Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

2024-11-26 22:11:44 +07:00 · 2024-11-26 22:11:44 +07:00 · f51f419bf7
commit f51f419bf7
parent a1faf5a4af 237ca1ee08
108 changed files with 96693 additions and 9563 deletions
--- a/image/event/12_day_12_menu/12_day_12_menu_en.png
+++ b/image/event/12_day_12_menu/12_day_12_menu_en.png
--- a/image/event/12_day_12_menu/12_day_12_menu_th.png
+++ b/image/event/12_day_12_menu/12_day_12_menu_th.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/jemila/jemila.png
-normal_thai=ROOT/taobin_project/image/event/jemila/jemila.png
-press_eng=ROOT/taobin_project/image/event/jemila/jemila.png
-press_thai=ROOT/taobin_project/image/event/jemila/jemila.png
-disable_eng=ROOT/taobin_project/image/event/jemila/jemila.png
-disable_thai=ROOT/taobin_project/image/event/jemila/jemila.png
+normal_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
+normal_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
+press_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
+press_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
+disable_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
+disable_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
--- a/image/page_drink_disable_n2/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_Super_cocoa_X3_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_Super_cocoa_X3_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_choco_snow_flake_smoothie.png
+++ b/image/page_drink_disable_n2/bn_choco_snow_flake_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_ESPRESSO_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_ESPRESSO_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_Gingerlime_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_Gingerlime_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_americano_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_americano_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_christmas_cafe_latte.png
+++ b/image/page_drink_disable_n2/bn_iced_christmas_cafe_latte.png
--- a/image/page_drink_disable_n2/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_ume_lime_soda_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_ume_lime_soda_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_reindeer_peppermint_smoothie.png
+++ b/image/page_drink_disable_n2/bn_reindeer_peppermint_smoothie.png
--- a/image/page_drink_disable_n2/bn_royal_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_royal_milk_tea.png
--- a/image/page_drink_disable_n2/bn_santa_ginger.png
+++ b/image/page_drink_disable_n2/bn_santa_ginger.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_12_day_12_menu.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_12_day_12_menu.png
--- a/image/page_drink_disable_n2/bn_southern_fusion_tea.png
+++ b/image/page_drink_disable_n2/bn_southern_fusion_tea.png
--- a/image/page_drink_disable_n2/bn_traditional_green_tea.png
+++ b/image/page_drink_disable_n2/bn_traditional_green_tea.png
--- a/image/page_drink_n/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
+++ b/image/page_drink_n/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
--- a/image/page_drink_n/bn_Super_cocoa_X3_12_day_12_menu.png
+++ b/image/page_drink_n/bn_Super_cocoa_X3_12_day_12_menu.png
--- a/image/page_drink_n/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
+++ b/image/page_drink_n/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
--- a/image/page_drink_n/bn_choco_snow_flake_smoothie.png
+++ b/image/page_drink_n/bn_choco_snow_flake_smoothie.png
--- a/image/page_drink_n/bn_iced_ESPRESSO_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_ESPRESSO_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_Gingerlime_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_Gingerlime_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_americano_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_americano_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_christmas_cafe_latte.png
+++ b/image/page_drink_n/bn_iced_christmas_cafe_latte.png
--- a/image/page_drink_n/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_ume_lime_soda_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_ume_lime_soda_12_day_12_menu.png
--- a/image/page_drink_n/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
+++ b/image/page_drink_n/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
--- a/image/page_drink_n/bn_reindeer_peppermint_smoothie.png
+++ b/image/page_drink_n/bn_reindeer_peppermint_smoothie.png
--- a/image/page_drink_n/bn_royal_milk_tea.png
+++ b/image/page_drink_n/bn_royal_milk_tea.png
--- a/image/page_drink_n/bn_santa_ginger.png
+++ b/image/page_drink_n/bn_santa_ginger.png
--- a/image/page_drink_n/bn_smoothie_coconut_12_day_12_menu.png
+++ b/image/page_drink_n/bn_smoothie_coconut_12_day_12_menu.png
--- a/image/page_drink_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_n/bn_southern_fusion_tea.png
--- a/image/page_drink_n/bn_traditional_green_tea.png
+++ b/image/page_drink_n/bn_traditional_green_tea.png
--- a/image/page_drink_picture2_n/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_Super_cocoa_X3_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_Super_cocoa_X3_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_choco_snow_flake_smoothie.png
+++ b/image/page_drink_picture2_n/bn_choco_snow_flake_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_ESPRESSO_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_ESPRESSO_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_Gingerlime_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_Gingerlime_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_americano_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_americano_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_christmas_cafe_latte.png
+++ b/image/page_drink_picture2_n/bn_iced_christmas_cafe_latte.png
--- a/image/page_drink_picture2_n/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_ume_lime_soda_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_ume_lime_soda_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_reindeer_peppermint_smoothie.png
+++ b/image/page_drink_picture2_n/bn_reindeer_peppermint_smoothie.png
--- a/image/page_drink_picture2_n/bn_royal_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_royal_milk_tea.png
--- a/image/page_drink_picture2_n/bn_santa_ginger.png
+++ b/image/page_drink_picture2_n/bn_santa_ginger.png
--- a/image/page_drink_picture2_n/bn_smoothie_coconut_12_day_12_menu.png
+++ b/image/page_drink_picture2_n/bn_smoothie_coconut_12_day_12_menu.png
--- a/image/page_drink_picture2_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_picture2_n/bn_southern_fusion_tea.png
--- a/image/page_drink_picture2_n/bn_traditional_green_tea.png
+++ b/image/page_drink_picture2_n/bn_traditional_green_tea.png
--- a/image/page_drink_press_n/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_Premium_Thai_tea_caramel_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_Super_cocoa_X3_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_Super_cocoa_X3_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_Thai_milk_tea_smoothie_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_choco_snow_flake_smoothie.png
+++ b/image/page_drink_press_n/bn_choco_snow_flake_smoothie.png
--- a/image/page_drink_press_n/bn_iced_ESPRESSO_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_ESPRESSO_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_Gingerlime_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_Gingerlime_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_americano_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_americano_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_christmas_cafe_latte.png
+++ b/image/page_drink_press_n/bn_iced_christmas_cafe_latte.png
--- a/image/page_drink_press_n/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_jasmin_milk_tea_Coconut_smoothie_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_ume_lime_soda_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_ume_lime_soda_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_iced_นมชมพู_smoothie_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_reindeer_peppermint_smoothie.png
+++ b/image/page_drink_press_n/bn_reindeer_peppermint_smoothie.png
--- a/image/page_drink_press_n/bn_royal_milk_tea.png
+++ b/image/page_drink_press_n/bn_royal_milk_tea.png
--- a/image/page_drink_press_n/bn_santa_ginger.png
+++ b/image/page_drink_press_n/bn_santa_ginger.png
--- a/image/page_drink_press_n/bn_smoothie_coconut_12_day_12_menu.png
+++ b/image/page_drink_press_n/bn_smoothie_coconut_12_day_12_menu.png
--- a/image/page_drink_press_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_press_n/bn_southern_fusion_tea.png
--- a/image/page_drink_press_n/bn_traditional_green_tea.png
+++ b/image/page_drink_press_n/bn_traditional_green_tea.png