diff --git a/inter/aus/image/page_drink_fail/bn_door_open.png b/inter/aus/image/page_drink_fail/bn_door_open.png new file mode 100644 index 00000000..d187683d Binary files /dev/null and b/inter/aus/image/page_drink_fail/bn_door_open.png differ diff --git a/inter/aus/image/page_drink_fail/bp_door_open.png b/inter/aus/image/page_drink_fail/bp_door_open.png new file mode 100644 index 00000000..51188674 Binary files /dev/null and b/inter/aus/image/page_drink_fail/bp_door_open.png differ diff --git a/inter/aus/image/page_drink_fail/remove_cup.png b/inter/aus/image/page_drink_fail/remove_cup.png new file mode 100644 index 00000000..67bfbb2c Binary files /dev/null and b/inter/aus/image/page_drink_fail/remove_cup.png differ diff --git a/inter/aus/xml/page_drinkfail3.lxml b/inter/aus/xml/page_drinkfail3.lxml new file mode 100644 index 00000000..8bad9e61 --- /dev/null +++ b/inter/aus/xml/page_drinkfail3.lxml @@ -0,0 +1,210 @@ + + "Enable" + 1080 + 1920 + "0xEFEDEA" + SoundVolume + + + ; On open + + + + Var DirImage = "ROOT/taobin_project/inter/aus/image/page_drink_fail" + + + Var Timeout = 0 + + Var Door_Open_State="Invisible" + Var Door_Open_flagBlink = 0 + + + + If HaveCup = "true" Then + + If CheckCupStateDoorCupClose = "" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "done" Then + Var buttonRemoveCup = "Enable" + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + EndIf + EndIf + + Var CheckCupStateDoorCupCloseCnt = 15 + + 1000 + + + + + Var Timeout = Timeout + 1 + + DEBUGVAR Timeout + DEBUGVAR MachineStage + DEBUGVAR NextOrder + DEBUGVAR HaveCup + + If Door_Open_flagBlink = 0 Then + Var Door_Open_flagBlink = 1 + Var Door_Open_State="Enable" + Else + Var Door_Open_flagBlink = 0 + Var Door_Open_State="Invisible" + EndIf + + If HaveCup = "true" Then + DEBUGVAR CheckCupStateDoorCupClose + + If CheckCupStateDoorCupClose = "" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "done" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "reset" Then + + If CheckCupStateDoorCupCloseCnt = 0 Then + Var CheckCupStateDoorCupClose = "" + Else + Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 + + EndIf + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + EndIf + EndIf + + If buttonRemoveCup = "Invisible" Then + Var Door_Open_State = "Invisible" + EndIf + + DEBUGVAR buttonRemoveCup + DEBUGVAR Door_Open_State + + If MachineStage = "remove-cup" Then + + Else + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + SAVELOG "Remove cup drink fail " + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + ; must remove cup. + If HaveCup = "true" Then + + Else + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + SAVELOG "Have Cup" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + + If Timeout > 240 Then + If NextOrder = "true" Then + SAVELOG "TIME OUT 240" + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + Refresh + TimerReset + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + + + + + + + + + + 53 + 473 + Var( DirImage + "/remove_cup.png" ) + + + + + + + + + + \ No newline at end of file diff --git a/inter/aus/xml/page_drinkfail_aus.lxml b/inter/aus/xml/page_drinkfail_aus.lxml index abfe3f31..34942e03 100644 --- a/inter/aus/xml/page_drinkfail_aus.lxml +++ b/inter/aus/xml/page_drinkfail_aus.lxml @@ -137,7 +137,7 @@ If Timeout > 20 Then If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail3.lxml" Else If NextOrder = "true" Then Var NextOrder = "false" @@ -180,7 +180,7 @@ If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail3.lxml" Else If NextOrder = "true" Then Var NextOrder = "false" diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index a2905354..befbb2e0 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -301,9 +301,12 @@ EndIf + Var IsCardlessEnable = 0 + If CoinInFlag = 0 Then If CancelFlag = 0 Then Coin CARD + Var IsCardlessEnable = 1 EndIf EndIf @@ -332,10 +335,9 @@ EndIf If SELLONLINE = 0 Then - ;SAVELOG "Credit card only NetworkStatus down" - SAVELOG "NetworkStatus down" + SAVELOG "Credit card only NetworkStatus down" - Var PayWithCreditCardState = "Disable" + Var PayWithCreditCardState = "Enable" Var PayWithTaoCreditState = "Disable" Var PayWithCouponState = "Disable" Var PayWithAUBState = "Disable" @@ -1653,8 +1655,10 @@ EndIf If CoinInFlag = 0 Then If CancelFlag = 0 Then - CashlessReq OFF - + If IsCardlessEnable = 1 Then + CashlessReq OFF + Var IsCardlessEnable = 0 + EndIf Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" Open "ROOT/taobin_project/xml/page_payment_credit.xml" @@ -1684,7 +1688,11 @@ EndIf If CoinInFlag = 0 Then If CancelFlag = 0 Then - CashlessReq OFF + + If IsCardlessEnable = 1 Then + CashlessReq OFF + Var IsCardlessEnable = 0 + EndIf Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" @@ -1722,6 +1730,10 @@ EndIf Var alphaState = "Enable" Var PopupCancelButtonState = "Enable" + If IsCardlessEnable = 1 Then + CashlessReq OFF + Var IsCardlessEnable = 0 + EndIf VendingQR ON Var SessionID2 = SelectSlot + ":" @@ -1828,6 +1840,12 @@ EndIf Var scanresult = "" Var scanmsg = "" Var EMAMemberID = "" + + If IsCardlessEnable = 1 Then + CashlessReq OFF + Var IsCardlessEnable = 0 + EndIf + INITSCANQR Var CameraState = "Enable" @@ -2064,6 +2082,11 @@ EndIf Var popup_cancel_button_y = 1345 + If IsCardlessEnable = 0 Then + Coin CARD + Var IsCardlessEnable = 1 + EndIf + If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 CashlessReq FAIL diff --git a/xml_main/startup.xml b/xml_main/startup.xml index aa71e478..1b7d8b1b 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.44" - Var XMLPageVersionInt = 944 + Var XMLPageVersion = "9.45" + Var XMLPageVersionInt = 945 ;Oreo Var OreoGuarantee = 0