Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

inter/aus/xml/event/script_common_for_open_promotion_xml.ev

@@ -3,17 +3,21 @@
 
 ; zone promote
 Var BigButtonEnable = "Enable"
-If OpenFromPageBoard = 1 Then
+
-	If WinterWarmersCatalogFlag = 1 Then
+Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml"
-		OpenInst 2 "ROOT/taobin_project/inter/aus/xml/event/promotion_winter_warmers.lxml" 
+
-	Else
+If WinterWarmersCatalogFlag = 1 Then
-		OpenInst 2 "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml" 
+	Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_winter_warmers.lxml" 
-	EndIf    
-Else
-		If WinterWarmersCatalogFlag = 1 Then
-			Open "ROOT/taobin_project/inter/aus/xml/event/promotion_winter_warmers.lxml" 
-		Else
-			Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml" 
-		EndIf
 EndIf
+
+If WestfieldCatalogFlag = 1 Then
+	Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_westfield.lxml" 
+EndIf  
+
+If OpenFromPageBoard = 1 Then
+	OpenInst 2 RecommendPage
+Else
+	Open RecommendPage
+EndIf
+
 Var OpenFromPageBoard = 0

inter/aus/xml/event/tricker.ev

@@ -11,7 +11,9 @@ Var GameEnableFromTrickerEv = 1
 
 Var NewCollectPointFlag = 0
 
-Var WinterWarmersCatalogFlag = 1
+Var WinterWarmersCatalogFlag = 0
+
+Var WestfieldCatalogFlag = 1
 
 Var XMLLiveInfoEnable = 1
 

inter/aus/xml/open_page_catalog.ev

@@ -1,8 +1,9 @@
 If WinterWarmersCatalogFlag = 1 Then
     Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
 Else
-    Var catalogFile = CountryRootPath + "/xml/page_catalog_cocktail.lxml"
+    Var catalogFile = CountryRootPath + "/xml/page_catalog_westfield.lxml"
 EndIf
 
 
+
 Open catalogFile

inter/aus/xml/page_catalog_westfield.lxml

