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

add GPRS display

Browse source 
- SGP: update remove cup, lock away cashless cancel, fix bug video not full
- MYS: change wording collect pt3
- DUBAI: update wordings
This commit is contained in:
Pakin 2025-04-04 14:16:54 +07:00
parent 3c05684c63
commit 333782116c
20 changed files with 26056 additions and 25362 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -481,7 +481,12 @@
Var QR_POPUP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment/img_tap_card_5_sec.png"
Var CountDownAllowCancel = 5
Var CountDownAllowCancel = 9999999
Var VendingIsQueueCounter = 0
Var VendingIsFail = 0
Var VendingIsUnknown = 0
Var VendingIsIdleByPressingBtn = 0
</EventOpen>
@ -708,6 +713,8 @@
Var PayInfoCFlag = 1
EndIf
DEBUGVAR VendingCashless
DEBUGVAR Timeout
If VendingCashless = "OK" Then
DEBUGVAR CashlessCode
@ -717,6 +724,8 @@
Var QRErrorState = "Invisible"
Var LOADING_STATE = "Invisible"
Var CountDownAllowCancel = 9999999
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
@ -737,6 +746,23 @@
Else
DEBUGVAR "VendingCashless get ActOk not ok"
DEBUGVAR VendingCashless
If VendingCashless = "QUEUE" Then
Var VendingIsQueueCounter = VendingIsQueueCounter + 1
SAVELOG "State::QUEUE.ActOk.add(1)"
EndIf
If VendingCashless = "ERROR" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "State::ERROR.ActOk.add(1)"
EndIf
If VendingCashless = "FAIL" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "State::FAIL.ActOk.add(1) cnt as Error"
EndIf
EndIf
</EventActionOk>
@ -786,6 +812,9 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var CountDownAllowCancel = 0
EndIf
EndIf
@ -803,6 +832,7 @@
DEBUGVAR VendingCashless
DEBUGVAR UserChoosePayment
DEBUGVAR CoinInFlag
DEBUGVAR Timeout
@ -812,7 +842,7 @@
DEBUGVAR UserChoosePayment
DEBUGVAR VendingCashless
If Timeout < 120 Then
If UserChoosePayment = "CreditCashless" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
@ -824,6 +854,11 @@
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
SAVELOG "Cashless by pressing button"
Var CountDownAllowCancel = 9999999
Var CashlessPayFlag = 1
EndIf
EndIf
@ -841,10 +876,16 @@
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
SAVELOG "Cashless without pressing button"
Var CountDownAllowCancel = 9999999
Var UserChoosePayment = "CreditCashless"
EndIf
EndIf
Else
SAVELOG "User tried to pay but timeout is > 120"
DEBUGVAR Timeout
EndIf
EndIf
Else
@ -868,11 +909,122 @@
DEBUGVAR VendingCashless
DEBUGVAR CountDownAllowCancel
DEBUGVAR VendingIsQueueCounter
DEBUGVAR VendingIsError
DEBUGVAR VendingIsUnknown
DEBUGVAR VendingIsIdleByPressingBtn
If CountDownAllowCancel > 0 Then
Var CountDownAllowCancel = CountDownAllowCancel - 1
EndIf
If VendingCashless = "" Then
Var VendingIsUnknown = VendingIsUnknown + 1
SAVELOG "VendingCashless is empty"
EndIf
If VendingCashless = "START" Then
Var VendingIsIdleByPressingBtn = VendingIsIdleByPressingBtn + 1
SAVELOG "VendingCashless is IDLE(START)"
EndIf
If VendingCashless = "ERROR" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "VendingCashless is ERROR, Timeout"
EndIf
If VendingCashless = "FAIL" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "VendingCashless is FAIL, Timeout"
EndIf
If VendingCashless = "QUEUE" Then
Var VendingIsQueueCounter = VendingIsQueueCounter + 1
SAVELOG "VendingCashless is QUEUE"
EndIf
If VendingIsQueueCounter > 0 Then
If VendingIsQueueCounter > 4 Then
SAVELOG "UnexpectedQueueCounter"
DEBUGVAR VendingIsQueueCounter
EndIf
If VendingCashless = "ERROR" Then
SAVELOG "VendingError::hasQueueMoreThan1 ---> Error"
Var CountDownAllowCancel = 0
Var VendingIsQueueCounter = 0
Var VendingIsError = 0
Var VendingIsUnknown = 0
EndIf
If VendingCashless = "FAIL" Then
SAVELOG "VendingError::hasQueueMoreThan1 ---> Fail"
Var CountDownAllowCancel = 0
Var VendingIsQueueCounter = 0
Var VendingIsError = 0
Var VendingIsUnknown = 0
EndIf
EndIf
If VendingIsUnknown > 59 Then
SAVELOG "VendingIsUnknown::AllowCancel60s"
Var CountDownAllowCancel = 0
Var VendingIsUnknown = 0
EndIf
If VendingIsIdleByPressingBtn > 9 Then
SAVELOG "Vending IDLE 10 s, auto exit"
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var CountDownAllowCancel = 9999999
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF
CashlessReq OFF ""
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL ""
EndIf
Refresh
Var VendingIsIdleByPressingBtn = 0
EndIf
; ok
If VendingCashless = "END" Then
Var VendingIsQueueCounter = 0
Var VendingIsUnknown = 0
Var VendingIsError = 0
Var VendingIsIdleByPressingBtn = 0
SAVELOG "VendingCashless is END, resetAll"
EndIf
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
DEBUGVAR UserChoosePayment
@ -1017,8 +1169,9 @@
EndIf
Else
Var PayState5 = "Enable"
If Timeout < 120 Then
Var PayState5 = "Enable"
EndIf
EndIf
Var stringLog = "Timeout " + Timeout
@ -1645,7 +1798,7 @@ If alphaState = "Invisible" Then
DEBUGVAR QR_POPUP
Refresh
Var alphaState = "Enable"
Var CountDownAllowCancel = 5
Var CountDownAllowCancel = 9999999
Coin CARD
EndIf
EndIf
@ -1873,6 +2026,10 @@ EndIf
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var CountDownAllowCancel = 9999999
Var VendingIsIdleByPressingBtn = 0
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF