Add sugar 2

xml/menu_catalog_default_init.xml

@@ -8,8 +8,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -18,8 +18,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -34,53 +34,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -93,7 +50,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -130,4 +87,3 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf

xml/menu_catalog_new.xml

@@ -118,9 +118,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -136,7 +136,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_board.xml

@@ -475,7 +475,9 @@
 	Var EnableSelectMenuBetweenBrew = "Enable"
 
 
-	
+	If JXMLVersionInt > 412 Then
+		Var ToppingNewShow = "true"
+	EndIf
 	
 	DEBUGVAR XMLProfile
 	
@@ -842,6 +844,7 @@
 
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
 			
+		
 		EndIf
 		
 		

xml/page_catalog.xml

@@ -10,7 +10,6 @@
 	TopView "show"
 	; On open
 
-	READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow
 	DEBUGVAR ToppingNewShow
 
 	Var NextPage = "-"
@@ -305,8 +304,8 @@
 
 ; menu row 1
 <Button>
-<X> 205 </X>
+<X> 220 </X>
-<Y> 849 </Y>
+<Y> 844 </Y>
 <Filename> Var(DirImage + "/bn_diy.png")   </Filename>
 <FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -314,73 +313,75 @@
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	
-	; eng
+    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-	If new_layout = "true" Then
+
-        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
-    EndIf	
 </EventClick>
 </Button>
 
 <Button>
-<X> 579 </X>
+<X> 564 </X>
-<Y> 849 </Y>
+<Y> 844 </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> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
+	Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
-		Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
-	EndIf
 </EventClick>
 </Button>
 
 ; menu row 2
 <Button>
-<X> 205 </X>
+<X> 47 </X>
-<Y> 1191 </Y>
+<Y> 1188 </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> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
+	Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
-		Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
-	EndIf
 </EventClick>
 </Button>
 
 <Button>
-<X> 579 </X>
+<X> 391 </X>
-<Y> 1191 </Y>
+<Y> 1188 </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> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
+	Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
-		Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 
-	EndIf
 </EventClick>
 </Button>
 
 
 
 <Button>
