diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index fb0aff87..7ca49596 100644
--- a/animation01/Menu Description - Sheet1.tsv	
+++ b/animation01/Menu Description - Sheet1.tsv	
@@ -135,6 +135,12 @@ ICED GINGER TEA	12-02-02-0020	1	10	23							24	88	2:28	42
 GINGER SODA	12-05-02-0038	1	10	13	23						24	88	3:28	42
 GINGER LIME \nSODA	12-05-02-0039	1	10	13	12	23					24	88	4:28	42
 														
+STRAWBERRY SODA	12-05-02-0041	1	19	23	13						24	55	0:55	17
+ICED STRAWBERRY	12-05-02-0040	1	16	19	23						24	75	1:15	24
+Hot strawberry tea	12-02-01-0022	1	10	19							24	90	1:30	43
+Iced strawberrry tea	12-02-02-0022	1	10	19	23						24	85	1:25	27
+STRAWBERRY SHAKE	12-04-02-0013	1	25	26	19	17	23				24	178	2:58	35
+														
 														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv
index 9b3edf4a..fb0aff87 100644
--- a/animation01/Menu Description - Sheet1_.tsv	
+++ b/animation01/Menu Description - Sheet1_.tsv	
@@ -76,7 +76,7 @@ Hot Water	12-05-01-0002	1	16								24	55	0:55	51
 Coke	12-05-02-0019												0:00	#DIV/0!
 Sprite	12-05-02-0020	1	23	18							24	20	0:20	8
 7UP	12-05-02-0021	1	23	18							24	20	0:20	8
-MATCHA SHAKE	12-04-02-0001	1	25	26	15	6	7	23			24	181	3:01	30
+MATCHA SHAKE	12-04-02-0001	1	25	26	9	6	7	23			24	181	3:01	30
 CHOCOLATE SHAKE	12-04-02-0002	1	25	26	6	7	15	23			24	219	3:39	36
 STRAWBERRY SHAKE	12-04-02-0003	1	25	26	19	17	23				24	178	2:58	35
 ESPRESSO SHAKE	12-04-02-0004	1	25	26	2	3	4	5	17	23	24	230	3:50	28
@@ -129,6 +129,13 @@ HOT LYCHEE AMERICANO	12-01-01-0017	1	2	3	4	5	11	16			24	100	21:40	32
 ICED LYCHEE AMERICANO	12-01-02-0017	1	2	3	4	5	11	16	23		24	100	22:40	32
 ETHIOPAI GUJI DIRTY	12-01-02-0018	1	7	2	3	4	5				24	100	22:40	32
 														
+HOT GINGER TEA	12-02-01-0020	1	10								24	88	1:28	42
+HOT LIME \nGINGER TEA	12-02-01-0021	1	10	12							24	88	1:28	42
+ICED GINGER TEA	12-02-02-0020	1	10	23							24	88	2:28	42
+GINGER SODA	12-05-02-0038	1	10	13	23						24	88	3:28	42
+GINGER LIME \nSODA	12-05-02-0039	1	10	13	12	23					24	88	4:28	42
+														
+														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
 double espresso	14-11-01-0001	1	2	3	4	5						116	1:56	28
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 523720fc..5cb2169f 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -651,12 +651,13 @@
 
 
 	If MachineStage = "show-menu" Then
-		SAVELOG "back_to_main from line  > 654."
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		If MachineState_Result = 0 Then
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		EndIf
 	EndIf
 	
 	If MachineStage = "close-maintenance" Then
-		SAVELOG "back_to_main from line  > 659."
+		SAVELOG "back_to_main from line  > 488."
 		Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
 	EndIf
 	
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 7663b0f2..ca10ae9e 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -1284,7 +1284,100 @@
 	<Value> $12-02-01-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-02-01-0010 
