Merged by xmlgen

image/event/image_template2

@@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+normal_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-press_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+press_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-disable_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+disable_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png

inter/tha/menu/lang.tsv

@@ -362,6 +362,7 @@
 002309		Drink didn’t dissolve properly	เครื่องดื่มไม่ละลาย	饮料未融化			အအေးမပျက်ပါ
 002310		Cup is messy/dirty	แก้วเลอะ	杯子脏了			ဖန်ခွက်ညစ်နေသည်
 002311		The cup tipped over / drink spilled	แก้วล้ม/เครื่องดื่มหก	杯子倒了 / 饮料洒了			ဖန်ခွက်လဲ/အရည်ချဲသွားသည်
+002312		Item not received	ไม่ได้รับสินค้า	未收到商品			ကုန်ပစ္စည်း မရရှိပါ
 		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center
 002350		Next	ถัดไป	下一步			နောက်တစ်ခု
 002351		Back	ย้อนกลับ	返回			နောက်သို့
@@ -1255,7 +1256,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง

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

@@ -1,7 +1,5 @@
-
+if "v3" in param and "promotion" in param and "other_catalog" in param:
-if "v3" in param and "promotion" in param:
+	file_template = open(directory_to_process + "/page_catalog_group_other_other.lxml", 'r')
-	print("Kenta", directory_to_process)
-	file_template = open(directory_to_process + "/page_catalog_group_recommend.lxml", 'r')
 	template_content = file_template.read()
 	file_template.close()
 
@@ -11,10 +9,10 @@ if "v3" in param and "promotion" in param:
 
 	all_active_pro = ""
 
-	files = os.listdir(directory_to_process + "/event/event_v3")
+	files = os.listdir(directory_to_process + "/event/event_v3/catalog_other")
 	files = [f for f in files if f.endswith(".json")]
 	for filename in files:
-		pro_json_file = open(directory_to_process + "/event/event_v3/"+ filename)
+		pro_json_file = open(directory_to_process + "/event/event_v3/catalog_other/"+ filename)
 		pro_json = json.load(pro_json_file)
 		start_time = datetime.datetime.strptime(pro_json["start"], "%Y-%m-%dT%H:%M:%S")
 		end_time = datetime.datetime.strptime(pro_json["end"], "%Y-%m-%dT%H:%M:%S")
@@ -27,6 +25,38 @@ if "v3" in param and "promotion" in param:
 			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
 			all_active_pro += pro_content + "\n\t"
 
+		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()
+
+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()
+
+	pro_template = open(directory_to_process + "/event/event_v3/promotion_template.inc")
+	pro_template_content = pro_template.read()
+	pro_template.close()
+
+	all_active_pro = ""
+
+	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)
+		start_time = datetime.datetime.strptime(pro_json["start"], "%Y-%m-%dT%H:%M:%S")
+		end_time = datetime.datetime.strptime(pro_json["end"], "%Y-%m-%dT%H:%M:%S")
+		if start_time > datetime.datetime.now() or datetime.datetime.now() < end_time:
+			pro_content = str(pro_template_content)
+			pro_content = pro_content.replace("#State", pro_json["state"])
+			pro_content = pro_content.replace("#Type", pro_json["type"])
+			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"
+
 		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))
 		pro_output_file.close()

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

@@ -1,6 +1,6 @@
 {
-  "start": "2025-03-10T00:00:00",
+  "start": "2025-05-01T00:00:00",
-  "end": "2025-03-31T00: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/1_promotion_boost_energy.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-05-01T00:00:00",
+  "end": "2025-05-11T00:00:00",
+  "state": "BoostEnergyProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/boost_energy/boost_energy.png",
+  "media_eng": "ROOT/taobin_project/image/event/boost_energy/boost_energy.png",
+  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_boost_energy.xml\""
+}

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

inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt

@@ -0,0 +1,96 @@
+<?hurr 
+    #include=menu_head.py 
+    echo param
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 7 Then
+		Var SlientRefreshIndex = 8
+	EndIf
+
+    Var OtherOtherRefreshTimeOut = 1
+	Var inst_show_other_other_counter = 10
+</EventOpen>
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
+     ; soda and other
+    Var Menu62Selected = "PressForever"
+
+    RootLayoutVisible 12 "show"
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var OtherOtherRefreshTimeOut = 14
+
+	DEBUGVAR SlientRefreshIndex
+    
+	
+	RefreshAll
+
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+
+    
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
+
+    ; setvarint RefreshOtherOther 1
+    If RefreshOtherOther = 1 Then
+        Var RefreshOtherOther = 0
+        SAVELOG "OPEN FROM 8"
+        Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml"
+    EndIf 
+
+    GetVisible inst_show_other_other
+    
+	;DEBUGVAR inst_show_other_other
+
+    Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
+	;DEBUGVAR OtherOtherRefreshTimeOut
+
+    If OtherOtherRefreshTimeOut > 15 Then
+	
+	
+        Var OtherOtherRefreshTimeOut = 0
+        Script "-" "-"
+		If inst_show_other_other = 1 Then
+		 	;RefreshAll
+		EndIf
+    EndIf
+
+
+    TimerReset
+</EventTimeout>
+
+
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.skt

@@ -0,0 +1,42 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

menu/new-layout.tsv

@@ -333,15 +333,27 @@ IGNORE		เก็กฮวย 	Chrysanths Tea	น้ำเก๊กฮวย น
 
 
 Name=Other,file=page_catalog_group_other.skt
-		เต่าพลังโซดา\n(เพิ่มปริมาณ)	Energy Drink\nSoda Extra	เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Soda, Ice	-	12-05-02-0143	12-05-03-0143	bn_iced_energy_drink_soda_Extra.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
 		เป๊ปซี่ (เพิ่มปริมาณ)	Pepsi Extra	เป๊ปซี่ โซดา และน้ำแข็ง	Pepsi, Soda And Ice	-	12-05-02-0133	-	bn_iced_pepsi_extra_catalog.png	-	-	-	posi1	2025/01/01T00:00:00	-	-	-
-		ยูซุคาราเมลโซดา	Yuzu Caramel Soda	ยูซุ คาราเมล โซดา	Yuzu Caramel Soda	-	12-05-02-0147	-	bn_Yuzu_Caramel_Soda.png	-	-	-	posi1	2025/04/01T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าพลังโซดา\n(เพิ่มปริมาณ)	Energy Drink\nSoda Extra	เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Soda, Ice	-	12-05-02-0143	12-05-03-0143	bn_iced_energy_drink_soda_Extra.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลัง\n(เพิ่มปริมาณ)	Energy Drink\nExtra	เครื่องดื่มเต่าทรงพลัง น้ำ\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Water,\nIce	-	12-05-02-0142	12-05-03-0142	bn_iced_energy_drink_Extra.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลัง\nสตรอเบอรีโซดา	Energy Drink\nStrawberry Soda	เครื่องดื่มเต่าทรงพลัง สตรอเบอรี่\nและโซดา (มีคาเฟอีน)	Medicine Drink, Strawberry\n, Soda	-	12-05-02-0136	12-05-03-0136	bn_iced_energy_drink_Strawberry_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลังบ๊วย\nโซดา	Energy Drink\nUme Soda	เครื่องดื่มเต่าทรงพลัง บ๊วย\nและโซดา (มีคาเฟอีน)	Medicine Drink, Ume ,\nSoda	-	12-05-02-0137	12-05-03-0137	bn_iced_energy_drink_plum_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลังลิ้นจี่\nโซดา	Energy Drink\nLychee Soda	เครื่องดื่มเต่าทรงพลัง ลิ้นจี่\nและโซดา (มีคาเฟอีน)	Medicine Drink, Lychee\n, Soda	-	12-05-02-0138	12-05-03-0138	bn_iced_energy_drink_Lychee_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลังมะนาว\nโซดา	Energy Drink\nLime Soda	เครื่องดื่มเต่าทรงพลัง มะนาว\nและโซดา (มีคาเฟอีน)	Medicine Drink, Lime Powder,\nSoda	-	12-05-02-0139	12-05-03-0139	bn_iced_energy_drink_lime_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลังคาราเมล\nโซดา	Energy Drink\nCaramel Soda	เครื่องดื่มเต่าทรงพลัง \nคาราเมล และโซดา (มีคาเฟอีน)	Medicine Drink, \n, Soda	-	12-05-02-0140	12-05-03-0140	bn_iced_energy_drink_caramel_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลังสละ\nโซดา	Energy Drink\nSalak Soda	เครื่องดื่มเต่าทรงพลัง\nน้ำแดงกลิ่นสละ และโซดา (มีคาเฟอีน)	Medicine Drink, Salak ,\nSoda	-	12-05-02-0141	12-05-03-0141	bn_iced_energy_drink_salak_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+		เต่าทรงพลัง\nเพิ่มปริมาณ	Energy Drink\nExtra	เครื่องดื่มเต่าทรงพลัง น้ำ\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Water,\nIce	-	12-05-02-0142	12-05-03-0142	bn_iced_energy_drink_Extra.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
+
+		เต่าทรงพลัง	Energy Drink	เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง\n(มีคาเฟอีน)	Medicine Drink, Water, Ice	-	12-05-02-0034	12-05-03-0034	bn_iced_energy_drink.png	-	-	-	posi1	-	-	-	-	-	#REF!	#REF!	#REF!	#REF!
+		เต่าทรงพลังโซดา	Energy Drink\nSoda	เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Soda, Ice	-	12-05-02-0035	12-05-03-0035	bn_iced_energy_drink_soda.png	-	-	-	posi1	-	-	-	-	-	#REF!	#REF!	#REF!	#REF!
+		เป๊ปซี่ทรอปิคอล	Pepsi Tropical	เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)	Pepsi Medicine Drink Coconut Soda	-	12-05-02-0148	-	bn_Pepsi_Tropical.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
+
+
 		ยูซุมัทฉะโซดา	Yuzu Matcha Soda	ยูซุ มัทฉะ มะนาว โซดา	Yuzu Matcha Lime Soda	-	12-02-02-0098	-	bn_hot_yuzu_Matcha_tea.png	-	-	-	posi1	2025/03/20T00:00:00	-	-	-
 
 		เป๊ปซี่ยูซุ	Pepsi Yuzu	เป๊ปซี่ ยูซุ โซดา	Pepsi Yuzu Soda	-	12-05-02-0106	-	bn_Pepsi_Yuzu.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่ลิ้นจี่	Pepsi  Lychee	เป๊ปซี่ โซดา ลิ้นจี่	Pepsi Lychee Soda	-	12-05-02-0057	-	bn_Pepsi_Lychee.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่สตรอเบอรี	Pepsi Strawberry	เป๊ปซี่ โซดา สตรอเบอรี	Pepsi Strawberry Soda	-	12-05-02-0058	-	bn_Pepsi_Strawberry.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