@@ -0,0 +1,760 @@
+<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
+
+	Machine WakeUp
+
+	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
+	
+	If Seeker = "curr" Then 	
+		Machine DoorLidClose
+	EndIf
+
+	Var GetPayInfoFlag = 0
+	Var countDownRetrun = 300
+
+	CoinVending OFF
+
+	
+	; Clear value
+	Topping "clear" "-"
+
+	
+	Var DirImage = "ROOT/taobin_project/image/page2_inter/"
+		
+
+	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
+
+	If RoadShow = "true" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+	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
+	
+
+
+	DEBUGVAR ShowButtonClick2
+
+	DEBUGVAR MenuKidButtonState
+
+	
+
+
+	DEBUGVAR $51-03-01-0035.Price
+	Var PromotionIDCurrentOrder = 0
+	RootLayoutVisible 3 "show"
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	;SAVELOG SoundPlaying
+
+	If countDownRetrun > 0 Then
+		Var countDownRetrun = countDownRetrun - 1
+	EndIf
+
+	If countDownRetrun = 0 Then
+		 If  Seeker = "next" Then 
+		 	RootLayoutVisible 3 "hide"
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+	EndIf
+
+	
+
+	; zone cup on arm
+    If CupOnArm = "true" Then
+
+		If CheckCupStateDoorCupClose = "" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+
+		If CheckCupStateDoorCupClose = "done" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+	Else
+		If buttonRemoveCup = "Enable" Then
+			Var buttonRemoveCup = "Invisible"
+		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>
+
+<EventLanguageOnChange>
+	DEBUGVAR LanguageShow
+
+	If LanguageShow = "ENG" Then
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+	EndIf
+
+	If LanguageShow = "MALAY" Then
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+	EndIf
+	
+	If LanguageShow = "THAI" Then
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+	EndIf
+	
+	Play PlaySoundLag	
+	Var countDownRetrun = 300
+
+	Var LanguageButtonEnable = "Enable"
+	Var ButtonLanguageCurrentXPosition = 990
+	Var ButtonLanguageCurrentYPosition = 438
+	Var ButtonLanguageListXPosition = 970
+	Var ButtonLanguageListYPosition = 430
+	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+
+	RefreshAll
+</EventLanguageOnChange>
+
+
+; 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 
+		RootLayoutVisible 3 "hide"
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+    Else
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+    EndIf
+</EventClick>
+</Button>
+
+
+<Text>
+<X> 70 </X>
+<Y> 591 </Y>
+<Width> 940 </Width>
+<Height> 85 </Height>
+<Language>
+	<ID> 000001 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 70 </X>
+<Y> 679 </Y>
+<Width> 940 </Width>
+<Height> 85 </Height>
+<Language>
+	<ID> 000002 </ID>
+</Language>
+</Text>
+
+; 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"
+
+	If CountryName = "Thailand" Then 
+    	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+    Else
+		Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
+		TRY OpenFileXML
+	EndIf
+
+</EventClick>
+<Language>
+	<ID> 000003 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</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"
+	
+
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml"
+	
+	DEBUGVAR CountryRootPath
+	DEBUGVAR OpenFileXML
+	Open OpenFileXML
+
+</EventClick>
+<Language>
+	<ID> 000005 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</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.lxml" 
+
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_tea.lxml"
+	Open OpenFileXML
+</EventClick>
+<Language>
+	<ID> 000006 </ID>
+	<X> 28 </X>
+	<Y> 193 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</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.lxml" 
+
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_milk.lxml"
+	Open OpenFileXML
+</EventClick>
+<Language>
+	<ID> 000007 </ID>
+	<X> 28 </X>
+	<Y> 193 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</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.lxml" 
+	
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml"
+	Open OpenFileXML
+</EventClick>
+<Language>
+	<ID> 000011 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</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.lxml" 
+
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml"
+	Open OpenFileXML
+
+</EventClick>
+<Language>
+	<ID> 000012 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</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.lxml" 
+
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml"
+	Open OpenFileXML
+</EventClick>
+<Language>
+	<ID> 000009 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
+
+;###############################################################
+
+
+
+<Button>
+<X> 220 </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.lxml" 
+
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml"
+	Open OpenFileXML
+
+</EventClick>
+<Language>
+	<ID> 000008 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
+
+
+<Button>
+<X> 564 </X>
+<Y> 1532 </Y>
+<State> "Enable" </State>
+<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"
+	
+	;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" 
+	
+	
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
+	Open OpenFileXML
+
+</EventClick>
+<Language>
+	<ID> 000010 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 82 </Height>
+</Language>
+</Button>
+
+
+<Button>
+<X> 736 </X>
+<Y> 1532 </Y>
+<State> "Invisible" </State>
+<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
+<FilenamePress> Var(DirImage + "/bn_winter_warmers.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_winter_warmers.lxml" 
+	
+	
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+	Open OpenFileXML
+
+</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
+	Var CheckMemberPage = CountryRootPath + "xml/page_check_member.lxml"
+	Open CheckMemberPage
+	
+</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>
+<EventClick> 
+	
+	Open "ROOT/taobin_project/xml/page_camera.xml"
+	
+</EventClick>
+</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>
+
+; 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>
+
+
+
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<EventClick> 
+    Machine RemoveCup
+	Machine DoorLidOpen
+
+	Var CheckCupStateDoorCupClose = "reset"
+	Var buttonRemoveCup = "Invisible"
+
+</EventClick>
+</Button>
+
+<EventUnitTest1>
+	Var StrawGetMoreState = "Invisible"
+	Var bg_lidProblem_ST = "Invisible"
+	Var GetLidButtonState2 = "Enable"
+	Var bg_lidProblem_ST2 ="Invisible"
+	
+	Var EnableGetMoreStrawFileName2 = "Enable"
+	Var bg_strawProblem_ST2 ="Invisible"
+</EventUnitTest1>
+
+<EventUnitTest4>
+	Var StrawGetMoreState = "Invisible"
+	Var bg_lidProblem_ST = "Enable"
+	Var GetLidButtonState2 = "Invisible"
+	Var bg_lidProblem_ST2 ="Enable"
+	
+	Var XStraw = 376
+	Var EnableGetMoreStrawFileName2 = "Invisible"
+	Var bg_strawProblem_ST2 ="Enable"
+</EventUnitTest4>
+
+
+<EventUnitTest2>
+	Var MachineState_Result = 0
+	Var waitAckPay = 1
+	Var BREW_COUNT_DOWN_FROM_APP = "on"
+	Var CountDownBrewing = 122
+	Var MachineStage = "testing"
+	Var BREW_CNT = 122
+	
+	Var InternationalEnable = 1
+	DEBUGVAR InternationalEnable
+	Var LanguageObjectShow = "Enable"
+	Var NoLangObjectShow = "Invisible"
+
+
+	Var Top2Timeout = 19
+	DEBUGVAR CountDownBrewing
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml"
+</EventUnitTest2>
+; Initial for jump to page_brewing3.xml
+<EventUnitTest3>
+
+</EventUnitTest3>
+
+</Popup>

xml/page_member_topup3.xml

@@ -161,8 +161,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-    Var PayCreditChannel = "cash"
+	Var TopupFromPage = "member"
-    Open "ROOT/taobin_project/xml/page_member_topupAmount.xml"
+    Open "ROOT/taobin_project/xml/page_topup_credit3_cash_warning.xml"
    
 	
 </EventClick>

xml/page_member_topupCash.xml

@@ -48,8 +48,7 @@
 
 	Var alphaState3 = "Invisible"
 
-
+	Var confirmButtonState = "Invisible"
-    INT AmountNumber
 
 	Var img_popup11 = "/img_popup11.png"
 	Var img_popup15 = "/img_popup15.png"
@@ -58,7 +57,6 @@
     If CountryName = "Malaysia" Then
 		Var img_popup11 = "/img_popup11-MYR.png"
 		Var img_popup15 = "/img_popup15-MYR.png"
-		Var AmountNumber = AmountNumber * 100
 	EndIf
 
 	;inter-image
@@ -68,12 +66,15 @@
 	EndIf 
 
 
-    Var PayAmount = AmountNumber
+    Var PayAmount = 0
-    Var RemainAmount = PayAmount 
+	Var RemainAmountStr !assigned StringFmt( PayAmount, DisplayFormat, PreScaleConvertShow )
-	Var RemainAmountStr = "" + RemainAmount
+	If show_eng = "true" Then
-
+		Var RemainAmountStr = "เติม " + RemainAmountStr
-	Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
+		Var RemainAmountStr = RemainAmountStr + "###size=90"
-
+	Else
+		Var RemainAmountStr = "Top-up " + RemainAmountStr
+		Var RemainAmountStr = RemainAmountStr + "###size=110"
+	EndIf
 
 
     Var CoinInFlag = 0
@@ -82,7 +83,7 @@
     Var PayOK = 0
 	Var CancelFlag = 0
 	Var ChangeFlag2 = 0
-	Var Seeker.StoreCreditFlag = 0
+	Var Seeker.StoreCreditFlag = 1
 
     CoinVending XBILL
 
@@ -109,18 +110,26 @@
 			If CancelFlag = 0 Then
 				SAVELOG "ButtonCancleAlpha2  > Timeout Order."
 				CoinVending OFF
-				Var CancelFlag = 1
-				Var CancelCounter = 0
-				Var RemainAmountStr = "คืนเงิน"
 				If CoinAmount = 0 Then
-					Var RemainAmountStr = "ยกเลิก"
+					Var CancelFlag = 1
-				EndIf
+					Var CancelCounter = 0
-				If Seeker.StoreCreditFlag = 1 Then
+					If show_eng = "true" Then 
-					Var RemainAmountStr = "เก็บเครดิต"
+						Var RemainAmountStr = "Cancelled"
-				EndIf
+					Else
-				If ViewBill > 0 Then
+						Var RemainAmountStr = "ยกเลิก"
-					CoinVending BILLREJECT
+					EndIf
+				Else
+					Var CoinInOK = 1
+					Var CoinInCounter = 0
+					If show_eng = "true" Then 
+						Var RemainAmountStr = "Keep credit"
+					Else
+						Var RemainAmountStr = "เก็บเครดิต"
+					EndIf
+					
+					CoinVending BILLSTACKALL
 				EndIf
+
 			EndIf
 		EndIf
 	EndIf
@@ -128,6 +137,10 @@
 	If ChangeOK = 1 Then
 
 		If CancelFlag = 0 Then
+			Var TxRef1 = ""	
+			CreateTxRef1 TxRef1
+			
+			Var PayAmount = CoinAmount
 			Open "ROOT/taobin_project/xml/page_member_topupSuccess.xml" 
 		Else
 
@@ -162,20 +175,8 @@
 		Var CoinInCounter = CoinInCounter + 1
 		If CoinInCounter = 1 Then
 			Var PayOK = 1
-			
+			If CoinAmount > 0 Then
-			Var SumCoinAmount = CoinAmount 
+				Var ChangeOK = 1
-			If SumCoinAmount >= PayAmount Then 
-				Var Canout = SumCoinAmount - PayAmount
-				If Canout > 0 Then
-					If Seeker.StoreCreditFlag = 0 Then
-						Change Canout	
-						Var ChangeFlag2 = 1
-					Else
-						Var ChangeOK = 1
-					EndIf
-				Else
-					Var ChangeOK = 1
-				EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -186,12 +187,9 @@
 		If CancelCounter = 2 Then
 			;Change CoinAmount
 			If CoinAmount > 0 Then
-				If Seeker.StoreCreditFlag = 0 Then					
+				Var CancelFlag = 0
-					Change CoinAmount
+				Var CancelCounter = 0
-					Var ChangeFlag2 = 1
+				Var ChangeTimeout = 0
-				Else
-					Var ChangeOK = 1
-				EndIf
 			Else
 				Var ChangeOK = 1
 			EndIf
@@ -203,14 +201,6 @@
 		EndIf
 	
 	EndIf
-	
-	
-
-
-    
-
-
-	
 
 	TimerReset
 	Refresh
@@ -243,87 +233,37 @@
 	TimerReset
 
 	Var CoinInFlag = 1
-	
+	Var confirmButtonState = "Enable"
+	Var alphaState2 = "Invisible"
 
 	If ViewBill > 0 Then
 
-		Var RemainAmount = PayAmount - CoinAmount
+		CoinVending BILLSTACKALL
-		
-
-		If ViewBill > RemainAmount Then
-			Var RemainAmountKeep = ViewBill - RemainAmount
-			Var RemainAmountKeepStr !assigned StringFmt( RemainAmountKeep, DisplayFormat, PreScaleConvertShow )
-			Var alphaState3 = "Enable"
-			Var alphaState2 = "Disable"
-		Else
-			;CoinVending BILLSTACKALL
-
-			If ViewBill = RemainAmount Then
-				CoinVending BILLSTACKALL
-			Else
-				Var RemainAmountKeep = 0
-				Var RemainAmountKeepStr !assigned StringFmt( RemainAmountKeep, DisplayFormat, PreScaleConvertShow )
-				Var alphaState3 = "Enable"
-				Var alphaState2 = "Disable"
-			EndIf
-		EndIf
 
 		Var Timeout = 0
-		Var RemainAmountStr = "" + RemainAmount
+
+		Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
+		If show_eng = "true" Then
+			Var RemainAmountStr = "Top-up " + RemainAmountStr
+			Var RemainAmountStr = RemainAmountStr + "###size=90"
+		Else
+			Var RemainAmountStr = "เติม " + RemainAmountStr
+			Var RemainAmountStr = RemainAmountStr + "###size=110"
+		EndIf
 		Var showRemaining = charOfBaht + RemainAmountStr
-
-		Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-
-		
-		
 	Else
-
-		
-		Var alphaState2 = "Enable"
 		
 
 		If CoinInOK = 0 Then
 
-			Var RemainAmount = PayAmount - CoinAmount
+			If show_eng = "true" Then
-			
+				Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
-
+				Var RemainAmountStr = "Top-up " + RemainAmountStr
-			Var SumCoinAmount = CoinAmount 
+				Var RemainAmountStr = RemainAmountStr + "###size=90"
-			
-			If SumCoinAmount >= PayAmount Then 
-				CoinVending OFF
-				Var Canout = SumCoinAmount - PayAmount
-				If Canout = 0 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				Else
-					If show_eng = "true" Then 
-						Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow )
-						Var RemainAmountStr = "Change " + RemainAmountStr
-						Var RemainAmountStr = RemainAmountStr + "###size=90"
-					Else
-						Var RemainAmountStr = "ทอน " + Canout
-					EndIf
-				EndIf
-
-
-				If Seeker.StoreCreditFlag = 1 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				EndIf
-
-				
-				Var CancleState = "Disable"
-				Var CoinInOK = 1
-				Var CoinInCounter = 0
-
-				Var TxRef1 = ""	
-				CreateTxRef1 TxRef1
-
-
-
 			Else
