From 743b298694b0adffc179bdada47a74dad9aaeb1b Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Wed, 9 Jun 2021 14:27:45 +0700
Subject: [PATCH] Move release lid and straw to brewing3..xml

---
 animation01/Menu Description - Sheet1.tsv |  12 +-
 xml/page_brewing3.xml                     |   2 -
 xml/page_catalog_choose_drink6.pml        |   3 +
 xml/page_catalog_choose_drink6.xml        | 333 ++++++++++++++++++++--
 xml/page_drinkok.xml                      |  14 +
 xml/page_lid_straw.xml                    |   9 +-
 xml/page_topping_select.xml               |  14 +
 7 files changed, 346 insertions(+), 41 deletions(-)

diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index b8ffe531..025aad50 100644
--- a/animation01/Menu Description - Sheet1.tsv	
+++ b/animation01/Menu Description - Sheet1.tsv	
@@ -74,14 +74,14 @@ Ice	12-05-02-0017	1	23								24	32	0:32	28
 Iced water	12-05-02-0018	1	23	16							24	62	1:02	29
 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												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
 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
 THAI TEA SHAKE	12-04-02-0005	1	25	26	6	7	10	23			24	223	3:43	37
-KOKUTO SHAKE	12-04-02-0006	1	25	26	27	17	23				24	180	3:00	35
+KOKUTO SHAKE	12-04-02-0006	1	25	26	26	17	23				24	180	3:00	35
 BLUEBERRY SHAKE	12-04-02-0007	1	25	26	20	17	23				24	171	2:51	33
 TAIWANESE TEA SHAKE	12-04-02-0008	1	25	26	10	17	23				24	197	3:17	39
 CARAMEL SHAKE	12-04-02-0009	1	25	26	22	17	23				24	196	3:16	38
@@ -106,7 +106,11 @@ ICED AMERICANO ETHIOPAI GUJI	12-01-02-0011	1	2	3	4	5	23	16			24	133	2:13	32
 ESPRESSO ETHIOPAI GUJI	12-01-01-0013	1	2	3	4	5					24	66	1:06	32
 ICED MATCHA LIMENADE	12-02-02-0012	1	8	9	12	23					24	1	1	32
 HOT MATCHA LIMENADE	12-02-01-0012	1	8	9	12	16					24	1	1	32
-	12-05-02-0023													
+Energy drink 	12-05-02-0034	1	34	23							24	100	3:40	32
+Energy drink soda	12-05-02-0035	1	34	13	23						24	100	3:40	32
+Mango milk	12-03-02-0007	1	31	7	31	23					24	100	4:40	32
+														
+														
 														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
@@ -197,7 +201,7 @@ TAIWANESE TEA SHAKE	14-04-02-0008	1	25	26	10	17	23				24	197	3:17	39
 CARAMEL SHAKE	14-04-02-0009	1	25	26	22	17	23				24	196	3:16	38
 MILK SHAKE	14-04-02-0010	1	25	26	6	7	23				24	120	2:00	23
 PLAIN PROTEIN	14-04-02-0011	1	25	26	23						24	100	1:40	32
-Energy drink 	14-05-02-0034	1	34	23							24	100	2:40	32
+Energy drink 	14-05-02-0034	1	34	23							24	100	3:40	32
 Energy drink soda	14-05-02-0035	1	34	13	23						24	100	3:40	32
 Energy drink Pepsi	14-05-02-0036	1	34	14	23						24	100	4:40	32
 Energy drink lime soda	14-05-02-0037	1	34	12	13	23					24	100	5:40	32
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index a9eeb648..2a42d2ef 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -7,8 +7,6 @@
 <EventOpen>
 	
 	; On open move from page_brewing3.xml
-	;Var LidState = "Enable"
-	Var StarwState = "Enable"
 	Var countClick2 = 0
 
 	Var Timeout = 0
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index 81da1449..998fb8f8 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -7,6 +7,7 @@
 
  product_code = []
  product_code.append('12-05-02-0007')
