before merge

2025-06-20 10:51:14 +07:00 · 2025-06-20 10:51:14 +07:00 · 5d9721e4ac
commit 5d9721e4ac
parent bc493f393d 5d28edad0b
188 changed files with 52004 additions and 17393 deletions
--- a/image/cart_en/additem_bd.png
+++ b/image/cart_en/additem_bd.png
--- a/image/cart_en/additem_bn.png
+++ b/image/cart_en/additem_bn.png
--- a/image/cart_en/additem_bp.png
+++ b/image/cart_en/additem_bp.png
--- a/image/cart_th/additem_bd.png
+++ b/image/cart_th/additem_bd.png
--- a/image/cart_th/additem_bn.png
+++ b/image/cart_th/additem_bn.png
--- a/image/cart_th/additem_bp.png
+++ b/image/cart_th/additem_bp.png
--- a/image/cart_uti/cartBottom.png
+++ b/image/cart_uti/cartBottom.png
--- a/image/cart_uti/cartTop.png
+++ b/image/cart_uti/cartTop.png
--- a/image/cart_uti/clear_slip_bn.png
+++ b/image/cart_uti/clear_slip_bn.png
--- a/image/cart_uti/clear_slip_bp.png
+++ b/image/cart_uti/clear_slip_bp.png
--- a/image/cart_uti/line.png
+++ b/image/cart_uti/line.png
--- a/image/cart_uti/plus_slip_bd.png
+++ b/image/cart_uti/plus_slip_bd.png
--- a/image/cart_uti/plus_slip_bn.png
+++ b/image/cart_uti/plus_slip_bn.png
--- a/image/cart_uti/plus_slip_bp.png
+++ b/image/cart_uti/plus_slip_bp.png
--- a/image/event/americano/americano_banner.png
+++ b/image/event/americano/americano_banner.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
-normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
-press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
-press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
-disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
-disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
+normal_eng=ROOT/taobin_project/image/event/americano/americano_banner.png
+normal_thai=ROOT/taobin_project/image/event/americano/americano_banner.png
+press_eng=ROOT/taobin_project/image/event/americano/americano_banner.png
+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
--- a/image/page_drink_disable_n2/bn_Apple_Americano_Banner.png
+++ b/image/page_drink_disable_n2/bn_Apple_Americano_Banner.png
--- a/image/page_drink_disable_n2/bn_Apple_Frop_Longback_Banner.png
+++ b/image/page_drink_disable_n2/bn_Apple_Frop_Longback_Banner.png
--- a/image/page_drink_disable_n2/bn_Mint_Americano.png
+++ b/image/page_drink_disable_n2/bn_Mint_Americano.png
--- a/image/page_drink_disable_n2/bn_New_americano_Double_Shot.png
+++ b/image/page_drink_disable_n2/bn_New_americano_Double_Shot.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Latte.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Latte.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_disable_n2/bn_hot_america_no_Banner.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no_Banner.png
--- a/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_blackcoffee_Banner.png
+++ b/image/page_drink_disable_n2/bn_hot_blackcoffee_Banner.png
--- a/image/page_drink_disable_n2/bn_hot_caramel_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_caramel_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_coconut_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_coconut_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_lychee_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_lychee_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_salak_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_salak_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_strawberry_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_strawberry_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_tao_energy_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_tao_energy_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_ume_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_ume_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_yuzu_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_yuzu_america_no.png
--- a/image/page_drink_n/bn_Apple_Americano_Banner.png
+++ b/image/page_drink_n/bn_Apple_Americano_Banner.png
--- a/image/page_drink_n/bn_Apple_Frop_Longback_Banner.png
+++ b/image/page_drink_n/bn_Apple_Frop_Longback_Banner.png
--- a/image/page_drink_n/bn_Mint_Americano.png
+++ b/image/page_drink_n/bn_Mint_Americano.png
--- a/image/page_drink_n/bn_New_americano_Double_Shot.png
+++ b/image/page_drink_n/bn_New_americano_Double_Shot.png
--- a/image/page_drink_n/bn_Ovaltine_Latte.png
+++ b/image/page_drink_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_n/bn_hot_america_no_Banner.png
+++ b/image/page_drink_n/bn_hot_america_no_Banner.png
--- a/image/page_drink_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_n/bn_hot_blackcoffee_Banner.png
+++ b/image/page_drink_n/bn_hot_blackcoffee_Banner.png
--- a/image/page_drink_n/bn_hot_caramel_america_no.png
+++ b/image/page_drink_n/bn_hot_caramel_america_no.png
--- a/image/page_drink_n/bn_hot_coconut_america_no.png
+++ b/image/page_drink_n/bn_hot_coconut_america_no.png
--- a/image/page_drink_n/bn_hot_lychee_america_no.png
+++ b/image/page_drink_n/bn_hot_lychee_america_no.png
--- a/image/page_drink_n/bn_hot_salak_america_no.png
+++ b/image/page_drink_n/bn_hot_salak_america_no.png
--- a/image/page_drink_n/bn_hot_strawberry_america_no.png
+++ b/image/page_drink_n/bn_hot_strawberry_america_no.png
--- a/image/page_drink_n/bn_hot_tao_energy_america_no.png
+++ b/image/page_drink_n/bn_hot_tao_energy_america_no.png
--- a/image/page_drink_n/bn_hot_ume_america_no.png
+++ b/image/page_drink_n/bn_hot_ume_america_no.png
--- a/image/page_drink_n/bn_hot_yuzu_america_no.png
+++ b/image/page_drink_n/bn_hot_yuzu_america_no.png
--- a/image/page_drink_picture2_n/bn_Apple_Americano_Banner.png
+++ b/image/page_drink_picture2_n/bn_Apple_Americano_Banner.png
--- a/image/page_drink_picture2_n/bn_Apple_Frop_Longback_Banner.png
+++ b/image/page_drink_picture2_n/bn_Apple_Frop_Longback_Banner.png
--- a/image/page_drink_picture2_n/bn_Mint_Americano.png
+++ b/image/page_drink_picture2_n/bn_Mint_Americano.png
--- a/image/page_drink_picture2_n/bn_New_americano_Double_Shot.png
+++ b/image/page_drink_picture2_n/bn_New_americano_Double_Shot.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Latte.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_picture2_n/bn_hot_america_no_Banner.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_Banner.png
--- a/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_blackcoffee_Banner.png
+++ b/image/page_drink_picture2_n/bn_hot_blackcoffee_Banner.png
--- a/image/page_drink_picture2_n/bn_hot_caramel_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_caramel_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_coconut_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_coconut_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_lychee_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_lychee_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_salak_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_salak_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_strawberry_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_strawberry_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_tao_energy_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_tao_energy_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_ume_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_ume_america_no.png
--- a/image/page_drink_picture2_n/bn_hot_yuzu_america_no.png
+++ b/image/page_drink_picture2_n/bn_hot_yuzu_america_no.png
--- a/image/page_drink_press_n/bn_Apple_Americano_Banner.png
+++ b/image/page_drink_press_n/bn_Apple_Americano_Banner.png
--- a/image/page_drink_press_n/bn_Apple_Frop_Longback_Banner.png
+++ b/image/page_drink_press_n/bn_Apple_Frop_Longback_Banner.png
--- a/image/page_drink_press_n/bn_Mint_Americano.png
+++ b/image/page_drink_press_n/bn_Mint_Americano.png
--- a/image/page_drink_press_n/bn_New_americano_Double_Shot.png
+++ b/image/page_drink_press_n/bn_New_americano_Double_Shot.png
--- a/image/page_drink_press_n/bn_Ovaltine_Latte.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_press_n/bn_hot_america_no_Banner.png
+++ b/image/page_drink_press_n/bn_hot_america_no_Banner.png
--- a/image/page_drink_press_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_press_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_press_n/bn_hot_blackcoffee_Banner.png
+++ b/image/page_drink_press_n/bn_hot_blackcoffee_Banner.png
--- a/Show more
+++ b/Show more