-				Var RemainAmountStr = "" + RemainAmount
+				Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
-				Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
+				Var RemainAmountStr = "เติม " + RemainAmountStr
+				Var RemainAmountStr = RemainAmountStr + "###size=110"
 			EndIf
 
 			Var Timeout = 0
@@ -348,38 +288,28 @@
 			If CancelFlag = 0 Then
 				SAVELOG "VDCancle  > Cancle Order."
 				CoinVending OFF
-				Var CancelFlag = 1
-				Var CancelCounter = 0
-				If show_eng = "true" Then 
-					Var RemainAmountStr = "Refund"
-				Else
-					Var RemainAmountStr = "คืนเงิน"
-				EndIf
 				If CoinAmount = 0 Then
+					Var CancelFlag = 1
+					Var CancelCounter = 0
 					If show_eng = "true" Then 
 						Var RemainAmountStr = "Cancelled"
 					Else
 						Var RemainAmountStr = "ยกเลิก"
 					EndIf
-				EndIf
+				Else
-
+					Var ChangeOK = 1
-				If Seeker.StoreCreditFlag = 1 Then
 					If show_eng = "true" Then 
-						Var RemainAmountStr = "keep credit"
+						Var RemainAmountStr = "Keep credit"
 					Else
 						Var RemainAmountStr = "เก็บเครดิต"
 					EndIf
 					
+					CoinVending BILLSTACKALL
 				EndIf
 
+				Refresh
 			EndIf 
 		EndIf
-		
-		Refresh
-
-		If ViewBill > 0 Then
-				CoinVending BILLREJECT
-		EndIf
 	EndIf
 </EventVDCancle>
 
@@ -387,14 +317,7 @@
 
 
 
-<Video>
+;include="ROOT/taobin_project/inc/video.inc"
-<X> 0 </X>
-<Y> 0 </Y>
-<Width> 1080</Width>
-<Height> 380 </Height>
-<Loop> "true" </Loop>
-<Filename> video_menu_0 </Filename>
-</Video>
 
 
 
@@ -496,11 +419,12 @@
 
 
 <Text>
-<X> 0 </X>
+<X> 253 </X>
-<Y> 1023 </Y>
+<Y> 1041 </Y>
 <Size> 144 </Size>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
-<Width> 1080 </Width>
+<Width> 576 </Width>
+<Height> 180 </Height>
 <Font> KanitRegularTTF </Font>
 <Color> 0xDE794E </Color>
 <Value> RemainAmountStr </Value>
@@ -509,158 +433,10 @@
 
 
 
-
-
 <Button>