-		เป๊ปซี่ทรอปิคอล	Pepsi Tropical	เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)	Pepsi Medicine Drink Coconut Soda	-	12-05-02-0148	-	bn_Pepsi_Tropical.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่มะนาว	Pepsi Lime	เป๊ปซี่ โซดา มะนาว	Pepsi Lime Soda	-	12-05-02-0149	-	bn_Pepsi_Lime.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	-	bn_Pepsi Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0104	12-05-03-0104	bn_iced_pepsi_plum.png	-	-	-	posi1	-	-	-	-
@@ -354,16 +366,6 @@ Name=Other,file=page_catalog_group_other.skt
 		ฟรุตพันช์ยูซุ	Yuzu Punch Drink	มะนาว ยูซุ น้ำแข็ง และคอลลาเจน	Collagen, Lime, Yuzu  And Ice	-	12-05-02-0145	12-05-03-0145	bn_iced_fruit_punch_Yuzu_Jemila.png	-	-	-	posi1	2025/02/17T00:00:00	-	PunchDrinkMenu	-
 		ฟรุตพันช์บ๊วย	Ume Punch Drink	มะนาว บ๊วย น้ำแข็ง และคอลลาเจน	Collagen, Lime, Ume  And Ice	-	12-05-02-0146	12-05-03-0146	bn_iced_fruit_punch_Ume_Jemila.png	-	-	-	posi1	2025/02/17T00:00:00	-	PunchDrinkMenu	-
 
-		เต่าทรงพลัง\nสตรอเบอรีโซดา	Energy Drink\nStrawberry Soda	เครื่องดื่มเต่าทรงพลัง สตรอเบอรี่\nและโซดา (มีคาเฟอีน)	Medicine Drink, Strawberry\n, Soda	-	12-05-02-0136	12-05-03-0136	bn_iced_energy_drink_Strawberry_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-		เต่าทรงพลังบ๊วย\nโซดา	Energy Drink\nUme Soda	เครื่องดื่มเต่าทรงพลัง บ๊วย\nและโซดา (มีคาเฟอีน)	Medicine Drink, Ume ,\nSoda	-	12-05-02-0137	12-05-03-0137	bn_iced_energy_drink_plum_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-		เต่าทรงพลังลิ้นจี่\nโซดา	Energy Drink\nLychee Soda	เครื่องดื่มเต่าทรงพลัง ลิ้นจี่\nและโซดา (มีคาเฟอีน)	Medicine Drink, Lychee\n, Soda	-	12-05-02-0138	12-05-03-0138	bn_iced_energy_drink_Lychee_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-		เต่าทรงพลังมะนาว\nโซดา	Energy Drink\nLime Soda	เครื่องดื่มเต่าทรงพลัง มะนาว\nและโซดา (มีคาเฟอีน)	Medicine Drink, Lime Powder,\nSoda	-	12-05-02-0139	12-05-03-0139	bn_iced_energy_drink_lime_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-		เต่าทรงพลังคาราเมล\nโซดา	Energy Drink\nCaramel Soda	เครื่องดื่มเต่าทรงพลัง \nคาราเมล และโซดา (มีคาเฟอีน)	Medicine Drink, \n, Soda	-	12-05-02-0140	12-05-03-0140	bn_iced_energy_drink_caramel_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-		เต่าทรงพลังสละ\nโซดา	Energy Drink\nSalak Soda	เครื่องดื่มเต่าทรงพลัง\nน้ำแดงกลิ่นสละ และโซดา (มีคาเฟอีน)	Medicine Drink, Salak ,\nSoda	-	12-05-02-0141	12-05-03-0141	bn_iced_energy_drink_salak_soda.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-		เต่าทรงพลัง\nเพิ่มปริมาณ	Energy Drink\nExtra	เครื่องดื่มเต่าทรงพลัง น้ำ\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Water,\nIce	-	12-05-02-0142	12-05-03-0142	bn_iced_energy_drink_Extra.png	-	-	-	posi1	2025/01/21T00:00:00	-	TaobinEnergyDrinkMenu	-
-
-		เต่าทรงพลัง	Energy Drink	เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง\n(มีคาเฟอีน)	Medicine Drink, Water, Ice	-	12-05-02-0034	12-05-03-0034	bn_iced_energy_drink.png	-	-	-	posi1	-	-	-	-	-	#REF!	#REF!	#REF!	#REF!
-		เต่าทรงพลังโซดา	Energy Drink\nSoda	เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน)	Medicine Drink, Soda, Ice	-	12-05-02-0035	12-05-03-0035	bn_iced_energy_drink_soda.png	-	-	-	posi1	-	-	-	-	-	#REF!	#REF!	#REF!	#REF!
 
 
 IGNORE			Pepsi Max			-	12-05-02-0062	12-05-03-0062					posi1	-	-	-	-
