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

video/script3_brew.ev

@@ -23,3 +23,13 @@ If LipitPro = 1 Then
 
 EndIf	
 
+If TeaTimePro = 1 Then
+
+	Var adver_brewing_play_index = 1
+	Var adver_brewing_count_down = 16
+	
+	Var brew_vdo2 = "ROOT/taobin_project/video/top_spender.png"
+	SAVELOG "Play adv4"
+
+EndIf
+

xml/event/lipit/page_collect_point_pro_lipit_2.xml

@@ -27,6 +27,8 @@
 	EndIf
 
     Var Seeker.IsLineMember = 0
+    Var LipMaskOutofStock = 0
+    Var TintMeOutofStock = 0
 
 	If PayOfflineMode = 1 Then
 		Var Seeker.TaobinErrorNetwork = 1
@@ -90,6 +92,18 @@
             Var TelephoneNumber = TelephoneNumberX
             Var TNumberTaobinMemberXXX = TelephoneNumber
             Var Seeker.IsAlreadyGetReward = Ext1c
+            Var LipMaskOutofStock = Ext1d
+            Var TintMeOutofStock = Ext1e
+            
+
+            ;DEBUG
+            ;Var LipMaskOutofStock = 1
+            ;Var TintMeOutofStock = 1
+
+
+            DEBUGVAR LipMaskOutofStock
+            DEBUGVAR TintMeOutofStock
+
             If TaobinName = "" Then
                 Var Seeker.IsLineMember = 0 
             Else
@@ -131,6 +145,27 @@
                 EndIf
             EndIf
 
+            If LipMaskOutofStock = 1 Then
+                If TintMeOutofStock = 1 Then
+                    SAVELOG "All reward out of stock skip to normal collect point."
+
+                    WRITE_FILE "/mnt/sdcard/lipit_reward_out_of_stock" "1"
+
+                    If Seeker.CodeChannel = 1 Then
+                        If Seeker.CollectPointMain = 1 Then
+                            GETACCEXT Param1 23
+                            Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                        Else
+                            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                        EndIf
+                    Else
+                        GETACCEXT Param1 23
+                        Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                    EndIf
+                EndIf
+            EndIf
+
+
 
             Var Seeker.PointTaobinStr = ParamCP
             Var Seeker.TNumberTaobinMember = TelephoneNumberX

xml/event/lipit/page_lipit_random.xml

@@ -163,6 +163,15 @@
         Var var3 = "X"
         
         Var randResultStr = rewardList[randResultInt] 
+                
+        If LipMaskOutofStock = 1 Then
+            Var randResultStr = "tint_me_healthy_balm"
+        EndIf
+
+        If TintMeOutofStock = 1 Then
+            Var randResultStr = "lip_mask_stick"
+        EndIf
+
         If randResultStr = "lip_mask_stick" Then
             Var rewardImage = DirImage + "/reward_lip_mask_stick.png"
             Var CodeType = "126"

xml/event/multi_promotion_config_13_4-17_05_2024.json

@@ -0,0 +1,43 @@
+[
+    {
+        "name": "tea_time",
+        "template": "/event/promotion_video_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "video_eng": "ROOT/taobin_project/image/event/lipit/tea_time_en.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.mp4",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_tea_time.xml"
+        }
+    },
+    {
+        "name": "monday_banana",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
+        }
+    },
+    {
+        "name": "free_energy_drink",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
+            "normal_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
+            "press_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
+            "press_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
+            "disable_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
+            "disable_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
+            "event_on_click": "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_bridge.xml"
+        }
+    }
+]

xml/event/promotion_lipit.xml

@@ -1084,6 +1084,259 @@
     <Align> center-vertical-horizontal </Align>
     </Text>
 </Block>