-<X> 398 </X>
+<X> 330 </X>
-<Y> 1338 </Y>
+<Y> 1355 </Y>
-<State> alphaState </State>
-<Filename> Var( DirImage + "/bn_edit.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_edit.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-     Open "ROOT/taobin_project/xml/page_member_topupAmount.xml"
-
-</EventClick>
-</Button>
-
-<Button>
-<X> 397 </X>
-<Y> 1338 </Y>
 <State> alphaState2 </State>
-<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-
-
-			
-	If CoinInOK = 0 Then
-        If CancelFlag = 0 Then
-			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
-            CoinVending OFF
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-			If show_eng = "true" Then 
-					Var RemainAmountStr = "Refund"
-				Else
-					Var RemainAmountStr = "คืนเงิน"
-			EndIf
-			If CoinAmount = 0 Then
-				If show_eng = "true" Then 
-					Var RemainAmountStr = "Cancelled"
-				Else
-					Var RemainAmountStr = "ยกเลิก"
-				EndIf
-			EndIf
-			If Seeker.StoreCreditFlag = 1 Then
-				If show_eng = "true" Then 
-					Var RemainAmountStr = "Keep credit"
-				Else
-					Var RemainAmountStr = "เก็บเครดิต"
-				EndIf
-			EndIf
-        EndIf
-	EndIf
-	
-	
-	Refresh
-
-
-</EventClick>
-</Button>
-
-
-
-<Button>
-<X> 829 </X>
-<Y> 777 </Y>
-<Filename> Var( DirImage + "/Exit.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/Exit.png" )</FilenamePress>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-    If CoinInOK = 0 Then
-        If CancelFlag = 0 Then
-			SAVELOG "ButtonCancleAlpha2  > Cancle Order2."
-            CoinVending OFF
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-			If show_eng = "true" Then 
-					Var RemainAmountStr = "Refund"
-				Else
-					Var RemainAmountStr = "คืนเงิน"
-			EndIf
-			If CoinAmount = 0 Then
-				If show_eng = "true" Then 
-					Var RemainAmountStr = "Cancelled"
-				Else
-					Var RemainAmountStr = "ยกเลิก"
-				EndIf
-			EndIf
-			If Seeker.StoreCreditFlag = 1 Then
-				If show_eng = "true" Then 
-					Var RemainAmountStr = "Keep credit"
-				Else
-					Var RemainAmountStr = "เก็บเครดิต"
-				EndIf
-			EndIf
-        EndIf
-	EndIf
-</EventClick>
-</Button>
-
-
-
-<Image>
-<X> 181 </X>
-<Y> 658 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage2 + img_popup15 )</Filename>
-</Image>
-
-<Text>
-<X> 0 </X>
-<Y> 1010 </Y>
-<Size> 120 </Size>
-<Align> Center </Align>
-<Width> 1080 </Width>
-<Font> KanitRegularTTF </Font>
-<State> alphaState3 </State>
-<Color> 0xDE794E </Color>
-<Value> RemainAmountKeepStr </Value>
-</Text>
-
-
-<Button>
-<X> 330 </X>
-<Y> 1303 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage + "/bn_confirm2.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_confirm2.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-  CoinVending BILLSTACKALL
-  Var Seeker.StoreCreditFlag = 1
-
-  Var alphaState3 = "Invisible"
-
-   Refresh
-
-</EventClick>
-</Button>
-
-
-<Button>
-<X> 330 </X>
-<Y> 1419 </Y>
-<State> alphaState3 </State>
 <Filename> Var( DirImage + "/bn_cancel3.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel3.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -670,55 +446,56 @@
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
-            CoinVending OFF
+			CoinVending OFF
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-			If show_eng = "true" Then 
-					Var RemainAmountStr = "Refund"
-				Else
-					Var RemainAmountStr = "คืนเงิน"
-			EndIf
 			If CoinAmount = 0 Then
-					If show_eng = "true" Then 
+				Var CancelCounter = 0
-						Var RemainAmountStr = "Cancelled"
+				Var CancelFlag = 1
-					Else
+				If show_eng = "true" Then 
-						Var RemainAmountStr = "ยกเลิก"
+					Var RemainAmountStr = "Cancelled"
-					EndIf
+				Else
+					Var RemainAmountStr = "ยกเลิก"
+				EndIf
+			Else
+				Var ChangeOK = 1
+				If show_eng = "true" Then 
+					Var RemainAmountStr = "Keep credit"
+				Else
+					Var RemainAmountStr = "เก็บเครดิต"
+				EndIf
+				
+				CoinVending BILLSTACKALL
 			EndIf
 
+			
+
+			Refresh
         EndIf
 	EndIf
-
+	
-	If ViewBill > 0 Then
+	
-		CoinVending BILLREJECT
-	EndIf
-
-	Var alphaState3 = "Invisible"
-
 	Refresh
-     
+
+
 </EventClick>
 </Button>
 
-
+<Button>
-
+<X> 330 </X>
-
+<Y> 1355 </Y>
-
+<State> confirmButtonState </State>
-
+<Filename> Var( DirImage + "/bn_confirm2.png" ) </Filename>
-
+<FilenamePress> Var( DirImage + "bp_confirm2.png" ) </FilenamePress>
-
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-
+<Volume> SoundVolume </Volume>
-
+<EventClick>
-
+	If CoinInOK = 0 Then
-
+		SAVELOG "ButtonConfirm"
-
+		CoinVending OFF
-
+		Var CoinInOK = 1
-
+		Var CoinInCounter = 0
-
+	EndIf
-
+</EventClick>
-
+</Button>
-
-
 
 </Popup>
 	

xml/page_payment_credit3-1.xml

@@ -132,8 +132,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-    Var PayCreditChannel = "cash"
+	Var TopupFromPage = "payment"
-	Open "ROOT/taobin_project/xml/page_payment_credit3-Topup.xml" 
+	Open "ROOT/taobin_project/xml/page_topup_credit3_cash_warning.xml" 
 
 </EventClick>
 </Button>

xml/page_payment_credit3-TopupCash.xml

@@ -38,9 +38,7 @@
 	Var alphaState2 = "Enable"
 
 	Var alphaState3 = "Invisible"
-
+	Var confirmButtonState = "Invisible"
-
-    INT AmountNumber
 
 	Var img_popup11 = "/img_popup11.png"
 	Var img_popup15 = "/img_popup15.png"
@@ -49,7 +47,6 @@
     If CountryName = "Malaysia" Then
 		Var img_popup11 = "/img_popup11-MYR.png"
 		Var img_popup15 = "/img_popup15-MYR.png"
-		Var AmountNumber = AmountNumber * 100
 	EndIf
 
 	;inter-image
@@ -62,20 +59,13 @@
     If CountryName = "Singapore" Then
 		Var img_popup11 = "/img_popup11-SGP.png"
 		Var img_popup15 = "/img_popup15-SGP.png"
-		Var AmountNumber = AmountNumber * 100
 	EndIf
 
     
     
-    Var CreditAmount = AmountNumber
+	Var CreditAmount = SumCreditAmount
-    Var RemainAmount = CreditAmount - CoinAmount
+	Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow )
-
+	Var showRemaining = charOfBaht + RemainAmountStr
-		
-
-	Var RemainAmountStr = "" + RemainAmount
-
-	Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-
 
 
     Var CoinInFlag = 0
@@ -85,14 +75,11 @@
 	Var CancelFlag = 0
 	Var ChangeFlag2 = 0
 
-	
-
-    
-
-
 	Var ChangeTimeout = 0
 	Var CancelCounter = 0
 
+	CoinVending XBILL
+
 
     Var ServiceAmount2 = CreditAmount
     Var ServiceCharge = 0
@@ -106,60 +93,7 @@
 	Var NamePriceShow = showname + " "
 	Var NamePriceShow = NamePriceShow + DrinkAmountStr
 
-	If CoinInOK = 0 Then
+	Var warning_price_state = "Enable"
-
-			Var RemainAmount = CreditAmount - CoinAmount
-			
-
-			Var SumCoinAmount = CoinAmount 
-			
-			If SumCoinAmount >= CreditAmount Then 
-				CoinVending OFF
-				Var Canout = SumCoinAmount - CreditAmount
-				If Canout = 0 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				Else
-					If show_eng = "true" Then 
-						Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow )
-						Var RemainAmountStr = "Change " + RemainAmountStr
-						Var RemainAmountStr = RemainAmountStr + "###size=90"
-					Else
-						Var RemainAmountStr = "ทอน " + Canout
-					EndIf
-				EndIf
-
-
-				If Seeker.StoreCreditFlag = 1 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				EndIf
-
-				
-				Var CancleState = "Disable"
-				Var CoinInOK = 1
-				Var CoinInCounter = 0
-
-				Var TxRef1 = ""	
-				CreateTxRef1 TxRef1
-
-
-
-			Else
-				Var RemainAmountStr = "" + RemainAmount
-				Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-			EndIf
-
-			Var Timeout = 0
-
-			
-			Var showRemaining = charOfBaht + RemainAmountStr
-			
-
-		
-		EndIf
-
-
 	
 
 </EventOpen>
@@ -178,19 +112,23 @@
 					AddData 24 TelephoneNumber  BmiYear PointCrm GetScore
 				EndIf
 
+				CoinVending OFF
 				Var CancelFlag = 1
 				Var CancelCounter = 0
-				Var RemainAmountStr = "คืนเงิน"
 				If CoinAmount = 0 Then
