pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

SGP: add delay page payment init, MYS: fix bug remove cup button not show

Browse source
This commit is contained in:
Pakin 2025-03-10 11:39:07 +07:00
parent 93fa5c540b
commit d28f470fbc
2 changed files with 61 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

88
inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
View file

@ -25,6 +25,8 @@
Var PreScaleCanculate = 100
DEBUGVAR VendingCashless
CashlessReq FAIL ""
Var WaitForStableCashlessState = 3
DEBUGVAR WaitForStableCashlessState
Var CashlessPayFlag = 0
@ -706,6 +708,7 @@
If VendingCashless = "OK" Then
DEBUGVAR CashlessCode
DEBUGVAR "Ok make::drink"
Var Timeout = 0
Var QRErrorState = "Invisible"
@ -728,7 +731,9 @@
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Else
DEBUGVAR "VendingCashless get ActOk not ok"
DEBUGVAR VendingCashless
EndIf
</EventActionOk>
@ -805,37 +810,47 @@
DEBUGVAR UserChoosePayment
DEBUGVAR VendingCashless
If UserChoosePayment = "CreditCashless" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
If WaitForStableCashlessState = 0 Then
If UserChoosePayment = "CreditCashless" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
EndIf
If UserChoosePayment = "" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
Var UserChoosePayment = "CreditCashless"
EndIf
EndIf
Else
DEBUGVAR "Get EventCashless while not stable"
DEBUGVAR WaitForStableCashlessState
DEBUGVAR VendingCashless
EndIf
If UserChoosePayment = "" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
Var UserChoosePayment = "CreditCashless"
EndIf
EndIf
EndIf
@ -860,6 +875,14 @@
DEBUGVAR VendingCashless
If WaitForStableCashlessState > 0 Then
DEBUGVAR WaitForStableCashlessState
Var LOADING_STATE = "Enable"
Var WaitForStableCashlessState = WaitForStableCashlessState - 1
Else
Var LOADING_STATE = "Invisible"
EndIf
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
@ -1828,7 +1851,12 @@ EndIf
<Filename> QR_POPUP </Filename>
</Image>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> LOADING_STATE </State>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 267 </X>