THAI: Add TeaTime promotion & FIXED: bug cancel pay with cash will get discount drink in full price

xml/event/dummy_layout_promotion.py

@@ -10,11 +10,11 @@ else:
 	# ; include-file=dummy_layout.inc
 	# file_inc = open(directory_to_process + "/dummy_layout.inc", 'r')
 	# file_inc_content = file_inc.read()
-	
+	file_inc1_content = ""
 
 	file_recommend.close()
 	if "template1" in param:
-
+		print("Here", param)
 		file_inc1 = open(directory_to_process + "/event/promotion_template1.inc", 'r')
 		file_inc1_content = file_inc1.read()
 		file_inc_img = open(directory_to_process + "../image/event/image_template1", 'r')

xml/event/multi_promotion_config_13_4-17_05_2024.json

@@ -3,14 +3,14 @@
         "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",
+            "normal_eng": "ROOT/taobin_project/image/event/tea_time/tea_time_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/tea_time/tea_time_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/tea_time/tea_time_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/tea_time/tea_time_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/tea_time/tea_time_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/tea_time/tea_time_th.png",
+            "video_eng": "ROOT/taobin_project/image/event/tea_time/tea_time_en.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/tea_time/tea_time_th.mp4",
             "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_tea_time.xml"
         }
     },

xml/event/out_put_file3.txt

@@ -1 +1 @@
-/event/promotion_pepsi_second_cup_30.xml
+/event/promotion_tea_time.xml

xml/event/promotion_template3.inc

@@ -33,7 +33,7 @@
      </FilenameDisable>
 <EventOnClick> 
 
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_second_cup_30.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_tea_time.xml"
         
 </EventOnClick>
 
@@ -53,7 +53,7 @@
             EndIf
         ) 
     </State>
-    <Filename> "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_th.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/tea_time/tea_time_th.mp4" </Filename>
 </Video>
 
 <Video>
@@ -71,7 +71,7 @@
         ) 
     </State>
     <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_en.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/tea_time/tea_time_en.mp4" </Filename>
 </Video>
 
 </Button>

xml/event/script_common_for_open_promotion_xml.ev

@@ -58,7 +58,7 @@ Else
 			Var FileRecommendToOpen =  "ROOT/taobin_project/xml/event/promotion_lipit.xml"
 		EndIf
 	Else
-		If PepsiSecondCup30Enable = 1 Then
+		If TeaTimePro = 1 Then
 			Var PromotionState1 = "Enable"
 			Var CountEnablePromotion = CountEnablePromotion + 1
 			
@@ -77,9 +77,9 @@ Else
 			EndIf
 
 			If CountEnablePromotion > 1 Then
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_pepsi_second_cup_30_and_monday_banana_and_free_energy_drink.xml"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_tea_time_and_monday_banana_and_free_energy_drink.xml"
 			Else
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_second_cup_30.xml"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_tea_time.xml"
 			EndIf
 		Else
 			If EnableFreeEnergyDrink = "true" Then

xml/event/tricker.ev

@@ -85,6 +85,7 @@ Var FreePowerup = "Invisible"
 
 ; Enable Tea Time, 13 - 30 Apr
 Var TeaTimePro = 0
+Var FromTeaTimePro = 0
 
 ; Enable Free Fire, 1 - 30 Apr
 Var FreeFirePro = 0
@@ -222,12 +223,18 @@ If SystemDateMonthInt = 4 Then
 		Var LipitPro = 1
 	EndIf
 
-	If SystemDateDayInt >= 13 Then
+	If SystemDateDayInt >= 8 Then
 		Var TeaTimePro = 1
 	EndIf
 
 EndIf
 
+If SystemDateMonthInt = 5 Then
+	If SystemDateDayInt <= 10 Then
+		Var TeaTimePro = 1
+	EndIf
+EndIf
+
 
 
 If BoxID = 173149 Then
@@ -351,6 +358,8 @@ If taobin_nopro = "true" Then
 	Var ProPeachEnable = 0
 	Var ProBadValentineEnable = 0
 	Var FreeEnergyDrink = 0
+	Var MondayBananaPro = 0
+	Var TeaTimePro = 0
 
 	Var PepsiSecondCup30Enable = 0
 	Var PepsiSecondCup30DiscountEnable = 0