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

inc/video.inc

@@ -90,18 +90,33 @@
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
-                    Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
+                Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
+                Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+                DEBUGVAR PreviseXMLFileName2
+
+                If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
+
+                    DEBUGVAR CurrentXMLFileName2
+                    DEBUGVAR CurrentXMLFileName2
+                    DEBUGVAR PreviseXMLFileName2
+
+                    Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
+                EndIf
+
             Else
                 Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
             EndIf
             If CurrentXMLFileName2 = "" Then
+                DEBUGVAR CountDownPauseVideo2
                  If CountDownPauseVideo2 < 2 Then
                     Var AdvTaobinMenu = "/mnt/sdcard
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
+                    DEBUGVAR CurrentXMLFileName2
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 EndIf

inter/aus/xml/page_brewing3.lxml

@@ -449,6 +449,7 @@
 	DEBUGVAR Seeker
 	If game_mode_enable = "true" Then
 		
+		CheckApp "com.NDF.taobin" GameInstalled
 		
 		DEBUGVAR GameInstalled
 		
@@ -721,14 +722,15 @@
 	Var Timeout = Timeout + 1
 	
 	If Timeout < 2 Then
-		If Game01Enable = 0 Then
-			If game_mode_enable = "true" Then
-				If BREW_CNT > 75 Then
-					SAVELOG "Button game enable from EventTimeout"
-					Var Game01Enable = 1
-					Var ButtonGameCountDownState = "Invisible"
-					Var ButtonGamePressToPlayState = "Enable"
-			
+		If GameInstalled = "true" Then
+			If Game01Enable = 0 Then
+				If game_mode_enable = "true" Then
+					If BREW_CNT > 75 Then
+						SAVELOG "Button game enable from EventTimeout"
+						Var Game01Enable = 1
+						Var ButtonGameCountDownState = "Invisible"
+						Var ButtonGamePressToPlayState = "Enable"
+					EndIf
 				EndIf
 			EndIf
 		EndIf

inter/mys/image/event/image_template1

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
-normal_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
-press_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
-press_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
-disable_eng=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
-disable_thai=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
+normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
+normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
+press_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
+press_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
+disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
+disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png

inter/mys/xml/event/event_profile.ev

@@ -0,0 +1,33 @@
+TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/tricker.ev"
+
+Var XMLProfilePreEvent = XMLProfile
+DEBUGVAR XMLProfile
+STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
+STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
+
+DEBUGVAR HasProYuzu250Concat
+DEBUGVAR ProReducedPriceEnable
+DEBUGVAR ProYuzu250Enable
+
+If ProReducedPriceEnable = 1 Then
+
+Else
+    ; case-pro-reduce-end
+    If ProYuzu250Enable = 1 Then
+        ; concat-profile
+        If HasProYuzu250Concat = "true" Then
+
+        Else
+        
+            If IsProfileReduce = "true" Then
+        
+            Else
+                CacheVarStr "put" XMLProfilePreEvent
+
+                Var XMLProfile = XMLProfile + "-"
+                Var XMLProfile = XMLProfile + "PromoYuzu250"
+            EndIf
+        EndIf
+    EndIf
+
+EndIf

inter/mys/xml/event/out_put_file1.txt

@@ -1 +1 @@
-/event/promotion_pepsi_099.lxml
+/event/promotion_yuzu_250.lxml

inter/mys/xml/event/promotion_onclick1.inc

@@ -1,84 +1 @@
-Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = 99
-		Var PriceD3 = $12-05-03-0007.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0007"
-		Var PD_CODE3 = "12-05-03-0007"
-		; begin lang 
-		Var aliasName[0] = "PEPSI"
-		Var aliasDesc[0] = "Pepsi & Ice"
-		Var aliasName[1] = "เป๊ปซี่น้ำแข็ง"
-		Var aliasDesc[1] = "เป๊ปซี่"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
-		Var aliasDesc[4] = "Pepsi, Ais"
-		Var NameLang[0][0] = ""
-		Var NameLang[0][1] = ""
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = ""
-		Var DescLang[0][0] = ""
-		Var DescLang[0][1] = ""
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "PEPSI"
-		Var NameLang[1][1] = "เป๊ปซี่น้ำแข็ง"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "PEPSI"
-		Var DescLang[1][0] = "Pepsi, Ice"
-		Var DescLang[1][1] = "เป๊ปซี่ และน้ำแข็ง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Pepsi, Ais"
-		Var NameLang[2][0] = "TAO SLUSHIE"
-		Var NameLang[2][1] = "เต่าสลัชชี่"
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = "TAO SLUSHIE"
-		Var DescLang[2][0] = "Pepsi, Ice"
-		Var DescLang[2][1] = "เป๊ปซี่ และน้ำแข็ง"
-		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = "Pepsi, Ais"
-		; end lang 
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0007.Button
-		Var PD_STAGE_3 = $12-05-03-0007.Button
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0007"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "12-05-03-0007"
-			EndIf
-		EndIf
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+    Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu_250.lxml"

