Merge remote-tracking branch 'origin/masterpiece' into th_inter

inter/tha/xml/multi/page_catalog.lxml

@@ -18,6 +18,8 @@
 
 	DEBUGVAR ToppingNewShow
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev"
+
 	DEBUGVAR OpenFromPageBoard
 	If OpenFromPageBoard = 1 Then
 		Var OpenFromPageBoard = 0
@@ -44,16 +46,16 @@
 	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"	
+
+	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 	
+
+	If Seeker = "curr" Then
 		Machine DoorLidClose
 	EndIf
 
@@ -64,11 +66,11 @@
 
 	CoinVending OFF
 
-	
+
 	; Clear value
 	Topping "clear" "-"
 
-	
+
 	Var DirImage = "ROOT/taobin_project/image/page2_inter/"
 
 	Var StrawAutoRelease1 = "false"
@@ -98,7 +100,7 @@
 
 		;GenHashWithTimeStamp QRCODE99x
 		WEB "ENABLE"
-		
+
 	Else
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
@@ -114,9 +116,9 @@
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 	EndIf
-	
+
 	; 1035 is Coke.
-	STRCONTAIN "1035" MaterialAvailable CokeUI 
+	STRCONTAIN "1035" MaterialAvailable CokeUI
 
 	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
 	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
@@ -131,8 +133,8 @@
 	Var QRCODE99_Y = 1718
 
     Var showCart = "Invisible"
-    If MultiPayEnable = "true" Then 
-	    
+    If MultiPayEnable = "true" Then
+
 	    If CART_COUNT = 1 Then
 	        Var showCart = "Enable"
 	  		Var cart_image_bn = DirImageCart + "/bn_cart1.png"
@@ -141,7 +143,7 @@
 			Var QRCODE99_Y = 1580
 
 	    EndIf
-	    
+
 	    If CART_COUNT = 2 Then
 	        Var showCart = "Enable"
 	    	Var cart_image_bn = DirImageCart + "/bn_cart2.png"
@@ -151,7 +153,7 @@
 
 	    EndIf
 
-    
+
 
 	    If CART_COUNT = 3 Then
 	    		Open "ROOT/taobin_project/xml/page_payment_multi.xml"
@@ -169,10 +171,10 @@
 
 	If XMLProfile = "taobin_notopup" Then
 		Var ButtontoTopupMenu = "Disable"
-	
+
 	EndIf
 
-	
+
 	Var menu_name_eng_hot = ""
 	Var menu_desc_eng_hot = ""
 	Var menu_name_thai_hot = ""
@@ -194,29 +196,29 @@
 	TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
 
 
-		
-	
-	If BoxID = 0 Then 
+
+
+	If BoxID = 0 Then
 		RebootWithCause "BoxID was zero"
 	EndIf
-	
+
 
 
 	DEBUGVAR ShowButtonClick2
 
 	DEBUGVAR MenuKidButtonState
 	DEBUGVAR New_Payment
-	
 
 
-	
+
+
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"
-	
+
 	Var ButtonLanguageCurrentXPosition = 1005
     Var ButtonLanguageCurrentYPosition = 458 - 38
 
-    Var ButtonLanguageListXPosition = 970  
+    Var ButtonLanguageListXPosition = 970
     Var ButtonLanguageListYPosition = 450 - 38
 
 	Var SelectedMenu = ""
@@ -232,7 +234,7 @@
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 
 	;SAVELOG SoundPlaying
 
@@ -241,15 +243,15 @@
 	EndIf
 
 	If countDownRetrun = 0 Then
-		 If  Seeker = "next" Then 
+		 If  Seeker = "next" Then
 		 	RootLayoutVisible 3 "hide"
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            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
@@ -280,7 +282,7 @@
 	DEBUGVAR Inst11MenuLoaded
 
 	DEBUGVAR MultiProcessTimer
