diff --git a/image/page_payment/img_popup22.png b/image/page_payment/img_popup22.png new file mode 100644 index 00000000..98feee43 Binary files /dev/null and b/image/page_payment/img_popup22.png differ diff --git a/image/page_payment_en/page_payment/img_popup22.png b/image/page_payment_en/page_payment/img_popup22.png new file mode 100644 index 00000000..b1bf58b7 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup22.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png index 6c2f036b..39c1bcf3 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png index df8d66ee..83e721fd 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png and b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png index 1ba4ea2b..0514daec 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png and b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png index 9a3bb3e0..2aadf849 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png index 6dbc35b9..7a7685c9 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png index bddb7e46..d2adb035 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png index 6e6c0451..5194907c 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png index f4151a22..48cf43ce 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png index 7e8149c6..695cb358 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png index fdec14f6..a3d1d9c2 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png index 636f8f2a..87c9c4fd 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png index 93e0b889..e15e02a6 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png index 69df1c5c..50a00bd8 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png index a7bf38ea..0714edec 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png index c7b0f148..0b794e49 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png index 35d234aa..3ed980f8 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png and b/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png index 7a51dd5d..5ff7ba55 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png and b/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png index fd3dedb8..53644f3e 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png index c8a21e1e..c359d0cb 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png index f0bc729d..509f4028 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png index 7ca14d99..9ae4faaa 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png and b/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png index e91334bf..bb0646c2 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png index 56e321d3..74462914 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png and b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png index c51968c9..fa743377 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png and b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png b/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png index 43ce6bd2..f0387eaa 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png and b/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png index fdde6023..5970eafe 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png index 603931ca..d102930f 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png index 4de10a65..2a7dc46c 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png and b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png index 9a6de3d3..db7dc71c 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png index 329af211..144f6777 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png index 611c00f9..0e0603eb 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png index a7b74ad6..072c24d2 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png index 3da0fc3c..8f83ffa4 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png index d5d2ff4b..d40a6138 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png index eb777712..5bf59ca7 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png index 25a56897..ab9f229e 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png index f3c4768d..f2700734 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png index f0f83572..bf5b7545 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png index 31191847..be7a38c2 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png index 7efd72a5..4d614dde 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png index 0446dd3c..ab4234e9 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png b/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png index 9299504a..b8d91e43 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png index c07b4fe4..58406d11 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png index cd4afa85..8e0d92d8 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png index e90583c9..bd7665f1 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png index 7fd32650..634b7ad0 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png index e048fd01..4bec7377 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png index 10b5e7e6..028fa05b 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png index 680a5f75..9e601a8d 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png index 5e234efe..ffa2cc5a 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png b/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png index 20f092b5..2072ecdc 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png and b/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png b/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png index fbf69e31..eb43baf3 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png and b/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png index ee5f23c2..59f439d6 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png and b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png b/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png index e0bd50d6..c2044067 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png and b/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png b/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png index 15c4e404..917576f4 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png and b/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png b/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png index 43ea3977..5e2c0446 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png and b/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png index 5d8c19a5..17360f91 100644 Binary files a/inter/aus/image/page_drink_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png index 7e256cc0..cb83f14d 100644 Binary files a/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png and b/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png index ac1c11e2..0d56c8d2 100644 Binary files a/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png and b/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_AMERICANO.png b/inter/aus/image/page_drink_n/bn_COCONUT_AMERICANO.png index cac5a5c2..ddb70515 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_AMERICANO.png and b/inter/aus/image/page_drink_n/bn_COCONUT_AMERICANO.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png b/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png index e1fb883d..640b5c65 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png and b/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png b/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png index e05c2109..97898b42 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png and b/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png b/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png index 936ad5d2..f9bc831e 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png and b/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png index 8e476707..572cf1dd 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png b/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png index 809475fc..b89919c2 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png and b/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png b/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png index 51261a79..a5ee4305 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png and b/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png b/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png index 8e2dbd20..be323630 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png and b/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png b/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png index 7165c4ba..e587b4e3 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png and b/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png index fc0638f8..2e1be9ca 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png and b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png index 21c6d86a..64f0fd7d 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png and b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png index b5e8bf77..5031a602 100644 Binary files a/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png index eeac82bf..e6cad374 100644 Binary files a/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png and b/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png index 425759b2..d06cf9d2 100644 Binary files a/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png and b/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png index 85fd530f..5394ad48 100644 Binary files a/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png index 82a9a068..c8673288 100644 Binary files a/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png index cfcf9b5e..5a4dc8a5 100644 Binary files a/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png index 5739452a..edc6faf6 100644 Binary files a/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png and b/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png index 6c4f0f6c..652ce0c6 100644 Binary files a/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png b/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png index 39860754..646abd72 100644 Binary files a/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png and b/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png differ diff --git a/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png b/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png index 71ff96f2..2a99ac8e 100644 Binary files a/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png and b/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png differ diff --git a/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png b/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png index 8b0dba14..0f7109fc 100644 Binary files a/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png and b/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png differ diff --git a/inter/aus/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png index 668695ca..db163c32 100644 Binary files a/inter/aus/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png index 122698d2..4973c3e3 100644 Binary files a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png index 6b30929b..d16fcdd1 100644 Binary files a/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png and b/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png index 169946ad..362effec 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png and b/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png b/inter/aus/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png index 6c5a5882..17677a3b 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png and b/inter/aus/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png index 3c927f90..aa2b2dfe 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png index 86e0d820..af470e47 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png index 764e7b4a..0dcb8c94 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png and b/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png index d33eaf68..4fabd4d8 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png and b/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee.png b/inter/aus/image/page_drink_n/bn_iced_Lychee.png index 02a59ad4..053983f3 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Lychee.png and b/inter/aus/image/page_drink_n/bn_iced_Lychee.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png index cb911d28..13a486f9 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png and b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png index bfce5f84..19188d58 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png and b/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png b/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png index ba7c794f..ac19bb76 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png and b/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png index 558792f1..9a1da5cf 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png index 7ab50f8a..b08e8f3a 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png and b/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_caramel_Biscoff.png b/inter/aus/image/page_drink_n/bn_iced_caramel_Biscoff.png index 75c321e4..9588e159 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_caramel_Biscoff.png and b/inter/aus/image/page_drink_n/bn_iced_caramel_Biscoff.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png index f10d7731..b0adba40 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png index 9c2d709c..bf9a0e37 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png index e1748575..b3d766a7 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png index 22537472..d196b26b 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_soda.png index 05a71c95..1c972396 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png index 267fdb03..22e0831e 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png and b/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png index bb64a98c..682699d5 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png and b/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_strawberry_soda.png b/inter/aus/image/page_drink_n/bn_iced_strawberry_soda.png index 7ff8f489..90502876 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_strawberry_soda.png and b/inter/aus/image/page_drink_n/bn_iced_strawberry_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_yuzu_soda.png b/inter/aus/image/page_drink_n/bn_iced_yuzu_soda.png index 78e9174d..403b5520 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_yuzu_soda.png and b/inter/aus/image/page_drink_n/bn_iced_yuzu_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_limeblack_tea_SingPark.png b/inter/aus/image/page_drink_n/bn_limeblack_tea_SingPark.png index 309317d1..7ee1aeb0 100644 Binary files a/inter/aus/image/page_drink_n/bn_limeblack_tea_SingPark.png and b/inter/aus/image/page_drink_n/bn_limeblack_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_n/bn_protein_Vanilla.png index 11981a96..ac66bcb1 100644 Binary files a/inter/aus/image/page_drink_n/bn_protein_Vanilla.png and b/inter/aus/image/page_drink_n/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png index 17c520c3..76feaaa5 100644 Binary files a/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png and b/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/image/page_drink_n/bn_smoothie_oreo.png b/inter/aus/image/page_drink_n/bn_smoothie_oreo.png index 1c7bdf52..44d6ff24 100644 Binary files a/inter/aus/image/page_drink_n/bn_smoothie_oreo.png and b/inter/aus/image/page_drink_n/bn_smoothie_oreo.png differ diff --git a/inter/aus/image/page_drink_n/bn_thai_black_tea_SingPark.png b/inter/aus/image/page_drink_n/bn_thai_black_tea_SingPark.png index fd0b87fa..b2fd98ba 100644 Binary files a/inter/aus/image/page_drink_n/bn_thai_black_tea_SingPark.png and b/inter/aus/image/page_drink_n/bn_thai_black_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_n/bn_thai_milk_tea_SingPark.png b/inter/aus/image/page_drink_n/bn_thai_milk_tea_SingPark.png index ecbab9e4..4de7e6b2 100644 Binary files a/inter/aus/image/page_drink_n/bn_thai_milk_tea_SingPark.png and b/inter/aus/image/page_drink_n/bn_thai_milk_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png index 2dd508f4..5ad7b171 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_picture2_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png index 4c2f6407..f6781b40 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png and b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png index b51e02a4..aed542f9 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png and b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_AMERICANO.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_AMERICANO.png index 09852f57..114ac99f 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_AMERICANO.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_AMERICANO.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_CHOCOLATE_MILK.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_CHOCOLATE_MILK.png index 459c5891..71a40adb 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_CHOCOLATE_MILK.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_CHOCOLATE_MILK.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png index f7f1f0f0..874cb232 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LYCHEE_SODA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LYCHEE_SODA.png index 2350e870..21a5b948 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LYCHEE_SODA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LYCHEE_SODA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png index f1f059fe..f7251fb1 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MILK.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MILK.png index e23e8ec4..ae8832bf 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MILK.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MILK.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_PEPSI.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_PEPSI.png index a33a015a..3483ba09 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_PEPSI.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_PEPSI.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SMOOTHIE.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SMOOTHIE.png index 75bc7419..ef67c572 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SMOOTHIE.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SMOOTHIE.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SODA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SODA.png index 6523bc7a..a9be1ab2 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SODA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SODA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png index bb43aa6f..3e8e9ce5 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_MILK_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_MILK_TEA.png index 41919b0f..5ecd12cc 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_MILK_TEA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png index de0c188e..51ec3205 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_picture2_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png index 52f4c228..af620649 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png and b/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png index be420fb9..bc40bfce 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png and b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png index fc6b737a..9aebf772 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_picture2_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png index eb93a6be..5c0de4fd 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_picture2_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png index b9968f3c..ebaea83a 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_picture2_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png index 5566c702..1ec0a455 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png and b/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png new file mode 100644 index 00000000..a57a29b9 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Biscoff.png b/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Biscoff.png index bdf51196..4b411088 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Biscoff.png and b/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Biscoff.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Straw_Biscoff.png b/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Straw_Biscoff.png index 78f2b015..e5334676 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Straw_Biscoff.png and b/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Straw_Biscoff.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png b/inter/aus/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png index 9d30f58f..fa67dc0d 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png and b/inter/aus/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_picture2_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png index 0d0b3eb1..47b19002 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_picture2_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png index 6b931795..6e87301c 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png index d0dad09a..db614e7b 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png and b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png index 1a3f660a..f3f78d4e 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_JASMINE_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_JASMINE_TEA.png index c0859718..e9552c44 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_JASMINE_TEA.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_JASMINE_TEA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_MATCHA_LATTE.png index 89cffdfd..b02333d2 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png index c97b3975..42bd6f70 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png index 0ff9c089..f34e25df 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png index 18a47ed1..a815137b 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee.png index aea8219b..2f501d96 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png index fbb51c4e..92cb3861 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png index 99147c3d..c9b44a47 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_soda.png index cbb56e7a..2c13c918 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png index 8b537ae3..edadaf58 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png index bc9323ba..73856bbb 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png index 055c8168..ca18e409 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_caramel_Biscoff.png b/inter/aus/image/page_drink_picture2_n/bn_iced_caramel_Biscoff.png index 1bc78beb..61ff3fa4 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_caramel_Biscoff.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_caramel_Biscoff.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png index c761d530..4b4439fd 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png index d12c82ee..8e5441a9 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png index 6f058c91..da8625e9 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png index a33efd04..bf41ac97 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_soda.png index c1c6457b..c7ba6e49 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png index bc603f16..9b9b3626 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_strawberry_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_strawberry_soda.png index 3056ec42..89fa5c48 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_strawberry_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_strawberry_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda.png index 56c261c1..3d4e2f19 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png b/inter/aus/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png index e86b6c42..3a173fb1 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png and b/inter/aus/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png index 480bccd2..7970a974 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png and b/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png index fd8f2f19..6130390c 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png and b/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_smoothie_oreo.png b/inter/aus/image/page_drink_picture2_n/bn_smoothie_oreo.png index fe663da3..2a80af7b 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_smoothie_oreo.png and b/inter/aus/image/page_drink_picture2_n/bn_smoothie_oreo.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png b/inter/aus/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png index ffb75415..ced4e81a 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png and b/inter/aus/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png b/inter/aus/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png index e0c48938..1f0ba43c 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png and b/inter/aus/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png index 8f61e041..12d19103 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_press_n/bn_Bananoffee_Latte.png new file mode 100644 index 00000000..c17edb58 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_press_n/bn_Bananoffee_Pie.png new file mode 100644 index 00000000..d415f1a8 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_AMERICANO.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_AMERICANO.png index 8f9be898..786152b9 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_AMERICANO.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_AMERICANO.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_CHOCOLATE_MILK.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_CHOCOLATE_MILK.png index 5ec77e5d..d121b85a 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_CHOCOLATE_MILK.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_CHOCOLATE_MILK.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_JASMINE_MILK_TEA.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_JASMINE_MILK_TEA.png index bb0d6878..0e77e13a 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_JASMINE_MILK_TEA.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_JASMINE_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_LYCHEE_SODA.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_LYCHEE_SODA.png index c739b2ea..63abf34c 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_LYCHEE_SODA.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_LYCHEE_SODA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png index 438cbdaf..cbba69c9 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_MILK.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_MILK.png index 750b6a71..a61bf70b 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_MILK.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_MILK.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_PEPSI.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_PEPSI.png index dd3ea63d..f3eea17e 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_PEPSI.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_PEPSI.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_SMOOTHIE.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_SMOOTHIE.png index 2d6750c9..6aceb7d9 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_SMOOTHIE.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_SMOOTHIE.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_SODA.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_SODA.png index 4044310e..388e669c 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_SODA.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_SODA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_BLACK_TEA.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_BLACK_TEA.png index 2fe641a9..66a7456e 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_BLACK_TEA.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_BLACK_TEA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_MILK_TEA.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_MILK_TEA.png index 1028bfe2..48f2f4fc 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_MILK_TEA.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_THAI_MILK_TEA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png index f601122b..63f6726a 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_press_n/bn_Caramel_choc_espresso.png new file mode 100644 index 00000000..acde8a28 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_press_n/bn_Choc_caramel_crumble.png new file mode 100644 index 00000000..74d353cf Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png index 308ef564..a4b7ec8b 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png index 62fe4472..709995cc 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png index b7ee92bb..15c0a4ba 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_press_n/bn_Melon_matcha_iced_tea.png new file mode 100644 index 00000000..1fa963b0 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png index 366665c6..0aae0d85 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Biscoff.png b/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Biscoff.png index 74db892a..0120f449 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Biscoff.png and b/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Biscoff.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Straw_Biscoff.png b/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Straw_Biscoff.png index a903a270..dd0ab9bd 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Straw_Biscoff.png and b/inter/aus/image/page_drink_press_n/bn_Mint_Milk_Straw_Biscoff.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png b/inter/aus/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png index 8b0dba14..1897408b 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png and b/inter/aus/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png b/inter/aus/image/page_drink_press_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png index 6680b6e9..79bce9bb 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png and b/inter/aus/image/page_drink_press_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png new file mode 100644 index 00000000..1a339140 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_press_n/bn_Yuzu_matcha_iced_tea.png new file mode 100644 index 00000000..c307a4a1 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_press_n/bn_hot_Bananoffee_milkshake.png new file mode 100644 index 00000000..b905cb30 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_JASMINE_TEA.png b/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_JASMINE_TEA.png index b5601a0d..45a3134a 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_JASMINE_TEA.png and b/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_JASMINE_TEA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_MATCHA_LATTE.png index 2aa7494a..10c76376 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png index 98bd1142..55cbee1c 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_press_n/bn_hot_latte_with_twist.png new file mode 100644 index 00000000..91ecd021 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_press_n/bn_iced_Caramel_mocha.png new file mode 100644 index 00000000..c98e7e2b Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Lychee.png b/inter/aus/image/page_drink_press_n/bn_iced_Lychee.png index df29af26..c93eeda4 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_Lychee.png and b/inter/aus/image/page_drink_press_n/bn_iced_Lychee.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_jasmine_tea.png new file mode 100644 index 00000000..6d4374bc Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_matcha_tea.png new file mode 100644 index 00000000..07b4ce8c Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Lychee_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_soda.png index 3e7195f5..77d6371e 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_Lychee_soda.png and b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png index 9c38ccac..5ec90291 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png and b/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png new file mode 100644 index 00000000..485fb450 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_press_n/bn_iced_Yuzu_jasmine_tea.png new file mode 100644 index 00000000..38597926 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_caramel_Biscoff.png b/inter/aus/image/page_drink_press_n/bn_iced_caramel_Biscoff.png index df024dfc..5988f0dc 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_caramel_Biscoff.png and b/inter/aus/image/page_drink_press_n/bn_iced_caramel_Biscoff.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png new file mode 100644 index 00000000..26d32d4d Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Melon_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Melon_soda.png new file mode 100644 index 00000000..31626519 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Melon_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda-1.png new file mode 100644 index 00000000..e21b25b7 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png new file mode 100644 index 00000000..25f49a8b Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_soda.png index 3e3e383a..6f50bb03 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_soda.png and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_press_n/bn_iced_pepsi_Lychee.png new file mode 100644 index 00000000..ac239297 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_strawberry_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_strawberry_soda.png index 905d634c..edf11d26 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_strawberry_soda.png and b/inter/aus/image/page_drink_press_n/bn_iced_strawberry_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda.png index 8fec13e0..5e7448b2 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda.png and b/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_limeblack_tea_SingPark.png b/inter/aus/image/page_drink_press_n/bn_limeblack_tea_SingPark.png index d04dcd77..9d27676c 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_limeblack_tea_SingPark.png and b/inter/aus/image/page_drink_press_n/bn_limeblack_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png index 56fc0a7a..8c28e086 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png and b/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png index 498dcf78..f2138841 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png and b/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_smoothie_oreo.png b/inter/aus/image/page_drink_press_n/bn_smoothie_oreo.png index aeee8bb1..323c0ba9 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_smoothie_oreo.png and b/inter/aus/image/page_drink_press_n/bn_smoothie_oreo.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_thai_black_tea_SingPark.png b/inter/aus/image/page_drink_press_n/bn_thai_black_tea_SingPark.png index cf7d48ca..bce12efe 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_thai_black_tea_SingPark.png and b/inter/aus/image/page_drink_press_n/bn_thai_black_tea_SingPark.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png b/inter/aus/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png index 59ee5003..cdfdc5cc 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png and b/inter/aus/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png differ diff --git a/xml/menutab/page_catalog_group_coffee.xml b/xml/menutab/page_catalog_group_coffee.xml index 151ec744..0e825bca 100644 --- a/xml/menutab/page_catalog_group_coffee.xml +++ b/xml/menutab/page_catalog_group_coffee.xml @@ -1,598 +1,613 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - Var Menu2Selected = "PressForever" - - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + Var Menu2Selected = "PressForever" + + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 2 Then + Var SlientRefreshIndex = 3 + + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show2 + ;DEBUGVAR inst_show2 + + + If inst_show2 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + If SlientRefreshIndex = 2 Then + If inst_show2 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile2 + Open CurrentOpenFile2 + + Else + Var SlientRefreshIndex = 3 + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + 10 497 @@ -1230,7 +1245,7 @@ KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -1486,7 +1501,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -2254,7 +2269,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -2510,7 +2525,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -3768,7 +3783,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -3779,7 +3794,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -3791,7 +3806,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -3802,7 +3817,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -4029,7 +4044,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -4040,7 +4055,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -4052,7 +4067,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -4063,7 +4078,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -4290,7 +4305,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต CHOPIN" @@ -4301,7 +4316,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -4313,7 +4328,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ESPRESSO" @@ -4324,7 +4339,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -4551,7 +4566,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MANDARINE" @@ -4573,7 +4588,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ESPRESSO" @@ -4810,7 +4825,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต OPUS ONE" @@ -4832,7 +4847,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ESPRESSO" @@ -5069,7 +5084,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -5080,7 +5095,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -5092,7 +5107,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -5103,7 +5118,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -5330,7 +5345,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -5341,7 +5356,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -5353,7 +5368,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -5364,7 +5379,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -5591,7 +5606,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -5602,7 +5617,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -5614,7 +5629,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -5625,7 +5640,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -5852,7 +5867,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -5863,7 +5878,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -5875,7 +5890,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -5886,7 +5901,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -6113,7 +6128,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -6124,7 +6139,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -6136,7 +6151,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -6373,7 +6388,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -6631,7 +6646,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -6642,7 +6657,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -6664,7 +6679,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -7394,7 +7409,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -7405,7 +7420,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -7417,7 +7432,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -7428,7 +7443,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -7655,7 +7670,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -7666,7 +7681,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -7678,7 +7693,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -7689,7 +7704,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -7916,7 +7931,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน CHOPIN" @@ -7927,7 +7942,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -7939,7 +7954,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN AMERICANO" @@ -7950,7 +7965,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -8177,7 +8192,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MANDARINE" @@ -8199,7 +8214,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE AMERICANO" @@ -8436,7 +8451,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน OPUS ONE" @@ -8458,7 +8473,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE AMERICANO" @@ -8695,7 +8710,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -8706,7 +8721,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -8718,7 +8733,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -8729,7 +8744,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -8956,7 +8971,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -8967,7 +8982,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -8979,7 +8994,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -8990,7 +9005,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -9217,7 +9232,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -9228,7 +9243,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -9240,7 +9255,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -9251,7 +9266,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -9478,7 +9493,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -9489,7 +9504,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -9501,7 +9516,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -9512,7 +9527,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -9739,7 +9754,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -9750,7 +9765,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -9762,7 +9777,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -9999,7 +10014,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -10021,7 +10036,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -10258,7 +10273,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -10269,7 +10284,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -10281,7 +10296,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN AMERICANO" @@ -10292,7 +10307,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -10519,7 +10534,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -10530,7 +10545,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -10542,7 +10557,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -10553,7 +10568,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -10776,7 +10791,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MOZART + "MOZART ALMOST DIRTY" @@ -10787,7 +10802,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -10799,7 +10814,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ALMOST DIRTY" @@ -10810,7 +10825,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -11033,7 +11048,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -11044,7 +11059,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -11056,7 +11071,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -11067,7 +11082,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -11290,7 +11305,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -11312,7 +11327,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -11545,7 +11560,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -11567,7 +11582,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -11800,7 +11815,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -11811,7 +11826,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -11823,7 +11838,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -11834,7 +11849,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -12057,7 +12072,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -12068,7 +12083,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -12080,7 +12095,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -12091,7 +12106,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -12314,7 +12329,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -12325,7 +12340,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -12337,7 +12352,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -12348,7 +12363,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -12571,7 +12586,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -12582,7 +12597,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -12594,7 +12609,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -12605,7 +12620,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -12828,7 +12843,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -12839,7 +12854,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -12851,7 +12866,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -13084,7 +13099,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -13106,7 +13121,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -13339,7 +13354,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -13350,7 +13365,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -13362,7 +13377,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -13373,7 +13388,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -13617,7 +13632,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -13869,7 +13884,7 @@ ICED ESPRESSO" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -15644,7 +15659,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -15666,7 +15681,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -15901,7 +15916,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -15923,7 +15938,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -16159,7 +16174,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16171,7 +16186,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -16416,7 +16431,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16428,7 +16443,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -16674,7 +16689,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16686,7 +16701,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -16931,7 +16946,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16943,7 +16958,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -17189,7 +17204,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -17201,7 +17216,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -17212,7 +17227,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -17447,7 +17462,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -17459,7 +17474,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -17470,7 +17485,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -17706,7 +17721,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -17718,7 +17733,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -17963,7 +17978,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -17975,7 +17990,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -18221,7 +18236,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -18233,7 +18248,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -18244,7 +18259,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18479,7 +18494,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -18491,7 +18506,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -18502,7 +18517,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18749,7 +18764,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19005,7 +19020,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19262,7 +19277,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19518,7 +19533,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19764,7 +19779,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -19776,7 +19791,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -19787,7 +19802,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -20022,7 +20037,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -20034,7 +20049,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -20045,7 +20060,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -20302,7 +20317,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -20558,7 +20573,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -20815,7 +20830,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -21071,7 +21086,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -21318,7 +21333,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -21329,7 +21344,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -21575,7 +21590,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -21586,7 +21601,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -21843,7 +21858,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -22099,7 +22114,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -22356,7 +22371,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -22612,7 +22627,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -22869,7 +22884,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -23125,7 +23140,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -23382,7 +23397,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -23638,7 +23653,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -24367,7 +24382,7 @@ Sugar, Milk" KanitMediumTTF 0x322B26 showthaiText - "กาแฟดำ + "กาแฟดำ มะพร้าวน้ำหอม" @@ -24399,7 +24414,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Coconut Syrup, + "Espresso, Coconut Syrup, Sugar, Water" @@ -24620,7 +24635,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showthaiText - "กาแฟดำ + "กาแฟดำ มะพร้าวน้ำหอม" @@ -24652,7 +24667,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Coconut Syrup, + "Espresso, Coconut Syrup, Sugar, Water" @@ -24874,7 +24889,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟบ๊วยโซดา" @@ -24896,7 +24911,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "7UP PLUM LIME + "7UP PLUM LIME COFFEE" @@ -25127,7 +25142,7 @@ COFFEE" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟบ๊วยโซดา" @@ -25149,7 +25164,7 @@ COFFEE" KanitMediumTTF 0x322B26 showengText - "7UP PLUM LIME + "7UP PLUM LIME COFFEE" @@ -25381,7 +25396,7 @@ COFFEE" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟสละโซดา" @@ -25403,7 +25418,7 @@ COFFEE" KanitMediumTTF 0x322B26 showengText - "7UP PLUM SALAK + "7UP PLUM SALAK LIME COFFEE" @@ -25414,7 +25429,7 @@ LIME COFFEE" KanitMediumTTF 0x6F5F51 showengText - "Espreeso, 7UP, Lime + "Espreeso, 7UP, Lime Salak, Ice" @@ -25635,7 +25650,7 @@ LIME COFFEE" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟสละโซดา" @@ -25657,7 +25672,7 @@ LIME COFFEE" KanitMediumTTF 0x322B26 showengText - "7UP PLUM SALAK + "7UP PLUM SALAK LIME COFFEE" @@ -25668,7 +25683,7 @@ LIME COFFEE" KanitMediumTTF 0x6F5F51 showengText - "Espreeso, 7UP, Lime + "Espreeso, 7UP, Lime Salak, Ice" @@ -25811,9 +25826,9 @@ LIME COFFEE" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/xml/menutab/page_catalog_group_forkid.xml b/xml/menutab/page_catalog_group_forkid.xml index 9be8e965..587bfb25 100644 --- a/xml/menutab/page_catalog_group_forkid.xml +++ b/xml/menutab/page_catalog_group_forkid.xml @@ -1,608 +1,623 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - ; protein - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + ; protein + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "PressForever" + EndIf + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 5 Then + Var SlientRefreshIndex = 6 + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show5 + ;DEBUGVAR inst_show5 + + + If inst_show5 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + + If SlientRefreshIndex = 5 Then + If inst_show5 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile5 + Open CurrentOpenFile5 + Else + Var SlientRefreshIndex = 6 + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + + 10 497 @@ -1243,7 +1258,7 @@ KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR MILK" @@ -1490,7 +1505,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -2258,7 +2273,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" @@ -2270,7 +2285,7 @@ MILK" KanitMediumTTF 0x322B26 showengText - "STRAWCOCOA + "STRAWCOCOA SMOOTHIE" @@ -2524,7 +2539,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -2778,7 +2793,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "COCOA OVALTINE + "COCOA OVALTINE VOLCANO" @@ -3527,7 +3542,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมเมล่อน โซดา + "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" @@ -3781,7 +3796,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ โซดา + "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" @@ -4035,7 +4050,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -4047,7 +4062,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -4301,7 +4316,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "TOKYO + "TOKYO BANANA MILK" @@ -4538,7 +4553,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "นมช็อกโกโตเกียว + "นมช็อกโกโตเกียว บานาน่า" @@ -4560,7 +4575,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "CHOCO TOKYO + "CHOCO TOKYO BANANA MILK" @@ -6330,7 +6345,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "โกโก้ + "โกโก้ บิสคอฟ" @@ -6341,7 +6356,7 @@ BANANA MILK" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล บิสคอฟ" @@ -6353,7 +6368,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "COCOA MILK + "COCOA MILK BISCOFF VOLCANO" @@ -6364,7 +6379,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk, + "Cocoa, Milk, Sugar, Biscof" @@ -6508,7 +6523,7 @@ Sugar, Biscof" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/menutab/page_catalog_group_health.xml b/xml/menutab/page_catalog_group_health.xml index 4fce89c5..cb0d647a 100644 --- a/xml/menutab/page_catalog_group_health.xml +++ b/xml/menutab/page_catalog_group_health.xml @@ -1,595 +1,611 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - Var Menu22Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + Var Menu22Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 6 Then + Var SlientRefreshIndex = 7 + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show6 + ;DEBUGVAR inst_show6 + + + + If inst_show6 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + If SlientRefreshIndex = 6 Then + If inst_show6 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile6 + Open CurrentOpenFile6 + Else + Var SlientRefreshIndex = 7 + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + 10 497 @@ -705,7 +721,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ และน้ำร้อน + "กาแฟ และน้ำร้อน (อเมริกาโน)" @@ -961,7 +977,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ และน้ำร้อน + "กาแฟ และน้ำร้อน (อเมริกาโน)" @@ -1239,7 +1255,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -1495,7 +1511,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -1731,7 +1747,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ผสมช็อกโกแลต + "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" @@ -1753,7 +1769,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Cocoa, + "Espresso, Cocoa, Milk, Sugar" @@ -1988,7 +2004,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ผสมช็อกโกแลต + "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" @@ -2010,7 +2026,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Cocoa, + "Espresso, Cocoa, Milk, Sugar" @@ -2267,7 +2283,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -2523,7 +2539,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -3027,7 +3043,7 @@ Foamed milk" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE MILK TEA" @@ -3038,7 +3054,7 @@ MILK TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwanese Tea, Sugar, + "Taiwanese Tea, Sugar, and Milk" @@ -4057,7 +4073,7 @@ and Milk" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA LIMENADE" @@ -4551,7 +4567,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชาดำไต้หวัน + "ชาดำไต้หวัน มะนาว" @@ -4573,7 +4589,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE LBLACK TEA" @@ -4584,7 +4600,7 @@ LBLACK TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwan tea, Limenade, + "Taiwan tea, Limenade, Water, and Ice" @@ -5860,7 +5876,7 @@ Water, and Ice" KanitMediumTTF 0x322B26 showengText - "ICED LIMENADE + "ICED LIMENADE SODA" @@ -9565,7 +9581,7 @@ SODA" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml index 3ef516d8..7b8b69af 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -1,595 +1,614 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - Var Menu4Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + Var Menu4Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 4 Then + Var SlientRefreshIndex = 5 + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show4 + ;DEBUGVAR inst_show4 + + + + If inst_show4 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + If SlientRefreshIndex = 4 Then + If inst_show4 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile4 + Open CurrentOpenFile4 + + Else + Var SlientRefreshIndex = 5 + + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -1219,7 +1238,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล น้ำเชื่อมคาราเมล" @@ -1241,7 +1260,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk,Sugar, + "Cocoa, Milk,Sugar, Caramel Syrup" @@ -1489,7 +1508,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR MILK" @@ -1736,7 +1755,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -2753,7 +2772,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" @@ -2765,7 +2784,7 @@ MILK" KanitMediumTTF 0x322B26 showengText - "STRAWCOCOA + "STRAWCOCOA SMOOTHIE" @@ -3008,7 +3027,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" @@ -3020,7 +3039,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "STRAWMILK + "STRAWMILK SMOOTHIE" @@ -3263,7 +3282,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -3275,7 +3294,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -3786,7 +3805,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -4029,7 +4048,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -4041,7 +4060,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "SUPER OREO + "SUPER OREO VOLCANO" @@ -4295,7 +4314,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "COCOA OVALTINE + "COCOA OVALTINE VOLCANO" @@ -5042,7 +5061,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showthaiText - "นมชมพูปั่น + "นมชมพูปั่น โอรีโอภูเขาไฟ" @@ -5053,7 +5072,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม น้ำตาล + "น้ำแดงกลิ่นสละ นม น้ำตาล Oreo" @@ -5065,7 +5084,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "PINK MILK + "PINK MILK OREO VOLCANO" @@ -5076,7 +5095,7 @@ OREO VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Milk, + "Salak Syrup, Milk, Sugar Oreo" @@ -5320,7 +5339,7 @@ Sugar Oreo" KanitMediumTTF 0x322B26 showengText - "TOKYO + "TOKYO BANANA MILK" @@ -5557,7 +5576,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "นมช็อกโกโตเกียว + "นมช็อกโกโตเกียว บานาน่า" @@ -5579,7 +5598,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "CHOCO TOKYO + "CHOCO TOKYO BANANA MILK" @@ -5826,7 +5845,7 @@ BANANA MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมมินต์ นม น้ำตาล + "น้ำเชื่อมมินต์ นม น้ำตาล Oreo" @@ -5838,7 +5857,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "MINT + "MINT OREO VOLCANO" @@ -5849,7 +5868,7 @@ OREO VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Oreo" @@ -6103,7 +6122,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Cocoa" @@ -6608,7 +6627,7 @@ Sugar, Cocoa" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY MINT MILK" @@ -6619,7 +6638,7 @@ MINT MILK" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Strawberry Syrup" @@ -7130,7 +7149,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showengText - "Peach Syrup, Milk, + "Peach Syrup, Milk, Sugar, Cocoa" @@ -7363,7 +7382,7 @@ Sugar, Cocoa" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมพีช นม น้ำตาล + "น้ำเชื่อมพีช นม น้ำตาล Oreo" @@ -7385,7 +7404,7 @@ Sugar, Cocoa" KanitMediumTTF 0x6F5F51 showengText - "Peach Syrup, Milk, + "Peach Syrup, Milk, Sugar, Oreo" @@ -7608,7 +7627,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมคาราเมล + "นมคาราเมล บิสคอฟ" @@ -7619,7 +7638,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมคาราเมล นม น้ำตาล + "น้ำเชื่อมคาราเมล นม น้ำตาล บิสคอฟ" @@ -7631,7 +7650,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CARAMEL MILK + "CARAMEL MILK BISCOFF VOLCANO" @@ -7642,7 +7661,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Caramel Syrup, Milk, + "Caramel Syrup, Milk, Sugar, Biscof" @@ -7865,7 +7884,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "นมสตรอเบอร์รี่ + "นมสตรอเบอร์รี่ บิสคอฟ" @@ -7876,7 +7895,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล + "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล บิสคอฟ" @@ -7888,7 +7907,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY MILK + "STRAWBERRY MILK BISCOFF VOLCANO" @@ -7899,7 +7918,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, Milk, + "Strawberry Syrup, Milk, Sugar, Biscof" @@ -8122,7 +8141,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "นมมินต์ + "นมมินต์ บิสคอฟ" @@ -8133,7 +8152,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมมินต์ นม น้ำตาล + "น้ำเชื่อมมินต์ นม น้ำตาล บิสคอฟ" @@ -8145,7 +8164,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "Mint MILK + "Mint MILK BISCOFF VOLCANO" @@ -8156,7 +8175,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Biscof" @@ -8379,7 +8398,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "โกโก้ + "โกโก้ บิสคอฟ" @@ -8390,7 +8409,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล บิสคอฟ" @@ -8402,7 +8421,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "COCOA MILK + "COCOA MILK BISCOFF VOLCANO" @@ -8413,7 +8432,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk, + "Cocoa, Milk, Sugar, Biscof" @@ -8636,7 +8655,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอมปั่น + "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" @@ -8668,7 +8687,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showengText - "Coconut syrup, Milk, + "Coconut syrup, Milk, Water" @@ -8891,7 +8910,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวโกโก้ปั่น + "มะพร้าวโกโก้ปั่น นมนิวซีแลนด์" @@ -8923,7 +8942,7 @@ Water" KanitMediumTTF 0x6F5F51 showengText - "Coconut syrup, Cocoa, Milk, + "Coconut syrup, Cocoa, Milk, Water" @@ -9067,14 +9086,14 @@ Water" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - RefreshAll - - - - + + + + + + + RefreshAll + + + + diff --git a/xml/menutab/page_catalog_group_other.xml b/xml/menutab/page_catalog_group_other.xml index 2d4e9de1..5d5929b0 100644 --- a/xml/menutab/page_catalog_group_other.xml +++ b/xml/menutab/page_catalog_group_other.xml @@ -1,597 +1,615 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - ; soda and other - Var Menu6Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + ; soda and other + Var Menu6Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 7 Then + Var SlientRefreshIndex = 8 + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show7 + ;DEBUGVAR inst_show7 + + + + If inst_show7 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + + If SlientRefreshIndex = 7 Then + If inst_show7 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile7 + Open CurrentOpenFile7 + Else + Var SlientRefreshIndex = 8 + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + 10 497 @@ -1466,7 +1484,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง โซดา + "เครื่องดื่มเต่าทรงพลัง โซดา (มีคาเฟอีน)" @@ -1478,7 +1496,7 @@ KanitMediumTTF 0x322B26 showengText - "TAO POWER + "TAO POWER DRINK SODA" @@ -1711,7 +1729,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพชูกำลัง + "เซเว่นอัพชูกำลัง บ๊วยโซดา" @@ -1733,7 +1751,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showengText - "7UP TAO POWER + "7UP TAO POWER PLUM SODA" @@ -1976,7 +1994,7 @@ PLUM SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมเมล่อน โซดา + "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" @@ -2230,7 +2248,7 @@ PLUM SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ โซดา + "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" @@ -2495,7 +2513,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showengText - "LIMENADE + "LIMENADE SODA" @@ -2991,7 +3009,7 @@ SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมลิ้นจี่ มะนาว + "น้ำเชื่อมลิ้นจี่ มะนาว โซดา " @@ -3003,7 +3021,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "LYCHEE + "LYCHEE LIMENADE SODA" @@ -3014,7 +3032,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, + "Lychee Syrup, Limenade, Soda & Ice" @@ -3237,7 +3255,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพลิ้นจี่ + "เซเว่นอัพลิ้นจี่ มะนาวโซดา" @@ -4271,7 +4289,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x322B26 showengText - "LIME + "LIME SALAK SODA" @@ -4282,7 +4300,7 @@ SALAK SODA" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Limenade, + "Salak Syrup, Limenade, Soda & Ice" @@ -4505,7 +4523,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพสละ + "เซเว่นอัพสละ มะนาวโซดา" @@ -5033,7 +5051,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "PLUM + "PLUM LIMENADE SODA" @@ -5044,7 +5062,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showengText - "Ume Syrup, Limenade, + "Ume Syrup, Limenade, Soda & Ice" @@ -6026,7 +6044,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพบ๊วย + "เซเว่นอัพบ๊วย มะนาวโซดา" @@ -6280,7 +6298,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ สตรอเบอรี่ร์บ๊วยโซดา" @@ -6302,7 +6320,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "7UP PLUM + "7UP PLUM STRAWBERRY LIME" @@ -8053,7 +8071,7 @@ STRAWBERRY LIME" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพยูซุ + "เซเว่นอัพยูซุ มะนาวโซดา" @@ -9340,7 +9358,7 @@ STRAWBERRY LIME" KanitMediumTTF 0x322B26 showengText - "GINGER LIME + "GINGER LIME SODA" @@ -9847,7 +9865,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "GINGER LIME + "GINGER LIME SODA" @@ -10333,7 +10351,7 @@ SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพมินต์ + "เซเว่นอัพมินต์ มะนาวโซดา" @@ -10587,7 +10605,7 @@ SODA" KanitMediumTTF 0x322B26 showthaiText - "สตรอเบอร์รี่ + "สตรอเบอร์รี่ มินต์โซดา" @@ -10609,7 +10627,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY MINT SODA" @@ -11095,7 +11113,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showthaiText - "บ๊วยมะนาว + "บ๊วยมะนาว มินต์โซดา" @@ -11117,7 +11135,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showengText - "PLUM LIMENADE + "PLUM LIMENADE MINT SODA" @@ -11350,7 +11368,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showthaiText - "มินต์ลิ้นจี่ + "มินต์ลิ้นจี่ มะนาวโซดา" @@ -11372,7 +11390,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showengText - "MINT LYCHEE + "MINT LYCHEE LEMON SODA" @@ -14641,7 +14659,7 @@ LEMON SODA" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอม + "มะพร้าวน้ำหอม ลิ้นจี่โซดา" @@ -14663,7 +14681,7 @@ LEMON SODA" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Lychee Soda" @@ -15665,7 +15683,7 @@ Lychee Soda" KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง + "เครื่องดื่มเต่าทรงพลัง (มีคาเฟอีน)" @@ -15919,7 +15937,7 @@ Lychee Soda" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ น้ำมะนาว + "น้ำแดงกลิ่นสละ น้ำมะนาว " @@ -15941,7 +15959,7 @@ Lychee Soda" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Limenade, + "Salak Syrup, Limenade, Water & Ice" @@ -16195,7 +16213,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, Sugar, + "Lychee Syrup, Sugar, Water & Ice" @@ -16428,7 +16446,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ + "น้ำแดงกลิ่นสละ " @@ -16682,7 +16700,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตอเบอร์รี่ น้ำ + "น้ำเชื่อมสตอเบอร์รี่ น้ำ " @@ -16704,7 +16722,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Water & Ice" @@ -17468,7 +17486,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, Sugar, + "Lychee Syrup, Sugar, Water & Ice" @@ -17722,7 +17740,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Water, Ice" @@ -18218,7 +18236,7 @@ Water, Ice" KanitMediumTTF 0x322B26 showengText - "CONGEE WITH + "CONGEE WITH PLANT PROTEIN" @@ -19396,7 +19414,7 @@ PLANT PROTEIN" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/menutab/page_catalog_group_tea.xml b/xml/menutab/page_catalog_group_tea.xml index 3c39ee2c..54db8ad6 100644 --- a/xml/menutab/page_catalog_group_tea.xml +++ b/xml/menutab/page_catalog_group_tea.xml @@ -1,600 +1,606 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - Var Menu3Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + Var Menu3Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 3 Then + Var SlientRefreshIndex = 4 + + EndIf + + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show3 + ;DEBUGVAR inst_show3 + + + + If inst_show3 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshIndex = 3 Then + If inst_show3 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile3 + Open CurrentOpenFile3 + Else + Var SlientRefreshIndex = 4 + + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + + + 10 497 @@ -2006,7 +2012,7 @@ KanitMediumTTF 0x322B26 showengText - "LIME + "LIME GINGER TEA" @@ -2264,7 +2270,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showengText - "LIME + "LIME GINGER TEA" @@ -5071,7 +5077,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่นมะนาว + "ชาเขียวญี่ปุ่นมะนาว " @@ -5093,7 +5099,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA LIMENADE" @@ -5587,7 +5593,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่นมะนาว + "ชาเขียวญี่ปุ่นมะนาว " @@ -5609,7 +5615,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA LIMENADE" @@ -7127,7 +7133,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอม + "มะพร้าวน้ำหอม มัทฉะลาเต้" @@ -7149,7 +7155,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Matcha latte" @@ -7160,7 +7166,7 @@ Matcha latte" KanitMediumTTF 0x6F5F51 showengText - "Coconut Syrup, Matcha Milk + "Coconut Syrup, Matcha Milk Water" @@ -7383,7 +7389,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่น + "ชาเขียวญี่ปุ่น มะพร้าวน้ำหอม" @@ -7637,7 +7643,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าว + "มะพร้าว ชาไทยนมนิวซีแลนด์" @@ -7659,7 +7665,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Thai Milk Tea" @@ -7670,7 +7676,7 @@ Thai Milk Tea" KanitMediumTTF 0x6F5F51 showengText - "Coconut Syrup, Thai Tea, Milk + "Coconut Syrup, Thai Tea, Milk Water" @@ -7893,7 +7899,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "ชาดำเย็น + "ชาดำเย็น มะพร้าวน้ำหอม" @@ -7915,7 +7921,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Thai Black Tea" @@ -8148,7 +8154,7 @@ Thai Black Tea" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าว + "มะพร้าว ชามะลินมนิวซีแลนด์" @@ -8170,7 +8176,7 @@ Thai Black Tea" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Jasmine milk tea" @@ -8181,7 +8187,7 @@ Jasmine milk tea" KanitMediumTTF 0x6F5F51 showengText - "Coconut Syrup, Jasmine Tea, Milk + "Coconut Syrup, Jasmine Tea, Milk Water" @@ -8404,7 +8410,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "ชามะลิ + "ชามะลิ มะพร้าวน้ำหอม" @@ -8925,7 +8931,7 @@ Water" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมน้ำตาลแดง + "ชาไทย น้ำเชื่อมน้ำตาลแดง นม " @@ -8937,7 +8943,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR TEA" @@ -9698,7 +9704,7 @@ TEA" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมสตอเบอร์รี่ + "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " @@ -9720,7 +9726,7 @@ TEA" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Strawberry Syrup, + "Thai tea, Strawberry Syrup, Water" @@ -9957,7 +9963,7 @@ Water" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมสตอเบอร์รี่ + "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " @@ -9979,7 +9985,7 @@ Water" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Strawberry Syrup, + "Thai tea, Strawberry Syrup, Water" @@ -10741,7 +10747,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA LIMENADE" @@ -10999,7 +11005,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE BLACK TEA" @@ -11257,7 +11263,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE LIME TEA" @@ -11268,7 +11274,7 @@ LIME TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwanese tea, Limenade, + "Taiwanese tea, Limenade, Water" @@ -11673,7 +11679,7 @@ Water" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/menutab/page_catalog_group_whey.xml b/xml/menutab/page_catalog_group_whey.xml index ebeee54e..e34641d1 100644 --- a/xml/menutab/page_catalog_group_whey.xml +++ b/xml/menutab/page_catalog_group_whey.xml @@ -1,603 +1,620 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - ;Var Menu6Selected = "Enable" - - Var Menu61Selected = "Enable" - Var Menu62Selected = "Enable" - - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - SetInstanceIgnoreTouch - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - GetVisible inst_show - ;DEBUGVAR inst_show - - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - - If inst_show = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - TimerReset - - - - SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - InstanceGetString SaveStringInst - DEBUGVAR SaveStringInst - DEBUGVAR show_eng - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + ;Var Menu6Selected = "Enable" + + Var Menu61Selected = "Enable" + Var Menu62Selected = "Enable" + + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 8 Then + Var SlientRefreshIndex = 9 + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + GetVisible inst_show8 + ;DEBUGVAR inst_show8 + + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + + If inst_show8 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + + If SlientRefreshIndex = 8 Then + If inst_show8 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile8 + Open CurrentOpenFile8 + Else + Var SlientRefreshIndex = 9 + EndIf + EndIf + + + TimerReset + + + + SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 " + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + 10 497 @@ -734,7 +751,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Matcha, & Milk" @@ -988,7 +1005,7 @@ Matcha, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Matcha, & Milk" @@ -1242,7 +1259,7 @@ Matcha, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Cocoa, & Milk" @@ -1475,7 +1492,7 @@ Cocoa, & Milk" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ + "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ นม" @@ -1487,7 +1504,7 @@ Cocoa, & Milk" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY SHAKE" @@ -1498,7 +1515,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein,Milk, + "Whey protein,Milk, Strawberry Syrup" @@ -1731,7 +1748,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ + "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ นม" @@ -1743,7 +1760,7 @@ Strawberry Syrup" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY SHAKE" @@ -1754,7 +1771,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein,Milk, + "Whey protein,Milk, Strawberry Syrup" @@ -1987,7 +2004,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน น้ำเชื่อมเมล่อน + "เวย์โปรตีน น้ำเชื่อมเมล่อน นม" @@ -2009,7 +2026,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showengText - "Whey protein,Milk, + "Whey protein,Milk, Melon Syrup" @@ -2263,7 +2280,7 @@ Melon Syrup" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Espresso + "Whey protein, Espresso & Milk" @@ -2517,7 +2534,7 @@ Melon Syrup" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Thai Tea, & Milk" @@ -2771,7 +2788,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Thai Tea, & Milk" @@ -3025,7 +3042,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Thai Tea, & Milk" @@ -3258,7 +3275,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม น้ำเชื่อมน้ำตาลแดง" @@ -3270,7 +3287,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR SHAKE" @@ -3281,7 +3298,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Kokuto syrup" @@ -3514,7 +3531,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม ชาไต้หวัน" @@ -3526,7 +3543,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA SHAKE" @@ -3537,7 +3554,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Taiwanese Tea, Sugar" @@ -3770,7 +3787,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม ชาไต้หวัน" @@ -3782,7 +3799,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA SHAKE" @@ -3793,7 +3810,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Taiwanese Tea, Sugar" @@ -4026,7 +4043,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม น้ำเชื่อมคาราเมล" @@ -4048,7 +4065,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Caramel Syrup" @@ -4698,7 +4715,7 @@ Caramel Syrup" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + +