THAI: Promotion: Boost Energy Drink

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

@@ -1,6 +1,34 @@
+if "v3" in param and "promotion" in param and "other_catalog" in param:
+	file_template = open(directory_to_process + "/page_catalog_group_other_other.lxml", 'r')
+	template_content = file_template.read()
+	file_template.close()
 
-if "v3" in param and "promotion" in param:
+	pro_template = open(directory_to_process + "/event/event_v3/promotion_template.inc")
-	print("Kenta", directory_to_process)
+	pro_template_content = pro_template.read()
+	pro_template.close()
+
+	all_active_pro = ""
+
+	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/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")
+		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\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()
+elif "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()

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/page_catalog_group_pro_buble_tea.lxml

@@ -7335,6 +7335,233 @@
 			
 			
 			
+		</EventOnClick>
+		</Menu>
+
+			; ==================> Len = 3
+		; - - 12-00-07-0001 
+		<Menu>
+		<State> Flag( 12-00-07-0001.Button,$Sum1200070001) </State>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" </DisableImage>
+		<Name>
+			<LanguageGroup>
+				<LanguageSlot1>Mango Smoothie</LanguageSlot1>
+				<LanguageSlot2>มะม่วงปั่น</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>-</LanguageSlot6>
+			</LanguageGroup>
+		</Name>
+		<Description>
+			<LanguageGroup>
+				<LanguageSlot1>Mango Frozen</LanguageSlot1>
+				<LanguageSlot2>มะม่วงสุขแช่แข็ง</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>-</LanguageSlot6>
+			</LanguageGroup>
+		</Description>
+		<HotState> "Disable2" </HotState>
+		<IceState> "Disable2" </IceState>
+		<BlendState> $12-00-07-0001.Button </BlendState>
+		<HotPrice> eval( 
+		If $##-##-##-####.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </HotPrice>
+		<IcePrice> eval( 
+		If $##-##-##-####.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </IcePrice>
+		<BlendPrice> eval( 
+		If $12-00-07-0001.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-00-07-0001.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<ConditionalDisable>
+			<Script>
+				If $Sum1200070001 = "Disable" Then
+					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag1_is_disable
+					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag2_is_disable
+					STRCONTAIN "STG=CLOSE" $12-00-07-0001.TAG tag3_is_disable
+					If tag1_is_disable = "true" Then
+						Var $Sum1200070001Tag = $##-##-##-####.TAG
+					EndIf
+					If tag2_is_disable = "true" Then
+						Var $Sum1200070001Tag = $##-##-##-####.TAG
+					EndIf
+					If tag3_is_disable = "true" Then
+						Var $Sum1200070001Tag = $12-00-07-0001.TAG
+					EndIf
+					Var $Sum1200070001TextValue !assigned GETS($Sum1200070001Tag,"MSG")
+					Var $Sum1200070001TextID !assigned GETS($Sum1200070001Tag,"TextID")
+					If $Sum1200070001TextID != "" Then
+						Var $Sum1200070001TextValue = ""
+					EndIf
+					If $Sum1200070001TextValue = "" Then
+						If $Sum1200070001TextID = "" Then
+							Var $Sum1200070001TextID = "000013"
+						EndIf
+					EndIf
+				EndIf
+			</Script>
+			<ID> $Sum1200070001TextID </ID>
+			<Value> $Sum1200070001TextValue </Value>
+		</ConditionalDisable>
+		<EventOnClick>
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_frozen_mango.png"
+			GetInstanceIDMenuTab OpenFromInstMenuTab
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $##-##-##-####.Price
+			Var PriceD2 = $##-##-##-####.Price
+			Var PriceD3 = $12-00-07-0001.Price
+			Var PD_CODE1 = "##-##-##-####"
+			Var PD_CODE2 = "##-##-##-####"
+			Var PD_CODE3 = "12-00-07-0001"
+			; begin lang
+			Var aliasName[0] = "Mango Smoothie"
+			Var aliasDesc[0] = "Mango Frozen"
+			Var aliasName[1] = "มะม่วงปั่น"
+			Var aliasDesc[1] = "มะม่วงสุขแช่แข็ง"
+			Var aliasName[2] = "-"
+			Var aliasDesc[2] = "-"
+			Var aliasName[3] = "-"
+			Var aliasDesc[3] = "-"
+			Var aliasName[4] = "-"
+			Var aliasDesc[4] = "-"
+			Var aliasName[5] = "-"
+			Var aliasDesc[5] = "-"
+			Var NameLang[0][0] = ""
+			Var NameLang[0][1] = ""
+			Var NameLang[0][2] = ""
+			Var NameLang[0][3] = ""
+			Var NameLang[0][4] = ""
+			Var NameLang[0][5] = ""
+			Var DescLang[0][0] = ""
+			Var DescLang[0][1] = ""
+			Var DescLang[0][2] = ""
+			Var DescLang[0][3] = ""
+			Var DescLang[0][4] = ""
+			Var DescLang[0][5] = ""
+			Var NameLang[1][0] = ""
+			Var NameLang[1][1] = ""
+			Var NameLang[1][2] = ""
+			Var NameLang[1][3] = ""
+			Var NameLang[1][4] = ""
+			Var NameLang[1][5] = ""
+			Var DescLang[1][0] = ""
+			Var DescLang[1][1] = ""
+			Var DescLang[1][2] = ""
+			Var DescLang[1][3] = ""
+			Var DescLang[1][4] = ""
+			Var DescLang[1][5] = ""
+			Var NameLang[2][0] = "Mango Smoothie"
+			Var NameLang[2][1] = "มะม่วงปั่น"
+			Var NameLang[2][2] = "-"
+			Var NameLang[2][3] = "-"
+			Var NameLang[2][4] = "-"
+			Var NameLang[2][5] = "-"
+			Var DescLang[2][0] = "Mango Frozen"
+			Var DescLang[2][1] = "มะม่วงสุขแช่แข็ง"
+			Var DescLang[2][2] = "-"
+			Var DescLang[2][3] = "-"
+			Var DescLang[2][4] = "-"
+			Var DescLang[2][5] = "-"
+			; end lang
+			Var PD_STAGE_1 = "Disable2"
+			Var PD_STAGE_2 = "Disable2"
+			Var PD_STAGE_3 = $12-00-07-0001.Button
+			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-00-07-0001"
+				EndIf
+			EndIf
+			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_buble_tea.lxml"
+			
+			
+			TabMenuVisibleInst 99
+			DEBUGVAR RedirectToNormalVersion
+			DEBUGVAR ToppingNewUINewSystem
+			If RedirectToNormalVersion = 1 Then
+				Var menu_name_eng_hot = NameLang[0][0]
+				Var menu_desc_eng_hot = DescLang[0][0]
+				Var menu_name_eng_cold = NameLang[1][0]
+				Var menu_desc_eng_cold = DescLang[1][0]
+				Var menu_name_eng_blender = NameLang[2][0]
+				Var menu_desc_eng_blender = DescLang[2][0]
+				
+				
+				
+				Var menu_name_thai_hot = NameLang[0][1]
+				Var menu_desc_thai_hot = DescLang[0][1]
+				Var menu_name_thai_cold = NameLang[1][1]
+				Var menu_desc_thai_cold = DescLang[1][1]
+				Var menu_name_thai_blender = NameLang[2][1]
+				Var menu_desc_thai_blender = DescLang[2][1]
+				DEBUGVAR menu_name_thai_cold
+				DEBUGVAR menu_desc_thai_cold
+					Var NameDrink = aliasName[0]
+					Var DrinkDescription =  aliasDesc[0]
+					Var NameDrinkTH = aliasName[1]
+					Var DrinkDescriptionTH = aliasDesc[1]
+			If LanguageShow = "THAI" Then
+				Var show_eng =  "false"
+			Else
+				Var show_eng =  "true"
+			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+			EndIf
+			
+			
+			
 		</EventOnClick>
 		</Menu>
 

ui/lang.tsv

@@ -340,12 +340,15 @@
 
 
 	Frozen_smoothie
-		Font=Kanit,Type=Light,Size=24,Color=0x513C2F,Align=Center,LineHeight=18	Font=Kanit,Type=Light,Size=24,Color=0x513C2F,Align=Center,LineHeight=18	Font=Kanit,Type=Light,Size=24,Color=0x513C2F,Align=Center,LineHeight=18		Font=Kanit,Type=Light,Size=16,Color=0x513C2F,Align=Center,LineHeight=18	Font=Kanit,Type=Light,Size=24,Color=0x513C2F,Align=Center,LineHeight=18
+		Font=Kanit,Type=Light,Size=30,Color=0x6F5F51,Align=Center,LineHeight=18	Font=Kanit,Type=Light,Size=30,Color=0x6F5F51,Align=Center,LineHeight=18	Font=Kanit,Type=Light,Size=30,Color=0x6F5F51,Align=Center,LineHeight=18		Font=Kanit,Type=Light,Size=30,Color=0x6F5F51,Align=Center,LineHeight=18	Font=Kanit,Type=Light,Size=30,Color=0x6F5F51,Align=Center,LineHeight=18
 002290		Preparation time: Approximately 3 minutes	เวลาเตรียม: ประมาณ 3 นาที	准备时间：大约3分钟			ပြင်ဆင်ချိန် - ခန့်မှန်းခြေ ၃ မိနစ်
+		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center
+		Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center		Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x746254,Align=Center
+002291		Pay now	ซื้อเลย	现在付款		Pay now	ဝယ်မယ်
 	Helper
-		Font=Kanit,Type=Medium,Size=28,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=28,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=28,Color=0x513C2F,Align=Center		Font=Kanit,Type=Medium,Size=28,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=28,Color=0x513C2F,Align=Center
+		Font=Kanit,Type=Medium,Size=28,Color=0x84776F	Font=Kanit,Type=Medium,Size=28,Color=0x84776F	Font=Kanit,Type=Medium,Size=28,Color=0x84776F		Font=Kanit,Type=Medium,Size=28,Color=0x84776F	Font=Kanit,Type=Medium,Size=28,Color=0x84776F
 002299		Select the issue you encountered	เลือกปัญหาที่คุณพบเจอ	请选择您遇到的问题			သင်ကြုံတွေ့သောပြဿနာကိုရွေးပါ
-		Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center		Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center
+		Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center		Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center
 002300		Support Center	ศูนย์ช่วยเหลือ	帮助中心			အကူအညီစင်တာ
 		Font=Kanit,Type=Medium,Size=30,Color=0x513C2F	Font=Kanit,Type=Medium,Size=30,Color=0x513C2F	Font=Kanit,Type=Medium,Size=30,Color=0x513C2F		Font=Kanit,Type=Medium,Size=30,Color=0x513C2F	Font=Kanit,Type=Medium,Size=30,Color=0x513C2F
 002301		Inserted money, amount unchanged	ตู้กินเงิน	机器没有退钱			စက်က ငွေပြန်မပေးပါ
@@ -359,17 +362,27 @@
 002309		Drink didn’t dissolve properly	เครื่องดื่มไม่ละลาย	饮料未融化			အအေးမပျက်ပါ
 002310		Cup is messy/dirty	แก้วเลอะ	杯子脏了			ဖန်ခွက်ညစ်နေသည်
 002311		The cup tipped over / drink spilled	แก้วล้ม/เครื่องดื่มหก	杯子倒了 / 饮料洒了			ဖန်ခွက်လဲ/အရည်ချဲသွားသည်
+		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	ย้อนกลับ	返回			နောက်သို့
+002352		Confirm	ยืนยัน	确认			အတည်ပြုပါ
+		Font=Montserrat,Type=Bold,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46	Font=Kanit,Type=Light,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46	Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46	Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center	Font=Montserrat,Type=Bold,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46	Font=Montserrat,Type=Bold,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46
+002353		Please enter your phone number\n[so we can contact you back.###Font=KanitLight,Size=36]	โปรดกรอกเบอร์โทรขอคุณ\n[เพื่อรอการติดต่อกลับจากเรา###Font=KanitLight,Size=36]	请输入您的电话号码\n[以便我们与您联系。###Font=KanitLight,Size=36]			ကျေးဇူးပြု၍ သင်၏ဖုန်းနံပါတ်ကို ဖြည့်ပါ\n[ကျွန်ုပ်တို့မှ ပြန်လည်ဆက်သွယ်နိုင်ရန်။###Font=KanitLight,Size=36]
+	Smoothie_process
+		Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center		Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center
+002400		Order summary	ยกเลิกออเดอร์	取消订单			အော်ဒါဖျက်ရန်
 
-
+002401		Open to blend	เปิดแล้วปั่นเลย	打开以搅拌			ကြိတ်ဖို့ဖွင့်ပါ
-
+		Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center		Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x746254,Align=Center
-
+002402		Cancel order	ยกเลิกการซื้อ	取消购买			ဝယ်ယူမှုဖျက်ရန်
-
+002403		Go back	กลับไปก่อนหน้า	返回			နောက်သို့သွားပါ
-
+002404		Back to home	กลับหน้าหลัก	返回主页			မူလစာမျက်နှာသို့ ပြန်သွားရန်
-
+		Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center,LineHeight=46	Font=Kanit,Type=Light,Size=36,Color=0x513C2F,Align=Center,LineHeight=46	Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center,LineHeight=46	Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center	Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center,LineHeight=46	Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center,LineHeight=46
-
+002405		Oh no! Your smoothie’s\n[getting cold feet###Font=KanitBold,Size=36]	โอ้ไม่! สมูทตี้ของคุณ\n[กำลังรู้สึกเศร้ามาก###Font=KanitLight,Size=36]	哎呀！您的冰沙\n[好像犹豫不决了。###Font=KanitMedium,Size=36]			ဝမ်းနည်းပါတယ်။ သင့်စမူသီသည်\n[ကြိတ်ခြင်းမှ ရပ်နေပါပြီ။###Font=KanitBold,Size=36]
-
+002406		You didn’t complete the transaction\n[within 120 seconds. Please try again###Font=KanitLight,Size=36]	คุณพลาดการทำรายการภายใน 120 วินาที\n[กรุณาลองทำรายการใหม่อีกครั้ง###Font=KanitLight,Size=36]	您在 120 秒内\n[未完成交易。请再试一次。###Font=KanitLight,Size=36]			သင်ငွေပေးချေမှုကို ၁၂၀စက္ကန့်အတွင်း\n[မပြီးမြောက်နိုင်ခဲ့ပါ။ ကျေးဇူးပြု၍ ပြန်လည်ကြိုးစားပါ။###Font=KanitLight,Size=36]
-
+		Font=Kanit,Type=Medium,Size=48,Color=0xEE8C62,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0xEE8C62,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0xEE8C62,Align=Center		Font=Kanit,Type=Medium,Size=48,Color=0xEE8C62,Align=Center	Font=Kanit,Type=Medium,Size=48,Color=0xEE8C62,Align=Center
-
+002407		Are you sure you\n[want to cancel?###Font=KanitLight,Size=36]	คุณแน่ใจหรือว่าต้องการ\n[ยกเลิกออเดอร์จริงๆ###Font=KanitLight,Size=36]	您确定要\n[取消吗？###Font=KanitLight,Size=36]			မင်းဖျက်ချင်တာ\n[သေချာပြီလား?###Font=KanitLight,Size=36]
+002408		Session expired	หมดเวลาทำรายการ	操作超时			ငွေပေးချေမှုအချိန်လွန်သွားပါပြီ
 
 
 
@@ -1242,7 +1255,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,158 @@
+<Popup>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Volume> SoundVolume </Volume>
+
+    <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/dummy_layout_promotion.py

@@ -281,6 +281,38 @@ else:
 		file_xml4.write( content_data)
 		file_xml4.close()
 
+	if "catalog_other_pro" in param:
+		with open(directory_to_process + "/page_catalog_group_other_other.xml", 'r') as otherCatalogFile:
+
+			otherCatalogConent = otherCatalogFile.read()
+
+			file_inc2 = open(directory_to_process + "/event/promotion_template_other_catalog.inc", 'r')
+			file_inc2_content = file_inc2.read()
+			file_inc2.close()
+
+			content_data = otherCatalogConent.replace(";BigLogoLayout", file_inc2_content)
+			content_data = content_data.replace("<Max> 16 </Max>", '<Max> 12 </Max>')
+			content_data = content_data.replace(";layout_mode", '<Mode> "EnableAdjust" </Mode>')
+			content_data = content_data.replace(";banner_shifting",
+			'''Var ColumnOverride[0] = 2
+		Var ColumnOverride[1] = 2
+		Var ColumnOverride[2] = 4
+		Var ColumnOverride[3] = 4
+		Var ColumnOverride[4] = 4
+		Var ColumnGravity[0] = 3
+		Var ColumnGravity[1] = 3
+			''')
+
+			file_xml3_out = open(directory_to_process + "/event/out_put_file_other_catalog.txt", 'r')
+			file_xml3_out_content = file_xml3_out.read()
+			file_xml3_out_content = file_xml3_out_content.strip()
+			file_xml3_out_content = file_xml3_out_content.replace("\r", "")
+			file_xml3_out_content = file_xml3_out_content.replace("\n", "")
+
+			with open(directory_to_process + file_xml3_out_content, 'w') as outputFile:
+				outputFile.write(content_data)
+
+
 	if "multi_promotion" in param:
 		files = os.listdir(directory_to_process + "/event/")
 		files = [f for f in files if f.startswith("multi_promotion_config")]

xml/event/out_put_file_other_catalog.txt

@@ -0,0 +1 @@
+/event/promotion_boost_energy.xml

xml/event/promotion_template_other_catalog.inc

@@ -0,0 +1,15 @@
+<Button>
+    <X> 42 </X>
+    <Y> 518 </Y>
+
+<State> BigButtonEnable </State>
+    <Filename> "ROOT/taobin_project/image/event/boost_energy/boost_energy.png" </Filename>
+    <FilenamePress> "ROOT/taobin_project/image/event/boost_energy/boost_energy.png" </FilenamePress>
+    <FilenameDisable> "ROOT/taobin_project/image/event/boost_energy/boost_energy.png" </FilenameDisable>
+<EventOnClick>
+
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_boost_energy.xml"
+
+</EventOnClick>
+
+</Button>

xml/event/tricker.ev

@@ -80,6 +80,9 @@ Var PepsiXTaobinPro = 0
 ; 3 dialects sound campaign, 1 Apr - 30 Apr
 Var SongkranSoundCampaign = 0
 
+; Boost Energy drink, 1 - 11 May
+Var BoostEnergyPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0
 
@@ -128,6 +131,11 @@ If SystemDateMonthInt = 3 Then
 	EndIf
 EndIf
 
+If SystemDateMonthInt = 5 Then
+    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_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
@@ -5657,8 +5659,8 @@ Espresso" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Opus One  Espresso"
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต  Opus One"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
-		Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
+		Var DrinkDescription = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_opus_one.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0049.Price
@@ -5740,7 +5742,7 @@ Opus One" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" </Value>
+	<Value> "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -5762,7 +5764,7 @@ Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." </Value>
+	<Value> "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -7208,8 +7210,8 @@ Espresso" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Geisha Espresso"
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต  Geisha"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
-		Var DrinkDescription = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
+		Var DrinkDescription = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0036.Price
@@ -7291,7 +7293,7 @@ Geisha" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
+	<Value> "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -7312,7 +7314,7 @@ Geisha" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin" </Value>
+	<Value> "Light Roast (Natural Process) White flower/Blood orange/Grape fruit" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -9255,8 +9257,8 @@ Americano" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Opus One  Americano"
 		Var NameDrinkTH = "อเมริกาโน  Opus One"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
-		Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
+		Var DrinkDescription = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_opus_one.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0050.Price
@@ -9338,7 +9340,7 @@ Opus One" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" </Value>
+	<Value> "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -9360,7 +9362,7 @@ Americano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." </Value>
+	<Value> "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -10806,8 +10808,8 @@ Americano" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Geisha   Americano"
 		Var NameDrinkTH = "อเมริกาโน  Geisha"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
-		Var DrinkDescription = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
+		Var DrinkDescription = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0035.Price
@@ -10889,7 +10891,7 @@ Geisha" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
+	<Value> "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10911,7 +10913,7 @@ Americano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin" </Value>
+	<Value> "Light Roast (Natural Process) White flower/Blood orange/Grape fruit" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -12340,8 +12342,8 @@ Almost Dirty" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Opus One   Almost Dirty"
 		Var NameDrinkTH = "Opus One   Almost Dirty"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
-		Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
+		Var DrinkDescription = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_opus_one.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -12423,7 +12425,7 @@ Almost Dirty" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" </Value>
+	<Value> "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -12445,7 +12447,7 @@ Almost Dirty" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." </Value>
+	<Value> "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -13867,8 +13869,8 @@ Almost Dirty" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Geisha  Almost Dirty"
 		Var NameDrinkTH = "Geisha  Almost Dirty"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
-		Var DrinkDescription = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
+		Var DrinkDescription = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -13950,7 +13952,7 @@ Almost Dirty" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
+	<Value> "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -13972,7 +13974,7 @@ Almost Dirty" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin" </Value>
+	<Value> "Light Roast (Natural Process) White flower/Blood orange/Grape fruit" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

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.xml

@@ -34,9 +34,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 100

xml/page_catalog_group_other_other.skt

@@ -11,6 +11,11 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
+	
+	If BoostEnergyPro = 1 Then
+	   Open "ROOT/taobin_project/xml/event/promotion_boost_energy.xml"
+	EndIf
+	
 	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
     ; soda and other
     Var Menu62Selected = "PressForever"
@@ -36,5 +41,6 @@
     #include=menu_new_layout_gen.py
 ?>
 
+;BigLogoLayout
 
 </Popup>

xml/page_catalog_group_other_other.xml

@@ -8,6 +8,11 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
+	
+	If BoostEnergyPro = 1 Then
+	   Open "ROOT/taobin_project/xml/event/promotion_boost_energy.xml"
+	EndIf
+	
 	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
     ; soda and other
     Var Menu62Selected = "PressForever"
@@ -34,9 +39,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 +16968,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_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_recommend.xml

@@ -13266,8 +13266,8 @@ Americano" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Geisha   Americano"
 		Var NameDrinkTH = "อเมริกาโน  Geisha"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
-		Var DrinkDescription = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
+		Var DrinkDescription = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0035.Price
@@ -13349,7 +13349,7 @@ Geisha" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
+	<Value> "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -13371,7 +13371,7 @@ Americano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin" </Value>
+	<Value> "Light Roast (Natural Process) White flower/Blood orange/Grape fruit" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -14298,8 +14298,8 @@ Americano" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Opus One  Americano"
 		Var NameDrinkTH = "อเมริกาโน  Opus One"
-		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
-		Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
+		Var DrinkDescription = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_opus_one.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0050.Price
@@ -14381,7 +14381,7 @@ Opus One" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" </Value>
+	<Value> "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -14403,7 +14403,7 @@ Americano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." </Value>
+	<Value> "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

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,9 @@
+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
+		Open "ROOT/taobin_project/xml/event/boost_energy/page_got_discount_code.xml"
+	EndIf
+EndIf
+
+Open "ROOT/taobin_project/xml/page_lid_straw.xml"