Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/aus/xml/open_page_catalog.ev

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

inter/aus/xml/page_catalog_cocktail.lxml

@@ -0,0 +1,749 @@
+<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 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_cocktail.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_cocktail.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_cocktail.lxml"
+	Open OpenFileXML
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 564 </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>
+
+; 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> 48 </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> 392 </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> "Enable" </State>
+<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>
+
+
+;###############################################################
+
+<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>

inter/aus/xml/page_catalog_group_health.lxml

@@ -1,30 +1,29 @@
-
-
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-	;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
-    Var Menu22Selected = "PressForever"
-    
-    
-    SAVELOG PreviseXMLFileName2
-
-    Var Timeout = 0
-
-
-    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
-</EventOpen>
-
-
-
-;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
-
-
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
+    Var Menu22Selected = "PressForever"
+    
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
+</EventOpen>
+
+
+
+;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
+
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -7171,8 +7170,8 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-
-
-
-</Popup>
+
+
+
+
+</Popup>

inter/aus/xml/page_topping_select6.lxml

@@ -496,6 +496,12 @@
 		Var topping_shot_price_x = 630
 		Var text_x_add_oreo_price = 510
 		Var text_show_normal_x = 408
+
+		Var custom_coffee_level_medium_text_x = 540
+		Var custom_coffee_level_medium_price_x = 600
+
+		Var custom_coffee_level_darker_text_x = 880
+		Var custom_coffee_level_dark_text_x = 785
 	Else
 	
 		Var DirImage = "ROOT/taobin_project/image/topping2"
@@ -510,6 +516,12 @@
 		Var topping_shot_price_x = 600
 		Var text_x_add_oreo_price = 490
 		Var text_show_normal_x = 386
+
+		Var custom_coffee_level_medium_text_x = 560
+		Var custom_coffee_level_medium_price_x = 600
+
+		Var custom_coffee_level_darker_text_x = 880
+		Var custom_coffee_level_dark_text_x = 790
 	
 	EndIf
 
@@ -1838,6 +1850,11 @@
 		DEBUGVAR toppingID2price1
 		DEBUGVAR toppingID2price2
 		DEBUGVAR toppingID2price3
+
+		DEBUGVAR toppingID9price1
+		DEBUGVAR toppingID9price2
+		DEBUGVAR toppingID9price3
+		DEBUGVAR toppingID9price4
 		Function 2
 	EndIf
 

xml/page_brewing3.xml

@@ -55,8 +55,8 @@
 
 		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
 
-		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png"
-		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png"
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
 
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"
@@ -65,13 +65,15 @@
 		Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png"
 		
 
-		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png"
-		Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png"
+		;Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png"
+		;Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png"
+		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png"
+		Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png"
 
 		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
 		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
 
-		Var XStraw = 274
+		Var XStraw = 142
 	Else
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
 		
@@ -108,7 +110,7 @@
 		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png"
 		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png"
 
-		Var XStraw = 274
+		Var XStraw = 142
 	EndIf
 
 	Var waitAckPay = 0
@@ -364,15 +366,18 @@
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 	Else
 		Var SelectMenuBetweenBrewEnable1 = "Enable"
+		Var EnableTopupCreditBetweenBrew = "Enable"
 	EndIf
 
 	If GetFreeFromError = 1 Then
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
 	If DisableFromPowerup = "true" Then
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
 	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
@@ -404,21 +409,25 @@
 	If Seeker.CreditCard = 1 Then
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"  
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
 	If NeedUpgrade = "true" Then
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"  
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
 	If NeedReboot = "true" Then
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"  
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 	
 	If SELLSTATUS = "DEACTIVE" Then
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf	
 
 	DEBUGVAR NeedUpgrade
@@ -1443,6 +1452,7 @@
 	If MachineState_Result > 0 Then
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
 	; Close next button.
@@ -1450,12 +1460,14 @@
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
 		Var SelectMenuBetweenBrewEnable2 = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 		
 	EndIf
 
 	If DisableFromPowerup = "true" Then
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
 	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
@@ -1923,8 +1935,8 @@
 </Button>
 
 <Button>
-<X> 792 </X>
-<Y> 1687 </Y>
+<X> 262 </X>
+<Y> 1787 </Y>
 <State>EnableTopupCreditBetweenBrew</State>
 <Filename> topup_credit_bn </Filename>
 <FilenamePress> topup_credit_bp </FilenamePress>
@@ -2079,7 +2091,7 @@
 ; Lid button, Get one and report
 ;
 <Button>
-<X> 14 </X>
+<X> 22 </X>
 <Y> 1787 </Y>
 <State>bg_lidProblem_ST</State>
 <Filename>  bnLidProblemReport </Filename>
@@ -2097,7 +2109,7 @@
 </Button>
 
 <Button>
-<X> 14 </X>
+<X> 22 </X>
 <Y> 1787 </Y>
 <State>GetLidButtonState</State>
 <Mode> "No" </Mode>

xml/page_brewing3Conti.xml

@@ -33,7 +33,7 @@
 	Var topup_credit_bn = DirImage + "/bn_topup_credit.png"
 	Var topup_credit_bp = DirImage + "/bp_topup_credit.png"
 
-	Var EnableTopupCreditBetweenBrew = "Invisible"
+	Var EnableTopupCreditBetweenBrew = "Enable"
 
 	If NextOrder = "true" Then
 		Var EnableSelectMenuBetweenBrew = "Invisible"
@@ -180,6 +180,11 @@
 
 	If Seeker.CreditCard = 1 Then
 		Var EnableSelectMenuBetweenBrew = "Invisible"  
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	If MachineState_Result > 0 Then 
+		Var EnableTopupCreditBetweenBrew = "Invisible"  
 	EndIf
 
 	Var CreditCardVoid = 0
@@ -1094,8 +1099,8 @@
 </Button>
 
 <Button>
-<X> 792 </X>
-<Y> 1687 </Y>
+<X> 262 </X>
+<Y> 1787 </Y>
 <State>EnableTopupCreditBetweenBrew</State>
 <Filename> topup_credit_bn </Filename>
 <FilenamePress> topup_credit_bp </FilenamePress>
@@ -1112,11 +1117,13 @@
 
 			Var SeekerTmp = "curr"
 			Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
+
+			CoinPause
 		EndIf
 	
 		SAVELOG "User click topup-credit button"
 		Var Seeker = "topupCredit"
-		CoinPause
+		
 		Var PayCredit = 0
 
 		If TelephoneNumber = "" Then 

xml/page_catalog.lxml

@@ -7,10 +7,7 @@
 <EventOpen>
 
 	If CountryName = "Australia" Then
-		If WinterWarmersCatalogFlag = 1 Then
-			Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
-			Open catalogFile 
-		EndIf
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev"
 	EndIf
 
 

xml/page_catalog_cocktail.xml

@@ -5,6 +5,13 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+
+	If CountryName = "Australia" Then
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev"
+	EndIf
+
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 	
 	TopView "show"

xml/page_topping_select7.xml

@@ -2353,6 +2353,10 @@
 		DEBUGVAR toppingID2price1
 		DEBUGVAR toppingID2price2
 		DEBUGVAR toppingID2price3
+		DEBUGVAR toppingID9price1
+		DEBUGVAR toppingID9price2
+		DEBUGVAR toppingID9price3
+		DEBUGVAR toppingID9price4
 
 		DEBUGVAR ShiftSugarStep
 

xml/page_topup_credit-ChooseNumber.xml

@@ -6,7 +6,6 @@
 <Background> "0xeae6e1" </Background>
 
 <Volume> SoundVolume </Volume>
-<Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
 
@@ -20,6 +19,7 @@
 	Var ShowErrorText = "Invisible"
 	Var ShowErrorText2 = "Invisible"
 	Var Tel_Confirm_State = "Invisible"
+	Var LoadingState = "Invisible"
 
 	Var GetCreditFlag = 0
 
@@ -47,6 +47,14 @@
 <EventTimeout> 
 
 	Var Timeout = Timeout + 1
+
+	If GetAccFlag = 1 Then
+		If Timeout > 20 Then
+			Var LoadingState = "Invisible"
+			Var ShowErrorText = "Enable"
+		EndIf
+	EndIf
+
 	If Timeout > 60 Then
 		
 		;Open "ROOT/taobin_project/xml/page_catalog2.xml" 
@@ -189,6 +197,24 @@
 </Text>
 
 
+<GIF>
+<X> 493 </X>
+<Y> 1020 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> LoadingState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/loading.gif"</Filename>
+</GIF>
+
+<Image>
+<X> 267 </X>
+<Y> 1120 </Y>
+<State> LoadingState </State>
+<Filename> Var( DirImage + "/loadingText.png" )</Filename>
+</Image>
+
+
+
 ;include="ROOT/taobin_project/inc/video.inc"
 
 			
@@ -214,6 +240,8 @@
 
 		Var GetAccFlag = 1
 		GETACCEXT TelephoneNumber 19
+		Var LoadingState = "Enable"
+		Refresh
 	Else
 
 		Var ShowErrorText2 = "Enable"

xml/page_topup_credit3-1.xml

@@ -38,6 +38,11 @@
 	Var timeout_Adddata22 = 0
 	GenHashWithTimeStamp PointCrm
 
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var topupCreditWithCash = "Disable"
+	EndIf
+
+
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>

xml/page_topup_credit3-Topup.xml

@@ -6,7 +6,6 @@
 <Background> "0xeae6e1" </Background>
 
 <Volume> SoundVolume </Volume>
-<Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
 
@@ -19,6 +18,7 @@
 	Var ShowTextNumber = "Enable"
 	Var ShowErrorText = "Invisible"
 	Var Tel_Confirm_State = "Invisible"
+	Var loadingReqState = "Invisible"
 
 	Var GetCreditFlag = 0
 
@@ -629,6 +629,8 @@ If ViewBill > 0 Then
 						Var TextWaiting = "กรุณารอซักครู่..."
 					EndIf
 
+					Var loadingReqState = "Enable"
+
 					Refresh
 
 				EndIf
@@ -681,10 +683,21 @@ If ViewBill > 0 Then
 <Filename> Var( DirImage + text_show_error ) </Filename>
 </Image>
 
+<Image>
+<X> 158 </X>
+<Y> 601 </Y>
+<State> loadingReqState </State>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha_loading.png" </Filename>
+</Image>
 
-
-
-;include="ROOT/taobin_project/inc/video.inc"
+<GIF>
+<X> 494 </X>
+<Y> 1078 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> loadingReqState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/loading.gif" </Filename>
+</GIF>
 
 
 <Text>
@@ -700,7 +713,7 @@ If ViewBill > 0 Then
 </Text>
 
 
-
+;include="ROOT/taobin_project/inc/video.inc"
 
 			
 <EventSecurity> 

xml/page_topup_credit3-TopupCash.xml

@@ -205,6 +205,7 @@
                 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
@@ -233,6 +234,7 @@
                 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