+	; button i=12 12-02-01-0022 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-01-0022.Button  </State> 
+	<Button>
+	<State> $12-02-01-0022.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-01-0022.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-01-0022.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-01-0022.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-01-0022.Self
+		Var NameDrink = $12-02-01-0022.NameE
+		Var NameDrinkTH = $12-02-01-0022.Name
+		Var DrinkDescriptionTH = $12-02-01-0022.description
+		Var DrinkDescription = $12-02-01-0022.descriptionE
+		Var PriceDrink = $12-02-01-0022.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-01-0022.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-02-01-0022.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-01-0022.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-01-0022.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-02-01-0022.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-02-01-0022.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=13 12-02-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1377,7 +1470,7 @@
 	<Value> $12-02-01-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-02-01-0011 
+	; button i=14 12-02-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1470,7 +1563,7 @@
 	<Value> $12-02-01-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-02-01-0012 
+	; button i=15 12-02-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1563,7 +1656,7 @@
 	<Value> $12-02-01-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-02-01-0017 
+	; button i=16 12-02-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1656,7 +1749,7 @@
 	<Value> $12-02-01-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-02-02-0020 
+	; button i=17 12-02-02-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1749,7 +1842,7 @@
 	<Value> $12-02-02-0020.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-02-02-0001 
+	; button i=18 12-02-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1842,7 +1935,7 @@
 	<Value> $12-02-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-02-02-0002 
+	; button i=19 12-02-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1935,7 +2028,7 @@
 	<Value> $12-02-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-02-02-0003 
+	; button i=20 12-02-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2028,7 +2121,7 @@
 	<Value> $12-02-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-02-02-0004 
+	; button i=21 12-02-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2121,7 +2214,7 @@
 	<Value> $12-02-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-02-02-0005 
+	; button i=22 12-02-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2214,7 +2307,7 @@
 	<Value> $12-02-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-02-02-0006 
+	; button i=23 12-02-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2307,7 +2400,7 @@
 	<Value> $12-02-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-02-02-0007 
+	; button i=24 12-02-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2400,7 +2493,7 @@
 	<Value> $12-02-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-02-02-0008 
+	; button i=25 12-02-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2493,7 +2586,7 @@
 	<Value> $12-02-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-02-02-0019 
+	; button i=26 12-02-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2586,7 +2679,7 @@
 	<Value> $12-02-02-0019.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-02-02-0009 
+	; button i=27 12-02-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2679,7 +2772,100 @@
 	<Value> $12-02-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-02-02-0010 
+	; button i=28 12-02-02-0022 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-02-0022.Button  </State> 
+	<Button>
+	<State> $12-02-02-0022.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-02-0022.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-02-0022.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-02-0022.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-02-0022.Self
+		Var NameDrink = $12-02-02-0022.NameE
+		Var NameDrinkTH = $12-02-02-0022.Name
+		Var DrinkDescriptionTH = $12-02-02-0022.description
+		Var DrinkDescription = $12-02-02-0022.descriptionE
+		Var PriceDrink = $12-02-02-0022.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-02-0022.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-02-02-0022.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-02-0022.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-02-0022.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-02-02-0022.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-02-02-0022.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=29 12-02-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2772,7 +2958,7 @@
 	<Value> $12-02-02-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 12-02-02-0011 
+	; button i=30 12-02-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2865,7 +3051,7 @@
 	<Value> $12-02-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=29 12-02-02-0012 
+	; button i=31 12-02-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2958,7 +3144,7 @@
 	<Value> $12-02-02-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=30 12-05-02-0027 
+	; button i=32 12-05-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index fdb6a09c..f645e540 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -820,7 +820,100 @@
 	<Value> $12-05-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-05-02-0006 
