DO

2023-10-25 18:02:34 +07:00 · 2023-10-25 18:02:34 +07:00 · 45437412db
commit 45437412db
parent ea4ec4991a
1280 changed files with 5353 additions and 2022 deletions
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -169,6 +169,9 @@
 		Var WheyShow = "false"
 		Var CocktailShow = "true"
 		Var RoadShow = "true"
+
+		STRCONTAIN "1401" MaterialAvailable BeerTrapEnable
+
 	Else
 		Var WheyShow = "true"
 		Var CocktailShow = "false"
@ -1124,7 +1127,11 @@
 					;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.lxml"

 				Else
-					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+					If BeerTrapEnable = "true" Then
+						OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+					Else
+						TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+					EndIf
        		EndIf
 	    	
 				Machine DoorClose
@ -1481,7 +1488,12 @@
 		
 		;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.lxml"
 	Else
-		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+
+		If BeerTrapEnable = "true" Then 
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+		Else
+			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+		EndIf
 	EndIf

 	Machine DoorClose
--- a/xml/page_catalog_beer_trap.xml
+++ b/xml/page_catalog_beer_trap.xml
@ -0,0 +1,292 @@
+<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
+
+	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/"
+	
+	 	
+	;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"
+	
+	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"
+	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>
+
+
+; 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>
+
+
+
+<Image>
+<X> 70 </X>
+<Y> 583 </Y>
+<Filename> Var(DirImage + "/text1.png")  </Filename>
+</Image>
+
+
+
+<Button>
+<X> 101 </X>
+<Y> 960 </Y>
+<State> Flag( 11-99-05-0028.Button,$Sum1199050001) </State> 
+<Filename> "ROOT/taobin_project/image/page_beer_trap/bn_Draft_beer.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page_beer_trap/bp_Draft_beer.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/page_beer_trap/bp_Draft_beer.png" </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+		Var NameDrink = "Beer Singha"
+		Var NameDrinkTH = "Beer Singha"
+		Var DrinkDescriptionTH = "Beer Singha"
+		Var DrinkDescription = "Beer Singha"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Draft_beer.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $11-99-05-0028.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "11-99-05-0028"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $11-99-05-0028.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "11-99-05-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $11-99-05-0028.NameE
+		Var menu_desc_eng_cold = $11-99-05-0028.descriptionE
+		Var menu_name_thai_cold = $11-99-05-0028.Name
+		Var menu_desc_thai_cold = $11-99-05-0028.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select7.xml"
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 568 </X>
+<Y> 960 </Y>
+<State> Flag( 11-99-05-0029.Button,$Sum1199050001) </State> 
+<Filename> "ROOT/taobin_project/image/page_beer_trap/bn_Draft_beer_with_ice.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page_beer_trap/bp_Draft_beer_with_ice.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/page_beer_trap/bp_Draft_beer_with_ice.png" </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+		Var NameDrink = "Beer Singha"
+		Var NameDrinkTH = "Beer Singha"
+		Var DrinkDescriptionTH = "Beer Singha, Iced"
+		Var DrinkDescription = "Beer Singha, Iced"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Draft_beer.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $11-99-05-0029.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "11-99-05-0029"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $11-99-05-0029.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "11-99-05-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $11-99-05-0029.NameE
+		Var menu_desc_eng_cold = $11-99-05-0029.descriptionE
+		Var menu_name_thai_cold = $11-99-05-0029.Name
+		Var menu_desc_thai_cold = $11-99-05-0029.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select7.xml"
+</EventClick>
+</Button>
+
+
+
+</Popup>
--- a/xml/page_catalog_cocktail.xml
+++ b/xml/page_catalog_cocktail.xml
@ -12,6 +12,9 @@

 	Var NextPage = "-"

+
+	Var RoadShow = "true" ; For free
+
 	Var Seeker.thankLidFlag = 0
 	Var Seeker.thankStrawFlag = 0

@ -30,6 +33,12 @@

 	CoinVending OFF

+
+
+	If BeerTrapEnable = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_beer_trap.xml"
+	EndIf
+	
 	
 	; Clear value
 	Topping "clear" "-"
@ -162,8 +171,6 @@
 	Var menu_name_thai_blender = ""
 	Var menu_desc_thai_blender = ""

-
-	
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
--- a/xml/page_catalog_cocktail.xml_bkn
+++ b/xml/page_catalog_cocktail.xml_bkn
@ -2,12 +2,19 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	
 	TopView "show"
 	; On open

+	Var NextPage = "-"
+
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
 	WEB "DISABLE"

 	Var web_readyOK = "false"
@ -22,6 +29,7 @@
 	Var countDownRetrun = 30

 	CoinVending OFF
+
 	
 	; Clear value
 	Topping "clear" "-"
@ -49,23 +57,32 @@
 	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 NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowButtonClick2 = "Enable"
 	Else
 		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
 	EndIf

-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""

-		GenHashWithTimeStamp QRCODE99
+		;GenHashWithTimeStamp QRCODE99x
 		WEB "ENABLE"
 		
 	Else
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
 		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"

 		Var QRCODE99 = ""
@ -117,6 +134,37 @@

    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 = ""
+
+
+	
+	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@ -128,7 +176,11 @@
 	EndIf

 	If countDownRetrun = 0 Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		 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

 	
@ -162,16 +214,25 @@
 
 </EventWebApp>

-
-<Video>
+<Image>
 <X> 0 </X>
-<Y> 0 </Y>
-<Width> 1080</Width>
-<Height> 380 </Height>
-<Loop> "true" </Loop>
-<Filename> video_menu_0 </Filename>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>

-</Video>
+
+
+;<Video>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Width> 1080</Width>
+;<Height> 380 </Height>
+;<Loop> "true" </Loop>
+;<Filename> video_menu_0 </Filename>
+;
+;</Video>



@ -184,8 +245,11 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
-	
+	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>

@ -227,9 +291,14 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; eng
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	
+	; eng
+	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>

@ -241,7 +310,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+	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" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+	EndIf
 </EventClick>
 </Button>

@ -254,7 +328,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+	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" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+	EndIf
 </EventClick>
 </Button>

@ -266,37 +345,55 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+	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" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+
+	EndIf
 </EventClick>
 </Button>