inter/mys/xml/event/script_common_for_open_promotion_xml.ev

@@ -5,36 +5,13 @@
 DEBUGVAR FruityRayaEnable
 DEBUGVAR ProThaiTeaEnable
 DEBUGVAR ProYuzuEnable
-
-Var CountEnablePromotion = 0
-Var PromotionState1 = "Invisible"
-Var PromotionState2 = "Invisible"
-
-If ProThaiTeaEnable = 1 Then
-	Var PromotionState1 = "Enable"
-	Var CountEnablePromotion = CountEnablePromotion + 1
-EndIf
-
-If ProYuzuEnable = 1 Then
-	Var PromotionState2 = "Enable"
-	Var CountEnablePromotion = CountEnablePromotion + 1
-EndIf
-
-DEBUGVAR CountEnablePromotion
+DEBUGVAR ProYuzu250Enable
 
 If OpenFromPageBoard = 1 Then
 
 	; has-ongoing-pro
-	If CountEnablePromotion >= 1 Then
-		Var BigButtonEnable = "Enable"
-
-		If CountEnablePromotion = 1 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
-		EndIf
-
-		If CountEnablePromotion = 2 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
-		EndIf
+	If ProYuzu250Enable = 1 Then
+        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
 
 		Var OpenFromPageBoard = 0
 	Else
@@ -42,21 +19,13 @@ If OpenFromPageBoard = 1 Then
 	EndIf
 Else
 
-	; has-ongoing-pro
-	If CountEnablePromotion >= 1 Then
-		Var BigButtonEnable = "Enable"
+	    ; has-ongoing-pro
+    If ProYuzu250Enable = 1 Then
+        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
 
-		If CountEnablePromotion = 1 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
-		EndIf
-
-		If CountEnablePromotion = 2 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
-		EndIf
-
-		Var OpenFromPageBoard = 0
-	Else
-		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
-	EndIf
+        Var OpenFromPageBoard = 0
+    Else
+        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
+    EndIf
 EndIf
 Var OpenFromPageBoard = 0

inter/mys/xml/event/tricker.ev

@@ -20,6 +20,10 @@ Var FromProThaiTea = 0
 Var ProYuzuEnable = 0
 Var FromProYuzu = 0
 
+; Yuzu Promo
+Var ProYuzu250Enable = 0
+Var FromProYuzu250 = 0
+
 
 ; Pro free oreo topping
 Var PromotionOreoToppingFreeEnable = 0
@@ -40,37 +44,6 @@ Var EnablePayLaterMode = 0
 ; Slide show Video
 Var UseSlideShowVideo = 0
 
-If SystemDateMonthInt = 6 Then
-	If SystemDateDayInt >= 15 Then
-		Var ProThaiTeaEnable = 1
-	Else
-		Var ProThaiTeaEnable = 0
-	EndIf
-EndIf
-
-
-If SystemDateMonthInt = 7 Then
-    Var ProThaiTeaEnable = 1
-
-    If SystemDateDayInt >= 15 Then
-		Var ProYuzuEnable = 1
-    Else
-    	Var ProYuzuEnable = 0
-    EndIf
-EndIf
-
-If SystemDateMonthInt = 8 Then
-	If SystemDateDayInt < 31 Then
-		Var ProThaiTeaEnable = 1
-		Var ProYuzuEnable = 1
-	Else
-		Var ProThaiTeaEnable = 0
-		Var ProYuzuEnable = 0
-
-		Var PromotionOreoToppingFreeEnable = 1
-	EndIf
-EndIf
-
 If SystemDateMonthInt = 9 Then
 	If SystemDateDayInt < 17 Then
 		Var PromotionOreoToppingFreeEnable = 1
@@ -86,16 +59,29 @@ If SystemDateMonthInt = 10 Then
 	If SetProReduceByBO = 1 Then
 		Var ProReducedPriceEnable = 1
 	EndIf
+ 
+    Var ProYuzu250Enable = 1
 EndIf
 
 If SystemDateMonthInt = 11 Then
 	If SetProReduceByBO = 1 Then
 		Var ProReducedPriceEnable = 1
 	EndIf
