diff --git a/image/event/matcha_every_day/matcha_every_day2.png b/image/event/matcha_every_day/matcha_every_day2.png new file mode 100644 index 00000000..59115508 Binary files /dev/null and b/image/event/matcha_every_day/matcha_every_day2.png differ diff --git a/image/page_drink_disable_n2/bn_Matcha_Milk_Yuzu.png b/image/page_drink_disable_n2/bn_Matcha_Milk_Yuzu.png new file mode 100644 index 00000000..ef891616 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Matcha_Milk_Yuzu.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_tea_pure_x3.png b/image/page_drink_disable_n2/bn_hot_matcha_tea_pure_x3.png new file mode 100644 index 00000000..684a44a1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_tea_pure_x3.png differ diff --git a/image/page_drink_disable_n2/bn_hot_yuzu_Matcha_tea.png b/image/page_drink_disable_n2/bn_hot_yuzu_Matcha_tea.png new file mode 100644 index 00000000..13c78f69 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_yuzu_Matcha_tea.png differ diff --git a/image/page_drink_n/bn_Matcha_Milk_Yuzu.png b/image/page_drink_n/bn_Matcha_Milk_Yuzu.png new file mode 100644 index 00000000..40a4ba49 Binary files /dev/null and b/image/page_drink_n/bn_Matcha_Milk_Yuzu.png differ diff --git a/image/page_drink_n/bn_hot_matcha_tea_pure_x3.png b/image/page_drink_n/bn_hot_matcha_tea_pure_x3.png new file mode 100644 index 00000000..5d2ea487 Binary files /dev/null and b/image/page_drink_n/bn_hot_matcha_tea_pure_x3.png differ diff --git a/image/page_drink_n/bn_hot_yuzu_Matcha_tea.png b/image/page_drink_n/bn_hot_yuzu_Matcha_tea.png new file mode 100644 index 00000000..e308d6eb Binary files /dev/null and b/image/page_drink_n/bn_hot_yuzu_Matcha_tea.png differ diff --git a/image/page_drink_picture2_n/bn_Matcha_Milk_Yuzu.png b/image/page_drink_picture2_n/bn_Matcha_Milk_Yuzu.png new file mode 100644 index 00000000..56f24f6f Binary files /dev/null and b/image/page_drink_picture2_n/bn_Matcha_Milk_Yuzu.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_tea_pure_x3.png b/image/page_drink_picture2_n/bn_hot_matcha_tea_pure_x3.png new file mode 100644 index 00000000..fdd58e08 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_matcha_tea_pure_x3.png differ diff --git a/image/page_drink_picture2_n/bn_hot_yuzu_Matcha_tea.png b/image/page_drink_picture2_n/bn_hot_yuzu_Matcha_tea.png new file mode 100644 index 00000000..daf30307 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_yuzu_Matcha_tea.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Milk_Yuzu.png b/image/page_drink_press_n/bn_Matcha_Milk_Yuzu.png new file mode 100644 index 00000000..cc82659e Binary files /dev/null and b/image/page_drink_press_n/bn_Matcha_Milk_Yuzu.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_tea_pure_x3.png b/image/page_drink_press_n/bn_hot_matcha_tea_pure_x3.png new file mode 100644 index 00000000..9dbbe7a0 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_matcha_tea_pure_x3.png differ diff --git a/image/page_drink_press_n/bn_hot_yuzu_Matcha_tea.png b/image/page_drink_press_n/bn_hot_yuzu_Matcha_tea.png new file mode 100644 index 00000000..306c34fa Binary files /dev/null and b/image/page_drink_press_n/bn_hot_yuzu_Matcha_tea.png differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 37718619..7bedbb58 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -322,6 +322,7 @@ IGNORE เก็กฮวย Chrysanths Tea น้ำเก๊กฮวย น Name=Other,file=page_catalog_group_other.skt เต่าพลังโซดา\n(เพิ่มปริมาณ) Energy Drink\nSoda Extra เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน) Medicine Drink, Soda, Ice - 12-05-02-0143 12-05-03-0143 bn_iced_energy_drink_soda_Extra.png - - - posi1 2025/01/21T00:00:00 - TaobinEnergyDrinkMenu เป๊ปซี่ (เพิ่มปริมาณ) Pepsi Extra เป๊ปซี่ โซดา และน้ำแข็ง Pepsi, Soda And Ice - 12-05-02-0133 - bn_iced_pepsi_extra.png - - - posi1 2025/01/01T00: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 - - ฟรุตพันช์ Fruit Punch Drink มะนาว น้ำแดง น้ำแข็ง และคอลลาเจน Collagen, Lime, Salak And Ice - 12-05-02-0144 12-05-03-0144 bn_iced_Fruit_Punch_Lime_Sala_jemila.png - - - posi1 2025/02/17T00:00:00 - PunchDrinkMenu ฟรุตพันช์ยูซุ Yuzu Punch Drink มะนาว ยูซุ น้ำแข็ง และคอลลาเจน Collagen, Lime, Yuzu And Ice - 12-05-02-0145 12-05-03-0145 bn_iced_fruit_punch_Yuzu_Jemila.png - - - posi1 2025/02/17T00:00:00 - PunchDrinkMenu ฟรุตพันช์บ๊วย Ume Punch Drink มะนาว บ๊วย น้ำแข็ง และคอลลาเจน Collagen, Lime, Ume And Ice - 12-05-02-0146 12-05-03-0146 bn_iced_fruit_punch_Ume_Jemila.png - - - posi1 2025/02/17T00:00:00 - PunchDrinkMenu @@ -467,6 +468,7 @@ IGNORE Pepsi Max - 12-05-02-0062 12-05-03-0062 posi1 - - - Name=Other,file=page_catalog_group_other_other.skt เต่าพลังโซดา\n(เพิ่มปริมาณ) Energy Drink\nSoda Extra เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน) Medicine Drink, Soda, Ice - 12-05-02-0143 12-05-03-0143 bn_iced_energy_drink_soda_Extra.png - - - posi1 2025/01/21T00:00:00 - TaobinEnergyDrinkMenu เป๊ปซี่ (เพิ่มปริมาณ) Pepsi Extra เป๊ปซี่ โซดา และน้ำแข็ง Pepsi, Soda And Ice - 12-05-02-0133 - bn_iced_pepsi_extra.png - - - posi1 2025/01/01T00: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 - - ฟรุตพันช์ Fruit Punch Drink มะนาว น้ำแดง น้ำแข็ง และคอลลาเจน Collagen, Lime, Salak And Ice - 12-05-02-0144 12-05-03-0144 bn_iced_Fruit_Punch_Lime_Sala_jemila.png - - - posi1 2025/02/17T00:00:00 - PunchDrinkMenu ฟรุตพันช์ยูซุ Yuzu Punch Drink มะนาว ยูซุ น้ำแข็ง และคอลลาเจน Collagen, Lime, Yuzu And Ice - 12-05-02-0145 12-05-03-0145 bn_iced_fruit_punch_Yuzu_Jemila.png - - - posi1 2025/02/17T00:00:00 - PunchDrinkMenu ฟรุตพันช์บ๊วย Ume Punch Drink มะนาว บ๊วย น้ำแข็ง และคอลลาเจน Collagen, Lime, Ume And Ice - 12-05-02-0146 12-05-03-0146 bn_iced_fruit_punch_Ume_Jemila.png - - - posi1 2025/02/17T00:00:00 - PunchDrinkMenu diff --git a/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml b/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml index 483ff329..97acab90 100644 --- a/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml +++ b/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml @@ -70,29 +70,29 @@ BigButtonEnable eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - Else - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - EndIf + If SystemDateDayInt >= 20 Then + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png" + Else + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" + EndIf ) eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - Else - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - EndIf + If SystemDateDayInt >= 20 Then + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png" + Else + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" + EndIf ) eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - Else - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - EndIf + If SystemDateDayInt >= 20 Then + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png" + Else + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" + EndIf ) @@ -115,33 +115,9 @@ - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เป๊ปซี่นม" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เป๊ปซี่ นม" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "Pepsi milk" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "-" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - 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" - - - 49 - 117 - - eval( - If $Sum = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum - text_unavailable - center-vertical-horizontal - - + ; - - - ; ==================> Len = 19 ; - - 12-03-03-0029 diff --git a/xml/event/promotion_matcha_every_day.xml b/xml/event/promotion_matcha_every_day.xml index a0158cc5..2bcd9ded 100644 --- a/xml/event/promotion_matcha_every_day.xml +++ b/xml/event/promotion_matcha_every_day.xml @@ -15841,29 +15841,29 @@ Limenade Soda" BigButtonEnable eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - Else - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - EndIf + If SystemDateDayInt >= 20 Then + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png" + Else + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" + EndIf ) eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - Else - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - EndIf + If SystemDateDayInt >= 20 Then + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png" + Else + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" + EndIf ) eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - Else - Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" - EndIf + If SystemDateDayInt >= 20 Then + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png" + Else + Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png" + EndIf ) @@ -15883,21 +15883,7 @@ Limenade Soda" Refresh - +;include="ROOT/taobin_project/inc/button_remove_cup.inc" diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index dad5d7c2..7b496d30 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -39,7 +39,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 90 +; menu_new_list 91 ; ==================> Len = 15 ; - 12-05-02-0143 12-05-03-0143 @@ -543,6 +543,257 @@ Soda Extra" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 15 + ; - 12-02-02-0098 - + + 33 + 22 + 225 + 296 + Flag( 12-02-02-0098.Button,DateTimeStart="2025/03/20T00:00:00",$Sum1202020098) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ยูซุมัทฉะโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ยูซุ มัทฉะ มะนาว โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Yuzu Matcha Soda" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Yuzu Matcha Lime Soda" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0098.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0098.Button + StringFmt( $12-02-02-0098.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + 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" + + + 49 + 117 + + eval( + If $Sum1202020098 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0098.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202020098 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 15 diff --git a/xml/page_catalog_group_other_other.xml b/xml/page_catalog_group_other_other.xml index b51a9a4a..399c8640 100644 --- a/xml/page_catalog_group_other_other.xml +++ b/xml/page_catalog_group_other_other.xml @@ -39,7 +39,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 65 +; menu_new_list 66 ; ==================> Len = 15 ; - 12-05-02-0143 12-05-03-0143 @@ -543,6 +543,257 @@ Soda Extra" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 15 + ; - 12-02-02-0098 - + + 33 + 22 + 225 + 296 + Flag( 12-02-02-0098.Button,DateTimeStart="2025/03/20T00:00:00",$Sum1202020098) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ยูซุมัทฉะโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ยูซุ มัทฉะ มะนาว โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Yuzu Matcha Soda" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Yuzu Matcha Lime Soda" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0098.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0098.Button + StringFmt( $12-02-02-0098.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + 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" + + + 49 + 117 + + eval( + If $Sum1202020098 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0098.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202020098 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 15