From 8b562200a44ed08abc5ee42fb3e1f7018e1a899d Mon Sep 17 00:00:00 2001
From: wanlop run <wanlop.r@forth.co.th>
Date: Wed, 11 Dec 2024 13:48:39 +0700
Subject: [PATCH] merge

---
 inter/tha/xml/page_topping_select6.lxml | 56 +++++++++----------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml
index f6f7d434..38893e7c 100644
--- a/inter/tha/xml/page_topping_select6.lxml
+++ b/inter/tha/xml/page_topping_select6.lxml
@@ -198,7 +198,8 @@
 		Var custom_coffee_level_dark_text_x = 785
 
 		Var SugarZeroCalPrice_X = 540
-
+		Var Text_SugarZeroCalPrice_X = 380
+		Var Text_SugarNormalPrice_Y = 75
 	EndIf
 
 	If LanguageShow = "THAI" Then
@@ -239,7 +240,8 @@
 		Var custom_coffee_level_dark_text_x = 790
 
 		Var SugarZeroCalPrice_X = 495
-
+		Var Text_SugarZeroCalPrice_X = 380
+		Var Text_SugarNormalPrice_Y = 75
 	EndIf
 
 
@@ -281,6 +283,7 @@
 
 		Var SugarZeroCalPrice_X = 540
 		Var Text_SugarZeroCalPrice_X = 480
+		Var Text_SugarNormalPrice_Y = 80
 	EndIf
 
 
@@ -1771,16 +1774,6 @@
 
 
 
-				; No 2 right steps
-				;If NoSugarStepRight2 = "true" Then
-
-				;	Var SugarState5 = "Disable"
-				;	Var SugarState6 = "Disable"
-
-				;EndIf
-
-
-
 
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
@@ -1824,13 +1817,7 @@
 					Var sugar_default_flag = 1
 				EndIf
 
-				; No 2 right steps
-				;If NoSugarStepRight2 = "true" Then
-
-				;	Var SugarState5 = "Disable"
-				;	Var SugarState6 = "Disable"
-
-				;EndIf
+				
 
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
@@ -7319,6 +7306,8 @@
 ;
 ;
 ;
+
+
 </FrameScroll>
 
 <EventSecurity>
@@ -7395,14 +7384,7 @@
 
 	__CMD "statement" 0 StatementCheckMenu "-"
 
-	;If HalfPrice = "true" Then
-	;	; Discount 50
-	;	DEBUGVAR HalfPrice
-	;	__CMD "invoke-discount-50" UserSelectProductCode "-" "-"
-	;
-	;Else
-	;	Var PriceDrink = PriceDrinkTmp
-	;EndIf
+
 
 	DEBUGVAR PriceDrinkTmp
 
@@ -8816,12 +8798,12 @@
 		EndIf
 	EndIf
 	
-	;If OatMilkEnable = "Enable" Then
-		;DEBUGVAR LanguageShowByIndex
-		;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
-		;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
-		;DEBUGVAR StringToppingOatMilkWithPrice
-	;EndIf
+	If OatMilkEnable = "Enable" Then
+		DEBUGVAR LanguageShowByIndex
+		Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
+		Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+		DEBUGVAR StringToppingOatMilkWithPrice
+	EndIf
 
 	If showOreoAddEnable = "Enable" Then
 		DEBUGVAR LanguageShowByIndex
@@ -8830,10 +8812,10 @@
 		DEBUGVAR StringToppingOreoWithPrice
 	EndIf
 
-	;If ShotCoffeePremium = "Enable" Then
-		;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
-		;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
-	;EndIf
+	If ShotCoffeePremium = "Enable" Then
+		Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
+		Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
+	EndIf
 
 	If showCoffeeLevel = "Enable" Then
 		Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)