diff --git a/inter/mys/xml/page_catalog_group_whey.lxml b/inter/mys/xml/page_catalog_group_whey.lxml
index d83954ec..67e4a1ac 100644
--- a/inter/mys/xml/page_catalog_group_whey.lxml
+++ b/inter/mys/xml/page_catalog_group_whey.lxml
@@ -2190,15 +2190,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 12-04-02-0004,12-24-02-0004 - 
+	; - 12-04-02-0004 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-04-02-0004,12-24-02-0004.Button,$Sum1204020004,1224020004) </State> 
+	<State> Flag( 12-04-02-0004.Button,$Sum1204020004) </State> 
 	<Button>
-	<State> $Sum1204020004,1224020004 </State> 
+	<State> $Sum1204020004 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_protein_espresso.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_protein_espresso.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_espresso.png" </FilenameDisable>
@@ -2208,10 +2208,10 @@
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-04-02-0004,12-24-02-0004.Price
+		Var PriceD2 = $12-04-02-0004.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-04-02-0004,12-24-02-0004"
+		Var PD_CODE2 = "12-04-02-0004"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "ESPRESSO SHAKE"
@@ -2234,16 +2234,16 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
+		Var NameLang[1][0] = "ESPRESSO SHAKE"
+		Var NameLang[1][1] = "เอสเพรสโซ่โปรตีน"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
+		Var NameLang[1][4] = "SHAKE ESPRESSO"
+		Var DescLang[1][0] = "Whey protein, Espressoand Milk"
+		Var DescLang[1][1] = "เวย์โปรตีน กาแฟ นม"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Protein Whey, Espresso, Susu"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -2256,7 +2256,7 @@
 		Var DescLang[2][4] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-04-02-0004,12-24-02-0004.Button
+		Var PD_STAGE_2 = $12-04-02-0004.Button
 		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -2273,7 +2273,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0004,12-24-02-0004"
+			Topping "Load" "12-04-02-0004"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2353,7 +2353,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-04-02-0004,12-24-02-0004.Button </State>
+	<State> $12-04-02-0004.Button </State>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -2363,8 +2363,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-04-02-0004,12-24-02-0004.Button </State>
-	<Value> StringFmt( $12-04-02-0004,12-24-02-0004.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-04-02-0004.Button </State>
+	<Value> StringFmt( $12-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -2407,9 +2407,9 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1204020004,1224020004 = "Disable" Then
+			If $Sum1204020004 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-04-02-0004,12-24-02-0004.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-04-02-0004.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -2444,7 +2444,269 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1204020004,1224020004 </State> 
+	<State> $Sum1204020004 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 12-24-02-0004 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-24-02-0004.Button,$Sum1224020004) </State> 
+	<Button>
+	<State> $Sum1224020004 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_protein_espresso.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_protein_espresso.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_espresso.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-24-02-0004.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-24-02-0004"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "ESPRESSO SHAKE"
+		Var aliasDesc[0] = "Whey protein, Espresso\n& Milk"
+		Var aliasName[1] = "เอสเพรสโซ่โปรตีน"
+		Var aliasDesc[1] = "เวย์โปรตีน กาแฟ นม"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "SHAKE ESPRESSO"
+		Var aliasDesc[4] = "Protein Whey, Espresso, Susu"
+		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] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		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-24-02-0004.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-24-02-0004"
+		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>ESPRESSO SHAKE</LanguageSlot1>
+		<LanguageSlot2>เอสเพรสโซ่โปรตีน</LanguageSlot2>
+		<LanguageSlot3>ESPRESSO SHAKE</LanguageSlot3>
+		<LanguageSlot4>เอสเพรสโซ่โปรตีน</LanguageSlot4>
+		<LanguageSlot5>SHAKE ESPRESSO</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>Whey protein, Espresso\n& Milk</LanguageSlot1>
+		<LanguageSlot2>เวย์โปรตีน กาแฟ นม</LanguageSlot2>
+		<LanguageSlot3>Whey protein, Espresso\n& Milk</LanguageSlot3>
+		<LanguageSlot4>เวย์โปรตีน กาแฟ นม</LanguageSlot4>
+		<LanguageSlot5>Protein Whey, Espresso, Susu</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-24-02-0004.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-24-02-0004.Button </State>
+	<Value> StringFmt( $12-24-02-0004.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 $Sum1224020004 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-24-02-0004.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> $Sum1224020004 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>