-					Var RemainAmountStr = "ยกเลิก"
+					If show_eng = "true" Then 
-                Else 
+						Var RemainAmountStr = "Cancelled"
-                    CoinVending OFF
+					Else
-				EndIf
+						Var RemainAmountStr = "ยกเลิก"
-				If Seeker.StoreCreditFlag = 1 Then
+					EndIf
-					Var RemainAmountStr = "เก็บเครดิต"
+				Else
-				EndIf
+					If show_eng = "true" Then 
-				If ViewBill > 0 Then
+						Var RemainAmountStr = "Keep credit"
-					CoinVending BILLREJECT
+					Else
+						Var RemainAmountStr = "เก็บเครดิต"
+					EndIf
+					
+					CoinVending BILLSTACKALL
 				EndIf
 			EndIf
 		EndIf
@@ -199,6 +137,8 @@
 	If ChangeOK = 1 Then
 
 		If CancelFlag = 0 Then
+			Var CreditAmount = CreditAmount + CoinAmount
+			Var ServiceAmount2 = CreditAmount
 			Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" 
 		Else
 
@@ -252,19 +192,8 @@
 		If CoinInCounter = 1 Then
 			Var PayOK = 1
 			
-			Var SumCoinAmount = CoinAmount 
+			If CoinAmount > 0 Then
-			If SumCoinAmount >= CreditAmount Then 
+				Var ChangeOK = 1
-				Var Canout = SumCoinAmount - CreditAmount
-				If Canout > 0 Then
-					If Seeker.StoreCreditFlag = 0 Then
-						Change Canout	
-						Var ChangeFlag2 = 1
-					Else
-						Var ChangeOK = 1
-					EndIf
-				Else
-					Var ChangeOK = 1
-				EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -273,17 +202,7 @@
 
 		Var CancelCounter = CancelCounter + 1
 		If CancelCounter = 2 Then
-			
+			Var ChangeOK = 1
-			If CoinAmount > 0 Then
-				If Seeker.StoreCreditFlag = 0 Then					
-					Change CoinAmount
-					Var ChangeFlag2 = 1
-				Else
-					Var ChangeOK = 1
-				EndIf
-			Else
-				Var ChangeOK = 1
-			EndIf
 		EndIf
 
 		Var ChangeTimeout = ChangeTimeout + 1
@@ -314,100 +233,39 @@
 </EventChangeStatus>
 
 <EventCoin>
-TimerReset
+	TimerReset
 
 	Var CoinInFlag = 1
 
 	DEBUGVAR ViewBill
-	
+	Var SumAmount = CreditAmount + CoinAmount
+	If SumAmount >= PayAmountSubDiscount Then
+		Var confirmButtonState = "Enable"
+		Var alphaState2 = "Invisible"
+		Var warning_price_state = "Invisible"
+	Else
+		Var warning_price_state = "Enable"
+	EndIf
 
 	If ViewBill > 0 Then
 
-		Var RemainAmount = CreditAmount - CoinAmount
+		CoinVending BILLSTACKALL
-		
-
-		If ViewBill > RemainAmount Then
-			Var RemainAmountKeep = ViewBill - RemainAmount
-			Var RemainAmountKeepStr !assigned StringFmt( RemainAmountKeep, DisplayFormat, PreScaleConvertShow )
-			Var alphaState3 = "Enable"
-			Var alphaState2 = "Disable"
-		Else
-			;CoinVending BILLSTACKALL
-			If ViewBill = RemainAmount Then
-				CoinVending BILLSTACKALL
-			Else
-				Var RemainAmountKeep = 0
-				Var RemainAmountKeepStr !assigned StringFmt( RemainAmountKeep, DisplayFormat, PreScaleConvertShow )
-				Var alphaState3 = "Enable"
-				Var alphaState2 = "Disable"
-			EndIf
-		EndIf
 
 		Var Timeout = 0
-		Var RemainAmountStr = "" + RemainAmount
+
+		Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
 		Var showRemaining = charOfBaht + RemainAmountStr
 
-		Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-
-		
-		
 	Else
 
 		
-		Var alphaState2 = "Enable"
-		
-
 		If CoinInOK = 0 Then
 
-			Var RemainAmount = CreditAmount - CoinAmount
-			
-
-			Var SumCoinAmount = CoinAmount 
-			
-			If SumCoinAmount >= CreditAmount Then 
-				CoinVending OFF
-				Var Canout = SumCoinAmount - CreditAmount
-				If Canout = 0 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				Else
-					If show_eng = "true" Then 
-						Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow )
-						Var RemainAmountStr = "Change " + RemainAmountStr
-						Var RemainAmountStr = RemainAmountStr + "###size=90"
-					Else
-						Var RemainAmountStr = "ทอน " + Canout
-					EndIf
-				EndIf
-
-
-				If Seeker.StoreCreditFlag = 1 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				EndIf
-
-				
-				Var CancleState = "Disable"
-				Var CoinInOK = 1
-				Var CoinInCounter = 0
-
-				Var TxRef1 = ""	
-				CreateTxRef1 TxRef1
-
-
-
-			Else
-				Var RemainAmountStr = "" + RemainAmount
-				Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-			EndIf
-
 			Var Timeout = 0
 
-			
+			Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
 			Var showRemaining = charOfBaht + RemainAmountStr
 			
-
-		
 		EndIf
 
 	EndIf
@@ -468,35 +326,47 @@ TimerReset
 <Align> Center </Align>
 <Width> 1080 </Width>
 <Font> KanitRegularTTF </Font>
-<State> alphaState2 </State>
 <Color> 0xDE794E </Color>
 <Value> RemainAmountStr </Value>
 </Text>
 
-
+<Text>
+<X> 253 </X>
+<Y> 1254 </Y>
+<Size> 20 </Size>
+<Width> 375 </Width>
+<Font> KanitRegularTTF </Font>
+<State> warning_price_state </State>
+<Color> 0xE4202B </Color>
+<Value>
+	eval(
+		If show_eng = "true" Then
+			Var return = "*Amount must equal or exceed price."
+		Else
+			Var return = "*จำนวนเงินต้องเท่ากับหรือมากกว่าราคาสินค้า"
+		EndIf
+	)
+ </Value>
+</Text>
 
 <Text>
 <X> 253 </X>
-<Y> 1271 </Y>
+<Y> 1295 </Y>
 <Size> 25 </Size>
 <Align> Right </Align>
 <Width> 500 </Width>
 <Font> KanitRegularTTF </Font>
-<State> alphaState2 </State>
 <Color> 0x746253 </Color>
 <Value> NamePriceShow </Value>
 </Text>
 
 
 
-
-
 <Button>
