diff --git a/inter/mys/animation01/play_list.tsv b/inter/mys/animation01/play_list.tsv
index 974dcb11..2ff0ff3f 100644
--- a/inter/mys/animation01/play_list.tsv
+++ b/inter/mys/animation01/play_list.tsv
@@ -904,7 +904,7 @@ MAELON LATTE SMOOTHIE	12-01-03-0039
 นมพีชเย็น	12-03-02-0038	1	7	60	16	23					24	120	15:00	23
 พีชโซดา	12-05-02-0069	1	60	60	13	23					24	120	15:00	23
 โกโก้พีชเย็น	12-03-02-0039	1	7	15	60	16	23				24	120	15:00	23
-PEACH MINT SODA	12-05-02-0070										24	120	15:00	23
+PEACH MINT SODA	12-05-02-0070	1	60	59	13	23					24	120	15:00	23
 พีชมะนาวโซดา	12-05-02-0071	1	12	60	13	23					24	120	15:00	23
 เป๊ปซี่พีช	12-05-02-0072	1	14	60	12	23					24	120	15:00	23
 ชามะลิพีช	12-02-02-0052	1	16	60	10	23					24	120	15:00	23
@@ -917,7 +917,6 @@ PEACH MINT SODA	12-05-02-0070										24	120	15:00	23
 กาแฟพีชลาเต้เย็น	12-21-03-0060	1	2	3	5	60	7	41			24	120	15:00	23
 พีชสตรอเบอร์รี่โซดา	12-05-02-0073	1	19	60	23	13					24	120	15:00	23
 โกโก้พีชปั่น	12-03-03-0039	1	7	15	60	16	23	41			24	120	15:00	23
-
 HOT GINGER CAFE LATTE	12-21-01-0061	1	10	6	2	3	4	5			24	120	15:00	23
 ICED GINGER CAFE LATTE	12-21-02-0061	1	10	6	2	3	4	5	23		24	120	15:00	23
 HOT GINGER MILK TEA	12-02-01-0053	1	6	10							24	120	15:00	23