+    
+    Var ProYuzu250Enable = 1
 EndIf
 
+If SystemDateMonthInt = 12 Then
+    Var ProYuzu250Enable = 1
+EndIf
 
-
+If SystemDateMonthInt = 1 Then
+    If SystemDateDayInt < 16 Then
+        Var ProYuzu250Enable = 1
+    Else
+        Var ProYuzu250Enable = 0
+    EndIf
+EndIf
 
 If BoxID = 177746 Then
 	Var ProThaiTeaEnable = 1
@@ -107,6 +93,9 @@ If BoxID = 177746 Then
 	;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
 
 	Var UseSlideShowVideo = 0
+
+    Var ProReducedPriceEnable = 0
+	Var ProYuzu250Enable = 1
 EndIf
 
 If BoxID = 210037 Then

inter/mys/xml/menu_new_layout_gen_v2.py

@@ -189,9 +189,12 @@
         if "thai_tea" in current_file_name:
           out_xml( '\t\tVar FromProThaiTea = 1 \r\n')
         
-        if "yuzu" in current_file_name:
+        if "yuzu" in current_file_name and "250" not in current_file_name:
           out_xml( '\t\tVar FromProYuzu = 1 \r\n')
         
+        if "yuzu_250" in current_file_name:
+          out_xml( '\t\tVar FromProYuzu250 = 1 \r\n')
+
         
         out_xml( '\t\t\r\n')
         out_xml( '\t\t\r\n')

inter/mys/xml/page_catalog_group_pro_yuzu_250.skt

@@ -0,0 +1,46 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    
+    Var FromProYuzu250 = 0
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.xml
+    ?>
+
+</EventOpen>
+
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

inter/mys/xml/page_collect_point_1.lxml

@@ -127,15 +127,12 @@
 	
 	DEBUGVAR PepweenCollectPoint
 
-	DEBUGVAR ProBadValentineEnable
-	DEBUGVAR FromBadValentinePro
-	DEBUGVAR LipitPro
-	DEBUGVAR FromLipitPro
 	DEBUGVAR FruityRayaEnable
 	DEBUGVAR FromFruityRaya
 	DEBUGVAR ProThaiTeaEnable
 	DEBUGVAR FromProThaiTea
 	DEBUGVAR FromProYuzu
+	DEBUGVAR FromProYuzu250
 	
 	If Seeker.TNumberTaobinCredit = "" Then
 	

inter/uae_dubai/xml/page_topping_select6.lxml

@@ -113,22 +113,14 @@
 		Var text_x_add_oreo_price = 510
 		Var text_show_normal_x = 408
 		Var SugarZeroCalPrice_X = 540
-	Else
-	
-		Var DirImage = "ROOT/taobin_project/image/topping2"
-		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
-		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-		Var showname = NameDrinkTH
-		Var showdesc = DrinkDescriptionTH
-
-		Var text_show_thai = "Enable"
-		Var text_show_eng = "Invisible"
-
-		Var topping_shot_price_x = 600
-		Var text_x_add_oreo_price = 490
-		Var text_show_normal_x = 386
-		Var SugarZeroCalPrice_X = 482
+	EndIf
 
+	If LanguageShow = "UAE_DUBAI" Then
+		Var topping_shot_price_x = 630
+		Var text_x_add_oreo_price = 620
+		Var text_show_normal_x = 535
+		Var text_milk_choice_price_x = 325
+		Var SugarZeroCalPrice_X = 540
 	EndIf
 
 	Var bg_strawlid = DirImage + "/bg_strawlid.png"
@@ -491,13 +483,14 @@
 		If SugarSoundFlag = 1 Then
 			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
 		EndIf
+	EndIf
 	
 
 	If LanguageShow = "UAE_DUBAI" Then
 		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 600
-		Var text_show_normal_x = 528
-		Var text_milk_choice_price_x = 295
+		Var text_x_add_oreo_price = 620
+		Var text_show_normal_x = 535
+		Var text_milk_choice_price_x = 325
 		Var SugarZeroCalPrice_X = 540
 	EndIf
 	

xml/page_board.xml

@@ -704,6 +704,10 @@
 		If BoxID = 200002 Then
 			Var UseSlideShowVideo = 1
 		EndIf
+
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/event_profile.ev"
+
+
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 
 	EndIf
@@ -921,7 +925,7 @@
 		Var UsePepsiTheme = 1
 		Var TargetThemeNum = 2
 
-		Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+		;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 	
 
@@ -1337,7 +1341,7 @@
 <EventUnitTest2>
 	Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
-	OpenInst 1 VideoAdvert
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
 
 	Var OpenFromPageBoard = 1