-<X> 397 </X>
+<X> 330 </X>
-<Y> 1380 </Y>
+<Y> 1355 </Y>
-
+<Filename> Var( DirImage + "/bn_cancel3.png" )</Filename>
-<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bn_cancel3.png" )</FilenamePress>
-<FilenamePress> Var( DirImage + "/bn_cancel2.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -504,39 +374,35 @@ TimerReset
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
-           
+
 			If ReqPayWithCash = 1 Then
 				Var BmiYear = useCreditAmount
 				Var GetScore = "useCredit"
 				AddData 24 TelephoneNumber  BmiYear PointCrm GetScore
 			EndIf
 
-			Var CancelFlag = 1
+			CoinVending OFF
 			Var CancelCounter = 0
-			If show_eng = "true" Then 
+			Var CancelFlag = 1
-					Var RemainAmountStr = "Refund"
-				Else
-					Var RemainAmountStr = "คืนเงิน"
-			EndIf
 			If CoinAmount = 0 Then
 				If show_eng = "true" Then 
 					Var RemainAmountStr = "Cancelled"
 				Else
 					Var RemainAmountStr = "ยกเลิก"
 				EndIf
-            Else 
+			Else
-                 CoinVending OFF
-			EndIf
-			If Seeker.StoreCreditFlag = 1 Then
 				If show_eng = "true" Then 
 					Var RemainAmountStr = "Keep credit"
 				Else
 					Var RemainAmountStr = "เก็บเครดิต"
 				EndIf
+				
+				CoinVending BILLSTACKALL
 			EndIf
-            If ViewBill > 0 Then
+
-					CoinVending BILLREJECT
+			
-			EndIf
+
+			Refresh
         EndIf
 	EndIf
 	
@@ -546,77 +412,24 @@ TimerReset
 </EventClick>
 </Button>
 
-<Image>
-<X> 181 </X>
-<Y> 658 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage2 + img_popup15 )</Filename>
-</Image>
-
-<Text>
-<X> 0 </X>
-<Y> 1010 </Y>
-<Size> 120 </Size>
-<Align> Center </Align>
-<Width> 1080 </Width>
-<Font> KanitRegularTTF </Font>
-<State> alphaState3 </State>
-<Color> 0xDE794E </Color>
-<Value> RemainAmountKeepStr </Value>
-</Text>
-
-
 <Button>
 <X> 330 </X>
-<Y> 1303 </Y>
+<Y> 1355 </Y>
-<State> alphaState3 </State>
+<State> confirmButtonState </State>
-<Filename> Var( DirImage + "/bn_confirm2.png" )</Filename>
+<Filename> Var( DirImage + "/bn_confirm2.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_confirm2.png" )</FilenamePress>
+<FilenamePress> Var( DirImage + "bp_confirm2.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
-
+	If CoinInOK = 0 Then
-  CoinVending BILLSTACKALL
+		SAVELOG "ButtonConfirm"
-  Var Seeker.StoreCreditFlag = 1
+		CoinVending OFF
-
+		Var CoinInOK = 1
-  Var alphaState3 = "Invisible"
+		Var CoinInCounter = 0
-
-   Refresh
-
-</EventClick>
-</Button>
-
-
-<Button>
-<X> 330 </X>
-<Y> 1419 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage + "/bn_cancel3.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel3.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-	If ViewBill > 0 Then
-		CoinVending BILLREJECT
 	EndIf
-
-	Var alphaState3 = "Invisible"
-
-	Refresh
-     
 </EventClick>
 </Button>
 
-<Image>
-<X> 145 </X>
-<Y> 820 </Y>
-<State> ShowErrorText </State>
-<Refresh> "Enable" </Refresh>
-<Filename> Var( DirImage + text_show_error ) </Filename>
-</Image>
-
-
 ;include="ROOT/taobin_project/inc/video.inc"
 
 <EventSecurity> 

xml/page_topup_credit3-1.xml

@@ -52,7 +52,7 @@
 	
 	If Timeout > 60 Then
 	
-		Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
 		
 	EndIf
 	
@@ -124,8 +124,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-    Var PayCreditChannel = "cash"
+	Var TopupFromPage = "brewing"
-	Open "ROOT/taobin_project/xml/page_topup_credit3-Topup.xml" 
+	Open "ROOT/taobin_project/xml/page_topup_credit3_cash_warning.xml" 
 
 </EventClick>
 </Button>

xml/page_topup_credit3-TopupCash.xml

@@ -38,9 +38,9 @@
 	Var alphaState2 = "Enable"
 
 	Var alphaState3 = "Invisible"
+	Var confirmButtonState = "Invisible"
 
 
-    INT AmountNumber
 
 	Var img_popup11 = "/img_popup11.png"
 	Var img_popup15 = "/img_popup15.png"
@@ -49,7 +49,6 @@
     If CountryName = "Malaysia" Then
 		Var img_popup11 = "/img_popup11-MYR.png"
 		Var img_popup15 = "/img_popup15-MYR.png"
-		Var AmountNumber = AmountNumber * 100
 	EndIf
 
 	;inter-image
@@ -62,20 +61,19 @@
     If CountryName = "Singapore" Then
 		Var img_popup11 = "/img_popup11-SGP.png"
 		Var img_popup15 = "/img_popup15-SGP.png"
-		Var AmountNumber = AmountNumber * 100
 	EndIf
 
-    
-    
-    Var CreditAmount = AmountNumber
-    Var RemainAmount = CreditAmount - CoinAmount
 
-		
+	Var CreditAmount = 0
-
-	Var RemainAmountStr = "" + RemainAmount
-
-	Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
 
+	Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow )
+	If show_eng = "true" Then
+		Var RemainAmountStr = "Top-up " + RemainAmountStr
+		Var RemainAmountStr = RemainAmountStr + "###size=110"
+	Else
+		Var RemainAmountStr = "เติม " + RemainAmountStr
+		Var RemainAmountStr = RemainAmountStr + "###size=90"
+	EndIf
 
 
     Var CoinInFlag = 0
@@ -87,7 +85,7 @@
 
 	
 
-    
+	CoinVending XBILL
 
 
 	Var ChangeTimeout = 0
@@ -99,66 +97,7 @@
 	Var	Donate = "" 
 	Var SuggestID  = ""
 
-    Var Seeker.StoreCreditFlag = 0
+    Var Seeker.StoreCreditFlag = 1
-
-	Var DrinkAmountStr !assigned StringFmt( PayAmountSubDiscount, DisplayFormat, PreScaleConvertShow )
-
-	Var NamePriceShow = showname + " "
-	Var NamePriceShow = NamePriceShow + DrinkAmountStr
-
-	If CoinInOK = 0 Then
-
-			Var RemainAmount = CreditAmount - CoinAmount
-			
-
-			Var SumCoinAmount = CoinAmount 
-			
-			If SumCoinAmount >= CreditAmount Then 
-				CoinVending OFF
-				Var Canout = SumCoinAmount - CreditAmount
-				If Canout = 0 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				Else
-					If show_eng = "true" Then 
-						Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow )
-						Var RemainAmountStr = "Change " + RemainAmountStr
-						Var RemainAmountStr = RemainAmountStr + "###size=90"
-					Else
-						Var RemainAmountStr = "ทอน " + Canout
-					EndIf
-				EndIf
-
-
-				If Seeker.StoreCreditFlag = 1 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				EndIf
-
-				
-				Var CancleState = "Disable"
-				Var CoinInOK = 1
-				Var CoinInCounter = 0
-
-				Var TxRef1 = ""	
-				CreateTxRef1 TxRef1
-
-
-
-			Else
-				Var RemainAmountStr = "" + RemainAmount
-				Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-			EndIf
-
-			Var Timeout = 0
-
-			
-			Var showRemaining = charOfBaht + RemainAmountStr
-			
-
-		
-		EndIf
-
 
 	
 
@@ -171,22 +110,25 @@
 		If CoinInOK = 0 Then
 			If CancelFlag = 0 Then
 				SAVELOG "ButtonCancleAlpha2  > Timeout Order."
