add GPRS display
- 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
parent
3c05684c63
commit
333782116c
20 changed files with 26056 additions and 25362 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -27,6 +27,14 @@
|
|||
|
||||
LED LedDoorDoor 5 255 255 255 255
|
||||
|
||||
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
|
||||
|
||||
Var ShowMenuNameAndImage = "Invisible"
|
||||
Var RemoveCupOnArmID = -1
|
||||
Var remove_cup_name = ""
|
||||
Var remove_cup_image = ""
|
||||
|
||||
|
||||
Var CheckCupStateDoorCupClose = ""
|
||||
Var CheckCupStateDoorCupCloseCnt = 0
|
||||
|
||||
|
|
@ -50,59 +58,50 @@
|
|||
;SAVELOG MachineErrorDetail
|
||||
Var MachineErrorDetailAll = MachineErrorDetailEng
|
||||
|
||||
|
||||
If MachineStage = "show-menu" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
If HaveCup = "false" Then
|
||||
If MachineStage = "show-menu" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
If MachineStage = "show-menu" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.lxml"
|
||||
EndIf
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
;include=ROOT/taobin_project/inc/remove_cup_step.inc
|
||||
|
||||
DEBUGVAR Timeout
|
||||
If Timeout > 5 Then
|
||||
Var Timeout = 0
|
||||
|
||||
DEBUGVAR DoorCupPosition
|
||||
Var RemoveCupOnArmID = 0
|
||||
If RemoveCupOnArmID > 0 Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var ShowMenuNameAndImage = "Invisible"
|
||||
Var RemoveCupOnArmID = -1
|
||||
Else
|
||||
DEBUGVAR RemoveCupOnArmID
|
||||
DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
|
||||
DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
|
||||
|
||||
Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
|
||||
Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
|
||||
Var ShowMenuNameAndImage = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; Logic have differrent drinkfail3.xml
|
||||
; protect lock
|
||||
;
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt > 0 Then
|
||||
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt = 0 Then
|
||||
Var CheckCupStateDoorCupClose = ""
|
||||
EndIf
|
||||
|
||||
DEBUGVAR HaveCup
|
||||
|
||||
If HaveCup = "true" Then
|
||||
|
||||
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR buttonRemoveCup
|
||||
DEBUGVAR CheckCupStateDoorCupClose
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
;include=ROOT/taobin_project/inc/remove_cup_tag_event.inc
|
||||
|
||||
<Text>
|
||||
<X> 50 </X>
|
||||
<Y> 852 </Y>
|
||||
|
|
@ -134,11 +133,9 @@
|
|||
<EventClick>
|
||||
|
||||
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var CheckCupStateDoorCupClose = "reset"
|
||||
Var CheckCupStateDoorCupCloseCnt = 30
|
||||
;include=ROOT/taobin_project/inc/remove_cup_button.inc
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000411 </ID>
|
||||
|
|
@ -150,6 +147,37 @@
|
|||
</Button>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 125 </X>
|
||||
<Y> 1700 </Y>
|
||||
<Height> 300 </Height>
|
||||
<Width> 320 </Width>
|
||||
<State> ShowMenuNameAndImage </State>
|
||||
<Filename> remove_cup_image </Filename>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<X> 300 </X>
|
||||
<Y> 1750 </Y>
|
||||
<State> ShowMenuNameAndImage </State>
|
||||
<Width> 1080 </Width>
|
||||
<Align> Center </Align>
|
||||
<Font> KanitLightTTF </Font>
|
||||
<Size> 48 </Size>
|
||||
<Color> HeadlineColor </Color>
|
||||
<Value>
|
||||
eval(
|
||||
STRCONTAIN "size" remove_cup_name SizeFromSheet
|
||||
If SizeFromSheet = "true" Then
|
||||
SPLIT Seeker.showname "###" 1 PureName
|
||||
Var return = PureName
|
||||
Else
|
||||
Var return = Seeker.showname
|
||||
EndIf
|
||||
)
|
||||
</Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 5 </X>
|
||||
<Y> 1868 </Y>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue