diff --git a/image/event/oreo_11/bn_close_en.png b/image/event/oreo_11/bn_close_en.png new file mode 100644 index 00000000..74a26717 Binary files /dev/null and b/image/event/oreo_11/bn_close_en.png differ diff --git a/image/event/oreo_11/bn_close_th.png b/image/event/oreo_11/bn_close_th.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/event/oreo_11/bn_close_th.png differ diff --git a/image/event/oreo_11/bp_close_en.png b/image/event/oreo_11/bp_close_en.png new file mode 100644 index 00000000..60a3529a Binary files /dev/null and b/image/event/oreo_11/bp_close_en.png differ diff --git a/image/event/oreo_11/bp_close_th.png b/image/event/oreo_11/bp_close_th.png new file mode 100644 index 00000000..92966e14 Binary files /dev/null and b/image/event/oreo_11/bp_close_th.png differ diff --git a/image/event/oreo_11/error_en.png b/image/event/oreo_11/error_en.png new file mode 100644 index 00000000..e1ddfe2c Binary files /dev/null and b/image/event/oreo_11/error_en.png differ diff --git a/image/event/oreo_11/error_th.png b/image/event/oreo_11/error_th.png new file mode 100644 index 00000000..21f62b66 Binary files /dev/null and b/image/event/oreo_11/error_th.png differ diff --git a/image/event/weekday_discount/weekday_discount_en.png b/image/event/weekday_discount/weekday_discount_en.png index 3bf8e854..d14c9fc5 100644 Binary files a/image/event/weekday_discount/weekday_discount_en.png and b/image/event/weekday_discount/weekday_discount_en.png differ diff --git a/image/event/weekday_discount/weekday_discount_th.png b/image/event/weekday_discount/weekday_discount_th.png index dead3fe8..12d90a8d 100644 Binary files a/image/event/weekday_discount/weekday_discount_th.png and b/image/event/weekday_discount/weekday_discount_th.png differ diff --git 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 index 288045f6..6f56c367 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git 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 index 86017288..0269f25f 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git 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 index ca5db1f2..4a6ba5da 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index a52f54cd..da32d17e 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git 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 index 96bb598e..bf9af139 100644 Binary files a/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git 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 index 5fbce028..f487f23d 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git 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 index 02cbd838..5aeb97d8 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git 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 index e431ff4a..8567c500 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git 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 index b36cdb54..97efd131 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git 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 index 91236ee5..bd97a58e 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git 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 index 88b71dbf..4db0df11 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git 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 index fe8b1918..5f61d1bd 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git 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 index c4005f55..9e3cf367 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git 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 index 62a6e0da..47943c84 100644 Binary files a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git 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 index c31e9f65..b3bfd54b 100644 Binary files a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git 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 index 8cf77999..569f9eb1 100644 Binary files a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git 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 index c3fb01dd..5a5a75ff 100644 Binary files a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index 017ad315..5bb8cb5c 100644 Binary files a/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png index 531726df..4aa6e1f9 100644 Binary files a/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 71f8ae79..204ae3a4 100644 Binary files a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index f425eff3..a4a64b83 100644 Binary files a/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index 61a8a939..3c1f7b52 100644 Binary files a/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index 40c56b09..5d47da50 100644 Binary files a/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index 2031a5cc..0872c63d 100644 Binary files a/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png index 03c4ff3b..6f6d85c1 100644 Binary files a/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index ea564c59..aa5dec57 100644 Binary files a/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index e9c73722..f8f2599a 100644 Binary files a/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png index f0b59abf..3ad303c9 100644 Binary files a/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png index 75c0b99a..be8e05ad 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png index 02530c9a..ed5099e6 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png index 15600ae3..5c3981ed 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index 597f1741..12096642 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png index dd9bcb96..7a657aed 100644 Binary files a/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 0e710c49..a2a025ca 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index 2bd9fd10..5429706a 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index 79a102f6..927311ac 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index fb2fcf13..348d9e3d 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index 7575a54b..439d3f3f 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png index 3feff72d..5033140e 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index 810dcee6..615e24cd 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index 0077cd43..59690a32 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png b/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png index 0fb638fc..275a272a 100644 Binary files a/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png and b/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png differ diff --git a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png index 0d2f937f..7d16b518 100644 Binary files a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png index 02f57c9e..6461da68 100644 Binary files a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png index cdf7fecb..ff359034 100644 Binary files a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png index 945b1fc9..df22dc20 100644 Binary files a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index bf8e6eb8..8833f5b7 100644 Binary files a/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png index 911252d3..41e9a0b2 100644 Binary files a/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 02fc4df4..e9fc3d2c 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index 5c71d34b..ab780483 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index 348ddd93..09b13482 100644 Binary files a/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index bcb4abca..444cd915 100644 Binary files a/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index a9bace01..2271d8c4 100644 Binary files a/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png index 3ac0b8c6..942f80a8 100644 Binary files a/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index d046d5d5..afb6e374 100644 Binary files a/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index 25a8f87e..3d74831f 100644 Binary files a/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png index a3b5b81b..27209c4a 100644 Binary files a/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 313fd83a..f0a6522f 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -56,14 +56,10 @@ Else If ProEnableCount > 1 Then - If FromBeforeGoToOreo = 1 Then - If WeekdayDiscountProEventOn = 1 Then - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml" - Else - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml" - EndIf + If WeekdayDiscountProEventOn = 1 Then + Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml" Else - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml" + Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml" EndIf Else diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 6b23a6c0..fd684a53 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -138,7 +138,7 @@ Var JemilaRewardOutOfStock = 0 Var HalloweenPro = 0 Var FromHalloweenPro = 0 -; Weekday discount, 4 Nov - 31 Dec +; Weekday discount, 4 Nov - 30 Nov Var WeekdayDiscountPro = 0 Var WeekdayDiscountProEventOn = 0 Var FromWeekdayDiscountProEventOn = 0 @@ -475,7 +475,7 @@ EndIf If OreoEnable = "true" Then - + Else Var OreoDiscount11Pro = 0 EndIf @@ -489,6 +489,11 @@ Var CurrentMainVideoTemp = 0 READ_FILE "/mnt/sdcard/coffeevending/jemila_reward_out_of_stock" JemilaRewardOutOfStock DEBUGVAR JemilaRewardOutOfStock +READ_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" Oreo11DisableFromFile +DEBUGVAR Oreo11DisableFromFile +If Oreo11DisableFromFile = 1 Then + Var OreoDiscount11Pro = 0 +EndIf ; Control collect promotion point behavior Var New_Payment = 0 diff --git a/xml/event/weekday_discount/before_go_to_oreo_discount.xml b/xml/event/weekday_discount/before_go_to_oreo_discount.xml index 2b70c753..1929ad5f 100644 --- a/xml/event/weekday_discount/before_go_to_oreo_discount.xml +++ b/xml/event/weekday_discount/before_go_to_oreo_discount.xml @@ -7,8 +7,6 @@ Var Timeout = 0 - Var FromBeforeGoToOreo = 1 - Var SELLONLINE = 0 If SELLSTATUS = "SELLONLINE" Then Var SELLONLINE = 1 @@ -19,16 +17,16 @@ Var GettingDiscountStatus = 0 - If SELLONLINE = 1 Then - If GettingDiscountStatus = 0 Then - Var GettingDiscountStatus = 1 - Var AC = "2/0899999999" - GETACCEXT AC 38 - EndIf - Else - Var OreoDiscount11Pro = 0 - TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" - EndIf + If SELLONLINE = 1 Then + If GettingDiscountStatus = 0 Then + Var GettingDiscountStatus = 1 + Var AC = "2/0899999999" + GETACCEXT AC 38 + EndIf + Else + Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml" + EndIf + @@ -38,33 +36,41 @@ Var Timeout = Timeout + 1 If Timeout > 5 Then - Var OreoDiscount11Pro = 0 - TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml" EndIf + + Refresh + TimerReset If GettingDiscountStatus = 1 Then - + DEBUGVAR Ext1a If Ext1a = "ok" Then - Var cupCount = Ext1b - INT cupCount + Var cupCount = Ext1b + INT cupCount - DEBUGVAR cupCount - SAVELOG "Ext1a=ok get oreo qoutar" - Else - SAVELOG "Ext1a=error not oreo qoutar" + DEBUGVAR cupCount + + Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml" + Else + If Ext1a = "error" Then + WRITE_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" "1" + + Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml" + EndIf EndIf - TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" EndIf + ;include="ROOT/taobin_project/xml/menu_catalog_new.xml" + 493 968 94 94 - LOADING_STATE + "Enable "ROOT/taobin_project/image/page_payment_en/page_payment/loading.gif" \ No newline at end of file diff --git a/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml b/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml index 6f3c230e..487a05a8 100644 --- a/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml +++ b/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml @@ -118,7 +118,7 @@ "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png" - Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml" + Open "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml" @@ -3190,7 +3190,7 @@ SMOOTHIE" Var NameDrink = "ICED SUPER COCOA X3" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3" - Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3272,7 +3272,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 2x นม และน้ำตาล" + "โกโก้ 3x นม และน้ำตาล" 16 @@ -3441,7 +3441,7 @@ SMOOTHIE" Var NameDrink = "ICE SUPER COCOA X2" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2" - Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3523,7 +3523,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 3x นม และน้ำตาล" + "โกโก้ 2x นม และน้ำตาล" 16 diff --git a/xml/event/weekday_discount/oreo_discount_11_error.xml b/xml/event/weekday_discount/oreo_discount_11_error.xml new file mode 100644 index 00000000..ef5f35ef --- /dev/null +++ b/xml/event/weekday_discount/oreo_discount_11_error.xml @@ -0,0 +1,53 @@ + + "Enable" + 1080 + 1920 + ; "0xeae6e1" + SoundVolume + + Var Timeout = 0 + + If show_eng = "true" Then + Var ImageError = "ROOT/taobin_project/image/event/oreo_11/error_en.png" + Var ButtonImg = "ROOT/taobin_project/image/event/oreo_11/bn_close_en.png" + Var ButtonPressedImg = "ROOT/taobin_project/image/event/oreo_11/bp_close_en.png" + Else + Var ImageError = "ROOT/taobin_project/image/event/oreo_11/error_th.png" + Var ButtonImg = "ROOT/taobin_project/image/event/oreo_11/bn_close_th.png" + Var ButtonPressedImg = "ROOT/taobin_project/image/event/oreo_11/bp_close_th.png" + EndIf + + + + 1000 + + Var Timeout = Timeout + 1 + + If Timeout > 5 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + Refresh + TimerReset + + + + + + 0 + 380 + ImageError + + + + + + \ No newline at end of file diff --git a/xml/event/weekday_discount/promotion_oreo_discount_11.xml b/xml/event/weekday_discount/promotion_oreo_discount_11.xml index 3a63457a..1f13104e 100644 --- a/xml/event/weekday_discount/promotion_oreo_discount_11.xml +++ b/xml/event/weekday_discount/promotion_oreo_discount_11.xml @@ -3876,7 +3876,7 @@ SMOOTHIE" Var NameDrink = "ICED SUPER COCOA X3" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3" - Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3958,7 +3958,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 2x นม และน้ำตาล" + "โกโก้ 3x นม และน้ำตาล" 16 @@ -4127,7 +4127,7 @@ SMOOTHIE" Var NameDrink = "ICE SUPER COCOA X2" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2" - Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount.png" Var OpenFromXML = CurrentXMLFileName2 @@ -4209,7 +4209,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 3x นม และน้ำตาล" + "โกโก้ 2x นม และน้ำตาล" 16 @@ -5158,7 +5158,7 @@ SMOOTHIE" - Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml" + Open "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml" diff --git a/xml/event/weekday_discount/promotion_weekday_discount.xml b/xml/event/weekday_discount/promotion_weekday_discount.xml index d63b836c..80f8f928 100644 --- a/xml/event/weekday_discount/promotion_weekday_discount.xml +++ b/xml/event/weekday_discount/promotion_weekday_discount.xml @@ -2893,7 +2893,7 @@ SMOOTHIE" Var NameDrink = "ICED SUPER COCOA X3" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3" - Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2975,7 +2975,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 2x นม และน้ำตาล" + "โกโก้ 3x นม และน้ำตาล" 16 @@ -3144,7 +3144,7 @@ SMOOTHIE" Var NameDrink = "ICE SUPER COCOA X2" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2" - Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3226,7 +3226,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 3x นม และน้ำตาล" + "โกโก้ 2x นม และน้ำตาล" 16 diff --git a/xml/event/weekday_discount/promotion_weekday_discount_event_on.xml b/xml/event/weekday_discount/promotion_weekday_discount_event_on.xml index 49a36b26..9c2adba9 100644 --- a/xml/event/weekday_discount/promotion_weekday_discount_event_on.xml +++ b/xml/event/weekday_discount/promotion_weekday_discount_event_on.xml @@ -3874,7 +3874,7 @@ SMOOTHIE" Var NameDrink = "ICED SUPER COCOA X3" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3" - Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3956,7 +3956,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 2x นม และน้ำตาล" + "โกโก้ 3x นม และน้ำตาล" 16 @@ -4125,7 +4125,7 @@ SMOOTHIE" Var NameDrink = "ICE SUPER COCOA X2" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2" - Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -4207,7 +4207,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 3x นม และน้ำตาล" + "โกโก้ 2x นม และน้ำตาล" 16