-	
+
 
 	If MultiProcess = "Enable" Then
         If SelectedMenu = "coffee" Then
@@ -289,7 +291,7 @@
                 Var MultiProcess = "Invisible"
                 TabMenuVisibleInst 2
                 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-            Else 
+            Else
                 If MultiProcessTimer >= 20 Then
                     Var MultiProcess = "Invisible"
                     TabMenuVisibleInst 2
@@ -400,10 +402,10 @@
 
 	Refresh
 	TimerReset
-</EventTimeout> 
+</EventTimeout>
 
 <EventChangeStatus>
-	;If ChangeStatus = "payout-end" Then 
+	;If ChangeStatus = "payout-end" Then
 	;	Var ChangeOK = 1
 	;EndIf
 </EventChangeStatus>
@@ -416,15 +418,15 @@
 			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>
@@ -448,26 +450,31 @@
 	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"
+
 		Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+
+		If SongkranSoundCampaign = 1 Then
+			Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
+		EndIf
 	EndIf
 
-	If LanguageShow = "MYANMAR" Then 
+	If LanguageShow = "MYANMAR" Then
 		Var show_eng = "true"
 		Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
 	EndIf
 
-	If LanguageShow = "MSC" Then 
+
+	If LanguageShow = "MSC" Then
 		Var show_eng = "true"
 		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
         Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
 	EndIf
-
-	Play PlaySoundLag	
+	Play PlaySoundLag
 	Var countDownRetrun = 120
 
 	Var LanguageButtonEnable = "Enable"
@@ -485,10 +492,10 @@
 <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 
+<EventClick>
+	If  Seeker = "next" Then
 		RootLayoutVisible 3 "hide"
-        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
     Else
         Open "ROOT/taobin_project/xml/page_back_to_main.xml"
     EndIf
@@ -519,7 +526,7 @@
 
 
 
-<FrameScroll> 
+<FrameScroll>
 <X> 1 </X>
 <Y> 844 </Y>
 <Width> 1080 </Width>
@@ -544,7 +551,7 @@
 		Var ColumnGravity[1] = 2
 		Var ColumnGravity[2] = 2
 		Var ColumnGravity[3] = 2
-		
+
 </Script>
 <Block>
 	<Width> 296 </Width>
@@ -558,15 +565,15 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 
-	<EventClick> 
-		
+	<EventClick>
+
 		Var OpenFromMulti = 1
-		
+
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
-		
+
 		RootLayoutVisible 3 "hide"
 		RootLayoutVisible 13 "hide"
-		
+
 	</EventClick>
 	<Language>
 		<ID> 000003 </ID>
@@ -588,12 +595,12 @@
 	<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 
 		If Inst5MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
-			TabMenuVisibleInst 2 
-			
+			TabMenuVisibleInst 2
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
@@ -630,10 +637,10 @@
 		Else
 			Var show_eng =  "true"
 		EndIf
-		
+
 		RootLayoutVisible 3 "hide"
 		RootLayoutVisible 13 "hide"
-		
+
 		; eng
 		Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
 