@@ -1593,7 +1597,8 @@
 
 				Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
-				OpenInst 1 VideoAdvert
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+
 
 
 				Var OpenFromPageBoard = 1
@@ -1791,10 +1796,10 @@
 			; Handle penetrator
 
 			If Only18 = "true" Then
-				OpenInst 1 VideoAdvert
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 				OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml"
 			Else
-				OpenInst 1 VideoAdvert
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
 			EndIf
 
@@ -1830,7 +1835,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-	OpenInst 1 VideoAdvert
+	;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 	If CocktailShow = "true" Then 
 		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
 	Else
@@ -1868,7 +1873,7 @@
 
 	Var NextPage = "-"
 	
-	OpenInst 1 VideoAdvert
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
 	If InternationalEnable = 1 Then
 		;inter-xml-open
@@ -1922,7 +1927,7 @@
 	SAVELOG "click ShowButtonClickFull"
 
 	Var NextPage = "-"
-	OpenInst 1 VideoAdvert
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 	If SpiralOnline = "true" Then
 
 		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
@@ -1993,7 +1998,7 @@
 	If IgnoreNetCore = "true" Then
 
 		Var NextPage = "-"
-		OpenInst 1 VideoAdvert
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
 		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
 
@@ -2016,7 +2021,7 @@
 	
 	Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
-	OpenInst 1 VideoAdvert
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
 
 	Var OpenFromPageBoard = 1

xml/page_catalog.lxml

@@ -18,6 +18,7 @@
 		Var FromFruityRaya = 0
 		Var FromProThaiTea = 0
 		Var FromProYuzu = 0
+		Var FromProYuzu250 = 0
 	EndIf
 
 	If UsePepsiTheme = 1 Then

xml/page_get_yourchange.xml

@@ -19,6 +19,10 @@
 		Var LangButtonEnable = "Invisible"
 	EndIf
 
+	If CountryName = "UnitedArabEmirates Dubai" Then
+		Var LangButtonEnable = "Invisible"
+	EndIf
+		
 	DEBUGVAR LangButtonEnable
 
 	If show_eng = "true" Then 

xml/page_payment_cash-AUS.xml

@@ -1646,7 +1646,7 @@ EndIf
 <Y> 748 </Y>
 ;inter-image
 <State> alphaState2 </State>
-<Filename> Var( DirImage2 + "/img_popup11-MYR.png" )</Filename>
+<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
 </Image>
 
 

xml/page_payment_cash-UAE.xml

@@ -1266,11 +1266,11 @@
 					Var alphaState3_offline = "Enable"
 				EndIf
 
-				If show_eng = "true" Then 
-					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
-				Else
-					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
-				EndIf
+				;If show_eng = "true" Then 
+				;	PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
+				;Else
+				;	PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
+				;EndIf
 
 			EndIf
 			
@@ -1949,22 +1949,22 @@ EndIf
 <X> 182 </X>
 <Y> 748 </Y>
 <State> alphaState3 </State>
-<Filename> Var( DirImage + "/img_popup12.png" )</Filename>
+<Filename> Var( DirImage2 + "/img_popup12_uae.png" )</Filename>
 </Image>
 
-<Button>
-<X> 327 </X>
-<Y> 1208 </Y>
-<State> alphaState3 </State>
-<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
-<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" 
-</EventClick>
-</Button>
+;<Button>
+;<X> 327 </X>
+;<Y> 1208 </Y>
+;<State> alphaState3 </State>
+;<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
+;<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;
+;		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" 
+;</EventClick>
+;</Button>
 
 <Button>
 <X> 327 </X>

xml/page_payment_credit3-TopupCash.xml

@@ -67,6 +67,12 @@
 		Var img_popup15 = "/img_popup15-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "Australia" Then
+		Var img_popup11 = "/img_popup11-AUS.png"
+		Var img_popup15 = "/img_popup15-AUS.png"
+	EndIf
+
     
     
 	Var CreditAmount = SumCreditAmount

xml/page_payment_credit3.xml

@@ -105,6 +105,11 @@
 		Var img_popup11 = "/img_popup11-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "Australia" Then
+		Var img_popup11 = "/img_popup11-AUS.png"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml/page_topup_credit3-TopupCash.xml

@@ -69,6 +69,12 @@
 		Var img_popup15 = "/img_popup15-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "Australia" Then
+		Var img_popup11 = "/img_popup11-AUS.png"
+		Var img_popup15 = "/img_popup15-AUS.png"
+	EndIf
+
 
 	Var CreditAmount = 0