DO TIM

2023-12-05 16:03:13 +07:00 · 2023-12-05 16:03:13 +07:00 · b2e0285e18
commit b2e0285e18
parent c031ecb468
116 changed files with 5462 additions and 137 deletions
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -282,29 +282,7 @@
 		DEBUGVAR SystemDateMonthInt
 		DEBUGVAR SystemDateDayInt

-		; Zone set video main page.
-
-		Var adver_brewing_en = 1
-
-		If CountryName = "Australia" Then
-			TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
-		EndIf
 		
-		If CountryName = "Malaysia" Then
-			TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
-		EndIf
-
-		If CountryName = "Thailand" Then
-			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev"
-		EndIf
-
-		If CountryName = "USANewYork" Then
-			TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
-		EndIf
-
-
-		DEBUGVAR CountDownShowButton
-		DEBUGVAR EventTurnOn
 	EndIf

 	If TaobinOnlineX = "false" Then
@ -746,8 +724,34 @@
 	
 	EndIf

+	; Zone set video main page.
+
+	Var adver_brewing_en = 1
+
+	If CountryName = "Australia" Then
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
+	EndIf
+	
+	If CountryName = "Malaysia" Then
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
+	EndIf
+
+	If CountryName = "Thailand" Then
+		TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev"
+	EndIf
+
+	If CountryName = "USANewYork" Then
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev"
+	EndIf
+
+
+		DEBUGVAR CountDownShowButton
+		DEBUGVAR EventTurnOn

 	If CountryName = "Malaysia" Then
+
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
+		
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		;EnableLanguage "THAI"
@ -787,6 +791,8 @@
 	EndIf

 	If CountryName = "Indonesia" Then
+		
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/idr/video/script_video.ev"
 		Var TextPriceMenuSize = 14
 		Var show_eng_button_stage = "Invisible"
 		Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
@ -805,6 +811,9 @@
 	EndIf

 	If CountryName = "Australia" Then
+		
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
+		
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		SetLanguage "ENG"
@ -842,6 +851,47 @@

 	EndIf

+	If CountryName = "USANewYork" Then
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev"
+
+		
+		Var WebAppShow = "Invisible"
+		EnableLanguage "ENG"
+		SetLanguage "ENG"
+		LanguageControl "UpdateList" "-"
+		
+		Var InternationalEnable = 1
+		Var show_eng = "true"
+		;Var VideoMainPage = "ROOT/taobin_project/inter/usaNY/video/video_main.mp4"
+		Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
+
+		Var ShowNetworkProblemText = "Network error. Payment Cash only."
+
+		Var CountryRootPath = "ROOT/taobin_project/inter/usaNY/"
+
+		ar TextPriceMenuSize = 12
+		Var TextPriceMenuY = 264
+		Var TextPriceMenuBlendX = 180
+		Var TextPriceMenuHotX = 48
+		Var ShowButtonClick2 = "Enable"
+		Var ButtontoTopupMenu = "Invisible"
+
+		Var PriceUnitText = ""
+
+		Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
+		Var show_eng_button_stage = "Invisible"
+
+		Var CountDownShowButton = 35
+
+		Var XButtonMember = 212
+		Var YButtonMember = 1695
+
+		If Not#LanguageLoaded = "" Then
+			LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/menu/lang.tsv"
+		EndIf
+
+	EndIf
+

 	DEBUGVAR InternationalEnable

--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@ -19760,7 +19760,7 @@ Sugar, Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = " MINT CAFE LATTE"
+		Var NameDrink = "MINT CAFE LATTE"
 		Var NameDrinkTH = "กาแฟมินต์ลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ มินต์"
 		Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Milk"
@ -19853,7 +19853,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> " MINT CAFE LATTE" </Value>
+	<Value> "MINT CAFE LATTE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -20011,7 +20011,7 @@ Sugar, Milk" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = " MINT CAFE LATTE"
+		Var NameDrink = "MINT CAFE LATTE"
 		Var NameDrinkTH = "กาแฟมินต์ลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ มินต์"
 		Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Milk"
@ -20104,7 +20104,7 @@ Sugar, Milk" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> " MINT CAFE LATTE" </Value>
+	<Value> "MINT CAFE LATTE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -20760,9 +20760,9 @@ Sugar, Water" </Value>
 	<State> Flag( 12-01-01-0059.Button,12-01-02-0059.Button,$Sum12010100591201020059) </State> 
 	<Button>
 	<State> $Sum12010100591201020059 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_peach.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_peach.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_peach.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -20770,7 +20770,7 @@ Sugar, Water" </Value>
 		Var NameDrinkTH = "พีชกาโน่"
 		Var DrinkDescriptionTH = "กาแฟ น้ำ และ พีช"
 		Var DrinkDescription = "Espresso, Peach Syrup , Sugar, Water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_peach.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0059.Price
 		Var PriceD2 = $12-01-02-0059.Price
