diff --git a/xml/function2.inc b/xml/function2.inc index 88de8916..9c9e8315 100644 --- a/xml/function2.inc +++ b/xml/function2.inc @@ -406,15 +406,12 @@ Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice Var strMulti6_1 = "TPID=321,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else ;Var PriceDrinkTmp = PriceDrinkNoTop Var strMulti6_1 = "TPID=320,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf @@ -424,14 +421,12 @@ ;Var topping6 = toppingID6index5 Var strMulti6_2 = "TPID=323,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else ;Var PriceDrinkTmp = PriceDrinkNoTop Var strMulti6_2 = "TPID=320,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf @@ -440,7 +435,6 @@ ;Var topping6 = toppingID6index3 Var strMulti6_3 = "TPID=322,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else ;Var PriceDrinkTmp = PriceDrinkNoTop @@ -448,61 +442,52 @@ Var strMulti6_3 = "TPID=320,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf If CustomMilkState[0] = "PressForever" Then Var strMulti11_1 = "TPID=541,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else Var strMulti11_1 = "TPID=542,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf If CustomMilkState[1] = "PressForever" Then Var strMulti11_2 = "TPID=542,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else Var strMulti11_2 = "TPID=542,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf If CustomMilkState[2] = "PressForever" Then Var strMulti11_3 = "TPID=543,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else Var strMulti11_3 = "TPID=542,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf If CustomTaiwaneseTeaState[0] = "PressForever" Then Var strMulti11_4 = "TPID=546,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else Var strMulti11_4 = "TPID=546,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf If CustomTaiwaneseTeaState[1] = "PressForever" Then Var strMulti11_5 = "TPID=547,multiply=1" Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode Else Var strMulti11_5 = "TPID=547,multiply=0" Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode EndIf + DEBUGVAR DisableUsingCode + If CustomTaiwaneseTeaState[1] = "PressForever" Then Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice EndIf diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 71f1cc27..4ede3573 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -998,6 +998,7 @@ If UserSelectProductCode = "" Then Var MenuReady = "error-pd2" Else + DEBUGVAR UserSelectProductCode Strlen UserSelectProductCode UserSelectProductCodeLen If UserSelectProductCodeLen = 13 Then @@ -1696,7 +1697,7 @@ - + If BugFlag = 1 Then @@ -2207,24 +2208,6 @@ EndIf EndIf - If TOPPING2 = "shot coffee" Then - - Var ShotCoffeeBG = "Enable" - Var showShotEnable = "Enable" - Var ExtraTopping = "Enable" - - Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - - DEBUGVAR toppingID2price2Conv - Var text_shot_normal_add = toppingID2price2Conv + ")" - Var text_shot_normal_add = "(+" + text_shot_normal_add - - If showShotNormal = "Enable" Then - Var showShotNormal = "Press" - EndIf - - EndIf - If TOPPING13 = "shot coffee" Then Var showAdjust = "Enable" If toppingID13index2Status = "Enable" Then @@ -4764,29 +4747,26 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index1 - Var SugarZeroCalOption = "Invisible" - Var UserSeletedSugar = 1 EndIf + + Var topping1 = toppingID1index1 EndIf - + Var SugarZeroCalOption = "Invisible" + Var UserSeletedSugar = 1 Refresh @@ -4813,49 +4793,46 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then + If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - EndIf - - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index2 EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + Var topping1 = toppingID1index1 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + + Var UserSeletedSugar = 1 EndIf @@ -4880,51 +4857,49 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index3 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index2 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index2 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -4949,67 +4924,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index4 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index3 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index2 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index4 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index3 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index2 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5034,67 +5007,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index5 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index4 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index3 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index5 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index4 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index3 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5119,67 +5090,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index6 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index5 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index4 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index6 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index5 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index4 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5191,7 +5160,7 @@ Refresh CustomSweetNotTextX CustomSweetTextY - CustomSweetState[0] + "CustomSweetState[0]" 250 22 @@ -5205,7 +5174,7 @@ Refresh CustomSweetLittleTextX CustomSweetTextY - CustomSweetState[1] + "CustomSweetState[1]" 250 22 @@ -5219,7 +5188,7 @@ Refresh CustomSweetLessTextX CustomSweetTextY - CustomSweetState[2] + "CustomSweetState[2]" 250 22 @@ -5233,7 +5202,7 @@ Refresh CustomSweetPerfectTextX CustomSweetPercentTextY - CustomSweetState[3] + "CustomSweetState[3]" 250 22 @@ -5247,7 +5216,7 @@ Refresh CustomSweetExtraTextX CustomSweetTextY - CustomSweetState[4] + "CustomSweetState[4]" 250 22 @@ -5261,7 +5230,7 @@ Refresh CustomSweetestTextX CustomSweetTextY - CustomSweetState[5] + "CustomSweetState[5]" 250 22 @@ -5479,28 +5448,26 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index1 - - Var UserSeletedSugar = 1 EndIf + Var topping1 = toppingID1index1 + + Var UserSeletedSugar = 1 + EndIf DEBUGVAR topping1 Refresh @@ -5526,51 +5493,49 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index2 EndIf - If ShiftSugarStep = 2 Then - - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index1 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index2 EndIf + + If ShiftSugarStep = 2 Then + + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index1 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5595,51 +5560,49 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index3 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index2 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index2 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5664,67 +5627,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index4 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index3 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index2 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index4 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index3 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index2 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5749,67 +5710,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index5 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index4 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index3 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index5 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index4 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index3 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5834,67 +5793,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index6 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index5 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index4 - EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index6 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index5 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index4 + EndIf + + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5906,7 +5863,7 @@ Refresh CustomSweetNotTextX CustomSweetTextY - CustomSweetState[0] + "CustomSweetState[0]" 250 22 @@ -5920,7 +5877,7 @@ Refresh CustomSweetLittleTextX CustomSweetTextY - CustomSweetState[1] + "CustomSweetState[1]" 250 22 @@ -5934,7 +5891,7 @@ Refresh CustomSweetLessTextX CustomSweetTextY - CustomSweetState[2] + "CustomSweetState[2]" 250 22 @@ -5948,7 +5905,7 @@ Refresh CustomSweetPerfectTextX CustomSweetPercentTextY - CustomSweetState[3] + "CustomSweetState[3]" 250 22 @@ -5962,7 +5919,7 @@ Refresh CustomSweetExtraTextX CustomSweetTextY - CustomSweetState[4] + "CustomSweetState[4]" 250 22 @@ -5976,7 +5933,7 @@ Refresh CustomSweetestTextX CustomSweetTextY - CustomSweetState[5] + "CustomSweetState[5]" 250 22 @@ -6044,42 +6001,40 @@ Refresh Refresh Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index1 EndIf - Var UserSeletedSugar = 1 - Var SugarNormalCheck = "PressForever" - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - EndIf - - DEBUGVAR SugarZeroCalCheck - - TRY "ROOT/taobin_project/xml/function2.inc" + Var topping1 = toppingID1index1 EndIf + + Var UserSeletedSugar = 1 + Var SugarNormalCheck = "PressForever" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + EndIf + + DEBUGVAR SugarZeroCalCheck + + TRY "ROOT/taobin_project/xml/function2.inc" EndIf DEBUGVAR topping1 @@ -6108,64 +6063,62 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index2 EndIf - If ShiftSugarStep = 2 Then - - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; select no sugar - Var SugarNormalCheck = "PressForever" - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - EndIf - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index1 - Else - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - EndIf - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index2 EndIf + + If ShiftSugarStep = 2 Then + + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; select no sugar + Var SugarNormalCheck = "PressForever" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + EndIf + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index1 + Else + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + EndIf + + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -6190,65 +6143,63 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index3 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - ; select no sugar - Var SugarNormalCheck = "PressForever" - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - EndIf - - Var topping1 = toppingID1index2 - Else - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - EndIf - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + ; select no sugar + Var SugarNormalCheck = "PressForever" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + EndIf + + Var topping1 = toppingID1index2 + Else + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + EndIf + + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -6273,83 +6224,81 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index4 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index3 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - ; select no sugar - Var SugarNormalCheck = "PressForever" - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - EndIf - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index2 - Else - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - EndIf - - - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index4 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index3 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + ; select no sugar + Var SugarNormalCheck = "PressForever" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + EndIf + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index2 + Else + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + EndIf + + + + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -6374,72 +6323,70 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index5 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index4 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - Var CustomSweetState[5] = "Enable" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index3 - EndIf - - DEBUGVAR SugarZeroCalCheck - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index5 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index4 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index3 + EndIf + + DEBUGVAR SugarZeroCalCheck + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -6464,71 +6411,69 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" - Var topping1 = toppingID1index6 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index5 - EndIf - - If ShiftSugarStep = 3 Then - - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" - - ; No 2 right steps - If NoSugarStepRight2 = "true" Then - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - Var topping1 = toppingID1index4 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index6 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index5 + EndIf + + If ShiftSugarStep = 3 Then + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" + + ; No 2 right steps + If NoSugarStepRight2 = "true" Then + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + Var topping1 = toppingID1index4 + EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + + Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -6540,7 +6485,7 @@ Refresh CustomSweetNotTextX CustomSweetTextY - CustomSweetState[0] + "CustomSweetState[0]" 250 22 @@ -6554,7 +6499,7 @@ Refresh CustomSweetLittleTextX CustomSweetTextY - CustomSweetState[1] + "CustomSweetState[1]" 250 22 @@ -6568,7 +6513,7 @@ Refresh CustomSweetLessTextX CustomSweetTextY - CustomSweetState[2] + "CustomSweetState[2]" 250 22 @@ -6582,7 +6527,7 @@ Refresh CustomSweetPerfectTextX CustomSweetPercentTextY - CustomSweetState[3] + "CustomSweetState[3]" 250 22 @@ -6596,7 +6541,7 @@ Refresh CustomSweetExtraTextX CustomSweetTextY - CustomSweetState[4] + "CustomSweetState[4]" 250 22 @@ -6610,7 +6555,7 @@ Refresh CustomSweetestTextX CustomSweetTextY - CustomSweetState[5] + "CustomSweetState[5]" 250 22 @@ -6826,20 +6771,17 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index1 - EndIf - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index1 EndIf + Var UserSeletedSugar = 1 EndIf @@ -6868,27 +6810,24 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then + If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - - Var topping1 = toppingID1index2 - EndIf - - - Var UserSeletedSugar = 1 - - TRY "ROOT/taobin_project/xml/function2.inc" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index2 EndIf + + + Var UserSeletedSugar = 1 EndIf + + TRY "ROOT/taobin_project/xml/function2.inc" + @@ -6910,21 +6849,19 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index3 - EndIf + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + Var UserSeletedSugar = 1 EndIf Refresh @@ -6949,21 +6886,19 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index4 - EndIf - Var UserSeletedSugar = 1 + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + + Var topping1 = toppingID1index4 EndIf + Var UserSeletedSugar = 1 EndIf Refresh @@ -7345,36 +7280,33 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - Var CustomSweetState[4] = "Disable" + Var CustomSweetState[4] = "Disable" - EndIf - - Var topping1 = toppingID1index1 EndIf - Var SugarNormalCheck = "PressForever" - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - Var UserSeletedSugar = 1 - TRY "ROOT/taobin_project/xml/function2.inc" + Var topping1 = toppingID1index1 EndIf + Var SugarNormalCheck = "PressForever" + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + Var UserSeletedSugar = 1 + TRY "ROOT/taobin_project/xml/function2.inc" + EndIf @@ -7402,35 +7334,32 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then + If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - Var CustomSweetState[4] = "Disable" + Var CustomSweetState[4] = "Disable" - EndIf - - Var topping1 = toppingID1index2 EndIf - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - - ;Var UserSeletedSugar = 1 + Var topping1 = toppingID1index2 EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + + ;Var UserSeletedSugar = 1 EndIf Refresh @@ -7454,34 +7383,32 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" - Var topping1 = toppingID1index3 EndIf - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - - ;Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + + ;Var UserSeletedSugar = 1 EndIf Refresh @@ -7506,34 +7433,32 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" - Var topping1 = toppingID1index4 EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - ;Var UserSeletedSugar = 1 + + Var topping1 = toppingID1index4 EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + ;Var UserSeletedSugar = 1 EndIf Refresh @@ -7683,20 +7608,17 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index1 + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var UserSeletedSugar = 1 - EndIf + Var topping1 = toppingID1index1 EndIf + Var UserSeletedSugar = 1 Refresh @@ -7723,33 +7645,29 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then + If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index1 - EndIf - - Var UserSeletedSugar = 1 - - TRY "ROOT/taobin_project/xml/function2.inc" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index2 EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index1 + EndIf + + Var UserSeletedSugar = 1 EndIf + TRY "ROOT/taobin_project/xml/function2.inc" @@ -7770,31 +7688,29 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index3 - EndIf + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index2 - EndIf - - - Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index2 + EndIf + + + Var UserSeletedSugar = 1 EndIf Refresh @@ -7819,37 +7735,35 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index4 - EndIf + If ShiftSugarStep = 1 Then - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index3 - EndIf - - If ShiftSugarStep = 3 Then - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index2 - EndIf - - Var UserSeletedSugar = 1 + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index4 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index3 + EndIf + + If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index2 + EndIf + + Var UserSeletedSugar = 1 EndIf @@ -8003,37 +7917,35 @@ Refresh Refresh Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "PressForever" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[0] = "PressForever" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - ar CustomSweetState[4] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + ar CustomSweetState[4] = "Disable" - Var topping1 = toppingID1index1 EndIf - Var SugarNormalCheck = "PressForever" - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - Var UserSeletedSugar = 1 - - TRY "ROOT/taobin_project/xml/function2.inc" + Var topping1 = toppingID1index1 EndIf + + Var SugarNormalCheck = "PressForever" + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + Var UserSeletedSugar = 1 + + TRY "ROOT/taobin_project/xml/function2.inc" EndIf @@ -8060,47 +7972,43 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then + If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - Var CustomSweetState[4] = "Disable" + Var CustomSweetState[4] = "Disable" - EndIf - - Var topping1 = toppingID1index2 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index1 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - Var UserSeletedSugar = 1 - - TRY "ROOT/taobin_project/xml/function2.inc" + Var topping1 = toppingID1index2 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "PressForever" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index1 + EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf + TRY "ROOT/taobin_project/xml/function2.inc" @@ -8121,42 +8029,40 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + If ShiftSugarStep = 1 Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" - Var topping1 = toppingID1index3 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index2 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - ;Var UserSeletedSugar = 1 + Var topping1 = toppingID1index3 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "PressForever" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index2 + EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + ;Var UserSeletedSugar = 1 EndIf Refresh @@ -8181,50 +8087,48 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ButtonConfirmOrderState = "Disable" Then - Else - If ShiftSugarStep = 1 Then - Var CustomSweetState[0] = "Enable" - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" + If ShiftSugarStep = 1 Then - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[4] = "Disable" + ; No 2 right steps + If NoSugarStepRight2 = "true" Then - EndIf + Var CustomSweetState[4] = "Disable" - Var topping1 = toppingID1index4 EndIf - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index3 - EndIf - - If ShiftSugarStep = 3 Then - Var CustomSweetState[3] = "PressForever" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "Enable" - Var topping1 = toppingID1index2 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - ;Var UserSeletedSugar = 1 + Var topping1 = toppingID1index4 EndIf + + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index3 + EndIf + + If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index2 + EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + ;Var UserSeletedSugar = 1 EndIf @@ -10804,7 +10708,7 @@ Refresh 700 72 - 002027 + 000102 @@ -10827,7 +10731,7 @@ Refresh Var ShotCoffeePremium = "Press" EndIf - TRY "ROOT/taobin_project/xml/function2.inc" + Function 2 Refresh @@ -10853,7 +10757,7 @@ Refresh Var ShotCoffeePremium = "Press" EndIf - TRY "ROOT/taobin_project/xml/function2.inc" + Function 2 Refresh diff --git a/xml/topview2.xml b/xml/topview2.xml index 137a0382..30b5cde0 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -182,7 +182,7 @@ If str_openfile_xml_0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Then If str_openfile_xml_2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then Var CountUpForProjectThisFileStruct = CountUpForProjectThisFileStruct + 1 - DEBUGVAR CountUpForProjectThisFileStruct + ;DEBUGVAR CountUpForProjectThisFileStruct EndIf EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 633415fe..bb26536b 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.11" - Var XMLPageVersionInt = 1011 + Var XMLPageVersion = "10.12" + Var XMLPageVersionInt = 1012 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index 57bb0685..eef68cc1 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "11.11" - Var XMLPageVersionInt = 1111 + Var XMLPageVersion = "11.12" + Var XMLPageVersionInt = 1112 ;Oreo Var OreoGuarantee = 0