Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

2024-10-22 15:49:59 +07:00 · 2024-10-22 15:49:59 +07:00 · fa213879b5
commit fa213879b5
parent dc3eeb4ba4 d71296159b
294 changed files with 88592 additions and 40892 deletions
--- a/image/event/oreo_11/oreo_11_th.png
+++ b/image/event/oreo_11/oreo_11_th.png
--- a/image/event/weekday_discount/weekday_discount_en.png
+++ b/image/event/weekday_discount/weekday_discount_en.png
--- a/image/event/weekday_discount/weekday_discount_th.png
+++ b/image/event/weekday_discount/weekday_discount_th.png
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_CaramelOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_CaramelOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_CaramelOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_CaramelOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_HojichaOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_HojichaOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_HojichaOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_HojichaOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_MelonOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_MelonOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_MelonOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_MelonOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_ThaiTeaOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_ThaiTeaOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_ThaiTeaOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_ThaiTeaOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_YUZU_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_YUZU_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_YUZU_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_YUZU_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_oreo_11_en.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_oreo_11_en.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_oreo_11_th.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_oreo_11_th.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_BananaOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_BananaOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_BananaOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_BananaOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_CaramelOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_CaramelOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_CaramelOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_CaramelOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Caramel_Matcha_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_ChocoOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_ChocoOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_ChocoOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_ChocoOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Coconut_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Coconut_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Coconut_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Coconut_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_HojichaOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_HojichaOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_HojichaOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_HojichaOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_MelonOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_MelonOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_MelonOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_MelonOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_Mint_Oreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_Mint_Oreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_Mint_Oreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_Mint_Oreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie_oreo_11_en.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie_oreo_11_th.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie_oreo_11_th.png
--- a/image/page_drink_n/bn_StrawberrOreo_smoothie_oreo_11_en.png
+++ b/image/page_drink_n/bn_StrawberrOreo_smoothie_oreo_11_en.png
--- a/Show more
+++ b/Show more