+	; button i=7 12-05-02-0040 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0040.Button  </State> 
+	<Button>
+	<State> $12-05-02-0040.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0040.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0040.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0040.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0040.Self
+		Var NameDrink = $12-05-02-0040.NameE
+		Var NameDrinkTH = $12-05-02-0040.Name
+		Var DrinkDescriptionTH = $12-05-02-0040.description
+		Var DrinkDescription = $12-05-02-0040.descriptionE
+		Var PriceDrink = $12-05-02-0040.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0040.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-05-02-0040.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-05-02-0040.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-05-02-0040.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-05-02-0040.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-05-02-0040.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=8 12-05-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 8732d388..25dd3dc3 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -1100,7 +1100,100 @@
 	<Value> $12-05-02-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-05-02-0013 
+	; button i=10 12-05-02-0041 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0041.Button  </State> 
+	<Button>
+	<State> $12-05-02-0041.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0041.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0041.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0041.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0041.Self
+		Var NameDrink = $12-05-02-0041.NameE
+		Var NameDrinkTH = $12-05-02-0041.Name
+		Var DrinkDescriptionTH = $12-05-02-0041.description
+		Var DrinkDescription = $12-05-02-0041.descriptionE
+		Var PriceDrink = $12-05-02-0041.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0041.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-05-02-0041.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-05-02-0041.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-05-02-0041.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-05-02-0041.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-05-02-0041.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=11 12-05-02-0013 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1193,7 +1286,7 @@
 	<Value> $12-05-02-0013.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-05-02-0031 
+	; button i=12 12-05-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1286,7 +1379,7 @@
 	<Value> $12-05-02-0031.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-05-02-0008 
+	; button i=13 12-05-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1379,7 +1472,7 @@
 	<Value> $12-05-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-05-02-0009 
+	; button i=14 12-05-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1472,7 +1565,7 @@
 	<Value> $12-05-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-05-02-0024 
+	; button i=15 12-05-02-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1565,7 +1658,7 @@
 	<Value> $12-05-02-0024.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-05-02-0038 
+	; button i=16 12-05-02-0038 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1658,7 +1751,7 @@
 	<Value> $12-05-02-0038.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-05-02-0029 
+	; button i=17 12-05-02-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1751,7 +1844,7 @@
 	<Value> $12-05-02-0029.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-05-02-0025 
+	; button i=18 12-05-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1844,7 +1937,7 @@
 	<Value> $12-05-02-0025.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-05-02-0039 
+	; button i=19 12-05-02-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1937,7 +2030,7 @@
 	<Value> $12-05-02-0039.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-05-02-0014 
+	; button i=20 12-05-02-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2030,7 +2123,7 @@
 	<Value> $12-05-02-0014.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-05-02-0015 
+	; button i=21 12-05-02-0015 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2123,7 +2216,7 @@
 	<Value> $12-05-02-0015.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-05-01-0001 
+	; button i=22 12-05-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2216,7 +2309,7 @@
 	<Value> $12-05-01-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-05-02-0001 
+	; button i=23 12-05-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2309,7 +2402,7 @@
 	<Value> $12-05-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-05-02-0034 
+	; button i=24 12-05-02-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2402,7 +2495,7 @@
 	<Value> $12-05-02-0034.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-05-02-0004 
+	; button i=25 12-05-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2495,7 +2588,7 @@
 	<Value> $12-05-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-05-02-0032 
+	; button i=26 12-05-02-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2588,7 +2681,7 @@
 	<Value> $12-05-02-0032.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-05-02-0005 
+	; button i=27 12-05-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2681,7 +2774,100 @@
 	<Value> $12-05-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-05-02-0006 
+	; button i=28 12-05-02-0040 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0040.Button  </State> 
+	<Button>
+	<State> $12-05-02-0040.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0040.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0040.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0040.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0040.Self
+		Var NameDrink = $12-05-02-0040.NameE
+		Var NameDrinkTH = $12-05-02-0040.Name
+		Var DrinkDescriptionTH = $12-05-02-0040.description
+		Var DrinkDescription = $12-05-02-0040.descriptionE
+		Var PriceDrink = $12-05-02-0040.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0040.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-05-02-0040.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-05-02-0040.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-05-02-0040.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-05-02-0040.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-05-02-0040.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=29 12-05-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2774,7 +2960,7 @@
 	<Value> $12-05-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 12-05-02-0026 
