From c6ff761d37e7205071707c360af6e3b80a83d1f1 Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 24 Jan 2023 23:02:42 +0700
Subject: [PATCH] Fix some

---
 xml/page_catalog_group_whey.xml | 499 +-------------------------------
 xml/page_topping_select6.xml    |   4 +-
 2 files changed, 3 insertions(+), 500 deletions(-)

diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index 901f949f..95561612 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -524,7 +524,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 16
+; menu_new_list 15
 	; ==================> Len = 16
 	; - 12-04-02-0001 - 
 <Block>
@@ -4270,503 +4270,6 @@ Caramel Syrup" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
-	; - 12-04-02-0019 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-04-02-0019.Button,$Sum1204020019) </State> 
-	<Button>
-	<State> $Sum1204020019 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_protein_Banana" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_protein_Banana" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_Banana" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "BANANA SHAKE"
-		Var NameDrinkTH = "โตเกียวบานาน่าโปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมโตเกียวบานาน่า"
-		Var DrinkDescription = "Whey protein, Milk, Tokyo Banana syrup"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Banana"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-04-02-0019.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-04-02-0019"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-04-02-0019.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" "12-04-02-0019"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
-		
-		Var menu_name_eng_cold = $12-04-02-0019.NameE
-		Var menu_desc_eng_cold = $12-04-02-0019.descriptionE
-		Var menu_name_thai_cold = $12-04-02-0019.Name
-		Var menu_desc_thai_cold = $12-04-02-0019.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "โตเกียวบานาน่าโปรตีน" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "เวย์โปรตีน นม 
-น้ำเชื่อมโตเกียวบานาน่า" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "BANANA SHAKE" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "Whey protein, Milk,
-Tokyo Banana syrup" </Value>
-	</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> 50 </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> $12-04-02-0019.Button </State>
-	</Image>
-	<Text>
-	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-04-02-0019.Button </State>
-	<Value> StringFmt( $12-04-02-0019.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> 180 </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 $Sum1204020019 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-04-02-0019.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>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum1204020019 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	;    
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( .Button,.Button,$Sum) </State> 
-	<Button>
-	<State> $Sum </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_protein_Banana" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_protein_Banana" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_Banana" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "BANANA SHAKE"
-		Var NameDrinkTH = "โตเกียวบานาน่าโปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมโตเกียวบานาน่า"
-		Var DrinkDescription = "Whey protein, Milk, Tokyo Banana syrup"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Banana"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $.Price
-		Var PriceD2 = $.Price
-		Var PriceD3 = $.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = "Disable2"
-		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" ""
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" ""
-			Else
-			Topping "Load" ""
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
-		
-		Var menu_name_eng_cold = $##-##-##-####.NameE
-		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
-		Var menu_name_thai_cold = $##-##-##-####.Name
-		Var menu_desc_thai_cold = $##-##-##-####.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "โตเกียวบานาน่าโปรตีน" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "เวย์โปรตีน นม 
-น้ำเชื่อมโตเกียวบานาน่า" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "BANANA SHAKE" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "Whey protein, Milk,
-Tokyo Banana syrup" </Value>
-	</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> 50 </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> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 115 </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> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 183 </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>
-	<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 $Sum = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
 </FrameScroll>
 ; Cart
 <Button>
diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml
index 151468f5..5f24945b 100644
--- a/xml/page_topping_select6.xml
+++ b/xml/page_topping_select6.xml
@@ -1215,7 +1215,7 @@
 				Refresh
 			EndIf
 
-			If TOPPING2 = "add-show-1106" Then
+			If TOPPING2 = "add-show-1105" Then
 		
 				Var ShotCoffeePremium = "Enable"
 				Var showShotEnable = "Invisible"
@@ -2764,7 +2764,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	SAVELOG "Press aadd oreo"
+	SAVELOG "Press add oreo"
 
 	If showOreoAddEnable = "Press" Then
 		Var showOreoAddEnable = "Enable"