version free from drinkfailed

animation01/Menu Description - Sheet1.tsv

@@ -127,6 +127,13 @@ HOT LYCHEE TEA	12-02-01-0019	1	11	16							24	100	19:40	32
 ICED LYCHEE TEA	12-02-02-0019	1	11	16	23						24	100	20:40	32
 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
 														
 														
 														

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,28 @@ 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
+ENERGY DRINK PEPSI	12-05-02-0036	1	34	14	23						24	100	5:40	32
+ENERGY DRINK SODA	12-05-02-0035	1	34	13	23						24	100	6:40	32
+ENERGY DRINK LIMENADE	12-05-02-0037	1	34	12							24	100	7:40	32
+ICED ENERGY DRINK	12-05-02-0034	1	34	23							24	100	8:40	32
+ICED BLACK TEA	12-02-02-0005	1	23								24	100	9:40	32
+STRAWBERRY MILK	12-03-02-0007	1	23								24	100	10:40	32
+ICED LYCHEE LIMENADE SODA	12-05-02-0022	1	11	13	23						24	100	11:40	32
+iced strawlimenade soda	12-05-02-0023	1	19	13	23						24	100	12:40	32
+none	12-02-02-0013	1	12	13							24	100	13:40	32
+iced espresso L	12-01-02-0012	1	12	13							24	100	14:40	32
+iced cappu L	12-01-02-0013	1	12	13							24	100	15:40	32
+iced thai tea L	12-02-02-0015	1	12	13							24	100	16:40	32
+ICED LYCHEE	12-05-02-0032	1	11	16	23						24	100	17:40	32
+ICED LYCHEE SODA	12-05-02-0033	1	11	13	23						24	100	18:40	32
+HOT LYCHEE TEA	12-02-01-0019	1	11	16							24	100	19:40	32
+ICED LYCHEE TEA	12-02-02-0019	1	11	16	23						24	100	20:40	32
+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
 														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
@@ -197,7 +218,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

sheet/best_seller.tsv

@@ -1,4 +1,5 @@
 17/1/21	
+12-01-02-0018
 12-05-02-0029
 12-01-01-0001
 12-01-01-0003

xml/page_board.xml

@@ -13,7 +13,7 @@
 
 
 	Var GetFreeFromError = 0
-	Var taobin_version = "1.49"
+	Var taobin_version = "1.51"
 
 	; On open
 	Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -117,7 +117,7 @@
 	
 
 
-	Var ShowPrice = "Invisible"
+	Var ShowPrice = "Enable"
 	If RoadShow = "true" Then
 		Var ShowPrice = "Invisible"
 	EndIf
@@ -151,17 +151,99 @@
 	LED LedDoorLid Off 255 255 255 255
 
 
-	; Default
+; Default
-	Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv1.mp4"
+		Var AdvTaobinHome = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_"
-	Var video_main_1 = "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv3.mp4"
+		Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_"
-	Var video_main_2 = "/mnt/sdcard/coffeevending/taobin_project/campaign2/page_main.mp4"
+		Var AdvTaobinMenu2 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_"
-	Var video_main_3 = "/mnt/sdcard/coffeevending/taobin_project/campaign3/page_main.mp4"
+		Var video_main_0 = AdvTaobinHome + AdvertiseProfile7
-	Var video_main_4 = "/mnt/sdcard/coffeevending/taobin_project/campaign4/page_main.mp4"
+		Var video_main_0 = video_main_0 + ".mp4"
-	Var video_main_count = 5
+		Var video_main_1 = AdvTaobinHome + AdvertiseProfile8
+		Var video_main_1 = video_main_1 + ".mp4"
+		Var video_main_2 = AdvTaobinHome + AdvertiseProfile9
+		Var video_main_2 = video_main_2 + ".mp4"
+		Var video_main_3 = AdvTaobinHome + AdvertiseProfile10
+		Var video_main_3 = video_main_3 + ".mp4"
+		Var video_main_4 = AdvTaobinHome + AdvertiseProfile11
+		Var video_main_4 = video_main_4 + ".mp4"
+		Var video_main_5 = AdvTaobinHome + AdvertiseProfile12
+		Var video_main_5 = video_main_5 + ".mp4"	
 