@@ -1293,14 +1295,13 @@ Name=BoostEnergy,file=page_catalog_group_pro_boost_energy.skt
 		เต่าทรงพลัง (เพิ่มปริมาณ)	Tao Power Drink Extra	เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง /n(มีคาเฟอีน)	MEDICINE DRINK, WATER, ICE	-	12-05-02-0142	12-05-03-0142	bn_iced_energy_drink_Extra.png	-	-	-	posi1	-	-	-	-
 		เต่าพลังโซดา (เพิ่มปริมาณ)	Tao Power Drink Soda Extra	เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน)	MEDICINE DRINK, SODA, ICE	-	12-05-02-0143	12-05-03-0143	bn_iced_energy_drink_soda_Extra.png	-	-	-	posi1	-	-	-	-
 
-Name=OreoVolcano,file=page_catalog_group_pro_oreo_volcano.skt										-	-	-	posi1	-	-	-	-
+Name=OreoVolcano,file=page_catalog_group_pro_oreo_volcano.skt
 		โอรีโอปั่นภูเขาไฟ	Oreo Smoothie\nVolcano	นม น้ำตาล โอรีโอ \n	Milk, Sugar, Oreo, Ice	-	-	12-03-03-0009	bn_smoothie_oreo.png	-	-	-	posi1	-	-	-	-
 		ซูเปอร์โอรีโอปั่น\nภูเขาไฟ	Super Oocano	นม น้ำตาล โอรีโอ	Milk, Sugar, Oreo, Ice	-	-	12-03-03-0032	bn_super_oreo_volcano.png	-	-	-	posi1	-	-	-	-
 		นมชมพูปั่นโอรีโอ\nภูเขาไฟ	Pink Oreo\nVolcano	น้ำแดงกลิ่นสละ นม น้ำตาล \nโอรีโอ	Salak , Milk,\nSugar Oreo	-	-	12-03-03-0026	bn_PinkOreo_smoothie.png	-	-	-	posi1	-	-	-	-
 		สตรอเบอรีปั่นโอรีโอ\nภูเขาไฟ	Strawberry Milk Oreo\nSmoothie	สตรอเบอรี นม น้ำตาล \nโอรีโอ	Strawberry , Milk,\nSugar, Oreo	-	-	12-03-03-0027	bn_Strawberr_milk_Oreo_smoothie.png	-	-	-	posi1	-	-	-	-
 		โกโก้ปั่นโอรีโอ\nภูเขาไฟ	Choco Oreo\nSmoothie	โกโก้ นม น้ำตาล \nโอรีโอ	Cocoa, Milk,\nSugar, Oreo	-	-	12-03-03-0030	bn_ChocoOreo_smoothie.png	-	-	-	posi1	-	-	-	-
-		พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ	Premium Espresso\nCaramel Oreo	กาแฟ นม คาราเมล และโอรีโอ	Coffee, Milk, Caramel , Oreo	-	-	12-01-03-0078	bn_Caramel_Espresso_Oreo_smoothie.png	-	-	-	posi1	-	-	-	-
+		พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ	Premium Espresso\nCaramel Oreo	กาแฟ นม คาราเมล และโอรีโอ	Coffee, Milk, Caramel , Oreo	-	-	12-01-03-0078	bn_Caramel_Espresso_Oreo_smoothie.png	-	-	12-21-03-0078	posi1	-	-	-	-
-		พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ	Premium Espresso\nCaramel Oreo (s)	กาแฟ นม คาราเมล และโอรีโอ	Coffee, Milk, Caramel , Oreo	-	-	-	bn_Caramel_Espresso_Oreo_smoothie.png	-	-	12-21-03-0078	posi1	-	-	-	-
 		พรีเมียมมัทฉะ\nคาราเมลโอรีโอ	Premium Matcha\nCaramel Oreo	มัทฉะ นม คาราเมล และโอรีโอ	Matcha, Milk, Caramel , Oreo	-	-	12-02-03-0057	bn_Caramel_GreenTea_Oreo_smoothie.png	-	-	-	posi1	-	-	-	-
 		พรีเมียมชาไทย\nคาราเมลโอรีโอ	Premium Thai Tea\nCaramel Oreo	ชาไทย นม คาราเมล และโอรีโอ	Thai Tea, Milk, Caramel , Oreo	-	-	12-02-03-0058	bn_Caramel_ThaiTea_Oreo_smoothie.png	-	-	-	posi1	-	-	-	-
 		ยูซุโอริโอ้โวคาโน่	Yuzu Milk Oreo Volcano	ยูซุ นม น้ำตาล \nโอรีโอ	Yuzu , Milk,\nSugar, Oreo	-	-	12-03-03-0087	bn_Yuzu_Milk_Oreo_Volcano.png	-	-	-	posi1	-	-	-	-
@@ -1316,7 +1317,7 @@ Name=OreoVolcano,file=page_catalog_group_pro_oreo_volcano.skt										-	-	-	pos
 		นมมะพร้าวปั่นโอรีโอ\nภูเขาไฟ	Coconut Milk Oreo\nSmoothie	มะพร้าว นม น้ำตาล \nโอรีโอ	Coconut, Milk,\nSugar, Oreo	-	-	12-03-03-0086	bn_Coconut_Oreo_smoothie.png	-	-	-	posi1	-	-	-	-
 
 
