DUBAI: update export id, add cancel spam block
This commit is contained in:
parent
164004102c
commit
168cee5868
2 changed files with 160 additions and 2 deletions
|
|
@ -901,4 +901,4 @@ ProductCode Name ID
|
||||||
53-05-02-0076 PEPSI max YUZU 900
|
53-05-02-0076 PEPSI max YUZU 900
|
||||||
53-05-02-0077 PEPSI Max BANANA 901
|
53-05-02-0077 PEPSI Max BANANA 901
|
||||||
53-05-02-0117 Coconut Pepsi 902
|
53-05-02-0117 Coconut Pepsi 902
|
||||||
53-05-03-0117 Coconut Pepsi Smoothie 903
|
53-04-02-0021 ESPRESSO SHAKE 903
|
||||||
|
|
|
||||||
|
|
|
@ -544,6 +544,13 @@
|
||||||
|
|
||||||
Var CancelContinue = 0
|
Var CancelContinue = 0
|
||||||
|
|
||||||
|
Var CountDownAllowCancel = 9999999
|
||||||
|
|
||||||
|
Var VendingIsQueueCounter = 0
|
||||||
|
Var VendingIsFail = 0
|
||||||
|
Var VendingIsUnknown = 0
|
||||||
|
Var VendingIsIdleByPressingBtn = 0
|
||||||
|
|
||||||
</EventOpen>
|
</EventOpen>
|
||||||
|
|
||||||
<EventActionOk>
|
<EventActionOk>
|
||||||
|
|
@ -792,6 +799,26 @@
|
||||||
|
|
||||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||||
|
|
||||||
|
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
|
EndIf
|
||||||
|
|
||||||
If VendingCashless = "END" Then
|
If VendingCashless = "END" Then
|
||||||
|
|
@ -872,6 +899,128 @@
|
||||||
DEBUGVAR SELLONLINE
|
DEBUGVAR SELLONLINE
|
||||||
|
|
||||||
|
|
||||||
|
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 = "-" 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
|
If ReadyForBrew = "false" Then
|
||||||
SAVELOG "Back to main1"
|
SAVELOG "Back to main1"
|
||||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||||
|
|
@ -1599,7 +1748,10 @@
|
||||||
Var VendingCashless = "-"
|
Var VendingCashless = "-"
|
||||||
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
|
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
|
||||||
CashlessPay RemainAmountX CreditCardRef
|
CashlessPay RemainAmountX CreditCardRef
|
||||||
|
|
||||||
|
SAVELOG "Cashless by pressing button"
|
||||||
Var CashlessPayFlag = 1
|
Var CashlessPayFlag = 1
|
||||||
|
Var CountDownAllowCancel = 9999999
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
@ -1804,7 +1956,13 @@
|
||||||
<Button>
|
<Button>
|
||||||
<X> 438 </X>
|
<X> 438 </X>
|
||||||
<Y> 1345 </Y>
|
<Y> 1345 </Y>
|
||||||
<State> alphaState </State>
|
<State> eval(
|
||||||
|
If CountDownAllowCancel > 0 Then
|
||||||
|
Var return = "Invisible"
|
||||||
|
Else
|
||||||
|
Var return = alphaState
|
||||||
|
EndIf
|
||||||
|
) </State>
|
||||||
<Filename> cancelBtn </Filename>
|
<Filename> cancelBtn </Filename>
|
||||||
<FilenamePress> cancelBtnP </FilenamePress>
|
<FilenamePress> cancelBtnP </FilenamePress>
|
||||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue