From 616956732fdbc07000740decc8b6a7d855d0e79a Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 22 Feb 2022 12:36:36 +0700
Subject: [PATCH 1/2] Relase 6.06

---
 animation01/Menu Description - Sheet1.tsv  | 13 +++++-
 animation01/Menu Description - Sheet1_.tsv | 47 ++++++++++++++++++++++
 sheet/best_seller.tsv                      |  4 ++
 xml/page_board.xml                         |  2 +-
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index fab55cfc..2338f15b 100644
--- a/animation01/Menu Description - Sheet1.tsv	
+++ b/animation01/Menu Description - Sheet1.tsv	
@@ -166,6 +166,17 @@ PEACHER	12-01-01-0028	1	2	47	3	4	5				24	66	1:06	32
 														
 Congee	12-06-01-0001	1	46								24	65	1:05	61
 														
+Pure beauty	12-01-02-0033	1	7	48	2	3	4	5			24	100	22:40	32
+Pure beauty	12-01-01-0032	1	2	48	3	4	5	16			24	88	1:28	32
+Pure beauty	12-01-02-0032	1	2	48	3	4	5	23	16		24	133	2:13	32
+Pure beauty	12-01-01-0033	1	2	48	3	4	5				24	66	1:06	32
+														
+														
+														
+														
+														
+														
+														
 														
 โกโก้สตอเบอร์รี่เย็น	12-03-02-0010	1	15	17	19	23					24	125	2:05	40
 โกโก้สตอเบอร์รี่ปั่น	12-03-03-0010	1	15	17	19	23	41				24	125	2:05	40
@@ -212,7 +223,7 @@ PLAIN PROTEIN	12-04-02-1018	1	25	26	23						24	100	1:40	32
 ESPRESSO SHAKE	12-04-02-1019	1	25	26	2	3	4	5	17	23	24	230	3:50	28
 CHOCOLATE SHAKE	12-04-02-1020	1	25	26	6	7	15	23			24	219	3:39	36
 THAI TEA SHAKE	12-04-02-1021	1	25	26	6	7	10	23			24	223	3:43	37
-														
+แอพ ฟาสท์ ชาเขียว	12-04-02-1022	1	25	26	9	6	7	23			24	181	3:01	30
 														
 														
 														
diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv
index 5aff906f..fab55cfc 100644
--- a/animation01/Menu Description - Sheet1_.tsv	
+++ b/animation01/Menu Description - Sheet1_.tsv	
@@ -177,6 +177,53 @@ Congee	12-06-01-0001	1	46								24	65	1:05	61
 														
 เอสเพรสโซ่ช็อต														
 														
