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_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 
@@ -49,7 +113,11 @@
             If show_eng = "true" Then
                 Var return = "Invisible"
             Else
-                Var return  = "Enable"
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
+					Var return = "Enable"
+				EndIf
             EndIf
         ) 
     </State>
@@ -64,7 +132,11 @@
     <State> 
         eval(
             If show_eng = "true" Then
-                Var return = "Enable"
+                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,12 +187,16 @@
 				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
-					Else
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 					EndIf
 				EndIf
 			EndIf
@@ -257,12 +261,16 @@
 			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
-				Else
-					GETACCEXT TelephoneNumber 32
-					Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 				EndIf
 			EndIf
 		EndIf
@@ -772,12 +780,16 @@
 				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
-					Else
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 					EndIf
 				EndIf
 			EndIf

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>