+	If AdvertiseProfile7 = "00" Then
+		Var video_main_count = 1
+	Else
+		If AdvertiseProfile8 = "00" Then
+			Var video_main_count = 1
+		Else
+			If AdvertiseProfile9 = "00" Then
+				Var video_main_count = 2
+			Else
+				If AdvertiseProfile10 = "00" Then
+					Var video_main_count = 3
+				Else
+					If AdvertiseProfile11 = "00" Then
+						Var video_main_count = 4
+					Else
+						If AdvertiseProfile12 = "00" Then
+							Var video_main_count = 5
+						Else
+							Var video_main_count = 6
+						EndIf
+					EndIf
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+	If VideoAdvIndex = 0 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile7
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 1 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile8
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 2 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile9
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 3 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile10
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 4 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile11
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 5 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile12
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
+
+	If VideoAdvIndex = 0 Then
+		Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile7
+		Var video_menu_1 = video_menu_1 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 1 Then
+		Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile8
+		Var video_menu_1 = video_menu_1 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 2 Then
+		Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile9
+		Var video_menu_1 = video_menu_1 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 3 Then
+		Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile10
+		Var video_menu_1 = video_menu_1 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 4 Then
+		Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile11
+		Var video_menu_1 = video_menu_1 + ".mp4"
+	EndIf
+	If VideoAdvIndex = 5 Then
+		Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile12
+		Var video_menu_1 = video_menu_1 + ".mp4"
+	EndIf
 
-	Var video_menu_1 = "ROOT/taobin_project/video/taobin_adv2_1.mp4"
-	Var video_menu_0 = "ROOT/taobin_project/video/taobin_adv2.mp4"
 
 	If CAMPAIGN1 = "true" Then
 		Var video_menu_1 = "ROOT/taobin_project/campaign1/page_catalog_menu.mp4"

xml/page_catalog_choose_drink2.pml

@@ -26,6 +26,8 @@
  product_code.append('12-01-01-0011')
  product_code.append('12-01-01-0012')
  product_code.append('12-01-01-0017')
+ product_code.append('12-01-02-0018')
+ 
 
  product_code.append('12-11-02-0001')
  product_code.append('12-01-02-0001')

xml/page_catalog_choose_drink2.xml

@@ -1564,7 +1564,100 @@
 	<Value> $12-01-01-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-11-02-0001 
+	; button i=15 12-01-02-0018 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0018.Button  </State> 
+	<Button>
+	<State> $12-01-02-0018.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0018.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0018.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0018.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0018.Self
+		Var NameDrink = $12-01-02-0018.NameE
+		Var NameDrinkTH = $12-01-02-0018.Name
+		Var DrinkDescriptionTH = $12-01-02-0018.description
+		Var DrinkDescription = $12-01-02-0018.descriptionE
+		Var PriceDrink = $12-01-02-0018.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0018.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-01-02-0018.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-0018.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-0018.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-0018.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-0018.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=16 12-11-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1657,7 +1750,7 @@
 	<Value> $12-11-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-01-02-0001 
+	; button i=17 12-01-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1750,7 +1843,7 @@
 	<Value> $12-01-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-01-02-0011 
+	; button i=18 12-01-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1843,7 +1936,7 @@
 	<Value> $12-01-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-01-02-0002 
+	; button i=19 12-01-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1936,7 +2029,7 @@
 	<Value> $12-01-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-11-02-0002 
+	; button i=20 12-11-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2029,7 +2122,7 @@
 	<Value> $12-11-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-01-02-0003 
+	; button i=21 12-01-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2122,7 +2215,7 @@
 	<Value> $12-01-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-01-02-0004 
+	; button i=22 12-01-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2215,7 +2308,7 @@
 	<Value> $12-01-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-01-02-0005 
+	; button i=23 12-01-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2308,7 +2401,7 @@
 	<Value> $12-01-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-01-02-0007 
+	; button i=24 12-01-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2401,7 +2494,7 @@
 	<Value> $12-01-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-01-02-0008 
+	; button i=25 12-01-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2494,7 +2587,7 @@
 	<Value> $12-01-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-01-02-0009 
+	; button i=26 12-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2587,7 +2680,7 @@
 	<Value> $12-01-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-01-02-0017 
+	; button i=27 12-01-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2680,7 +2773,7 @@
 	<Value> $12-01-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 11-01-02-0009 
+	; button i=28 11-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>