@@ -659,17 +666,17 @@
 	<FilenamePress>  Var(DirImage + "/bp_tea.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 
 		If Inst6MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
-			TabMenuVisibleInst 3 
-			
+			TabMenuVisibleInst 3
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "tea"  
+			Var SelectedMenu = "tea"
 		EndIf
 
 	</EventClick>
@@ -693,17 +700,17 @@
 	<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 
 		If Inst7MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
-			TabMenuVisibleInst 4 
-			
+			TabMenuVisibleInst 4
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "caramel"  
+			Var SelectedMenu = "caramel"
 		EndIf
 	</EventClick>
 	<Language>
@@ -727,17 +734,17 @@
 	<FilenamePress> bpSodaAndOther </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 
 		If Inst11MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 7
-			
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "soda"  
+			Var SelectedMenu = "soda"
 		EndIf
 	</EventClick>
 	<Language>
@@ -761,17 +768,17 @@
 	<FilenamePress> Var(DirImage + "/bp_Pepsi_7up.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 
 		If Inst10MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 8
-			
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "pepsi"  
+			Var SelectedMenu = "pepsi"
 		EndIf
 
 	</EventClick>
@@ -798,17 +805,17 @@
 	<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 
 		If Inst8MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
-			TabMenuVisibleInst 5 
-			
+			TabMenuVisibleInst 5
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "kidmenu"  
+			Var SelectedMenu = "kidmenu"
 		EndIf
 	</EventClick>
 	<Language>
@@ -832,16 +839,16 @@
 	<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 		If Inst8MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
-			TabMenuVisibleInst 5 
-			
+			TabMenuVisibleInst 5
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "appfast"  
+			Var SelectedMenu = "appfast"
 		EndIf
 
 	</EventClick>
@@ -866,7 +873,7 @@
 	<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
+	<EventClick>
 		TabMenuVisibleInst 5
 		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 
@@ -892,17 +899,17 @@
 	<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<EventClick> 
-		
+	<EventClick>
+
 		If Inst9MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 6
-			
+
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 		Else
 			Var MultiProcessTimer = 0
 			Var MultiProcess = "Enable"
-			Var SelectedMenu = "healthy"  
+			Var SelectedMenu = "healthy"
 		EndIf
 
 	</EventClick>
@@ -928,11 +935,11 @@
 <FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; eng
 	Var CheckMemberPage = "ROOT/taobin_project/xml/page_before_check_member.xml"
 	Open CheckMemberPage
-	
+
 </EventClick>
 
 <Language>
@@ -953,11 +960,11 @@
 <FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; eng
 	Var PayDetail=""
-	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
-	
+	Open "ROOT/taobin_project/xml/page_back_to_topup.xml"
+
 </EventClick>
 <Language>
 	<ID> 002004 </ID>
@@ -975,10 +982,10 @@
 <Color> "0xFF0000" </Color>
 <Width> 1080 </Width>
 <Height> 60 </Height>
-<EventClick> 
-	
+<EventClick>
+
 	Open "ROOT/taobin_project/xml/page_camera.xml"
-	
+
 </EventClick>
 </Button>
 
@@ -1002,7 +1009,7 @@
 
 			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"
@@ -1010,7 +1017,7 @@
 		EndIf
 	Else
 	EndIf
- 
+
 </EventWebApp>
 
 
@@ -1044,12 +1051,12 @@
 <Height> 100 </Height>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var ClickCountMainTe = ClickCountMainTe + 1
-	
+
 	DEBUGVAR ClickCountMainTe
 
-	If ClickCountMainTe = 2 Then 
+	If ClickCountMainTe = 2 Then
 		Var OpenRouteManTest = 1
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
         Var ClickCountMainTe = 0
@@ -1074,7 +1081,7 @@
 	Var bg_lidProblem_ST = "Invisible"
 	Var GetLidButtonState2 = "Enable"
 	Var bg_lidProblem_ST2 ="Invisible"
-	
+
 	Var EnableGetMoreStrawFileName2 = "Enable"
 	Var bg_strawProblem_ST2 ="Invisible"
 </EventUnitTest1>
@@ -1084,7 +1091,7 @@
 	Var bg_lidProblem_ST = "Enable"
 	Var GetLidButtonState2 = "Invisible"
 	Var bg_lidProblem_ST2 ="Enable"
-	
+
 	Var XStraw = 376
 	Var EnableGetMoreStrawFileName2 = "Invisible"
 	Var bg_strawProblem_ST2 ="Enable"
@@ -1097,7 +1104,7 @@
 	Var CountDownBrewing = 122
 	Var MachineStage = "testing"
 	Var BREW_CNT = 122
-	
+
 	Var InternationalEnable = 1
 	DEBUGVAR InternationalEnable
 	Var LanguageObjectShow = "Enable"