-<X> 205 </X>
+<X> 748 </X>
-<Y> 1533 </Y>
+<Y> 1188 </Y>
+<Filename> bnSodaAndOther </Filename>
+<FilenamePress> bpSodaAndOther </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+
+</EventClick>
+</Button>
+
+
+;=============================================================================
+<Button>
+<X> 219 </X>
+<Y> 1532 </Y>
 <State>WheyButtonState</State>
 <Filename> Var(DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
@@ -388,18 +389,13 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
+	Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
-		Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
-	EndIf
 </EventClick>
 </Button>
 
-
 <Button>
-<X> 205 </X>
+<X> 219 </X>
-<Y> 1533 </Y>
+<Y> 1532 </Y>
 <State>MenuKidButtonState</State>
 <Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
 <FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
@@ -407,14 +403,14 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-		Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
 	
 </EventClick>
 </Button>
 
 <Button>
-<X> 205 </X>
+<X> 219 </X>
-<Y> 1533 </Y>
+<Y> 1532 </Y>
 <State>AppFastButtonState</State>
 <Filename> Var(DirImage + "/bn_appfast.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
@@ -422,33 +418,28 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
+	Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
-		Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
-	EndIf
 </EventClick>
 </Button>
-
+;=============================================================================
 
 <Button>
-<X> 579 </X>
+<X> 564 </X>
-<Y> 1533 </Y>
+<Y> 1532 </Y>
-<Filename> bnSodaAndOther </Filename>
+<State>"Enable"</State>
-<FilenamePress> bpSodaAndOther </FilenamePress>
+<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
+	
-		Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
-	Else
+	
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
-	EndIf
 </EventClick>
 </Button>
 
-
 <Button>
 <X> 225 </X>
 <Y> 424 </Y>

xml/page_catalog_2.xml

@@ -0,0 +1,576 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	
+	TopView "show"
+	; On open
+
+	READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow
+	DEBUGVAR ToppingNewShow
+
+	Var NextPage = "-"
+
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
+	WEB "DISABLE"
+
+	Var web_readyOK = "false"
+	Var web_telnumOK = ""
+
+	Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
+	
+	If CocktailShow = "true" Then 
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+	EndIf
+	
+	If TermTemOnline = "true" Then
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
+	EndIf
+	 	
+	;Machine DoorLidClose
+
+	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"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+		Play PlaySoundLag
+
+		Var DirImageCart = "ROOT/taobin_project/image/cart_en"
+
+		Var text_unavailable = "UNAVAILABLE###size=16"
+	
+	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"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+		Play PlaySoundLag
+
+		Var DirImageCart = "ROOT/taobin_project/image/cart_th"
+
+		Var text_unavailable = "หมด###size=32"
+	EndIf
+
+
+	Var StrawAutoRelease1 = "false"
+	Var StrawAutoRelease2 = "false"
+
+
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
+
+
+
+	If SELLONLINE = 1 Then
+		Var ShowButtonClick2 = "Enable"
+	Else
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+	If SELLONLINE = 1 Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+
+		;GenHashWithTimeStamp QRCODE99x
+		WEB "ENABLE"
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+
+		Var QRCODE99 = ""
+		WEB "DISABLE"
+
+	EndIf
+
+	; 1035 is Coke.
+	STRCONTAIN "1035" MaterialAvailable CokeUI 
+
+	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
+	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
+
+
+	Var countClick = 0
+
+
+	DEBUGVAR CART_COUNT
+
+
+	Var QRCODE99_Y = 1718
+
+    Var showCart = "Invisible"
+    If MultiPayEnable = "true" Then 
+	    
+	    If CART_COUNT = 1 Then
+	        Var showCart = "Enable"
+	  		Var cart_image_bn = DirImageCart + "/bn_cart1.png"
+	    	Var cart_image_bp = DirImageCart + "/bp_cart1.png"
+
+			Var QRCODE99_Y = 1580
+
+	    EndIf
+	    
+	    If CART_COUNT = 2 Then
+	        Var showCart = "Enable"
+	    	Var cart_image_bn = DirImageCart + "/bn_cart2.png"
+	    	Var cart_image_bp = DirImageCart + "/bp_cart2.png"
+
+			Var QRCODE99_Y = 1580
+
+	    EndIf
+
+    
+
+	    If CART_COUNT = 3 Then
+	    		Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+	    EndIf
+
+    EndIf
+
+	If Seeker = "next" Then
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+
+	If XMLProfile = "taobin_notopup" Then
+		Var ButtontoTopupMenu = "Disable"
+	
+	EndIf
+
+	
+	Var menu_name_eng_hot = ""
+	Var menu_desc_eng_hot = ""
+	Var menu_name_thai_hot = ""
+	Var menu_desc_thai_hot = ""
+
+	Var menu_name_eng_cold = ""
+	Var menu_desc_eng_cold = ""
+	Var menu_name_thai_cold = ""
+	Var menu_desc_thai_cold = ""
+
+
+	Var menu_name_eng_blender = ""
+	Var menu_desc_eng_blender = ""
+	Var menu_name_thai_blender = ""
+	Var menu_desc_thai_blender = ""
+
+
+	
+	
+	If BoxID = 0 Then 
+		RebootWithCause "BoxID was zero"
+	EndIf
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	;SAVELOG SoundPlaying
+
+	If countDownRetrun > 0 Then
+		Var countDownRetrun = countDownRetrun - 1
+	EndIf
+
+	If countDownRetrun = 0 Then
+		 If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+	EndIf
+
+	
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<EventChangeStatus>
+	;If ChangeStatus = "payout-end" Then 
+	;	Var ChangeOK = 1
+	;EndIf
+</EventChangeStatus>
+
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99 Then
+			Cart "DeleteMenuID" "ALL"
+			Var web_readyOK = web_ready
+			Var web_telnumOK = web_telnum
+		
+
+		
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+		EndIf
+		
+	Else
+	EndIf
+ 
+</EventWebApp>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+
+
+;<Video>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Width> 1080</Width>
+;<Height> 380 </Height>
+;<Loop> "true" </Loop>
+;<Filename> video_menu_0 </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> 
+	If  Seeker = "next" Then 
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+    Else
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+    EndIf
+</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> 220 </X>
+<Y> 844 </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> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 564 </X>
+<Y> 844 </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> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+
+</EventClick>
+</Button>
+
+; menu row 2
+<Button>
+<X> 47 </X>
+<Y> 1188 </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> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 391 </X>
+<Y> 1188 </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> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 748 </X>
+<Y> 1188 </Y>
+<Filename> bnSodaAndOther </Filename>
+<FilenamePress> bpSodaAndOther </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+
+</EventClick>
+</Button>
+
+
+;=============================================================================
+<Button>
+<X> 219 </X>
+<Y> 1532 </Y>
+<State>WheyButtonState</State>
+<Filename> Var(DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 219 </X>
+<Y> 1532 </Y>
+<State>MenuKidButtonState</State>
+<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
+<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 219 </X>
+<Y> 1532 </Y>
+<State>AppFastButtonState</State>
+<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+
+</EventClick>
+</Button>
+;=============================================================================
+
+<Button>
+<X> 564 </X>
+<Y> 1532 </Y>
+<State>AppFastButtonState</State>
+<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
+<FilenamePress> Var(DirImage + "/bnp_HealthyOption.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+	Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 225 </X>
+<Y> 424 </Y>
+<State> ShowButtonClick2 </State>
+<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/taobin_project/xml/page_check_member.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 696 </X>
+<Y> 424 </Y>
+<State> ButtontoTopupMenu </State>
+<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Var PayDetail=""
+	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+
+		;Var TestLoopMakeDrink = 1
+
+	EndIf
+	DEBUGVAR countClick
+
+	If countClick = 5 Then
+		If ToppingNewEnable = "false" Then
+			Var ToppingNewEnable = "true"
+		Else
+			Var ToppingNewEnable = "false"
+		EndIf
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+	EndIf
+
+	Refresh
+</EventClick>
+</Button>
+
+;<QRCode>
+;<X> 895 </X>
+;<Y> QRCODE99_Y</Y>
+;<Width> 178 </Width>
+;<Height> 178 </Height>
+;<State> "Enable" </State>
+;<Service> testservice </Service>
+;</QRCode>
+
+
+
+; Cart
+<Button>
+<X> 915 </X>
+<Y> 1769 </Y>
+<State> showCart </State>
+<Filename> cart_image_bn  </Filename>
+<Filename> cart_image_bp  </Filename>
+<FilenamePress> cart_image_bp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<Interval> 400</Interval>
+<EventClick> 
+
+		
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+		
+	
+</EventClick>
+</Button>
+
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99x Then
+
+			Var web_readyOK = web_ready
+			Var web_telnumOK = web_telnum
+			
+			Var web_app_prepar = "true"
+
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+		EndIf
+	Else
+	EndIf
+ 
+</EventWebApp>
+
+
+
+</Popup>

xml/page_catalog_group_appfast.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
 
@@ -305,9 +261,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -323,7 +279,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_cocktail.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
         ; protein
@@ -815,9 +771,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -833,7 +789,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_coffee.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
     If SpiralOnline = "true" Then 
@@ -290,9 +246,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -308,7 +264,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_forkid.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
         ; protein
@@ -308,9 +264,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -326,7 +282,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_health.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
     Var Menu22Selected = "PressForever"
@@ -285,9 +241,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -303,7 +259,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -2054,9 +2010,9 @@ and Milk" </Value>
 	<State> Flag( 12-02-01-1026.Button,12-02-02-1026.Button,$Sum12020110261202021026) </State> 
 	<Button>
 	<State> $Sum12020110261202021026 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_Healthy.png" </Filename>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_latte_Healthy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_Healthy.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_latte_Healthy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_matcha_tea_Healthy.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_matcha_latte_Healthy.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2064,7 +2020,7 @@ and Milk" </Value>
 		Var NameDrinkTH = "มัทฉะลาเต้"
 		Var DrinkDescriptionTH = "ชาเขียวมัทฉะ และ นมอุ่น "
 		Var DrinkDescription = "Matcha and Warm milk"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_Healthy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_latte_Healthy.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-1026.Price
 		Var PriceD2 = $12-02-02-1026.Price
@@ -4299,9 +4255,9 @@ Water, and Ice" </Value>
 	<State> Flag( 12-05-01-1001.Button,12-05-01-1001.Button,$Sum12050110011205011001) </State> 
 	<Button>
 	<State> $Sum12050110011205011001 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_milk_Healthy.png" </Filename>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_limande_Healthy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_milk_Healthy.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_limande_Healthy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_milk_Healthy.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_limande_Healthy.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4309,7 +4265,7 @@ Water, and Ice" </Value>
 		Var NameDrinkTH = "น้ำมะนาว"
 		Var DrinkDescriptionTH = "น้ำมะนาว น้ำตาล"
 		Var DrinkDescription = "Limenade, Sugar"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_milk_Healthy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_limande_Healthy.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-05-01-1001.Price
 		Var PriceD2 = $12-05-01-1001.Price

xml/page_catalog_group_milk.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
     If SpiralOnline = "true" Then 
@@ -290,9 +246,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -308,7 +264,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_other.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
     ; soda and other
@@ -288,9 +244,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -306,7 +262,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_recommend.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
     If SpiralOnline = "true" Then 
@@ -290,9 +246,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -308,7 +264,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_tea.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
     If SpiralOnline = "true" Then 
@@ -291,9 +247,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -309,7 +265,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_whey.xml

@@ -18,8 +18,8 @@
         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_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
 
@@ -28,8 +28,8 @@
         Var showthaiText = "Enable"
         
         Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
     EndIf
@@ -44,53 +44,10 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-        Var Menu1Selected2 = "Enable"
-        Var Menu2Selected2 = "Enable"
-        Var Menu3Selected2 = "Enable"
-        Var Menu4Selected2 = "Enable"
-        
-        Var Menu6Selected2 = "Enable"
-        Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
+    EndIf   
+        Var MenuVSelected2 = "Invisible"
 
-
-
-        If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Enable" 
-            Var Menu21Selected2 = "Invisible" 
-            Var Menu7Selected2 = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected2 = "Invisible" 
-                Var Menu21Selected2 = "Enable"
-                Var Menu7Selected2 = "Invisible"
-            Else
-                Var Menu11Selected2 = "Invisible"
-                Var Menu21Selected2 = "Invisible" 
-                Var Menu7Selected2 = "Enable"
-            EndIf
-        EndIf
-
-         ; init default
-        Var Menu1Selected = "Invisible"
-        Var Menu2Selected = "Invisible"
-        Var Menu3Selected = "Invisible"
-        Var Menu4Selected = "Invisible"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Invisible"
-        Var Menu7Selected = "Invisible"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        Var Menu21Selected = "Invisible" 
-            
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-        ; fuck
-
-        Var Menu22Selected = "Enable"
-    Else
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
@@ -103,7 +60,7 @@
 
         Var Menu21Selected2 = "Invisible"
 
-
+        Var MenuVSelected2 = "Invisible"
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -140,7 +97,6 @@
 
 
         Var Menu22Selected = "Enable"
-    EndIf
 
     
         ; protein
@@ -304,9 +260,9 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
+<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -322,7 +278,7 @@
 
 <Button>
 <X> 1000 </X>
-<Y> 415 </Y>
+<Y> 381 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_topping_select5.xml

@@ -2149,7 +2149,7 @@
 ;
 ;-BEGIN shot layout
 <Block>	
-<State> "Enable" </State>
+<State> ExtraTopping </State>
 <Width> 1080 </Width>
 <Height> "auto" </Height>
 <MarginTop> 20 </MarginTop>
@@ -2158,6 +2158,7 @@
 <Width> 986 </Width>
 <Height> "auto" </Height>	
 <Align> "vertical"</Align>
+<State> ExtraTopping </State>
 ;
 <Row1>
 	<Width> 986 </Width>
@@ -2835,6 +2836,7 @@
 	Var Seeker.topping1 = topping1
 	Var Seeker.topping2 = topping2
 	Var Seeker.topping3 = topping3
+	Var Seeker.topping6 = topping6
 
 	Var Seeker.get_a_straw = StrawState
 	Var Seeker.get_a_lid = LidState
@@ -2843,6 +2845,7 @@
 	DEBUGVAR Seeker.topping1
 	DEBUGVAR Seeker.topping2
 	DEBUGVAR Seeker.topping3
+	DEBUGVAR Seeker.topping6
 	DEBUGVAR Seeker.get_a_straw
 	DEBUGVAR Seeker.get_a_lid
 
@@ -2889,6 +2892,7 @@
 		Topping "Select1-ID" topping1
 		Topping "Select2-ID" topping2
 		Topping "Select3-ID" topping3
+		Topping "Select6-ID" topping6
 
 		; Pack
 		Topping "Pack" ExtendDataCurr
@@ -2902,6 +2906,7 @@
 		Topping "__select1-id" topping1
 		Topping "__select2-id" topping2
 		Topping "__select3-id" topping3
+		Topping "__select6-id" topping6
 		; Pack
 		Topping "__pack" ExtendDataNext
 
@@ -2909,6 +2914,7 @@
 		Var NextUserSelecttopping1Paid = topping1
 		Var NextUserSelecttopping2Paid = topping2
 		Var NextUserSelecttopping3Paid = topping3
+		Var NextUserSelecttopping6Paid = topping6
 
 
 
@@ -2968,16 +2974,24 @@
 	If blendedState = "ForceSet" Then
 		Var TOPPING_PRICE = PriceDiff
 		Var UserSelectProductCode = SubMenuProductCode1
+		If showShotEnable = "Invisible" Then
+
+		Else
+			Var showShotEnable = "Disable"
+		EndIf
 
-		Var showShotEnable = "Disable"
 		Var showText4 = "Enable"
 	Else
 
 		If blendedState = "Press" Then
 			Var TOPPING_PRICE = PriceDiff
 			Var UserSelectProductCode = SubMenuProductCode1
+			If showShotEnable = "Invisible" Then
+
+			Else
+				Var showShotEnable = "Disable"
+			EndIf
 
-			Var showShotEnable = "Disable"
 			Var showText4 = "Enable"
 		Else
 			
@@ -3190,7 +3204,11 @@
 		Var PriceDrinkNoTop = PriceD3
 		Var UserSelectProductCode = PD_CODE3
 
-		Var showShotEnable = "Disable" 
+		If showShotEnable = "Invisible" Then
+
+		Else
+			Var showShotEnable = "Disable"
+		EndIf
 		Var showText4 = "Enable"
 
 		If show_eng = "true" Then
@@ -3439,13 +3457,14 @@
 </Text>
 
 <Text>
-<X> 543 </X>
+<X> 1 </X>
-<Y> 20 </Y>
+<Y> 1 </Y>
 <Font> KanitTTF </Font>
-<Size> 36 </Size>
+<Size> 22 </Size>
 <Width> 1080 </Width>
+<Align> end </Align>
 <Color> 0xFF0000 </Color>
-<Value> "File 5"</Value>
+<Value> "#5"</Value>
 </Text>