From 23813b824e34c05be34968db508161ac1d7d83b1 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 16 Feb 2024 11:28:49 +0700 Subject: [PATCH] AUS: Add sugar zero cal --- .../bg_sugar_with_0_cal_option.png | Bin 0 -> 3831 bytes image/topping_inter/radio_checked.png | Bin 0 -> 2020 bytes image/topping_inter/radio_unchecked.png | Bin 0 -> 1231 bytes inter/aus/menu/lang.tsv | 9 + inter/aus/xml/page_topping_select6.lxml | 1463 ++++++++++++++++- xml/page_board.xml | 17 +- xml/page_topping_select7.xml | 51 +- 7 files changed, 1511 insertions(+), 29 deletions(-) create mode 100644 image/topping_inter/bg_sugar_with_0_cal_option.png create mode 100644 image/topping_inter/radio_checked.png create mode 100644 image/topping_inter/radio_unchecked.png diff --git a/image/topping_inter/bg_sugar_with_0_cal_option.png b/image/topping_inter/bg_sugar_with_0_cal_option.png new file mode 100644 index 0000000000000000000000000000000000000000..28eef90988f8e1e7762fa53e657ff0b097116d3d GIT binary patch literal 3831 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 f z)EJG9jF4rG(4&X<>E7*IH2Px1J85^mL}w+qt94^Ul8BOHv7djbSJzS|RS2Fxc}#=- zy>#>1pgVDrnB>-&*-ga~+}Rr0M~>A%Xw6@L(?Yh~TmVbmh(cpcjp!?8ER>2&@c2~IYToM+|_2R z z(Z`Cd6tImsFtC%LqX@!!Xkoo_#NAB5+~5GrOWFIc<6;@cFU(wNxCDii5wsez62u6Q`q5ON_@H4@uZ+I^OGU;E4esw z;buyLWG!4A!p*{J{}5adwDU@2=^&`~8#meX13X-GjeHIeR5@76&dYoO4;M=lBy56X z{vl{h>X#%em_QHW#xIx@SYlX{l6uj7{`4{V1;dW9q@aW*HQR!ahJL}&B$v46D1HlO z9rl5npRp&w1+o;})HcJFf-bZkDOfRFz1(Ye1jW%Pf|(SVXhG1kg31oe?HWlVvE6PN zQPZ@zdZ4U$`s8t{6fUu#2ZW$*w=9x9NiyRU<;FrBX3bni3|_X&B0}wbw)Ng42rF_h zsuz9ddsHo@T(F#Sh(bPto*ape&aOXm$4r~eq{jsYCh+0m{d-Fi zlZd&aY&k_vh&YNz(~bLJ`E5t5VRBZh)D_g$udJE%IcDB)DRzqNamH@#=roO)#?M~B zM7>5zRdsNQLY@|?06_?=)N>f9McKZ`G(YrRUL{~u9x}YpndranGiVqnK_wIQY9$%G zC19j)$dHhP;B56C0I*sn$YscB>VZWO%q7aAy4kg80kCkSW&&j9L#!x*UO-fH16f#W tlU3?4`!|FToCr%wAe}?TRP5gn?*RN?(q_b$WJv%3002ovPDHLkV1g$|LW%$Y literal 0 HcmV?d00001 diff --git a/inter/aus/menu/lang.tsv b/inter/aus/menu/lang.tsv index e13631bf..6aef785f 100644 --- a/inter/aus/menu/lang.tsv +++ b/inter/aus/menu/lang.tsv @@ -81,8 +81,17 @@ TextID Note English Thai 000065 Sweetness level ระดับความหวาน 000066 Straw and Lid หลอด และ ฝา 000067 Drink Type ประเภทเครื่องดื่ม + + 000103 Vegan substitution นมทางเลือก + Font=Kanit,Type=Regular,Size=28,Color=0x513C2F +000105 Sugar น้ำตาล + Font=Kanit,Type=Regular,Size=23,Color=0x513C2F +000106 0 cal sugar syrup น้ำตาล 0 cal + Font=Kanit,Type=Light,Size=14,Color=0x5A5A5A +000107 Diabetes-friendly and keto-approved as it does not cause any fluctuations in blood sugar levels. ไม่มีผลต่อน้ำตาลในเลือด คีโต และ เบาหวานทานได้ + Text Font=Kanit,Type=Regular,Size=36,Color=0x513C2F 000070 I want a straw รับหลอด diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml index 754fd8ea..225c1752 100644 --- a/inter/aus/xml/page_topping_select6.lxml +++ b/inter/aus/xml/page_topping_select6.lxml @@ -68,6 +68,12 @@ Var ShotCoffeePremium = "Invisible" Var showOreoAddEnable = "Invisible" + +; Sugar Zero Cal + ; Test Sugar Zero Cal + ;Var SugarZeroCalEnable = "true" + Var SugarZeroCalOption = "Invisible" + Var BGSugarHotHealthy = "Invisible" Var BGSugarColdHealthy = "Invisible" @@ -106,6 +112,7 @@ Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 + Var SugarZeroCalPrice_X = 540 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -120,6 +127,7 @@ Var topping_shot_price_x = 600 Var text_x_add_oreo_price = 490 Var text_show_normal_x = 386 + Var SugarZeroCalPrice_X = 482 EndIf @@ -474,6 +482,7 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Var text_show_blend_x = 872 + Var SugarZeroCalPrice_X = 540 Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf If LanguageShow = "THAI" Then @@ -481,6 +490,7 @@ Var text_x_add_oreo_price = 490 Var text_show_normal_x = 386 Var text_show_blend_x = 852 + Var SugarZeroCalPrice_X = 482 Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf If LanguageShow = "MALAY" Then @@ -488,6 +498,7 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Var text_show_blend_x = 872 + Var SugarZeroCalPrice_X = 540 Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf @@ -534,6 +545,7 @@ DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER + DEBUGVAR MAT_ID_511215 DEBUGVAR TOPPING1 @@ -775,7 +787,7 @@ ; Suger 4 step cold If TOPPING1 = "Suger 4 step cold" Then - + Var SugarZeroCalOption = "Enable" Var BGSugar = "Invisible" @@ -788,6 +800,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -807,12 +820,13 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var SugarZeroCalOption = "Invisible" EndIf EndIf ; Suger 4 step hot If TOPPING1 = "Suger 4 step hot" Then - + Var SugarZeroCalOption = "Enable" Var BGSugar = "Invisible" @@ -825,6 +839,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -844,13 +859,14 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var SugarZeroCalOption = "Invisible" EndIf EndIf DEBUGVAR RecipeTag2 ; If TOPPING1 = "Sugar" Then - + Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -868,6 +884,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -892,12 +909,14 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var SugarZeroCalOption = "Invisible" EndIf EndIf If TOPPING1 = "Powder Sugar" Then + Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" @@ -919,6 +938,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -943,6 +963,7 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var SugarZeroCalOption = "Invisible" EndIf DEBUGVAR toppingID1Default @@ -951,7 +972,8 @@ If TOPPING1 = "Sugar Premix 25" Then - + Var SugarZeroCalOption = "Enable" + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -995,6 +1017,7 @@ EndIf If TOPPING1 = "Powder Sugar Premix 50" Then + Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" @@ -1036,6 +1059,8 @@ EndIf If TOPPING1 = "Powder Sugar Premix 25" Then + Var SugarZeroCalOption = "Enable" + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -1093,7 +1118,24 @@ Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf - + + ; Sugar Zero Cal + DEBUGVAR SugarZeroCalEnable + If SugarZeroCalEnable = "true" Then + + Var SugarZeroCalPrice = 50 + Var priceFormat = "(+%.2f)" + Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow) + + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalCheck = "Enable" + Else + Var SugarZeroCalOption = "Invisible" + EndIf + + If MAT_ID_511215 = "Disable" Then + Var SugarZeroCalOption = "Invisible" + EndIf Var ShowCollagenOnly = "Enable" @@ -1740,7 +1782,18 @@ 988 156 20 - BGSugarNew + eval( + If SugarZeroCalOption = "Enable" Then + Var return = "Invisible" + Else + If BGSugarNew = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + EndIf +) + ; sugar layout "Enable" @@ -1790,6 +1843,7 @@ Var topping1 = toppingID1index1 EndIf + Var SugarZeroCalOption = "Invisible" Var UserSeletedSugar = 1 EndIf @@ -1853,6 +1907,15 @@ Var topping1 = toppingID1index1 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -1914,6 +1977,14 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -1983,6 +2054,15 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -2051,6 +2131,15 @@ Var topping1 = toppingID1index3 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -2119,6 +2208,15 @@ Var topping1 = toppingID1index4 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -2164,7 +2262,18 @@ 988 156 20 - BGSugarHotHealthy + eval( + If SugarZeroCalOption = "Enable" Then + Var return = "Invisible" + Else + If BGSugarHotHealthy = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + EndIf +) + ; sugar layout BGSugarHotHealthy @@ -2212,6 +2321,7 @@ Var topping1 = toppingID1index1 EndIf + Var SugarZeroCalOption = "Invisible" Var UserSeletedSugar = 1 EndIf @@ -2263,6 +2373,14 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -2313,6 +2431,14 @@ Var topping1 = toppingID1index3 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -2362,6 +2488,14 @@ Var topping1 = toppingID1index4 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -2408,7 +2542,18 @@ 988 156 20 - BGSugarColdHealthy + eval( + If SugarZeroCalOption = "Enable" Then + Var return = "Invisible" + Else + If BGSugarColdHealthy = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + EndIf +) + ; sugar layout BGSugarColdHealthy @@ -2455,6 +2600,7 @@ Var topping1 = toppingID1index1 EndIf + Var SugarZeroCalOption = "Invisible" ;Var UserSeletedSugar = 1 EndIf @@ -2507,6 +2653,14 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -2557,6 +2711,14 @@ Var topping1 = toppingID1index3 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -2606,7 +2768,14 @@ Var topping1 = toppingID1index4 EndIf - + If SugarZeroCalEnable = "true" Then + If MAT_ID_511215 = "Disable" Then + Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -2648,9 +2817,1264 @@ ; ; ; + +;-BEGIN Sugar zero cal 6 level + + + 988 + 214 + 20 + eval( + If SugarZeroCalOption = "Enable" Then + If BGSugarNew = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + Else + Var return = "Invisible" + EndIf +) + +; sugar layout + + BGSugarNew + "ROOT/taobin_project/image/topping_inter/bg_sugar_with_0_cal_option.png" + + + + 40 + 10 + 500 + 72 + + 000065 + + + + +; Normal Sugar + + +; Sugar Zero Cal + + + + 92 + 75 + 150 + 34 + + 000105 + + + + + 171 + 75 + 100 + 34 + KanitRegularTTF + 28 + 0x84776F + "(Free)" + + + + 357 + 69 + 250 + 34 + + 000106 + + + + + 357 + 96 + 600 + 21 + + 000107 + + + + + SugarZeroCalPrice_X + 67 + KanitRegularTTF + "Enable" + 28 + 0x84776F + SugarZeroCalPriceStr + + + ; +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + +; sugar6 + +;- END topping1 + + ; +;-BEGIN Sugar zero cal 4 level hot + + + 988 + 214 + 20 + eval( + If SugarZeroCalOption = "Enable" Then + If BGSugarHotHealthy = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + Else + Var return = "Invisible" + EndIf +) + +; sugar layout + + BGSugarHotHealthy + "ROOT/taobin_project/image/topping_inter/bg_sugar_with_0_cal_option.png" + + + + 40 + 10 + 500 + 72 + + 000065 + + + + +; Normal Sugar + + +; Sugar Zero Cal + + + + 92 + 75 + 150 + 34 + + 000105 + + + + + 171 + 75 + 100 + 34 + KanitRegularTTF + 28 + 0x84776F + "(Free)" + + + + 357 + 69 + 250 + 34 + + 000106 + + + + + 357 + 96 + 600 + 21 + + 000107 + + + + + SugarZeroCalPrice_X + 67 + KanitRegularTTF + "Enable" + 28 + 0x84776F + SugarZeroCalPriceStr + + +; +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +;- END topping2 + + + +; +;-BEGIN Sugar zero cal 4 level cold + + + 988 + 214 + 20 + eval( + If SugarZeroCalOption = "Enable" Then + If BGSugarColdHealthy = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + Else + Var return = "Invisible" + EndIf +) + +; sugar layout + + BGSugarColdHealthy + "ROOT/taobin_project/image/topping_inter/bg_sugar_with_0_cal_option.png" + + + + 40 + 10 + 500 + 72 + + 000065 + + + + +; Normal Sugar + + +; Sugar Zero Cal + + + + 92 + 75 + 150 + 34 + + 000105 + + + + + 171 + 75 + 100 + 34 + KanitRegularTTF + 28 + 0x84776F + "(Free)" + + + + 357 + 69 + 250 + 34 + + 000106 + + + + + 357 + 96 + 600 + 21 + + 000107 + + + + + SugarZeroCalPrice_X + 67 + KanitRegularTTF + "Enable" + 28 + 0x84776F + SugarZeroCalPriceStr + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +;- END topping2 + ;-BEGIN milk choice @@ -3603,6 +5027,19 @@ ; Set drink + ; Post Topping + If SugarZeroCalEnable = "true" Then + Var sugarToppingID = 511000 + If SugarZeroCalCheck = "PressForever" Then + Var sugarToppingID = 511001 + Else + Var sugarToppingID = 511000 + EndIf + + Topping "PostTopping1-ID" sugarToppingID + + EndIf + If Seeker = "curr" Then Topping "Select" UserSelectProductCode @@ -3964,6 +5401,14 @@ Var DisableUsingCode = "false" EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalOption = "Enable" Then + If SugarZeroCalCheck = "PressForever" Then + Var TOPPING_PRICE = TOPPING_PRICE + SugarZeroCalPrice + EndIf + EndIf + EndIf DEBUGVAR OatMilkEnable DEBUGVAR MenuCodeName1 diff --git a/xml/page_board.xml b/xml/page_board.xml index 0b6e80dd..6e3beb64 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -208,6 +208,8 @@ EndIf + DEBUGVAR MaterialAvailable + STRCONTAIN "9501" MaterialAvailable TaobinOnline STRCONTAIN "9505" MaterialAvailable TermTemOnline @@ -224,10 +226,7 @@ STRCONTAIN "1213" MaterialAvailable PeachSyrupEnable STRCONTAIN "1211" MaterialAvailable BananaSyrupEnable - STRCONTAIN "1214" MaterialAvailable SugarZeroCalEnable - - - Var MenuKidEnable = "false" + STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable ;Var AppFastEnable = "false" If AppFastEnable = "true" Then @@ -811,6 +810,8 @@ DEBUGVAR EnableCreditCard + STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable + EndIf If CountryName = "Indonesia" Then @@ -831,6 +832,8 @@ Var XButtonMember = 212 Var YButtonMember = 1695 + + STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable EndIf If CountryName = "Australia" Then @@ -872,6 +875,8 @@ LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/aus/menu/lang.tsv" EndIf + DEBUGVAR MaterialAvailable + STRCONTAIN "511215" MaterialAvailable SugarZeroCalEnable EndIf If CountryName = "USANewYork" Then @@ -913,6 +918,8 @@ LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/menu/lang.tsv" EndIf + STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable + EndIf @@ -954,6 +961,8 @@ LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/menu/lang.tsv" EndIf + STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable + EndIf DEBUGVAR InternationalEnable diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 068ad41d..2c20d62d 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -912,7 +912,7 @@ DEBUGVAR MAT_ID_9701 DEBUGVAR MAT_ID_9601 - DEBUGVAR MAT_ID_1214 + DEBUGVAR MAT_ID_1215 DEBUGVAR SubMenuProductCode1 @@ -1926,7 +1926,7 @@ EndIf - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Var SugarZeroCalOption = "Invisible" EndIf @@ -3141,8 +3141,10 @@ If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3214,8 +3216,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3301,8 +3305,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3388,8 +3394,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3475,8 +3483,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3618,8 +3628,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3664,8 +3676,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3712,8 +3726,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3858,8 +3874,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3907,8 +3925,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -3955,8 +3975,10 @@ EndIf If SugarZeroCalEnable = "true" Then - If MAT_ID_1214 = "Disable" Then + If MAT_ID_1215 = "Disable" Then Else + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var SugarZeroCalOption = "Enable" EndIf EndIf @@ -4991,7 +5013,6 @@ Var topping1 = toppingID1index2 EndIf - Var SugarZeroCalOption = "Enable" Var UserSeletedSugar = 1 EndIf @@ -5035,7 +5056,6 @@ Var topping1 = toppingID1index3 EndIf - Var SugarZeroCalOption = "Enable" ;Var UserSeletedSugar = 1 EndIf @@ -5078,7 +5098,6 @@ Var topping1 = toppingID1index4 EndIf - Var SugarZeroCalOption = "Enable" ;Var UserSeletedSugar = 1 EndIf