diff --git a/image/event/image_template3 b/image/event/image_template3 index 353de2f9..9e886392 100644 --- a/image/event/image_template3 +++ b/image/event/image_template3 @@ -1,6 +1,6 @@ -normal_eng=ROOT/taobin_project/image/event/tea_time/tea_time_th.png -normal_thai=ROOT/taobin_project/image/event/tea_time/tea_time_th.png -press_eng=ROOT/taobin_project/image/event/tea_time/tea_time_th.png -press_thai=ROOT/taobin_project/image/event/tea_time/tea_time_th.png -disable_eng=ROOT/taobin_project/image/event/tea_time/tea_time_th.png -disable_thai=ROOT/taobin_project/image/event/tea_time/tea_time_th.png \ No newline at end of file +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 \ No newline at end of file diff --git a/image/event/nam_hom_coconut/error/bg.png b/image/event/nam_hom_coconut/error/bg.png new file mode 100644 index 00000000..c782e7a0 Binary files /dev/null and b/image/event/nam_hom_coconut/error/bg.png differ diff --git a/image/event/nam_hom_coconut/error/coconut.png b/image/event/nam_hom_coconut/error/coconut.png new file mode 100644 index 00000000..25ca3f5a Binary files /dev/null and b/image/event/nam_hom_coconut/error/coconut.png differ diff --git a/image/event/nam_hom_coconut/error/confirm_btn.png b/image/event/nam_hom_coconut/error/confirm_btn.png new file mode 100644 index 00000000..60882fd1 Binary files /dev/null and b/image/event/nam_hom_coconut/error/confirm_btn.png differ diff --git a/image/event/nam_hom_coconut/error/confirm_btn_press.png b/image/event/nam_hom_coconut/error/confirm_btn_press.png new file mode 100644 index 00000000..d2c50b34 Binary files /dev/null and b/image/event/nam_hom_coconut/error/confirm_btn_press.png differ diff --git a/image/event/nam_hom_coconut/error/cura-md-bag.png b/image/event/nam_hom_coconut/error/cura-md-bag.png new file mode 100644 index 00000000..5bbae0a9 Binary files /dev/null and b/image/event/nam_hom_coconut/error/cura-md-bag.png differ diff --git a/image/event/nam_hom_coconut/error/text2_en.png b/image/event/nam_hom_coconut/error/text2_en.png new file mode 100644 index 00000000..bdc1d449 Binary files /dev/null and b/image/event/nam_hom_coconut/error/text2_en.png differ diff --git a/image/event/nam_hom_coconut/error/text2_th.png b/image/event/nam_hom_coconut/error/text2_th.png new file mode 100644 index 00000000..1909ff81 Binary files /dev/null and b/image/event/nam_hom_coconut/error/text2_th.png differ diff --git a/image/event/nam_hom_coconut/error/text_en.png b/image/event/nam_hom_coconut/error/text_en.png new file mode 100644 index 00000000..1408c85f Binary files /dev/null and b/image/event/nam_hom_coconut/error/text_en.png differ diff --git a/image/event/nam_hom_coconut/error/text_th.png b/image/event/nam_hom_coconut/error/text_th.png new file mode 100644 index 00000000..802d608a Binary files /dev/null and b/image/event/nam_hom_coconut/error/text_th.png differ diff --git a/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4 b/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4 new file mode 100644 index 00000000..1e9950eb Binary files /dev/null and b/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4 differ diff --git a/image/event/nam_hom_coconut/nam_hom_coconut_en.png b/image/event/nam_hom_coconut/nam_hom_coconut_en.png new file mode 100644 index 00000000..3fd2623b Binary files /dev/null and b/image/event/nam_hom_coconut/nam_hom_coconut_en.png differ diff --git a/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4 b/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4 new file mode 100644 index 00000000..ee35df65 Binary files /dev/null and b/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4 differ diff --git a/image/event/nam_hom_coconut/nam_hom_coconut_th.png b/image/event/nam_hom_coconut/nam_hom_coconut_th.png new file mode 100644 index 00000000..7a8b3fcc Binary files /dev/null and b/image/event/nam_hom_coconut/nam_hom_coconut_th.png differ diff --git a/image/page_drink_disable_n2/bn_black_tea_coconut_pro.png b/image/page_drink_disable_n2/bn_black_tea_coconut_pro.png new file mode 100644 index 00000000..4bde9997 Binary files /dev/null and b/image/page_drink_disable_n2/bn_black_tea_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_Coconut_pro.png b/image/page_drink_disable_n2/bn_hot_americano_Coconut_pro.png new file mode 100644 index 00000000..2588d88f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_Coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut_pro.png b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut_pro.png new file mode 100644 index 00000000..1d81c3df Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_pro.png b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_pro.png new file mode 100644 index 00000000..d1541555 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Coconut_soda_pro.png b/image/page_drink_disable_n2/bn_iced_Coconut_soda_pro.png new file mode 100644 index 00000000..db202b29 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Coconut_soda_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Lychee_Coconut_pro.png b/image/page_drink_disable_n2/bn_iced_Lychee_Coconut_pro.png new file mode 100644 index 00000000..0c46ef94 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Lychee_Coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut_pro.png b/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut_pro.png new file mode 100644 index 00000000..a7e664b6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_coconut_pro.png b/image/page_drink_disable_n2/bn_iced_milk_coconut_pro.png new file mode 100644 index 00000000..aeb63484 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_milk_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_coconut_pro.png b/image/page_drink_disable_n2/bn_iced_pepsi_coconut_pro.png new file mode 100644 index 00000000..c9f0b895 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_jasmine_coconut_pro.png b/image/page_drink_disable_n2/bn_jasmine_coconut_pro.png new file mode 100644 index 00000000..37beb3ec Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_jasmine_milk_coconut_pro.png b/image/page_drink_disable_n2/bn_jasmine_milk_coconut_pro.png new file mode 100644 index 00000000..c1864a05 Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_milk_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_match_milk_coconut_pro.png b/image/page_drink_disable_n2/bn_match_milk_coconut_pro.png new file mode 100644 index 00000000..de4caebb Binary files /dev/null and b/image/page_drink_disable_n2/bn_match_milk_coconut_pro.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_coconut_pro.png b/image/page_drink_disable_n2/bn_smoothie_coconut_pro.png new file mode 100644 index 00000000..a0377e2a Binary files /dev/null and b/image/page_drink_disable_n2/bn_smoothie_coconut_pro.png differ diff --git a/image/page_drink_n/bn_black_tea_coconut_pro.png b/image/page_drink_n/bn_black_tea_coconut_pro.png new file mode 100644 index 00000000..505274f9 Binary files /dev/null and b/image/page_drink_n/bn_black_tea_coconut_pro.png differ diff --git a/image/page_drink_n/bn_hot_americano_Coconut_pro.png b/image/page_drink_n/bn_hot_americano_Coconut_pro.png new file mode 100644 index 00000000..7e8a9eac Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_Coconut_pro.png differ diff --git a/image/page_drink_n/bn_hot_thai_milk_tea_coconut_pro.png b/image/page_drink_n/bn_hot_thai_milk_tea_coconut_pro.png new file mode 100644 index 00000000..aaaac252 Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_milk_tea_coconut_pro.png differ diff --git a/image/page_drink_n/bn_iced_Cocoa_coconut_pro.png b/image/page_drink_n/bn_iced_Cocoa_coconut_pro.png new file mode 100644 index 00000000..3a428a44 Binary files /dev/null and b/image/page_drink_n/bn_iced_Cocoa_coconut_pro.png differ diff --git a/image/page_drink_n/bn_iced_Coconut_soda_pro.png b/image/page_drink_n/bn_iced_Coconut_soda_pro.png new file mode 100644 index 00000000..1cc52370 Binary files /dev/null and b/image/page_drink_n/bn_iced_Coconut_soda_pro.png differ diff --git a/image/page_drink_n/bn_iced_Lychee_Coconut_pro.png b/image/page_drink_n/bn_iced_Lychee_Coconut_pro.png new file mode 100644 index 00000000..64cbffcb Binary files /dev/null and b/image/page_drink_n/bn_iced_Lychee_Coconut_pro.png differ diff --git a/image/page_drink_n/bn_iced_matcha_tea_coconut_pro.png b/image/page_drink_n/bn_iced_matcha_tea_coconut_pro.png new file mode 100644 index 00000000..99cb1b4e Binary files /dev/null and b/image/page_drink_n/bn_iced_matcha_tea_coconut_pro.png differ diff --git a/image/page_drink_n/bn_iced_milk_coconut_pro.png b/image/page_drink_n/bn_iced_milk_coconut_pro.png new file mode 100644 index 00000000..a9cf29c7 Binary files /dev/null and b/image/page_drink_n/bn_iced_milk_coconut_pro.png differ diff --git a/image/page_drink_n/bn_iced_pepsi_coconut_pro.png b/image/page_drink_n/bn_iced_pepsi_coconut_pro.png new file mode 100644 index 00000000..eac3c3c7 Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_coconut_pro.png differ diff --git a/image/page_drink_n/bn_jasmine_coconut_pro.png b/image/page_drink_n/bn_jasmine_coconut_pro.png new file mode 100644 index 00000000..d644c298 Binary files /dev/null and b/image/page_drink_n/bn_jasmine_coconut_pro.png differ diff --git a/image/page_drink_n/bn_jasmine_milk_coconut_pro.png b/image/page_drink_n/bn_jasmine_milk_coconut_pro.png new file mode 100644 index 00000000..294ddc69 Binary files /dev/null and b/image/page_drink_n/bn_jasmine_milk_coconut_pro.png differ diff --git a/image/page_drink_n/bn_match_milk_coconut_pro.png b/image/page_drink_n/bn_match_milk_coconut_pro.png new file mode 100644 index 00000000..fa6e8920 Binary files /dev/null and b/image/page_drink_n/bn_match_milk_coconut_pro.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_pro.png b/image/page_drink_n/bn_smoothie_coconut_pro.png new file mode 100644 index 00000000..4e8d9aa0 Binary files /dev/null and b/image/page_drink_n/bn_smoothie_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_black_tea_coconut_pro.png b/image/page_drink_picture2_n/bn_black_tea_coconut_pro.png new file mode 100644 index 00000000..2b4fbfff Binary files /dev/null and b/image/page_drink_picture2_n/bn_black_tea_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_Coconut_pro.png b/image/page_drink_picture2_n/bn_hot_americano_Coconut_pro.png new file mode 100644 index 00000000..57d95607 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_americano_Coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut_pro.png b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut_pro.png new file mode 100644 index 00000000..1076adf9 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Cocoa_coconut_pro.png b/image/page_drink_picture2_n/bn_iced_Cocoa_coconut_pro.png new file mode 100644 index 00000000..fd87f9df Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_Cocoa_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Coconut_soda_pro.png b/image/page_drink_picture2_n/bn_iced_Coconut_soda_pro.png new file mode 100644 index 00000000..5bb5e958 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_Coconut_soda_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Lychee_Coconut_pro.png b/image/page_drink_picture2_n/bn_iced_Lychee_Coconut_pro.png new file mode 100644 index 00000000..3b56b377 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_Lychee_Coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut_pro.png b/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut_pro.png new file mode 100644 index 00000000..6a4fa6d2 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_coconut_pro.png b/image/page_drink_picture2_n/bn_iced_milk_coconut_pro.png new file mode 100644 index 00000000..712a2ea4 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_milk_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_coconut_pro.png b/image/page_drink_picture2_n/bn_iced_pepsi_coconut_pro.png new file mode 100644 index 00000000..3d54e0d0 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_jasmine_coconut_pro.png b/image/page_drink_picture2_n/bn_jasmine_coconut_pro.png new file mode 100644 index 00000000..8f3896d5 Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_jasmine_milk_coconut_pro.png b/image/page_drink_picture2_n/bn_jasmine_milk_coconut_pro.png new file mode 100644 index 00000000..62957d71 Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_milk_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_match_milk_coconut_pro.png b/image/page_drink_picture2_n/bn_match_milk_coconut_pro.png new file mode 100644 index 00000000..74fdeaa0 Binary files /dev/null and b/image/page_drink_picture2_n/bn_match_milk_coconut_pro.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_pro.png b/image/page_drink_picture2_n/bn_smoothie_coconut_pro.png new file mode 100644 index 00000000..a3ef9e90 Binary files /dev/null and b/image/page_drink_picture2_n/bn_smoothie_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_black_tea_coconut_pro.png b/image/page_drink_press_n/bn_black_tea_coconut_pro.png new file mode 100644 index 00000000..8a246a72 Binary files /dev/null and b/image/page_drink_press_n/bn_black_tea_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_Coconut_pro.png b/image/page_drink_press_n/bn_hot_americano_Coconut_pro.png new file mode 100644 index 00000000..d80b18d7 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_americano_Coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_hot_thai_milk_tea_coconut_pro.png b/image/page_drink_press_n/bn_hot_thai_milk_tea_coconut_pro.png new file mode 100644 index 00000000..75b806df Binary files /dev/null and b/image/page_drink_press_n/bn_hot_thai_milk_tea_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_Cocoa_coconut_pro.png b/image/page_drink_press_n/bn_iced_Cocoa_coconut_pro.png new file mode 100644 index 00000000..facdd7cd Binary files /dev/null and b/image/page_drink_press_n/bn_iced_Cocoa_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_Coconut_soda_pro.png b/image/page_drink_press_n/bn_iced_Coconut_soda_pro.png new file mode 100644 index 00000000..64bac114 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_Coconut_soda_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_Lychee_Coconut_pro.png b/image/page_drink_press_n/bn_iced_Lychee_Coconut_pro.png new file mode 100644 index 00000000..af85b8aa Binary files /dev/null and b/image/page_drink_press_n/bn_iced_Lychee_Coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_matcha_tea_coconut_pro.png b/image/page_drink_press_n/bn_iced_matcha_tea_coconut_pro.png new file mode 100644 index 00000000..38c22b90 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_matcha_tea_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_milk_coconut_pro.png b/image/page_drink_press_n/bn_iced_milk_coconut_pro.png new file mode 100644 index 00000000..f6bd7e14 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_milk_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_pepsi_coconut_pro.png b/image/page_drink_press_n/bn_iced_pepsi_coconut_pro.png new file mode 100644 index 00000000..a4600f75 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_jasmine_coconut_pro.png b/image/page_drink_press_n/bn_jasmine_coconut_pro.png new file mode 100644 index 00000000..12b34696 Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_jasmine_milk_coconut_pro.png b/image/page_drink_press_n/bn_jasmine_milk_coconut_pro.png new file mode 100644 index 00000000..899e1853 Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_milk_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_match_milk_coconut_pro.png b/image/page_drink_press_n/bn_match_milk_coconut_pro.png new file mode 100644 index 00000000..5a169969 Binary files /dev/null and b/image/page_drink_press_n/bn_match_milk_coconut_pro.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_pro.png b/image/page_drink_press_n/bn_smoothie_coconut_pro.png new file mode 100644 index 00000000..aa2ad91d Binary files /dev/null and b/image/page_drink_press_n/bn_smoothie_coconut_pro.png differ diff --git a/xml/event/multi_promotion_config_melon_coffee.json b/xml/event/ignore_multi_promotion_config_melon_coffee.json similarity index 100% rename from xml/event/multi_promotion_config_melon_coffee.json rename to xml/event/ignore_multi_promotion_config_melon_coffee.json diff --git a/xml/event/multi_promotion_config_melon_energy.json b/xml/event/ignore_multi_promotion_config_melon_energy.json similarity index 100% rename from xml/event/multi_promotion_config_melon_energy.json rename to xml/event/ignore_multi_promotion_config_melon_energy.json diff --git a/xml/event/multi_promotion_config_coconut_melon.json b/xml/event/multi_promotion_config_coconut_melon.json new file mode 100644 index 00000000..19b8256c --- /dev/null +++ b/xml/event/multi_promotion_config_coconut_melon.json @@ -0,0 +1,30 @@ +[ + { + "name": "nam_hom_coconut", + "template": "/event/promotion_video_template.inc", + "config": { + "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", + "video_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4", + "video_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4", + "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml" + } + }, + { + "name": "wednesday_melon", + "template": "/event/promotion_template.inc", + "config": { + "normal_eng": "ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_EN.png", + "normal_thai": "ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_TH.png", + "press_eng": "ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_EN.png", + "press_thai": "ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_TH.png", + "disable_eng": "ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_EN.png", + "disable_thai": "ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_TH.png", + "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_wednesday_melon.xml" + } + } +] \ No newline at end of file diff --git a/xml/event/out_put_file3.txt b/xml/event/out_put_file3.txt index 1f7957a8..a3023880 100644 --- a/xml/event/out_put_file3.txt +++ b/xml/event/out_put_file3.txt @@ -1 +1 @@ -/event/promotion_tea_time.xml \ No newline at end of file +/event/promotion_nam_hom_coconut.xml \ No newline at end of file diff --git a/xml/event/promotion_template3.inc b/xml/event/promotion_template3.inc index b553cade..68e58b51 100644 --- a/xml/event/promotion_template3.inc +++ b/xml/event/promotion_template3.inc @@ -33,7 +33,7 @@ - Open "ROOT/taobin_project/xml/page_catalog_group_pro_tea_time.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml" @@ -53,7 +53,7 @@ EndIf ) - "ROOT/taobin_project/image/event/tea_time/tea_time_th.mp4" + "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4" diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 89a2838d..6dca8a2c 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -12,6 +12,7 @@ DEBUGVAR EnergyDrinkEnable DEBUGVAR EnergyDrink1BathPro DEBUGVAR CoffeeDrink1BathPro DEBUGVAR WednesdayMelonPro +DEBUGVAR NamHomCoconutPro Var PromotionState1 = "Invisible" Var PromotionState2 = "Invisible" @@ -38,24 +39,19 @@ Else Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" ; zone promote - If TeaTimePro = 1 Then + If NamHomCoconutPro = 1 Then Var PromotionState1 = "Enable" Var CountEnablePromotion = CountEnablePromotion + 1 - If EnergyDrink1BathPro = 1 Then + If WednesdayMelonPro = 1 Then Var PromotionState2 = "Enable" Var CountEnablePromotion = CountEnablePromotion + 1 EndIf - If CoffeeDrink1BathPro = 1 Then - Var PromotionState3 = "Enable" - Var CountEnablePromotion = CountEnablePromotion + 1 - EndIf - If CountEnablePromotion > 1 Then - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_tea_time_and_energy_drink_1_bath_and_coffee_drink_1_bath.xml" + Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_nam_hom_coconut_and_wednesday_melon.xml" Else - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_tea_time.xml" + Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_nam_hom_coconut.xml" EndIf Else If EnergyDrink1BathPro = 1 Then diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 7138a9b5..3da78b58 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -103,6 +103,10 @@ Var FromCoffeeDrink1BathPro = 0 Var WednesdayMelonPro = 0 Var FromWednesdayMelonPro = 0 +; Enable Nam Hom Coconut, 3 - 21 June +Var NamHomCoconutPro = 0 +Var FromNamHomCoconutPro = 0 + Var NewCollectPoint = 1 Var NewFlowPaymentCode = 0 @@ -283,6 +287,13 @@ If SystemDateMonthInt = 5 Then EndIf If SystemDateMonthInt = 6 Then + + If SystemDateDayInt >= 3 Then + If SystemDateDayInt <= 21 Then + Var NamHomCoconutPro = 1 + EndIf + EndIf + If SystemDateDayInt = 5 Then Var WednesdayMelonPro = 1 EndIf @@ -290,6 +301,7 @@ If SystemDateMonthInt = 6 Then If SystemDateDayInt = 12 Then Var WednesdayMelonPro = 1 EndIf + EndIf @@ -423,12 +435,18 @@ If taobin_nopro = "true" Then Var LipitPro = 0 Var WednesdayMelonPro = 0 - + Var NamHomCoconutPro = 0 Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00" EndIf +If CoconutSyrupEnable = "true" Then + +Else + Var NamHomCoconutPro = 0 +EndIf + If MelonSyrupEnable = "true" Then Else diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 9688968c..4abbc737 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -231,6 +231,11 @@ wednesday_melon_original_prices = {} wednesday_melon_fix_price = False + if current_file_name == "page_catalog_group_pro_nam_hom_coconut.skt": + from_nam_hom_coconut = True + else: + from_nam_hom_coconut = False + #print ("######################################################################################################") idx_of_eng = 2 out_xml(' \r\n') @@ -549,6 +554,9 @@ if from_tea_time_pro: out_xml( '\t\tVar FromTeaTimePro = 1 \r\n') + if from_nam_hom_coconut: + out_xml( '\t\tVar FromNamHomCoconutPro = 1 \r\n') + out_xml( '\t\t\r\n') out_xml( '\t\t'+ button_add_string +'\r\n') @@ -1140,6 +1148,9 @@ if wednesday_melon_fix_price: out_xml( '\t\tVar FromWednesdayMelonPro = 1 \r\n') + + if from_nam_hom_coconut: + out_xml( '\t\tVar FromNamHomCoconutPro = 1 \r\n') out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 19718b2f..a953f780 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -201,6 +201,7 @@ STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable STRCONTAIN "1206" MaterialAvailable EnergyDrinkEnable + STRCONTAIN "1216" MaterialAvailable CoconutSyrupEnable ;Var AppFastEnable = "false" If AppFastEnable = "true" Then diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 3efd8546..f226d76c 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -905,6 +905,7 @@ Var FromPowerUpPro = 0 Var FromEnergyDrink1BathPro = 0 Var FromCoffeeDrink1BathPro = 0 + Var FromNamHomCoconutPro = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"