-; menu row 3
-;<Button>
-;<X> 205 </X>
-;<Y> 1533 </Y>
-;<Filename> Var(DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var(DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-

 <Button>
 <X> 205 </X>
 <Y> 1533 </Y>
+<State>"Enable"</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" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+	EndIf
 </EventClick>
 </Button>

+<Button>
+<X> 205 </X>
+<Y> 1533 </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"
+	If new_layout = "true" Then
+		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>
 <Y> 1533 </Y>
@ -305,7 +402,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+	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" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+	EndIf
 </EventClick>
 </Button>

@ -328,13 +430,15 @@
 <Button>
 <X> 696 </X>
 <Y> 424 </Y>
-<State> ShowButtonClick2 </State>
+<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>
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -535,7 +535,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 34
+; menu_new_list 32
 	; ==================> Len = 11
 	; 12-02-01-0001 12-02-02-0001 12-02-03-0001 
 <Block>
@ -3308,510 +3308,6 @@ GINGER TEA" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 16
-	; 12-02-01-0025 12-02-02-0025 12-02-03-0025 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0025.Button,12-02-02-0025.Button,12-02-03-0025.Button,$Sum120201002512020200251202030025) </State> 
-	<Button>
-	<State> $Sum120201002512020200251202030025 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_taiwan_milk_tea.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_taiwan_milk_tea.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_taiwan_milk_tea.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
-		Var NameDrinkTH = "ชานมไต้หวัน "
-		Var DrinkDescriptionTH = "ชาไต้หวัน และ นมอุ่น"
-		Var DrinkDescription = "Taiwanese Tea, Sugar, Milk"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-02-01-0025.Price
-		Var PriceD2 = $12-02-02-0025.Price
-		Var PriceD3 = $12-02-03-0025.Price
-		Var PD_CODE1 = "12-02-01-0025"
-		Var PD_CODE2 = "12-02-02-0025"
-		Var PD_CODE3 = "12-02-03-0025"
-		Var PD_STAGE_1 = $12-02-01-0025.Button
-		Var PD_STAGE_2 = $12-02-02-0025.Button
-		Var PD_STAGE_3 = $12-02-03-0025.Button
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0025"
-			Else
-			Topping "Load" "12-02-03-0025"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $12-02-01-0025.NameE
-		Var menu_desc_eng_hot = $12-02-01-0025.descriptionE
-		Var menu_name_thai_hot = $12-02-01-0025.Name
-		Var menu_desc_thai_hot = $12-02-01-0025.description
-		
-		Var menu_name_eng_cold = $12-02-02-0025.NameE
-		Var menu_desc_eng_cold = $12-02-02-0025.descriptionE
-		Var menu_name_thai_cold = $12-02-02-0025.Name
-		Var menu_desc_thai_cold = $12-02-02-0025.description
-		
-		Var menu_name_eng_blender = $12-02-03-0025.NameE
-		Var menu_desc_eng_blender = $12-02-03-0025.descriptionE
-		Var menu_name_thai_blender = $12-02-03-0025.Name
-		Var menu_desc_thai_blender = $12-02-03-0025.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "ชานมไต้หวัน " </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "ชาไต้หวัน และ นมอุ่น" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "Taiwanese Tea, Sugar, Milk" </Value>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> $12-02-01-0025.Button </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-01-0025.Button </State>
-	<Value> StringFmt(  $12-02-01-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-02-02-0025.Button </State>
-	</Image>
-	<Text>
-	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-02-0025.Button </State>
-	<Value> StringFmt( $12-02-02-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $12-02-03-0025.Button </State>
-	</Image>
-	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-03-0025.Button </State>
-	<Value> StringFmt(  $12-02-03-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum120201002512020200251202030025 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum120201002512020200251202030025 = "Disable" Then
-				STRCONTAIN "ERR" $12-02-01-0025.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-02-02-0025.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-02-03-0025.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum120201002512020200251202030025 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 16
-	; 12-02-01-0003 12-02-02-0003 12-02-03-0003 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0003.Button,12-02-02-0003.Button,12-02-03-0003.Button,$Sum120201000312020200031202030003) </State> 
-	<Button>
-	<State> $Sum120201000312020200031202030003 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_taiwan_milk_tea.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_taiwan_milk_tea.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_taiwan_milk_tea.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
-		Var NameDrinkTH = "ชานมไต้หวัน"
-		Var DrinkDescriptionTH = "ชาไต้หวัน นม  "
-		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-02-01-0003.Price
-		Var PriceD2 = $12-02-02-0003.Price
-		Var PriceD3 = $12-02-03-0003.Price
-		Var PD_CODE1 = "12-02-01-0003"
-		Var PD_CODE2 = "12-02-02-0003"
-		Var PD_CODE3 = "12-02-03-0003"
-		Var PD_STAGE_1 = $12-02-01-0003.Button
-		Var PD_STAGE_2 = $12-02-02-0003.Button
-		Var PD_STAGE_3 = $12-02-03-0003.Button
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0003"
-			Else
-			Topping "Load" "12-02-03-0003"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $12-02-01-0003.NameE
-		Var menu_desc_eng_hot = $12-02-01-0003.descriptionE
-		Var menu_name_thai_hot = $12-02-01-0003.Name
-		Var menu_desc_thai_hot = $12-02-01-0003.description
-		
-		Var menu_name_eng_cold = $12-02-02-0003.NameE
-		Var menu_desc_eng_cold = $12-02-02-0003.descriptionE
-		Var menu_name_thai_cold = $12-02-02-0003.Name
-		Var menu_desc_thai_cold = $12-02-02-0003.description
-		
-		Var menu_name_eng_blender = $12-02-03-0003.NameE
-		Var menu_desc_eng_blender = $12-02-03-0003.descriptionE
-		Var menu_name_thai_blender = $12-02-03-0003.Name
-		Var menu_desc_thai_blender = $12-02-03-0003.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "ชานมไต้หวัน" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "ชาไต้หวัน นม  " </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "Taiwan Tea, Milk, Sugar" </Value>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> $12-02-01-0003.Button </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-01-0003.Button </State>
-	<Value> StringFmt(  $12-02-01-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-02-02-0003.Button </State>
-	</Image>
-	<Text>
-	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-02-0003.Button </State>
-	<Value> StringFmt( $12-02-02-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $12-02-03-0003.Button </State>
-	</Image>
-	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-03-0003.Button </State>
-	<Value> StringFmt(  $12-02-03-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum120201000312020200031202030003 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum120201000312020200031202030003 = "Disable" Then
-				STRCONTAIN "ERR" $12-02-01-0003.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-02-02-0003.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-02-03-0003.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum120201000312020200031202030003 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 16
@ -5853,7 +5349,7 @@ LIMENADE" </Value>
 		Var NameDrink = "JASMINE MILK TEA"
 		Var NameDrinkTH = "ชามะลิลาเต้"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
-		Var DrinkDescription = "Jasmine & Milk"
+		Var DrinkDescription = "Jasmine Tea & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0046.Price
@ -5953,7 +5449,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine & Milk" </Value>
+	<Value> "Jasmine Tea & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -388,11 +388,23 @@
 				EndIf
 			EndIf

-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-			Open "ROOT/taobin_project/xml/page_payment.xml" 
+
+			If  Seeker = "next" Then 
+				If CupRemain > 0 Then 
+					OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+					Open "ROOT/taobin_project/xml/page_payment.xml" 
+				EndIf
+
+			Else
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_payment.xml" 
+			EndIf
+
 			


+
 		EndIf
 	EndIf