From 588019d02dffcb5154f95bd5f959781c224bb633 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Mon, 4 Dec 2023 10:00:56 +0700
Subject: [PATCH 1/2] FIXED: bug when drink failed and slip to remove_cup_page

---
 inter/aus/xml/page_catalog_group_coffee.lxml  |   2 +-
 inter/aus/xml/page_catalog_group_other.lxml   | 528 ------------------
 .../aus/xml/page_catalog_group_recommend.lxml |  10 +-
 inter/aus/xml/page_remove_cup.lxml            |  30 +-
 4 files changed, 8 insertions(+), 562 deletions(-)

diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml
index 282f2c7d..0632bebe 100644
--- a/inter/aus/xml/page_catalog_group_coffee.lxml
+++ b/inter/aus/xml/page_catalog_group_coffee.lxml
@@ -15489,7 +15489,7 @@
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
 		Var NameLang[0][0] = "Hot MATCHACAFÉ LATTE"
-		Var NameLang[0][1] = "กาแฟ มัทฉะลาเต้ร้อน"
+		Var NameLang[0][1] = "Hot MATCHACAFÉ LATTE"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
 		Var NameLang[0][4] = "KAFÉ LATTE MATCHA PANAS"
diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml
index 7b71050f..2c62a431 100644
--- a/inter/aus/xml/page_catalog_group_other.lxml
+++ b/inter/aus/xml/page_catalog_group_other.lxml
@@ -9531,534 +9531,6 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; ==================> Len = 3
-	; - 51-05-02-0005 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 51-05-02-0005.Button,$Sum5105020005) </State> 
-	<Button>
-	<State> $Sum5105020005 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberry.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberry.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberry.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $51-05-02-0005.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "51-05-02-0005"
-		Var PD_CODE3 = "##-##-##-####"
-		; begin lang 
-		Var aliasName[0] = "STRAWBERRY"
-		Var aliasDesc[0] = "Strawberry Syrup,\nWater & Ice"
-		Var aliasName[1] = "น้ำสตอเบอร์รี่"
-		Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ น้ำ \n"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = ""
-		Var NameLang[0][1] = ""
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = ""
-		Var DescLang[0][0] = ""
-		Var DescLang[0][1] = ""
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "Iced STRAWBERRY"
-		Var NameLang[1][1] = "น้ำสตอเบอร์รี่เย็น"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "STRAWBERI AIS"
-		Var DescLang[1][0] = "Strawberry Syrup,Water, Ice"
-		Var DescLang[1][1] = "น้ำเชื่อมสตอเบอร์รี่ น้ำ และน้ำแข็ง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Sirap Strawberi, Air, Ais"
-		Var NameLang[2][0] = ""
-		Var NameLang[2][1] = ""
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
-		Var DescLang[2][0] = ""
-		Var DescLang[2][1] = ""
-		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
-		; end lang 
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $51-05-02-0005.Button
-		Var PD_STAGE_3 = "Disable2"
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "51-05-02-0005"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 22 </Size>
-	<Width>222</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>STRAWBERRY</LanguageSlot1>
-		<LanguageSlot2>น้ำสตอเบอร์รี่</LanguageSlot2>
-		<LanguageSlot3>STRAWBERRY</LanguageSlot3>
-		<LanguageSlot4>น้ำสตอเบอร์รี่</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>น้ำสตอเบอร์รี่</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>222</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>Strawberry Syrup,\nWater & Ice</LanguageSlot1>
-		<LanguageSlot2>น้ำเชื่อมสตอเบอร์รี่ น้ำ \n</LanguageSlot2>
-		<LanguageSlot3>Strawberry Syrup,\nWater & Ice</LanguageSlot3>
-		<LanguageSlot4>น้ำเชื่อมสตอเบอร์รี่ น้ำ \n</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>น้ำเชื่อมสตอเบอร์รี่ น้ำ \n</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> TextPriceMenuHotX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , 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> $51-05-02-0005.Button </State>
-	</Image>
-	<Text>
-	<X> 113 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-05-02-0005.Button </State>
-	<Value> StringFmt( $51-05-02-0005.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> TextPriceMenuBlendX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			Var ice_tab_process_show = "Invisible"
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum5105020005 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-05-02-0005.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum5105020005 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; ==================> Len = 3
-	; 51-05-01-0001 51-05-02-0001 51-05-03-0001 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 51-05-01-0001.Button,51-05-02-0001.Button,51-05-03-0001.Button,$Sum510501000151050200015105030001) </State> 
-	<Button>
-	<State> $Sum510501000151050200015105030001 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $51-05-01-0001.Price
-		Var PriceD2 = $51-05-02-0001.Price
-		Var PriceD3 = $51-05-03-0001.Price
-		Var PD_CODE1 = "51-05-01-0001"
-		Var PD_CODE2 = "51-05-02-0001"
-		Var PD_CODE3 = "51-05-03-0001"
-		; begin lang 
-		Var aliasName[0] = "LIMENADE"
-		Var aliasDesc[0] = "Limenade, Sugar"
-		Var aliasName[1] = "น้ำมะนาว"
-		Var aliasDesc[1] = "น้ำมะนาว น้ำตาล"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot LIMENADE"
-		Var NameLang[0][1] = "น้ำมะนาวร้อน"
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = "AIR LIMAU PANAS"
-		Var DescLang[0][0] = "Limenade, Sugar"
-		Var DescLang[0][1] = "น้ำมะนาว น้ำตาล"
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = "Limau,Gula"
-		Var NameLang[1][0] = "Iced LIMENADE"
-		Var NameLang[1][1] = "น้ำมะนาวเย็น"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "LIMAU AIS"
-		Var DescLang[1][0] = "Limenade,Sugar, Ice"
-		Var DescLang[1][1] = "นำมะนาว น้ำตาล น้ำแข็ง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Limau, Gula, Ais"
-		Var NameLang[2][0] = "LIMENADE SMOOTHIE"
-		Var NameLang[2][1] = "น้ำมะนาวปั่น"
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = "SMOOTHIE LIMAU"
-		Var DescLang[2][0] = "Limenade,Sugar, Ice"
-		Var DescLang[2][1] = "นำมะนาว น้ำตาล น้ำแข็ง"
-		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = "Limau, Gula, Ais"
-		; end lang 
-		Var PD_STAGE_1 = $51-05-01-0001.Button
-		Var PD_STAGE_2 = $51-05-02-0001.Button
-		Var PD_STAGE_3 = $51-05-03-0001.Button
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "51-05-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "51-05-01-0001"
-			Else
-			Topping "Load" "51-05-03-0001"
-			EndIf
-		EndIf
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 22 </Size>
-	<Width>222</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>LIMENADE</LanguageSlot1>
-		<LanguageSlot2>น้ำมะนาว</LanguageSlot2>
-		<LanguageSlot3>LIMENADE</LanguageSlot3>
-		<LanguageSlot4>น้ำมะนาว</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>น้ำมะนาว</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>222</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>Limenade, Sugar</LanguageSlot1>
-		<LanguageSlot2>น้ำมะนาว น้ำตาล</LanguageSlot2>
-		<LanguageSlot3>Limenade, Sugar</LanguageSlot3>
-		<LanguageSlot4>น้ำมะนาว น้ำตาล</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>น้ำมะนาว น้ำตาล</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> $51-05-01-0001.Button </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> TextPriceMenuHotX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-05-01-0001.Button </State>
-	<Value> StringFmt(  $51-05-01-0001.Price , 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> $51-05-02-0001.Button </State>
-	</Image>
-	<Text>
-	<X> 113 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-05-02-0001.Button </State>
-	<Value> StringFmt( $51-05-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $51-05-03-0001.Button </State>
-	</Image>
-	<Text>
-	<X> TextPriceMenuBlendX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-05-03-0001.Button </State>
-	<Value> StringFmt(  $51-05-03-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum510501000151050200015105030001 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum510501000151050200015105030001 = "Disable" Then
-				STRCONTAIN "ERR" $51-05-01-0001.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-05-02-0001.TAG tag2_is_disable
-				STRCONTAIN "ERR" $51-05-03-0001.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum510501000151050200015105030001 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 51-05-02-0026 51-05-03-0026 
diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml
index d2a11907..f27ce053 100644
--- a/inter/aus/xml/page_catalog_group_recommend.lxml
+++ b/inter/aus/xml/page_catalog_group_recommend.lxml
@@ -3813,7 +3813,7 @@
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 4
+	; ==================> Len = 3
 	; 51-01-01-0036 - - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3823,13 +3823,13 @@
 	<State> Flag( 51-01-01-0036.Button,Disable=Invisible,$Sum5101010036) </State> 
 	<Button>
 	<State> $Sum5101010036 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//Washed Sherry cask ferment \nNote: Whisky & Vanilla" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//Washed Sherry cask ferment \nNote: Whisky & Vanilla" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//Washed Sherry cask ferment \nNote: Whisky & Vanilla" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_espresso_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_espresso_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_espresso_light_geisha.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "Washed Sherry cask ferment \nNote: Whisky & Vanilla"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0036.Price
 		Var PriceD2 = $-.Price
diff --git a/inter/aus/xml/page_remove_cup.lxml b/inter/aus/xml/page_remove_cup.lxml
index 61109dd1..dab8db7d 100644
--- a/inter/aus/xml/page_remove_cup.lxml
+++ b/inter/aus/xml/page_remove_cup.lxml
@@ -10,9 +10,9 @@
 	Var countClick = 0
 	Var countClick2 = 0
 
-	Var CountryName = "Malaysia"
+	Var CountryName = "Australia"
 
-	DEBUGVAR "MALAY Remove Cup"
+	DEBUGVAR "AUS Remove Cup"
 
     Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
 		
@@ -134,32 +134,6 @@
 </Button>
 
 
-
-<Button>
-<X> 990 </X>
-<Y> 400 </Y>
-<State> show_eng_button_stage </State>
-<Filename> show_btn </Filename>
-<FilenamePress> show_btp  </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	; eng
-	If show_eng = "true" Then 
-		Var show_eng = "false"
-	Else
-		Var show_eng = "true"
-	EndIf
-	Open CurrentXMLFileName2
-</EventClick>
-</Button>
-
-
-
-
-
-
-
 <Text>
 <X> 5 </X>
 <Y> 1868 </Y>

From f3b447e499e898e8801b3d7cb827b9293406c868 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Mon, 4 Dec 2023 14:37:09 +0700
Subject: [PATCH 2/2] fixed thai member button page_board

---
 xml/page_board.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xml/page_board.xml b/xml/page_board.xml
index 698d5ed5..51910618 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -693,7 +693,7 @@
 	; CountryName
 	Var show_eng_button_stage = "Enable"
 
-	Var MemberButtonFileName = "ROOT/taobin_project/image/main_page/bp_main_page_member.png"
+	Var MemberButtonFileName = "ROOT/taobin_project/image/TermTempage2/bp_main_page_member.png"
 
 
 
@@ -724,6 +724,9 @@
 
 	Var InternationalEnable = 0
 	Var InternationalEnableStr = "false"
+
+	Var XButtonMember = 212
+	Var YButtonMember = 1695
 	
 	; CountryName
 	If CountryName = "" Then