From ec06b3785a357cf092cd11c5e0990422f16d7dcd Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 19 May 2022 15:51:03 +0700 Subject: [PATCH] before DO --- xml/page_payment.xml | 2 +- xml/page_topping_select4.xml | 19 ++++++++++++++++--- xml_main/startup.xml_new_layout | 4 ++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 5f1ad44d..38e494af 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -185,7 +185,7 @@ - If CountStepPackPayment = CountStepForCupFlagDelay Then + If CountStepPackPayment >= CountStepForCupFlagDelay Then SAVELOG ExtendData diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 85d0d403..d7e2161f 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -788,7 +788,7 @@ Var BugFlag = 1 Var topping1 = toppingID1Default - + Var ToppingGotoPayment = "false" @@ -799,6 +799,14 @@ Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf EndIf + + If SelectDrinkType = 0 Then + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + EndIf Else @@ -2259,7 +2267,9 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" ExtendDataCurr + + Var ExtendData = ExtendDataCurr Else Topping "SetNextOrder" UserSelectProductCode @@ -2270,7 +2280,10 @@ Topping "__select2-id" topping2 Topping "__select3-id" topping3 ; Pack - Topping "__pack" ExtendData + Topping "__pack" ExtendDataNext + + Var ExtendData = ExtendDataNext + EndIf diff --git a/xml_main/startup.xml_new_layout b/xml_main/startup.xml_new_layout index 68ff29ac..2f238735 100644 --- a/xml_main/startup.xml_new_layout +++ b/xml_main/startup.xml_new_layout @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.45" - Var XMLPageVersionInt = 645 + Var XMLPageVersion = "6.46" + Var XMLPageVersionInt = 646