From 3637980ada4fd59458b0d1e714c0a7b556fbf717 Mon Sep 17 00:00:00 2001
From: Ittipat Lusuk <ittipat.l@forth.co.th>
Date: Wed, 11 Dec 2024 11:30:29 +0700
Subject: [PATCH] THAI INTER: Fix IndexDrinktType, OatMilkPrice

---
 inter/tha/xml/page_topping_select6.lxml | 29 ++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml
index 1c4917c8..d184bafa 100644
--- a/inter/tha/xml/page_topping_select6.lxml
+++ b/inter/tha/xml/page_topping_select6.lxml
@@ -895,6 +895,7 @@
 		Var text_cancel_yc = 16
 		Var Text_SugarZeroCalPrice_X = 360
 		Var Text_SugarNormalPrice_Y = 80
+		Var OatMilkPrice_X = 260
 		If show_name_len > 24 Then
 			Var showname = showname + "###size=54"
 		EndIf
@@ -918,6 +919,7 @@
 		Var text_cancel_yc = 16
 		Var Text_SugarZeroCalPrice_X = 360
 		Var Text_SugarNormalPrice_Y = 75
+		Var OatMilkPrice_X = 220
 		If show_name_len > 0 Then
 			Var showname = showname + "###size=68"
 		EndIf
@@ -942,6 +944,7 @@
 		Var text_cancel_xc = 5
 		Var text_cancel_yc = 30
 		Var show_eng = "true"
+		Var OatMilkPrice_X = 210
 		If show_name_len > 24 Then
 			Var showname = showname + "###size=54"
 		EndIf
@@ -954,8 +957,10 @@
 		EndIf
 	EndIf
 
-	;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
-	;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+	Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
+	DEBUGVAR StringToppingOatMilkWithPrice
+	Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+	DEBUGVAR StringToppingOatMilkWithPrice
 
 	Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
 	Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
@@ -2812,7 +2817,7 @@
 
 	Var high_light_drink_type = "Invisible"
 
-
+	Var IndexDrinktType = 0
 
 
 </EventClick>
@@ -2870,7 +2875,7 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2
 
-
+	Var IndexDrinktType = 1
 
 </EventClick>
 <Language>
@@ -2928,7 +2933,7 @@
 	Topping "Load" PD_CODE3
 
 
-
+	Var IndexDrinktType = 2
 
 </EventClick>
 <Language>
@@ -6070,9 +6075,20 @@
 <Height> 65 </Height>
 <Language>
 	<ID> 000113 </ID>
+	<SubValue> OatMilkPrice </SubValue>
 </Language>
 </Text>
 
+;<Text>
+;<X> OatMilkPrice_X </X>
+;<Y> 77 </Y>
+;<Font> KanitRegularTTF </Font>
+;<State> "Enable" </State>
+;<Size> 28 </Size>
+;<Color> 0x84776F </Color>
+;<Value> OatMilkPrice </Value>
+;</Text>
+
 </Block>
 ;
 ;
@@ -8435,12 +8451,15 @@
 	If SelectCountDrinkType = 1 Then
 		If DefaultDrinkType = 1 Then
 			Var hot_button_state = "PressForever"
+			Var IndexDrinktType = 0
 		EndIf
 		If DefaultDrinkType = 2 Then
 			Var cold_button_state = "PressForever"
+			Var IndexDrinktType = 1
 		EndIf
 		If DefaultDrinkType = 3 Then
 			Var blend_button_state = "PressForever"
+			Var IndexDrinktType = 2
 		EndIf
 
 	EndIf