-Name=20Bath?
+Name=20Bath,file=page_catalog_group_20_baht.skt
 		เป๊ปซี่ (เพิ่มปริมาณ)	Pepsi Extra	เป๊ปซี่ โซดา และน้ำแข็ง	Pepsi, Soda And Ice	-	12-05-02-0133	-	bn_iced_pepsi_extra_catalog.png	-	-	-	posi1	-	-	-	-
 		เต่าพลังโซดา (เพิ่มปริมาณ)	Tao Power Drink Soda Extra	เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน)	MEDICINE DRINK, SODA, ICE	-	12-05-02-0143	-	bn_iced_energy_drink_soda_Extra.png	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่ยูซุ	Pepsi Yuzu	เป๊ปซี่ ยูซุ โซดา	Pepsi Yuzu Soda	-	12-05-02-0106	-	bn_Pepsi_Yuzu.png	-	-	-	posi1	-	-	-	-

ui/lang.tsv

@@ -362,6 +362,7 @@
 002309		Drink didn’t dissolve properly	เครื่องดื่มไม่ละลาย	饮料未融化			အအေးမပျက်ပါ
 002310		Cup is messy/dirty	แก้วเลอะ	杯子脏了			ဖန်ခွက်ညစ်နေသည်
 002311		The cup tipped over / drink spilled	แก้วล้ม/เครื่องดื่มหก	杯子倒了 / 饮料洒了			ဖန်ခွက်လဲ/အရည်ချဲသွားသည်
+002312		Item not received	ไม่ได้รับสินค้า	未收到商品			ကုန်ပစ္စည်း မရရှိပါ
 		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center
 002350		Next	ถัดไป	下一步			နောက်တစ်ခု
 002351		Back	ย้อนกลับ	返回			နောက်သို့
@@ -1255,7 +1256,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง

xml/event/boost_energy/page_got_discount_code.xml

@@ -0,0 +1,156 @@
+<Popup>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <EventOpen>
+        Var Timeout = 0
+        Var ImageDir = "ROOT/taobin_project/image/event/boost_energy/"
+
+        If show_eng = "true" Then
+            Var GotDiscountImg = ImageDir + "got_discount_code_en.png"
+            Var ButtonIdleImg = "ROOT/taobin_project/image/collectiing/bn_confirm.png"
+            Var ButtonPressedImg = "ROOT/taobin_project/image/collectiing/bp_confirm.png"
+        Else
+            Var GotDiscountImg = ImageDir + "got_discount_code_th.png"
+            Var ButtonIdleImg = "ROOT/taobin_project/image/collectiing_en/bn_confirm.png"
+            Var ButtonPressedImg = "ROOT/taobin_project/image/collectiing_en/bp_confirm.png"
+        EndIf
+
+        Var CloseButtonState = "Invisible"
+
+        DEBUGVAR GotDiscountImg
+        DEBUGVAR TelephoneNumber
+
+        SAVELOG "[BOOST_ENERGY] Sending code"
+
+        Var Param1 = "157"
+        Var Param2 = ""
+        Var Param3 = ""
+        AddData 43 TelephoneNumber Param1 Param2 Param3
+    </EventOpen>
+
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        ;Var CountDownBrewing = BREW_CNT
+
+        ;Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 5 Then
+            SAVELOG "[BOOST_ENERGY] Timeout"
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
+
+        TimerReset
+        Refresh
+    </EventTimeout>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+
+    <EventActionOk>
+        If Ext1a = "ok" Then
+
+        Else
+
+            SAVELOG "[BOOST_ENERGY] EventActionOk: Ext1a != ok send code fail"
+            DEBUGVAR ParamCP
+            DEBUGVAR TelephoneNumberX
+            DEBUGVAR TelephoneNumber
+
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember= TelephoneNumber
+
+            If show_eng = "true" Then
+                Var GotDiscountImg = ImageDir + "send_code_fail_en.png"
+            Else
+                Var GotDiscountImg = ImageDir + "send_code_fail_th.png"
+            EndIf
+
+            Var CloseButtonState = "Enable"
+            Var Timeout = 0
+
+            Refresh
+
+        EndIf
+    </EventActionOk>
+
+    <EventActionError>
+
+        SAVELOG "[BOOST_ENERGY] EventActionError: send code fail"
+        DEBUGVAR ParamCP
+        DEBUGVAR TelephoneNumberX
+        DEBUGVAR TelephoneNumber
+
+        Var Seeker.TaobinErrorNetwork = 1
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+
+		If show_eng = "true" Then
+            Var GotDiscountImg = ImageDir + "send_code_fail_en.png"
+        Else
+            Var GotDiscountImg = ImageDir + "send_code_fail_th.png"
+        EndIf
+
+        Var CloseButtonState = "Enable"
+        Var Timeout = 0
+
+        Refresh
+
+    </EventActionError>
+
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+    <X> 0 </X>
+    <Y> 380 </Y>
+    <Filename> GotDiscountImg </Filename>
+    </Image>
+
+    <Button>
+        <X> 397 </X>
+        <Y> 1783 </Y>
+        <State> CloseButtonState </State>
+        <Filename> ButtonIdleImg </Filename>
+        <FilenamePress> ButtonPressedImg </FilenamePress>
+        <EventClick>
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        </EventClck>
+    </Button>
+
+
+
+    ;<Image>
+    ;<X> 751 </X>
+    ;<Y> 413 </Y>
+    ;<Filename> IMG_CNT </Filename>
+    ;</Image>
+
+    ;<Text>
+    ;<X> XPosiShowCountDownBrew </X>
+    ;<Y> 470 </Y>
+    ;<Align> End </Align>
+    ;<Width> 153 </Width>
+    ;<Size> 88 </Size>
+    ;<Font> RobotoBold </Font>
+    ;<Color> 0x513C2F </Color>
+    ;<Value> ShowCountDownBrewing </Value>
+    ;</Text>
+
+</Popup>

