do cocktail

xml/adv_play.xml

@@ -0,0 +1,25 @@
+<Page>
+<Scale> "ALL" </Scale>
+<Width> HeadScreenWidth </Width>
+<Height> HeadScreenHeight </Height>
+<Background> AdvImageFile </Background>
+<EventOpen>
+	;
+	Var FileNumber = FileNumber + 1
+	If FileNumber > 2 Then
+		Var FileNumber = 1
+	EndIf
+
+</EventOpen>
+
+<Timeout> AdvImageTimeout </Timeout>
+<EventTimeout> 
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" 
+</EventTimeout> 
+
+<EventSecurity> 
+	Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+</Page>

xml/menu_catalog.xml

@@ -122,7 +122,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -132,6 +132,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>

xml/menu_gen.py

@@ -60,6 +60,7 @@
       out_xml( '\t<Text>\r\n')
       out_xml( '\t<X> ' + str(x_button[i] + 182) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
+      out_xml( '\t<State> ShowPrice </State>\r\n')
       out_xml( '\t<Align> "Hurr" </Align>\r\n')
       out_xml( '\t<Width>150</Width>\r\n')
       out_xml( '\t<Size> 27 </Size>\r\n')
@@ -71,6 +72,7 @@
       out_xml( '\t<Text>\r\n')
       out_xml( '\t<X> ' + str(x_button[i] + 164) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
+      out_xml( '\t<State> ShowPrice </State>\r\n')
       out_xml( '\t<Width>20</Width>\r\n')
       out_xml( '\t<Size> 27 </Size>\r\n')
       out_xml( '\t<Font> KanitTTF </Font>\r\n')

xml/page_board.xml

@@ -9,7 +9,7 @@
 <EventOpen>
 	TopView "hide"
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
-
+	Var FileNumber = 1
 
 	Var sub_profile = "whey"
 	Var taobin_version = "1.05"
@@ -65,8 +65,25 @@
 	Var TestLoopFailed = 0
 
 	Var IgnoreNetCore = "false"
+	SAVELOG SaleProfile
+
+	STRCONTAIN "whey" SaleProfile WheyShow 
+	STRCONTAIN "cocktail" SaleProfile CocktailShow 
+	STRCONTAIN "roadshow" SaleProfile RoadShow 
 	
 
+	Var ShowPrice = "Enable"
+	If RoadShow = "true" Then
+		Var ShowPrice = "Invisible"
+	EndIf
+
+	SAVELOG WheyShow
+	SAVELOG CocktailShow
+	SAVELOG RoadShow
+	SAVELOG ShowPrice
+
+
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -184,8 +201,12 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
-	
+	If CocktailShow = "true" Then 
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+	Else
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
+	EndIf
+
 	TopView "show"
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 </EventClick>

xml/page_catalog.xml

@@ -9,6 +9,9 @@
 	TopView "show"
 	; On open
 	
+	If CocktailShow = "true" Then 
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+	EndIf
 
 	Var GetPayInfoFlag = 0
 	Var countDownRetrun = 30
@@ -201,7 +204,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
 

xml/page_catalog_choose_drink1.pml

@@ -58,9 +58,17 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
 
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
 
 </EventOpen>
 <Timeout> 60000 </Timeout>

xml/page_catalog_choose_drink1.xml

@@ -32,9 +32,17 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
 
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
 
 </EventOpen>
 <Timeout> 60000 </Timeout>
@@ -167,7 +175,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -177,6 +185,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -583,6 +606,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -593,6 +617,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -644,6 +669,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -654,6 +680,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -705,6 +732,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -715,6 +743,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -766,6 +795,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -776,6 +806,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -827,6 +858,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -837,6 +869,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -888,6 +921,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -898,6 +932,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -949,6 +984,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -959,6 +995,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1010,6 +1047,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1020,6 +1058,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1071,6 +1110,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1081,6 +1121,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1132,6 +1173,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1142,6 +1184,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1193,6 +1236,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1203,6 +1247,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1254,6 +1299,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1264,6 +1310,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1315,6 +1362,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1325,6 +1373,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1376,6 +1425,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1386,6 +1436,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1437,6 +1488,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1447,6 +1499,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1498,6 +1551,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1508,6 +1562,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink2.pml

@@ -70,8 +70,15 @@
     Var Menu2Selected = "PressForever"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+        
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
     
 
 </EventOpen>

xml/page_catalog_choose_drink2.xml

@@ -32,8 +32,15 @@
     Var Menu2Selected = "PressForever"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+        
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
     
 
 </EventOpen>
@@ -168,7 +175,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -178,6 +185,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -654,6 +676,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -664,6 +687,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -715,6 +739,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -725,6 +750,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -776,6 +802,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -786,6 +813,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -837,6 +865,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -847,6 +876,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -898,6 +928,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -908,6 +939,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -959,6 +991,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -969,6 +1002,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1020,6 +1054,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1030,6 +1065,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1081,6 +1117,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1091,6 +1128,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1142,6 +1180,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1152,6 +1191,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1203,6 +1243,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1213,6 +1254,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1264,6 +1306,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1274,6 +1317,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1325,6 +1369,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1335,6 +1380,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1386,6 +1432,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1396,6 +1443,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1447,6 +1495,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1457,6 +1506,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1508,6 +1558,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1518,6 +1569,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1569,6 +1621,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1579,6 +1632,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1630,6 +1684,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1640,6 +1695,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1691,6 +1747,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1701,6 +1758,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1752,6 +1810,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1762,6 +1821,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink3.pml

@@ -62,12 +62,19 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
+    Var Menu1Selected = "Enable"
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "PressForever"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 

xml/page_catalog_choose_drink3.xml

@@ -27,12 +27,19 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
+    Var Menu1Selected = "Enable"
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "PressForever"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 
@@ -165,7 +172,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -175,6 +182,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -605,6 +627,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -615,6 +638,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -666,6 +690,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -676,6 +701,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -727,6 +753,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -737,6 +764,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -788,6 +816,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -798,6 +827,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -849,6 +879,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -859,6 +890,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -910,6 +942,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -920,6 +953,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -971,6 +1005,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -981,6 +1016,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1032,6 +1068,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1042,6 +1079,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1093,6 +1131,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1103,6 +1142,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1154,6 +1194,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1164,6 +1205,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1215,6 +1257,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1225,6 +1268,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1276,6 +1320,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1286,6 +1331,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1337,6 +1383,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1347,6 +1394,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1398,6 +1446,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1408,6 +1457,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1459,6 +1509,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1469,6 +1520,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1520,6 +1572,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1530,6 +1583,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1581,6 +1635,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1591,6 +1646,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink4.pml

@@ -54,8 +54,17 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "PressForever"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+
+    
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 

xml/page_catalog_choose_drink4.xml

@@ -31,8 +31,17 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "PressForever"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+
+    
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 
@@ -165,7 +174,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -175,6 +184,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -422,6 +446,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -432,6 +457,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -483,6 +509,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -493,6 +520,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -544,6 +572,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -554,6 +583,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -605,6 +635,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -615,6 +646,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -666,6 +698,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -676,6 +709,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -727,6 +761,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -737,6 +772,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -788,6 +824,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -798,6 +835,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -849,6 +887,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -859,6 +898,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -910,6 +950,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -920,6 +961,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink5.pml

@@ -48,8 +48,15 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "PressForever"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 

xml/page_catalog_choose_drink5.xml

@@ -32,8 +32,15 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "PressForever"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 
@@ -166,7 +173,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -176,6 +183,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -377,6 +399,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -387,6 +410,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -438,6 +462,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -448,6 +473,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -499,6 +525,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -509,6 +536,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -560,6 +588,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -570,6 +599,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -621,6 +651,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -631,6 +662,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -682,6 +714,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -692,6 +725,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -743,6 +777,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -753,6 +788,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink6.pml

@@ -70,8 +70,16 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "PressForever"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 

xml/page_catalog_choose_drink6.xml

@@ -31,8 +31,16 @@
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Enable"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "PressForever"
+    Var Menu7Selected = "Enable"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 
@@ -165,7 +173,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -175,6 +183,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -700,6 +723,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -710,6 +734,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -761,6 +786,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -771,6 +797,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -822,6 +849,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -832,6 +860,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -883,6 +912,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -893,6 +923,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -944,6 +975,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -954,6 +986,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1005,6 +1038,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1015,6 +1049,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1066,6 +1101,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1076,6 +1112,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1127,6 +1164,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1137,6 +1175,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1188,6 +1227,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1198,6 +1238,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1249,6 +1290,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1259,6 +1301,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1310,6 +1353,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1320,6 +1364,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1371,6 +1416,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1381,6 +1427,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1432,6 +1479,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1442,6 +1490,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1493,6 +1542,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1503,6 +1553,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1554,6 +1605,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1564,6 +1616,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1615,6 +1668,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1625,6 +1679,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 1016 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1676,6 +1731,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1686,6 +1742,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1737,6 +1794,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1747,6 +1805,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1798,6 +1857,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1808,6 +1868,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1859,6 +1920,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1869,6 +1931,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 1344 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -1920,6 +1983,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 1672 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1930,6 +1994,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 1672 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink7.pml

@@ -47,12 +47,20 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
+    Var Menu1Selected = "Enable"
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "PressForever"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "PressForever"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 

xml/page_catalog_choose_drink7.xml

@@ -27,12 +27,20 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
+    Var Menu1Selected = "Enable"
     Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
-    Var Menu5Selected = "PressForever"
+    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
+    Var Menu7Selected = "PressForever"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
+    
 </EventOpen>
 <Timeout> 60000 </Timeout>
 <EventTimeout> 
@@ -165,7 +173,7 @@
 <Button>
 <X> 696 </X>
 <Y> 395 </Y>
-<State> Menu5Selected </State>
+<State> Menu7Selected </State>
 <Filename> Var( DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -175,6 +183,21 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+; obselete
 ;<Button>
 ;<X> 696 </X>
 ;<Y> 395 </Y>
@@ -447,6 +470,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -457,6 +481,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -508,6 +533,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -518,6 +544,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -569,6 +596,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -579,6 +607,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -630,6 +659,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -640,6 +670,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 32 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -691,6 +722,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -701,6 +733,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -752,6 +785,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -762,6 +796,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -813,6 +848,7 @@
 	<Text>
 	<X> 740 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -823,6 +859,7 @@
 	<Text>
 	<X> 722 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -874,6 +911,7 @@
 	<Text>
 	<X> 997 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -884,6 +922,7 @@
 	<Text>
 	<X> 979 </X>
 	<Y> 360 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -935,6 +974,7 @@
 	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -945,6 +985,7 @@
 	<Text>
 	<X> 208 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -996,6 +1037,7 @@
 	<Text>
 	<X> 483 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
 	<Size> 27 </Size>
@@ -1006,6 +1048,7 @@
 	<Text>
 	<X> 465 </X>
 	<Y> 688 </Y>
+	<State> ShowPrice </State>
 	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>

xml/page_catalog_choose_drink8.pml

@@ -0,0 +1,88 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+<?hurr
+ 
+
+
+ product_code = []
+ product_code.append('11-99-05-0001')
+ product_code.append('11-99-05-0002')
+ product_code.append('11-99-05-0003')
+ product_code.append('11-99-05-0004')
+ product_code.append('11-99-05-0005')
+ product_code.append('11-99-05-0006')
+ product_code.append('11-99-05-0007')
+ product_code.append('11-99-05-0008')
+ product_code.append('11-99-05-0009')
+ product_code.append('11-99-05-0010')
+ 
+ menu_count = len( product_code)
+
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
+<EventOpen>
+	; On open
+	
+	If show_eng = "true" Then 
+        Var showthaiText = "Invisible"
+        Var showengText = "Enable"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+    Else
+        Var showengText = "Invisible"
+        Var showthaiText = "Enable"
+        
+        Var DirImage = "ROOT/taobin_project/image/page3"
+        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+    EndIf
+
+	 Var Menu1Selected = "Enable"
+    Var Menu2Selected = "Enable"
+    Var Menu3Selected = "Enable"
+    Var Menu4Selected = "Enable"
+    Var Menu5Selected = "Invisible"
+    Var Menu6Selected = "Enable"
+    Var Menu7Selected = "Invisible"
+    
+
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "PressForever"
+    EndIf
+    
+</EventOpen>
+<Timeout> 60000 </Timeout>
+<EventTimeout> 
+    Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	TimerReset
+</EventTimeout> 
+
+
+<?hurr 
+    #include=menu_catalog.xml
+?>
+
+
+
+
+
+<?hurr 
+    #include=menu_gen.py 
+?>
+
+
+
+
+
+</Popup>

xml/page_catalog_cocktail.xml

@@ -0,0 +1,235 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
+<EventOpen>
+	TopView "show"
+	; On open
+	
+
+	Var GetPayInfoFlag = 0
+	Var countDownRetrun = 30
+
+	CoinVending OFF
+	
+	; Clear value
+	Topping "clear" "-"
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	;SAVELOG SoundPlaying
+
+	If countDownRetrun > 0 Then
+		Var countDownRetrun = countDownRetrun - 1
+	EndIf
+
+	If countDownRetrun = 0 Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	EndIf
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<EventChangeStatus>
+	;If ChangeStatus = "payout-end" Then 
+	;	Var ChangeOK = 1
+	;EndIf
+</EventChangeStatus>
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename>
+</Video>
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 990 </X>
+<Y> 438 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	If show_eng = "true" Then 
+		Var show_eng = "false"
+	Else
+		Var show_eng = "true"
+	EndIf
+	Open CurrentXMLFileName2
+</EventClick>
+</Button>
+
+
+
+
+<Image>
+<X> 70 </X>
+<Y> 583 </Y>
+<Filename> Var(DirImage + "/text1.png")  </Filename>
+</Image>
+
+
+
+; menu row 1
+<Button>
+<X> 205 </X>
+<Y> 849 </Y>
+<Filename> Var(DirImage + "/bn_diy.png")   </Filename>
+<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 579 </X>
+<Y> 849 </Y>
+<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+</EventClick>
+</Button>
+
+; menu row 2
+<Button>
+<X> 205 </X>
+<Y> 1191 </Y>
+<Filename> Var(DirImage + "/bn_tea.png") </Filename>
+<FilenamePress>  Var(DirImage + "/bp_tea.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 579 </X>
+<Y> 1191 </Y>
+<Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 205 </X>
+<Y> 1533 </Y>
+<Filename> Var(DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 579 </X>
+<Y> 1533 </Y>
+<Filename> Var(DirImage + "/bn_soda.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_soda.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+;<Text>
+;<X> 0 </X>
+;<Y> 1886 </Y>
+;<Size> 20 </Size>
+;<Width> 1080</Width>
+;<Align> Center </Align>
+;<Font> RobotoBlack </Font>
+;<Color> 0x513C2F </Color>
+;<Value> countDownRetrun </Value>
+;</Text>
+
+
+<Button>
+<X> 392 </X>
+<Y> 424 </Y>
+<Filename>  Var(DirImage + "/bn_main_page_member.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	;Open "ROOT/xml/service_menu.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 696 </X>
+<Y> 424 </Y>
+<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
+	
+</EventClick>
+</Button>
+
+
+</Popup>

xml/page_lid_straw.xml

@@ -76,7 +76,7 @@
 	; count down
 	If LidStrawCountDown = 1 Then
 		Var LidStrawCountDown = 10
-		;Open "ROOT/taobin_project/xml/page_brewing2.xml"
+		
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 	EndIf
 

xml/page_payment_cash.xml

@@ -198,8 +198,12 @@
 		EndIf
 
 		;Var RemainAmount = 0
+
 		Var showRemaining = charOfBaht + RemainAmountStr
-	
+		If RoadShow = "true" Then
+			Var showRemaining = "Free"
+		EndIf
+
 	EndIf
 
 	If show_eng = "true" Then 

xml/page_thankyou.xml

@@ -78,16 +78,15 @@
 		;Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		;Open "ROOT/taobin_project/xml/page_brewing.xml"  
 
-<<<<<<< HEAD
 		If TestLoopMakeDrink = 1 Then 
 			Open "ROOT/taobin_project/xml/page_brewing2.xml"  
 		EndIf
-=======
+
 		Var CountDownBrewing = BrewTime
 		Var CountUpBrewing = 0
 		SAVELOG BrewTime
 		Var ShowCountDownBrewing = CountDownBrewing
->>>>>>> f36bbe70987e89d48bcc2837537db37c4f90c33b
+
 
 		Open "ROOT/taobin_project/xml/page_collect_point_1.xml"  
 	EndIf

xml/page_topping_alter.xml

@@ -58,6 +58,11 @@
 	Var Timeout = 0
 	
 	SAVELOG PriceDrinkTmp
+	
+	If RoadShow = "true" Then
+		Var PriceDrinkTmp = "Free"
+	EndIf
+
 
 
 	Var ToppingGotoPayment = "true"

xml/page_topping_premix25percent.xml

@@ -68,6 +68,9 @@
 	CRLFToSpace showdesc
 	
 	;SAVELOG showname
+	If RoadShow = "true" Then
+			Var PriceShowValue = "Free"
+	EndIf
 
 </EventOpen>
 <Timeout> 30000 </Timeout>

xml/page_topping_premix25percent_no.xml

@@ -68,6 +68,9 @@
 	CRLFToSpace showdesc
 	;SAVELOG showname
 
+	If RoadShow = "true" Then
+			Var PriceShowValue = "Free"
+	EndIf
 </EventOpen>
 <Timeout> 30000 </Timeout>
 <EventTimeout> 

xml/page_topping_premix50percent.xml

@@ -66,6 +66,9 @@
 	CRLFToSpace showname
 	;SAVELOG showname
 
+	If RoadShow = "true" Then
+			Var PriceShowValue = "Free"
+	EndIf
 </EventOpen>
 <Timeout> 30000 </Timeout>
 <EventTimeout> 

xml/page_topping_sugar_only.xml

@@ -53,7 +53,7 @@
 		Var SelectSugarID = 3
 	EndIf
 
-	IftoppingID1Default = "4" Then
+	If toppingID1Default = "4" Then
 		Var SweetState1 = "Enable"
 		Var SweetState2 = "Enable"
 		Var SweetState3 = "Enable"
@@ -84,7 +84,9 @@
 	EndIf
 	
 
-
+	If RoadShow = "true" Then
+			Var PriceShowValue = "Free"
+	EndIf
 </EventOpen>
 <Timeout> 2000 </Timeout>
 <EventTimeout> 

xml/page_topping_sugar_sufficiency.xml

@@ -55,6 +55,10 @@
 	CRLFToSpace showname
 	CRLFToSpace showdesc
 	
+	If RoadShow = "true" Then
+			Var PriceShowValue = "Free"
+	EndIf
+	
 	;SAVELOG showname
 
 </EventOpen>

xml/page_topping_with_barista.xml

@@ -99,6 +99,10 @@
 	EndIf
 
 	CRLFToSpace showname
+
+	If RoadShow = "true" Then
+		Var PriceShowValue = "Free"
+	EndIf
 	
 </EventOpen>
 <Timeout> 30000 </Timeout>

xml/test_video_loop.xml

@@ -1,3 +1,4 @@
+
 <Page>
 <Scale> "ALL" </Scale>
 <Width> HeadScreenWidth </Width>
@@ -16,7 +17,11 @@
 	Open "/mnt/sdcard/coffeevending/xml/startup_head.xml" 
 </EventTimeout> 
 <EventEnd> 
-	Open "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" 
+	Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
+	Var AdvImageFile = AdvImageFile + FileNumber
+	Var AdvImageFile = AdvImageFile + ".png"
+	Var AdvImageTimeout = 10000
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml" 
 </EventEnd>
 <EventSecurity> 
 	Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"