xml/page_catalog_choose_drink3.pml

@@ -8,6 +8,8 @@
  product_code.append('12-02-01-0001')
  product_code.append('12-02-01-0002')
  
+ product_code.append('12-02-01-0020')
+ 
  product_code.append('12-02-01-0003')
  product_code.append('12-02-01-0004')
  
@@ -15,6 +17,8 @@
  #product_code.append('12-02-01-0005') #HOT BLACK TEA
  product_code.append('12-02-01-0006')
  
+ product_code.append('12-02-01-0021')
+ 
  product_code.append('12-02-01-0007')
  product_code.append('12-02-01-0008')
  product_code.append('12-02-01-0019')
@@ -24,6 +28,8 @@
  product_code.append('12-02-01-0012')
  product_code.append('12-02-01-0017')
 
+ product_code.append('12-02-02-0020')
+ 
  product_code.append('12-02-02-0001')
  product_code.append('12-02-02-0002')
  product_code.append('12-02-02-0003')

xml/page_catalog_choose_drink3.xml

@@ -447,7 +447,100 @@
 	<Value> $12-02-01-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=3 12-02-01-0003 
+	; button i=3 12-02-01-0020 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-01-0020.Button  </State> 
+	<Button>
+	<State> $12-02-01-0020.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-01-0020.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-01-0020.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-01-0020.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-01-0020.Self
+		Var NameDrink = $12-02-01-0020.NameE
+		Var NameDrinkTH = $12-02-01-0020.Name
+		Var DrinkDescriptionTH = $12-02-01-0020.description
+		Var DrinkDescription = $12-02-01-0020.descriptionE
+		Var PriceDrink = $12-02-01-0020.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-01-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-02-01-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-02-01-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-02-01-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-02-01-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-02-01-0020.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=4 12-02-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -540,7 +633,7 @@
 	<Value> $12-02-01-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=4 12-02-01-0004 
+	; button i=5 12-02-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -633,7 +726,7 @@
 	<Value> $12-02-01-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=5 12-02-01-0006 
+	; button i=6 12-02-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -726,7 +819,100 @@
 	<Value> $12-02-01-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=6 12-02-01-0007 
+	; button i=7 12-02-01-0021 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-01-0021.Button  </State> 
+	<Button>
+	<State> $12-02-01-0021.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-01-0021.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-01-0021.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-01-0021.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-01-0021.Self
+		Var NameDrink = $12-02-01-0021.NameE
+		Var NameDrinkTH = $12-02-01-0021.Name
+		Var DrinkDescriptionTH = $12-02-01-0021.description
+		Var DrinkDescription = $12-02-01-0021.descriptionE
+		Var PriceDrink = $12-02-01-0021.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-01-0021.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-0021.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-0021.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-0021.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-0021.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-0021.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=8 12-02-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -819,7 +1005,7 @@
 	<Value> $12-02-01-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-02-01-0008 
+	; button i=9 12-02-01-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -912,7 +1098,7 @@
 	<Value> $12-02-01-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-02-01-0019 
+	; button i=10 12-02-01-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1005,7 +1191,7 @@
 	<Value> $12-02-01-0019.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-02-01-0009 
+	; button i=11 12-02-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1098,7 +1284,7 @@
 	<Value> $12-02-01-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-02-01-0010 
+	; button i=12 12-02-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1191,7 +1377,7 @@
 	<Value> $12-02-01-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-02-01-0011 
+	; button i=13 12-02-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1284,7 +1470,7 @@
 	<Value> $12-02-01-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-02-01-0012 
+	; button i=14 12-02-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1377,7 +1563,7 @@
 	<Value> $12-02-01-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-02-01-0017 
+	; button i=15 12-02-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1470,7 +1656,100 @@
 	<Value> $12-02-01-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-02-02-0001 
+	; button i=16 12-02-02-0020 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-02-0020.Button  </State> 
+	<Button>
+	<State> $12-02-02-0020.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-02-0020.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-02-0020.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-02-0020.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-02-0020.Self
+		Var NameDrink = $12-02-02-0020.NameE
+		Var NameDrinkTH = $12-02-02-0020.Name
+		Var DrinkDescriptionTH = $12-02-02-0020.description
+		Var DrinkDescription = $12-02-02-0020.descriptionE
+		Var PriceDrink = $12-02-02-0020.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-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-02-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-02-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-02-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-02-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-02-02-0020.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=17 12-02-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1563,7 +1842,7 @@
 	<Value> $12-02-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-02-02-0002 