+	; button i=30 12-05-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2867,7 +3053,7 @@
 	<Value> $12-05-02-0026.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=29 12-05-02-0030 
+	; button i=31 12-05-02-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2960,7 +3146,7 @@
 	<Value> $12-05-02-0030.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=30 12-05-02-0002 
+	; button i=32 12-05-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3053,7 +3239,7 @@
 	<Value> $12-05-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=31 12-05-02-0003 
+	; button i=33 12-05-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3146,7 +3332,7 @@
 	<Value> $12-05-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=32 12-05-02-0016 
+	; button i=34 12-05-02-0016 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3239,7 +3425,7 @@
 	<Value> $12-05-02-0016.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=33 12-05-02-0017 
+	; button i=35 12-05-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3332,7 +3518,7 @@
 	<Value> $12-05-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=34 12-05-02-0018 
+	; button i=36 12-05-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3425,7 +3611,7 @@
 	<Value> $12-05-02-0018.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=35 12-05-01-0002 
+	; button i=37 12-05-01-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index 00028244..ba59c856 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -541,7 +541,100 @@
 	<Value> $12-04-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=4 12-04-02-0004 
+	; button i=4 12-04-02-0013 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-04-02-0013.Button  </State> 
+	<Button>
+	<State> $12-04-02-0013.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-04-02-0013.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-04-02-0013.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-04-02-0013.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-04-02-0013.Self
+		Var NameDrink = $12-04-02-0013.NameE
+		Var NameDrinkTH = $12-04-02-0013.Name
+		Var DrinkDescriptionTH = $12-04-02-0013.description
+		Var DrinkDescription = $12-04-02-0013.descriptionE
+		Var PriceDrink = $12-04-02-0013.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-04-02-0013.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-04-02-0013.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-04-02-0013.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-04-02-0013.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-04-02-0013.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-04-02-0013.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=5 12-04-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -634,7 +727,7 @@
 	<Value> $12-04-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=5 12-04-02-0005 
+	; button i=6 12-04-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -727,7 +820,7 @@
 	<Value> $12-04-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=6 12-04-02-0006 
+	; button i=7 12-04-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -820,7 +913,7 @@
 	<Value> $12-04-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-04-02-0007 
+	; button i=8 12-04-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -913,7 +1006,7 @@
 	<Value> $12-04-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-04-02-0008 
+	; button i=9 12-04-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1006,7 +1099,7 @@
 	<Value> $12-04-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-04-02-0009 
+	; button i=10 12-04-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1099,7 +1192,7 @@
 	<Value> $12-04-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-04-02-0010 
+	; button i=11 12-04-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1192,7 +1285,7 @@
 	<Value> $12-04-02-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-04-02-0011 
+	; button i=12 12-04-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml
index 6d3b9720..1e8045f2 100644
--- a/xml/page_drinkfail2.xml
+++ b/xml/page_drinkfail2.xml
@@ -11,13 +11,21 @@
 	Var TNumberTaobinMember = ""
 
 	
+	DEBUGVAR TelephoneNumberProblem
+	
 	If TelephoneNumberProblem = "" Then
 
 	Else
-		Var ERROR_PAY_TIMEOUT = "false"	
+		;Var ERROR_PAY_TIMEOUT = "false"	
 		Var NumberFailed = "true"
 		CHECKNUMBERFAIL TelephoneNumberProblem NumberFailed
 
+		DEBUGVAR NumberFailed
+		DEBUGVAR ERROR_PAY_TIMEOUT
+		DEBUGVAR ERROR_BREW_CAUSE_ENG
+		DEBUGVAR ERROR_BREW_CAUSE_THAI
+
+
 		If ERROR_PAY_TIMEOUT = "true" Then
 			
 			If NumberFailed = "false" Then