MYS: add promotion Yuzu price 250

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
@@ -124,4 +113,4 @@ EndIf
 ;If BoxID = Something Then
 ;	Var EnablePayLaterMode = 1
 ;
-;EndIf
+;EndIf

inter/mys/xml/menu_new_layout_gen_v2.py

@@ -189,8 +189,11 @@
         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')

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_catalog_group_recommend_multi_pro.lxml

@@ -1,174 +1,174 @@
-
-
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-	    Var NextPage = "-"
-
-    DEBUGVAR ICE_PROCESS_STATUS
-    DEBUGVAR ICE_PROCESS_TXT
-
-
-    DEBUGVAR LanguageShow
-    DEBUGVAR CountryName
-    
-    If LanguageShow = "ENG" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-        
-    EndIf
-    If LanguageShow = "THAI" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
-        Var DirImage = "ROOT/taobin_project/image/page3"
-    EndIf
-
-    ;inter-image
-    If CountryName = "Malaysia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
-    
-
-    ;inter-image
-    If CountryName = "Australia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
-    
-
-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-
-    ; SpiralOnline
-  
-        Var MenuVSelected2 = "Invisible"
-
-        Var Menu1Selected2 = "Invisible"
-        Var Menu2Selected2 = "Invisible"
-        Var Menu3Selected2 = "Invisible"
-        Var Menu4Selected2 = "Invisible"
-        
-        Var Menu6Selected2 = "Invisible"
-        Var Menu7Selected2 = "Invisible"
-        Var MenuVSelected2 = "Invisible"
-        Var Menu11Selected2 = "Invisible"
-
-        Var Menu21Selected2 = "Invisible"
-
-        Var MenuVSelected2 = "Invisible"
-        If SpiralOnline = "true" Then 
-            If Seeker =  "curr" Then
-                Var MenuVSelected2 = "Enable"
-            EndIf
-        EndIf 
-        
-        ; init default
-        Var Menu1Selected = "Enable"
-        Var Menu2Selected = "Enable"
-        Var Menu3Selected = "Enable"
-        Var Menu4Selected = "Enable"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Enable"
-        Var Menu7Selected = "Enable"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        If CocktailShow = "true" Then 
-            Var Menu7Selected = "Invisible"
-            Var Menu8Selected = "Enable"
-        EndIf
-
-            
-        If AppFastEnable = "true" Then
-            Var Menu11Selected = "Enable" 
-            Var Menu21Selected = "Invisible" 
-            Var Menu7Selected = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected = "Invisible" 
-                Var Menu21Selected = "Enable"
-                Var Menu7Selected = "Invisible"
-            Else
-                Var Menu11Selected = "Invisible"
-                Var Menu21Selected = "Invisible" 
-                Var Menu7Selected = "Enable"
-            EndIf
-        EndIf
-
-        If CocktailShow = "true" Then
-            Var Menu7Selected = "Invisible"
-        EndIf 
-
-        If RecipeTag1 = "HealthTurnOn" Then
-            Var Menu22Selected = "Enable"
-        Else
-            Var Menu22Selected = "Invisible"
-        EndIf
-        ;
-        
-
-    
-    Var Menu1Selected = "PressForever"
-
-    Var OreoBigButtonEnable = "Enable"
-
-    If $12-01-01-0001.Button = "Invisible" Then
-        Var esp102101001Enable = "Invisible"
-        Var esp122101001Enable = "Enable"
-
-    Else
-        Var esp102101001Enable = "Enable"
-        Var esp122101001Enable = "Invisible"
-
-    EndIf
-    
-    SAVELOG PreviseXMLFileName2
-
-    Var Timeout = 0
-
-    If show_eng = "true" Then 
-    
-        Var text_unavailable = "UNAVAILABLE###size=16"
-    Else
-        Var text_unavailable = "หมด###size=32"
-    
-    EndIf
-
-    
-    If show_eng = "true" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
-    Else
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-    EndIf
-
-</EventOpen>
-
-
-;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
-
-
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	    Var NextPage = "-"
+
+    DEBUGVAR ICE_PROCESS_STATUS
+    DEBUGVAR ICE_PROCESS_TXT
+
+
+    DEBUGVAR LanguageShow
+    DEBUGVAR CountryName
+    
+    If LanguageShow = "ENG" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+        
+    EndIf
+    If LanguageShow = "THAI" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var DirImage = "ROOT/taobin_project/image/page3"
+    EndIf
+
+    ;inter-image
+    If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+    
+
+    ;inter-image
+    If CountryName = "Australia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+    
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+    ; SpiralOnline
+  
+        Var MenuVSelected2 = "Invisible"
+
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        Var Menu21Selected2 = "Invisible"
+
+        Var MenuVSelected2 = "Invisible"
+        If SpiralOnline = "true" Then 
+            If Seeker =  "curr" Then
+                Var MenuVSelected2 = "Enable"
+            EndIf
+        EndIf 
+        
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
+        Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu21Selected = "Invisible" 
+            Var Menu7Selected = "Invisible"
+        Else
+            If MenuKidEnable = "true" Then
+                Var Menu11Selected = "Invisible" 
+                Var Menu21Selected = "Enable"
+                Var Menu7Selected = "Invisible"
+            Else
+                Var Menu11Selected = "Invisible"
+                Var Menu21Selected = "Invisible" 
+                Var Menu7Selected = "Enable"
+            EndIf
+        EndIf
+
+        If CocktailShow = "true" Then
+            Var Menu7Selected = "Invisible"
+        EndIf 
+
+        If RecipeTag1 = "HealthTurnOn" Then
+            Var Menu22Selected = "Enable"
+        Else
+            Var Menu22Selected = "Invisible"
+        EndIf
+        ;
+        
+
+    
+    Var Menu1Selected = "PressForever"
+
+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+    If show_eng = "true" Then 
+    
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    Else
+        Var text_unavailable = "หมด###size=32"
+    
+    EndIf
+
+    
+    If show_eng = "true" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+    Else
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+    EndIf
+
+</EventOpen>
+
+
+;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
+
+
 <FrameScroll> 
 <Max> 4 </Max>
 <X> 10 </X>
@@ -46160,27 +46160,27 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-
-
-
-;BigLogoLayout
-
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
-
-</Popup>
-
-
+
+
+
+
+;BigLogoLayout
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</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
 	

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

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