diff --git a/image/topping2/bg_custom_coffee_level.png b/image/topping2/bg_custom_coffee_level.png index 3e046ae5..2945ecb4 100644 Binary files a/image/topping2/bg_custom_coffee_level.png and b/image/topping2/bg_custom_coffee_level.png differ diff --git a/image/topping2_en/bg_custom_coffee_level.png b/image/topping2_en/bg_custom_coffee_level.png index 462f89b6..60a42071 100644 Binary files a/image/topping2_en/bg_custom_coffee_level.png and b/image/topping2_en/bg_custom_coffee_level.png differ diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index 35984691..9a7ac284 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -21,6 +21,7 @@ ;Var QRCODE99 = "" ;CoinVending OFF + VendingQR OFF Var ShowTextNumber = "Enable" Var ShowErrorText = "Invisible" diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index f7f6a314..c7150c31 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -22,6 +22,7 @@ ;Var QRCODE99 = "" ;CoinVending OFF + VendingQR OFF Var ShowTextNumber = "Enable" Var ShowErrorText = "Invisible" diff --git a/xml/page_payment_codeOther.xml b/xml/page_payment_codeOther.xml index 7c59534b..6b0c9a8f 100644 --- a/xml/page_payment_codeOther.xml +++ b/xml/page_payment_codeOther.xml @@ -21,6 +21,7 @@ ;Var QRCODE99 = "" ;CoinVending OFF + VendingQR OFF Var ShowTextNumber = "Enable" Var ShowErrorText = "Invisible" diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index f5d650b1..b62b05b5 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -163,7 +163,12 @@ SAVELOG BrewTime Var ShowCountDownBrewing = CountDownBrewing - Open "ROOT/taobin_project/xml/page_brewing3.xml" + If InternationalEnable = 1 Then + Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" + Open Brew3Inter + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf EndIf @@ -315,7 +320,12 @@ MakeDrinkV1 Seeker.selected_a_drink SelectSugarID EndIf - Open "ROOT/taobin_project/xml/page_brewing3.xml" + If InternationalEnable = 1 Then + Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" + Open Brew3Inter + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index bd04b896..07666732 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -101,6 +101,7 @@ Var CustomCoffeeLevelState[0] = "Enable" Var CustomCoffeeLevelState[1] = "Enable" Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "Enable" Var CustomCoffeeTampingState[0] = "Enable" Var CustomCoffeeTampingState[1] = "Enable" @@ -173,16 +174,17 @@ Var CustomCoffeeLevelText[0] = "Medium" Var CustomCoffeeLevelText[1] = "Just Right" Var CustomCoffeeLevelText[2] = "Dark" + Var CustomCoffeeLevelText[3] = "Darker" Var CustomCoffeeTampingText[0] = "Light" 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_price_x = 723 + Var custom_coffee_level_medium_text_x = 540 + Var custom_coffee_level_medium_price_x = 600 - Var custom_coffee_level_dark_text_x = 895 + Var custom_coffee_level_darker_text_x = 880 + Var custom_coffee_level_dark_text_x = 785 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -205,15 +207,17 @@ Var CustomCoffeeLevelText[0] = "กลาง" Var CustomCoffeeLevelText[1] = "กำลังพอดี" Var CustomCoffeeLevelText[2] = "เข้ม" + Var CustomCoffeeLevelText[3] = "เข้มกว่า" Var CustomCoffeeTampingText[0] = "เบา" Var CustomCoffeeTampingText[1] = "ปานกลาง" Var CustomCoffeeTampingText[2] = "เน้น" - Var custom_coffee_level_medium_text_x = 680 - Var custom_coffee_level_medium_price_x = 718 + Var custom_coffee_level_medium_text_x = 560 + Var custom_coffee_level_medium_price_x = 600 - Var custom_coffee_level_dark_text_x = 905 + Var custom_coffee_level_darker_text_x = 880 + Var custom_coffee_level_dark_text_x = 790 EndIf Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust @@ -608,15 +612,17 @@ Var CustomCoffeeLevelText[0] = "Medium" Var CustomCoffeeLevelText[1] = "Just Right" Var CustomCoffeeLevelText[2] = "Dark" + Var CustomCoffeeLevelText[3] = "Darker" Var CustomCoffeeTampingText[0] = "Light" Var CustomCoffeeTampingText[1] = "Medium" Var CustomCoffeeTampingText[2] = "Hight" - Var custom_coffee_level_medium_text_x = 662 - Var custom_coffee_level_medium_price_x = 723 + Var custom_coffee_level_medium_text_x = 540 + Var custom_coffee_level_medium_price_x = 600 - Var custom_coffee_level_dark_text_x = 895 + Var custom_coffee_level_darker_text_x = 880 + Var custom_coffee_level_dark_text_x = 785 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -639,16 +645,17 @@ Var CustomCoffeeLevelText[0] = "กลาง" Var CustomCoffeeLevelText[1] = "กำลังพอดี" Var CustomCoffeeLevelText[2] = "เข้ม" + Var CustomCoffeeLevelText[3] = "เข้มกว่า" Var CustomCoffeeTampingText[0] = "เบา" Var CustomCoffeeTampingText[1] = "ปานกลาง" Var CustomCoffeeTampingText[2] = "เน้น" - Var custom_coffee_level_medium_text_x = 680 - Var custom_coffee_level_medium_price_x = 718 - - Var custom_coffee_level_dark_text_x = 905 + Var custom_coffee_level_medium_text_x = 560 + Var custom_coffee_level_medium_price_x = 600 + Var custom_coffee_level_darker_text_x = 880 + Var custom_coffee_level_dark_text_x = 790 EndIf Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust @@ -818,6 +825,7 @@ DEBUGVAR toppingID9index1 DEBUGVAR toppingID9index2 DEBUGVAR toppingID9index3 + DEBUGVAR toppingID9index4 DEBUGVAR toppingID10index1 DEBUGVAR toppingID10index2 @@ -865,6 +873,7 @@ DEBUGVAR toppingID9price1 DEBUGVAR toppingID9price2 DEBUGVAR toppingID9price3 + DEBUGVAR toppingID9price4 DEBUGVAR BrewParam @@ -1010,6 +1019,7 @@ Var CustomCoffeeLevelState[0] = "PressForever" Var CustomCoffeeLevelState[1] = "Enable" Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "Enable" EndIf @@ -1018,6 +1028,7 @@ Var CustomCoffeeLevelState[0] = "Enable" Var CustomCoffeeLevelState[1] = "PressForever" Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "Enable" EndIf If toppingID9index3 = toppingID9Default Then @@ -1025,6 +1036,15 @@ Var CustomCoffeeLevelState[0] = "Enable" Var CustomCoffeeLevelState[1] = "Enable" Var CustomCoffeeLevelState[2] = "PressForever" + Var CustomCoffeeLevelState[3] = "Enable" + EndIf + + If toppingID9index4 = toppingID9Default Then + Var CurrentCoffeeLevelId = toppingID9index4 + Var CustomCoffeeLevelState[0] = "Enable" + Var CustomCoffeeLevelState[1] = "Enable" + Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "PressForever" EndIf EndIf @@ -1054,6 +1074,14 @@ Var CustomCoffeeLevelAdditionalPrice[2] = "" EndIf + If toppingID9price4 > 0 Then + Var priceFormated !assigned StringFmt( toppingID9price4 , PriceCustomCoffeeFormat, PreScaleConvertShow) + Var CustomCoffeeLevelAdditionalPrice[3] = "(+" + priceFormated + Var CustomCoffeeLevelAdditionalPrice[3] = CustomCoffeeLevelAdditionalPrice[3] + ")" + Else + Var CustomCoffeeLevelAdditionalPrice[3] = "" + EndIf + EndIf If TOPPING9 = "double-shot-espv2" Then @@ -1070,6 +1098,7 @@ Var CustomCoffeeLevelState[0] = "PressForever" Var CustomCoffeeLevelState[1] = "Enable" Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "Enable" EndIf @@ -1078,6 +1107,7 @@ Var CustomCoffeeLevelState[0] = "Enable" Var CustomCoffeeLevelState[1] = "PressForever" Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "Enable" EndIf If toppingID9index3 = toppingID9Default Then @@ -1085,6 +1115,15 @@ Var CustomCoffeeLevelState[0] = "Enable" Var CustomCoffeeLevelState[1] = "Enable" Var CustomCoffeeLevelState[2] = "PressForever" + Var CustomCoffeeLevelState[3] = "Enable" + EndIf + + If toppingID9index4 = toppingID9Default Then + Var CurrentCoffeeLevelId = toppingID9index4 + Var CustomCoffeeLevelState[0] = "Enable" + Var CustomCoffeeLevelState[1] = "Enable" + Var CustomCoffeeLevelState[2] = "Enable" + Var CustomCoffeeLevelState[3] = "PressForever" EndIf EndIf @@ -1114,6 +1153,14 @@ Var CustomCoffeeLevelAdditionalPrice[2] = "" EndIf + If toppingID9price4 > 0 Then + Var priceFormated !assigned StringFmt( toppingID9price4 , PriceCustomCoffeeFormat, PreScaleConvertShow) + Var CustomCoffeeLevelAdditionalPrice[3] = "(+" + priceFormated + Var CustomCoffeeLevelAdditionalPrice[3] = CustomCoffeeLevelAdditionalPrice[3] + ")" + Else + Var CustomCoffeeLevelAdditionalPrice[3] = "" + EndIf + EndIf If TOPPING10 = "tampping-espv2" Then @@ -4072,8 +4119,8 @@ + + @@ -4155,7 +4231,7 @@ - 785 + 676 CustomCoffeeTextY KanitRegularTTF showCoffeeLevel @@ -4174,6 +4250,16 @@ CustomCoffeeLevelText[2] + + custom_coffee_level_darker_text_x + CustomCoffeeTextY + KanitRegularTTF + showCoffeeLevel + 16 + 0x513C2F + CustomCoffeeLevelText[3] + + ; Additional Price @@ -4188,7 +4274,7 @@ - 825 + 720 CustomCoffeeTextY KanitRegularTTF showCoffeeLevel @@ -4198,7 +4284,7 @@ - 930 + 820 CustomCoffeeTextY KanitRegularTTF showCoffeeLevel @@ -4207,6 +4293,16 @@ CustomCoffeeLevelAdditionalPrice[2] + + 930 + CustomCoffeeTextY + KanitRegularTTF + showCoffeeLevel + 16 + 0x84776F + CustomCoffeeLevelAdditionalPrice[3] + + @@ -5004,6 +5100,9 @@ If CustomCoffeeLevelState[2] = "PressForever" Then Var topping9 = toppingID9index3 EndIf + If CustomCoffeeLevelState[3] = "PressForever" Then + Var topping9 = toppingID9index4 + EndIf Else Var topping9 = 0 EndIf @@ -5582,6 +5681,9 @@ If CustomCoffeeLevelState[2] = "PressForever" Then Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price3 EndIf + If CustomCoffeeLevelState[3] = "PressForever" Then + Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price4 + EndIf EndIf