diff --git a/image/topping2/sugar_type_option.png b/image/topping2/sugar_type_option.png index 0f52ad4d..f26399cd 100644 Binary files a/image/topping2/sugar_type_option.png and b/image/topping2/sugar_type_option.png differ diff --git a/image/topping2_en/sugar_type_option.png b/image/topping2_en/sugar_type_option.png index 32a3a83a..8b6621c2 100644 Binary files a/image/topping2_en/sugar_type_option.png and b/image/topping2_en/sugar_type_option.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 838526c9..0b6e80dd 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -224,6 +224,8 @@ STRCONTAIN "1213" MaterialAvailable PeachSyrupEnable STRCONTAIN "1211" MaterialAvailable BananaSyrupEnable + STRCONTAIN "1214" MaterialAvailable SugarZeroCalEnable + Var MenuKidEnable = "false" diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index c049a9c0..068ad41d 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -126,6 +126,13 @@ ; End Customer Coffee +; Sugar Zero Cal + + ; Test Sugar Zero Cal + ;Var SugarZeroCalEnable = "true" + + Var SugarZeroCalOption = "Invisible" + Var BGSugarHotHealthy = "Invisible" Var BGSugarColdHealthy = "Invisible" @@ -188,6 +195,8 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 785 + Var SugarZeroCalPrice_X = 540 + Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -222,6 +231,8 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 790 + + Var SugarZeroCalPrice_X = 482 EndIf @@ -749,6 +760,8 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 785 + Var SugarZeroCalPrice_X = 540 + Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -783,6 +796,8 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 790 + + Var SugarZeroCalPrice_X = 482 EndIf @@ -897,6 +912,7 @@ DEBUGVAR MAT_ID_9701 DEBUGVAR MAT_ID_9601 + DEBUGVAR MAT_ID_1214 DEBUGVAR SubMenuProductCode1 @@ -1400,6 +1416,7 @@ If UserSeletedSugar = 0 Then + If SugarModeUpdateWhenChangeDrinkType = 1 Then Var SugarModeUpdateWhenChangeDrinkType = 0 RefreshAll @@ -1416,7 +1433,7 @@ ; Suger 4 step cold If TOPPING1 = "Suger 4 step cold" Then - + Var SugarZeroCalOption = "Enable" Var BGSugar = "Invisible" @@ -1429,6 +1446,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -1463,11 +1481,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" @@ -1481,6 +1501,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -1508,12 +1529,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" @@ -1532,6 +1555,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -1568,11 +1592,13 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var SugarZeroCalOption = "Invisible" EndIf EndIf If TOPPING1 = "Powder Sugar for Hot" Then + Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" @@ -1591,6 +1617,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -1627,11 +1654,13 @@ 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" @@ -1653,6 +1682,7 @@ If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 + Var SugarZeroCalOption = "Invisible" EndIf If toppingID1index2 = toppingID1Default Then @@ -1690,6 +1720,7 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var SugarZeroCalOption = "Invisible" EndIf DEBUGVAR toppingID1Default @@ -1698,6 +1729,7 @@ If TOPPING1 = "Sugar Premix 25" Then + Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" @@ -1750,6 +1782,7 @@ EndIf If TOPPING1 = "Powder Sugar Premix 50" Then + Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" @@ -1803,6 +1836,8 @@ EndIf If TOPPING1 = "Powder Sugar Premix 25" Then + Var SugarZeroCalOption = "Enable" + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -1859,6 +1894,7 @@ Var SugarModeUpdateWhenChangeDrinkType = 0 If TOPPING1 = "Suger 4 step cold" Then + Var BGSugarColdHealthy = "Enable" Var BGSugarHotHealthy = "Invisible" @@ -1867,12 +1903,32 @@ EndIf If TOPPING1 = "Suger 4 step hot" Then + Var BGSugarHotHealthy = "Enable" Var BGSugarColdHealthy = "Invisible" Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf + + ; Sugar Zero Cal + DEBUGVAR SugarZeroCalEnable + If SugarZeroCalEnable = "true" Then + + Var SugarZeroCalPrice = 10 + Var priceFormat = "(+฿%.0f)" + Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow) + + Var SugarNormalCheck = "PressForever" + Var SugarZeroCalCheck = "Enable" + Else + Var SugarZeroCalOption = "Invisible" + EndIf + + + If MAT_ID_1214 = "Disable" Then + Var SugarZeroCalOption = "Invisible" + EndIf Var ShowCollagenOnly = "Enable" @@ -2952,7 +3008,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" @@ -3001,11 +3068,15 @@ Var topping1 = toppingID1index1 EndIf + Var SugarZeroCalOption = "Invisible" Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 + + Function 2 + Refresh @@ -3068,6 +3139,14 @@ Var topping1 = toppingID1index1 EndIf + + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -3134,7 +3213,12 @@ Var topping1 = toppingID1index2 EndIf - + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -3216,6 +3300,12 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -3297,6 +3387,12 @@ Var topping1 = toppingID1index3 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -3378,6 +3474,12 @@ Var topping1 = toppingID1index4 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -3409,7 +3511,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 @@ -3455,11 +3568,15 @@ Var topping1 = toppingID1index1 EndIf + Var SugarZeroCalOption = "Invisible" Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 + + Function 2 + Refresh @@ -3500,6 +3617,12 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -3540,6 +3663,12 @@ EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var topping1 = toppingID1index3 EndIf @@ -3582,6 +3711,12 @@ EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var topping1 = toppingID1index4 EndIf @@ -3616,7 +3751,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 @@ -3662,11 +3808,15 @@ Var topping1 = toppingID1index1 EndIf + Var SugarZeroCalOption = "Invisible" ;Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 + + Function 2 + Refresh @@ -3707,6 +3857,12 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -3750,6 +3906,12 @@ Var topping1 = toppingID1index3 EndIf + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -3792,7 +3954,12 @@ Var topping1 = toppingID1index4 EndIf - + If SugarZeroCalEnable = "true" Then + If MAT_ID_1214 = "Disable" Then + Else + Var SugarZeroCalOption = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -3824,6 +3991,1105 @@ ; ; ; + +;-BEGIN Sugar Zero options 6 levels sugar new + + eval( + If SugarZeroCalOption = "Enable" Then + If BGSugarNew = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + Else + Var return = "Invisible" + EndIf +) + + 988 + 214 + 20 + + SugarZeroCalOption + Var( DirImage + "/sugar_type_option.png") + + +; Normal Sugar + + +; Sugar Zero Cal + + + + SugarZeroCalPrice_X + 67 + KanitRegularTTF + "Enable" + 28 + 0x84776F + SugarZeroCalPriceStr + + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + +; sugar6 + +;- END topping1 + + + + + +; +; +; +;-BEGIN Sugar Zero options 4 levels hot healthy + + eval( + If SugarZeroCalOption = "Enable" Then + If BGSugarHotHealthy = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + Else + Var return = "Invisible" + EndIf +) + + 988 + 214 + 20 + + SugarZeroCalOption + Var( DirImage + "/sugar_type_option.png") + + +; Normal Sugar + + +; Sugar Zero Cal + + + + SugarZeroCalPrice_X + 67 + KanitRegularTTF + "Enable" + 28 + 0x84776F + SugarZeroCalPriceStr + + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + + + +; +; +; +;-BEGIN Sugar Zero options 4 levels cold healthy + + eval( + If SugarZeroCalOption = "Enable" Then + If BGSugarColdHealthy = "Enable" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + Else + Var return = "Invisible" + EndIf +) + + 988 + 214 + 20 + + SugarZeroCalOption + Var( DirImage + "/sugar_type_option.png") + + +; Normal Sugar + + +; Sugar Zero Cal + + + + SugarZeroCalPrice_X + 67 + KanitRegularTTF + "Enable" + 28 + 0x84776F + SugarZeroCalPriceStr + + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + + + + ;-BEGIN milk choice OatMilkToppingEnable @@ -5731,6 +6997,19 @@ ; Set drink + ; Post Topping + If SugarZeroCalEnable = "true" Then + Var sugarToppingID = 1000 + If SugarZeroCalCheck = "PressForever" Then + Var sugarToppingID = 1001 + Else + Var sugarToppingID = 1000 + EndIf + + Topping "PostTopping1-ID" sugarToppingID + + EndIf + If Seeker = "curr" Then Topping "Select" UserSelectProductCode @@ -6138,6 +7417,15 @@ 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 DEBUGVAR MenuCodeName1_State