xml/event/multi_promotion_config_matcha_every_day_oreo_volcano.json

@@ -0,0 +1,28 @@
+[
+  {
+      "name": "matcha_every_day",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+          "normal_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+          "press_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+          "press_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+          "disable_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+          "disable_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_matcha_every_day.xml"
+      }
+  },
+  {
+      "name": "oreo_volcano",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+          "normal_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+          "press_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+          "press_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+          "disable_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+          "disable_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_volcano.xml"
+      }
+  }
+]

xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_coconut_milk.xml
+/event/promotion_oreo_volcano.xml

xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_coconut_milk.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_volcano.xml"

xml/event/promotion_template2.inc

@@ -12,22 +12,4 @@
         ###EventOnClick
 
 </EventOnClick>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4" </Filename>
-</Video>
 </Button>
-
-<EventUnitTest1>
-    Var BigButtonEnable = "Enable"
-    Refresh
-</EventUnitTest1>
-<EventUnitTest2>
-    Var BigButtonEnable = "Invisible"
-    Refresh
-</EventUnitTest2>

xml/event/script_common_for_open_promotion_xml.ev

@@ -4,13 +4,10 @@ DEBUGVAR PayOfflineMode
 DEBUGVAR CocktailShow
 DEBUGVAR OpenFromPageBoard
 
-DEBUGVAR StrawberrySeriesPro
-DEBUGVAR OvaltineSchoolPro
-DEBUGVAR RedStringOfFatePro
-DEBUGVAR CoconutMilkPro
-DEBUGVAR MatchaEveryDayPro
 DEBUGVAR KingdomThaiTeaPro
 DEBUGVAR PepsiXTaobinPro
+DEBUGVAR MatchaEveryDayPro
+DEBUGVAR OreoVolcanoPro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -34,18 +31,8 @@ Else
 
 	Else
 
-		If CoconutMilkPro = 1 Then
+		If PepsiXTaobinPro = 1 Then
-			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
-			Var PromotionState2 = "Enable"
-
-			If MatchaEveryDayPro = 1 Then
-				Var PromotionState1 = "Enable"
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml"
-			EndIf
-		Else
-			If MatchaEveryDayPro = 1 Then
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
-			EndIf
 		EndIf
 
 		If KingdomThaiTeaPro = 1 Then
@@ -61,13 +48,19 @@ Else
 				Var PromotionState2 = "Enable"
 				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml"
 			EndIf
-		Else
+		EndIf
-			If PepsiXTaobinPro = 1 Then
+
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
+		If MatchaEveryDayPro = 1 Then
-			EndIf
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
+		EndIf
+
+		If OreoVolcanoPro = 1 Then
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_oreo_volcano.xml"
+			Var PromotionState1 = "Enable"
 
 			If MatchaEveryDayPro = 1 Then
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
+				Var PromotionState2 = "Enable"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml"
 			EndIf
 		EndIf
 

xml/event/tricker.ev

@@ -68,9 +68,6 @@ Var SwensenPro = 0
 ; Coconut Milk, 1 Mar - 31 Mar
 Var CoconutMilkPro = 0
 
-; Matcha every day, 10 Mar - 31 Mar
-Var MatchaEveryDayPro = 0
-
 ; Kingdom of Thai tea, 1 Apr - 30 Apr
 Var KingdomThaiTeaPro = 0
 
@@ -80,6 +77,15 @@ Var PepsiXTaobinPro = 0
 ; 3 dialects sound campaign, 1 Apr - 30 Apr
 Var SongkranSoundCampaign = 0
 
+; Boost Energy drink, 1 - 11 May
+Var BoostEnergyPro = 0
+
+; Matcha every day, 1 - 31 May
+Var MatchaEveryDayPro = 0
+
+; Oreo volcano, 1 - 31 May
+Var OreoVolcanoPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0
 
@@ -128,6 +134,15 @@ If SystemDateMonthInt = 3 Then
 	EndIf
 EndIf
 
+If SystemDateMonthInt = 5 Then
+
+	Var OreoVolcanoPro = 1
+	Var MatchaEveryDayPro = 1
+
+    If SystemDateDayInt <= 11 Then
+        Var BoostEnergyPro = 1
+    EndIf
+EndIf
 
 
 Var JemilaToppingFlag = 1

xml/menu_new_layout_gen.py

@@ -337,8 +337,8 @@
       out_xml('<Column> 2 </Column>\r\n')
     else:
       out_xml('<Column> 4 </Column>\r\n')
-    if recommend_page:
+    #if recommend_page:
-      out_xml(';layout_mode\r\n')
+    out_xml(';layout_mode\r\n')
     out_xml('<Script>\r\n')
 
     if "all" in verbose:
@@ -346,8 +346,8 @@
 
     out_xml('\t\tVar block_index_override = 0\r\n')
     out_xml('\t\tVar block_index_move = 0\r\n')
-    if recommend_page:
+    #if recommend_page:
-      out_xml('\t\t;banner_shifting\r\n')
+    out_xml('\t\t;banner_shifting\r\n')
 
     out_xml('</Script>\r\n')
 
@@ -1305,7 +1305,7 @@
               out_xml( '\t\t\tEndIf\r\n')
               out_xml( '\t\tEndIf\r\n')
 
-            
+
           else:
             out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
             out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\r\n')

xml/page_catalog_group_20_baht.skt

@@ -0,0 +1,43 @@
+<?hurr 
+    #include=menu_head.py 
+    echo param
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	
+	
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+    ; soda and other
+    Var Menu62Selected = "PressForever"
+
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+;BigLogoLayout
+
+</Popup>

xml/page_catalog_group_appfast.xml

@@ -44,9 +44,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 5

xml/page_catalog_group_cocktail.xml

@@ -35,9 +35,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 53

xml/page_catalog_group_coffee.xml

@@ -35,9 +35,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 72

xml/page_catalog_group_deep_fryer.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3

xml/page_catalog_group_forkid.xml

@@ -45,9 +45,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 19

xml/page_catalog_group_health.xml

@@ -32,9 +32,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 30

xml/page_catalog_group_milk.xml

@@ -33,9 +33,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 60

xml/page_catalog_group_oreo.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 13

xml/page_catalog_group_other_other.skt

@@ -11,6 +11,8 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
+	
+	
 	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
     ; soda and other
     Var Menu62Selected = "PressForever"
@@ -36,5 +38,6 @@
     #include=menu_new_layout_gen.py
 ?>
 
+;BigLogoLayout
 
 </Popup>

xml/page_catalog_group_other_other.xml

@@ -8,6 +8,8 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
+	
+	
 	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
     ; soda and other
     Var Menu62Selected = "PressForever"
@@ -34,9 +36,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 75
@@ -16961,5 +16965,6 @@ Plant Protein" </Value>
 </Button>
 
 
+;BigLogoLayout
 
 </Popup>

xml/page_catalog_group_pepsi_7up.xml

@@ -33,9 +33,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 36

xml/page_catalog_group_pepsi_pro.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10

xml/page_catalog_group_pro_12_day_12_menu.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 12

xml/page_catalog_group_pro_15THB.xml

@@ -182,9 +182,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 9

xml/page_catalog_group_pro_7up_lucky_draw_x2.xml

@@ -26,9 +26,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 44

xml/page_catalog_group_pro_bad_valentine.xml

@@ -31,9 +31,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 9

xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml

@@ -25,9 +25,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 23

xml/page_catalog_group_pro_boost_energy.skt

@@ -1,5 +1,5 @@
-<?hurr 
+<?hurr
-    #include=menu_head.py 
+    #include=menu_head.py
 ?>
 
 <Popup>
@@ -10,7 +10,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
 
 
     Var Timeout = 0
@@ -24,10 +24,10 @@
 
 
 
-<?hurr 
+<?hurr
     #include=menu_new_layout_gen_v2.py
 ?>
-<?hurr 
+<?hurr
     #include=menu_new_layout_gen.py
 ?>
 

xml/page_catalog_group_pro_buble_tea.xml

@@ -27,9 +27,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 17

xml/page_catalog_group_pro_cocoa_77.xml

@@ -35,9 +35,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 18

xml/page_catalog_group_pro_coconut_milk.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 5

xml/page_catalog_group_pro_freefile.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3

xml/page_catalog_group_pro_halloween.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 15

xml/page_catalog_group_pro_happy_trios.xml

@@ -31,9 +31,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3

xml/page_catalog_group_pro_jemila.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10

xml/page_catalog_group_pro_kingdom_thai_tea.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 7

xml/page_catalog_group_pro_lipit.xml

@@ -31,9 +31,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10

xml/page_catalog_group_pro_matcha_every_day.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14

xml/page_catalog_group_pro_melon.xml

@@ -28,9 +28,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 7

xml/page_catalog_group_pro_mom_cocoa.xml

@@ -25,9 +25,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 24

xml/page_catalog_group_pro_monday_banana.xml

@@ -31,9 +31,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3

xml/page_catalog_group_pro_mymint.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 13

xml/page_catalog_group_pro_nam_hom_coconut.xml

@@ -27,9 +27,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 26

xml/page_catalog_group_pro_oreo_11.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 19

xml/page_catalog_group_pro_oreo_volcano.skt

@@ -0,0 +1,36 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

xml/page_catalog_group_pro_ovaltine_school.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3

xml/page_catalog_group_pro_passion_mint.xml

@@ -26,9 +26,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10

xml/page_catalog_group_pro_peach.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 12

xml/page_catalog_group_pro_pepsi_second_cup_30.xml

@@ -31,9 +31,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14

xml/page_catalog_group_pro_pepsi_x_taobin.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 12

xml/page_catalog_group_pro_pepween.xml

@@ -59,9 +59,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14

xml/page_catalog_group_pro_red_string_of_fate.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3

xml/page_catalog_group_pro_rerun.xml

@@ -32,9 +32,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 12

