diff --git a/adv/sync_1.file b/adv/sync_1.file index 71e9ca2a..98590a5a 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,8 +1,8 @@ -total 131968 --rw-rw---- 1 root sdcard_rw 0 2025-06-12 15:11 sync_1.file +total 133608 +-rw-rw---- 1 root sdcard_rw 0 2025-06-20 21:26 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4 --rw-rw---- 1 root sdcard_rw 7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4 +-rw-rw---- 1 root sdcard_rw 9129355 2025-06-18 11:18 taobin_adv_menu_01.mp4 -rw-rw---- 1 root sdcard_rw 7570852 2025-05-16 09:08 taobin_adv_menu_02.mp4 -rw-rw---- 1 root sdcard_rw 11272524 2025-06-12 15:08 taobin_adv_menu_03.mp4 -rw-rw---- 1 root sdcard_rw 1209432 1980-01-01 00:00 taobin_adv_menu_04.mp4 @@ -17,7 +17,7 @@ total 131968 -rw-rw---- 1 root sdcard_rw 258907 2023-09-18 18:44 taobin_adv_menu_13.mp4 -rw-rw---- 1 root sdcard_rw 3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4 -rw-rw---- 1 root sdcard_rw 3178714 1980-01-01 00:00 taobin_adv_menu_15.mp4 --rw-rw---- 1 root sdcard_rw 8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4 +-rw-rw---- 1 root sdcard_rw 8649951 2025-06-23 15:01 taobin_adv_menu_16.mp4 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4 diff --git a/adv/taobin_adv_menu_16.mp4 b/adv/taobin_adv_menu_16.mp4 index dd8d914b..eb515ed1 100644 Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ diff --git a/image/event/americano/americano_banner.mp4 b/image/event/americano/americano_banner.mp4 new file mode 100755 index 00000000..a50b0978 Binary files /dev/null and b/image/event/americano/americano_banner.mp4 differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_extra_m.png b/image/page_drink_disable_n2/bn_iced_pepsi_extra_m.png new file mode 100644 index 00000000..f1eee52c Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_extra_m.png differ diff --git a/image/page_drink_n/bn_iced_pepsi_extra_m.png b/image/page_drink_n/bn_iced_pepsi_extra_m.png new file mode 100644 index 00000000..0842d824 Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_extra_m.png differ diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_extra_m.png b/image/page_drink_picture2_n/bn_iced_pepsi_extra_m.png new file mode 100644 index 00000000..fe1536da Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_extra_m.png differ diff --git a/image/page_drink_press_n/bn_iced_pepsi_extra_m.png b/image/page_drink_press_n/bn_iced_pepsi_extra_m.png new file mode 100644 index 00000000..736e7bfd Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_extra_m.png differ diff --git a/inter/tha/animation01/play_list.tsv b/inter/tha/animation01/play_list.tsv index fd4ee1a6..0c71620c 100644 --- a/inter/tha/animation01/play_list.tsv +++ b/inter/tha/animation01/play_list.tsv @@ -1208,6 +1208,8 @@ Strawberry milk 7Up lime top ovaltine 12-03-03-0083 1 18 19 17 23 41 51 24 13 PEPSI EXTRA 12-05-02-0133 1 23 14 24 100 6:40 32 PEPSI EXTRA 12-05-03-0133 1 23 14 41 24 100 6:40 32 +PEPSI EXTRA 12-05-02-0160 1 23 14 24 100 6:40 32 +PEPSI EXTRA 12-05-03-0160 1 23 14 41 24 100 6:40 32 เพียงพบสบตารัก 12-03-03-0100 1 19 12 15 51 17 23 41 24 100 6:40 32 วิวาห์หวาน 12-03-03-0101 1 12 51 17 23 41 24 100 6:40 32 ดั่งรักนิรันด์ 12-03-03-0102 1 19 12 51 23 41 24 100 6:40 32 diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index 241dbb44..f3228a8c 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -125,6 +125,8 @@ Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=24,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 000092 Only smoothie\n avalible สำหรับเมนูปั่น 仅提供冰沙 Only smoothie\n avalible smoothie\n တစ်မျိုးတည်းသာ ရနိုင်သည်။ 000093 Extra shot unavalible for\nsmoothie ไม่สามารถเพิ่มช็อต\nถ้าสั่งเมนูปั่น \冰沙无法额外拍摄 Extra shot unavalible for\nsmoothie Smoothie အတွက်\nအပိုရိုက်ချက် မရနိုင်ပါ။ + Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 + Text topping extra Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=30,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=30,Color=0x513C2F,LineHeight=46 @@ -453,7 +455,7 @@ 800026 Do you cut-off cash box? ทำการตัดยอดหรือไม่? 你切断收银箱吗？ Do you cut-off cash box? 800027 Please Open door cash box กรุณาเปิดประตูเก็บเงินก่อน 请打开收银箱门 Please Open door cash box 800028 Internal Communcation fail. ระบบสื่อสารมีปัญหาภายในตู้ 内部通信失败。 Internal Communcation fail. -800029 ENG ไทย 中文 日本語 +800029 Next ถัดไป ICE system @@ -1691,6 +1693,7 @@ 2100564 Gen 3.2 รุ่น 3.2 2100565 Gen 3.1 รุ่น 3.1 2100566 Gen 3.X รุ่น 3.X +2100567 Gen 4.X รุ่น 4.X 2100600 Use เปิดใช้งาน 2100601 Ignore ปิดใช้งาน @@ -1903,27 +1906,27 @@ 3000919 Do you want to clear all data? ต้องการลบข้อมูลทั้งหมดหรือไม่ Summary -3001000 เหรียญ 1 ทอนปัจจุบัน = -3001000 เหรียญ 2 ทอนปัจจุบัน = -3001000 เหรียญ 5 ทอนปัจจุบัน = -3001000 เหรียญ 10 ทอนปัจจุบัน = -3001000 Reset All Reset All / เริ่มนับใหม่ - - - - - - - - - - - - - - +3001001 เหรียญ 1 ทอนปัจจุบัน = +3001002 เหรียญ 2 ทอนปัจจุบัน = +3001003 เหรียญ 5 ทอนปัจจุบัน = +3001004 เหรียญ 10 ทอนปัจจุบัน = +3001005 Reset All Reset All / เริ่มนับใหม่ + Ingredient management +3001050 Add เพิ่ม +3001051 Filter ตัวกรอง +3001052 Status สถานะ +3001053 Bean เมล็ด +3001054 Leaves ใบ +3001055 Powder ผง +3001056 Soda โซดา +3001057 Syrup ไซรัป +3001058 Type ประเภท +3001059 Cup แก้ว +3001060 Lid ฝา +3001061 Straw หลอด +3001062 Whipper หัวชง diff --git a/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json b/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json index c4225431..e8d3c165 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json +++ b/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json @@ -2,8 +2,8 @@ "start": "2025-07-01T00:00:00", "end": "2025-07-31T00:00:00", "state": "AmericanoProState", - "type": "IMAGE", - "media_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "media_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", + "type": "VIDEO", + "media_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "media_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml\"" } diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml index 238ca8f7..95d4394c 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml @@ -110,13 +110,13 @@ AmericanoProState - IMAGE + VIDEO eval( If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png" + Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4" Else - Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png" + Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4" EndIf ) diff --git a/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml index 860cbb7b..41c73f9c 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml +++ b/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml @@ -357,6 +357,234 @@ + + + + ; ==================> Len = 3 + ; - 12-05-02-0160 12-05-03-0160 + + Flag( 12-05-02-0160.Button,12-05-03-0160.Button,DateTimeStart="2025/01/01T00:00:00",$Sum12050201601205030160) + "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra_m.png" + "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_extra_m.png" + "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_extra_m.png" + + + Pepsi Extra + เป๊ปซี่ (เพิ่มปริมาณ) + - + - + - + - + + + + + Pepsi, Soda And Ice + เป๊ปซี่ โซดา และน้ำแข็ง + - + - + - + - + + + "Disable2" + $12-05-02-0160.Button + $12-05-03-0160.Button + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-05-02-0160.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-05-02-0160.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-05-03-0160.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-05-03-0160.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum12050201601205030160TextID + $Sum12050201601205030160TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_extra_m.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $12-05-02-0160.Price + Var PriceD3 = $12-05-03-0160.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0160" + Var PD_CODE3 = "12-05-03-0160" + ; begin lang + Var aliasName[0] = "Pepsi Extra" + Var aliasDesc[0] = "Pepsi, Soda And Ice" + 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] = "ICED Pepsi Extra" + Var NameLang[1][1] = "เป๊ปซี่ (เพิ่มปริมาณ)" + Var NameLang[1][2] = "-" + Var NameLang[1][3] = "-" + Var NameLang[1][4] = "-" + Var NameLang[1][5] = "-" + Var DescLang[1][0] = "Pepsi, Soda And Ice" + Var DescLang[1][1] = "เป๊ปซี่ โซดา และน้ำแข็ง" + Var DescLang[1][2] = "-" + Var DescLang[1][3] = "-" + Var DescLang[1][4] = "-" + Var DescLang[1][5] = "-" + Var NameLang[2][0] = "Pepsi Extra 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] = "Pepsi, Soda And Ice" + 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 = $12-05-02-0160.Button + Var PD_STAGE_3 = $12-05-03-0160.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 + ; default topping 3 + If PD_STAGE_3 = "Enable" Then + Topping "Load" "12-05-03-0160" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "12-05-02-0160" + Else + Topping "Load" "-" + 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_other_other.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 + + + diff --git a/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev b/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev index bdd4ddc5..d2271294 100644 --- a/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev +++ b/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev @@ -27,6 +27,7 @@ Var AppleFarmFestivalProState = "Invisible" Var HappyTriosProState = "Invisible" Var SchoolOvaltineProState = "Invisible" Var TaiwaneseTeaProState = "Invisible" +Var AmericanoProState = "Invisible" If MatchaEveryDayPro = 1 Then Var MatchaEveryDayProState = "Enable" @@ -52,6 +53,11 @@ If TaiwaneseTeaPro = 1 Then Var TaiwaneseTeaProState = "Enable" EndIf + +If AmericanoPro = 1 Then + Var AmericanoProState = "Enable" +EndIf + DEBUGVAR SchoolOvaltineProState DEBUGVAR HappyTriosProState DEBUGVAR AppleFarmFestivalProState diff --git a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml b/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml index d4a04699..ddb0052d 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml @@ -357,6 +357,234 @@ + + + + ; ==================> Len = 3 + ; - 12-05-02-0160 12-05-03-0160 + + Flag( 12-05-02-0160.Button,12-05-03-0160.Button,DateTimeStart="2025/01/01T00:00:00",$Sum12050201601205030160) + "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra_m.png" + "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_extra_m.png" + "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_extra_m.png" + + + Pepsi Extra + เป๊ปซี่ (เพิ่มปริมาณ) + - + - + - + - + + + + + Pepsi, Soda And Ice + เป๊ปซี่ โซดา และน้ำแข็ง + - + - + - + - + + + "Disable2" + $12-05-02-0160.Button + $12-05-03-0160.Button + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-05-02-0160.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-05-02-0160.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-05-03-0160.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-05-03-0160.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum12050201601205030160TextID + $Sum12050201601205030160TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_extra_m.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $12-05-02-0160.Price + Var PriceD3 = $12-05-03-0160.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0160" + Var PD_CODE3 = "12-05-03-0160" + ; begin lang + Var aliasName[0] = "Pepsi Extra" + Var aliasDesc[0] = "Pepsi, Soda And Ice" + 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] = "ICED Pepsi Extra" + Var NameLang[1][1] = "เป๊ปซี่ (เพิ่มปริมาณ)" + Var NameLang[1][2] = "-" + Var NameLang[1][3] = "-" + Var NameLang[1][4] = "-" + Var NameLang[1][5] = "-" + Var DescLang[1][0] = "Pepsi, Soda And Ice" + Var DescLang[1][1] = "เป๊ปซี่ โซดา และน้ำแข็ง" + Var DescLang[1][2] = "-" + Var DescLang[1][3] = "-" + Var DescLang[1][4] = "-" + Var DescLang[1][5] = "-" + Var NameLang[2][0] = "Pepsi Extra 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] = "Pepsi, Soda And Ice" + 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 = $12-05-02-0160.Button + Var PD_STAGE_3 = $12-05-03-0160.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 + ; default topping 3 + If PD_STAGE_3 = "Enable" Then + Topping "Load" "12-05-03-0160" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "12-05-02-0160" + Else + Topping "Load" "-" + 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_other_other.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 + + + diff --git a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml index e85ec4e1..9968eee1 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml @@ -578,6 +578,234 @@ + + + + ; ==================> Len = 3 + ; - 12-05-02-0160 12-05-03-0160 + + Flag( 12-05-02-0160.Button,12-05-03-0160.Button,DateTimeStart="2025/01/01T00:00:00",$Sum12050201601205030160) + "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra_m.png" + "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_extra_m.png" + "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_extra_m.png" + + + Pepsi Extra + เป๊ปซี่ (เพิ่มปริมาณ) + - + - + - + - + + + + + Pepsi, Soda And Ice + เป๊ปซี่ โซดา และน้ำแข็ง + - + - + - + - + + + "Disable2" + $12-05-02-0160.Button + $12-05-03-0160.Button + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-05-02-0160.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-05-02-0160.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-05-03-0160.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-05-03-0160.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum12050201601205030160TextID + $Sum12050201601205030160TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_extra_m.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $12-05-02-0160.Price + Var PriceD3 = $12-05-03-0160.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0160" + Var PD_CODE3 = "12-05-03-0160" + ; begin lang + Var aliasName[0] = "Pepsi Extra" + Var aliasDesc[0] = "Pepsi, Soda And Ice" + 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] = "ICED Pepsi Extra" + Var NameLang[1][1] = "เป๊ปซี่ (เพิ่มปริมาณ)" + Var NameLang[1][2] = "-" + Var NameLang[1][3] = "-" + Var NameLang[1][4] = "-" + Var NameLang[1][5] = "-" + Var DescLang[1][0] = "Pepsi, Soda And Ice" + Var DescLang[1][1] = "เป๊ปซี่ โซดา และน้ำแข็ง" + Var DescLang[1][2] = "-" + Var DescLang[1][3] = "-" + Var DescLang[1][4] = "-" + Var DescLang[1][5] = "-" + Var NameLang[2][0] = "Pepsi Extra 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] = "Pepsi, Soda And Ice" + 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 = $12-05-02-0160.Button + Var PD_STAGE_3 = $12-05-03-0160.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 + ; default topping 3 + If PD_STAGE_3 = "Enable" Then + Topping "Load" "12-05-03-0160" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "12-05-02-0160" + Else + Topping "Load" "-" + 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_pepsi_7up.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 + + + diff --git a/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml b/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml index 618edf37..ab659fb2 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml @@ -83,7 +83,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_Banner.png" - Solar God’s Explosion + Solar God’s\nExplosion (Americano) ระเบิดเทพสุริยัน - - @@ -94,7 +94,7 @@ Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ\n(อเมริกาโน) - - - @@ -182,10 +182,10 @@ Var PD_CODE2 = "12-01-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Solar God’s Explosion" + Var aliasName[0] = "Solar God’s\nExplosion (Americano)" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "ระเบิดเทพสุริยัน" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ\n(อเมริกาโน)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -311,7 +311,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_Banner.png" - Solar God’s Explosion + Solar God’s\nExplosion (Americano) ระเบิดเทพสุริยัน - - @@ -322,7 +322,7 @@ Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ\n(อเมริกาโน) - - - @@ -410,10 +410,10 @@ Var PD_CODE2 = "12-21-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Solar God’s Explosion" + Var aliasName[0] = "Solar God’s\nExplosion (Americano)" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "ระเบิดเทพสุริยัน" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ\n(อเมริกาโน)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -1907,7 +1907,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_coconut_america_no.png" - Tamed Monkey’s Secret + Tamed Monkey’s\nSecret วานรสอนง่าย - - @@ -2006,7 +2006,7 @@ Var PD_CODE2 = "12-01-02-0068" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Tamed Monkey’s Secret" + Var aliasName[0] = "Tamed Monkey’s\nSecret" Var aliasDesc[0] = "Espresso, Coconut,\nSugar, Water" Var aliasName[1] = "วานรสอนง่าย" Var aliasDesc[1] = "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว" @@ -2135,7 +2135,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_coconut_america_no.png" - Tamed Monkey’s Secret + Tamed Monkey’s\nSecret วานรสอนง่าย - - @@ -2234,7 +2234,7 @@ Var PD_CODE2 = "12-21-02-0068" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Tamed Monkey’s Secret" + Var aliasName[0] = "Tamed Monkey’s\nSecret" Var aliasDesc[0] = "Espresso, Coconut,\nSugar, Water" Var aliasName[1] = "วานรสอนง่าย" Var aliasDesc[1] = "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว" @@ -2363,7 +2363,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_jemila.png" - Sita’s Hundred Punches + Sita’s Hundred\nPunches สีดาร้อยหมัด - - @@ -2462,7 +2462,7 @@ Var PD_CODE2 = "12-01-02-0075" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Sita’s Hundred Punches" + Var aliasName[0] = "Sita’s Hundred\nPunches" Var aliasDesc[0] = "Jemila, Espresso And Ice" Var aliasName[1] = "สีดาร้อยหมัด" Var aliasDesc[1] = "เจมิลา กาแฟ และน้ำแข็ง" @@ -2591,7 +2591,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_jemila.png" - Sita’s Hundred Punches + Sita’s Hundred\nPunches สีดาร้อยหมัด - - @@ -2690,7 +2690,7 @@ Var PD_CODE2 = "12-21-02-0075" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Sita’s Hundred Punches" + Var aliasName[0] = "Sita’s Hundred\nPunches" Var aliasDesc[0] = "Jemila, Espresso And Ice" Var aliasName[1] = "สีดาร้อยหมัด" Var aliasDesc[1] = "เจมิลา กาแฟ และน้ำแข็ง" @@ -2819,7 +2819,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_blackcoffee_Banner.png" - Lion’s Mountain Slayer + Lion’s Mountain\nSlayer (Black Coffee) สิงหลโค่นภูผา - - @@ -2830,7 +2830,7 @@ Dark shot Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ (กาแฟดำ) - - - @@ -2918,10 +2918,10 @@ Var PD_CODE2 = "12-01-02-0081" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Lion’s Mountain Slayer" + Var aliasName[0] = "Lion’s Mountain\nSlayer (Black Coffee)" Var aliasDesc[0] = "Dark shot Espresso, Water" Var aliasName[1] = "สิงหลโค่นภูผา" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ (กาแฟดำ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3047,7 +3047,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_blackcoffee_Banner.png" - Lion’s Mountain Slayer + Lion’s Mountain\nSlayer (Black Coffee) สิงหลโค่นภูผา - - @@ -3058,7 +3058,7 @@ Dark shot Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ (กาแฟดำ) - - - @@ -3146,10 +3146,10 @@ Var PD_CODE2 = "12-21-02-0081" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Lion’s Mountain Slayer" + Var aliasName[0] = "Lion’s Mountain\nSlayer (Black Coffee)" Var aliasDesc[0] = "Dark shot Espresso, Water" Var aliasName[1] = "สิงหลโค่นภูผา" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ (กาแฟดำ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3275,7 +3275,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Americano_Banner.png" - 100 Hp Snow White + 100 Hp Snow White\n(Apple Americano) สโนไวท์ร้อยแรงม้า - - @@ -3286,7 +3286,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล) - - - @@ -3374,10 +3374,10 @@ Var PD_CODE2 = "12-01-02-0088" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "100 Hp Snow White" + Var aliasName[0] = "100 Hp Snow White\n(Apple Americano)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "สโนไวท์ร้อยแรงม้า" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3503,7 +3503,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Americano_Banner.png" - 100 Hp Snow White + 100 Hp Snow White\n(Apple Americano) สโนไวท์ร้อยแรงม้า - - @@ -3514,7 +3514,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล) - - - @@ -3602,10 +3602,10 @@ Var PD_CODE2 = "12-21-02-0088" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "100 Hp Snow White" + Var aliasName[0] = "100 Hp Snow White\n(Apple Americano)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "สโนไวท์ร้อยแรงม้า" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3731,7 +3731,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Frop_Longback_Banner.png" - Firestorm of Colors + Firestorm of Colors\n(Apple Frop Longback) อัคคาสาดสี - - @@ -3742,7 +3742,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ) - - - @@ -3830,10 +3830,10 @@ Var PD_CODE2 = "12-01-02-0091" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Firestorm of Colors" + Var aliasName[0] = "Firestorm of Colors\n(Apple Frop Longback)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "อัคคาสาดสี" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3959,7 +3959,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Frop_Longback_Banner.png" - Firestorm of Colors + Firestorm of Colors\n(Apple Frop Longback) อัคคาสาดสี - - @@ -3970,7 +3970,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ) - - - @@ -4058,10 +4058,10 @@ Var PD_CODE2 = "12-21-02-0091" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Firestorm of Colors" + Var aliasName[0] = "Firestorm of Colors\n(Apple Frop Longback)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "อัคคาสาดสี" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -5099,7 +5099,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_america_no.png" - Sweet-Toothed Hermit + Sweet-Toothed\nHermit ฤๅษีติดหวาน - - @@ -5198,7 +5198,7 @@ Var PD_CODE2 = "12-01-02-0095" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Sweet-Toothed Hermit" + Var aliasName[0] = "Sweet-Toothed\nHermit" Var aliasDesc[0] = "Coffee, Water, and Caramel" Var aliasName[1] = "ฤๅษีติดหวาน" Var aliasDesc[1] = "กาแฟ น้ำ และ คาราเมล" @@ -5327,7 +5327,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_america_no.png" - Sweet-Toothed Hermit + Sweet-Toothed\nHermit ฤๅษีติดหวาน - - @@ -5426,7 +5426,7 @@ Var PD_CODE2 = "12-21-02-0095" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Sweet-Toothed Hermit" + Var aliasName[0] = "Sweet-Toothed\nHermit" Var aliasDesc[0] = "Coffee, Water, and Caramel" Var aliasName[1] = "ฤๅษีติดหวาน" Var aliasDesc[1] = "กาแฟ น้ำ และ คาราเมล" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml index 794dad07..0100c28b 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml @@ -5416,6 +5416,234 @@ + + + + ; ==================> Len = 3 + ; 12-02-01-0011 12-02-02-0011 12-02-03-0011 + + Flag( 12-02-01-0011.Button,12-02-02-0011.Button,12-02-03-0011.Button,$Sum120201001112020200111202030011) + "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_tea.png" + "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_tea.png" + "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_tea.png" + + + Matcha + ชาเขียวญี่ปุ่น + 抹茶 + - + - + ဂျပန်လက်ဖက်စိမ်း + + + + + Matcha & Water + ชาเขียว และน้ำ + 抹茶、水 + - + - + ဂျပန်လက်ဖက်စိမ်း ‌သောက်ရေ + + + $12-02-01-0011.Button + $12-02-02-0011.Button + $12-02-03-0011.Button + eval( + If $12-02-01-0011.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-02-01-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-02-02-0011.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-02-02-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $12-02-03-0011.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $12-02-03-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum120201001112020200111202030011TextID + $Sum120201001112020200111202030011TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_tea.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $12-02-01-0011.Price + Var PriceD2 = $12-02-02-0011.Price + Var PriceD3 = $12-02-03-0011.Price + Var PD_CODE1 = "12-02-01-0011" + Var PD_CODE2 = "12-02-02-0011" + Var PD_CODE3 = "12-02-03-0011" + ; begin lang + Var aliasName[0] = "Matcha" + Var aliasDesc[0] = "Matcha & Water " + 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] = "HOT Matcha" + Var NameLang[0][1] = "ชาเขียวญี่ปุ่น " + Var NameLang[0][2] = "热抹茶" + Var NameLang[0][3] = "-" + Var NameLang[0][4] = "-" + Var NameLang[0][5] = "ပူပြင်းသော Matcha" + Var DescLang[0][0] = "Matcha & Water " + Var DescLang[0][1] = "ชาเขียว และน้ำ" + Var DescLang[0][2] = "抹茶、热水" + Var DescLang[0][3] = "-" + Var DescLang[0][4] = "-" + Var DescLang[0][5] = "Matcha နှင့် ရေ" + Var NameLang[1][0] = "ICED Matcha" + Var NameLang[1][1] = "ชาเขียวญี่ปุ่น " + Var NameLang[1][2] = "热抹茶" + Var NameLang[1][3] = "-" + Var NameLang[1][4] = "-" + Var NameLang[1][5] = "ပူပြင်းသော Matcha" + Var DescLang[1][0] = "Matcha & Water " + Var DescLang[1][1] = "ชาเขียว และน้ำ" + Var DescLang[1][2] = "抹茶、热水" + Var DescLang[1][3] = "-" + Var DescLang[1][4] = "-" + Var DescLang[1][5] = "Matcha နှင့် ရေ" + Var NameLang[2][0] = "Matcha SMOOTHIE" + Var NameLang[2][1] = "ชาเขียวญี่ปุ่น " + Var NameLang[2][2] = "热抹茶" + Var NameLang[2][3] = "-" + Var NameLang[2][4] = "-" + Var NameLang[2][5] = "ပူပြင်းသော Matcha" + Var DescLang[2][0] = "Matcha & Water " + Var DescLang[2][1] = "ชาเขียว และน้ำ" + Var DescLang[2][2] = "抹茶、热水" + Var DescLang[2][3] = "-" + Var DescLang[2][4] = "-" + Var DescLang[2][5] = "Matcha နှင့် ရေ" + ; end lang + Var PD_STAGE_1 = $12-02-01-0011.Button + Var PD_STAGE_2 = $12-02-02-0011.Button + Var PD_STAGE_3 = $12-02-03-0011.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 + ; default topping 3 + If PD_STAGE_3 = "Enable" Then + Topping "Load" "12-02-03-0011" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "12-02-02-0011" + Else + Topping "Load" "12-02-01-0011" + 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_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 + + + @@ -12028,234 +12256,6 @@ - - - - ; ==================> Len = 3 - ; 12-02-01-0011 12-02-02-0011 12-02-03-0011 - - Flag( 12-02-01-0011.Button,12-02-02-0011.Button,12-02-03-0011.Button,$Sum120201001112020200111202030011) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_tea.png" - - - Matcha - ชาเขียวญี่ปุ่น - 抹茶 - - - - - ဂျပန်လက်ဖက်စိမ်း - - - - - Matcha & Water - ชาเขียว และน้ำ - 抹茶、水 - - - - - ဂျပန်လက်ဖက်စိမ်း ‌သောက်ရေ - - - $12-02-01-0011.Button - $12-02-02-0011.Button - $12-02-03-0011.Button - eval( - If $12-02-01-0011.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $12-02-01-0011.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $12-02-02-0011.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $12-02-02-0011.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $12-02-03-0011.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $12-02-03-0011.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - - 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 - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - $Sum120201001112020200111202030011TextID - $Sum120201001112020200111202030011TextValue - - - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_tea.png" - GetInstanceIDMenuTab OpenFromInstMenuTab - Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $12-02-01-0011.Price - Var PriceD2 = $12-02-02-0011.Price - Var PriceD3 = $12-02-03-0011.Price - Var PD_CODE1 = "12-02-01-0011" - Var PD_CODE2 = "12-02-02-0011" - Var PD_CODE3 = "12-02-03-0011" - ; begin lang - Var aliasName[0] = "Matcha" - Var aliasDesc[0] = "Matcha & Water " - 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] = "HOT Matcha" - Var NameLang[0][1] = "ชาเขียวญี่ปุ่น " - Var NameLang[0][2] = "热抹茶" - Var NameLang[0][3] = "-" - Var NameLang[0][4] = "-" - Var NameLang[0][5] = "ပူပြင်းသော Matcha" - Var DescLang[0][0] = "Matcha & Water " - Var DescLang[0][1] = "ชาเขียว และน้ำ" - Var DescLang[0][2] = "抹茶、热水" - Var DescLang[0][3] = "-" - Var DescLang[0][4] = "-" - Var DescLang[0][5] = "Matcha နှင့် ရေ" - Var NameLang[1][0] = "ICED Matcha" - Var NameLang[1][1] = "ชาเขียวญี่ปุ่น " - Var NameLang[1][2] = "热抹茶" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" - Var NameLang[1][5] = "ပူပြင်းသော Matcha" - Var DescLang[1][0] = "Matcha & Water " - Var DescLang[1][1] = "ชาเขียว และน้ำ" - Var DescLang[1][2] = "抹茶、热水" - Var DescLang[1][3] = "-" - Var DescLang[1][4] = "-" - Var DescLang[1][5] = "Matcha နှင့် ရေ" - Var NameLang[2][0] = "Matcha SMOOTHIE" - Var NameLang[2][1] = "ชาเขียวญี่ปุ่น " - Var NameLang[2][2] = "热抹茶" - Var NameLang[2][3] = "-" - Var NameLang[2][4] = "-" - Var NameLang[2][5] = "ပူပြင်းသော Matcha" - Var DescLang[2][0] = "Matcha & Water " - Var DescLang[2][1] = "ชาเขียว และน้ำ" - Var DescLang[2][2] = "抹茶、热水" - Var DescLang[2][3] = "-" - Var DescLang[2][4] = "-" - Var DescLang[2][5] = "Matcha နှင့် ရေ" - ; end lang - Var PD_STAGE_1 = $12-02-01-0011.Button - Var PD_STAGE_2 = $12-02-02-0011.Button - Var PD_STAGE_3 = $12-02-03-0011.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 - ; default topping 3 - If PD_STAGE_3 = "Enable" Then - Topping "Load" "12-02-03-0011" - Else - If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-02-02-0011" - Else - Topping "Load" "12-02-01-0011" - 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_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 - - - diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 22d64650..6eb38adb 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -295,6 +295,7 @@ Name=Tea,file=page_catalog_group_tea.skt เพียวมัทฉะแอปเปิ้ล Apple Pure Matcha ชาเขียว แอปเปิ้ล Matcha Apple 12-02-01-0088 12-02-02-0088 12-02-03-0088 bn_Apple_Pure_matcha.png - - - posi1 - - - 3 มัทฉะลาเต้พรีเมียม Matcha Latte\nPremium มัทฉะ น้ำตาล นม Matcha, Sugar, Milk 12-02-01-0103 12-02-02-0103 12-02-03-0103 bn_Matcha_Latte_Premium.png - - - posi1 - - NewMatchaPremiumX3 - มัทฉะลาเต้ คูณ 3 Matcha Latte X3 มัทฉะ น้ำตาล นม Matcha, Sugar, Milk 12-02-01-0104 12-02-02-0104 12-02-03-0104 bn_Matcha_Latte_X3.png - - - posi1 - - NewMatchaPremiumX3 - + ชาเขียวญี่ปุ่น Matcha ชาเขียว และน้ำ Matcha & Water 12-02-01-0011 12-02-02-0011 12-02-03-0011 bn_hot_matcha_tea.png - - - posi1 - - - - #REF! #REF! #REF! #REF! #REF! เพียวมัทฉะคูณ 3 Pure Matcha X3 มัทฉะ น้ำเย็น Matcha Cold Water - 12-02-02-0099 - bn_Pure_Matcha_X3.png - - - posi1 2025/03/20T00:00:00 - - - ยูซุมัทฉะลาเต้ Yuzu Matcha Latte ยูซุ มัทฉะ นม Yuzu Matcha Milk 12-02-01-0097 12-02-02-0097 12-02-03-0097 bn_Matcha_Milk_Yuzu.png - - - posi1 2025/03/20T00:00:00 - - - ยูซุมัทฉะโซดา Yuzu Matcha Soda ยูซุ มัทฉะ มะนาว โซดา Yuzu Matcha Lime Soda - 12-02-02-0098 - bn_hot_yuzu_Matcha_tea.png - - - posi1 2025/03/20T00:00:00 - - - @@ -329,7 +330,6 @@ IGNORE เก็กฮวย Chrysanths Tea น้ำเก๊กฮวย น โฮจิฉะลาเต้ Hojicha Latte ชาเขียวคั่ว และ นม Hojicha and milk 12-02-01-0037 12-02-02-0037 12-02-03-0037 bn_hot_hojicha_milk_tea_sing.png - - - posi1 - - - - #REF! #REF! #REF! #REF! #REF! ชาเขียวญี่ปุ่น Matcha ชาเขียว และน้ำ Matcha & Water 12-02-01-0027 12-02-02-0027 12-02-03-0027 bn_hot_matcha_tea.png - - - posi1 - - - - #REF! #REF! #REF! #REF! #REF! ชาเขียวญี่ปุ่นมะนาว Matcha \nLimenade ชาเขียว มะนาว Matcha, Limenade, Water 12-02-01-0028 12-02-02-0028 12-02-03-0028 bn_hot_lime_Matcha.png - - - posi1 - - - - #REF! #REF! #REF! #REF! #REF! - ชาเขียวญี่ปุ่น Matcha ชาเขียว และน้ำ Matcha & Water 12-02-01-0011 12-02-02-0011 12-02-03-0011 bn_hot_matcha_tea.png - - - posi1 - - - - #REF! #REF! #REF! #REF! #REF! ชาเขียวญี่ปุ่นมะนาว Matcha \nLimenade ชาเขียว น้ำ มะนาว Matcha, Limenade, Water 12-02-01-0012 12-02-02-0012 12-02-03-0012 bn_hot_lime_Matcha.png - - - posi1 - - - - #REF! #REF! #REF! #REF! #REF! ชามะลิ Jasmine Tea ชามะลิ น้ำ Jasmine Tea ,Water 12-02-01-0045 12-02-02-0045 12-02-03-0046 bn_jasmine_tea.png - - - posi1 - - - - ชานมมะลิ Jasmine Milk Tea ชามะลิ และนม Jasmine Tea & Milk 12-02-01-0046 12-02-02-0046 12-02-03-0047 bn_jasmine_milk_tea.png - - - posi1 - - - - @@ -496,6 +496,8 @@ Name=pepsi-7up,file=page_catalog_group_pepsi_7up.skt เป๊ปซี่น้ำแข็ง Pepsi เป๊ปซี่ Pepsi & Ice - 12-05-02-0007 12-05-03-0007 bn_iced_pepsi.png - - - posi1 - - - - - #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! เป๊ปซี่ (เพิ่มปริมาณ) Pepsi Extra เป๊ปซี่ โซดา และน้ำแข็ง Pepsi, Soda And Ice - 12-05-02-0133 12-05-03-0133 bn_iced_pepsi_extra_catalog.png - - - posi1 2025/01/01T00:00:00 - - - + เป๊ปซี่ (เพิ่มปริมาณ) Pepsi Extra เป๊ปซี่ โซดา และน้ำแข็ง Pepsi, Soda And Ice - 12-05-02-0160 12-05-03-0160 bn_iced_pepsi_extra_m.png - - - posi1 2025/01/01T00:00:00 - - - + IGNORE - Pepsi Max - - - 12-05-02-0062 12-05-03-0062 - - - - posi1 - - - - เป๊ปซี่ยูซุ Pepsi Yuzu เป๊ปซี่ ยูซุ โซดา Pepsi Yuzu Soda - 12-05-02-0106 12-05-03-0106 bn_Pepsi_Yuzu.png - - - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro - เป๊ปซี่ลิ้นจี่ Pepsi Lychee เป๊ปซี่ โซดา ลิ้นจี่ Pepsi Lychee Soda - 12-05-02-0057 12-05-03-0057 bn_Pepsi_Lychee.png - - - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro - @@ -540,6 +542,7 @@ IGNORE - Pepsi Max - - - 12-05-02-0062 12-05-03-0062 - - - - posi1 - - - - Name=Other,file=page_catalog_group_other_other.skt เป๊ปซี่ (เพิ่มปริมาณ) Pepsi Extra เป๊ปซี่ โซดา และน้ำแข็ง Pepsi, Soda And Ice - 12-05-02-0133 12-05-03-0133 bn_iced_pepsi_extra_catalog.png - - - posi1 2025/01/01T00:00:00 - - - + เป๊ปซี่ (เพิ่มปริมาณ) Pepsi Extra เป๊ปซี่ โซดา และน้ำแข็ง Pepsi, Soda And Ice - 12-05-02-0160 12-05-03-0160 bn_iced_pepsi_extra_m.png - - - posi1 2025/01/01T00:00:00 - - - เต่าพลังโซดา\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 3 น้ำแอปเปิ้ล Apple Juice แอปเปิ้ล น้ำ Apple Water 12-05-01-0134 12-05-02-0134 12-05-03-0134 bn_Apple_Juice.png - - - posi1 2025/06/01T00:00:00 - - 3 แอปเปิ้ลโซดา Apple Soda แอปเปิ้ล โซดา Apple Soda - 12-05-02-0135 12-05-03-0135 bn_Apple_Soda.png - - - posi1 2025/06/01T00:00:00 - - 3 @@ -1408,15 +1411,15 @@ Name=TaiwaneseTea,file=page_catalog_group_pro_taiwanese_tea.skt ชาไต้หวันสละ Taiwanese\nSalak Tea ชาไต้หวัน สละ น้ำตาล Taiwanese Tea Salak Sugar 12-02-01-0118 12-02-02-0118 - bn_Taiwanese_Tea_Salak.png - - - posi1 - - - - Name=AmericanoPro,file=page_catalog_group_pro_americano.skt - ระเบิดเทพสุริยัน Solar God’s\nExplosion กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no_Banner.png 12-21-01-0003 12-21-02-0001 - posi1 - - - - + ระเบิดเทพสุริยัน Solar God’s\nExplosion (Americano) กาแฟ และน้ำ\n(อเมริกาโน) Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no_Banner.png 12-21-01-0003 12-21-02-0001 - posi1 - - - - สะท้านพิภพ Groundbreaking กาแฟ น้ำ และ ลิ้นจี่ Espresso, Lychee,\nSugar, Water 12-01-01-0017 12-01-02-0017 - bn_hot_lychee_america_no.png 12-21-01-0017 12-21-02-0017 - posi1 - - - - อัศจรรย์ยันหว่าง Miracle of Midday กาแฟ น้ำ และ ยูซุ Espresso, Yuzu,\nSugar, Water 12-01-01-0040 12-01-02-0040 - bn_hot_yuzu_america_no.png 12-21-01-0040 12-21-02-0040 - posi1 - - - - พระรามแปรงฟัน Rama’s Morning Mint กาแฟ น้ำ และ มินต์ Espresso, Mint,\nSugar, Water 12-01-01-0058 12-01-02-0058 - bn_Mint_Americano.png 12-21-01-0058 12-21-02-0058 - posi1 - - - - วานรสอนง่าย Tamed Monkey’s\nSecret กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว Espresso, Coconut,\nSugar, Water 12-01-01-0068 12-01-02-0068 - bn_hot_coconut_america_no.png 12-21-01-0068 12-21-02-0068 - posi1 - - - - สีดาร้อยหมัด Sita’s Hundred\nPunches เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso And Ice - 12-01-02-0075 - bn_hot_america_no_jemila.png - 12-21-02-0075 - posi1 - - - - - สิงหลโค่นภูผา Lion’s Mountain\nSlayer กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee_Banner.png 12-21-01-0081 12-21-02-0081 - posi1 - - - - - สโนไวท์ร้อยแรงม้า 100 Hp Snow White กาแฟ แอปเปิ้ล Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano_Banner.png 12-21-01-0088 12-21-02-0088 - posi1 - - - - - อัคคาสาดสี Firestorm of Colors กาแฟ แอปเปิ้ล Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback_Banner.png - 12-21-02-0091 - posi1 - - - - + สิงหลโค่นภูผา Lion’s Mountain\nSlayer (Black Coffee) กาแฟ และน้ำ (กาแฟดำ) Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee_Banner.png 12-21-01-0081 12-21-02-0081 - posi1 - - - - + สโนไวท์ร้อยแรงม้า 100 Hp Snow White\n(Apple Americano) กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล) Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano_Banner.png 12-21-01-0088 12-21-02-0088 - posi1 - - - - + อัคคาสาดสี Firestorm of Colors\n(Apple Frop Longback) กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ) Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback_Banner.png - 12-21-02-0091 - posi1 - - - - ราตรีนี้ระเริง Let's party tonight! กาแฟ น้ำ และ สตรอเบอรี Coffee, Water, and Strawberry 12-01-01-0093 12-01-02-0093 - bn_hot_strawberry_america_no.png 12-21-01-0093 12-21-02-0093 - posi1 - - - - กัศยปคชสาร Kashyapa's Elephant กาแฟ น้ำ และ สละ Coffee, Water, and Salak 12-01-01-0094 12-01-02-0094 - bn_hot_salak_america_no.png 12-21-01-0094 12-21-02-0094 - posi1 - - - - ฤๅษีติดหวาน Sweet-Toothed\nHermit กาแฟ น้ำ และ คาราเมล Coffee, Water, and Caramel 12-01-01-0095 12-01-02-0095 - bn_hot_caramel_america_no.png 12-21-01-0095 12-21-02-0095 - posi1 - - - - diff --git a/video/brewing_adv15.mp4 b/video/brewing_adv15.mp4 index 7ef9c7f1..cd9e7b78 100755 Binary files a/video/brewing_adv15.mp4 and b/video/brewing_adv15.mp4 differ diff --git a/video/brewing_adv15_long.mp4 b/video/brewing_adv15_long.mp4 index 7ef9c7f1..cd9e7b78 100755 Binary files a/video/brewing_adv15_long.mp4 and b/video/brewing_adv15_long.mp4 differ diff --git a/video/brewing_adv16 long.mp4 b/video/brewing_adv16_long.mp4 similarity index 100% rename from video/brewing_adv16 long.mp4 rename to video/brewing_adv16_long.mp4 diff --git a/video/brewing_txt_adv16.png b/video/brewing_txt_adv16.png index d0043d05..69604645 100644 Binary files a/video/brewing_txt_adv16.png and b/video/brewing_txt_adv16.png differ diff --git a/video/brewing_txt_adv16_en.png b/video/brewing_txt_adv16_en.png index 25da78a3..87d2fa17 100644 Binary files a/video/brewing_txt_adv16_en.png and b/video/brewing_txt_adv16_en.png differ diff --git a/video/script1.ev b/video/script1.ev index b1846bc5..420a6c85 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -169,8 +169,8 @@ If brewing_adv15_long_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv15_long.mp4" brewing_adv15_long_size EndIf DEBUGVAR brewing_adv15_long_size -If brewing_adv15_long_size = 13110372 Then - If KingdomThaiTeaPro = 1 Then +If brewing_adv15_long_size = 9336295 Then + If AmericanoPro = 1 Then Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv15_long.mp4" Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0 diff --git a/video/sync_1.file b/video/sync_1.file index caccb42a..78987572 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 350212 +total 350088 -rw-rw---- 1 root sdcard_rw 12354151 2025-05-08 10:24 Mixer_proof3.mp4 -rw-rw---- 1 root sdcard_rw 10151578 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3.mp4 -rw-rw---- 1 root sdcard_rw 76993 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3_pause.mp4 @@ -10,10 +10,10 @@ total 350212 -rw-rw---- 1 root sdcard_rw 10365289 2025-06-09 18:13 brewing_adv13_long.mp4 -rw-rw---- 1 root sdcard_rw 9260622 2025-01-09 17:28 brewing_adv14.mp4 -rw-rw---- 1 root sdcard_rw 5353047 2025-01-23 13:08 brewing_adv14_long.mp4 --rw-rw---- 1 root sdcard_rw 9340625 2025-06-16 10:53 brewing_adv15.mp4 --rw-rw---- 1 root sdcard_rw 9340625 2025-06-16 10:53 brewing_adv15_long.mp4 --rw-rw---- 1 root sdcard_rw 9254300 2025-06-18 11:19 brewing_adv16 long.mp4 +-rw-rw---- 1 root sdcard_rw 9336295 2025-06-24 18:02 brewing_adv15.mp4 +-rw-rw---- 1 root sdcard_rw 9336295 2025-06-24 18:02 brewing_adv15_long.mp4 -rw-rw---- 1 root sdcard_rw 9254300 2025-06-18 11:19 brewing_adv16.mp4 +-rw-rw---- 1 root sdcard_rw 9254300 2025-06-18 11:19 brewing_adv16_long.mp4 -rw-rw---- 1 root sdcard_rw 9371529 2025-04-30 16:22 brewing_adv17.mp4 -rw-rw---- 1 root sdcard_rw 9371529 2025-04-30 16:22 brewing_adv17_long.mp4 -rw-rw---- 1 root sdcard_rw 9701195 2024-11-28 13:34 brewing_adv21.mp4 @@ -46,11 +46,11 @@ total 350212 -rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 10065192 2025-02-21 16:58 remove_cup_how_to.mp4 --rw-rw---- 1 root sdcard_rw 8500 2025-06-19 10:49 script1.ev +-rw-rw---- 1 root sdcard_rw 8494 2025-06-24 18:27 script1.ev -rw-rw---- 1 root sdcard_rw 1020 2025-04-10 18:50 script2.ev -rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev -rw-rw---- 1 root sdcard_rw 11041 2025-06-11 17:39 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2025-06-19 10:50 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2025-06-20 21:25 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/event/double_promotion_americano_and_taiwanese_tea.xml b/xml/event/double_promotion_americano_and_taiwanese_tea.xml index 80e1575e..87ffd140 100644 --- a/xml/event/double_promotion_americano_and_taiwanese_tea.xml +++ b/xml/event/double_promotion_americano_and_taiwanese_tea.xml @@ -103,6 +103,39 @@ + + + + + ;endblock1 diff --git a/xml/event/multi_promotion_config_americano_taiwanese_tea.json b/xml/event/multi_promotion_config_americano_taiwanese_tea.json index f55a81e5..7b8940e1 100644 --- a/xml/event/multi_promotion_config_americano_taiwanese_tea.json +++ b/xml/event/multi_promotion_config_americano_taiwanese_tea.json @@ -1,7 +1,7 @@ [ { "name": "americano", - "template": "/event/promotion_template.inc", + "template": "/event/promotion_video_template.inc", "config": { "normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", "normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", @@ -9,6 +9,8 @@ "press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", "disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", "disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", + "video_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "video_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" } }, diff --git a/xml/event/promotion_americano.xml b/xml/event/promotion_americano.xml index 45609328..f63dee02 100644 --- a/xml/event/promotion_americano.xml +++ b/xml/event/promotion_americano.xml @@ -19159,13 +19159,28 @@ Limenade Soda" "ROOT/taobin_project/image/event/americano/americano_banner.png" "ROOT/taobin_project/image/event/americano/americano_banner.png" - - Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" - - + Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" + + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh + + diff --git a/xml/event/promotion_template3.inc b/xml/event/promotion_template3.inc index adf7974a..f73bbacc 100644 --- a/xml/event/promotion_template3.inc +++ b/xml/event/promotion_template3.inc @@ -5,11 +5,27 @@ BigButtonEnable ###normal_thai - ###press_thai - ###disable_thai + ###normal_thai + ###normal_thai - - ###EventOnClick - + Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" + + + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh + diff --git a/xml/page_board.xml b/xml/page_board.xml index ac4396e4..309d21ba 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -189,6 +189,13 @@ CacheVarStr "put" XMLProfile EndIf + If SpiralOnline = "" Then + CacheVarStr "get" SpiralOnline + Else + CacheVarStr "put" SpiralOnline + EndIf + + If BoxID = 105005 Then Var XMLProfile = "Plus5AndInclude20Percent-taobin_notopup-taobin_nopro-taobin_notopping" Var XMLProfile = "DiscountFromBO-MachineShedule" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index ccc9c77d..7b847fb5 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.05" - Var XMLPageVersionInt = 1005 + Var XMLPageVersion = "10.07" + Var XMLPageVersionInt = 1007 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index 1f488bc2..82b26667 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "11.05" - Var XMLPageVersionInt = 1105 + Var XMLPageVersion = "11.07" + Var XMLPageVersionInt = 1107 ;Oreo Var OreoGuarantee = 0