THAI: Oreo Volcano and extend Matcha Every Day

inter/tha/xml/multi/v3/event/dummy_layout_promotion.py

@@ -28,7 +28,8 @@ if "v3" in param and "promotion" in param and "other_catalog" in param:
 		pro_output_file = open(directory_to_process + "/event/event_v3/catalog_other/active_promotions.lxml", 'w')
 		pro_output_file.write(template_content.replace(";banners", all_active_pro))
 		pro_output_file.close()
-elif "v3" in param and "promotion" in param:
+
+if "v3" in param and "promotion" in param:
 	file_template = open(directory_to_process + "/page_catalog_group_recommend.lxml", 'r')
 	template_content = file_template.read()
 	file_template.close()
@@ -41,6 +42,7 @@ elif "v3" in param and "promotion" in param:
 
 	files = os.listdir(directory_to_process + "/event/event_v3")
 	files = [f for f in files if f.endswith(".json")]
+	files.sort()
 	for filename in files:
 		pro_json_file = open(directory_to_process + "/event/event_v3/"+ filename)
 		pro_json = json.load(pro_json_file)
@@ -53,7 +55,7 @@ elif "v3" in param and "promotion" in param:
 			pro_content = pro_content.replace("#MediaThai", pro_json["media_thai"])
 			pro_content = pro_content.replace("#MediaEng", pro_json["media_eng"])
 			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
-			all_active_pro += pro_content + "\n\t"
+			all_active_pro += pro_content + "\n"
 
 		pro_output_file = open(directory_to_process + "/event/event_v3/active_promotions.lxml", 'w')
 		pro_output_file.write(template_content.replace(";banners", all_active_pro))

inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json

@@ -1,6 +1,6 @@
 {
-  "start": "2025-03-10T00:00:00",
-  "end": "2025-03-31T00:00:00",
+  "start": "2025-05-01T00:00:00",
+  "end": "2025-05-31T00:00:00",
   "state": "MatchaEveryDayProState",
   "type": "IMAGE",
   "media_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",

inter/tha/xml/multi/v3/event/event_v3/2_promotion_oreo_volcano.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-05-01T00:00:00",
+  "end": "2025-05-31T00:00:00",
+  "state": "OreoVolcanoProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+  "media_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_oreo_volcano.xml\""
+}

inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml

@@ -59,10 +59,10 @@
 
     GetVisible inst_show_other_other
     
-	DEBUGVAR inst_show_other_other
+	;DEBUGVAR inst_show_other_other
 
     Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
-	DEBUGVAR OtherOtherRefreshTimeOut
+	;DEBUGVAR OtherOtherRefreshTimeOut
 
     If OtherOtherRefreshTimeOut > 15 Then
 	

inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev

@@ -3,6 +3,7 @@
 Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
 
 Var MatchaEveryDayProState  = "Invisible"
+Var OreoVolcanoProState  = "Invisible"
 Var KingdomThaiTeaProState = "Invisible"
 Var PepsiXTaobinProState = "Invisible"
 
@@ -10,6 +11,10 @@ If MatchaEveryDayPro = 1 Then
     Var MatchaEveryDayProState  = "Enable"
 EndIf
 
+If OreoVolcanoPro = 1 Then
+	Var OreoVolcanoProState = "Enable"
+EndIf
+
 If KingdomThaiTeaPro = 1 Then
     Var KingdomThaiTeaProState = "Enable"
 EndIf