+ product_code.append('12-05-02-0020')
  product_code.append('12-05-02-0021')
  product_code.append('12-05-02-0035')
  product_code.append('12-05-02-0010')
@@ -30,6 +31,8 @@
 
  product_code.append('12-05-01-0001')
  product_code.append('12-05-02-0001')
+ product_code.append('12-05-02-0034')
+ 
  product_code.append('12-05-02-0004')
  product_code.append('12-05-02-0005')
 
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index f80f8cb9..89b7c798 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -356,7 +356,100 @@
 	<Value> $12-05-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=2 12-05-02-0021 
+	; button i=2 12-05-02-0020 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0020.Button  </State> 
+	<Button>
+	<State> $12-05-02-0020.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0020.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0020.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0020.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0020.Self
+		Var NameDrink = $12-05-02-0020.NameE
+		Var NameDrinkTH = $12-05-02-0020.Name
+		Var DrinkDescriptionTH = $12-05-02-0020.description
+		Var DrinkDescription = $12-05-02-0020.descriptionE
+		Var PriceDrink = $12-05-02-0020.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0020.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-0020.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-0020.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-0020.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-0020.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-0020.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=3 12-05-02-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -449,7 +542,100 @@
 	<Value> $12-05-02-0021.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=3 12-05-02-0010 
+	; button i=4 12-05-02-0035 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0035.Button  </State> 
+	<Button>
+	<State> $12-05-02-0035.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0035.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0035.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0035.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0035.Self
+		Var NameDrink = $12-05-02-0035.NameE
+		Var NameDrinkTH = $12-05-02-0035.Name
+		Var DrinkDescriptionTH = $12-05-02-0035.description
+		Var DrinkDescription = $12-05-02-0035.descriptionE
+		Var PriceDrink = $12-05-02-0035.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0035.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-0035.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-0035.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-0035.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-0035.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-0035.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=5 12-05-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -542,7 +728,7 @@
 	<Value> $12-05-02-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=4 12-05-02-0011 
+	; button i=6 12-05-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -635,7 +821,7 @@
 	<Value> $12-05-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=5 12-05-02-0028 
+	; button i=7 12-05-02-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -728,7 +914,7 @@
 	<Value> $12-05-02-0028.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=6 12-05-02-0012 
+	; button i=8 12-05-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -821,7 +1007,7 @@
 	<Value> $12-05-02-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-05-02-0013 
+	; button i=9 12-05-02-0013 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -914,7 +1100,7 @@
 	<Value> $12-05-02-0013.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-05-02-0025 
+	; button i=10 12-05-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1007,7 +1193,7 @@
 	<Value> $12-05-02-0025.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-05-02-0031 
+	; button i=11 12-05-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1100,7 +1286,7 @@
 	<Value> $12-05-02-0031.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-05-02-0008 
+	; button i=12 12-05-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1193,7 +1379,7 @@
 	<Value> $12-05-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-05-02-0009 
+	; button i=13 12-05-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1286,7 +1472,7 @@
 	<Value> $12-05-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-05-02-0024 
+	; button i=14 12-05-02-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1379,7 +1565,7 @@
 	<Value> $12-05-02-0024.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-05-02-0029 
+	; button i=15 12-05-02-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1472,7 +1658,7 @@
 	<Value> $12-05-02-0029.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-05-02-0014 
+	; button i=16 12-05-02-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1565,7 +1751,7 @@
 	<Value> $12-05-02-0014.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-05-02-0015 
+	; button i=17 12-05-02-0015 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1658,7 +1844,7 @@
 	<Value> $12-05-02-0015.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-05-01-0001 
+	; button i=18 12-05-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1751,7 +1937,7 @@
 	<Value> $12-05-01-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-05-02-0001 
+	; button i=19 12-05-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1844,7 +2030,100 @@
 	<Value> $12-05-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-05-02-0004 