diff --git a/inter/mys/image/page_drink_disable_n2/bn_Mint_peach_soda.png b/inter/mys/image/page_drink_disable_n2/bn_Mint_peach_soda.png
new file mode 100644
index 00000000..6542c9d3
Binary files /dev/null and b/inter/mys/image/page_drink_disable_n2/bn_Mint_peach_soda.png differ
diff --git a/inter/mys/image/page_drink_disable_n2/bn_hot_peach_latte.png b/inter/mys/image/page_drink_disable_n2/bn_hot_peach_latte.png
new file mode 100644
index 00000000..2b1ee2b7
Binary files /dev/null and b/inter/mys/image/page_drink_disable_n2/bn_hot_peach_latte.png differ
diff --git a/inter/mys/image/page_drink_n/bn_Mint_peach_soda.png b/inter/mys/image/page_drink_n/bn_Mint_peach_soda.png
new file mode 100644
index 00000000..5f4605c9
Binary files /dev/null and b/inter/mys/image/page_drink_n/bn_Mint_peach_soda.png differ
diff --git a/inter/mys/image/page_drink_n/bn_hot_peach_latte.png b/inter/mys/image/page_drink_n/bn_hot_peach_latte.png
new file mode 100644
index 00000000..1cc6f615
Binary files /dev/null and b/inter/mys/image/page_drink_n/bn_hot_peach_latte.png differ
diff --git a/inter/mys/image/page_drink_picture2_n/bn_Mint_peach_soda.png b/inter/mys/image/page_drink_picture2_n/bn_Mint_peach_soda.png
new file mode 100644
index 00000000..339f1d5e
Binary files /dev/null and b/inter/mys/image/page_drink_picture2_n/bn_Mint_peach_soda.png differ
diff --git a/inter/mys/image/page_drink_picture2_n/bn_hot_peach_latte.png b/inter/mys/image/page_drink_picture2_n/bn_hot_peach_latte.png
new file mode 100644
index 00000000..d4342a6a
Binary files /dev/null and b/inter/mys/image/page_drink_picture2_n/bn_hot_peach_latte.png differ
diff --git a/inter/mys/image/page_drink_press_n/bn_Mint_peach_soda.png b/inter/mys/image/page_drink_press_n/bn_Mint_peach_soda.png
new file mode 100644
index 00000000..339f1d5e
Binary files /dev/null and b/inter/mys/image/page_drink_press_n/bn_Mint_peach_soda.png differ
diff --git a/inter/mys/image/page_drink_press_n/bn_hot_peach_latte.png b/inter/mys/image/page_drink_press_n/bn_hot_peach_latte.png
new file mode 100644
index 00000000..35b5931c
Binary files /dev/null and b/inter/mys/image/page_drink_press_n/bn_hot_peach_latte.png differ
diff --git a/inter/mys/xml/page_catalog_group_coffee.lxml b/inter/mys/xml/page_catalog_group_coffee.lxml
index 009ea019..f42c6125 100644
--- a/inter/mys/xml/page_catalog_group_coffee.lxml
+++ b/inter/mys/xml/page_catalog_group_coffee.lxml
@@ -21318,6 +21318,272 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 12-01-01-0060 12-01-02-0060 12-01-03-0060 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<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/inter/mys/image/page_drink_n//bn_hot_peach_latte.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_hot_peach_latte.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_hot_peach_latte.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/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
+		Var PriceD3 = $12-01-03-0060.Price
+		Var PD_CODE1 = "12-01-01-0060"
+		Var PD_CODE2 = "12-01-02-0060"
+		Var PD_CODE3 = "12-01-03-0060"
+		; begin lang 
+		Var aliasName[0] = "PEACH CAFE LATTE"
+		Var aliasDesc[0] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var aliasName[1] = "กาแฟพีชลาเต้"
+		Var aliasDesc[1] = "กาแฟ น้ำ นม และ พีช"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "PEACH CAFE LATTE"
+		Var aliasDesc[4] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var NameLang[0][0] = "HOT PEACH CAFE LATTE"
+		Var NameLang[0][1] = "กาแฟพีชลาเต้"
+		Var NameLang[0][2] = "-"
+		Var NameLang[0][3] = "-"
+		Var NameLang[0][4] = "HOT PEACH CAFE LATTE"
+		Var DescLang[0][0] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var DescLang[0][1] = "กาแฟ น้ำ นม และ พีช"
+		Var DescLang[0][2] = "-"
+		Var DescLang[0][3] = "-"
+		Var DescLang[0][4] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var NameLang[1][0] = "ICED PEACH CAFE LATTE"
+		Var NameLang[1][1] = "กาแฟพีชลาเต้"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "ICED PEACH CAFE LATTE"
+		Var DescLang[1][0] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		Var DescLang[1][1] = "กาแฟ น้ำ นม และ พีช"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		Var NameLang[2][0] = "PEACH CAFE LATTE SMOOTHIE"
+		Var NameLang[2][1] = "กาแฟพีชลาเต้"
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "PEACH CAFE LATTE SMOOTHIE"
+		Var DescLang[2][0] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		Var DescLang[2][1] = "กาแฟ น้ำ นม และ พีช"
+		Var DescLang[2][2] = "-"
+		Var DescLang[2][3] = "-"
+		Var DescLang[2][4] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		; end lang 
+		Var PD_STAGE_1 = $12-01-01-0060.Button
+		Var PD_STAGE_2 = $12-01-02-0060.Button
+		Var PD_STAGE_3 = $12-01-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-01-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0060"
+			Else
+			Topping "Load" "12-01-03-0060"
+			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>PEACH CAFE LATTE</LanguageSlot1>
+		<LanguageSlot2>กาแฟพีชลาเต้</LanguageSlot2>
+		<LanguageSlot3>PEACH CAFE LATTE</LanguageSlot3>
+		<LanguageSlot4>กาแฟพีชลาเต้</LanguageSlot4>
+		<LanguageSlot5>PEACH CAFE LATTE</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>Espresso, Peach Syrup,\nSugar, Milk</LanguageSlot1>
+		<LanguageSlot2>กาแฟ น้ำ นม และ พีช</LanguageSlot2>
+		<LanguageSlot3>Espresso, Peach Syrup,\nSugar, Milk</LanguageSlot3>
+		<LanguageSlot4>กาแฟ น้ำ นม และ พีช</LanguageSlot4>
+		<LanguageSlot5>Espresso, Peach Syrup,\nSugar, Milk</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> $12-01-01-0060.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> $12-01-01-0060.Button </State>
+	<Value> StringFmt(  $12-01-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-01-02-0060.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> $12-01-02-0060.Button </State>
+	<Value> StringFmt( $12-01-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-01-03-0060.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> $12-01-03-0060.Button </State>
+	<Value> StringFmt(  $12-01-03-0060.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120101006012010200601201030060 = "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 $Sum120101006012010200601201030060 = "Disable" Then
+				STRCONTAIN "ERR" $12-01-01-0060.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-02-0060.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-01-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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum120101006012010200601201030060 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; 12-01-01-0030 12-01-02-0030 12-01-03-0030 
@@ -21861,13 +22127,13 @@
 	<State> Flag( 12-21-01-0061.Button,12-21-02-0061.Button,$Sum12210100611221020061) </State> 
 	<Button>
 	<State> $Sum12210100611221020061 </State> 
-	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_lime_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_hot_lime_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_hot_lime_tea.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_lime_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-21-01-0061.Price
 		Var PriceD2 = $12-21-02-0061.Price
@@ -21880,32 +22146,32 @@
 		Var aliasDesc[0] = "Espresso, Milk, Ginger"
 		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 aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "GINGER CAFE LATTE"
+		Var aliasDesc[4] = "Espresso, Milk, Ginger"
 		Var NameLang[0][0] = "HOT GINGER CAFE LATTE"
 		Var NameLang[0][1] = "กาแฟขิงลาเต้"
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = ""
+		Var NameLang[0][2] = "-"
+		Var NameLang[0][3] = "-"
+		Var NameLang[0][4] = "HOT GINGER CAFE LATTE"
 		Var DescLang[0][0] = "Espresso, Milk, Ginger, \nWater"
 		Var DescLang[0][1] = "กาแฟ น้ำ นม ขิง"
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = ""
+		Var DescLang[0][2] = "-"
+		Var DescLang[0][3] = "-"
+		Var DescLang[0][4] = "Espresso, Milk, Ginger, \nWater"
 		Var NameLang[1][0] = "ICED GINGER CAFE LATTE"
 		Var NameLang[1][1] = "กาแฟขิงลาเต้"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "ICED GINGER CAFE LATTE"
 		Var DescLang[1][0] = "Espresso, Milk, Ginger, \nIce"
 		Var DescLang[1][1] = "กาแฟ น้ำ นม ขิง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Espresso, Milk, Ginger, \nIce"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -21967,7 +22233,7 @@
 		<LanguageSlot2>กาแฟขิงลาเต้</LanguageSlot2>
 		<LanguageSlot3>GINGER CAFE LATTE</LanguageSlot3>
 		<LanguageSlot4>กาแฟขิงลาเต้</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>GINGER CAFE LATTE</LanguageSlot5>
 		<LanguageSlot6>กาแฟขิงลาเต้</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -21983,7 +22249,7 @@
 		<LanguageSlot2>กาแฟ น้ำ นม ขิง</LanguageSlot2>
 		<LanguageSlot3>Espresso, Milk, Ginger</LanguageSlot3>
 		<LanguageSlot4>กาแฟ น้ำ นม ขิง</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Espresso, Milk, Ginger</LanguageSlot5>
 		<LanguageSlot6>กาแฟ น้ำ นม ขิง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml
index 37152657..9318b770 100644
--- a/inter/mys/xml/page_catalog_group_other.lxml
+++ b/inter/mys/xml/page_catalog_group_other.lxml
@@ -9541,6 +9541,268 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 12-05-02-0070 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-05-02-0070.Button,$Sum1205020070) </State> 
+	<Button>
+	<State> $Sum1205020070 </State> 
+	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_Mint_peach_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_Mint_peach_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_Mint_peach_soda.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_Mint_peach_soda.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-05-02-0070.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-05-02-0070"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "PEACH MINT SODA"
+		Var aliasDesc[0] = "Peach Syrup, Mint Syrup Soda& Ice"
+		Var aliasName[1] = "พีชมินต์โซดา"
+		Var aliasDesc[1] = "น้ำเชื่อมพีช น้ำเชื่อมมินต์ และโซดา"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "PEACH MINT SODA"
+		Var aliasDesc[4] = "Peach Syrup, Mint Syrup Soda& Ice"
+		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] = "PEACH MINT SODA"
+		Var NameLang[1][1] = "พีชมินต์โซดา"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "PEACH MINT SODA"
+		Var DescLang[1][0] = "Peach Syrup, Mint Syrup Soda& Ice"
+		Var DescLang[1][1] = "น้ำเชื่อมพีช น้ำเชื่อมมินต์ และโซดา"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Peach Syrup, Mint Syrup Soda& Ice"
+		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 = $12-05-02-0070.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-05-02-0070"
+		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>PEACH MINT SODA</LanguageSlot1>
+		<LanguageSlot2>พีชมินต์โซดา</LanguageSlot2>
+		<LanguageSlot3>PEACH MINT SODA</LanguageSlot3>
+		<LanguageSlot4>พีชมินต์โซดา</LanguageSlot4>
+		<LanguageSlot5>PEACH MINT SODA</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>Peach Syrup, Mint Syrup Soda& Ice</LanguageSlot1>
+		<LanguageSlot2>น้ำเชื่อมพีช น้ำเชื่อมมินต์ และโซดา</LanguageSlot2>
+		<LanguageSlot3>Peach Syrup, Mint Syrup Soda& Ice</LanguageSlot3>
+		<LanguageSlot4>น้ำเชื่อมพีช น้ำเชื่อมมินต์ และโซดา</LanguageSlot4>
+		<LanguageSlot5>Peach Syrup, Mint Syrup Soda& Ice</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> "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> $12-05-02-0070.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> $12-05-02-0070.Button </State>
+	<Value> StringFmt( $12-05-02-0070.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 $Sum1205020070 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-05-02-0070.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> $Sum1205020070 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 12-05-02-0078 - 
diff --git a/inter/mys/xml/page_catalog_group_tea.lxml b/inter/mys/xml/page_catalog_group_tea.lxml
index 47b05ae8..eccc75d1 100644
--- a/inter/mys/xml/page_catalog_group_tea.lxml
+++ b/inter/mys/xml/page_catalog_group_tea.lxml
@@ -11834,12 +11834,12 @@
 		Var aliasDesc[0] = "Ginger, Taiwanese tea, Milk"
 		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 aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "GINGER MILK TEA"
+		Var aliasDesc[4] = "Ginger, Taiwanese tea, Milk"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -11847,29 +11847,29 @@
 		Var NameLang[0][4] = ""
 		Var DescLang[0][0] = "Ginger, Taiwanese tea, Milk, \nWater"
 		Var DescLang[0][1] = "ชาไต้หวัน นม ขิง"
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = ""
+		Var DescLang[0][2] = "-"
+		Var DescLang[0][3] = "-"
+		Var DescLang[0][4] = "Ginger, Taiwanese tea, Milk, \nWater"
 		Var NameLang[1][0] = "ICED GINGER MILK TEA"
 		Var NameLang[1][1] = "ชานมขิง"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "ICED GINGER MILK TEA"
 		Var DescLang[1][0] = "Ginger, Taiwanese tea, Milk, \nIce"
 		Var DescLang[1][1] = "ชาไต้หวัน นม ขิง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Ginger, Taiwanese tea, Milk, \nIce"
 		Var NameLang[2][0] = "GINGER MILK TEA SMOOTHIE"
 		Var NameLang[2][1] = "ชานมขิง"
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "GINGER MILK TEA SMOOTHIE"
 		Var DescLang[2][0] = "Ginger, Taiwanese tea, \nMilk, Water"
 		Var DescLang[2][1] = "ชาไต้หวัน นม ขิง"
-		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][2] = "-"
+		Var DescLang[2][3] = "-"
+		Var DescLang[2][4] = "Ginger, Taiwanese tea, \nMilk, Water"
 		; end lang 
 		Var PD_STAGE_1 = $12-02-01-0053.Button
 		Var PD_STAGE_2 = $12-02-02-0053.Button
@@ -11921,7 +11921,7 @@
 		<LanguageSlot2>ชานมขิง</LanguageSlot2>
 		<LanguageSlot3>GINGER MILK TEA</LanguageSlot3>
 		<LanguageSlot4>ชานมขิง</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>GINGER MILK TEA</LanguageSlot5>
 		<LanguageSlot6>ชานมขิง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11937,7 +11937,7 @@
 		<LanguageSlot2>ชาไต้หวัน นม ขิง</LanguageSlot2>
 		<LanguageSlot3>Ginger, Taiwanese tea, Milk</LanguageSlot3>
 		<LanguageSlot4>ชาไต้หวัน นม ขิง</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Ginger, Taiwanese tea, Milk</LanguageSlot5>
 		<LanguageSlot6>ชาไต้หวัน นม ขิง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -12100,32 +12100,32 @@
 		Var aliasDesc[0] = "Ginger, Yuzu, Water"
 		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 aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "GINGER YUZU TEA"
+		Var aliasDesc[4] = "Ginger, Yuzu, Water"
 		Var NameLang[0][0] = "HOT GINGER YUZU TEA"
 		Var NameLang[0][1] = "ชาขิงยูซุ"
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = ""
+		Var NameLang[0][2] = "-"
+		Var NameLang[0][3] = "-"
+		Var NameLang[0][4] = "HOT GINGER YUZU TEA"
 		Var DescLang[0][0] = "Ginger, Yuzu, Water"
 		Var DescLang[0][1] = "ขิง น้ำเชื่อมยูซุ"
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = ""
+		Var DescLang[0][2] = "-"
+		Var DescLang[0][3] = "-"
+		Var DescLang[0][4] = "Ginger, Yuzu, Water"
 		Var NameLang[1][0] = "ICED GINGER YUZU TEA"
 		Var NameLang[1][1] = "ชาขิงยูซุ"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "ICED GINGER YUZU TEA"
 		Var DescLang[1][0] = "Ginger, Yuzu, Ice"
 		Var DescLang[1][1] = "ขิง น้ำเชื่อมยูซุ"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Ginger, Yuzu, Ice"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -12187,7 +12187,7 @@
 		<LanguageSlot2>ชาขิงยูซุ</LanguageSlot2>
 		<LanguageSlot3>GINGER YUZU TEA</LanguageSlot3>
 		<LanguageSlot4>ชาขิงยูซุ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>GINGER YUZU TEA</LanguageSlot5>
 		<LanguageSlot6>ชาขิงยูซุ</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -12203,7 +12203,7 @@
 		<LanguageSlot2>ขิง น้ำเชื่อมยูซุ</LanguageSlot2>
 		<LanguageSlot3>Ginger, Yuzu, Water</LanguageSlot3>
 		<LanguageSlot4>ขิง น้ำเชื่อมยูซุ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Ginger, Yuzu, Water</LanguageSlot5>
 		<LanguageSlot6>ขิง น้ำเชื่อมยูซุ</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -12366,12 +12366,12 @@
 		Var aliasDesc[0] = "Ginger, Matcha, Water \n& Ice"
 		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 aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "GINGER MATCHA"
+		Var aliasDesc[4] = "Ginger, Matcha, Water \n& Ice"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -12384,14 +12384,14 @@
 		Var DescLang[0][4] = ""
 		Var NameLang[1][0] = "ICED GINGER MATCHA"
 		Var NameLang[1][1] = "ชาเขียวญี่ปุ่นขิง"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "ICED GINGER MATCHA"
 		Var DescLang[1][0] = "Ginger, Matcha, Water \n& Ice"
 		Var DescLang[1][1] = "ชาเขียว น้ำ ขิง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Ginger, Matcha, Water \n& Ice"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -12453,7 +12453,7 @@
 		<LanguageSlot2>ชาเขียวญี่ปุ่นขิง</LanguageSlot2>
 		<LanguageSlot3>GINGER MATCHA</LanguageSlot3>
 		<LanguageSlot4>ชาเขียวญี่ปุ่นขิง</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>GINGER MATCHA</LanguageSlot5>
 		<LanguageSlot6>ชาเขียวญี่ปุ่นขิง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -12469,7 +12469,7 @@
 		<LanguageSlot2>ชาเขียว น้ำ ขิง</LanguageSlot2>
 		<LanguageSlot3>Ginger, Matcha, Water \n& Ice</LanguageSlot3>
 		<LanguageSlot4>ชาเขียว น้ำ ขิง</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Ginger, Matcha, Water \n& Ice</LanguageSlot5>
 		<LanguageSlot6>ชาเขียว น้ำ ขิง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -12624,16 +12624,16 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-02-03-0056"
 		; begin lang 
-		Var aliasName[0] = "GINGER MILK TEA OREO SMOOTHIE"
+		Var aliasName[0] = "GINGER MILK TEA\nOREO SMOOTHIE"
 		Var aliasDesc[0] = "Ginger, Milk, Oreo"
 		Var aliasName[1] = "ชานมขิงโอริโอ้ปั่น"
 		Var aliasDesc[1] = "ขิง นม Oreo"
-		Var aliasName[2] = ""
-		Var aliasDesc[2] = ""
-		Var aliasName[3] = ""
-		Var aliasDesc[3] = ""
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "GINGER MILK TEA\nOREO SMOOTHIE"
+		Var aliasDesc[4] = "Ginger, Milk, Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -12654,16 +12654,16 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "GINGER MILK TEA OREO SMOOTHIE"
+		Var NameLang[2][0] = "GINGER MILK TEA\nOREO SMOOTHIE###size=58"
 		Var NameLang[2][1] = "ชานมขิงโอริโอ้ปั่น"
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "GINGER MILK TEA\nOREO SMOOTHIE###size=58"
 		Var DescLang[2][0] = "Ginger, Milk, Oreo, Ice"
-		Var DescLang[2][1] = "ขิง นม น้ำแข็ง และ Oreo"
-		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][1] = "ขิง นม น้ำแข็ง และ Oreo "
+		Var DescLang[2][2] = "-"
+		Var DescLang[2][3] = "-"
+		Var DescLang[2][4] = "Ginger, Milk, Oreo, Ice"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -12711,11 +12711,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>GINGER MILK TEA OREO SMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot1>
 		<LanguageSlot2>ชานมขิงโอริโอ้ปั่น</LanguageSlot2>
-		<LanguageSlot3>GINGER MILK TEA OREO SMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot3>
 		<LanguageSlot4>ชานมขิงโอริโอ้ปั่น</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot5>
 		<LanguageSlot6>ชานมขิงโอริโอ้ปั่น</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -12731,7 +12731,7 @@
 		<LanguageSlot2>ขิง นม Oreo</LanguageSlot2>
 		<LanguageSlot3>Ginger, Milk, Oreo</LanguageSlot3>
 		<LanguageSlot4>ขิง นม Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Ginger, Milk, Oreo</LanguageSlot5>
 		<LanguageSlot6>ขิง นม Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml
index bbf6378b..4e8f439a 100644
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@@ -269,6 +269,10 @@
 	If LanguageShow = "ENG" Then
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
 	EndIf
+
+	If LanguageShow = "MALAY" Then
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+	EndIf
 	
 	If LanguageShow = "THAI" Then
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"