diff --git a/inter/gbr/xml/page_payment_with_ukb.lxml b/inter/gbr/xml/page_payment_with_ukb.lxml index 45772554..31a6b74b 100644 --- a/inter/gbr/xml/page_payment_with_ukb.lxml +++ b/inter/gbr/xml/page_payment_with_ukb.lxml @@ -85,7 +85,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -107,7 +107,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -129,7 +129,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -151,7 +151,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -173,7 +173,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -195,7 +195,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -217,7 +217,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -239,7 +239,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -261,7 +261,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -283,7 +283,7 @@ Refresh StrLen UKBMemberID IDNumLen - If IDNumLen >= MAX_UKB_CODE Then + If IDNumLen >= MIN_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf diff --git a/inter/gbr/xml/page_topping_select6.lxml b/inter/gbr/xml/page_topping_select6.lxml index 1485b380..1db599e5 100644 --- a/inter/gbr/xml/page_topping_select6.lxml +++ b/inter/gbr/xml/page_topping_select6.lxml @@ -6741,16 +6741,16 @@ - - LidDeactiveButton - 602 - 144 - 290 - 72 - - 000091 - - +; +; LidDeactiveButton +; 602 +; 144 +; 290 +; 72 +; +; 000091 +; +; diff --git a/xml/page_payment_cash-GBR.xml b/xml/page_payment_cash-GBR.xml index 8938b3d5..f2db0a4b 100644 --- a/xml/page_payment_cash-GBR.xml +++ b/xml/page_payment_cash-GBR.xml @@ -17,6 +17,7 @@ Var ErrorCause = "" Var MAX_UKB_CODE = 6 + Var MIN_UKB_CODE = 5 Var PreScaleCanculate = 100 @@ -1454,7 +1455,14 @@ DEBUGVAR textLen - If textLen = MAX_UKB_CODE Then + Var validTextLength = "false" + If textLen >= MIN_UKB_CODE Then + If textLen <= MAX_UKB_CODE Then + Var validTextLength = "true" + EndIf + EndIf + + If validTextLength = "true" Then Var UKBMemberID = scanmsg diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 2cd9986c..87e6ccc7 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -4746,26 +4746,29 @@ 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 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[5] = "Disable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + EndIf + Var topping1 = toppingID1index1 + Var SugarZeroCalOption = "Invisible" + Var UserSeletedSugar = 1 EndIf - - Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalOption = "Invisible" - Var UserSeletedSugar = 1 + Refresh @@ -4792,46 +4795,49 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ShiftSugarStep = 1 Then + 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" + 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 topping1 = toppingID1index2 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + + Var UserSeletedSugar = 1 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 @@ -4856,49 +4862,51 @@ 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" - 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 - ; 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "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 CustomSweetState[2] = "PressForever" + 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 - Var topping1 = toppingID1index2 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -4923,65 +4931,67 @@ 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 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 - ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - 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 CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[3] = "PressForever" - 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 - Var topping1 = toppingID1index2 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5006,65 +5016,67 @@ 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" - 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 - ; 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 = toppingID1index5 EndIf - Var topping1 = toppingID1index5 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "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 - ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5089,65 +5101,67 @@ 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" - 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 - ; 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 = toppingID1index6 EndIf - Var topping1 = toppingID1index6 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" + ; 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 = toppingID1index5 EndIf - Var topping1 = toppingID1index5 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" + ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5159,7 +5173,7 @@ Refresh CustomSweetNotTextX CustomSweetTextY - "CustomSweetState[0]" + CustomSweetState[0] 250 22 @@ -5173,7 +5187,7 @@ Refresh CustomSweetLittleTextX CustomSweetTextY - "CustomSweetState[1]" + CustomSweetState[1] 250 22 @@ -5187,7 +5201,7 @@ Refresh CustomSweetLessTextX CustomSweetTextY - "CustomSweetState[2]" + CustomSweetState[2] 250 22 @@ -5201,7 +5215,7 @@ Refresh CustomSweetPerfectTextX CustomSweetPercentTextY - "CustomSweetState[3]" + CustomSweetState[3] 250 22 @@ -5215,7 +5229,7 @@ Refresh CustomSweetExtraTextX CustomSweetTextY - "CustomSweetState[4]" + CustomSweetState[4] 250 22 @@ -5229,7 +5243,7 @@ Refresh CustomSweetestTextX CustomSweetTextY - "CustomSweetState[5]" + CustomSweetState[5] 250 22 @@ -5447,26 +5461,28 @@ 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 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[5] = "Disable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + EndIf + Var topping1 = toppingID1index1 + + Var UserSeletedSugar = 1 EndIf - Var topping1 = toppingID1index1 - - Var UserSeletedSugar = 1 - EndIf DEBUGVAR topping1 Refresh @@ -5492,49 +5508,51 @@ 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" - 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 - ; 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 - Var topping1 = toppingID1index2 - EndIf + If ShiftSugarStep = 2 Then - 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 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 = toppingID1index1 EndIf - Var topping1 = toppingID1index1 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5559,49 +5577,51 @@ 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" - 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 - ; 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "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 CustomSweetState[2] = "PressForever" + 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 - Var topping1 = toppingID1index2 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5626,65 +5646,67 @@ 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 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 - ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - 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 CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "PressForever" - 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[3] = "PressForever" - 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 - Var topping1 = toppingID1index2 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5709,65 +5731,67 @@ 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" - 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 - ; 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 = toppingID1index5 EndIf - Var topping1 = toppingID1index5 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "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 - ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5792,65 +5816,67 @@ 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" - 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 - ; 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 = toppingID1index6 EndIf - Var topping1 = toppingID1index6 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" + ; 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 = toppingID1index5 EndIf - Var topping1 = toppingID1index5 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" + ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf - - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -5862,7 +5888,7 @@ Refresh CustomSweetNotTextX CustomSweetTextY - "CustomSweetState[0]" + CustomSweetState[0] 250 22 @@ -5876,7 +5902,7 @@ Refresh CustomSweetLittleTextX CustomSweetTextY - "CustomSweetState[1]" + CustomSweetState[1] 250 22 @@ -5890,7 +5916,7 @@ Refresh CustomSweetLessTextX CustomSweetTextY - "CustomSweetState[2]" + CustomSweetState[2] 250 22 @@ -5904,7 +5930,7 @@ Refresh CustomSweetPerfectTextX CustomSweetPercentTextY - "CustomSweetState[3]" + CustomSweetState[3] 250 22 @@ -5918,7 +5944,7 @@ Refresh CustomSweetExtraTextX CustomSweetTextY - "CustomSweetState[4]" + CustomSweetState[4] 250 22 @@ -5932,7 +5958,7 @@ Refresh CustomSweetestTextX CustomSweetTextY - "CustomSweetState[5]" + CustomSweetState[5] 250 22 @@ -6000,40 +6026,42 @@ Refresh Refresh Else + If ButtonConfirmOrderState = "Disable" Then + Else + If ShiftSugarStep = 1 Then - 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 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[5] = "Disable" - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" + EndIf + Var topping1 = toppingID1index1 EndIf - Var topping1 = toppingID1index1 - EndIf + Var UserSeletedSugar = 1 + Var SugarNormalCheck = "PressForever" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then - Var UserSeletedSugar = 1 - Var SugarNormalCheck = "PressForever" - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" + Else + Var SugarZeroCalCheck = "Disable" + EndIf EndIf + + DEBUGVAR SugarZeroCalCheck + + TRY "ROOT/taobin_project/xml/function2.inc" EndIf - - DEBUGVAR SugarZeroCalCheck - - TRY "ROOT/taobin_project/xml/function2.inc" EndIf DEBUGVAR topping1 @@ -6062,62 +6090,64 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" 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 - - 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" - - ; 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 + If ButtonConfirmOrderState = "Disable" Then Else - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + 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 + + 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" + + ; 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 - EndIf - Var UserSeletedSugar = 1 + Var UserSeletedSugar = 1 + EndIf EndIf DEBUGVAR topping1 @@ -6142,63 +6172,65 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" 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 - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - 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 + If ButtonConfirmOrderState = "Disable" Then Else - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + 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 + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + 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 - EndIf - Var UserSeletedSugar = 1 + Var UserSeletedSugar = 1 + EndIf EndIf DEBUGVAR topping1 @@ -6223,81 +6255,83 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" 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 - - Var CustomSweetState[4] = "Disable" - Var CustomSweetState[5] = "Disable" - - EndIf - - 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 + If ButtonConfirmOrderState = "Disable" Then Else - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + 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 + + Var CustomSweetState[4] = "Disable" + Var CustomSweetState[5] = "Disable" + + EndIf + + 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 - - - - Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -6322,70 +6356,72 @@ 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" - 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 - ; 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 = toppingID1index5 EndIf - Var topping1 = toppingID1index5 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "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 - ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "PressForever" + Var CustomSweetState[5] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "PressForever" - 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 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 - EndIf - - DEBUGVAR SugarZeroCalCheck - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + DEBUGVAR SugarZeroCalCheck + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf EndIf - EndIf - Var UserSeletedSugar = 1 + Var UserSeletedSugar = 1 + EndIf EndIf DEBUGVAR topping1 @@ -6410,69 +6446,71 @@ 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" - 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 - ; 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 = toppingID1index6 EndIf - Var topping1 = toppingID1index6 - EndIf + If ShiftSugarStep = 2 Then + Var CustomSweetState[1] = "Enable" - If ShiftSugarStep = 2 Then - Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[2] = "Enable" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" + ; 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 = toppingID1index5 EndIf - Var topping1 = toppingID1index5 - EndIf + If ShiftSugarStep = 3 Then - If ShiftSugarStep = 3 Then + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "PressForever" - Var CustomSweetState[3] = "Enable" - Var CustomSweetState[4] = "Enable" - Var CustomSweetState[5] = "PressForever" + ; 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 = toppingID1index4 EndIf - Var topping1 = toppingID1index4 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf EndIf - EndIf - Var UserSeletedSugar = 1 + Var UserSeletedSugar = 1 + EndIf EndIf DEBUGVAR topping1 @@ -6484,7 +6522,7 @@ Refresh CustomSweetNotTextX CustomSweetTextY - "CustomSweetState[0]" + CustomSweetState[0] 250 22 @@ -6498,7 +6536,7 @@ Refresh CustomSweetLittleTextX CustomSweetTextY - "CustomSweetState[1]" + CustomSweetState[1] 250 22 @@ -6512,7 +6550,7 @@ Refresh CustomSweetLessTextX CustomSweetTextY - "CustomSweetState[2]" + CustomSweetState[2] 250 22 @@ -6526,7 +6564,7 @@ Refresh CustomSweetPerfectTextX CustomSweetPercentTextY - "CustomSweetState[3]" + CustomSweetState[3] 250 22 @@ -6540,7 +6578,7 @@ Refresh CustomSweetExtraTextX CustomSweetTextY - "CustomSweetState[4]" + CustomSweetState[4] 250 22 @@ -6554,7 +6592,7 @@ Refresh CustomSweetestTextX CustomSweetTextY - "CustomSweetState[5]" + CustomSweetState[5] 250 22 @@ -6770,17 +6808,20 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" 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 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" - Var topping1 = toppingID1index1 + Var topping1 = toppingID1index1 + EndIf + Var UserSeletedSugar = 1 EndIf - Var UserSeletedSugar = 1 EndIf @@ -6809,24 +6850,27 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ShiftSugarStep = 1 Then + 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" + 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 topping1 = toppingID1index2 EndIf - - - Var UserSeletedSugar = 1 EndIf - - TRY "ROOT/taobin_project/xml/function2.inc" - @@ -6848,19 +6892,21 @@ 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" - 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 - Var topping1 = toppingID1index3 + Var UserSeletedSugar = 1 EndIf - - Var UserSeletedSugar = 1 EndIf Refresh @@ -6885,19 +6931,21 @@ 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] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - 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 + Var topping1 = toppingID1index4 + EndIf + Var UserSeletedSugar = 1 EndIf - Var UserSeletedSugar = 1 EndIf Refresh @@ -7279,32 +7327,35 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" 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 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" - ; 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 topping1 = toppingID1index1 - EndIf + Var SugarNormalCheck = "PressForever" + If SugarZeroCalCheck = "Disable2" Then - Var SugarNormalCheck = "PressForever" - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" + Else + Var SugarZeroCalCheck = "Disable" + EndIf + Var UserSeletedSugar = 1 + TRY "ROOT/taobin_project/xml/function2.inc" EndIf - Var UserSeletedSugar = 1 - TRY "ROOT/taobin_project/xml/function2.inc" EndIf @@ -7333,32 +7384,35 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ShiftSugarStep = 1 Then + 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" + 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 - Var topping1 = toppingID1index2 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf EndIf + + ;Var UserSeletedSugar = 1 EndIf - - ;Var UserSeletedSugar = 1 EndIf Refresh @@ -7382,32 +7436,34 @@ 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" - 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 - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[4] = "Disable" - Var CustomSweetState[4] = "Disable" + EndIf + Var topping1 = toppingID1index3 EndIf - Var topping1 = toppingID1index3 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf EndIf - EndIf - ;Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 + EndIf EndIf Refresh @@ -7432,32 +7488,34 @@ 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] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - 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 - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[4] = "Disable" - Var CustomSweetState[4] = "Disable" + EndIf + Var topping1 = toppingID1index4 EndIf - - Var topping1 = toppingID1index4 - EndIf - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalCheck = "Disable" Then - Var SugarZeroCalCheck = "Enable" + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf EndIf + ;Var UserSeletedSugar = 1 EndIf - ;Var UserSeletedSugar = 1 EndIf Refresh @@ -7607,17 +7665,20 @@ 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 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 topping1 = toppingID1index1 + Var UserSeletedSugar = 1 + EndIf EndIf - Var UserSeletedSugar = 1 Refresh @@ -7644,29 +7705,33 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ShiftSugarStep = 1 Then + 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" - 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 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 + Var UserSeletedSugar = 1 + + TRY "ROOT/taobin_project/xml/function2.inc" + EndIf EndIf - TRY "ROOT/taobin_project/xml/function2.inc" @@ -7687,29 +7752,31 @@ 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" - 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 - Var topping1 = toppingID1index3 + 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 - - 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 @@ -7734,35 +7801,37 @@ 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] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + Var topping1 = toppingID1index4 + EndIf - 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 + 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 - - 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 @@ -7916,35 +7985,37 @@ Refresh Refresh Else + If ButtonConfirmOrderState = "Disable" Then + Else + If ShiftSugarStep = 1 Then - 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 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 + ar CustomSweetState[4] = "Disable" - ar CustomSweetState[4] = "Disable" + EndIf + Var topping1 = toppingID1index1 EndIf - Var topping1 = toppingID1index1 + Var SugarNormalCheck = "PressForever" + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + Var UserSeletedSugar = 1 + + TRY "ROOT/taobin_project/xml/function2.inc" EndIf - - Var SugarNormalCheck = "PressForever" - If SugarZeroCalCheck = "Disable2" Then - - Else - Var SugarZeroCalCheck = "Disable" - EndIf - Var UserSeletedSugar = 1 - - TRY "ROOT/taobin_project/xml/function2.inc" EndIf @@ -7971,43 +8042,47 @@ Refresh SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else - If ShiftSugarStep = 1 Then + 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" + 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 - 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" + 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" EndIf - Var UserSeletedSugar = 1 EndIf - TRY "ROOT/taobin_project/xml/function2.inc" @@ -8028,40 +8103,42 @@ 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" - 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 - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[4] = "Disable" - Var CustomSweetState[4] = "Disable" + EndIf + Var topping1 = toppingID1index3 EndIf - 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" + 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 - ;Var UserSeletedSugar = 1 EndIf Refresh @@ -8086,48 +8163,50 @@ 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] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "PressForever" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" - 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 - ; No 2 right steps - If NoSugarStepRight2 = "true" Then + Var CustomSweetState[4] = "Disable" - Var CustomSweetState[4] = "Disable" + EndIf + Var topping1 = toppingID1index4 EndIf - 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" + 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 - ;Var UserSeletedSugar = 1 EndIf @@ -10707,7 +10786,7 @@ Refresh 700 72 - 000102 + 002027 @@ -10730,7 +10809,7 @@ Refresh Var ShotCoffeePremium = "Press" EndIf - Function 2 + TRY "ROOT/taobin_project/xml/function2.inc" Refresh @@ -10756,7 +10835,7 @@ Refresh Var ShotCoffeePremium = "Press" EndIf - Function 2 + TRY "ROOT/taobin_project/xml/function2.inc" Refresh diff --git a/xml/vending_info.xml b/xml/vending_info.xml index ee7fd190..ba988f0c 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -15,7 +15,7 @@ DEBUGVAR GetFreeFromError DEBUGVAR FailErrorHappend - + Var info_startX = 11 Var info_1Y = 250 Var info_2Y = 320 @@ -187,7 +187,8 @@ DEBUGVAR FrontDoorVersionInt - If FrontDoorVersionInt > 2000 Then + ; front_more_than_20000 + If FrontDoorVersionInt > 19999 Then Var EnableTestRGB = "Enable" Else Var EnableTestRGB = "Invisible" @@ -339,7 +340,7 @@ "ROOT/taobin_project/image/tab_1.png" If CountTouchButton = 4 Then - + Var TimeOutSmoothiesProcess = 181 Var SelectDrink = "12-00-07-0000" Var Seeker.selected_a_drink = SelectDrink diff --git a/xml/vending_info2.xml b/xml/vending_info2.xml index 1eec9f6a..cf914675 100644 --- a/xml/vending_info2.xml +++ b/xml/vending_info2.xml @@ -183,6 +183,21 @@ Var sleepmodeEnable = "false" + Var AlphaState = "Invisible" + + If NewUiBSM = "" Then + Var NewUiBSM = "Offline" + EndIf + + If EnableBrewIPC = "" Then + Var EnableBrewIPC = "false" + EndIf + + + If EnableBrewIPC = "true" Then + StartBrewNewUiLoginService + EndIf + 1000 @@ -190,11 +205,35 @@ DEBUGVAR Timeout DEBUGVAR WhileRetryCounter + DEBUGVAR NewUiBSM + + If WaitPopup = "Enable" Then + Var AlphaState = "Enable" + Else + If FailPopup = "Enable" Then + Var AlphaState = "Enable" + EndIf + EndIf + + If AlphaState = "Enable" Then + If Timeout > 10 Then + Var AlphaState = "Invisible" + Var alphaPasswordPromptWithKeyboard = "Invisible" + Var PassPhrase = "" + Var HiddenPassPhrase = "" + EndIf + EndIf If alphaPasswordPromptWithKeyboard = "Enable" Then - Var Timeout = 0 + + If AlphaState = "Enable" Then + SAVELOG "Wait for password v2" + Var Timeout = Timeout + 1 + Else + Var Timeout = 0 + EndIf Else Var Timeout = Timeout + 1 EndIf @@ -217,6 +256,8 @@ Var alphaPasswordPromptWithKeyboard = "Invisible" Var alphaPasswordPrompt = "Invisible" + Var AlphaState = "Invisible" + Var tmpPassPhrase = PassPhrase DEBUGVAR tmpPassPhrase @@ -508,24 +549,24 @@ SignalStrengthLevel - +;