diff --git a/image/collectiing_en/img_popup11-GBR.png b/image/collectiing_en/img_popup11-GBR.png index 354116ea..61b28380 100644 Binary files a/image/collectiing_en/img_popup11-GBR.png and b/image/collectiing_en/img_popup11-GBR.png differ diff --git a/image/collectiing_en/img_popup15-GBR.png b/image/collectiing_en/img_popup15-GBR.png index 0c0c24fe..4ccfa441 100644 Binary files a/image/collectiing_en/img_popup15-GBR.png and b/image/collectiing_en/img_popup15-GBR.png differ diff --git a/image/display_point_en/text5-GBR.png b/image/display_point_en/text5-GBR.png index 8d113e78..6c0130ed 100644 Binary files a/image/display_point_en/text5-GBR.png and b/image/display_point_en/text5-GBR.png differ diff --git a/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png b/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png index 87bc0b69..f4fc72d3 100644 Binary files a/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png and b/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png b/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png index b1096dde..5965fe1b 100644 Binary files a/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png and b/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png index a89624e1..9eabbdfc 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png index a8afdb9f..543e0142 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png index 765f4b2c..580711f5 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png index 29142677..019fc048 100644 Binary files a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png and b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.png b/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.png index 530b7ae1..d79d4c00 100644 Binary files a/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.png and b/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png b/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png index 9c561745..6270454c 100644 Binary files a/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png and b/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png b/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png index 49940d92..c8c0ebb8 100644 Binary files a/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png and b/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Coconut_Milk_Smoothie.png b/image/page_drink_disable_n2/bn_Coconut_Milk_Smoothie.png index 325c548c..37eb57a4 100644 Binary files a/image/page_drink_disable_n2/bn_Coconut_Milk_Smoothie.png and b/image/page_drink_disable_n2/bn_Coconut_Milk_Smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png b/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png index 2977dfa6..06b740e1 100644 Binary files a/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png and b/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie.png new file mode 100644 index 00000000..68c85ff8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png new file mode 100644 index 00000000..7bf594f6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png b/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png index e7e8de9d..84ab4754 100644 Binary files a/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png and b/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png index 4dfe2a45..5f1d06c4 100644 Binary files a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png and b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png differ diff --git a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png index 587eb1bd..60f785a4 100644 Binary files a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png and b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png differ diff --git a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png index e02ab582..cf77c567 100644 Binary files a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png and b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png index fcda71ed..2c5eb0cb 100644 Binary files a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png and b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png differ diff --git a/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png b/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png index 48469692..1422a1d8 100644 Binary files a/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png and b/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png differ diff --git a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png index 789fff48..7d255093 100644 Binary files a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png and b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png index 729858b4..30a47fcd 100644 Binary files a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png and b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png b/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png index 93d4096f..a7edcf83 100644 Binary files a/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png and b/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png index 43ce6bd2..2ff8ce32 100644 Binary files a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_PEPSI_Coaco_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_PEPSI_Coaco_Oreo_smoothie.png new file mode 100644 index 00000000..3e721f1c Binary files /dev/null and b/image/page_drink_disable_n2/bn_PEPSI_Coaco_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_PEPSI_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_PEPSI_Oreo_smoothie.png new file mode 100644 index 00000000..9424b2f0 Binary files /dev/null and b/image/page_drink_disable_n2/bn_PEPSI_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png index b80cb039..995e4f1c 100644 Binary files a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png and b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png b/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png index 15b4a541..f58cb8c6 100644 Binary files a/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png and b/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png b/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png index 1e7b5e80..31be2f58 100644 Binary files a/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png and b/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png b/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png index b6703024..0786d74a 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png and b/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Oliang.png b/image/page_drink_disable_n2/bn_iced_Oliang.png index 6b27240c..51f4c7a0 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Oliang.png and b/image/page_drink_disable_n2/bn_iced_Oliang.png differ diff --git a/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png b/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png index b5d6e9d5..0c5a330b 100644 Binary files a/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png and b/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png differ diff --git a/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png b/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png index 3efde667..a5d26ce1 100644 Binary files a/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png and b/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png differ diff --git a/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie.png new file mode 100644 index 00000000..2785e69d Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_oreo.png b/image/page_drink_disable_n2/bn_smoothie_oreo.png index 087e03a4..ae35aeac 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_oreo.png and b/image/page_drink_disable_n2/bn_smoothie_oreo.png differ diff --git a/image/page_drink_disable_n2/bn_super_oreo_volcano.png b/image/page_drink_disable_n2/bn_super_oreo_volcano.png index 14707166..22122c4b 100644 Binary files a/image/page_drink_disable_n2/bn_super_oreo_volcano.png and b/image/page_drink_disable_n2/bn_super_oreo_volcano.png differ diff --git a/image/page_drink_n/bn_BananaOreo_smoothie.png b/image/page_drink_n/bn_BananaOreo_smoothie.png index ce69a043..d4e04f11 100644 Binary files a/image/page_drink_n/bn_BananaOreo_smoothie.png and b/image/page_drink_n/bn_BananaOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_CaramelOreo_smoothie.png b/image/page_drink_n/bn_CaramelOreo_smoothie.png index 85cd787d..4a4aaa55 100644 Binary files a/image/page_drink_n/bn_CaramelOreo_smoothie.png and b/image/page_drink_n/bn_CaramelOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png index 2ab92f43..30665bdd 100644 Binary files a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png index b6ade681..b2bfd4c3 100644 Binary files a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png index 176ca140..f8439941 100644 Binary files a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_ChocoOreo_smoothie.png b/image/page_drink_n/bn_ChocoOreo_smoothie.png index 691e63da..d5e18661 100644 Binary files a/image/page_drink_n/bn_ChocoOreo_smoothie.png and b/image/page_drink_n/bn_ChocoOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.png b/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.png index b210626b..9bc407ad 100644 Binary files a/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.png and b/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.png differ diff --git a/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png b/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png index 7b9e1fd2..a62f9458 100644 Binary files a/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png and b/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png differ diff --git a/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png b/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png index 841c59bf..83836448 100644 Binary files a/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png and b/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png differ diff --git a/image/page_drink_n/bn_Coconut_Milk_Smoothie.png b/image/page_drink_n/bn_Coconut_Milk_Smoothie.png index c3fcb391..d8bb162f 100644 Binary files a/image/page_drink_n/bn_Coconut_Milk_Smoothie.png and b/image/page_drink_n/bn_Coconut_Milk_Smoothie.png differ diff --git a/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png b/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png index a0472177..ca2a5c27 100644 Binary files a/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png and b/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png differ diff --git a/image/page_drink_n/bn_Coconut_Oreo_smoothie.png b/image/page_drink_n/bn_Coconut_Oreo_smoothie.png new file mode 100644 index 00000000..c704d4e5 Binary files /dev/null and b/image/page_drink_n/bn_Coconut_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie.png b/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie.png new file mode 100644 index 00000000..607486dd Binary files /dev/null and b/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_HojichaOreo_smoothie.png b/image/page_drink_n/bn_HojichaOreo_smoothie.png index e8e71a88..253bdfac 100644 Binary files a/image/page_drink_n/bn_HojichaOreo_smoothie.png and b/image/page_drink_n/bn_HojichaOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Iced_chrysanthemum_milk.png b/image/page_drink_n/bn_Iced_chrysanthemum_milk.png index 1c361bf5..67cf659d 100644 Binary files a/image/page_drink_n/bn_Iced_chrysanthemum_milk.png and b/image/page_drink_n/bn_Iced_chrysanthemum_milk.png differ diff --git a/image/page_drink_n/bn_Iced_chrysanthemum_tea.png b/image/page_drink_n/bn_Iced_chrysanthemum_tea.png index db72cdd6..606be9d7 100644 Binary files a/image/page_drink_n/bn_Iced_chrysanthemum_tea.png and b/image/page_drink_n/bn_Iced_chrysanthemum_tea.png differ diff --git a/image/page_drink_n/bn_Iced_taiwan_milk_tea.png b/image/page_drink_n/bn_Iced_taiwan_milk_tea.png index aecae64b..caf82e69 100644 Binary files a/image/page_drink_n/bn_Iced_taiwan_milk_tea.png and b/image/page_drink_n/bn_Iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png b/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png index ddc25c65..d48e0665 100644 Binary files a/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png and b/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png differ diff --git a/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png b/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png index 6c3396fb..9b86b826 100644 Binary files a/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png and b/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png differ diff --git a/image/page_drink_n/bn_Matcha_Latte_Premium.png b/image/page_drink_n/bn_Matcha_Latte_Premium.png index cec2253a..09e72c4b 100644 Binary files a/image/page_drink_n/bn_Matcha_Latte_Premium.png and b/image/page_drink_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_n/bn_Matcha_Latte_X3.png b/image/page_drink_n/bn_Matcha_Latte_X3.png index efe2bf2e..3d8be959 100644 Binary files a/image/page_drink_n/bn_Matcha_Latte_X3.png and b/image/page_drink_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_n/bn_MelonOreo_smoothie.png b/image/page_drink_n/bn_MelonOreo_smoothie.png index a4a6525d..93f54437 100644 Binary files a/image/page_drink_n/bn_MelonOreo_smoothie.png and b/image/page_drink_n/bn_MelonOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Mint_Oreo_smoothie.png b/image/page_drink_n/bn_Mint_Oreo_smoothie.png index 8b0dba14..ff4058a1 100644 Binary files a/image/page_drink_n/bn_Mint_Oreo_smoothie.png and b/image/page_drink_n/bn_Mint_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_PEPSI_Coaco_Oreo_smoothie.png b/image/page_drink_n/bn_PEPSI_Coaco_Oreo_smoothie.png new file mode 100644 index 00000000..a1acdcf9 Binary files /dev/null and b/image/page_drink_n/bn_PEPSI_Coaco_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_PEPSI_Oreo_smoothie.png b/image/page_drink_n/bn_PEPSI_Oreo_smoothie.png new file mode 100644 index 00000000..d3206625 Binary files /dev/null and b/image/page_drink_n/bn_PEPSI_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_PinkOreo_smoothie.png b/image/page_drink_n/bn_PinkOreo_smoothie.png index 509dc6cf..0abca711 100644 Binary files a/image/page_drink_n/bn_PinkOreo_smoothie.png and b/image/page_drink_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_StrawberrOreo_smoothie.png b/image/page_drink_n/bn_StrawberrOreo_smoothie.png index 0e505f41..916c848b 100644 Binary files a/image/page_drink_n/bn_StrawberrOreo_smoothie.png and b/image/page_drink_n/bn_StrawberrOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Yuzu Milk_Oreo_Volcano.png b/image/page_drink_n/bn_Yuzu Milk_Oreo_Volcano.png new file mode 100644 index 00000000..8ea638f5 Binary files /dev/null and b/image/page_drink_n/bn_Yuzu Milk_Oreo_Volcano.png differ diff --git a/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png b/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png index cfe7d77f..7a0e0ad4 100644 Binary files a/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png and b/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png differ diff --git a/image/page_drink_n/bn_iced_Oliang.png b/image/page_drink_n/bn_iced_Oliang.png index 2bbeeb19..97c6bd05 100644 Binary files a/image/page_drink_n/bn_iced_Oliang.png and b/image/page_drink_n/bn_iced_Oliang.png differ diff --git a/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png b/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png index 1202e70c..0a991692 100644 Binary files a/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png and b/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png differ diff --git a/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png b/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png index 8b124e17..d805cc66 100644 Binary files a/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png and b/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png differ diff --git a/image/page_drink_n/bn_jasmine_Oreo_smoothie.png b/image/page_drink_n/bn_jasmine_Oreo_smoothie.png new file mode 100644 index 00000000..5e4ea4ef Binary files /dev/null and b/image/page_drink_n/bn_jasmine_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_smoothie_oreo.png b/image/page_drink_n/bn_smoothie_oreo.png index 3479c937..d5fb1b07 100644 Binary files a/image/page_drink_n/bn_smoothie_oreo.png and b/image/page_drink_n/bn_smoothie_oreo.png differ diff --git a/image/page_drink_n/bn_super_oreo_volcano.png b/image/page_drink_n/bn_super_oreo_volcano.png index 8eb0ae9d..f0e9b70d 100644 Binary files a/image/page_drink_n/bn_super_oreo_volcano.png and b/image/page_drink_n/bn_super_oreo_volcano.png differ diff --git a/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png b/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png index b9354148..52265eec 100644 Binary files a/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png and b/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_CaramelOreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_CaramelOreo_smoothie_oreo.png new file mode 100644 index 00000000..40f78c2b Binary files /dev/null and b/image/page_drink_picture2_n/bn_CaramelOreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..53017ec7 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..d835c8ba Binary files /dev/null and b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..05a50e18 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/image/page_drink_picture2_n/bn_ChocoOreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_ChocoOreo_smoothie_oreo.png new file mode 100644 index 00000000..3deede7e Binary files /dev/null and b/image/page_drink_picture2_n/bn_ChocoOreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_Coconut_Milk_Cocoa_Smoothie.png b/image/page_drink_picture2_n/bn_Coconut_Milk_Cocoa_Smoothie.png index 7e77175d..49e50c7f 100644 Binary files a/image/page_drink_picture2_n/bn_Coconut_Milk_Cocoa_Smoothie.png and b/image/page_drink_picture2_n/bn_Coconut_Milk_Cocoa_Smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png b/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png index 02ab1ef0..44e3a4c3 100644 Binary files a/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png and b/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png b/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png index 3054bf2f..7ed4a7d4 100644 Binary files a/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png and b/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Coconut_Milk_Smoothie.png b/image/page_drink_picture2_n/bn_Coconut_Milk_Smoothie.png index a0b3740f..5e90e05e 100644 Binary files a/image/page_drink_picture2_n/bn_Coconut_Milk_Smoothie.png and b/image/page_drink_picture2_n/bn_Coconut_Milk_Smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png b/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png index c14ff73c..79291574 100644 Binary files a/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png and b/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Coconut_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_Coconut_Oreo_smoothie.png new file mode 100644 index 00000000..102adaf1 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Coconut_Oreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Ginger_milk_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_Ginger_milk_Oreo_smoothie.png new file mode 100644 index 00000000..a0f2e983 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ginger_milk_Oreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_HojichaOreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_HojichaOreo_smoothie_oreo.png new file mode 100644 index 00000000..8ce6347b Binary files /dev/null and b/image/page_drink_picture2_n/bn_HojichaOreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_Iced_chrysanthemum_milk.png b/image/page_drink_picture2_n/bn_Iced_chrysanthemum_milk.png index 0cb25bcd..5aa33302 100644 Binary files a/image/page_drink_picture2_n/bn_Iced_chrysanthemum_milk.png and b/image/page_drink_picture2_n/bn_Iced_chrysanthemum_milk.png differ diff --git a/image/page_drink_picture2_n/bn_Iced_chrysanthemum_tea.png b/image/page_drink_picture2_n/bn_Iced_chrysanthemum_tea.png index cf9eb97b..4718c1ac 100644 Binary files a/image/page_drink_picture2_n/bn_Iced_chrysanthemum_tea.png and b/image/page_drink_picture2_n/bn_Iced_chrysanthemum_tea.png differ diff --git a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png index ef0681ee..b187a2fb 100644 Binary files a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png and b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png index 5229cb70..61b24a62 100644 Binary files a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png and b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png differ diff --git a/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png b/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png index b3c84f07..4f2fd0e5 100644 Binary files a/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png and b/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png differ diff --git a/image/page_drink_picture2_n/bn_MelonOreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_MelonOreo_smoothie_oreo.png new file mode 100644 index 00000000..767dd74a Binary files /dev/null and b/image/page_drink_picture2_n/bn_MelonOreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie_oreo.png new file mode 100644 index 00000000..723de85c Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png index fa7639c8..b434ea76 100644 Binary files a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png and b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png b/image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png index 5191446e..26c6566d 100644 Binary files a/image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png and b/image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_YUZU_Oreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_YUZU_Oreo_smoothie_oreo.png new file mode 100644 index 00000000..75fa39a2 Binary files /dev/null and b/image/page_drink_picture2_n/bn_YUZU_Oreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png b/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png index 0115d93b..6186d5a8 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png and b/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Oliang.png b/image/page_drink_picture2_n/bn_iced_Oliang.png index 7ba09334..39feac5b 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Oliang.png and b/image/page_drink_picture2_n/bn_iced_Oliang.png differ diff --git a/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png b/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png index 089053b9..35296ab5 100644 Binary files a/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png and b/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png differ diff --git a/image/page_drink_picture2_n/bn_iced_fruit_punch_Yuzu_Jemila.png b/image/page_drink_picture2_n/bn_iced_fruit_punch_Yuzu_Jemila.png index 7622e8c6..34c5a4b3 100644 Binary files a/image/page_drink_picture2_n/bn_iced_fruit_punch_Yuzu_Jemila.png and b/image/page_drink_picture2_n/bn_iced_fruit_punch_Yuzu_Jemila.png differ diff --git a/image/page_drink_picture2_n/bn_jasmine_Oreo_smoothie_oreo.png b/image/page_drink_picture2_n/bn_jasmine_Oreo_smoothie_oreo.png new file mode 100644 index 00000000..331b9252 Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_Oreo_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_oreo.png b/image/page_drink_picture2_n/bn_smoothie_oreo.png index b584d63f..bf05bb89 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_oreo.png and b/image/page_drink_picture2_n/bn_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount.png b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount.png index bd51445d..b0e3c75f 100644 Binary files a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount.png and b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount.png differ diff --git a/image/page_drink_press_n/bn_BananaOreo_smoothie.png b/image/page_drink_press_n/bn_BananaOreo_smoothie.png index 2a77b9a4..556c917d 100644 Binary files a/image/page_drink_press_n/bn_BananaOreo_smoothie.png and b/image/page_drink_press_n/bn_BananaOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_CaramelOreo_smoothie.png b/image/page_drink_press_n/bn_CaramelOreo_smoothie.png index 161d3b9d..4dce2ec2 100644 Binary files a/image/page_drink_press_n/bn_CaramelOreo_smoothie.png and b/image/page_drink_press_n/bn_CaramelOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png index 45652894..4742d90a 100644 Binary files a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png index 8c205fa9..54520cff 100644 Binary files a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png index 2eda5305..7c5fc297 100644 Binary files a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_ChocoOreo_smoothie.png b/image/page_drink_press_n/bn_ChocoOreo_smoothie.png index 7ac7807b..d3c8479c 100644 Binary files a/image/page_drink_press_n/bn_ChocoOreo_smoothie.png and b/image/page_drink_press_n/bn_ChocoOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Coconut_Milk_Cocoa_Smoothie.png b/image/page_drink_press_n/bn_Coconut_Milk_Cocoa_Smoothie.png index 6e067cf6..b3951e9a 100644 Binary files a/image/page_drink_press_n/bn_Coconut_Milk_Cocoa_Smoothie.png and b/image/page_drink_press_n/bn_Coconut_Milk_Cocoa_Smoothie.png differ diff --git a/image/page_drink_press_n/bn_Coconut_Milk_Coffee_Smoothie.png b/image/page_drink_press_n/bn_Coconut_Milk_Coffee_Smoothie.png index 6de57395..78311d7f 100644 Binary files a/image/page_drink_press_n/bn_Coconut_Milk_Coffee_Smoothie.png and b/image/page_drink_press_n/bn_Coconut_Milk_Coffee_Smoothie.png differ diff --git a/image/page_drink_press_n/bn_Coconut_Milk_Matcha_Smoothie.png b/image/page_drink_press_n/bn_Coconut_Milk_Matcha_Smoothie.png index eb6f8769..bec5dee2 100644 Binary files a/image/page_drink_press_n/bn_Coconut_Milk_Matcha_Smoothie.png and b/image/page_drink_press_n/bn_Coconut_Milk_Matcha_Smoothie.png differ diff --git a/image/page_drink_press_n/bn_Coconut_Milk_Smoothie.png b/image/page_drink_press_n/bn_Coconut_Milk_Smoothie.png index 98c9f979..38b38494 100644 Binary files a/image/page_drink_press_n/bn_Coconut_Milk_Smoothie.png and b/image/page_drink_press_n/bn_Coconut_Milk_Smoothie.png differ diff --git a/image/page_drink_press_n/bn_Coconut_Milk_Strawberry_Smoothie.png b/image/page_drink_press_n/bn_Coconut_Milk_Strawberry_Smoothie.png index 1dace103..669f6435 100644 Binary files a/image/page_drink_press_n/bn_Coconut_Milk_Strawberry_Smoothie.png and b/image/page_drink_press_n/bn_Coconut_Milk_Strawberry_Smoothie.png differ diff --git a/image/page_drink_press_n/bn_Coconut_Oreo_smoothie.png b/image/page_drink_press_n/bn_Coconut_Oreo_smoothie.png new file mode 100644 index 00000000..1911769f Binary files /dev/null and b/image/page_drink_press_n/bn_Coconut_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Ginger_milk_Oreo_smoothie.png b/image/page_drink_press_n/bn_Ginger_milk_Oreo_smoothie.png new file mode 100644 index 00000000..ee994e7b Binary files /dev/null and b/image/page_drink_press_n/bn_Ginger_milk_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_HojichaOreo_smoothie.png b/image/page_drink_press_n/bn_HojichaOreo_smoothie.png index 5d83056e..01809752 100644 Binary files a/image/page_drink_press_n/bn_HojichaOreo_smoothie.png and b/image/page_drink_press_n/bn_HojichaOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Iced_chrysanthemum_milk.png b/image/page_drink_press_n/bn_Iced_chrysanthemum_milk.png index 377e5ca6..9ba64453 100644 Binary files a/image/page_drink_press_n/bn_Iced_chrysanthemum_milk.png and b/image/page_drink_press_n/bn_Iced_chrysanthemum_milk.png differ diff --git a/image/page_drink_press_n/bn_Iced_chrysanthemum_tea.png b/image/page_drink_press_n/bn_Iced_chrysanthemum_tea.png index ff2f0eaa..bd3a222a 100644 Binary files a/image/page_drink_press_n/bn_Iced_chrysanthemum_tea.png and b/image/page_drink_press_n/bn_Iced_chrysanthemum_tea.png differ diff --git a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png index 5539e741..13d49500 100644 Binary files a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png and b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png index abb79ec2..5f00e70b 100644 Binary files a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png and b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png differ diff --git a/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png b/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png index c3a51553..eeef8ed7 100644 Binary files a/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png and b/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Latte_Premium.png b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png index 2ce4281c..74793a27 100644 Binary files a/image/page_drink_press_n/bn_Matcha_Latte_Premium.png and b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Latte_X3.png b/image/page_drink_press_n/bn_Matcha_Latte_X3.png index e57fc5f3..8f5bb76c 100644 Binary files a/image/page_drink_press_n/bn_Matcha_Latte_X3.png and b/image/page_drink_press_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_press_n/bn_MelonOreo_smoothie.png b/image/page_drink_press_n/bn_MelonOreo_smoothie.png index 74b796ca..1fa6679a 100644 Binary files a/image/page_drink_press_n/bn_MelonOreo_smoothie.png and b/image/page_drink_press_n/bn_MelonOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png b/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png index e2e50fb0..9e2398a6 100644 Binary files a/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_PEPSI_Coaco_Oreo_smoothie.png b/image/page_drink_press_n/bn_PEPSI_Coaco_Oreo_smoothie.png new file mode 100644 index 00000000..058ce2bb Binary files /dev/null and b/image/page_drink_press_n/bn_PEPSI_Coaco_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_PEPSI_Oreo_smoothie.png b/image/page_drink_press_n/bn_PEPSI_Oreo_smoothie.png new file mode 100644 index 00000000..985e413a Binary files /dev/null and b/image/page_drink_press_n/bn_PEPSI_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_PinkOreo_smoothie.png b/image/page_drink_press_n/bn_PinkOreo_smoothie.png index 3877ac02..7ee2631f 100644 Binary files a/image/page_drink_press_n/bn_PinkOreo_smoothie.png and b/image/page_drink_press_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_StrawberrOreo_smoothie.png b/image/page_drink_press_n/bn_StrawberrOreo_smoothie.png index daf4a903..a2e57ec0 100644 Binary files a/image/page_drink_press_n/bn_StrawberrOreo_smoothie.png and b/image/page_drink_press_n/bn_StrawberrOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Yuzu Milk_Oreo_Volcano.png b/image/page_drink_press_n/bn_Yuzu Milk_Oreo_Volcano.png new file mode 100644 index 00000000..afb27e8f Binary files /dev/null and b/image/page_drink_press_n/bn_Yuzu Milk_Oreo_Volcano.png differ diff --git a/image/page_drink_press_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png b/image/page_drink_press_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png index a60b03b2..71b1a2e6 100644 Binary files a/image/page_drink_press_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png and b/image/page_drink_press_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png differ diff --git a/image/page_drink_press_n/bn_iced_Oliang.png b/image/page_drink_press_n/bn_iced_Oliang.png index 9a878cb0..eb90f36a 100644 Binary files a/image/page_drink_press_n/bn_iced_Oliang.png and b/image/page_drink_press_n/bn_iced_Oliang.png differ diff --git a/image/page_drink_press_n/bn_iced_fruit_punch_Ume_Jemila.png b/image/page_drink_press_n/bn_iced_fruit_punch_Ume_Jemila.png index 67fa3868..fc8ee244 100644 Binary files a/image/page_drink_press_n/bn_iced_fruit_punch_Ume_Jemila.png and b/image/page_drink_press_n/bn_iced_fruit_punch_Ume_Jemila.png differ diff --git a/image/page_drink_press_n/bn_iced_fruit_punch_Yuzu_Jemila.png b/image/page_drink_press_n/bn_iced_fruit_punch_Yuzu_Jemila.png index 0113944f..ab22d3f1 100644 Binary files a/image/page_drink_press_n/bn_iced_fruit_punch_Yuzu_Jemila.png and b/image/page_drink_press_n/bn_iced_fruit_punch_Yuzu_Jemila.png differ diff --git a/image/page_drink_press_n/bn_jasmine_Oreo_smoothie.png b/image/page_drink_press_n/bn_jasmine_Oreo_smoothie.png new file mode 100644 index 00000000..180afeb8 Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_smoothie_oreo.png b/image/page_drink_press_n/bn_smoothie_oreo.png index 3248e8ed..d6774cc6 100644 Binary files a/image/page_drink_press_n/bn_smoothie_oreo.png and b/image/page_drink_press_n/bn_smoothie_oreo.png differ diff --git a/image/page_drink_press_n/bn_super_oreo_volcano.png b/image/page_drink_press_n/bn_super_oreo_volcano.png index 60a03b9c..dc41b528 100644 Binary files a/image/page_drink_press_n/bn_super_oreo_volcano.png and b/image/page_drink_press_n/bn_super_oreo_volcano.png differ diff --git a/image/page_payment_credit3-TopupSuccess/text_4-GBR.png b/image/page_payment_credit3-TopupSuccess/text_4-GBR.png new file mode 100644 index 00000000..aac11f4c Binary files /dev/null and b/image/page_payment_credit3-TopupSuccess/text_4-GBR.png differ diff --git a/image/page_payment_en/page_payment/text_4-GBR.png b/image/page_payment_en/page_payment/text_4-GBR.png index 8b7674cb..aac11f4c 100644 Binary files a/image/page_payment_en/page_payment/text_4-GBR.png and b/image/page_payment_en/page_payment/text_4-GBR.png differ diff --git a/inter/gbr/video/script_video.ev b/inter/gbr/video/script_video.ev index 954d62f7..a638e778 100644 --- a/inter/gbr/video/script_video.ev +++ b/inter/gbr/video/script_video.ev @@ -23,36 +23,14 @@ If SystemDateMonthInt = 1 Then Var EventNewYear = 1 EndIf EndIf - - If SystemDateDayInt <= 31 Then - GetFileSizeK "taobin_project/inter/gbr/video/video_main_ao.mp4" MainfileSize - DEBUGVAR MainfileSize - If MainfileSize = 20796764 Then - Var EventAO = 1 - Else - DEBUGVAR "AO:Size incorrect" - EndIf - EndIf EndIf -If SystemDateMonthInt = 3 Then - GetFileSizeK "taobin_project/inter/gbr/video/video_main_StPatrick.mp4" MainfileSize - DEBUGVAR MainfileSize - If MainfileSize = 17941307 Then - Var StPatrickEvent = 1 - Else - DEBUGVAR "StPatrick: Video size incorrect" - EndIf -EndIf - -If SystemDateMonthInt = 4 Then - GetFileSizeK "taobin_project/inter/gbr/video/video_main_happy_easter.mp4" MainfileSize - DEBUGVAR MainfileSize - If MainfileSize = 21836197 Then - Var HappyEasterEvent = 1 - Else - DEBUGVAR "HappyEaster: Video size incorrect" - EndIf +GetFileSizeK "taobin_project/inter/gbr/video/video_main_ao.mp4" MainfileSize +DEBUGVAR MainfileSize +If MainfileSize = 18183048 Then + Var EventAO = 1 +Else + DEBUGVAR "AO:Size incorrect" EndIf DEBUGVAR EventNewYear @@ -68,14 +46,5 @@ Else EndIf If EventAO = 1 Then - Var VideoMainPage = "ROOT/taobin_project/inter/gbr/video/video_main_ao.mp4" -EndIf - -If StPatrickEvent = 1 Then - Var VideoMainPage = "ROOT/taobin_project/inter/gbr/video/video_main_StPatrick.mp4" -EndIf - -If HappyEasterEvent = 1 Then - Var VideoMainPage = "ROOT/taobin_project/inter/gbr/video/video_main_happy_easter.mp4" EndIf \ No newline at end of file diff --git a/inter/gbr/video/video_main_ao.mp4 b/inter/gbr/video/video_main_ao.mp4 index 1acbb7a1..c2ac6554 100644 Binary files a/inter/gbr/video/video_main_ao.mp4 and b/inter/gbr/video/video_main_ao.mp4 differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 0adf1e4d..ea29d0e9 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -2271,6 +2271,13 @@ PRICE "Reset" "-" Var CountDownPauseVideo = 1 EndIf + If CountryName = "United Kingdom" Then + If EventAO = 1 Then + Var CountDownShowButton = 0 + Var CountDownPauseVideo = 35 + EndIf + EndIf + Refresh diff --git a/xml/page_payment_cash-GBR.xml b/xml/page_payment_cash-GBR.xml new file mode 100644 index 00000000..df9134b2 --- /dev/null +++ b/xml/page_payment_cash-GBR.xml @@ -0,0 +1,2514 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + PlaySoundLag + + + Var cash_disable = "0" + READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable + DEBUGVAR cash_disable + + ;If AdultFlag = 1 Then + ; Open "ROOT/taobin_project/xml/page_payment_camera.xml" + ;EndIf + + Var ErrorCause = "" + + Var PreScaleCanculate = 100 + + Var CashlessPayFlag = 0 + Var RemainAmountStrENG = "" + Var AdultState = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState3 = "Invisible" + + ;Var AdultFlag = 0 + Var AdultFlag2 = 0 + + If AdultFlag = 1 Then + + Var AdultFlag = 0 + + DEBUGVAR SystemDate + Var sdate = "" + Var sdate = SystemDate + Var sdateday = "" + Var sdatemonth = "" + Var sdateyear = "" + SPLIT sdate "/" 1 sdateday + SPLIT sdate "/" 2 sdatemonth + SPLIT sdate "/" 3 sdateyear + INT sdateday + INT sdatemonth + INT sdateyear + READCARDID + + Var AdultState = "Enable" + Var AdultState1 = "Enable" + + Var countAdultS2 = 0 + Var AdultFlag2 = 1 + EndIf + + Var ReqPayInfoFlag2 = 0 + + + DEBUGVAR QRCODETMP + + DEBUGVAR IsSmoRet + Var countClick2 = 0 + ;SAVELOG SelectDrink + ;SAVELOG NameDrink + ;SAVELOG NameDrinkTH + ;SAVELOG DrinkDescription + SAVELOG PriceDrink + ;SAVELOG topping1 + ;SAVELOG topping2 + ;SAVELOG topping3 + DEBUGVAR SelectDrink + + DEBUGVAR video_menu_0 + + + Var FlagQROpened = 0 + Var PayInfoCFlag = 0 + Var ActionOKCase = 0 + Var VendingCampaign = Seeker.IntVendingCampaign + Var Seeker.VendingCampaign = Seeker.IntVendingCampaign + + Var PayAmount = PriceDrink + + Var LOADING_STATE = "Invisible" + ; Below original + ; On open + + Var popup_cancel_button_y = 1345 + Var PopupCancelButtonState = "Invisible" + + + Var cancelState = "Invisible" + + Var CameraState = "Invisible" + + Var EMAEnterNumberButtonState = "Invisible" + Var EMAPopupSuccessState = "Invisible" + Var EMAPopupErrorState = "Invisible" + Var QRErrorText = "Errror scanning\nthe QR code" + + Var alphaState = "Invisible" + Var alphaState2 = "Invisible" + Var alphaState3 = "Invisible" + Var alphaState3_offline = "Invisible" + + + Var CoinInFlag = 0 + ;Var CoinAmount = 0 + Var CancelFlag = 0 + Var CancelCounter = 0 + Var CoinInCounter = 0 + Var CancelNumber = 3 + + + + Var PayAmount = PriceDrink + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var RemainAmountStr = "" + RemainAmount + Var Timeout = 0 + Var PayOK = 0 + Var ChangeOK = 0 + Var CoinInOK = 0 + + Var RemainAmountKeep = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + + Var VendingREFID = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + + Var ServiceCredit = SelectDrink + Var ServiceAmount2 = PayAmount + Var Seeker.ServiceAmount2 = PayAmount + Var ServiceCharge = 0 + Var Donate = "" + Var SuggestID = "" + Var CancleState = "Enable" + + Var Seeker.VendingDiscount = DiscountDrink + + + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRErrorFlag = 0 + Var CreditCardErrorState = "Invisible" + + + SAVELOG SelectDrink + + SAVELOG QRChannel + SAVELOG QRCODE99 + DEBUGVAR QRCODE99 + + SAVELOG VendingCampaign + SAVELOG Seeker.VendingCode + SAVELOG Seeker.CodeChannel + + + If Seeker.VendingCode = "C00" Then + Var Seeker.CodeChannel = 0 + EndIf + + Var ExtendData = Seeker.ExtendData + + DEBUGVAR QRCODE99KBANK + + Var PayWithCreditCardState = "Disable" + Var PayWithTaoCreditState = "Disable" + Var PayWithCouponState = "Disable" + Var PayWithAUBState = "Disable" + Var PayWithFatzebraState = "Disable" + + If RoadShow = "true" Then + Var PayWithCreditCardState = "Invisible" + Var PayWithTaoCreditState = "Invisible" + Var PayWithCouponState = "Invisible" + Var PayWithAUBState = "Invisible" + Var PayWithFatzebraState = "Invisible" + Var showRemaining = "Free" + Else + + Var PayWithCreditCardState = "Enable" + Var PayWithTaoCreditState = "Enable" + Var PayWithCouponState = "Enable" + Var PayWithAUBState = "Enable" + Var PayWithFatzebraState = "Enable" + + If Seeker.IntVendingCredit > 0 Then + SAVELOG "Cash only IntVendingCredit" + Var PayWithCreditCardState = "Enable" + Var PayWithTaoCreditState = "Disable" + Var PayWithCouponState = "Disable" + Var PayWithAUBState = "Disable" + Var PayWithFatzebraState = "Enable" + EndIf + + + + + Var showRemaining = charOfBaht + RemainAmountStr + + If show_eng = "true" Then + Var showRemaining = charOfBaht + RemainAmountStr + Else + Var showRemaining = RemainAmountStr + " บาท" + EndIf + + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + + EndIf + + + + + Var Seeker.PayWithQR = 0 + Var NoGotoMenupage = "false" + + If GetFreeFromError = 1 Then + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + If Seeker = "curr" Then + + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + If CoinInOK = 0 Then + + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit + If SumCoinAmount >= PayAmount Then + + SAVELOG "CoinInOk First" + DEBUGVAR CoinAmount + DEBUGVAR Seeker.IntVendingCampaign + DEBUGVAR Seeker.IntVendingCredit + + ;Var VendingQRCode = "ERROR" + CoinVending OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow ) + Else + + If show_eng = "true" Then + ;Var RemainAmountStr = "Change " + Canout + ;Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow ) + Var RemainAmountStr = "Change " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + EndIf + + ;Var RemainAmount = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + If RoadShow = "true" Then + Var showRemaining = "Free" + EndIf + + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + + EndIf + + Var IsCardlessEnable = 0 + + If CoinInFlag = 0 Then + If CancelFlag = 0 Then + Coin CARD + Var IsCardlessEnable = 1 + EndIf + EndIf + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var Caution = "Caution: Food Allergy Notice" + Var Allergy = "Drinks ordered from this machine may have come in contact or contain MILK, SOY, GLUTEN or WHEAT" + + Var EnoughChange = "yes" + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + If SELLONLINE = 0 Then + SAVELOG "Credit card only NetworkStatus down" + + Var PayWithCreditCardState = "Enable" + Var PayWithTaoCreditState = "Disable" + Var PayWithCouponState = "Disable" + Var PayWithAUBState = "Disable" + Var PayWithFatzebraState = "Disable" + + Var PayOfflineMode = 1 + + Var ShowNetworkProblem = "Enable" + Var ShowNetworkProblemText = "Network error. Payment with credit card only." + Var ShowButtonClick2 = "Invisible" + + + Else + Var PayOfflineMode = 0 + + Var ShowNetworkProblem = "Invisible" + Var ShowNetworkProblemText = "" + EndIf + + DEBUGVAR NOCashFlag + + ;cancel order + If SELLSTATUS = "DEACTIVE" Then + Var SELLONLINE = 1 + EndIf + + + + Var pay_with_chanel_text = DirImage + "/text_1.png" + + + ;If DisableUsingCode = "true" Then + If DisableUsingCode = "-" Then + SAVELOG "Diable code because using topping." + Var PayWithCouponState = "Disable" + Else + + If Seeker.IntVendingCredit > 0 Then + Var pay_with_chanel_text = DirImage + "/text_2.png" + EndIf + EndIf + + Machine DoorClose + + If web_readyOK = "true" Then + + Var web_readyOK = "false" + + If web_payment = "CASH" Then + Var alphaState2 = "Enable" + EndIf + + EndIf + + __CMD "prepar-cup-from-order" 0 "-" "-" + + + ;Open "ROOT/taobin_project/xml/page_page_camera.xml" + + If RoadShow = "true" Then + Var PayWithCreditCardState = "Disable" + Var PayWithTaoCreditState = "Disable" + Var PayWithCouponState = "Disable" + Var PayWithAUBState = "Disable" + Var PayWithFatzebraState = "Disable" + EndIf + + + If EMAMemberID = "" Then + + Else + Var CameraState = "Invisible" + Var alphaState = "Enable" + Var PopupCancelButtonState = "Enable" + Var EMAEnterNumberButtonState = "Disable" + + Var popup_cancel_button_y = 1390 + + If CoinInFlag = 0 Then + If CancelFlag = 0 Then + Var QR_POPUP = "/img_popup_ema.png" + Var QRCODE99 = "" + + Var LOADING_STATE = "Enable" + + VendingQR ON + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "AUB:2:" + Var ECommerceQR = ECommerceQR + EMAMemberID + Var ECommerceQR = ECommerceQR + "/" + + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + EndIf + + If Seeker.IntVendingCredit > 0 Then + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + "|" + EndIf + Var ECommerceQR = ECommerceQR + "CRD" + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + PointCrm + EndIf + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + Var PayDetail2 = Seeker.PayDetail2 + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 6 + Refresh + EndIf + EndIf + EndIf + + + + + + + Var VendingQRTypeResult = "" + + DEBUGVAR ECommerceQR + SPLIT ECommerceQR "/" 5 VendingQRTypeResult + + + If ActionOKCase = 0 Then + If VendingREFID = "" Then + SAVELOG "menu_page4-QR.xml > ActOK_REFID" + Refresh + Else + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + SAVELOG "menu_page4-QR.xml > ActOK_make" + ;Var VendingQRCode = "ERROR" + ;Coin STANDBY + VendingQR OFF + CoinVending OFF + + If ReqPayInfoFlag2 = 0 Then + Var Seeker.CampaignPayChanel = "unknown" + EndIf + If ReqPayInfoFlag2 = 1 Then + DEBUGVAR VendingBank + Var Seeker.CampaignPayChanel = "fatzebra" + EndIf + If ReqPayInfoFlag2 = 2 Then + Var Seeker.CampaignPayChanel = "shopee" + EndIf + If ReqPayInfoFlag2 = 3 Then + Var Seeker.CampaignPayChanel = "true" + EndIf + If ReqPayInfoFlag2 = 4 Then + Var Seeker.CampaignPayChanel = "dolfin" + EndIf + If ReqPayInfoFlag2 = 5 Then + Var Seeker.CampaignPayChanel = "linepay" + EndIf + If ReqPayInfoFlag2 = 6 Then + Var Seeker.CampaignPayChanel = "aubpay" + EndIf + + + + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + ;Var TxRef1 = "" + ;CreateTxRef1 TxRef1 + EndIf + Var Seeker.PayWithQR = 1 + Var Seeker.VendingTSID = VendingTSID + + + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var BrewingTextThai = "เตรียมแก้ว" + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + If ReqPayInfoFlag = 1 Then + If VendingQRTypeResult = "FZB:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99FZB = SessionID + Var QRCODE99FZB = QRCODE99FZB + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99FZB + Var QRCODE99FZB = QRCODE99FZB + Ext21 + Var QRCODETMP = QRCODE99FZB + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 1 + SAVELOG QRCODE99FZB + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99FZB + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" + EndIf + + EndIf + + + EndIf + + If ReqPayInfoFlag = 2 Then + If VendingQRTypeResult = "AIR:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 2 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + + If ReqPayInfoFlag = 3 Then + If VendingQRTypeResult = "TWN:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 3 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + + If ReqPayInfoFlag = 4 Then + If VendingQRTypeResult = "DOL:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 4 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + + If ReqPayInfoFlag = 5 Then + If VendingQRTypeResult = "LPY:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 5 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + + If ReqPayInfoFlag = 6 Then + + SPLIT ECommerceQR "/" 6 MemberData + + If VendingQRTypeResult = "AUB" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 6 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + SPLIT MemberData ":" 1 _EMAMemberName + SPLIT MemberData ":" 2 EMAMemberSurname + SPLIT MemberData ":" 3 _EMAMemberBalance + + INT _EMAMemberBalance + + Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName) + Var _BalanceFormat = "Remain Balance: $%.2f" + Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow) + + DEBUGVAR EMAMemberName + DEBUGVAR EMAMemberSurname + DEBUGVAR EMAMemberBalance + + Var QR_POPUP = "/img_popup_ema_success.png" + + Var EMAPopupSuccessState = "Enable" + Var EMAEnterNumberButtonState = "Invisible" + Var PopupCancelButtonState = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + EndIf + EndIf + + Else + Var PayInfoCFlag = 1 + EndIf + + + If VendingCashless = "OK" Then + DEBUGVAR CashlessCode + Var Timeout = 0 + + Var CreditCardErrorState = "Invisible" + Var LOADING_STATE = "Invisible" + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + VendingQR OFF + CoinVending OFF + Refresh + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.CreditCard = 1 + Var Seeker.CreditCardRef = CreditCardRef + + CashlessReq SUCCESS "" + + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + + + DEBUGVAR ErrorCause + + If ActionOKCase = 0 Then + If ReqPayInfoFlag = 1 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorImg = "/QRError.png" + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 2 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorImg = "/QRError.png" + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 3 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorImg = "/QRError.png" + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 4 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorImg = "/QRError.png" + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 5 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorImg = "/QRError.png" + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 6 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + + ; Server error + If ErrorCause = "failed_fromoper_1000" Then + Var QRErrorText = "A server error occurred" + EndIf + + ; Member not found + If ErrorCause = "failed_fromoper_1001" Then + Var QRErrorText = "Number not found" + EndIf + + ; Not enough balance + If ErrorCause = "failed_fromoper_1002" Then + Var QRErrorText = "Insufficient Balance" + EndIf + + Var QR_POPUP = "/img_popup8-2.png" + Var EMAPopupErrorState = "Enable" + Var EMAEnterNumberButtonState = "Invisible" + Var LOADING_STATE = "Invisible" + Var popup_cancel_button_y = 1225 + EndIf + EndIf + Else + Var PayInfoCFlag = 1 + EndIf + + + If VendingCashless = "ERROR" Then + Var Timeout = 0 + + ;Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var CreditCardErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + + EndIf + + + + Refresh + + + + + + Var CreditCardRef = "" + GenHashWithTimeStamp CreditCardRef + DEBUGVAR VendingCashless + + If VendingCashless = "READY" Then + Var QRCODE99 = "" + Var Timeout = 0 + Var CreditCardErrorState = "Invisible" + Var QR_POPUP = "/img_popup8-2.png" + Var VendingCashless = "-" + Var LOADING_STATE = "Enable" + Var alphaState = "Enable" + Var PopupCancelButtonState = "Enable" + Var RemainAmountX = RemainAmount + CashlessPay RemainAmountX CreditCardRef + Var CashlessPayFlag = 1 + EndIf + + Refresh + + + + + 1000 + + If ReadyForBrew = "false" Then + SAVELOG "Back to main1" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + EndIf + + + If CamFlag = 1 Then + Var CamCount = CamCount + 1 + If CamCount > 2 Then + facecompare 10 + Var CamFlag = 0 + Var CamCount = 0 + EndIf + EndIf + + + + If AdultState2 = "Enable" Then + Var countAdultS2 = countAdultS2 + 1 + + If countAdultS2 > 60 Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + EndIf + Else + Var countAdultS2 = 0 + EndIf + + + Var Timeout = Timeout + 1 + + + If Timeout >= 120 Then + Var alphaState = "Invisible" + Var PopupCancelButtonState = "Invisible" + Var CameraState = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + Var EMAPopupErrorState = "Invisible" + + If RoadShow = "true" Then + Else + Var PayWithTaoCreditState = "Press" + Var PayWithAUBState = "Press" + Var PayWithFatzebraState = "Press" + EndIf + + Var LOADING_STATE = "Invisible" + Var QRErrorState = "Invisible" + Var CreditCardErrorState = "Invisible" + + EndIf + + + If Timeout > 210 Then + If ActionOKCase = 1 Then + Var PayInfoCFlag = 1 + EndIf + EndIf + + If PayInfoCFlag = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + + + If TestLoopMakeDrink = 1 Then + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + + If CoinInOK = 1 Then + Var CoinInCounter = CoinInCounter + 1 + If CoinInCounter = 1 Then + + SAVELOG "CoinInOk OK" + + ;Var ChangeOK = 1 + Var Timeout = 180 + Var PayOK = 1 + + EndIf + EndIf + + Var stringLog = "Timeout " + Timeout + Var stringLog = stringLog + " PayOK" + Var stringLog = stringLog + PayOK + + + If Timeout > 180 Then + If PayOK = 1 Then + + If Seeker = "curr" Then + + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + + EndIf + + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + Else + If CancelFlag = 0 Then + SAVELOG "Timeout > 180 s." + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + + If CashlessPayFlag = 1 Then + Var CashlessPayFlag = 0 + CashlessReq FAIL "" + EndIf + + Var CancelCounter = 0 + If CoinAmount = 0 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + Var Seeker.CurrCreditUse = 0 + EndIf + + + + If Seeker.IntVendingCampaign = 0 Then + VendingQR OFF + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + EndIf + + EndIf + EndIf + EndIf + + + If CancelFlag = 1 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + Var Seeker.CurrCreditUse = 0 + EndIf + + Var CancelCounter = CancelCounter + 1 + If CancelCounter = CancelNumber Then + ;Change CoinAmount + If CoinAmount > 0 Then + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 1 + Else + Change CoinAmount + EndIf + + Else + If ActionOKCase = 0 Then + Var ActionOKCase = 1 + Var PayInfoCFlag = 1 + EndIf + EndIf + + VendingQR OFF + EndIf + + If CancelCounter >= 43 Then + Var ChangeOK = 1 + EndIf + + ; This copy in file menu_catalog.xml + + If ChangeOK = 1 Then + If ActionOKCase = 0 Then + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var PayCredit = 1 + + Var ActionOKCase = 1 + If Seeker = "curr" Then + If Seeker.IntVendingCampaign = 0 Then + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + Else + ;wait ack + EndIf + EndIf + EndIf + + EndIf + + + Refresh + TimerReset + + + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 1 + EndIf + + + + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + + If CancelFlag = 0 Then + + If AdultFlag2 = 1 Then + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + + Var AdultState2 = "Enable" + Var AdultState1 = "Invisible" + Var AdultState3 = "Invisible" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then + + ;Var birthDate = IDBirthdate + Var StrYear = "" + Var StrMon = "" + Var StrDay = "" + + SUBSTRING IDBirthdate 0 4 StrYear + SUBSTRING IDBirthdate 4 6 StrMon + SUBSTRING IDBirthdate 6 8 StrDay + + INT StrYear + INT StrMon + INT StrDay + + Var Adult20 = 0 + + + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay + + DEBUGVAR sdatemonth + DEBUGVAR sdateday + + Var sdateyear = sdateyear + 543 + Var AgeNumber = sdateyear - StrYear + DEBUGVAR AgeNumber + + If AgeNumber >= 20 Then + + If AgeNumber = 20 Then + If sdatemonth > StrMon Then + Var Adult20 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult20 = 1 + EndIf + EndIf + EndIf + Else + Var Adult20 = 1 + EndIf + + If Adult20 = 1 Then + Var AdultState3 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState = "Invisible" + ;CoinVending XBILL + Open "ROOT/taobin_project/xml/page_payment_camera.xml" + Refresh + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + + Var AdultFlag2 = 1 + + EndIf + EndIf + EndIf + + + EndIf + + EndIf + + + + + + + TimerReset + + If CoinInFlag = 0 Then + ;VendingQR OFF + Var alphaState = "Invisible" + Var PopupCancelButtonState = "Invisible" + EndIf + + + + Var CoinInFlag = 1 + + + + If ViewBill > 0 Then + + If PayOfflineMode = 1 Then + ;CoinVending BILLREJECT + Var alphaState3_offline = "Enable" + Else + + If Seeker.StoreCreditFlag = 1 Then + CoinVending BILLSTACKALL + Else + + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + If ViewBill >= RemainAmount Then + Var RemainAmountKeep = ViewBill - RemainAmount + Else + Var RemainAmountKeep = ViewBill + EndIf + + Var Timeout = 0 + + + Var RemainAmountStr = "" + RemainAmount + Var showRemaining = charOfBaht + RemainAmountStr + + Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + + + + If SELLONLINE = 1 Then + Var alphaState3 = "Enable" + Else + Var alphaState3_offline = "Enable" + EndIf + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" + EndIf + + EndIf + + EndIf + + + Else + + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + VendingQR OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow ) + Else + If show_eng = "true" Then + ;Var RemainAmountStr = "Change " + Canout + ;Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow ) + Var RemainAmountStr = "Change " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + EndIf + + Var Timeout = 0 + + ;Var RemainAmount = 0 + Var showRemaining = charOfBaht + RemainAmountStr + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow ) + Var alphaState2 = "Enable" + + + EndIf + + EndIf + + + + + Refresh + + + If CoinInFlag = 1 Then + If CoinInOK = 0 Then + If CancelFlag = 0 Then + SAVELOG "VDCancle > Cancle Order." + Machine CancelWepApp + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + Var CancelCounter = 0 + ;If CoinAmount = 0 Then + ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ;EndIf + + Var showRemaining = "Refund" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + If FlagQROpened = 1 Then + Var CancelNumber = 12 + EndIf + + EndIf + EndIf + ;VendingQR OFF + Refresh + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + EndIf + + + + + DEBUGVAR scanresult + DEBUGVAR scanmsg + + If scanresult = "true" Then + + StrLen scanmsg textLen + If textLen = 8 Then + + Var EMAMemberID = scanmsg + + If Timeout < 120 Then + If CoinInFlag = 0 Then + If CancelFlag = 0 Then + Var QR_POPUP = "/img_popup_ema.png" + Var QRCODE99 = "" + + Var LOADING_STATE = "Enable" + Var EMAEnterNumberButtonState = "Disable" + Var PopupCancelButtonState = "Disable" + + VendingQR ON + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "AUB:2:" + Var ECommerceQR = ECommerceQR + EMAMemberID + Var ECommerceQR = ECommerceQR + "/" + + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + EndIf + + If Seeker.IntVendingCredit > 0 Then + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + "|" + EndIf + Var ECommerceQR = ECommerceQR + "CRD" + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + PointCrm + EndIf + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + Var PayDetail2 = Seeker.PayDetail2 + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 6 + Refresh + EndIf + EndIf + EndIf + Else + Var QR_POPUP = "/img_popup8-2.png" + Var EMAPopupErrorState = "Enable" + Var alphaState = "Enable" + Var LOADING_STATE = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + Var popup_cancel_button_y = 1225 + EndIf + EndIf + + Var CameraState = "Invisible" + CLOSESCANQR + + Refresh + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + 144 + 413 + pay_with_chanel_text + + + +; back + + + + + + 375 + 623 + 331 + 435 + PictureDrink + + + + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + + + + + + + + + + + + + +; + + + + + 0 + 1065 + 1080 + Center + 72 + KanitMediumTTF + 0xB78F24 + showRemaining + + + + + + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 1022 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + +; QR popup + + 0 + 380 + alphaState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 249 + 748 + alphaState + Var( DirImage + QR_POPUP ) + + + + + + 267 + 1065 + LOADING_STATE + Var( DirImage + "/loadingText.png" ) + + + + 120 + 900 +"usbfront" + 850 + 800 + CameraState + + + + + + + 249 + 1186 + EMAPopupSuccessState + 583 + KanitLightTTF + 40 + 0x513C2F + center-vertical-horizontal + EMAMemberName + + + + 249 + 1233 + EMAPopupSuccessState + 583 + KanitLightTTF + 40 + 0x513C2F + center-vertical-horizontal + EMAMemberBalance + + + + 249 + 821 + EMAPopupErrorState + 583 + KanitRegularTTF + 48 + 0x513C2F + center-vertical-horizontal + QRErrorText + + + + + + + +; begin cash popup + + 0 + 380 + alphaState2 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 +;inter-image + alphaState2 + Var( DirImage2 + "/img_popup11-GBR.png" ) + + + + + 0 + 380 + AdultState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + + 249 + 751 + AdultState1 + Var( DirImage + "/img_popup4.png" ) + + + + 838 + 1350 + eval( + Var return = "Invisible" + + If AdultState1 = "Enable" Then + If AdultState2 = "Invisible" Then + Var return = "Enable" + EndIf + EndIf + DEBUGVAR return + ) + + + + "TimerSec=3" + + "ROOT/taobin_project/image/anmi/arrow_1.png" + + + + + + 249 + 751 + AdultState2 + Var( DirImage + "/img_popup4-2.png" ) + + + + 249 + 751 + AdultState3 + Var( DirImage + "/img_popup4-3.png" ) + + + + + + + + + + 0 + 1041 + 144 + Center + 1080 + KanitRegularTTF + alphaState2 + 0xDE794E + RemainAmountStr + +; end case popup + + + 0 + 380 + alphaState3 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState3 + Var( DirImage2 + "/img_popup12.png" ) + + + + + + + + 0 + 380 + alphaState3_offline + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState3_offline + Var( DirImage2 + "/img_popup12_offline.png" ) + + + + +; +; 0 +; 1041 +; 100 +; Center +; 1080 +; KanitRegularTTF +; alphaState3 +; 0xDE794E +; RemainAmountKeep +; + + + + 270 + 1000 +550 + Center + 30 + KanitRegularTTF + alphaState + 0xFF0000 + CashTextWarning + + + + + 415 + 975 + 250 + 250 + alphaState + testservice + + + + + + + + 0 + 380 + cancelState + Var( DirImage + "/CancelOrder.png" ) + + + + 493 + 968 + 94 + 94 + LOADING_STATE + Var( DirImage + "/loading.gif" ) + + + + + 0 + 1640 + 36 + Center + 1080 + KanitRegularTTF + 0x8B0000 + Caution + + + + + 0 + 1700 + 20 + Center + 1080 + KanitRegularTTF + 0x513C2F + Allergy + + + + + Open "/media/bt/xml/security_alarm.xml" + + +; +; 0 +; 1880 +; 14 +; "Left" +; 1080 +; KanitThinTTF +; 0x513C2F +; SelectDrink +; + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + + + + + + + + + diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 9e4fcd62..7785f86a 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -142,9 +142,13 @@ Var PayAmount = PriceDrink Var LOADING_STATE = "Invisible" + Var AlphaPopupLoadingState = "Invisible" + ; Below original ; On open + Var CreditCardLoading = 0 + Var CreditCardLoadingTimeout = 0 SAVELOG "payment case 1" Var cancelState = "Invisible" @@ -205,7 +209,7 @@ Var SendCancelActionFlag = 0 Var CancelingPopupCountDown = 0 - Var PopupTimeout = 20 + Var PopupTimeout = 30 Var PopupTimeoutEnable = "Invisible" Var CashTextWarning = "" @@ -1964,7 +1968,14 @@ ; popup will close after 30 second Var Timeout = 90 Var PopupTimeoutEnable = "Invisible" - Var cancelButtonQRPopupState = "Enable" + If alphaState = "Enable" Then + Var cancelButtonQRPopupState = "Enable" + EndIf + Var AlphaPopupLoadingState = "Invisible" + Var LOADING_STATE = "Invisible" + Var CreditCardLoading = 0 + + CoinVending XBILL Else Var Timeout = 0 EndIf @@ -2400,6 +2411,26 @@ If KBankCashlessMachine = 1 Then If alphaState = "Enable" Then If ReqPayInfoFromCashOther = 2 Then + If CreditCardLoading = 1 Then + If CreditCardLoadingTimeout > 0 Then + Var CreditCardLoadingTimeout = CreditCardLoadingTimeout - 1 + Else + Var AlphaPopupLoadingState = "Invisible" + Var LOADING_STATE = "Invisible" + Var PopupTimeoutEnable = "Enable" + Var PopupTimeout = 30 + Var CreditCardLoading = 0 + + If CoinAmount > 0 Then + Change CoinAmount + EndIf + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + EndIf + EndIf + If PopupTimeoutEnable = "Enable" Then If PopupTimeout > 0 Then Var PopupTimeout = PopupTimeout - 1 @@ -2563,122 +2594,122 @@ DEBUGVAR CoinInOK - If CashButtonState = "Enable" Then - Var CoinInFlag = 1 - - If ViewBill > 0 Then - If PayOfflineMode = 1 Then - Var alphaState3_offline = "Enable" - ;CoinVending BILLREJECT - Else - - If Seeker.StoreCreditFlag = 1 Then - CoinVending BILLSTACKALL - Else - - - Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign - Var RemainAmount = RemainAmount - Seeker.IntVendingCredit - - If ViewBill >= RemainAmount Then - Var RemainAmountKeep = ViewBill - RemainAmount - Else - Var RemainAmountKeep = ViewBill - EndIf - - DEBUGVAR Timeout - Var Timeout = 0 - - - Var RemainAmountStr = "" + RemainAmount - Var showRemaining = charOfBaht + RemainAmountStr - - - - If SELLONLINE = 1 Then - Var alphaState3 = "Enable" - Else - Var alphaState3_offline = "Enable" - EndIf - - - If show_eng = "true" Then - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" - Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" - EndIf - EndIf - EndIf - Else - If CoinInOK = 0 Then - Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign - Var RemainAmount = RemainAmount - Seeker.IntVendingCredit - - Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign - Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit - - If SumCoinAmount >= PayAmount Then - ;Var VendingQRCode = "ERROR" - CoinVending OFF - VendingQR OFF - Var Canout = SumCoinAmount - PayAmount - If Canout = 0 Then - Var RemainAmountStr = 0 - Else - If show_eng = "true" Then - Var RemainAmountStr = "Change " + Canout - Var RemainAmountStr = RemainAmountStr + "###size=90" - Else - Var FlagalphaState2 = 1 - Var RemainAmountStr = "ทอน " + Canout - EndIf - If LanguageShow = "MYANMAR" Then - Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout - Var RemainAmountStr = RemainAmountStr + "###size=60" - EndIf - If LanguageShow = "MSC" Then - Var RemainAmountStr = "找钱 " + Canout - Var RemainAmountStr = RemainAmountStr + "###size=60" - EndIf - EndIf - - - Var CancleState = "Disable" - Var CoinInOK = 1 - Var CoinInCounter = 0 - - Else - Var RemainAmountStr = "" + RemainAmount - EndIf - - DEBUGVAR Timeout - Var Timeout = 0 - - ;Var RemainAmount = 0 - Var showRemaining = charOfBaht + RemainAmountStr - Var alphaState2 = "Enable" - Var alphaState2t = alphaState2 - If FlagalphaState2 = 1 Then - Var alphaState2t = "Invisible" - EndIf - EndIf - EndIf + If CreditCardLoading = 1 Then + ; do nothing Else - If ViewBill > 0 Then - CoinVending BILLREJECT - EndIf + If CashButtonState = "Enable" Then + Var CoinInFlag = 1 - Var RemainAmount = PayAmount - Seeker.IntVendingCampaign - Var RemainAmount = RemainAmount - Seeker.IntVendingCredit - Var RemainAmountStr = "" + RemainAmount + If ViewBill > 0 Then + If PayOfflineMode = 1 Then + Var alphaState3_offline = "Enable" + ;CoinVending BILLREJECT + Else + + If Seeker.StoreCreditFlag = 1 Then + CoinVending BILLSTACKALL + Else + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + If ViewBill >= RemainAmount Then + Var RemainAmountKeep = ViewBill - RemainAmount + Else + Var RemainAmountKeep = ViewBill + EndIf + + DEBUGVAR Timeout + Var Timeout = 0 + + + Var RemainAmountStr = "" + RemainAmount + Var showRemaining = charOfBaht + RemainAmountStr + + + + If SELLONLINE = 1 Then + Var alphaState3 = "Enable" + Else + Var alphaState3_offline = "Enable" + EndIf + + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" + EndIf + EndIf + EndIf + Else + If CoinInOK = 0 Then + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + VendingQR OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Else + If show_eng = "true" Then + Var RemainAmountStr = "Change " + Canout + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var FlagalphaState2 = 1 + Var RemainAmountStr = "ทอน " + Canout + EndIf + If LanguageShow = "MYANMAR" Then + Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout + Var RemainAmountStr = RemainAmountStr + "###size=60" + EndIf + If LanguageShow = "MSC" Then + Var RemainAmountStr = "找钱 " + Canout + Var RemainAmountStr = RemainAmountStr + "###size=60" + EndIf + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + Else + Var RemainAmountStr = "" + RemainAmount + EndIf + + DEBUGVAR Timeout + Var Timeout = 0 + + ;Var RemainAmount = 0 + Var showRemaining = charOfBaht + RemainAmountStr + Var alphaState2 = "Enable" + Var alphaState2t = alphaState2 + If FlagalphaState2 = 1 Then + Var alphaState2t = "Invisible" + EndIf + EndIf + EndIf + Else + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var RemainAmountStr = "" + RemainAmount + EndIf + Refresh EndIf - - - - - Refresh If CoinInFlag = 1 Then @@ -3063,14 +3094,19 @@ If KBankCashlessMachine = 1 Then Var QR_POPUP = "/img_popup8_with_service_charge.png" Var cancelButtonQRPopupState = "Invisible" - Var PopupTimeoutEnable = "Enable" - Var PopupTimeout = 20 + Var AlphaPopupLoadingState = "Enable" + Var LOADING_STATE = "Enable" + Var CreditCardLoading = 1 + Var CreditCardLoadingTimeout = 3 + VendingQR OFF + CoinVending OFF + Coin CARD Else Var QR_POPUP = "/img_popup8.png" Var cancelButtonQRPopupState = "Enable" + Coin CARD EndIf Var alphaState = "Enable" - Coin CARD Var ReqPayInfoFromCashOther = 2 EndIf EndIf @@ -3289,11 +3325,14 @@ eval( Var CancelingPopupFlag = "Enable" Var CancelingPopupCountDown = 0 - If KBankCashlessMachine = 1 Then - If ServiceCharge > 0 Then - Var ServiceCharge = 0 - EndIf - EndIf + If KBankCashlessMachine = 1 Then + If ReqPayInfoFromCashOther = 2 Then + If ServiceCharge > 0 Then + Var ServiceCharge = 0 + EndIf + CoinVending XBILL + EndIf + EndIf Refresh EndIf @@ -3635,6 +3674,13 @@ eval( ; Var( DirImage + "/loading.gif" ) ; + + 249 + 748 + AlphaPopupLoadingState + "ROOT/taobin_project/image/page_payment/alpha_popup.png" + + 493 968