xml/page_catalog_group_pro_robinson_beauty.xml

@@ -31,9 +31,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10

xml/page_catalog_group_pro_strawberry_series.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 7

xml/page_catalog_group_pro_tea_time.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 26

xml/page_catalog_group_pro_thick_tea_by_brewer.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 15

xml/page_catalog_group_pro_wednesday_melon.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 13

xml/page_catalog_group_pro_weekday_discount.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14

xml/page_catalog_group_pro_weekday_discount_event_on.xml

@@ -29,9 +29,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14

xml/page_catalog_group_soft_serve.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 25

xml/page_catalog_group_songkran.xml

@@ -162,9 +162,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 7

xml/page_catalog_group_tea.xml

@@ -38,9 +38,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 64

xml/page_catalog_group_whey.xml

@@ -40,9 +40,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 20

xml/page_catalog_momday.xml

@@ -30,9 +30,11 @@
 <ScrollHeight> "auto" </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
+;layout_mode
 <Script>
 		Var block_index_override = 0
 		Var block_index_move = 0
+		;banner_shifting
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 6

xml/page_collect_point_3_28.xml

@@ -1027,40 +1027,15 @@
 
 
 <Function2>
-
+	If CoffeePoint >= 28 Then
-    If FromHappyTriosPro = 1 Then
+		If GetDrink5Bath = 1 Then
-        If Seeker.VendingCode = "PX6" Then
+			Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
-
+		Else
-        Else
+			;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-            Open "ROOT/taobin_project/xml/event/happy_trios/page_sending_discount_code.xml"
+		EndIf
-        EndIf
+	Else
-    EndIf
+		;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-
+	EndIf
-    If CoffeePoint >= 28 Then
-        If GetDrink5Bath = 1 Then
-            Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
-        Else
-            If Seeker.IsLineMember = 0 Then
-                If LuckyDrawCampaign = 1 Then
-                    Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-                Else
-                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-                EndIf
-            Else
-                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-            EndIf
-        EndIf
-    Else
-        If Seeker.IsLineMember = 0 Then
-            If LuckyDrawCampaign = 1 Then
-                Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-            Else
-                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-            EndIf
-        Else
-            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-        EndIf
-    EndIf
 </Function2>
 
 

xml/page_display_get_15_discount.xml

@@ -43,15 +43,7 @@
 		If FromCheckMemberPoint = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
 		Else
-			If Seeker.IsLineMember = 0 Then
+			;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
 		EndIf
 	EndIf
 
@@ -166,11 +158,7 @@
 	If FromCheckMemberPoint = 1 Then
 		Open "ROOT/taobin_project/xml/page_check_member2.xml"
 	Else
-		If LuckyDrawCampaign = 1 Then
+		;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-			Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-		EndIf
 	EndIf
 </EventClick>
 </Button>
@@ -189,15 +177,7 @@
 	If FromCheckMemberPoint = 1 Then
 		Open "ROOT/taobin_project/xml/page_check_member2.xml"
 	Else
-		If Seeker.IsLineMember = 0 Then
+		;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-			If LuckyDrawCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-		EndIf
 	EndIf
 
 </EventClick>

xml/page_display_get_drink_5_baht.xml

@@ -61,15 +61,7 @@
 			If FromCheckMemberPoint = 1 Then
 				Open "ROOT/taobin_project/xml/page_check_member2.xml"
 			Else
-				If Seeker.IsLineMember = 0 Then
+				;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-					If LuckyDrawCampaign = 1 Then
-						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-					Else
-						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-					EndIf
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -165,15 +157,7 @@
 		If FromCheckMemberPoint = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
 		Else
-			If Seeker.IsLineMember = 0 Then
+			;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
 		EndIf
 	EndIf
 </EventClick>

xml/page_display_get_free.xml

@@ -99,11 +99,7 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 5 Then
     	; goto lid straw
-
+     	;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-
-
-		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-		;Open "ROOT/taobin_project/xml/page_catalog.xml"
 	EndIf
 
 	TimerReset
@@ -188,9 +184,7 @@
 <EventClick>
 	; goto lid straw
 
-
+	;include="ROOT/taobin_project/xml/sometime/after_collect_point.xml"
-
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 
 </EventClick>
 </Button>

xml/sometime/after_collect_point.xml

@@ -0,0 +1,78 @@
+If BoostEnergyPro = 1 Then
+	If Seeker.CodeChannel = 1 Then
+		SAVELOG "[AFTER_COLLECT_POINT] BoostEnergyPro: Not get discount code because client use discount to buy drink."
+	Else
+
+		Var getDiscount = 0
+		If Seeker.selected_a_drink = "12-05-02-0148" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0034" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0034" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0035" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0035" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0136" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0136" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0137" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0137" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0138" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0138" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0139" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0139" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0140" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0140" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0141" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0141" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0142" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0142" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-02-0143" Then
+			Var getDiscount = 1
+		EndIf
+		If Seeker.selected_a_drink = "12-05-03-0143" Then
+			Var getDiscount = 1
+		EndIf
+
+		If getDiscount = 1 Then
+			Open "ROOT/taobin_project/xml/event/boost_energy/page_got_discount_code.xml"
+		EndIf
+
+	EndIf
+EndIf
+
+Open "ROOT/taobin_project/xml/page_lid_straw.xml"