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

2024-07-15 17:30:30 +07:00 · 2024-07-15 17:30:30 +07:00 · 705ab50146
commit 705ab50146
parent b57750e134 61a0e525fb
312 changed files with 64716 additions and 623 deletions
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-normal_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
-press_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-press_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
-disable_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-disable_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
+normal_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+normal_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+press_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+press_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+disable_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+disable_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-normal_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
-press_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-press_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
-disable_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-disable_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
+normal_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+normal_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+press_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+press_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+disable_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+disable_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
--- a/image/event/lucky_draw_ads/bn_check_coupon.png
+++ b/image/event/lucky_draw_ads/bn_check_coupon.png
--- a/image/event/lucky_draw_ads/bn_check_coupon_en.png
+++ b/image/event/lucky_draw_ads/bn_check_coupon_en.png
--- a/image/event/lucky_draw_ads/bn_next.png
+++ b/image/event/lucky_draw_ads/bn_next.png
--- a/image/event/lucky_draw_ads/bn_topup_credit.png
+++ b/image/event/lucky_draw_ads/bn_topup_credit.png
--- a/image/event/lucky_draw_ads/bn_topup_credit_en.png
+++ b/image/event/lucky_draw_ads/bn_topup_credit_en.png
--- a/image/event/lucky_draw_ads/bp_check_coupon.png
+++ b/image/event/lucky_draw_ads/bp_check_coupon.png
--- a/image/event/lucky_draw_ads/bp_check_coupon_en.png
+++ b/image/event/lucky_draw_ads/bp_check_coupon_en.png
--- a/image/event/lucky_draw_ads/bp_next.png
+++ b/image/event/lucky_draw_ads/bp_next.png
--- a/image/event/lucky_draw_ads/bp_topup_credit.png
+++ b/image/event/lucky_draw_ads/bp_topup_credit.png
--- a/image/event/lucky_draw_ads/bp_topup_credit_en.png
+++ b/image/event/lucky_draw_ads/bp_topup_credit_en.png
--- a/image/event/lucky_draw_ads/popup_bg.png
+++ b/image/event/lucky_draw_ads/popup_bg.png
--- a/image/event/lucky_draw_ads/text.png
+++ b/image/event/lucky_draw_ads/text.png
--- a/image/event/lucky_draw_ads/text_en.png
+++ b/image/event/lucky_draw_ads/text_en.png
--- a/image/event/passion_mint/passion_mint_th.png
+++ b/image/event/passion_mint/passion_mint_th.png
--- a/image/main_page/bn_main_page_member.png
+++ b/image/main_page/bn_main_page_member.png
--- a/image/main_page/bp_main_page_member.png
+++ b/image/main_page/bp_main_page_member.png
--- a/image/page_drink_disable_n2/BN_Yuzu_Mint_Soda_passion.png
+++ b/image/page_drink_disable_n2/BN_Yuzu_Mint_Soda_passion.png
--- a/image/page_drink_disable_n2/Mint_SuperVocano_passion.png
+++ b/image/page_drink_disable_n2/Mint_SuperVocano_passion.png
--- a/image/page_drink_disable_n2/bn_7UP_Coconut_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Coconut_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Energy_PLUM_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Energy_PLUM_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Lychee_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2-1.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2-1.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_sala_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_sala_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_soda_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_soda_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Iced_Mint_Latte_passion.png
+++ b/image/page_drink_disable_n2/bn_Iced_Mint_Latte_passion.png
--- a/image/page_drink_disable_n2/bn_Iced_Mint_Mocha_passion.png
+++ b/image/page_drink_disable_n2/bn_Iced_Mint_Mocha_passion.png
--- a/image/page_drink_disable_n2/bn_Matcha_latte_mint_smoothie_passion.png
+++ b/image/page_drink_disable_n2/bn_Matcha_latte_mint_smoothie_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Americano_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Americano_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Cocoa_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Cocoa_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Smoothie_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Smoothie_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_pepsi.png
+++ b/image/page_drink_disable_n2/bn_Mint_pepsi.png
--- a/image/page_drink_disable_n2/bn_Mint_pepsi_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_pepsi_passion.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Bananna_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Bananna_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Energy_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Energy_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Lychee_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Matcha_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Matcha_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Melon_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Melon_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Milk_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Milk_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Mint_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Mint_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Plum_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Plum_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Plum_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Plum_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Salak_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Salak_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Smoothie_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Smoothie_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Strawberry_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Strawberry_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_iced_7up.png
+++ b/image/page_drink_disable_n2/bn_iced_7up.png
--- a/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png
--- a/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png
--- a/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png
--- a/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png
--- a/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png
--- a/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png
--- a/image/page_drink_n/BN_Yuzu_Mint_Soda_passion.png
+++ b/image/page_drink_n/BN_Yuzu_Mint_Soda_passion.png
--- a/image/page_drink_n/Mint_SuperVocano_passion.png
+++ b/image/page_drink_n/Mint_SuperVocano_passion.png
--- a/image/page_drink_n/bn_7UP_Coconut_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Coconut_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Energy_PLUM_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Energy_PLUM_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_lime_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_lime_Lychee_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_lime_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_lime_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_lime_sala_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_lime_sala_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_soda_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_soda_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Iced_Mint_Latte_passion.png
+++ b/image/page_drink_n/bn_Iced_Mint_Latte_passion.png
--- a/image/page_drink_n/bn_Iced_Mint_Mocha_passion.png
+++ b/image/page_drink_n/bn_Iced_Mint_Mocha_passion.png
--- a/image/page_drink_n/bn_Matcha_latte_mint_smoothie_passion.png
+++ b/image/page_drink_n/bn_Matcha_latte_mint_smoothie_passion.png
--- a/image/page_drink_n/bn_Mint_Americano_passion.png
+++ b/image/page_drink_n/bn_Mint_Americano_passion.png
--- a/image/page_drink_n/bn_Mint_Cocoa_passion.png
+++ b/image/page_drink_n/bn_Mint_Cocoa_passion.png
--- a/image/page_drink_n/bn_Mint_Milk_Straw_Smoothie_passion.png
+++ b/image/page_drink_n/bn_Mint_Milk_Straw_Smoothie_passion.png
--- a/image/page_drink_n/bn_Mint_Strawberry_Soda_passion.png
+++ b/image/page_drink_n/bn_Mint_Strawberry_Soda_passion.png
--- a/image/page_drink_n/bn_Mint_pepsi_passion.png
+++ b/image/page_drink_n/bn_Mint_pepsi_passion.png
--- a/image/page_drink_n/bn_Pepsi_Bananna_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Bananna_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Energy_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Energy_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Lychee_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Matcha_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Matcha_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Melon_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Melon_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Milk_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Milk_lucky_draw_x2.png
--- a/Show more
+++ b/Show more