-				
+				CoinVending OFF
-				 CoinVending OFF
-
-				Var CancelFlag = 1
-				Var CancelCounter = 0
-				Var RemainAmountStr = "คืนเงิน"
 				If CoinAmount = 0 Then
-					Var RemainAmountStr = "ยกเลิก"
+					Var CancelFlag = 1
-                Else 
+					Var CancelCounter = 0
-                   
+					If show_eng = "true" Then 
-				EndIf
+						Var RemainAmountStr = "Cancelled"
-				If Seeker.StoreCreditFlag = 1 Then
+					Else
-					Var RemainAmountStr = "เก็บเครดิต"
+						Var RemainAmountStr = "ยกเลิก"
-				EndIf
+					EndIf
-				If ViewBill > 0 Then
+				Else
-					CoinVending BILLREJECT
+					Var CoinInOK = 1
+					Var CoinInCounter = 0
+					If show_eng = "true" Then 
+						Var RemainAmountStr = "Keep credit"
+					Else
+						Var RemainAmountStr = "เก็บเครดิต"
+					EndIf
+					
+					CoinVending BILLSTACKALL
 				EndIf
 			EndIf
 		EndIf
@@ -196,21 +138,22 @@
 
 		If CancelFlag = 0 Then
 
-				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+			Var TelephoneNumber = Seeker.TNumberTaobinCredit
-                Var PayO2 = Var Seeker.CoffeePinNumber
+			Var PayO2 = Var Seeker.CoffeePinNumber
-                    
-                Var VendingDiscount = 0
-                Var VendingCampaign = 0
-                Var ServiceType = "credit"
-                Var SessionID2 = "00-00-00-0000"
-                Var ServiceCredit = "coffee"
-				Var PayDetail = ""
-				Var CreditReference = ""
-
-                Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-                Var PayCredit = 1
 
+			Var CreditAmount = CoinAmount
+			Var ServiceAmount2 = CreditAmount
+				
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
+			Var ServiceType = "credit"
+			Var SessionID2 = "00-00-00-0000"
+			Var ServiceCredit = "coffee"
+			Var PayDetail = ""
+			Var CreditReference = ""
 
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			Var PayCredit = 1
 
 			Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml" 
 		Else
@@ -266,19 +209,8 @@
 		If CoinInCounter = 1 Then
 			Var PayOK = 1
 			
-			Var SumCoinAmount = CoinAmount 
+			If CoinAmount > 0 Then
-			If SumCoinAmount >= CreditAmount Then 
+				Var ChangeOK = 1
-				Var Canout = SumCoinAmount - CreditAmount
-				If Canout > 0 Then
-					If Seeker.StoreCreditFlag = 0 Then
-						Change Canout	
-						Var ChangeFlag2 = 1
-					Else
-						Var ChangeOK = 1
-					EndIf
-				Else
-					Var ChangeOK = 1
-				EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -289,12 +221,9 @@
 		If CancelCounter = 2 Then
 			
 			If CoinAmount > 0 Then
-				If Seeker.StoreCreditFlag = 0 Then					
+				Var CancelFlag = 0
-					Change CoinAmount
+				Var CancelCounter = 0
-					Var ChangeFlag2 = 1
+				Var ChangeTimeout = 0
-				Else
-					Var ChangeOK = 1
-				EndIf
 			Else
 				Var ChangeOK = 1
 			EndIf
@@ -328,91 +257,44 @@
 </EventChangeStatus>
 
 <EventCoin>
-TimerReset
+	TimerReset
 
 	Var CoinInFlag = 1
 
 	DEBUGVAR ViewBill
+
+	Var confirmButtonState = "Enable"
+	Var alphaState2 = "Invisible"
 	
 
 	If ViewBill > 0 Then
 
-		Var RemainAmount = CreditAmount - CoinAmount
+		CoinVending BILLSTACKALL
-		
-
-		If ViewBill > RemainAmount Then
-			Var RemainAmountKeep = ViewBill - RemainAmount
-			Var RemainAmountKeepStr !assigned StringFmt( RemainAmountKeep, DisplayFormat, PreScaleConvertShow )
-			Var alphaState3 = "Enable"
-			Var alphaState2 = "Disable"
-		Else
-			;CoinVending BILLSTACKALL
-			If ViewBill = RemainAmount Then
-				CoinVending BILLSTACKALL
-			Else
-				Var RemainAmountKeep = 0
-				Var RemainAmountKeepStr !assigned StringFmt( RemainAmountKeep, DisplayFormat, PreScaleConvertShow )
-				Var alphaState3 = "Enable"
-				Var alphaState2 = "Disable"
-			EndIf
-		EndIf
 
 		Var Timeout = 0
-		Var RemainAmountStr = "" + RemainAmount
+
+		Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
+		If show_eng = "true" Then
+			Var RemainAmountStr = "Top-up " + RemainAmountStr
+			Var RemainAmountStr = RemainAmountStr + "###size=90"
+		Else
+			Var RemainAmountStr = "เติม " + RemainAmountStr
+			Var RemainAmountStr = RemainAmountStr + "###size=110"
+		EndIf
 		Var showRemaining = charOfBaht + RemainAmountStr
-
-		Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
-
-		
 		
 	Else
 
-		
-		Var alphaState2 = "Enable"
-		
-
 		If CoinInOK = 0 Then
 
-			Var RemainAmount = CreditAmount - CoinAmount
+			If show_eng = "true" Then
-			
+				Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
-
+				Var RemainAmountStr = "Top-up " + RemainAmountStr
-			Var SumCoinAmount = CoinAmount 
+				Var RemainAmountStr = RemainAmountStr + "###size=90"
-			
-			If SumCoinAmount >= CreditAmount Then 
-				CoinVending OFF
-				Var Canout = SumCoinAmount - CreditAmount
-				If Canout = 0 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				Else
-					If show_eng = "true" Then 
-						Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow )
-						Var RemainAmountStr = "Change " + RemainAmountStr
-						Var RemainAmountStr = RemainAmountStr + "###size=90"
-					Else
-						Var RemainAmountStr = "ทอน " + Canout
-					EndIf
-				EndIf
-
-
-				If Seeker.StoreCreditFlag = 1 Then
-					Var RemainAmountStr = 0
-					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
-				EndIf
-
-				
-				Var CancleState = "Disable"
-				Var CoinInOK = 1
-				Var CoinInCounter = 0
-
-				Var TxRef1 = ""	
-				CreateTxRef1 TxRef1
-
-
-
 			Else
-				Var RemainAmountStr = "" + RemainAmount
+				Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
-				Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
+				Var RemainAmountStr = "เติม " + RemainAmountStr
+				Var RemainAmountStr = RemainAmountStr + "###size=110"
 			EndIf
 
 			Var Timeout = 0
@@ -476,13 +358,13 @@ TimerReset
 
 
 <Text>
-<X> 0 </X>
+<X> 253 </X>
 <Y> 1041 </Y>
 <Size> 144 </Size>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
-<Width> 1080 </Width>
+<Width> 576 </Width>
+<Height> 180 </Height>
 <Font> KanitRegularTTF </Font>
-<State> alphaState2 </State>
 <Color> 0xDE794E </Color>
 <Value> RemainAmountStr </Value>
 </Text>
@@ -496,11 +378,10 @@ TimerReset
 
 
 <Button>
