fix drinkfail text
This commit is contained in:
pichet
parent
04e09e5970
commit
f55bd4aa7e
10 changed files with 159 additions and 42 deletions
BIN
image/collectiing/text22-2.png
Normal file
BIN
image/collectiing/text22-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 70 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 64 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 124 KiB |
BIN
image/collectiing_en/text22-2.png
Normal file
BIN
image/collectiing_en/text22-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 65 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 134 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.5 KiB |
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
If Timeout > 5 Then
|
||||
If Timeout > 9 Then
|
||||
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
If TelNumLen >= 10 Then
|
||||
|
|
@ -156,11 +156,11 @@
|
|||
<Filename> Var( DirImage + "/text23.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 410 </X>
|
||||
<Y> 600 </Y>
|
||||
<Filename> Var( DirImage + "/Businessman_sorry.png" ) </Filename>
|
||||
</Image>
|
||||
;<Image>
|
||||
;<X> 410 </X>
|
||||
;<Y> 600 </Y>
|
||||
;<Filename> Var( DirImage + "/Businessman_sorry.png" ) </Filename>
|
||||
;</Image>
|
||||
|
||||
<Text>
|
||||
<X> 5 </X>
|
||||
|
|
|
|||
|
|
@ -146,6 +146,12 @@
|
|||
Var xRefundChannelX = 162
|
||||
EndIf
|
||||
|
||||
Var text22 = "/text22.png"
|
||||
|
||||
If Seeker.CampaignPayChanel = "promptpay" Then
|
||||
Var text22 = "/text22-2.png"
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -549,23 +555,23 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Image>
|
||||
<X> xRefundChannelX </X>
|
||||
<Y> 960 </Y>
|
||||
<Filename> Var( DirImage + textRefundChannelX ) </Filename>
|
||||
</Image>
|
||||
;<Image>
|
||||
;<X> xRefundChannelX </X>
|
||||
;<Y> 960 </Y>
|
||||
;<Filename> Var( DirImage + textRefundChannelX ) </Filename>
|
||||
;</Image>
|
||||
|
||||
<Image>
|
||||
<X> 47 </X>
|
||||
<Y> 428 </Y>
|
||||
<Filename> Var( DirImage + "/text22.png" ) </Filename>
|
||||
<Y> 408 </Y>
|
||||
<Filename> Var( DirImage + text22 ) </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 410 </X>
|
||||
<Y> 524 </Y>
|
||||
<Filename> Var( DirImage + "/Businessman_sorry.png" ) </Filename>
|
||||
</Image>
|
||||
;<Image>
|
||||
;<X> 410 </X>
|
||||
;<Y> 524 </Y>
|
||||
;<Filename> Var( DirImage + "/Businessman_sorry.png" ) </Filename>
|
||||
;</Image>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,16 @@
|
|||
; Open "ROOT/taobin_project/xml/page_payment_camera.xml"
|
||||
;EndIf
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash-MYR.xml"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Indonesia" Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash-IDR.xml"
|
||||
EndIf
|
||||
|
||||
Var PreScaleCanculate = 1
|
||||
|
||||
|
||||
Var CashlessPayFlag = 0
|
||||
Var RemainAmountStrENG = ""
|
||||
|
|
@ -632,6 +642,92 @@
|
|||
Var ReqPayInfoFlag = 4
|
||||
EndIf
|
||||
|
||||
If web_payment = "LINEPAY" Then
|
||||
|
||||
Var QR_POPUP = "/img_popup9.png"
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
Var alphaState = "Enable"
|
||||
;CoinVending OFF
|
||||
VendingQR ON
|
||||
|
||||
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumberQR = "0899999999"
|
||||
Var ServiceType = "coffee"
|
||||
Var ECommerceQR = ""
|
||||
Var ECommerceQR = ECommerceQR + PriceDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + DiscountDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SessionID2
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "LPY:2/"
|
||||
|
||||
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
Var AccountType = "new"
|
||||
Var testservice = "kbank"
|
||||
Var tc = ""
|
||||
Var GetScore = ""
|
||||
Var OperatorName = ""
|
||||
Var SessionID = ""
|
||||
|
||||
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
Var ReqPayInfoFlag = 5
|
||||
EndIf
|
||||
|
||||
If web_payment = "LAZADAPAY" Then
|
||||
|
||||
Var QR_POPUP = "/img_popup10.png"
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
Var alphaState = "Enable"
|
||||
;CoinVending OFF
|
||||
VendingQR ON
|
||||
|
||||
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumberQR = "0899999999"
|
||||
Var ServiceType = "coffee"
|
||||
Var ECommerceQR = ""
|
||||
Var ECommerceQR = ECommerceQR + PriceDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + DiscountDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SessionID2
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "LZP:2/"
|
||||
|
||||
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
Var AccountType = "new"
|
||||
Var testservice = "kbank"
|
||||
Var tc = ""
|
||||
Var GetScore = ""
|
||||
Var OperatorName = ""
|
||||
Var SessionID = ""
|
||||
|
||||
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
Var ReqPayInfoFlag = 6
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
|
@ -690,7 +786,7 @@
|
|||
If IndoQR = 1 Then
|
||||
Var Seeker.CampaignPayChanel = "xendit"
|
||||
Else
|
||||
Var Seeker.CampaignPayChanel = "cash"
|
||||
Var Seeker.CampaignPayChanel = "promptpay"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -706,6 +802,9 @@
|
|||
If ReqPayInfoFlag2 = 5 Then
|
||||
Var Seeker.CampaignPayChanel = "linepay"
|
||||
EndIf
|
||||
If ReqPayInfoFlag2 = 6 Then
|
||||
Var Seeker.CampaignPayChanel = "lazadapay"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
|
@ -883,6 +982,33 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If ReqPayInfoFlag = 6 Then
|
||||
If VendingQRTypeResult = "LZP:2" Then
|
||||
Var CashTextWarning = ""
|
||||
Var QRErrorState = "Invisible"
|
||||
Var QRCODE99Shoppy = "https://pre-wormhole.lazada.co.th/wow/i/th/open-loop-shadow/open-loop-csb?hybrid=1&wh_showError=true&wx_navbar_transparent=true&lzd_navbar_hidden=true&codeValue="
|
||||
Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID
|
||||
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
|
||||
SAVELOG Ext1a
|
||||
SAVELOG QRCODE99Shoppy
|
||||
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
|
||||
Var ReqPayInfoFlag = 0
|
||||
Var ReqPayInfoFlag2 = 6
|
||||
SAVELOG QRCODE99Shoppy
|
||||
SAVELOG Ext21
|
||||
|
||||
Var QRCODE99 = QRCODE99Shoppy
|
||||
Var LOADING_STATE = "Invisible"
|
||||
|
||||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
|
|
@ -918,34 +1044,14 @@
|
|||
<EventActionError>
|
||||
|
||||
If ActionOKCase = 0 Then
|
||||
If ReqPayInfoFlag = 1 Then
|
||||
Var QRErrorFlag = 1
|
||||
If alphaState = "Enable" Then
|
||||
Var QRErrorState = "Enable"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
If ReqPayInfoFlag = 2 Then
|
||||
Var QRErrorFlag = 1
|
||||
If alphaState = "Enable" Then
|
||||
Var QRErrorState = "Enable"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
If ReqPayInfoFlag = 3 Then
|
||||
Var QRErrorFlag = 1
|
||||
If alphaState = "Enable" Then
|
||||
Var QRErrorState = "Enable"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
If ReqPayInfoFlag = 4 Then
|
||||
If ReqPayInfoFlag > 0 Then
|
||||
Var QRErrorFlag = 1
|
||||
If alphaState = "Enable" Then
|
||||
Var QRErrorState = "Enable"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
|
|
@ -1539,7 +1645,12 @@
|
|||
; Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
;EndIf
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var showRemaining = "Refund"
|
||||
Else
|
||||
Var showRemaining = "คืนเงิน"
|
||||
EndIf
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
If FlagQROpened = 1 Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue