From 207100665f219fdfa18d8ecb382f7bb380a7b332 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Wed, 27 Nov 2024 16:36:20 +0700 Subject: [PATCH] THAI: Fix bug topping select press next button very fast, fix bug page_payment_cash to wait 3 second before send cancel action --- xml/page_payment_cash.xml | 43 +- xml/page_topping_select7.xml | 766 +++++++++++++++++++---------------- 2 files changed, 434 insertions(+), 375 deletions(-) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 5c53c9cb..7875a55f 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -182,6 +182,7 @@ Var Seeker.VendingDiscount = DiscountDrink Var CancelingPopupFlag = "Invisible" + Var SendCancelActionFlag = 0 Var CancelingPopupCountDown = 0 Var CashTextWarning = "" @@ -2244,14 +2245,38 @@ If CancelingPopupFlag = "Enable" Then - SAVELOG "Canceled Popup" - Var CancelingPopupCountDown = CancelingPopupCountDown + 1 + DEBUGVAR CancelingPopupCountDown + If CancelingPopupCountDown > 3 Then + If SendCancelActionFlag = 0 Then + SAVELOG "Send Canceled Popup" + + Var SendCancelActionFlag = 1 + + If QRPopupOpenFlag = 1 Then + VendingQR OFF + EndIf + + If ReqPayInfoFromCashOther = 2 Then + DEBUGVAR "CashlessReq OFF by user" + CashlessReq OFF + EndIf + + If CashlessPayFlag = 1 Then + Var CashlessPayFlag = 0 + CashlessReq FAIL + EndIf + EndIf + EndIf + + If CancelingPopupCountDown > 5 Then + SAVELOG "Close Cancel Popup" Var CancelingPopupFlag = "Invisible" Var alphaState = "Invisible" + Var SendCancelActionFlag = 0 EndIf EndIf @@ -3101,20 +3126,6 @@ eval( Var CancelingPopupFlag = "Enable" Var CancelingPopupCountDown = 0 - If QRPopupOpenFlag = 1 Then - VendingQR OFF - EndIf - - If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF by user" - CashlessReq OFF - EndIf - - If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 - CashlessReq FAIL - EndIf - Refresh EndIf diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 0f4f456b..aa783342 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -72,6 +72,8 @@ Var SugarState5 = "Invisible" Var SugarState6 = "Invisible" + Var ReadyToGoNext = 0 + Var AddShotEnable = "Invisible" Var BGSugar = "Invisible" @@ -346,7 +348,8 @@ EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Else Var show_select_type = "Invisible" @@ -955,7 +958,8 @@ Var OatMilkX = 270 EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -2479,7 +2483,8 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev" - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -2900,7 +2905,8 @@ DEBUGVAR topping1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -3381,7 +3387,8 @@ DEBUGVAR topping1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -3614,7 +3621,8 @@ DEBUGVAR topping1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -3831,7 +3839,8 @@ Var SugarNormalCheck = "PressForever" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -3865,7 +3874,8 @@ Var SugarZeroCalCheck = "PressForever" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -3941,7 +3951,8 @@ DEBUGVAR SugarZeroCalCheck - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf DEBUGVAR topping1 @@ -4451,7 +4462,8 @@ Var SugarNormalCheck = "PressForever" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -4485,7 +4497,8 @@ Var SugarZeroCalCheck = "PressForever" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -4553,7 +4566,8 @@ Var SugarZeroCalCheck = "Disable" EndIf Var UserSeletedSugar = 1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf DEBUGVAR topping1 @@ -4773,7 +4787,8 @@ Var SugarNormalCheck = "PressForever" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -4807,7 +4822,8 @@ Var SugarZeroCalCheck = "PressForever" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf @@ -4878,7 +4894,8 @@ EndIf Var UserSeletedSugar = 1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 EndIf DEBUGVAR topping1 @@ -5243,7 +5260,8 @@ Var OatMilkEnable = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5269,7 +5287,8 @@ Var OatMilkEnable = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5375,7 +5394,8 @@ Var ShotCoffeePremium = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -5401,7 +5421,8 @@ Var ShotCoffeePremium = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -5455,7 +5476,8 @@ Var showShotEnable = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -5487,7 +5509,8 @@ Var showShotEnable = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -5553,7 +5576,8 @@ Var showOreoAddEnable = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -5585,7 +5609,8 @@ Var showOreoAddEnable = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5649,7 +5674,8 @@ Var CollagenState = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -5683,7 +5709,8 @@ Var CollagenState = "Press" EndIf - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5795,7 +5822,8 @@ Var CurrentCoffeeWaterId = toppingID7index1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5820,7 +5848,8 @@ Var CurrentCoffeeWaterId = toppingID7index2 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5846,7 +5875,8 @@ Var CurrentCoffeeWaterId = toppingID7index3 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5872,7 +5902,8 @@ Var CurrentCoffeeWaterId = toppingID7index4 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5897,7 +5928,8 @@ Var CurrentCoffeeWaterId = toppingID7index5 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -5986,7 +6018,8 @@ Var CurrentCoffeeQuantityId = toppingID8index1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6010,7 +6043,8 @@ Var CurrentCoffeeQuantityId = toppingID8index2 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6033,7 +6067,8 @@ Var CurrentCoffeeQuantityId = toppingID8index3 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6121,7 +6156,8 @@ Var CurrentCoffeeLevelId = toppingID9index1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6146,7 +6182,8 @@ Var CurrentCoffeeLevelId = toppingID9index2 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6171,7 +6208,8 @@ Var CurrentCoffeeLevelId = toppingID9index3 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6197,7 +6235,8 @@ Var CurrentCoffeeLevelId = toppingID9index4 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6318,7 +6357,8 @@ Var CurrentCoffeeTampingId = toppingID8index1 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6341,7 +6381,8 @@ Var CurrentCoffeeTampingId = toppingID8index2 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6366,7 +6407,8 @@ Var CurrentCoffeeTampingId = toppingID8index3 - Function 2 + Var ReadyToGoNext = 0 + Function 2 @@ -6492,354 +6534,355 @@ - ;Var Seeker = "curr" - - Var Timeout = 0 - - - Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode - - __CMD "statement" 0 StatementCheckMenu "-" - - ;If HalfPrice = "true" Then - ; ; Discount 50 - ; DEBUGVAR HalfPrice - ; __CMD "invoke-discount-50" UserSelectProductCode "-" "-" - ; - ;Else - ; Var PriceDrink = PriceDrinkTmp - ;EndIf - - DEBUGVAR PriceDrinkTmp - - ;Var Seeker.PriceDrink = PriceDrinkTmp - - Var PriceDrink = PriceDrinkTmp - Var PromotionPriceDrink = PriceDrink - - DEBUGVAR PriceDrink - - SAVELOG "USER press next ( topping ) - new" - - If SugarState1 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index1 - EndIf - EndIf - - If SugarState2 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index1 - EndIf - - EndIf - - If SugarState3 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index1 - EndIf - - EndIf - - If SugarState3 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index1 - EndIf - - EndIf - - If SugarState4 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index4 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index2 - EndIf - - EndIf - - If SugarState5 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index5 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index4 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index3 - EndIf - - EndIf - - If showCustomCoffee = "Enable" Then - If showCoffeeWater = "Enable" Then - If CustomCoffeeWaterState[0] = "PressForever" Then - Var topping7 = toppingID7index1 - EndIf - If CustomCoffeeWaterState[1] = "PressForever" Then - Var topping7 = toppingID7index2 - EndIf - If CustomCoffeeWaterState[2] = "PressForever" Then - Var topping7 = toppingID7index3 - EndIf - If CustomCoffeeWaterState[3] = "PressForever" Then - Var topping7 = toppingID7index4 - EndIf - If CustomCoffeeWaterState[4] = "PressForever" Then - Var topping7 = toppingID7index5 - EndIf - Else - Var topping7 = 0 - EndIf - - If showCoffeeQuantity = "Enable" Then - If CustomCoffeeQuantityState[0] = "PressForever" Then - Var topping2 = toppingID2index1 - EndIf - If CustomCoffeeQuantityState[1] = "PressForever" Then - Var topping2 = toppingID2index2 - EndIf - If CustomCoffeeQuantityState[2] = "PressForever" Then - Var topping2 = toppingID2index3 - EndIf - Else - If toppingID2index3 = "" Then - Else - Var topping2 = 0 - EndIf - EndIf - - If showCoffeeLevel = "Enable" Then - If CustomCoffeeLevelState[0] = "PressForever" Then - Var topping9 = toppingID9index1 - EndIf - If CustomCoffeeLevelState[1] = "PressForever" Then - Var topping9 = toppingID9index2 - EndIf - If CustomCoffeeLevelState[2] = "PressForever" Then - Var topping9 = toppingID9index3 - EndIf - If CustomCoffeeLevelState[3] = "PressForever" Then - Var topping9 = toppingID9index4 - EndIf - Else - Var topping9 = 0 - EndIf - - If showCoffeeTamping = "Enable" Then - If CustomCoffeeTampingState[0] = "PressForever" Then - Var topping8 = toppingID8index1 - EndIf - If CustomCoffeeTampingState[1] = "PressForever" Then - Var topping8 = toppingID8index2 - EndIf - If CustomCoffeeTampingState[2] = "PressForever" Then - Var topping8 = toppingID8index3 - EndIf - Else - Var topping8 = 0 - EndIf - Else - If toppingID2index3 = "" Then - Else - Var topping2 = 0 - EndIf - Var topping7 = 0 - Var topping8 = 0 - Var topping9 = 0 - Var topping10 = 0 - EndIf - - - - ; Post Topping - If SugarZeroCalEnable = "true" Then - Var sugarToppingID = 1000 - If SugarZeroCalCheck = "PressForever" Then - Var sugarToppingID = 1001 - Else - Var sugarToppingID = 1000 - EndIf - EndIf - - If Seeker = "next" Then - SAVELOG "NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT " - EndIf - - - Var Seeker.topping1 = topping1 - Var Seeker.topping2 = topping2 - Var Seeker.topping3 = topping3 - Var Seeker.topping6 = topping6 - Var Seeker.topping7 = topping7 - Var Seeker.topping8 = topping8 - Var Seeker.topping9 = topping9 - Var Seeker.topping10 = topping10 - - Var Seeker.PostTopping1 = sugarToppingID - - Var Seeker.get_a_straw = StrawState - Var Seeker.get_a_lid = LidState - - - DEBUGVAR Seeker.topping1 - DEBUGVAR Seeker.topping2 - DEBUGVAR Seeker.topping3 - DEBUGVAR Seeker.topping6 - DEBUGVAR Seeker.topping7 - DEBUGVAR Seeker.topping8 - DEBUGVAR Seeker.topping9 - DEBUGVAR Seeker.topping10 - DEBUGVAR Seeker.PostTopping1 - - DEBUGVAR Seeker.get_a_straw - DEBUGVAR Seeker.get_a_lid - - DEBUGVAR LidState - DEBUGVAR StrawState - DEBUGVAR UserSelectProductCode - - - If StrawState = "Press" Then - Machine StrawOrder - Var LedLidBlink = "true" - EndIf - - If LidState = "Press" Then - Machine LidOrder - Var LedLidBlink = "true" - Var bg_lidProblem_ST = "Enable" - Else - If LidState = "Disable" Then - Var bg_lidProblem_ST = "Disable" - Else - Var bg_lidProblem_ST = "Invisible" - EndIf - EndIf - - If SelectDrinkType = 0 Then - - Else - Var StrawState = "Enable" - Var LidState = "Enable" - EndIf - ; + If ReadyToGoNext = 1 Then + ;Var Seeker = "curr" + + Var Timeout = 0 + + + Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode + + __CMD "statement" 0 StatementCheckMenu "-" + + ;If HalfPrice = "true" Then + ; ; Discount 50 + ; DEBUGVAR HalfPrice + ; __CMD "invoke-discount-50" UserSelectProductCode "-" "-" + ; + ;Else + ; Var PriceDrink = PriceDrinkTmp + ;EndIf + + DEBUGVAR PriceDrinkTmp + + ;Var Seeker.PriceDrink = PriceDrinkTmp + + Var PriceDrink = PriceDrinkTmp + Var PromotionPriceDrink = PriceDrink + + DEBUGVAR PriceDrink + + SAVELOG "USER press next ( topping ) - new" + + If SugarState1 = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index1 + EndIf + EndIf + + If SugarState2 = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index1 + EndIf + + EndIf + + If SugarState3 = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index1 + EndIf + + EndIf + + If SugarState3 = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index1 + EndIf + + EndIf + + If SugarState4 = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index4 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index2 + EndIf + + EndIf + + If SugarState5 = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index5 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index4 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index3 + EndIf + + EndIf + + If showCustomCoffee = "Enable" Then + If showCoffeeWater = "Enable" Then + If CustomCoffeeWaterState[0] = "PressForever" Then + Var topping7 = toppingID7index1 + EndIf + If CustomCoffeeWaterState[1] = "PressForever" Then + Var topping7 = toppingID7index2 + EndIf + If CustomCoffeeWaterState[2] = "PressForever" Then + Var topping7 = toppingID7index3 + EndIf + If CustomCoffeeWaterState[3] = "PressForever" Then + Var topping7 = toppingID7index4 + EndIf + If CustomCoffeeWaterState[4] = "PressForever" Then + Var topping7 = toppingID7index5 + EndIf + Else + Var topping7 = 0 + EndIf + + If showCoffeeQuantity = "Enable" Then + If CustomCoffeeQuantityState[0] = "PressForever" Then + Var topping2 = toppingID2index1 + EndIf + If CustomCoffeeQuantityState[1] = "PressForever" Then + Var topping2 = toppingID2index2 + EndIf + If CustomCoffeeQuantityState[2] = "PressForever" Then + Var topping2 = toppingID2index3 + EndIf + Else + If toppingID2index3 = "" Then + Else + Var topping2 = 0 + EndIf + EndIf + + If showCoffeeLevel = "Enable" Then + If CustomCoffeeLevelState[0] = "PressForever" Then + Var topping9 = toppingID9index1 + EndIf + If CustomCoffeeLevelState[1] = "PressForever" Then + Var topping9 = toppingID9index2 + EndIf + If CustomCoffeeLevelState[2] = "PressForever" Then + Var topping9 = toppingID9index3 + EndIf + If CustomCoffeeLevelState[3] = "PressForever" Then + Var topping9 = toppingID9index4 + EndIf + Else + Var topping9 = 0 + EndIf + + If showCoffeeTamping = "Enable" Then + If CustomCoffeeTampingState[0] = "PressForever" Then + Var topping8 = toppingID8index1 + EndIf + If CustomCoffeeTampingState[1] = "PressForever" Then + Var topping8 = toppingID8index2 + EndIf + If CustomCoffeeTampingState[2] = "PressForever" Then + Var topping8 = toppingID8index3 + EndIf + Else + Var topping8 = 0 + EndIf + Else + If toppingID2index3 = "" Then + Else + Var topping2 = 0 + EndIf + Var topping7 = 0 + Var topping8 = 0 + Var topping9 = 0 + Var topping10 = 0 + EndIf + + + + ; Post Topping + If SugarZeroCalEnable = "true" Then + Var sugarToppingID = 1000 + If SugarZeroCalCheck = "PressForever" Then + Var sugarToppingID = 1001 + Else + Var sugarToppingID = 1000 + EndIf + EndIf + + If Seeker = "next" Then + SAVELOG "NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT " + EndIf + + + Var Seeker.topping1 = topping1 + Var Seeker.topping2 = topping2 + Var Seeker.topping3 = topping3 + Var Seeker.topping6 = topping6 + Var Seeker.topping7 = topping7 + Var Seeker.topping8 = topping8 + Var Seeker.topping9 = topping9 + Var Seeker.topping10 = topping10 + + Var Seeker.PostTopping1 = sugarToppingID + + Var Seeker.get_a_straw = StrawState + Var Seeker.get_a_lid = LidState + + + DEBUGVAR Seeker.topping1 + DEBUGVAR Seeker.topping2 + DEBUGVAR Seeker.topping3 + DEBUGVAR Seeker.topping6 + DEBUGVAR Seeker.topping7 + DEBUGVAR Seeker.topping8 + DEBUGVAR Seeker.topping9 + DEBUGVAR Seeker.topping10 + DEBUGVAR Seeker.PostTopping1 + + DEBUGVAR Seeker.get_a_straw + DEBUGVAR Seeker.get_a_lid + + DEBUGVAR LidState + DEBUGVAR StrawState + DEBUGVAR UserSelectProductCode + + + If StrawState = "Press" Then + Machine StrawOrder + Var LedLidBlink = "true" + EndIf + + If LidState = "Press" Then + Machine LidOrder + Var LedLidBlink = "true" + Var bg_lidProblem_ST = "Enable" + Else + If LidState = "Disable" Then + Var bg_lidProblem_ST = "Disable" + Else + Var bg_lidProblem_ST = "Invisible" + EndIf + EndIf + + If SelectDrinkType = 0 Then + + Else + Var StrawState = "Enable" + Var LidState = "Enable" + EndIf + ; - DEBUGVAR PromotionIDCurrentOrder + DEBUGVAR PromotionIDCurrentOrder - Var SelectDrink = UserSelectProductCode + Var SelectDrink = UserSelectProductCode - Var Seeker.selected_a_drink = UserSelectProductCode - DEBUGVAR Seeker.selected_a_drink + Var Seeker.selected_a_drink = UserSelectProductCode + DEBUGVAR Seeker.selected_a_drink - ; Set drink + ; Set drink - If Seeker = "curr" Then + If Seeker = "curr" Then - ;include="ROOT/taobin_project/inc/select_drink_current.inc" + ;include="ROOT/taobin_project/inc/select_drink_current.inc" - Else - Topping "SetNextOrder" UserSelectProductCode + Else + Topping "SetNextOrder" UserSelectProductCode - Topping "__select" UserSelectProductCode - ; Set option toppinng and pack - Topping "__select1-id" topping1 - Topping "__select2-id" topping2 - Topping "__select3-id" topping3 - Topping "__select6-id" topping6 - Topping "__select7-id" topping7 - Topping "__select8-id" topping8 - Topping "__select9-id" topping9 - Topping "__select10-id" topping10 + Topping "__select" UserSelectProductCode + ; Set option toppinng and pack + Topping "__select1-id" topping1 + Topping "__select2-id" topping2 + Topping "__select3-id" topping3 + Topping "__select6-id" topping6 + Topping "__select7-id" topping7 + Topping "__select8-id" topping8 + Topping "__select9-id" topping9 + Topping "__select10-id" topping10 - Topping "__posttopping1-ID" sugarToppingID - ; Pack - Topping "__pack" ExtendDataNext + Topping "__posttopping1-ID" sugarToppingID + ; Pack + Topping "__pack" ExtendDataNext - Var NextUserSelectDrinkFromPaid = UserSelectProductCode - Var NextUserSelecttopping1Paid = topping1 - Var NextUserSelecttopping2Paid = topping2 - Var NextUserSelecttopping3Paid = topping3 - Var NextUserSelecttopping6Paid = topping6 - Var NextUserSelecttopping7Paid = topping7 - Var NextUserSelecttopping8Paid = topping8 - Var NextUserSelecttopping9Paid = topping9 - Var NextUserSelecttopping10Paid = topping10 + Var NextUserSelectDrinkFromPaid = UserSelectProductCode + Var NextUserSelecttopping1Paid = topping1 + Var NextUserSelecttopping2Paid = topping2 + Var NextUserSelecttopping3Paid = topping3 + Var NextUserSelecttopping6Paid = topping6 + Var NextUserSelecttopping7Paid = topping7 + Var NextUserSelecttopping8Paid = topping8 + Var NextUserSelecttopping9Paid = topping9 + Var NextUserSelecttopping10Paid = topping10 - EndIf + EndIf - DEBUGVAR Seeker - DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker + DEBUGVAR Seeker.ExtendData - Var Seeker.PictureDrink = PictureDrink - Var Seeker.showname = showname + Var Seeker.PictureDrink = PictureDrink + Var Seeker.showname = showname - DEBUGVAR MenuCautionImageStage0 - DEBUGVAR CustomerFilterEnable - DEBUGVAR CustomerFilterType + DEBUGVAR MenuCautionImageStage0 + DEBUGVAR CustomerFilterEnable + DEBUGVAR CustomerFilterType - GetLongTimeInMinute LastTimeClickOrder + GetLongTimeInMinute LastTimeClickOrder - If CART_COUNT = 0 Then - If UserSelectProductCode = "-" Then + If CART_COUNT = 0 Then + If UserSelectProductCode = "-" Then - Else + Else - If SelectDrinkType = 1 Then - EndIf - EndIf + If SelectDrinkType = 1 Then + EndIf + EndIf - If SelectDrinkType = 0 Then - Var high_light_drink_type = "Enable" - EndIf - Else + If SelectDrinkType = 0 Then + Var high_light_drink_type = "Enable" + EndIf + Else - If CART1_STATUS = "EMPTY" Then - Cart "AddMenuID" 1 - Else - If CART2_STATUS = "EMPTY" Then - Cart "AddMenuID" 2 - Else - If CART3_STATUS = "EMPTY" Then - Cart "AddMenuID" 3 - EndIf - EndIf - EndIf + If CART1_STATUS = "EMPTY" Then + Cart "AddMenuID" 1 + Else + If CART2_STATUS = "EMPTY" Then + Cart "AddMenuID" 2 + Else + If CART3_STATUS = "EMPTY" Then + Cart "AddMenuID" 3 + EndIf + EndIf + EndIf - Var CartUpdate = "true" - Var ButtonNext = "true" + Var CartUpdate = "true" + Var ButtonNext = "true" - EndIf - - Var LastTimeClickOrder = 0 + EndIf + Var LastTimeClickOrder = 0 + EndIf @@ -7960,6 +8003,8 @@ Var Timeout = 0 + Var ReadyToGoNext = 1 + RefreshAll @@ -8043,7 +8088,8 @@ Var high_light_drink_type = "Invisible" - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -8081,7 +8127,8 @@ Var PriceDrinkNoTop = PriceD2 - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh @@ -8117,7 +8164,8 @@ Var PriceDrinkNoTop = PriceD3 - Function 2 + Var ReadyToGoNext = 0 + Function 2 Refresh