@ -21002,7 +21002,257 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; - - - 
+	; 12-01-01-0059 12-01-02-0059 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0059.Button,12-01-02-0059.Button,$Sum12010100591201020059) </State> 
+	<Button>
+	<State> $Sum12010100591201020059 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_peach.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_peach.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_peach.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "PEACH AMERICANO "
+		Var NameDrinkTH = "พีชกาโน่"
+		Var DrinkDescriptionTH = "กาแฟ น้ำ และ พีช"
+		Var DrinkDescription = "Espresso, Peach Syrup , Sugar, Water"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_peach.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0059.Price
+		Var PriceD2 = $12-01-02-0059.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0059"
+		Var PD_CODE2 = "12-01-02-0059"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0059.Button
+		Var PD_STAGE_2 = $12-01-02-0059.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-01-02-0059"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0059"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0059.NameE
+		Var menu_desc_eng_hot = $12-01-01-0059.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0059.Name
+		Var menu_desc_thai_hot = $12-01-01-0059.description
+		
+		Var menu_name_eng_cold = $12-01-02-0059.NameE
+		Var menu_desc_eng_cold = $12-01-02-0059.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0059.Name
+		Var menu_desc_thai_cold = $12-01-02-0059.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> "PEACH AMERICANO " </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> "Espresso, Peach Syrup ,
+Sugar, Water" </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> $12-01-01-0059.Button </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> $12-01-01-0059.Button </State>
+	<Value> StringFmt( $12-01-01-0059.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-01-02-0059.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-01-02-0059.Button </State>
+	<Value> StringFmt( $12-01-02-0059.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
+		
+			If $Sum12010100591201020059 = "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 $Sum12010100591201020059 = "Disable" Then
+				STRCONTAIN "ERR" $12-01-01-0059.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-02-0059.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> $Sum12010100591201020059 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 	; ==================> Len = 12
 	; 12-01-01-0060 12-01-02-0060 12-01-03-0060 
 <Block>
@ -21013,17 +21263,17 @@ Sugar, Water" </Value>
 	<State> Flag( 12-01-01-0060.Button,12-01-02-0060.Button,12-01-03-0060.Button,$Sum120101006012010200601201030060) </State> 
 	<Button>
 	<State> $Sum120101006012010200601201030060 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_peach_latte.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_peach_latte.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_peach_latte.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = " PEACH CAFE LATTE"
+		Var NameDrink = "PEACH CAFE LATTE"
 		Var NameDrinkTH = "กาแฟพีชลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ พีช"
 		Var DrinkDescription = "Espresso, Peach Syrup, Sugar, Milk"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_peach_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0060.Price
 		Var PriceD2 = $12-01-02-0060.Price
@ -21112,7 +21362,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> " PEACH CAFE LATTE" </Value>
+	<Value> "PEACH CAFE LATTE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -21255,7 +21505,257 @@ Sugar, Milk" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; - - - 
+	; 12-21-01-0060 12-21-02-0060 12-21-03-0060 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-21-01-0060.Button,12-21-02-0060.Button,12-21-03-0060.Button,$Sum122101006012210200601221030060) </State> 
+	<Button>
+	<State> $Sum122101006012210200601221030060 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_peach_latte.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_peach_latte.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_peach_latte.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "PEACH CAFE LATTE"
+		Var NameDrinkTH = "กาแฟพีชลาเต้"
+		Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ พีช"
+		Var DrinkDescription = "Espresso, Peach Syrup, Sugar, Milk"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_peach_latte.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-21-01-0060.Price
+		Var PriceD2 = $12-21-02-0060.Price
+		Var PriceD3 = $12-21-03-0060.Price
+		Var PD_CODE1 = "12-21-01-0060"
+		Var PD_CODE2 = "12-21-02-0060"
+		Var PD_CODE3 = "12-21-03-0060"
+		Var PD_STAGE_1 = $12-21-01-0060.Button
+		Var PD_STAGE_2 = $12-21-02-0060.Button
+		Var PD_STAGE_3 = $12-21-03-0060.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" "12-21-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0060"
+			Else
+			Topping "Load" "12-21-03-0060"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-21-01-0060.NameE
+		Var menu_desc_eng_hot = $12-21-01-0060.descriptionE
+		Var menu_name_thai_hot = $12-21-01-0060.Name
+		Var menu_desc_thai_hot = $12-21-01-0060.description
+		
+		Var menu_name_eng_cold = $12-21-02-0060.NameE
+		Var menu_desc_eng_cold = $12-21-02-0060.descriptionE
+		Var menu_name_thai_cold = $12-21-02-0060.Name
+		Var menu_desc_thai_cold = $12-21-02-0060.description
+		
+		Var menu_name_eng_blender = $12-21-03-0060.NameE
+		Var menu_desc_eng_blender = $12-21-03-0060.descriptionE
+		Var menu_name_thai_blender = $12-21-03-0060.Name
+		Var menu_desc_thai_blender = $12-21-03-0060.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> "PEACH CAFE LATTE" </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> "Espresso, Peach Syrup,
+Sugar, Milk" </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> $12-21-01-0060.Button </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> $12-21-01-0060.Button </State>
+	<Value> StringFmt( $12-21-01-0060.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-21-02-0060.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-21-02-0060.Button </State>
+	<Value> StringFmt( $12-21-02-0060.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> $12-21-03-0060.Button </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> $12-21-03-0060.Button </State>
+	<Value> StringFmt( $12-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum122101006012210200601221030060 = "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 $Sum122101006012210200601221030060 = "Disable" Then
+				STRCONTAIN "ERR" $12-21-01-0060.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-02-0060.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-21-03-0060.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> $Sum122101006012210200601221030060 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 </FrameScroll>
 ; Cart
 <Button>
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@ -6083,9 +6083,9 @@ Strawberry Syrup" </Value>
 	<State> Flag( 12-03-01-0038.Button,12-03-02-0038.Button,12-03-03-0038.Button,$Sum120301003812030200381203030038) </State> 
 	<Button>
 	<State> $Sum120301003812030200381203030038 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Milk.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -6093,7 +6093,7 @@ Strawberry Syrup" </Value>
 		Var NameDrinkTH = "นมพีช"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช และนม "
 		Var DrinkDescription = "Mint Syrup and Milk"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-03-01-0038.Price
 		Var PriceD2 = $12-03-02-0038.Price
@ -6335,9 +6335,9 @@ Strawberry Syrup" </Value>
 	<State> Flag( 12-03-02-0039.Button,12-03-03-0039.Button,$Sum12030200391203030039) </State> 
 	<Button>
 	<State> $Sum12030200391203030039 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Cocoa.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Cocoa.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Cocoa.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -6345,7 +6345,7 @@ Strawberry Syrup" </Value>
 		Var NameDrinkTH = "โกโก้พีช"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช นม น้ำตาล และโกโก้"
 		Var DrinkDescription = "Mint Syrup, Milk, Sugar, Cocoa"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Cocoa.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-03-02-0039.Price
@ -6584,9 +6584,9 @@ Sugar, Cocoa" </Value>
 	<State> Flag( 12-03-03-0040.Button,$Sum1203030040) </State> 
 	<Button>
 	<State> $Sum1203030040 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Oreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Oreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Oreo_smoothie.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -6594,7 +6594,7 @@ Sugar, Cocoa" </Value>
 		Var NameDrinkTH = "พีชโอริโอ้ภูเขาไฟ"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Peach Syrup, Milk, Sugar, Oreo"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Oreo_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
--- a/xml/page_catalog_group_oreo.xml
+++ b/xml/page_catalog_group_oreo.xml
@ -3563,9 +3563,9 @@ Sugar, Oreo" </Value>
 	<State> Flag( 12-03-03-0040.Button,$Sum1203030040) </State> 
 	<Button>
 	<State> $Sum1203030040 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Oreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Oreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Oreo_smoothie.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -3573,7 +3573,7 @@ Sugar, Oreo" </Value>
 		Var NameDrinkTH = "พีชโอริโอ้ภูเขาไฟ"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Peach Syrup, Milk, Sugar, Oreo"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Oreo_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
@ -3811,9 +3811,9 @@ Sugar, Oreo" </Value>
 	<State> Flag( .Button,.Button,.Button,$Sum) </State> 
 	<Button>
 	<State> $Sum </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Oreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Oreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Oreo_smoothie.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -3821,7 +3821,7 @@ Sugar, Oreo" </Value>
 		Var NameDrinkTH = "พีชโอริโอ้ภูเขาไฟ"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Peach Syrup, Milk, Sugar, Oreo"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Oreo_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $.Price
 		Var PriceD2 = $.Price
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@ -8762,9 +8762,9 @@ LEMON SODA" </Value>
 	<State> Flag( 12-05-02-0069.Button,$Sum1205020069) </State> 
 	<Button>
 	<State> $Sum1205020069 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_peach_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_peach_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_peach_soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -8772,7 +8772,7 @@ LEMON SODA" </Value>
 		Var NameDrinkTH = "พีชโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช และโซดา"
 		Var DrinkDescription = "Peach Syrup& Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_peach_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0069.Price
@ -9010,9 +9010,9 @@ LEMON SODA" </Value>
 	<State> Flag( $Sum) </State> 
 	<Button>
 	<State> $Sum </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Mint_peach_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Mint_peach_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Mint_peach_soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -9020,7 +9020,7 @@ LEMON SODA" </Value>
 		Var NameDrinkTH = "พีชมิ้นท์โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช น้ำเชื่อมมิ้นท์ และโซดา"
 		Var DrinkDescription = "Peach Syrup, Mint Syrup& Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_peach_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
@ -9258,9 +9258,9 @@ LEMON SODA" </Value>
 	<State> Flag( 12-05-02-0071.Button,$Sum1205020071) </State> 
 	<Button>
 	<State> $Sum1205020071 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Mint_peach_lime_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Mint_peach_lime_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Mint_peach_lime_soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -9268,7 +9268,7 @@ LEMON SODA" </Value>
 		Var NameDrinkTH = "พีชมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีท มะนาว และโซดา  "
 		Var DrinkDescription = "Peach Syrup, Lime, Soda & Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_peach_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0071.Price
@ -9506,9 +9506,9 @@ LEMON SODA" </Value>
 	<State> Flag( 12-05-02-0072.Button,$Sum1205020072) </State> 
 	<Button>
 	<State> $Sum1205020072 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_pepsi.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_pepsi.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_pepsi.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -9516,7 +9516,7 @@ LEMON SODA" </Value>
 		Var NameDrinkTH = "เป๊ปซี่พีช"
 		Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมพีช และโซดา"
 		Var DrinkDescription = "Pepsi, Peach Syrup& Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_pepsi.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0072.Price
@ -9754,9 +9754,9 @@ LEMON SODA" </Value>
 	<State> Flag( 12-05-02-0073.Button,$Sum1205020073) </State> 
 	<Button>
 	<State> $Sum1205020073 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Strawberry_Soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Strawberry_Soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Strawberry_Soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -9764,7 +9764,7 @@ LEMON SODA" </Value>
 		Var NameDrinkTH = "พีชสตรอเบอร์รี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช น้ำเชื่อมสตรอเบอร์รี่  และโซดา"
 		Var DrinkDescription = "Peach Syrup, Strawberry Syrup,Soda & Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Strawberry_Soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0073.Price
@ -12743,9 +12743,9 @@ Water, Ice" </Value>
 	<State> Flag( 12-05-02-0068.Button,$Sum1205020068) </State> 
 	<Button>
 	<State> $Sum1205020068 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_peach.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_peach.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_peach.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -12753,7 +12753,7 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำพีช"
 		Var DrinkDescriptionTH = "น้ำเชื่อมพีช น้ำ  "
 		Var DrinkDescription = "Peach Syrup, Water & Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_peach.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0068.Price
--- a/xml/page_catalog_group_soft_serve.xml
+++ b/xml/page_catalog_group_soft_serve.xml
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -5855,9 +5855,9 @@ LIMENADE" </Value>
 	<State> Flag( 12-02-01-0051.Button,12-02-02-0051.Button,12-02-03-0051.Button,$Sum120201005112020200511202030051) </State> 
 	<Button>
 	<State> $Sum120201005112020200511202030051 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_peach_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_peach_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_peach_tea.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -5865,7 +5865,7 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชาพีช"
 		Var DrinkDescriptionTH = "ชาไทย และน้ำเชื่อมพีช"
 		Var DrinkDescription = "Thai Tea, Peach Syrup & Water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_peach_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0051.Price
 		Var PriceD2 = $12-02-02-0051.Price
@ -6107,9 +6107,9 @@ LIMENADE" </Value>
 	<State> Flag( 12-02-02-0052.Button,$Sum1202020052) </State> 
 	<Button>
 	<State> $Sum1202020052 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_peach_jasmine_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_peach_jasmine_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_peach_jasmine_tea.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@ -6117,7 +6117,7 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชามะลิพีช"
 		Var DrinkDescriptionTH = "ชามะลิ และน้ำเชื่อมพีช"
 		Var DrinkDescription = "Jasmine Tea, Peach Syrup &Milk"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_peach_jasmine_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-02-02-0052.Price