+Hot Thai Tea café Latte	12-01-01-0029	1	2	3	4	5	6	7	10		24	161	2:41	22
+Hot Taiwanese Tea café Latte	12-01-01-0030	1	2	3	4	5	10				24	136	2:16	26
+Hot Matcha café Latte	12-01-01-0031	1	2	3	4	5	8	9	7		24	140	2:20	19
+Iced Thai Tea café Latte	12-01-02-0029	1	2	3	4	5	6	7	10	23	24	190	3:10	23
+Iced Taiwanese Tea café Latte	12-01-02-0030	1	2	3	4	5	10	23			24	178	2:58	29
+Iced Matcha café Latte	12-01-02-0031	1	2	3	4	5	8	9	7	23	24	204	3:24	25
+Iced Thai Tea café Latte	12-01-03-0029	2	3	4	5	6	7	10	23	41	24	190	3:10	23
+Iced Taiwanese Tea café Latte	12-01-03-0030	1	2	3	4	5	10	23	41		24	178	2:58	29
+Iced Matcha café Latte	12-01-03-0031	2	3	4	5	8	9	7	23	41	24	204	3:24	25
+Hot thai milk tea	12-02-01-0024	1	6	7	10						24	78	1:18	25
+Hot Taiwanese Tea	12-02-01-0025	1	6	7	10						24	90	1:30	29
+Hot matcha latte	12-02-01-0026	1	6	7	8	9					24	149	2:29	36
+HOT MATCHA	12-02-01-0027	1	16	8	9						24	100	14:40	32
+HOT MATCHA LIMENADE	12-02-01-0028	1	8	9	12	16					24	1	1	32
+Iced Thai milk Tea	12-02-02-0024	1	6	7	10	23					24	165	2:45	40
+Iced Taiwanese Tea	12-02-02-0025	1	6	7	10	23					24	104	1:44	25
+Iced matcha latte	12-02-02-0026	1	6	7	8	9	23				24	175	2:55	34
+ICED MATCHA	12-02-02-0027	1	16	8	9	23					24	100	15:40	32
+ICED MATCHA LIMENADE	12-02-02-0028	1	8	9	12	23					24	1	1	32
+ICED MATCHA	12-02-02-0029	1	16	8	9	23					24	100	15:40	32
+ICED MATCHA LIMENADE	12-02-02-0030	1	8	9	12	23					24	1	1	32
+ICED MATCHA	12-02-02-0031	1	16	8	9	23					24	100	15:40	32
+ICED MATCHA LIMENADE	12-02-02-0032	1	8	9	12	23					24	1	1	32
+Iced Thai milk Tea	12-02-03-0024	1	6	7	10	23	41				24	165	2:45	40
+Iced Taiwanese Tea	12-02-03-0025	1	6	7	10	23	41				24	104	1:44	25
+Iced matcha latte	12-02-03-0026	1	6	7	8	9	23	41			24	175	2:55	34
+ICED MATCHA	12-02-03-0027	1	16	8	9	23	41				24	100	15:40	32
+ICED MATCHA LIMENADE	12-02-03-0028	1	8	9	12	23	41				24	1	1	32
+THAI TEA SHAKE	12-04-02-0015	1	25	26	6	7	10	23			24	223	3:43	37
+MATCHA SHAKE	12-04-02-0016	1	25	26	9	6	7	23			24	181	3:01	30
+TAIWANESE TEA SHAKE	12-04-02-0017	1	25	26	10	17	23				24	197	3:17	39
+PLAIN PROTEIN	12-04-02-1018	1	25	26	23						24	100	1:40	32
+ESPRESSO SHAKE	12-04-02-1019	1	25	26	2	3	4	5	17	23	24	230	3:50	28
+CHOCOLATE SHAKE	12-04-02-1020	1	25	26	6	7	15	23			24	219	3:39	36
+THAI TEA SHAKE	12-04-02-1021	1	25	26	6	7	10	23			24	223	3:43	37
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
 														
 Coke	12-05-02-0019	1	23	37	13						24	49	0:49	23
 Coke	12-05-03-0019	1	23	37	13	41					24	49	0:49	23
diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv
index beff9184..b2529ccb 100644
--- a/sheet/best_seller.tsv
+++ b/sheet/best_seller.tsv
@@ -22,6 +22,10 @@
 12-01-01-0027
 12-01-02-0027
 12-01-01-0028
+12-01-02-0033
+12-01-01-0032
+12-01-02-0032
+12-01-01-0033
 12-01-02-0024
 12-01-01-0023
 12-01-02-0023
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 4928f7a1..0d3f4575 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -409,7 +409,7 @@
 		Var WebAppShow = "Invisible"
 	EndIf
 
-	READ_FILE "/mnt/sdcard/spiral" SpiralOnline
+	;READ_FILE "/mnt/sdcard/spiral" SpiralOnline
 
 	DEBUGVAR SpiralOnline
 </EventOpen>

From 52c9ceabb8f1fc8c93d460376837115892369c04 Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 22 Feb 2022 13:14:25 +0700
Subject: [PATCH 2/2] Release 6.06

---
 xml/page_catalog_choose_drink2.pml |   4 +
 xml/page_catalog_choose_drink2.xml | 512 ++++++++++++++++++++++++++---
 xml/page_payment.xml               |   2 +-
 xml/page_topping_select4.xml       |  10 +
 4 files changed, 483 insertions(+), 45 deletions(-)

diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index e354c7e7..5a714ea0 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -15,6 +15,7 @@
  product_code.append('12-01-01-0026')
  product_code.append('12-01-01-0024')
  product_code.append('12-01-01-0028')
+ product_code.append('12-01-01-0033')
 
  # Normal esp
  product_code.append('12-11-01-0001')
@@ -27,6 +28,7 @@
  product_code.append('12-01-01-0025')
  product_code.append('12-01-01-0023')
  product_code.append('12-01-01-0027')
+ product_code.append('12-01-01-0032')
  
  # End
  product_code.append('12-01-01-0004')
@@ -49,6 +51,7 @@
  product_code.append('12-01-02-0026')
  product_code.append('12-01-02-0024')
  product_code.append('12-01-02-0028')
+ product_code.append('12-01-02-0033')
 
  # End
  product_code.append('12-11-02-0001')
@@ -61,6 +64,7 @@
  product_code.append('12-01-02-0025')
  product_code.append('12-01-02-0023')
  product_code.append('12-01-02-0027')
+ product_code.append('12-01-02-0032')
 
  # End
  product_code.append('12-01-02-0002')
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index ae9f7c55..61ad6dbf 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -1233,7 +1233,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=8 12-11-01-0001 
+	; button i=8 12-01-01-0033 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0033.Button  </State> 
+	<Button>
+	<State> $12-01-01-0033.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0033.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0033.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0033.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0033.Self
+		Var NameDrink = $12-01-01-0033.NameE
+		Var NameDrinkTH = $12-01-01-0033.Name
+		Var DrinkDescriptionTH = $12-01-01-0033.description
+		Var DrinkDescription = $12-01-01-0033.descriptionE
+		Var PriceDrink = $12-01-01-0033.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0033.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0033.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.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-01-01-0033.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-01-01-0033.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-01-01-0033.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-01-01-0033.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-01-01-0033.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-01-0033.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=9 12-11-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1339,7 +1445,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=9 12-01-01-0003 
+	; button i=10 12-01-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1445,7 +1551,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=10 12-01-01-0014 
+	; button i=11 12-01-01-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1551,7 +1657,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=11 12-01-01-0019 
+	; button i=12 12-01-01-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1657,7 +1763,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=12 12-01-01-0021 
+	; button i=13 12-01-01-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1763,7 +1869,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=13 12-01-01-0025 
+	; button i=14 12-01-01-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1869,7 +1975,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=14 12-01-01-0023 
+	; button i=15 12-01-01-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1975,7 +2081,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=15 12-01-01-0027 
+	; button i=16 12-01-01-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2081,7 +2187,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=16 12-01-01-0004 
+	; button i=17 12-01-01-0032 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0032.Button  </State> 
+	<Button>
+	<State> $12-01-01-0032.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0032.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0032.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0032.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0032.Self
+		Var NameDrink = $12-01-01-0032.NameE
+		Var NameDrinkTH = $12-01-01-0032.Name
+		Var DrinkDescriptionTH = $12-01-01-0032.description
+		Var DrinkDescription = $12-01-01-0032.descriptionE
+		Var PriceDrink = $12-01-01-0032.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0032.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0032.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.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-01-01-0032.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-01-01-0032.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-01-01-0032.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-01-01-0032.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-01-01-0032.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-01-0032.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=18 12-01-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2187,7 +2399,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=17 12-01-01-0005 
+	; button i=19 12-01-01-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2293,7 +2505,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=18 12-01-01-0006 
+	; button i=20 12-01-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2399,7 +2611,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=19 12-01-01-0007 
+	; button i=21 12-01-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2505,7 +2717,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=20 12-01-01-0008 
+	; button i=22 12-01-01-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2611,7 +2823,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=21 12-01-01-0031 
+	; button i=23 12-01-01-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2717,7 +2929,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=22 12-01-01-0009 
+	; button i=24 12-01-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2823,7 +3035,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=23 12-01-01-0010 
+	; button i=25 12-01-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2929,7 +3141,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=24 12-01-01-0011 
+	; button i=26 12-01-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3035,7 +3247,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=25 12-01-01-0012 
+	; button i=27 12-01-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3141,7 +3353,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=26 12-01-01-0017 
+	; button i=28 12-01-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3247,7 +3459,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=27 12-01-02-0018 
+	; button i=29 12-01-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3353,7 +3565,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=28 12-01-02-0020 
+	; button i=30 12-01-02-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3459,7 +3671,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=29 12-01-02-0022 
+	; button i=31 12-01-02-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3565,7 +3777,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=30 12-01-02-0026 
+	; button i=32 12-01-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3671,7 +3883,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=31 12-01-02-0024 
+	; button i=33 12-01-02-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3777,7 +3989,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=32 12-01-02-0028 
+	; button i=34 12-01-02-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3883,7 +4095,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=33 12-11-02-0001 
+	; button i=35 12-01-02-0033 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0033.Button  </State> 
+	<Button>
+	<State> $12-01-02-0033.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0033.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0033.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0033.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0033.Self
+		Var NameDrink = $12-01-02-0033.NameE
+		Var NameDrinkTH = $12-01-02-0033.Name
+		Var DrinkDescriptionTH = $12-01-02-0033.description
+		Var DrinkDescription = $12-01-02-0033.descriptionE
+		Var PriceDrink = $12-01-02-0033.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0033.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0033.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.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-01-02-0033.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-01-02-0033.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-01-02-0033.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-01-02-0033.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-01-02-0033.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-02-0033.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=36 12-11-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3989,7 +4307,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=34 12-01-02-0001 
+	; button i=37 12-01-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4095,7 +4413,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=35 12-01-02-0011 
+	; button i=38 12-01-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4201,7 +4519,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=36 12-01-02-0019 
+	; button i=39 12-01-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4307,7 +4625,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=37 12-01-02-0021 
+	; button i=40 12-01-02-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4413,7 +4731,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=38 12-01-02-0025 
+	; button i=41 12-01-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4519,7 +4837,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=39 12-01-02-0023 
+	; button i=42 12-01-02-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4625,7 +4943,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=40 12-01-02-0027 
+	; button i=43 12-01-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4731,7 +5049,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=41 12-01-02-0002 
+	; button i=44 12-01-02-0032 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0032.Button  </State> 
+	<Button>
+	<State> $12-01-02-0032.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0032.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0032.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0032.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0032.Self
+		Var NameDrink = $12-01-02-0032.NameE
+		Var NameDrinkTH = $12-01-02-0032.Name
+		Var DrinkDescriptionTH = $12-01-02-0032.description
+		Var DrinkDescription = $12-01-02-0032.descriptionE
+		Var PriceDrink = $12-01-02-0032.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0032.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0032.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.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-01-02-0032.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-01-02-0032.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-01-02-0032.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-01-02-0032.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-01-02-0032.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-02-0032.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=45 12-01-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4837,7 +5261,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=42 12-11-02-0002 
+	; button i=46 12-11-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4943,7 +5367,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=43 12-01-02-0003 
+	; button i=47 12-01-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5049,7 +5473,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=44 12-01-02-0004 
+	; button i=48 12-01-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5155,7 +5579,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=45 12-01-02-0005 
+	; button i=49 12-01-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5261,7 +5685,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=46 12-01-02-0031 
+	; button i=50 12-01-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5367,7 +5791,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=47 12-01-02-0007 
+	; button i=51 12-01-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5473,7 +5897,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=48 12-01-02-0008 
+	; button i=52 12-01-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5579,7 +6003,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=49 12-01-02-0009 
+	; button i=53 12-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5685,7 +6109,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=50 12-01-02-0017 
+	; button i=54 12-01-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5791,7 +6215,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=51 12-01-02-0006 
+	; button i=55 12-01-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index b330fab9..b80d3d1c 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -93,7 +93,7 @@
 			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 		EndIf
 
-	End
+	EndIf
 
 	Var MachineStage = "-"
 
diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index 84bfefc1..995b5e9f 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -675,6 +675,16 @@
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
+		
+		If TOPPING2 = "add-show-1103" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+		
 
 ;-END
 		If TOPPING3 = "Collagen" Then