From 0e95eb8a35a22cff660338a102a9ac2dfd489f79 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Wed, 27 Nov 2024 20:37:29 +0700
Subject: [PATCH 1/3] update gen layout

---
 xml/menu_new_layout_gen.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index 378adb89..b8a10f47 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -835,6 +835,8 @@
                 out_xml( '\t<Value> StringFmt(  $' + spl[4] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               elif passion_mint:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(passion_mint_fix_price, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif from_12_day_12_menu:
+                out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(price_12_day_12_menu, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
@@ -850,6 +852,8 @@
               out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price - 7 ) </Value>\r\n')
             elif passion_mint:
               out_xml( '\t<Value> "฿' + str(GetPrice(passion_mint_fix_price, spl[4])) + '" </Value>\r\n')
+            elif from_12_day_12_menu:
+              out_xml( '\t<Value> "฿' + str(GetPrice(price_12_day_12_menu, spl[4])) + '" </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
@@ -1481,6 +1485,8 @@
                 out_xml( '\t<Value> StringFmt(  $' +spl[8] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               elif passion_mint:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(passion_mint_fix_price, spl[8])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif price_12_day_12_menu:
+                out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(price_12_day_12_menu, spl[8])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' +spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
@@ -1490,6 +1496,8 @@
               out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price - 7 ) </Value>\r\n')
             elif passion_mint:
               out_xml( '\t<Value> "฿' + str(GetPrice(passion_mint_fix_price, spl[8])) + '" </Value>\r\n')
+            elif price_12_day_12_menu:
+              out_xml( '\t<Value> "฿' + str(GetPrice(price_12_day_12_menu, spl[8])) + '" </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n')
 
@@ -1542,6 +1550,8 @@
                 out_xml( '\t<Value> StringFmt(  $' +spl[9] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               elif passion_mint:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(passion_mint_fix_price, spl[9])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif from_12_day_12_menu:
+                out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(price_12_day_12_menu, spl[9])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' +spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
@@ -1551,6 +1561,8 @@
               out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price - 7 ) </Value>\r\n')
             elif passion_mint:
               out_xml( '\t<Value> "฿' + str(GetPrice(passion_mint_fix_price, spl[9])) + '" </Value>\r\n')
+            elif from_12_day_12_menu:
+              out_xml( '\t<Value> "฿' + str(GetPrice(price_12_day_12_menu, spl[9])) + '" </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n')
 
@@ -1602,6 +1614,8 @@
                 out_xml( '\t<Value> StringFmt(  $' +spl[10] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               elif passion_mint:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(passion_mint_fix_price, spl[10])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif from_12_day_12_menu:
+                out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(price_12_day_12_menu, spl[10])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' +spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
@@ -1611,6 +1625,8 @@
               out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price - 7 ) </Value>\r\n')
             elif passion_mint:
               out_xml( '\t<Value> "฿' + str(GetPrice(passion_mint_fix_price, spl[10])) + '" </Value>\r\n')
+            elif from_12_day_12_menu:
+              out_xml( '\t<Value> "฿' + str(GetPrice(price_12_day_12_menu, spl[10])) + '" </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n')
 

From 2eebf65eeac19f525dea21529d3545f8c739fc43 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Wed, 27 Nov 2024 20:39:58 +0700
Subject: [PATCH 2/3] Update page_catalog_group_pro_12_day_12_menu.xml

---
 xml/page_catalog_group_pro_12_day_12_menu.xml | 116 +++++++++---------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/xml/page_catalog_group_pro_12_day_12_menu.xml b/xml/page_catalog_group_pro_12_day_12_menu.xml
index f80baa1e..8db3ad1e 100644
--- a/xml/page_catalog_group_pro_12_day_12_menu.xml
+++ b/xml/page_catalog_group_pro_12_day_12_menu.xml
@@ -183,7 +183,7 @@
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -440,7 +440,7 @@ CARAMEL OREO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -698,7 +698,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -954,7 +954,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1061,19 +1061,19 @@ SMOOTHIE" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - 12-01-02-0001  - 
+	; - 12-01-02-0001 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0001 .Button,$Sum1201020001 ) </State> 
+	<State> Flag( 12-01-02-0001.Button,$Sum1201020001) </State> 
 	<Button>
-	<State> $Sum1201020001  </State> 
+	<State> $Sum1201020001 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_americano_12_day_12_menu.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_americano_12_day_12_menu.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_americano_12_day_12_menu.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-01-02-0001 , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-01-02-0001, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1084,18 +1084,18 @@ SMOOTHIE" </Value>
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_americano_12_day_12_menu.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = "-"
-		Var PriceD2 = "-"
+		Var PriceD2 = 25
 		Var PriceD3 = "-"
 		Var OriginalPriceD1 = "-"
-		Var OriginalPriceD2 = "-"
+		Var OriginalPriceD2 = 35
 		Var OriginalPriceD3 = "-"
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-01-02-0001 "
+		Var PD_CODE2 = "12-01-02-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-01-02-0001 .Button
+		Var PD_STAGE_2 = $12-01-02-0001.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-01-02-0001 , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-01-02-0001, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -1112,7 +1112,7 @@ SMOOTHIE" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0001 "
+			Topping "Load" "12-01-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1125,10 +1125,10 @@ SMOOTHIE" </Value>
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-		Var menu_name_eng_cold = $12-01-02-0001 .NameE
-		Var menu_desc_eng_cold = $12-01-02-0001 .descriptionE
-		Var menu_name_thai_cold = $12-01-02-0001 .Name
-		Var menu_desc_thai_cold = $12-01-02-0001 .description
+		Var menu_name_eng_cold = $12-01-02-0001.NameE
+		Var menu_desc_eng_cold = $12-01-02-0001.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0001.Name
+		Var menu_desc_thai_cold = $12-01-02-0001.description
 		
 		Var menu_name_eng_blender = $##-##-##-####.NameE
 		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@@ -1209,14 +1209,14 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-01-02-0001 .Button </State>
+	<State> $12-01-02-0001.Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -1226,8 +1226,8 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-02-0001 .Button </State>
-	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-01-02-0001.Button </State>
+	<Value> StringFmt(  25 , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -1270,9 +1270,9 @@ SMOOTHIE" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1201020001  = "Disable" Then
+			If $Sum1201020001 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-01-02-0001 .TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-01-02-0001.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -1309,7 +1309,7 @@ SMOOTHIE" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1201020001  </State> 
+	<State> $Sum1201020001 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -1462,7 +1462,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1480,7 +1480,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-21-02-0001.Button </State>
-	<Value> StringFmt(  $12-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  25 , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -1498,7 +1498,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1718,7 +1718,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1975,7 +1975,7 @@ SMOOTHIE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2231,7 +2231,7 @@ ICED ESPRESSO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2485,7 +2485,7 @@ ICED ESPRESSO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2503,7 +2503,7 @@ ICED ESPRESSO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-31-02-0001.Button </State>
-	<Value> StringFmt(  $12-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  30 , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -2521,7 +2521,7 @@ ICED ESPRESSO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2742,7 +2742,7 @@ Water" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2997,7 +2997,7 @@ Water" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3253,7 +3253,7 @@ GINGER TEA" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3360,19 +3360,19 @@ GINGER TEA" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - 12-05-02-0025.png.png - 
+	; - 12-05-02-0025 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0025.png.png.Button,$Sum1205020025.png.png) </State> 
+	<State> Flag( 12-05-02-0025.Button,$Sum1205020025) </State> 
 	<Button>
-	<State> $Sum1205020025.png.png </State> 
+	<State> $Sum1205020025 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_ume_lime_soda_12_day_12_menu.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_ume_lime_soda_12_day_12_menu.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_ume_lime_soda_12_day_12_menu.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-05-02-0025.png.png, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-05-02-0025, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -3383,18 +3383,18 @@ GINGER TEA" </Value>
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda_12_day_12_menu.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = "-"
-		Var PriceD2 = "-"
+		Var PriceD2 = 15
 		Var PriceD3 = "-"
 		Var OriginalPriceD1 = "-"
-		Var OriginalPriceD2 = "-"
+		Var OriginalPriceD2 = 25
 		Var OriginalPriceD3 = "-"
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0025.png.png"
+		Var PD_CODE2 = "12-05-02-0025"
 		Var PD_CODE3 = "##-##-##-####"
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0025.png.png.Button
+		Var PD_STAGE_2 = $12-05-02-0025.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0025.png.png, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0025, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3411,7 +3411,7 @@ GINGER TEA" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0025.png.png"
+			Topping "Load" "12-05-02-0025"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3424,10 +3424,10 @@ GINGER TEA" </Value>
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-		Var menu_name_eng_cold = $12-05-02-0025.png.png.NameE
-		Var menu_desc_eng_cold = $12-05-02-0025.png.png.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0025.png.png.Name
-		Var menu_desc_thai_cold = $12-05-02-0025.png.png.description
+		Var menu_name_eng_cold = $12-05-02-0025.NameE
+		Var menu_desc_eng_cold = $12-05-02-0025.descriptionE
+		Var menu_name_thai_cold = $12-05-02-0025.Name
+		Var menu_desc_thai_cold = $12-05-02-0025.description
 		
 		Var menu_name_eng_blender = $##-##-##-####.NameE
 		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@@ -3509,14 +3509,14 @@ LIMENADE SODA" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-05-02-0025.png.png.Button </State>
+	<State> $12-05-02-0025.Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -3526,8 +3526,8 @@ LIMENADE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-05-02-0025.png.png.Button </State>
-	<Value> StringFmt(  "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-05-02-0025.Button </State>
+	<Value> StringFmt(  15 , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3570,9 +3570,9 @@ LIMENADE SODA" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1205020025.png.png = "Disable" Then
+			If $Sum1205020025 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-05-02-0025.png.png.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-05-02-0025.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -3609,7 +3609,7 @@ LIMENADE SODA" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1205020025.png.png </State> 
+	<State> $Sum1205020025 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>

From c990e8c3082351e477039c2ab3386d801010826a Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Wed, 27 Nov 2024 20:50:18 +0700
Subject: [PATCH 3/3] THAI: Update new menu name

---
 xml/page_catalog_group_milk_winter_wonder.xml | 17 ++++++++++++-----
 ...page_catalog_group_recommend_thick_tea.xml |  9 ++++-----
 ..._catalog_group_recommend_winter_wonder.xml | 19 ++++++++++---------
 xml/page_catalog_group_tea_thick_tea.xml      | 18 +++++++++++-------
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/xml/page_catalog_group_milk_winter_wonder.xml b/xml/page_catalog_group_milk_winter_wonder.xml
index 2b9f8d3d..427321ec 100644
--- a/xml/page_catalog_group_milk_winter_wonder.xml
+++ b/xml/page_catalog_group_milk_winter_wonder.xml
@@ -8,7 +8,12 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+
+	If WinterWonderPro = 1 Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_milk_winter_wonder.xml"
+    EndIf
+
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
     Var Menu4Selected = "PressForever"
 
     SAVELOG PreviseXMLFileName2
@@ -2846,7 +2851,7 @@ STRAWBERRY SYRUP AND ICE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CHRISTMAS CAFE LATTE "
 		Var NameDrinkTH = "คริสมาสต์ คาเฟ ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ"
+		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว และน้ำ"
 		Var DrinkDescription = "COFFEE, MILK, LIME, CARAMEL SYRUP AND WATER"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_christmas_cafe_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2929,7 +2934,8 @@ STRAWBERRY SYRUP AND ICE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ" </Value>
+	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว
+และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3098,7 +3104,7 @@ CARAMEL SYRUP AND WATER" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CHRISTMAS CAFE LATTE "
 		Var NameDrinkTH = "คริสมาสต์ คาเฟ ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ"
+		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว และน้ำ"
 		Var DrinkDescription = "COFFEE, MILK, LIME, CARAMEL SYRUP AND WATER"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_christmas_cafe_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3181,7 +3187,8 @@ CARAMEL SYRUP AND WATER" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ" </Value>
+	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว
+และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_recommend_thick_tea.xml b/xml/page_catalog_group_recommend_thick_tea.xml
index 7489bd4b..28ee21ee 100644
--- a/xml/page_catalog_group_recommend_thick_tea.xml
+++ b/xml/page_catalog_group_recommend_thick_tea.xml
@@ -625,8 +625,8 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick>
-		Var NameDrink = "TRADITIONAL GREEN TEA"
-		Var NameDrinkTH = "ชาเขียวโบราณ"
+		Var NameDrink = "TRADITIONAL MATCHA"
+		Var NameDrinkTH = "มัทฉะโบราณ"
 		Var DrinkDescriptionTH = "ชามะลิ มัทฉะ นม และน้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "JASMINE TEA,  MATCHA, MILK, CARAMEL SYRUP"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_traditional_green_tea.png"
@@ -699,7 +699,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเขียวโบราณ" </Value>
+	<Value> "มัทฉะโบราณ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -720,8 +720,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TRADITIONAL GREEN
-TEA" </Value>
+	<Value> "TRADITIONAL MATCHA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_recommend_winter_wonder.xml b/xml/page_catalog_group_recommend_winter_wonder.xml
index 38dce2bf..ad398a04 100644
--- a/xml/page_catalog_group_recommend_winter_wonder.xml
+++ b/xml/page_catalog_group_recommend_winter_wonder.xml
@@ -1129,7 +1129,7 @@ STRAWBERRY SYRUP AND ICE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CHRISTMAS CAFE LATTE "
 		Var NameDrinkTH = "คริสมาสต์ คาเฟ ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ"
+		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว และน้ำ"
 		Var DrinkDescription = "COFFEE, MILK, LIME, CARAMEL SYRUP AND WATER"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_christmas_cafe_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1212,7 +1212,8 @@ STRAWBERRY SYRUP AND ICE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ" </Value>
+	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว
+และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1381,7 +1382,7 @@ CARAMEL SYRUP AND WATER" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CHRISTMAS CAFE LATTE "
 		Var NameDrinkTH = "คริสมาสต์ คาเฟ ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ"
+		Var DrinkDescriptionTH = "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว และน้ำ"
 		Var DrinkDescription = "COFFEE, MILK, LIME, CARAMEL SYRUP AND WATER"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_christmas_cafe_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1464,7 +1465,8 @@ CARAMEL SYRUP AND WATER" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล และน้ำ" </Value>
+	<Value> "กาแฟ นม น้ำเชื่อมคาราเมล มะนาว
+และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1888,8 +1890,8 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TRADITIONAL GREEN TEA"
-		Var NameDrinkTH = "ชาเขียวโบราณ"
+		Var NameDrink = "TRADITIONAL MATCHA"
+		Var NameDrinkTH = "มัทฉะโบราณ"
 		Var DrinkDescriptionTH = "ชามะลิ มัทฉะ นม และน้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "JASMINE TEA,  MATCHA, MILK, CARAMEL SYRUP"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_traditional_green_tea.png"
@@ -1962,7 +1964,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเขียวโบราณ" </Value>
+	<Value> "มัทฉะโบราณ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1983,8 +1985,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TRADITIONAL GREEN
-TEA" </Value>
+	<Value> "TRADITIONAL MATCHA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_tea_thick_tea.xml b/xml/page_catalog_group_tea_thick_tea.xml
index 7ad1a922..3a852656 100644
--- a/xml/page_catalog_group_tea_thick_tea.xml
+++ b/xml/page_catalog_group_tea_thick_tea.xml
@@ -8,10 +8,15 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+
+	If ThickTeaByBrewerPro = 1 Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_tea_thick_tea.xml"
+    EndIf
+
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
     Var Menu3Selected = "PressForever"
 
-    
+
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0
@@ -6692,8 +6697,8 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TRADITIONAL GREEN TEA"
-		Var NameDrinkTH = "ชาเขียวโบราณ"
+		Var NameDrink = "TRADITIONAL MATCHA"
+		Var NameDrinkTH = "มัทฉะโบราณ"
 		Var DrinkDescriptionTH = "ชามะลิ มัทฉะ นม และน้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "JASMINE TEA,  MATCHA, MILK, CARAMEL SYRUP"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_traditional_green_tea.png"
@@ -6766,7 +6771,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเขียวโบราณ" </Value>
+	<Value> "มัทฉะโบราณ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -6787,8 +6792,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TRADITIONAL GREEN
-TEA" </Value>
+	<Value> "TRADITIONAL MATCHA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>