+	; button i=18 12-02-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1656,7 +1935,7 @@
 	<Value> $12-02-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-02-02-0003 
+	; button i=19 12-02-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1749,7 +2028,7 @@
 	<Value> $12-02-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-02-02-0004 
+	; button i=20 12-02-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1842,7 +2121,7 @@
 	<Value> $12-02-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-02-02-0005 
+	; button i=21 12-02-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1935,7 +2214,7 @@
 	<Value> $12-02-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-02-02-0006 
+	; button i=22 12-02-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2028,7 +2307,7 @@
 	<Value> $12-02-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-02-02-0007 
+	; button i=23 12-02-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2121,7 +2400,7 @@
 	<Value> $12-02-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-02-02-0008 
+	; button i=24 12-02-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2214,7 +2493,7 @@
 	<Value> $12-02-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-02-02-0019 
+	; button i=25 12-02-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2307,7 +2586,7 @@
 	<Value> $12-02-02-0019.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-02-02-0009 
+	; button i=26 12-02-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2400,7 +2679,7 @@
 	<Value> $12-02-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-02-02-0010 
+	; button i=27 12-02-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2493,7 +2772,7 @@
 	<Value> $12-02-02-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-02-02-0011 
+	; button i=28 12-02-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2586,7 +2865,7 @@
 	<Value> $12-02-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-02-02-0012 
+	; button i=29 12-02-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2679,7 +2958,7 @@
 	<Value> $12-02-02-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-05-02-0027 
+	; button i=30 12-05-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>

xml/page_catalog_choose_drink6.pml

@@ -18,15 +18,18 @@
 
  product_code.append('12-05-02-0012')
  product_code.append('12-05-02-0013')
- product_code.append('12-05-02-0025')
  product_code.append('12-05-02-0031')
  product_code.append('12-05-02-0008')
  product_code.append('12-05-02-0009')
 
  product_code.append('12-05-02-0024')
 
- product_code.append('12-05-02-0029')
+ product_code.append('12-05-02-0038')
 
+ product_code.append('12-05-02-0029') # LIMENADE group
+ product_code.append('12-05-02-0025')
+ product_code.append('12-05-02-0039')
+ 
  product_code.append('12-05-02-0014')
  product_code.append('12-05-02-0015')
 

xml/page_catalog_choose_drink6.xml

@@ -1193,100 +1193,7 @@
 	<Value> $12-05-02-0013.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-05-02-0025 
+	; button i=11 12-05-02-0031 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> $12-05-02-0025.Button  </State> 
-	<Button>
-	<State> $12-05-02-0025.Button  </State> 
-	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0025.image ) </Filename>
-	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0025.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0025.image ) " </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var SelectDrink = $12-05-02-0025.Self
-		Var NameDrink = $12-05-02-0025.NameE
-		Var NameDrinkTH = $12-05-02-0025.Name
-		Var DrinkDescriptionTH = $12-05-02-0025.description
-		Var DrinkDescription = $12-05-02-0025.descriptionE
-		Var PriceDrink = $12-05-02-0025.Price
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0025.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-0025.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-0025.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-0025.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-0025.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-0025.descriptionE </Value>
-	</Text>
-</Block>
-	; button i=12 12-05-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1379,7 +1286,7 @@
 	<Value> $12-05-02-0031.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-05-02-0008 
+	; button i=12 12-05-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1472,7 +1379,7 @@
 	<Value> $12-05-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-05-02-0009 
+	; button i=13 12-05-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1565,7 +1472,7 @@
 	<Value> $12-05-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-05-02-0024 
+	; button i=14 12-05-02-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1657,6 +1564,99 @@
 	<State> showengText </State>
 	<Value> $12-05-02-0024.descriptionE </Value>
 	</Text>
+</Block>
+	; button i=15 12-05-02-0038 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0038.Button  </State> 
+	<Button>
+	<State> $12-05-02-0038.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0038.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0038.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0038.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0038.Self
+		Var NameDrink = $12-05-02-0038.NameE
+		Var NameDrinkTH = $12-05-02-0038.Name
+		Var DrinkDescriptionTH = $12-05-02-0038.description
+		Var DrinkDescription = $12-05-02-0038.descriptionE
+		Var PriceDrink = $12-05-02-0038.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0038.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-0038.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-0038.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-0038.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-0038.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-0038.descriptionE </Value>
+	</Text>
 </Block>
 	; button i=16 12-05-02-0029 
 <Block>
