From 6e09549dd84de08c61e05cee49e170f7e40cf87b Mon Sep 17 00:00:00 2001
From: kenta-work <poomipat002@gmail.com>
Date: Tue, 5 Sep 2023 12:44:12 +0700
Subject: [PATCH] =?UTF-8?q?update=20custom=20topping=20for=20=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B9=81=E0=B8=9F=E0=B8=84=E0=B8=B1=E0=B9=88=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=AD=E0=B9=88=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xml/page_topping_select8.xml | 66 +++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index 88234e03..7145a99b 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -105,6 +105,8 @@
 
 	; Texts
 	Var CustomCoffeeTextY = 47
+	Var custom_coffee_offset_text_x = 0
+
 
 	Var CustomCoffeeWaterText[0] = "20ml"
 	Var CustomCoffeeWaterText[1] = "30ml"
@@ -173,10 +175,11 @@
 		Var CustomCoffeeTampingText[1] = "Medium"
 		Var CustomCoffeeTampingText[2] = "Hight"
 
-		Var custom_coffee_level_medium_text_x = 662
+		;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 = 895
+		Var custom_coffee_level_dark_text_x = 915
 	Else
 	
 		Var DirImage = "ROOT/taobin_project/image/topping2"
@@ -204,10 +207,10 @@
 		Var CustomCoffeeTampingText[1] = "ปานกลาง"
 		Var CustomCoffeeTampingText[2] = "เน้น"
 
-		Var custom_coffee_level_medium_text_x = 677
+		Var custom_coffee_level_medium_text_x = 690
 		Var custom_coffee_level_medium_price_x = 718
 
-		Var custom_coffee_level_dark_text_x = 905
+		Var custom_coffee_level_dark_text_x = 920
 	EndIf
 
 	Var text_x_free_topping =  text_x_add_oreo_price + text_x_free_adjust
@@ -598,10 +601,10 @@
 		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_dark_text_x = 895
+		Var custom_coffee_level_dark_text_x = 915
 	Else
 	
 		Var DirImage = "ROOT/taobin_project/image/topping2"
@@ -629,10 +632,10 @@
 		Var CustomCoffeeTampingText[1] = "ปานกลาง"
 		Var CustomCoffeeTampingText[2] = "เน้น"
 
-		Var custom_coffee_level_medium_text_x = 677
+		Var custom_coffee_level_medium_text_x = 690
 		Var custom_coffee_level_medium_price_x = 718
 
-		Var custom_coffee_level_dark_text_x = 905
+		Var custom_coffee_level_dark_text_x = 920
 
 	EndIf
 
@@ -977,7 +980,7 @@
 			EndIf
 		EndIf
 
-		If TOPPING8 = "coffee-quantity" Then
+		If TOPPING8 = "add-show-1009" Then
 			Var showCustomCoffee = "Enable"
 			Var showCoffeeQuantity = "Enable"
 
@@ -1787,9 +1790,16 @@
 
 			If TOPPING2 = "add-show-1009" Then
 		
-				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Invisible"
-				Var ExtraTopping = "Enable"
+				If toppingID2index2 = 60 Then
+					Var ShotCoffeePremium = "Enable"
+					Var showShotEnable = "Invisible"
+					Var ExtraTopping = "Enable"
+				EndIf
+
+				If toppingID2index2 = 1060 Then
+					Var showCustomCoffee = "Enable"
+					var showCoffeeQuantity = "Enable"
+				EndIf
 				
 				DEBUGVAR TOPPING2
 				Refresh
@@ -5256,11 +5266,15 @@
 		Var UserSelectProductCode = PD_CODE2
 
 		If showShotEnable = "Disable" Then
-			Var showShotEnable = "Enable"
+			If showCustomCoffee = "Invisible" Then
+				Var showShotEnable = "Enable"
+			EndIf
 		EndIf
 
-		If showCustomCoffee = "Enable" Then
-			Var showCustomCoffee = "Invisible"
+		If showCustomCoffee = "Invisible" Then
+			If showShotEnable = "Enable" Then
+				Var showCustomCoffee = "Enable"
+			EndIf
 		EndIf
 
 		Var showText4 = "Invisible"
@@ -5292,8 +5306,8 @@
 			Var showShotEnable = "Disable"
 		EndIf
 
-		If showCustomCoffee = "Enable" Then
-			Var showCustomCoffee = "Invisible"
+		If showCustomCoffee = "Invisible" Then
+			Var showCustomCoffee = "Enable"
 		EndIf
 
 		Var showText4 = "Enable"
@@ -5433,8 +5447,10 @@
 			Var showCustomCoffee = "Enable"
 		EndIf
 
-		If TOPPING8 = "coffee-quantity" Then
-			Var showCustomCoffee = "Enable"
+		If TOPPING2 = "add-show-1009" Then
+			If toppingID2index2 = 1060 Then
+				Var showCustomCoffee = "Enable"
+			EndIf
 		EndIf
 
 		If TOPPING9 = "single-shot-espv2" Then
@@ -5456,7 +5472,7 @@
 		EndIf
 
 		If showCoffeeQuantity = "Enable" Then
-			If CurrentCoffeeQuantityId = toppingID8Default Then
+			If CurrentCoffeeQuantityId = toppingID2Default Then
 			Else
 				Var CustomCoffeeDefault = "false"
 			EndIf
@@ -5480,18 +5496,20 @@
 		If CustomCoffeeDefault = "false" Then
 			Var showShotEnable = "Disable"
 		Else
-			Var showShotEnable = "Enable"
+			If showText4 = "Invisible" Then
+				Var showShotEnable = "Enable"
+			EndIf
 		EndIf
 		
 		
 		If CustomCoffeeQuantityState[0] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID8index1price
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2index1price
 		EndIf
 		If CustomCoffeeQuantityState[1] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID8index2price
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2index2price
 		EndIf
 		If CustomCoffeeQuantityState[2] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID8index3price
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2index3price
 		EndIf
 
 		If CustomCoffeeLevelState[0] = "PressForever" Then