+    <Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> FreeFireMenuState1 </State> 
+	<Button>
+	<State> $Sum1299030026 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo_freefire.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo_freefire.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo_freefire.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-99-03-0026, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Kapella's Sweet Drinks"
+		Var NameDrinkTH = "คาเพลล่าสวีทดริ๊งค์"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล   Oreo"
+		Var DrinkDescription = "Strawberry Syrup, Milk, Sugar, Oreo"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo_freefire.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-99-03-0026.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-99-03-0026"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-99-03-0026.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-99-03-0026, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		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" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0026"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-99-03-0026.NameE
+		Var menu_desc_eng_blender = $12-99-03-0026.descriptionE
+		Var menu_name_thai_blender = $12-99-03-0026.Name
+		Var menu_desc_thai_blender = $12-99-03-0026.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "คาเพลล่าสวีทดริ๊งค์" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล 
+ Oreo" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "Kapella's Sweet Drinks" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Strawberry Syrup, Milk,
+Sugar, Oreo" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-99-03-0026.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-99-03-0026.Button </State>
+	<Value> StringFmt(  $12-99-03-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum1299030026 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-99-03-0026.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1299030026 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+
+
+
     
 <Block>
     <MarginLeft> 33 </MarginLeft>
@@ -1334,42 +1587,287 @@
     <Align> center-vertical-horizontal </Align>
     </Text>
 </Block>
+<Block>
+    <MarginLeft> 33 </MarginLeft>
+    <MarginTop> 22 </MarginTop>
+    <Width> 225 </Width>
+    <Height> 296 </Height>
+    <State> "Enable" </State> 
+    <Button>
+    <State> "Enable" </State> 
+    <Filename> "ROOT/taobin_project/image/page_drink_n//bn_water_roomtemp.png" </Filename>
+    <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_water_roomtemp.png" </FilenamePress>
+    <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_water_roomtemp.png" </FilenameDisable>
+    <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+    <Volume> SoundVolume </Volume>
+    <EventOnClick> 
+        Var NameDrink = "DRINKING WATER"
+        Var NameDrinkTH = "น้ำดื่ม"
+        Var DrinkDescriptionTH = "น้ำ"
+        Var DrinkDescription = "Water"
+        Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
+        Var OpenFromXML = CurrentXMLFileName2
+        Var PriceD1 = $-.Price
+        Var PriceD2 = $12-05-02-0016.Price
+        Var PriceD3 = $-.Price
+        Var PD_CODE1 = "##-##-##-####"
+        Var PD_CODE2 = "12-05-02-0016"
+        Var PD_CODE3 = "##-##-##-####"
+        Var PD_STAGE_1 = "Disable2"
+        Var PD_STAGE_2 = $12-05-02-0016.Button
+        Var PD_STAGE_3 = "Disable2"
+        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-0016"
+        Else
+            If PD_STAGE_1 = "Enable" Then
+            Topping "Load" "-"
+            Else
+            Topping "Load" "-"
+            EndIf
+        EndIf
+        Var menu_name_eng_hot = $##-##-##-####.NameE
+        Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+        Var menu_name_thai_hot = $##-##-##-####.Name
+        Var menu_desc_thai_hot = $##-##-##-####.description
+        
+        Var menu_name_eng_cold = $12-05-02-0016.NameE
+        Var menu_desc_eng_cold = $12-05-02-0016.descriptionE
+        Var menu_name_thai_cold = $12-05-02-0016.Name
+        Var menu_desc_thai_cold = $12-05-02-0016.description
+        
+        Var menu_name_eng_blender = $##-##-##-####.NameE
+        Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+        Var menu_name_thai_blender = $##-##-##-####.Name
+        Var menu_desc_thai_blender = $##-##-##-####.description
+        
+        DEBUGVAR PD_STAGE_1
+        DEBUGVAR PD_STAGE_2
+        DEBUGVAR PD_STAGE_3
+        Var SelectDrinkType = 0
         
         
+        Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+        
+    </EventOnClick>
+    </Button>
+    <Text>
+    <X>  16   </X>
+    <Y>  164  </Y>
+    <Size> 24 </Size>
+    <Width>220</Width>
+    <Mode> "multi2" </Mode>
+    <Font> KanitMediumTTF </Font>
+    <Color> 0x322B26 </Color>
+    <State> showthaiText </State>
+    <Value> "น้ำดื่ม" </Value>
+    </Text>
+    <Text>
+    <X> 16 </X>
+    <Y> 220 </Y>
+    <Size> 14 </Size>
+    <Width>220</Width>
+    <Font> KanitMediumTTF </Font>
+    <Color> 0x6F5F51 </Color>
+    <State> showthaiText </State>
+    <Value> "น้ำ" </Value>
+    </Text>
+    <Text>
+    <X> 16 </X>
+    <Y> 164 </Y>
+    <Size> 22 </Size>
+    <Width>220</Width>
+    <Mode> "multi2" </Mode>
+    <Font> KanitMediumTTF </Font>
+    <Color> 0x322B26 </Color>
+    <State> showengText </State>
+    <Value> "DRINKING WATER" </Value>
+    </Text>
+    <Text>
+    <X> 16 </X>
+    <Y> 220 </Y>
+    <Size> 14 </Size>
+    <Width>220</Width>
+    <Font> KanitMediumTTF </Font>
+    <Color> 0x6F5F51 </Color>
+    <State> showengText </State>
+    <Value> "Water" </Value>
+    </Text>
+    <Image>
+    <X> 16 </X>
+    <Y> 264 </Y>
+    <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+    </Image>
+    <Image>
+    <X> 16 </X>
+    <Y> 264 </Y>
+    <State> "Invisible" </State>
+    <Filename> Var( DirImage2 + "hot.png" ) </Filename>
+    <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+    </Image>
+    <Text>
+    <X> 50 </X>
+    <Y> TextPriceMenuY </Y>
+    <Size> TextPriceMenuSize </Size>
+    <Width>220</Width>
+    <Font> KanitMediumTTF </Font>
+    <Color> 0x6F5F51 </Color>
+    <ColorDisable> 0xEAE6E1 </ColorDisable>
+    <State> "Invisible" </State>
+    <Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+    </Text>
+    <Image>
+    <X> 81 </X>
+    <Y> 264 </Y>
+    <Filename> Var( DirImage2 + "cold.png" ) </Filename>
+    <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+    <State> $12-05-02-0016.Button </State>
+    </Image>
+    <Text>
+    <X> 115 </X>
+    <Y> TextPriceMenuY </Y>
+    <Size> TextPriceMenuSize </Size>
+    <Width>220</Width>
+    <Font> KanitMediumTTF </Font>
+    <Color> 0x6F5F51 </Color>
+    <ColorDisable> 0xEAE6E1 </ColorDisable>
+    <State> $12-05-02-0016.Button </State>
+    <Value> StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+    </Text>
+    <Image>
+    <X> 146 </X>
+    <Y> 264 </Y>
+    <Filename> Var( DirImage2 + "blend.png" ) </Filename>
+    <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+    <State> "Invisible" </State>
+    </Image>
+    <Text>
+    <X> 180 </X>
+    <Y> TextPriceMenuY </Y>
+    <Size> TextPriceMenuSize </Size>
+    <Width>220</Width>
+    <Font> KanitRegularTTF </Font>
+    <Color> 0x6F5F51 </Color>
+    <ColorDisable> 0xEAE6E1 </ColorDisable>
+    <State> "Invisible" </State>
+    <Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+    </Text>
+    <Image>
+    <X> 81 </X>
+    <Y> 264 </Y>
+    <State> 
+        eval( 
+        If ICE_PROCESS_STATUS = 2 Then
+        
+            Var ice_tab_process_show = "Invisible"
+        
+        Else
+            Var ice_tab_process_show = "Invisible"
+        EndIf
+        Var return = ice_tab_process_show
+        )
+    </State>
+    <Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+    <FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+    </Image>
+    <Image>
+    <X> 49 </X>
+    <Y> 117 </Y>
+    <State> 
+        eval( 
+            If $Sum1205020016 = "Disable" Then
+                STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+                STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable
+                STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+                Var return = "Invisible"
+                If tag1_is_disable = "true" Then
+                    Var return = "Enable"
+                EndIf
+                If tag2_is_disable = "true" Then
+                    Var return = "Enable"
+                EndIf
+                If tag3_is_disable = "true" Then
+                    Var return = "Enable"
+                EndIf
+            Else
+                    Var return = "Invisible"
+            EndIf
+        )
+    </State>
+    <Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+    </Image>
+    <Text>
+    <X> 84 </X>
+    <Y> 266 </Y>
+    <Size> 10 </Size>
+    <Font> OpunMediumTTF </Font>
+    <Color> 0xDE794E </Color>
+    <State> ice_tab_process_show </State>
+    <Value> ice_show_open </Value>
+    </Text>
+    <Text>
+    <X> 48 </X>
+    <Y> 116 </Y>
+    <Size> 32 </Size>
+    <Width>128</Width>
+    <Height>64</Height>
+    <Font> MITRegularTTF </Font>
+    <Color> 0x5A5A5A </Color>
+    <Mode> "disable-show" </Mode>
+    <State> $Sum1205020016 </State> 
+    <Value> text_unavailable </Value>
+    <Align> center-vertical-horizontal </Align>
+    </Text>
+</Block>
 
 	; - - - 
-    ; ==================> Len = 16
+	; ==================> Len = 12
-    ; - - 12-03-03-0026 
+	; - - 12-99-03-0067 
-
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-    <State> "Enable"  </State> 
+	<State> FreeFireMenuState2 </State> 
 	<Button>
-    <State> "Enable" </State> 
+	<State> $Sum1299030067 </State> 
-    <Filename> "ROOT/taobin_project/image/page_drink_n//bn_water_roomtemp.png" </Filename>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo_Chocolate_Milk_freefire.png" </Filename>
-    <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_water_roomtemp.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo_Chocolate_Milk_freefire.png" </FilenamePress>
-    <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_water_roomtemp.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo_Chocolate_Milk_freefire.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-99-03-0067, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-        Var NameDrink = "DRINKING WATER"
+		Var NameDrink = "Maxim's Booster"
-        Var NameDrinkTH = "น้ำดื่ม"
+		Var NameDrinkTH = "แม๊กซิมบูสเตอร์ "
-        Var DrinkDescriptionTH = "น้ำ"
+		Var DrinkDescriptionTH = "เป๊ปซี่ โกโก้ นม และโอริโอ้"
-        Var DrinkDescription = "Water"
+		Var DrinkDescription = "Pepsi, Cocoa, Milk, Oreo and Ice"
-        Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo_Chocolate_Milk_freefire.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-        Var PriceD2 = $12-05-02-0016.Price
+		Var PriceD2 = $-.Price
-        Var PriceD3 = $-.Price
+		Var PriceD3 = $12-99-03-0067.Price
 		Var PD_CODE1 = "##-##-##-####"
-        Var PD_CODE2 = "12-05-02-0016"
+		Var PD_CODE2 = "##-##-##-####"
-        Var PD_CODE3 = "##-##-##-####"
+		Var PD_CODE3 = "12-99-03-0067"
 		Var PD_STAGE_1 = "Disable2"
-        Var PD_STAGE_2 = $12-05-02-0016.Button
+		Var PD_STAGE_2 = "Disable2"
-        Var PD_STAGE_3 = "Disable2"
+		Var PD_STAGE_3 = $12-99-03-0067.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-99-03-0067, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -1385,12 +1883,12 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-            Topping "Load" "12-05-02-0016"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-            Topping "Load" "-"
+			Topping "Load" "12-99-03-0067"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@@ -1398,15 +1896,15 @@
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-        Var menu_name_eng_cold = $12-05-02-0016.NameE
+		Var menu_name_eng_cold = $##-##-##-####.NameE
-        Var menu_desc_eng_cold = $12-05-02-0016.descriptionE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
-        Var menu_name_thai_cold = $12-05-02-0016.Name
+		Var menu_name_thai_cold = $##-##-##-####.Name
-        Var menu_desc_thai_cold = $12-05-02-0016.description
+		Var menu_desc_thai_cold = $##-##-##-####.description
 		
-        Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_name_eng_blender = $12-99-03-0067.NameE
-        Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_desc_eng_blender = $12-99-03-0067.descriptionE
-        Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_name_thai_blender = $12-99-03-0067.Name
-        Var menu_desc_thai_blender = $##-##-##-####.description
+		Var menu_desc_thai_blender = $12-99-03-0067.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@@ -1427,7 +1925,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-    <Value> "น้ำดื่ม" </Value>
+	<Value> "แม๊กซิมบูสเตอร์ " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1437,7 +1935,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-    <Value> "น้ำ" </Value>
+	<Value> "เป๊ปซี่ โกโก้ นม และโอริโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1448,7 +1946,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-    <Value> "DRINKING WATER" </Value>
+	<Value> "Maxim's Booster" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1458,7 +1956,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-    <Value> "Water" </Value>
+	<Value> "Pepsi, Cocoa, Milk, Oreo and Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1488,7 +1986,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-    <State> $12-05-02-0016.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -1498,15 +1996,15 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-    <State> $12-05-02-0016.Button </State>
+	<State> "Invisible" </State>
-    <Value> StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-    <State> "Invisible" </State>
+	<State> $12-99-03-0067.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
@@ -1516,8 +2014,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-    <State> "Invisible" </State>
+	<State> $12-99-03-0067.Button </State>
-    <Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $12-99-03-0067.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1542,10 +2040,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-            If $Sum1205020016 = "Disable" Then
+			If $Sum1299030067 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-                STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-                STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-99-03-0067.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -1581,40 +2079,46 @@
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-    <State> $Sum1205020016 </State> 
+	<State> $Sum1299030067 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
+	; - - - 
+	; ==================> Len = 12
+	; - - 12-99-03-0066 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-    <State> "Enable" </State> 
+	<State> FreeFireMenuState3 </State> 
 	<Button>
-    <State> "Enable" </State> 
+	<State> $Sum1299030066 </State> 
-    <Filename> "ROOT/taobin_project/image/page_drink_n//bn_water_roomtemp.png" </Filename>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo_Pepsi_Milk_freefire.png" </Filename>
-    <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_water_roomtemp.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo_Pepsi_Milk_freefire.png" </FilenamePress>
-    <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_water_roomtemp.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo_Pepsi_Milk_freefire.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-99-03-0066, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-        Var NameDrink = "DRINKING WATER"
+		Var NameDrink = "Kelly's secret recipe"
-        Var NameDrinkTH = "น้ำดื่ม"
+		Var NameDrinkTH = "สูตรลับเคลลี่"
-        Var DrinkDescriptionTH = "น้ำ"
+		Var DrinkDescriptionTH = "เป๊ปซี่ นม และโอริโอ้"
-        Var DrinkDescription = "Water"
+		Var DrinkDescription = "pepsi, Milk, Sugar, Oreo"
-        Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo_Pepsi_Milk_freefire.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-        Var PriceD2 = $12-05-02-0016.Price
+		Var PriceD2 = $-.Price
-        Var PriceD3 = $-.Price
+		Var PriceD3 = $12-99-03-0066.Price
 		Var PD_CODE1 = "##-##-##-####"
-        Var PD_CODE2 = "12-05-02-0016"
+		Var PD_CODE2 = "##-##-##-####"
-        Var PD_CODE3 = "##-##-##-####"
+		Var PD_CODE3 = "12-99-03-0066"
 		Var PD_STAGE_1 = "Disable2"
-        Var PD_STAGE_2 = $12-05-02-0016.Button
+		Var PD_STAGE_2 = "Disable2"
-        Var PD_STAGE_3 = "Disable2"
+		Var PD_STAGE_3 = $12-99-03-0066.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-99-03-0066, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -1630,12 +2134,12 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-            Topping "Load" "12-05-02-0016"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-            Topping "Load" "-"
+			Topping "Load" "12-99-03-0066"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@@ -1643,15 +2147,15 @@
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-        Var menu_name_eng_cold = $12-05-02-0016.NameE
+		Var menu_name_eng_cold = $##-##-##-####.NameE
-        Var menu_desc_eng_cold = $12-05-02-0016.descriptionE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
-        Var menu_name_thai_cold = $12-05-02-0016.Name
+		Var menu_name_thai_cold = $##-##-##-####.Name
-        Var menu_desc_thai_cold = $12-05-02-0016.description
+		Var menu_desc_thai_cold = $##-##-##-####.description
 		
-        Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_name_eng_blender = $12-99-03-0066.NameE
-        Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_desc_eng_blender = $12-99-03-0066.descriptionE
-        Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_name_thai_blender = $12-99-03-0066.Name
-        Var menu_desc_thai_blender = $##-##-##-####.description
+		Var menu_desc_thai_blender = $12-99-03-0066.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@@ -1672,7 +2176,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-    <Value> "น้ำดื่ม" </Value>
+	<Value> "สูตรลับเคลลี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1682,7 +2186,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-    <Value> "น้ำ" </Value>
+	<Value> "เป๊ปซี่ นม และโอริโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1693,7 +2197,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-    <Value> "DRINKING WATER" </Value>
+	<Value> "Kelly's secret recipe" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1703,7 +2207,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-    <Value> "Water" </Value>
+	<Value> "pepsi, Milk,
+Sugar, Oreo" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1733,7 +2238,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-    <State> $12-05-02-0016.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -1743,15 +2248,15 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-    <State> $12-05-02-0016.Button </State>
+	<State> "Invisible" </State>
-    <Value> StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-    <State> "Invisible" </State>
+	<State> $12-99-03-0066.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
@@ -1761,8 +2266,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-    <State> "Invisible" </State>
+	<State> $12-99-03-0066.Button </State>
-    <Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $12-99-03-0066.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1787,10 +2292,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-            If $Sum1205020016 = "Disable" Then
+			If $Sum1299030066 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-                STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-                STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-99-03-0066.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -1826,11 +2331,12 @@
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-    <State> $Sum1205020016 </State> 
+	<State> $Sum1299030066 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
+
 ; menu_new_li;TAGESP
 	; ==================> Len = 17
 	; - - 12-03-03-0009 
@@ -12552,7 +13058,71 @@ LIMENADE SODA" </Value>
     <X> 42 </X>
     <Y> 518 </Y>
 
-<State> BigButtonEnable </State>
+<State> 
+	eval(
+		If BigButtonEnable = "Enable" Then
+			If LipitRewardOutOfStock = 1 Then
+				Var return = "Enable"
+			Else
+				Var return = "Invisible"
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+ </State>
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_lipit.xml"
+        
+</EventOnClick>
+
+</Button>
+
+<Button>
+    <X> 42 </X>
+    <Y> 518 </Y>
+
+<State>
+	eval(
+		If BigButtonEnable = "Enable" Then
+			If LipitRewardOutOfStock = 1 Then
+				Var return = "Invisible"
+			Else
+				Var return = "Enable"
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+ </State>
     <Filename>
      eval( 
         If show_eng = "true" Then 
@@ -12597,9 +13167,13 @@ LIMENADE SODA" </Value>
         eval(
             If show_eng = "true" Then
                 Var return = "Invisible"
+            Else
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
 				Else
 					Var return = "Enable"
 				EndIf
+            EndIf
         ) 
     </State>
     <Filename> "ROOT/taobin_project/image/event/lipit/pro_lipit_th.mp4" </Filename>
@@ -12613,7 +13187,11 @@ LIMENADE SODA" </Value>
     <State> 
         eval(
             If show_eng = "true" Then
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
 					Var return = "Enable"
+				EndIf
             Else
                 Var return  = "Invisible"
             EndIf

xml/event/promotion_template1.inc

@@ -3,7 +3,71 @@
     <X> 42 </X>
     <Y> 518 </Y>
 
-<State> BigButtonEnable </State>
+<State> 
+	eval(
+		If BigButtonEnable = "Enable" Then
+			If LipitRewardOutOfStock = 1 Then
+				Var return = "Enable"
+			Else
+				Var return = "Invisible"
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+ </State>
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_lipit.xml"
+        
+</EventOnClick>
+
+</Button>
+
+<Button>
+    <X> 42 </X>
+    <Y> 518 </Y>
+
+<State>
+	eval(
+		If BigButtonEnable = "Enable" Then
+			If LipitRewardOutOfStock = 1 Then
+				Var return = "Invisible"
+			Else
+				Var return = "Enable"
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+ </State>
     <Filename>
      eval( 
         If show_eng = "true" Then 
@@ -48,9 +112,13 @@
         eval(
             If show_eng = "true" Then
                 Var return = "Invisible"
+            Else
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
 				Else
 					Var return = "Enable"
 				EndIf
+            EndIf
         ) 
     </State>
     <Filename> "ROOT/taobin_project/image/event/lipit/pro_lipit_th.mp4" </Filename>
@@ -64,7 +132,11 @@
     <State> 
         eval(
             If show_eng = "true" Then
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
 					Var return = "Enable"
+				EndIf
             Else
                 Var return  = "Invisible"
             EndIf

xml/event/script_common_for_open_promotion_xml.ev

@@ -6,9 +6,13 @@ DEBUGVAR OpenFromPageBoard
 
 DEBUGVAR LipitPro
 DEBUGVAR MondayBananaPro
-DEBUGVAR PepsiSecondCup30Enable
 DEBUGVAR FreeEnergyDrink
 DEBUGVAR EnergyDrinkEnable
+DEBUGVAR TeaTimePro
+DEBUGVAR FreeFirePro
+DEBUGVAR FreeFireMenuState1
+DEBUGVAR FreeFireMenuState2
+DEBUGVAR FreeFireMenuState3
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -29,6 +33,7 @@ Else
 	DEBUGVAR FreeEnergyDrink
 	;Var FreeEnergyDrink = 1
 	;Var EnableFreeEnergyDrink = "true"
+	;Var MondayBananaPro = 1
 	DEBUGVAR EnableFreeEnergyDrink
 
 	Var CountEnablePromotion = 0

xml/event/tricker.ev

@@ -69,9 +69,10 @@ Var PepsiSecondCup30Enable = 0
 Var PepsiSecondCup30DiscountEnable = 0
 Var FromPepsiSecondCup30 = 0
 
-; Enable Lipit Promotion, 18 Mar - 12 Apr
+; Enable Lipit Promotion, 18 Mar - 5 Apr
 Var LipitPro = 0
 Var FromLipitPro = 0
+Var LipitRewardOutOfStock = 0
 
 ; Enable Monday Banana Promotion, every Monday start 11 Mar - 19 Apr
 Var MondayBananaPro = 0
@@ -82,6 +83,12 @@ Var FreeEnergyDrink = 0
 Var FromPowerUpPro = 0
 Var FreePowerup = "Invisible"
 
+; Enable Tea Time, 13 - 30 Apr
+Var TeaTimePro = 0
+
+; Enable Free Fire, 1 - 30 Apr
+Var FreeFirePro = 0
+
 Var NewCollectPoint = 1
 
 Var NewFlowPaymentCode = 0
@@ -189,6 +196,7 @@ EndIf
 If SystemDateMonthInt = 4 Then
 
 	Var FreeEnergyDrink = 1
+	Var FreeFirePro = 1
 
 	If SystemDateDayInt = 1 Then
 		Var MondayBananaPro = 1
@@ -214,6 +222,10 @@ If SystemDateMonthInt = 4 Then
 		Var LipitPro = 1
 	EndIf
 
+	If SystemDateDayInt >= 13 Then
+		Var TeaTimePro = 1
+	EndIf
+
 EndIf
 
 
@@ -365,8 +377,23 @@ Else
 	Var FreeEnergyDrink = 0
 EndIf
 
+If FreeFirePro = 1 Then	
+	Var FreeFireMenuState1 = $12-99-03-0026.Button
+	Var FreeFireMenuState2 = $12-99-03-0067.Button
+	Var FreeFireMenuState3 = $12-99-03-0066.Button
+Else
+	Var FreeFireMenuState1 = "Invisible"
+	Var FreeFireMenuState2 = "Invisible"
+	Var FreeFireMenuState3 = "Invisible"
+EndIf
+
 If LipitPro = 1 Then
 
+	READ_FILE "/mnt/sdcard/lipit_reward_out_of_stock" lipitOutOfStock
+	STRCONTAIN "1" lipitOutOfStock LipitOutOfStockContain
+	If LipitOutOfStockContain = "true" Then
+		Var LipitRewardOutOfStock = 1
+	EndIf
 	
 	Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro1.mp4"
 	Var CountDownShowButton = 0

xml/page_board.xml

@@ -82,6 +82,8 @@
 	Var RobotoRegular = "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"
 	Var RobotoThin = "ROOT/taobin_project/font/Roboto/Roboto-Thin.ttf"
 
+	Var RobotoCondensedRegular = "ROOT/taobin_project/font/Roboto/RobotoCondensed-Regular.ttf"
+
 	Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
 	Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
 	Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf"
@@ -96,6 +98,9 @@
 
 	Var MITRegularTTF = "ROOT/taobin_project/font/Mitr/Mitr-Regular.ttf"
 
+	Var DinCondensedRegular = "ROOT/taobin_project/font/Din/DIN-Regular.ttf"
+	Var DinCondensedBold = "ROOT/taobin_project/font/Din/DIN-Condensed-Bold.ttf"
+
 
 	Var countClick = 0
 

xml/page_catalog_group_pro_freefile.skt

@@ -0,0 +1,63 @@
+<?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.py
+    ?>
+    
+    Var FromMyMintPro = 0
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+;BigLogoLayout
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
+
+

xml/page_collect_point_1.xml

@@ -187,15 +187,19 @@
 				If FromLipitPro = 1 Then
 					If Seeker.CodeChannel = 1 Then
 						If Seeker.CollectPointPromotion = 1 Then
+							If LipitRewardOutOfStock = 0 Then
 								GETACCEXT TelephoneNumber 32
 								Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 							EndIf
+						EndIf
 					Else
+						If LipitRewardOutOfStock = 0 Then
 							GETACCEXT TelephoneNumber 32
 							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 						EndIf
 					EndIf
 				EndIf
+			EndIf
 
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
@@ -257,15 +261,19 @@
 			If FromLipitPro = 1 Then
 				If Seeker.CodeChannel = 1 Then
 					If Seeker.CollectPointPromotion = 1 Then
+						If LipitRewardOutOfStock = 0 Then
 							GETACCEXT TelephoneNumber 32
 							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 						EndIf
+					EndIf
 				Else
+					If LipitRewardOutOfStock = 0 Then
 						GETACCEXT TelephoneNumber 32
 						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 					EndIf
 				EndIf
 			EndIf
+		EndIf
 
 		If PepweenCollectPoint = 0 Then
 			GETACCEXT TelephoneNumber 31
@@ -772,15 +780,19 @@
 				If FromLipitPro = 1 Then
 					If Seeker.CodeChannel = 1 Then
 						If Seeker.CollectPointPromotion = 1 Then
+							If LipitRewardOutOfStock = 0 Then
 								GETACCEXT TelephoneNumber 32
 								Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 							EndIf
+						EndIf
 					Else
+						If LipitRewardOutOfStock = 0 Then
 							GETACCEXT TelephoneNumber 32
 							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 						EndIf
 					EndIf
 				EndIf
+			EndIf
 
 			If PepweenCollectPoint = 0 Then
 				GETACCEXT TelephoneNumber 31

xml/topview_blank_main.xml

@@ -4,6 +4,7 @@
 <Height> 1920 </Height>
 <EventOpen>
 
+    ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/top_spender.xml"
 
 </EventOpen>