@@ -1751,7 +1751,193 @@
 	<Value> $12-05-02-0029.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-05-02-0014 
+	; button i=17 12-05-02-0025 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0025.Button  </State> 
+	<Button>
+	<State> $12-05-02-0025.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0025.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0025.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0025.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0025.Self
+		Var NameDrink = $12-05-02-0025.NameE
+		Var NameDrinkTH = $12-05-02-0025.Name
+		Var DrinkDescriptionTH = $12-05-02-0025.description
+		Var DrinkDescription = $12-05-02-0025.descriptionE
+		Var PriceDrink = $12-05-02-0025.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0025.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-0025.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-0025.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-0025.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-0025.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-0025.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=18 12-05-02-0039 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0039.Button  </State> 
+	<Button>
+	<State> $12-05-02-0039.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0039.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0039.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0039.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0039.Self
+		Var NameDrink = $12-05-02-0039.NameE
+		Var NameDrinkTH = $12-05-02-0039.Name
+		Var DrinkDescriptionTH = $12-05-02-0039.description
+		Var DrinkDescription = $12-05-02-0039.descriptionE
+		Var PriceDrink = $12-05-02-0039.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0039.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-0039.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-0039.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-0039.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-0039.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-0039.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=19 12-05-02-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1844,7 +2030,7 @@
 	<Value> $12-05-02-0014.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-05-02-0015 
+	; button i=20 12-05-02-0015 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1937,7 +2123,7 @@
 	<Value> $12-05-02-0015.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-05-01-0001 
+	; button i=21 12-05-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2030,7 +2216,7 @@
 	<Value> $12-05-01-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-05-02-0001 
+	; button i=22 12-05-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2123,7 +2309,7 @@
 	<Value> $12-05-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-05-02-0034 
+	; button i=23 12-05-02-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2216,7 +2402,7 @@
 	<Value> $12-05-02-0034.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-05-02-0004 
+	; button i=24 12-05-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2309,7 +2495,7 @@
 	<Value> $12-05-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-05-02-0032 
+	; button i=25 12-05-02-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2402,7 +2588,7 @@
 	<Value> $12-05-02-0032.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-05-02-0005 
+	; button i=26 12-05-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2495,7 +2681,7 @@
 	<Value> $12-05-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-05-02-0006 
+	; button i=27 12-05-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2588,7 +2774,7 @@
 	<Value> $12-05-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-05-02-0026 
+	; button i=28 12-05-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2681,7 +2867,7 @@
 	<Value> $12-05-02-0026.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-05-02-0030 
+	; button i=29 12-05-02-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2774,7 +2960,7 @@
 	<Value> $12-05-02-0030.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 12-05-02-0002 
+	; button i=30 12-05-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2867,7 +3053,7 @@
 	<Value> $12-05-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=29 12-05-02-0003 
+	; button i=31 12-05-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2960,7 +3146,7 @@
 	<Value> $12-05-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=30 12-05-02-0016 
+	; button i=32 12-05-02-0016 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3053,7 +3239,7 @@
 	<Value> $12-05-02-0016.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=31 12-05-02-0017 
+	; button i=33 12-05-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3146,7 +3332,7 @@
 	<Value> $12-05-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=32 12-05-02-0018 
+	; button i=34 12-05-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3239,7 +3425,7 @@
 	<Value> $12-05-02-0018.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=33 12-05-01-0002 
+	; button i=35 12-05-01-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>

xml/page_check_member.xml

@@ -6,7 +6,7 @@
 <Background> "0xEFEDEA" </Background>
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
-<EventOpen>2
+<EventOpen>
 	; On open
 
 	Var Timeout = 0

xml/page_drinkfail2.xml

@@ -18,7 +18,7 @@
 		Var NumberFailed = "true"
 		CHECKNUMBERFAIL TelephoneNumberProblem NumberFailed
 
-		If ERROR_PAY_TIMEOUT = "false" Then
+		If ERROR_PAY_TIMEOUT = "true" Then
 			
 			If NumberFailed = "false" Then
 

