diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index bbdc9c09..da931bfa 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -47,7 +47,7 @@ Var CHECK_EventOpen_Double = 0 - If ConfigNumer = 10564 Then + If RecipeTag3 = "CoffeePlay" Then Open "ROOT/taobin_project/xml/page_topping_select8.xml" EndIf diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 1a16fc86..e774144c 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -177,11 +177,11 @@ Var CustomCoffeeTampingText[1] = "Medium" Var CustomCoffeeTampingText[2] = "Hight" - ;Var custom_coffee_level_medium_text_x = 662 - Var custom_coffee_level_medium_text_x = 682 + Var custom_coffee_level_medium_text_x = 662 + ;Var custom_coffee_level_medium_text_x = 682 Var custom_coffee_level_medium_price_x = 723 - Var custom_coffee_level_dark_text_x = 915 + Var custom_coffee_level_dark_text_x = 895 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -209,10 +209,10 @@ Var CustomCoffeeTampingText[1] = "ปานกลาง" Var CustomCoffeeTampingText[2] = "เน้น" - Var custom_coffee_level_medium_text_x = 690 + Var custom_coffee_level_medium_text_x = 680 Var custom_coffee_level_medium_price_x = 718 - Var custom_coffee_level_dark_text_x = 920 + Var custom_coffee_level_dark_text_x = 905 EndIf Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust @@ -603,10 +603,10 @@ Var CustomCoffeeTampingText[1] = "Medium" Var CustomCoffeeTampingText[2] = "Hight" - Var custom_coffee_level_medium_text_x = 682 + Var custom_coffee_level_medium_text_x = 662 Var custom_coffee_level_medium_price_x = 723 - Var custom_coffee_level_dark_text_x = 915 + Var custom_coffee_level_dark_text_x = 895 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -634,10 +634,10 @@ Var CustomCoffeeTampingText[1] = "ปานกลาง" Var CustomCoffeeTampingText[2] = "เน้น" - Var custom_coffee_level_medium_text_x = 690 + Var custom_coffee_level_medium_text_x = 680 Var custom_coffee_level_medium_price_x = 718 - Var custom_coffee_level_dark_text_x = 920 + Var custom_coffee_level_dark_text_x = 905 EndIf @@ -841,17 +841,20 @@ DEBUGVAR SubMenuProductCode3 + DEBUGVAR toppingID2price1 DEBUGVAR toppingID2price2 + DEBUGVAR toppingID2price3 + DEBUGVAR toppingID2price4 DEBUGVAR toppingID3price2 DEBUGVAR toppingID6price2 - DEBUGVAR toppingID8index1price - DEBUGVAR toppingID8index2price - DEBUGVAR toppingID8index3price + DEBUGVAR toppingID8price1 + DEBUGVAR toppingID8price2 + DEBUGVAR toppingID8price3 - DEBUGVAR toppingID9index1price - DEBUGVAR toppingID9index2price - DEBUGVAR toppingID9index3price + DEBUGVAR toppingID9price1 + DEBUGVAR toppingID9price2 + DEBUGVAR toppingID9price3 DEBUGVAR BrewParam @@ -1017,29 +1020,29 @@ EndIf - ; If toppingID2index1price > 0 Then - ; Var priceFormated !assigned StringFmt( toppingID2index1price , PriceCustomCoffeeFormat, PreScaleConvertShow) - ; Var CustomCoffeeQuantityAdditionalPrice[0] = "(+" + priceFormated - ; Var CustomCoffeeQuantityAdditionalPrice[0] = CustomCoffeeQuantityAdditionalPrice[0] + ")" - ; Else - ; Var CustomCoffeeQuantityAdditionalPrice[0] = "" - ; EndIf - ; - ; If toppingID2index3price > 0 Then - ; Var priceFormated !assigned StringFmt( toppingID2index3price , PriceCustomCoffeeFormat, PreScaleConvertShow) - ; Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated - ; Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")" - ; Else - ; Var CustomCoffeeQuantityAdditionalPrice[1] = "" - ; EndIf - ; - ; If toppingID2index4price > 0 Then - ; Var priceFormated !assigned StringFmt( toppingID2index4price , PriceCustomCoffeeFormat, PreScaleConvertShow) - ; Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated - ; Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")" - ; Else - ; Var CustomCoffeeQuantityAdditionalPrice[2] = "" - ; EndIf + If toppingID2price1 > 0 Then + Var priceFormated !assigned StringFmt( toppingID2price1 , PriceCustomCoffeeFormat, PreScaleConvertShow) + Var CustomCoffeeQuantityAdditionalPrice[0] = "(+" + priceFormated + Var CustomCoffeeQuantityAdditionalPrice[0] = CustomCoffeeQuantityAdditionalPrice[0] + ")" + Else + Var CustomCoffeeQuantityAdditionalPrice[0] = "" + EndIf + + If toppingID2price3 > 0 Then + Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow) + Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated + Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")" + Else + Var CustomCoffeeQuantityAdditionalPrice[1] = "" + EndIf + + If toppingID2price4 > 0 Then + Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow) + Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated + Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")" + Else + Var CustomCoffeeQuantityAdditionalPrice[2] = "" + EndIf EndIf EndIf @@ -1077,24 +1080,24 @@ EndIf - If toppingID9index1price > 0 Then - Var priceFormated !assigned StringFmt( toppingID9index1price , PriceCustomCoffeeFormat, PreScaleConvertShow) + If toppingID9price1 > 0 Then + Var priceFormated !assigned StringFmt( toppingID9price1 , PriceCustomCoffeeFormat, PreScaleConvertShow) Var CustomCoffeeLevelAdditionalPrice[0] = "(+" + priceFormated Var CustomCoffeeLevelAdditionalPrice[0] = CustomCoffeeLevelAdditionalPrice[0] + ")" Else Var CustomCoffeeLevelAdditionalPrice[0] = "" EndIf - If toppingID9index2price > 0 Then - Var priceFormated !assigned StringFmt( toppingID9index2price , PriceCustomCoffeeFormat, PreScaleConvertShow) + If toppingID9price2 > 0 Then + Var priceFormated !assigned StringFmt( toppingID9price2 , PriceCustomCoffeeFormat, PreScaleConvertShow) Var CustomCoffeeLevelAdditionalPrice[1] = "(+" + priceFormated Var CustomCoffeeLevelAdditionalPrice[1] = CustomCoffeeLevelAdditionalPrice[1] + ")" Else Var CustomCoffeeLevelAdditionalPrice[1] = "" EndIf - If toppingID9index3price > 0 Then - Var priceFormated !assigned StringFmt( toppingID9index3price , PriceCustomCoffeeFormat, PreScaleConvertShow) + If toppingID9price3 > 0 Then + Var priceFormated !assigned StringFmt( toppingID9price3 , PriceCustomCoffeeFormat, PreScaleConvertShow) Var CustomCoffeeLevelAdditionalPrice[2] = "(+" + priceFormated Var CustomCoffeeLevelAdditionalPrice[2] = CustomCoffeeLevelAdditionalPrice[2] + ")" Else @@ -5504,23 +5507,23 @@ If CustomCoffeeQuantityState[0] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2index1price + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1 EndIf If CustomCoffeeQuantityState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2index3price + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3 EndIf If CustomCoffeeQuantityState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2index4price + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4 EndIf If CustomCoffeeLevelState[0] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9index1price + Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price1 EndIf If CustomCoffeeLevelState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9index2price + Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price2 EndIf If CustomCoffeeLevelState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9index3price + Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price3 EndIf EndIf