+	; button i=20 12-05-02-0034 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0034.Button  </State> 
+	<Button>
+	<State> $12-05-02-0034.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0034.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0034.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0034.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0034.Self
+		Var NameDrink = $12-05-02-0034.NameE
+		Var NameDrinkTH = $12-05-02-0034.Name
+		Var DrinkDescriptionTH = $12-05-02-0034.description
+		Var DrinkDescription = $12-05-02-0034.descriptionE
+		Var PriceDrink = $12-05-02-0034.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0034.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-0034.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-0034.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-0034.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-0034.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-0034.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=21 12-05-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1937,7 +2216,7 @@
 	<Value> $12-05-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-05-02-0005 
+	; button i=22 12-05-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2030,7 +2309,7 @@
 	<Value> $12-05-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-05-02-0006 
+	; button i=23 12-05-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2123,7 +2402,7 @@
 	<Value> $12-05-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-05-02-0026 
+	; button i=24 12-05-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2216,7 +2495,7 @@
 	<Value> $12-05-02-0026.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-05-02-0030 
+	; button i=25 12-05-02-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2309,7 +2588,7 @@
 	<Value> $12-05-02-0030.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-05-02-0002 
+	; button i=26 12-05-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2402,7 +2681,7 @@
 	<Value> $12-05-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-05-02-0003 
+	; button i=27 12-05-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2495,7 +2774,7 @@
 	<Value> $12-05-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-05-02-0016 
+	; button i=28 12-05-02-0016 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2588,7 +2867,7 @@
 	<Value> $12-05-02-0016.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-05-02-0017 
+	; button i=29 12-05-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2681,7 +2960,7 @@
 	<Value> $12-05-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-05-02-0018 
+	; button i=30 12-05-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2774,7 +3053,7 @@
 	<Value> $12-05-02-0018.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 12-05-01-0002 
+	; button i=31 12-05-01-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index 562c799f..7c633512 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -6,6 +6,19 @@
 <Volume> SoundVolume </Volume>
 <Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
 <EventOpen>
+	DEBUGVAR StarwState
+	DEBUGVAR LidState
+	
+
+	If StarwState = "Press" Then
+		Machine Straw
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+	If LidState = "Press" Then
+		Machine Lid
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+
 	; On open
 	Var LidState = "Enable"
 	Var StarwState = "Enable"
@@ -24,6 +37,7 @@
 	Var VideoPlayFile = VideoPlayFile + VideoFileEnd
 	Var Timeout = 0
 
+
 	If TNumberTaobinMember = "" Then
 
 	Else
diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml
index 402545ee..f12ae461 100644
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@@ -78,14 +78,7 @@
 	If lidAndStrawOldPageIgnore = "true" Then
 		Var lidAndStrawOldPageIgnore = "false"
 
-		If StarwState = "Press" Then
-			Machine Straw
-			LED LedDoorLid Blink 255 255 255 255
-		EndIf
-		If LidState = "Press" Then
-			Machine Lid
-			LED LedDoorLid Blink 255 255 255 255
-		EndIf
+		
 		
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 	EndIf
diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml
index 0821ff68..5348be53 100644
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@@ -516,6 +516,20 @@
 <Value> showdesc </Value>
 </Text>
 
+;<Text>
+;<X> 0 </X>
+;<Y> 880 </Y>
+;<State> BGSugar </State>
+;<Width> 1080</Width>
+;<Align> Center </Align>
+;<Size> 18 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xEE8C62 </Color>
+;<Value> "*ห้ามดื่มเกินวันละ 2 แก้ว เพราะหัวใจสั่น นอนไม่หลับ เด็กและสตรีมีครรภ์ไม่ควรดื่ม ผู้ป่วยควรปรึกษาแพทย์ก่อน" </Value>
+;</Text>
+
+
+
 
 ; back
 <Button>