-<X> 397 </X>
+<X> 330 </X>
-<Y> 1380 </Y>
+<Y> 1355 </Y>
-
+<Filename> Var( DirImage + "/bn_cancel3.png" )</Filename>
-<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bn_cancel3.png" )</FilenamePress>
-<FilenamePress> Var( DirImage + "/bn_cancel2.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -508,34 +389,24 @@ TimerReset
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
-           
 			CoinVending OFF
-
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-			If show_eng = "true" Then 
-					Var RemainAmountStr = "Refund"
-				Else
-					Var RemainAmountStr = "คืนเงิน"
-			EndIf
 			If CoinAmount = 0 Then
+				Var CancelCounter = 0
+				Var CancelFlag = 1
 				If show_eng = "true" Then 
 					Var RemainAmountStr = "Cancelled"
 				Else
 					Var RemainAmountStr = "ยกเลิก"
 				EndIf
-            Else 
+			Else
-                 
+				Var ChangeOK = 1
-			EndIf
-			If Seeker.StoreCreditFlag = 1 Then
 				If show_eng = "true" Then 
 					Var RemainAmountStr = "Keep credit"
 				Else
 					Var RemainAmountStr = "เก็บเครดิต"
 				EndIf
-			EndIf
+				
-            If ViewBill > 0 Then
+				CoinVending BILLSTACKALL
-					CoinVending BILLREJECT
 			EndIf
         EndIf
 	EndIf
@@ -546,76 +417,24 @@ TimerReset
 </EventClick>
 </Button>
 
-<Image>
-<X> 181 </X>
-<Y> 658 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage2 + img_popup15 )</Filename>
-</Image>
-
-<Text>
-<X> 0 </X>
-<Y> 1010 </Y>
-<Size> 120 </Size>
-<Align> Center </Align>
-<Width> 1080 </Width>
-<Font> KanitRegularTTF </Font>
-<State> alphaState3 </State>
-<Color> 0xDE794E </Color>
-<Value> RemainAmountKeepStr </Value>
-</Text>
-
-
 <Button>
 <X> 330 </X>
-<Y> 1303 </Y>
+<Y> 1355 </Y>
-<State> alphaState3 </State>
+<State> confirmButtonState </State>
-<Filename> Var( DirImage + "/bn_confirm2.png" )</Filename>
+<Filename> Var( DirImage + "/bn_confirm2.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_confirm2.png" )</FilenamePress>
+<FilenamePress> Var( DirImage + "bp_confirm2.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
-
+	If CoinInOK = 0 Then
-  CoinVending BILLSTACKALL
+		SAVELOG "ButtonConfirm"
-  Var Seeker.StoreCreditFlag = 1
+		CoinVending OFF
-
+		Var CoinInOK = 1
-  Var alphaState3 = "Invisible"
+		Var CoinInCounter = 0
-
-   Refresh
-
-</EventClick>
-</Button>
-
-
-<Button>
-<X> 330 </X>
-<Y> 1419 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage + "/bn_cancel3.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel3.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-	If ViewBill > 0 Then
-		CoinVending BILLREJECT
 	EndIf
-
-	Var alphaState3 = "Invisible"
-
-	Refresh
-     
 </EventClick>
 </Button>
 
-<Image>
-<X> 145 </X>
-<Y> 820 </Y>
-<State> ShowErrorText </State>
-<Refresh> "Enable" </Refresh>
-<Filename> Var( DirImage + text_show_error ) </Filename>
-</Image>
-
 
 ;include="ROOT/taobin_project/inc/video.inc"
 

xml/page_topup_credit3_cash_warning.xml

@@ -0,0 +1,134 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xeae6e1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+
+        If show_eng = "true" Then 
+            Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+        Else
+            Var DirImage = "ROOT/taobin_project/image/collectiing"
+        EndIf
+
+	    Var ReqPayWithCash = 0
+
+    </EventOpen>
+
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout> 
+
+        Var Timeout = Timeout + 1
+        
+        If Timeout > 30 Then
+            If TopupFromPage = "member" Then
+                Open "ROOT/taobin_project/xml/page_member_topup3.xml"
+            Else
+                If TopupFromPage = "payment" Then
+                    Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_topup_credit3-1.xml" 
+                EndIf
+            EndIf
+        EndIf
+        
+
+        Refresh
+        TimerReset
+    </EventTimeout> 
+
+    <EventCoin>
+        If ViewBill > 0 Then
+            CoinVending BILLREJECT
+        EndIf
+    </EventCoin>
+
+    
+    <EventActionOk>
+        If ReqPayWithCash = 1 Then
+            Var Seeker.CreditReferenceTmp = "" + useCreditAmount
+            Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
+            Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
+
+            Var Seeker.StoreCreditFlag = 1
+            Var Seeker.CreditNotEnoughRefID = PointCrm
+            Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
+	    EndIf
+    </EventActionOk>
+
+
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+    </Image>
+
+    <Image>
+        <X> 157 </X>
+        <Y> 803 </Y>
+        <Filename> "ROOT/taobin_project/image/collectiing/cash_warning_bg.png" </Filename>
+    </Image>
+
+     <Image>
+        <X> 172 </X>
+        <Y> 839 </Y>
+        <Filename> Var( DirImage + "/cash_warning_text.png" ) </Filename>
+    </Image>
+
+    <Button>
+        <X> 218 </X>
+        <Y> 1150 </Y>
+        <Filename> Var( DirImage + "/bn_cancel2.png" ) </Filename>
+        <FilenamePress> Var( DirImage + "/bp_cancel2.png" ) </FilenamePress>
+        <EventClick>
+            If TopupFromPage = "member" Then
+                Open "ROOT/taobin_project/xml/page_member_topup3.xml"
+            Else
+                If TopupFromPage = "payment" Then
+                    Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_topup_credit3-1.xml" 
+                EndIf
+            EndIf
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 577 </X>
+        <Y> 1150 </Y>
+        <Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
+        <FilenamePress> Var( DirImage + "/bp_confirm.png" ) </FilenamePress>
+        <EventClick>
+            
+            Var PayCreditChannel = "cash"
+            
+            If TopupFromPage = "member" Then
+                Open "ROOT/taobin_project/xml/page_member_topupCash.xml"
+            Else
+                If TopupFromPage = "payment" Then
+                    If ReqPayWithCash = 0 Then
+                        Var TelephoneNumber = Seeker.TNumberTaobinCredit
+                        Var useCreditAmount = SumCreditAmount
+                        Var BmiYear = useCreditAmount
+                        Var GetScore = "useCredit"
+                        AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+                        Var ReqPayWithCash = 1
+                    EndIf
+                Else
+	                Open "ROOT/taobin_project/xml/page_topup_credit3-TopupCash.xml"
+                EndIf
+            EndIf
+        </EventClick>
+    </Button>
+
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <EventSecurity> 
+        Open "/media/bt/xml/security_alarm.xml" 
+    </EventSecurity>
+</Popup>

xml/process/payment.ev

@@ -53,6 +53,7 @@ If Seeker.PayWithQR = 1 Then
 		Var VendingCampaign = Seeker.VendingCampaign
 		Var TxReference = Seeker.TxRef1
 		Var VendingOrderID = Seeker.ORDER_ID
+		Var PayType = "newpay"
 
 		Var ServiceType = "coffee-payment"
 		Var ServiceCredit = SelectDrink