xml/page_drinkfail3.xml

@@ -34,8 +34,8 @@
 
     Var Timeout = Timeout + 1
 
-	If Timeout > 240 Then
+	;If Timeout > 10 Then
-    ;If Timeout > 10 Then
+    If Timeout > 240 Then
        Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
 	EndIf
 

xml/page_drinkfail4.xml

@@ -0,0 +1,238 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	
+	
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collectiing/"
+	EndIf
+
+	
+	Var Timeout = 0
+    Var GetFreeFlag = 0
+
+    Var ShowErrorText = "Invisible"
+
+    
+
+
+
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	
+
+    Var Timeout = Timeout + 1
+
+	
+
+    
+    If GetFreeFlag = 1 Then
+
+        If Timeout > 240 Then
+            StrLen TelephoneNumberProblem TelNumLen
+            If TelNumLen >= 10 Then  
+
+                If PayWithQR = 1 Then
+                    Var  VendingTSIDProblem = VendingTSIDTmp
+                Else
+                    Var VendingTSIDProblem = VendingTSID
+                EndIf
+
+                Var ProblemID = 7
+
+                Var ChooseProblem = "taobin purchasing problems"
+                PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
+
+            EndIf
+
+            If MachineStage = "remove-cup" Then
+                Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+            EndIf
+          
+        EndIf
+
+        If MachineStage = "remove-cup" Then
+			
+        Else
+            StrLen TelephoneNumberProblem TelNumLen
+            If TelNumLen >= 10 Then  
+
+                If PayWithQR = 1 Then
+                    Var  VendingTSIDProblem = VendingTSIDTmp
+                Else
+                    Var VendingTSIDProblem = VendingTSID
+                EndIf
+
+                Var ProblemID = 7
+
+                Var ChooseProblem = "taobin purchasing problems(Got Free)"
+                PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
+
+            EndIf
+            Var GetFreeFromError = 1
+            Var TelephoneNumberGOTFree = TelephoneNumberProblem
+            Var ShowPrice = "Invisible"
+            Open "ROOT/taobin_project/xml/page_catalog.xml" 
+        EndIf
+
+    Else
+        If Timeout > 60 Then
+            StrLen TelephoneNumberProblem TelNumLen
+            If TelNumLen >= 10 Then  
+
+                If PayWithQR = 1 Then
+                    Var  VendingTSIDProblem = VendingTSIDTmp
+                Else
+                    Var VendingTSIDProblem = VendingTSID
+                EndIf
+
+                Var ProblemID = 7
+
+                Var ChooseProblem = "taobin purchasing problems"
+                PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
+
+            EndIf
+
+            If MachineStage = "remove-cup" Then
+                Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+            EndIf
+        EndIf
+	EndIf
+
+
+    If MachineStage = "remove-cup" Then
+        Var ShowErrorText = "Enable"
+    Else
+        Var ShowErrorText = "Invisible"
+    EndIf
+
+   
+
+
+    Refresh
+	TimerReset
+    
+
+</EventTimeout> 
+
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+
+
+
+
+
+
+
+<Image>
+<X> 53 </X>
+<Y> 473 </Y>
+<Filename> Var( DirImage + "/img_popup13.png" )</Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 427 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Refresh> "Enable" </Refresh>
+<Value> TextErrorShow </Value>
+</Text>
+
+<Image>
+<X> 271 </X>
+<Y> 1479 </Y>
+<State> ShowErrorText </State>
+<Filename> Var( DirImage + "/text_20.png" )</Filename>
+</Image>
+
+
+
+<Button>
+<X> 294 </X>
+<Y> 1536 </Y>
+<Filename> Var( DirImage + "/bn_door_open2.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_door_open2.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+    If GetFreeFlag = 0 Then
+        Var GetFreeFlag = 1
+        Var Timeout = 0
+    EndIf
+
+    Machine RemoveCup
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 294 </X>
+<Y> 1677 </Y>
+<State> Door_Open_State </State>
+<Filename> Var( DirImage + "/bn_recieve_coupon.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_recieve_coupon.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    
+    Machine RemoveCup
+
+    StrLen TelephoneNumberProblem TelNumLen
+	If TelNumLen >= 10 Then  
+
+		If PayWithQR = 1 Then
+			Var  VendingTSIDProblem = VendingTSIDTmp
+		Else
+			Var VendingTSIDProblem = VendingTSID
+		EndIf
+
+		Var ProblemID = 7
+
+		Var ChooseProblem = "taobin purchasing problems"
+		PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
+
+	EndIf
+
+    If MachineStage = "remove-cup" Then
+		Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+	Else
+		
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
+</EventClick>
+</Button>
+
+
+</Popup>

xml/page_payment_credit3.xml

@@ -20,8 +20,6 @@
 
 	Var SumCreditAmount = CoffeeCredit
 
-	;Var SumCreditAmount = 5
-
 	Var NotEnoughFlag = 0
 
 	If SumCreditAmount >= PayAmount Then 

xml/page_topping_select.xml

@@ -92,6 +92,10 @@
 		Var PriceDrinkTmp = "Free"
 	EndIf
 
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
 	DEBUGVAR sugarKeto
 	If sugarKeto = "true" Then
@@ -858,6 +862,10 @@
 	Var PriceDrinkNoTop = PriceDrinkTmp
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	SAVELOG PriceDrinkTmp
 	Refresh
 
@@ -894,7 +902,10 @@
 
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
-	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	SAVELOG PriceDrinkTmp
 	Refresh
 
@@ -925,6 +936,10 @@
 	EndIf
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	Var PriceDrinkNoTop = PriceDrinkTmp
 
 	DEBUGVAR PriceDrinkTmp
@@ -955,6 +970,10 @@
 	EndIf
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	Var PriceDrinkNoTop = PriceDrinkTmp
 
 	DEBUGVAR PriceDrinkTmp
@@ -1013,6 +1032,10 @@
 
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	SAVELOG PriceDrinkTmp
 	Refresh
 
@@ -1048,6 +1071,9 @@
 
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
 	
 	SAVELOG PriceDrinkTmp
 	Refresh
@@ -1079,6 +1105,10 @@
 	EndIf
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	Var PriceDrinkNoTop = PriceDrinkTmp
 
 	DEBUGVAR PriceDrinkTmp
@@ -1109,6 +1139,10 @@
 	EndIf
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	Var PriceDrinkNoTop = PriceDrinkTmp
 	
 	DEBUGVAR PriceDrinkTmp
@@ -1162,6 +1196,10 @@
 	EndIf
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	DEBUGVAR PriceDrinkTmp
 	
 	Refresh
@@ -1190,6 +1228,10 @@
 	EndIf
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 	
+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+	
 	DEBUGVAR PriceDrinkTmp
 	
 	Refresh

xml/test_video_loop.xml

@@ -36,7 +36,11 @@
 		DEBUGVAR video_main_4
 	EndIf
 
-
+	If VideoAdvIndex = 6 Then
+		Var HeadVideoFilename = video_main_5
+		DEBUGVAR video_main_5
+	EndIf
+	
 	DEBUGVAR VideoAdvIndex
 	DEBUGVAR video_main_count
 

xml/vending_info.xml

@@ -79,7 +79,6 @@
 	var Text2_7 = Text2_7 + SignalStrengthLevel
 	var Text2_7 = Text2_7 + "]"
 	
-
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -190,6 +189,7 @@
 <EventClick>
 	LED LedDoorCup Off 255 255 255 255
 	LED LedDoorLid Off 255 255 255 255
+	;Var ShowPrice = "Enable"
 </EventClick>
 </Image>
 
@@ -199,7 +199,14 @@
 <Y> info_5Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
+	;Var ShowPrice = "Invisible"
 	Open "ROOT/xml/test_coin.xml"
+
+	;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail3.xml"
+	
+	;TopView "show"
+	;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 </EventClick>
 </Image>
 

xml/video_loop2.xml

@@ -18,14 +18,14 @@
 	Var AdvImageFile = AdvImageFile + FileNumber
 	Var AdvImageFile = AdvImageFile + ".png"
 	Var AdvImageTimeout = 8000
-	Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml" 
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
 </EventTimeout> 
 <EventEnd> 
 	Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
 	Var AdvImageFile = AdvImageFile + FileNumber
 	Var AdvImageFile = AdvImageFile + ".png"
 	Var AdvImageTimeout = 8000
-	Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml" 
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
 </EventEnd>
 <EventSecurity> 
 	Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"