diff --git a/adv/sync_1.file b/adv/sync_1.file index 63719871..0eecf4b5 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 250892 --rw-rw---- 1 root sdcard_rw 0 2024-11-01 10:08 sync_1.file +total 258384 +-rw-rw---- 1 root sdcard_rw 0 2024-11-10 15:15 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 3647528 2023-09-18 18:44 taobin_adv_01.mp4 -rw-rw---- 1 root sdcard_rw 8456105 2024-03-18 16:14 taobin_adv_02.mp4 @@ -39,6 +39,6 @@ total 250892 -rw-rw---- 1 root sdcard_rw 2594334 2024-05-20 16:50 taobin_adv_menu_15.mp4 -rw-rw---- 1 root sdcard_rw 8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4 --rw-rw---- 1 root sdcard_rw 2165663 2023-09-18 18:44 taobin_adv_menu_18.mp4 +-rw-rw---- 1 root sdcard_rw 9807774 2024-11-06 09:22 taobin_adv_menu_18.mp4 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4 -rw-rw---- 1 root sdcard_rw 2353764 2024-11-01 10:02 taobin_adv_menu_20.mp4 diff --git a/adv/taobin_adv_menu_18.mp4 b/adv/taobin_adv_menu_18.mp4 index 18628651..de361a4a 100644 Binary files a/adv/taobin_adv_menu_18.mp4 and b/adv/taobin_adv_menu_18.mp4 differ diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 7414e999..1e60804d 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -504,33 +504,6 @@ ICED AMERICANO BLUE DADDY 12-01-03-0019 1 2 36 3 4 5 23 16 41 24 133 2:13 32 Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23 - - - - - - - - - - - - - - - - - - - - - - - - - - - รีเมียมเอสเพรสโซ่คาราเมลโอริโอ้ 12-21-03-0078 1 2 3 4 14 23 41 24 49 11:01 23 @@ -547,55 +520,6 @@ PEPSI COCOA OREO 12-99-03-0067 1 14 40 15 23 41 24 49 10:01 23 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hot Latte 12-01-81-0004 1 2 3 4 5 6 70 24 1170 10:30 19 Hot Cappucino 12-01-81-0005 1 2 3 4 5 6 70 24 136 2:16 22 Hot Milk 12-03-81-0005 1 6 70 24 102 1:42 49 @@ -1231,3 +1155,17 @@ Strawberry milk 7Up lime top ovaltine 12-03-03-0083 1 18 19 17 23 41 51 24 13 โกโก้ยูซุปั่น 12-99-03-0035 1 15 53 23 41 24 133 12:13 22 กาแฟชานมไต้หวันปั่น 12-99-03-0036 1 2 3 4 5 10 23 41 24 133 13:13 22 กาแฟชานมไต้หวันปั่น 12-99-03-0038 1 2 3 4 5 10 23 41 24 133 14:13 22 + +ชานมขิงโอรีโอปั่น 12-02-03-0056 1 40 7 10 23 41 24 49 10:01 23 +นมมะพร้าวปั่นโอรีโอ\nภูเขาไฟ 12-03-03-0086 1 40 62 23 41 24 49 10:01 23 +นมยูสุปั่นโอรีโอภูเขาไฟ 12-03-03-0087 1 40 53 23 41 24 49 10:01 23 + + + + + + + + + + diff --git a/font/Noto_Sans_Thai/NotoSansThai-Black.ttf b/font/Noto_Sans_Thai/NotoSansThai-Black.ttf new file mode 100644 index 00000000..e2e19470 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Black.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf b/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf new file mode 100644 index 00000000..0d93c1f2 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf b/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf new file mode 100644 index 00000000..695b6b14 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf b/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf new file mode 100644 index 00000000..bc5c80c5 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Light.ttf b/font/Noto_Sans_Thai/NotoSansThai-Light.ttf new file mode 100644 index 00000000..ff65f51d Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Light.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf b/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf new file mode 100644 index 00000000..94f4a7bb Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf b/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf new file mode 100644 index 00000000..638e709b Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf b/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf new file mode 100644 index 00000000..0baa3971 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf b/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf new file mode 100644 index 00000000..30de0630 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf differ diff --git a/image/collectiing/bd_pay_with_cashACU.png b/image/collectiing/bd_pay_with_cashACU.png new file mode 100644 index 00000000..24305cbc Binary files /dev/null and b/image/collectiing/bd_pay_with_cashACU.png differ diff --git a/image/collectiing/bn_pay_with_cashACU.png b/image/collectiing/bn_pay_with_cashACU.png new file mode 100644 index 00000000..864d8674 Binary files /dev/null and b/image/collectiing/bn_pay_with_cashACU.png differ diff --git a/image/collectiing/bp_pay_with_cashACU.png b/image/collectiing/bp_pay_with_cashACU.png new file mode 100644 index 00000000..71cda60f Binary files /dev/null and b/image/collectiing/bp_pay_with_cashACU.png differ diff --git a/image/event/oreo_11/bn_close_en.png b/image/event/oreo_11/bn_close_en.png new file mode 100644 index 00000000..74a26717 Binary files /dev/null and b/image/event/oreo_11/bn_close_en.png differ diff --git a/image/event/oreo_11/bn_close_th.png b/image/event/oreo_11/bn_close_th.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/event/oreo_11/bn_close_th.png differ diff --git a/image/event/oreo_11/bp_close_en.png b/image/event/oreo_11/bp_close_en.png new file mode 100644 index 00000000..60a3529a Binary files /dev/null and b/image/event/oreo_11/bp_close_en.png differ diff --git a/image/event/oreo_11/bp_close_th.png b/image/event/oreo_11/bp_close_th.png new file mode 100644 index 00000000..92966e14 Binary files /dev/null and b/image/event/oreo_11/bp_close_th.png differ diff --git a/image/event/oreo_11/error_en.png b/image/event/oreo_11/error_en.png new file mode 100644 index 00000000..e1ddfe2c Binary files /dev/null and b/image/event/oreo_11/error_en.png differ diff --git a/image/event/oreo_11/error_th.png b/image/event/oreo_11/error_th.png new file mode 100644 index 00000000..21f62b66 Binary files /dev/null and b/image/event/oreo_11/error_th.png differ diff --git a/image/event/weekday_discount/weekday_discount_en.png b/image/event/weekday_discount/weekday_discount_en.png index 3bf8e854..d14c9fc5 100644 Binary files a/image/event/weekday_discount/weekday_discount_en.png and b/image/event/weekday_discount/weekday_discount_en.png differ diff --git a/image/event/weekday_discount/weekday_discount_th.png b/image/event/weekday_discount/weekday_discount_th.png index dead3fe8..12d90a8d 100644 Binary files a/image/event/weekday_discount/weekday_discount_th.png and b/image/event/weekday_discount/weekday_discount_th.png differ diff --git a/image/page_doing/brewing_txt_adv16.png b/image/page_doing/brewing_txt_adv16.png new file mode 100644 index 00000000..d0043d05 Binary files /dev/null and b/image/page_doing/brewing_txt_adv16.png differ diff --git a/image/page_doing/brewing_txt_adv16_en.png b/image/page_doing/brewing_txt_adv16_en.png new file mode 100644 index 00000000..25da78a3 Binary files /dev/null and b/image/page_doing/brewing_txt_adv16_en.png differ diff --git a/image/page_doing/brewing_txt_adv17.png b/image/page_doing/brewing_txt_adv17.png new file mode 100644 index 00000000..29bf3c9b Binary files /dev/null and b/image/page_doing/brewing_txt_adv17.png differ diff --git a/image/page_doing/brewing_txt_adv17_en.png b/image/page_doing/brewing_txt_adv17_en.png new file mode 100644 index 00000000..e832787c Binary files /dev/null and b/image/page_doing/brewing_txt_adv17_en.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png index 288045f6..6f56c367 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png index 86017288..0269f25f 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png index ca5db1f2..4a6ba5da 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index a52f54cd..da32d17e 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png index 96bb598e..bf9af139 100644 Binary files a/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 5fbce028..f487f23d 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index 02cbd838..5aeb97d8 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index e431ff4a..8567c500 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index b36cdb54..97efd131 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index 91236ee5..bd97a58e 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png index 88b71dbf..4db0df11 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index fe8b1918..5f61d1bd 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index c4005f55..9e3cf367 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png index 62a6e0da..47943c84 100644 Binary files a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png index c31e9f65..b3bfd54b 100644 Binary files a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png index 8cf77999..569f9eb1 100644 Binary files a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png index c3fb01dd..5a5a75ff 100644 Binary files a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index 017ad315..5bb8cb5c 100644 Binary files a/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png index 531726df..4aa6e1f9 100644 Binary files a/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 71f8ae79..204ae3a4 100644 Binary files a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index f425eff3..a4a64b83 100644 Binary files a/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index 61a8a939..3c1f7b52 100644 Binary files a/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index 40c56b09..5d47da50 100644 Binary files a/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index 2031a5cc..0872c63d 100644 Binary files a/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png index 03c4ff3b..6f6d85c1 100644 Binary files a/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index ea564c59..aa5dec57 100644 Binary files a/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index e9c73722..f8f2599a 100644 Binary files a/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png index f0b59abf..3ad303c9 100644 Binary files a/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png index 75c0b99a..be8e05ad 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png index 02530c9a..ed5099e6 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png index 15600ae3..5c3981ed 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index 597f1741..12096642 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png index dd9bcb96..7a657aed 100644 Binary files a/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 0e710c49..a2a025ca 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index 2bd9fd10..5429706a 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index 79a102f6..927311ac 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index fb2fcf13..348d9e3d 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index 7575a54b..439d3f3f 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png index 3feff72d..5033140e 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index 810dcee6..615e24cd 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index 0077cd43..59690a32 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png b/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png index 0fb638fc..275a272a 100644 Binary files a/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png and b/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png differ diff --git a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png index 0d2f937f..7d16b518 100644 Binary files a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png index 02f57c9e..6461da68 100644 Binary files a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png index cdf7fecb..ff359034 100644 Binary files a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png index 945b1fc9..df22dc20 100644 Binary files a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png index bf8e6eb8..8833f5b7 100644 Binary files a/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png index 911252d3..41e9a0b2 100644 Binary files a/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png index 02fc4df4..e9fc3d2c 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png index 5c71d34b..ab780483 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png index 348ddd93..09b13482 100644 Binary files a/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png index bcb4abca..444cd915 100644 Binary files a/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png index a9bace01..2271d8c4 100644 Binary files a/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png index 3ac0b8c6..942f80a8 100644 Binary files a/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png index d046d5d5..afb6e374 100644 Binary files a/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png b/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png index 25a8f87e..3d74831f 100644 Binary files a/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png differ diff --git a/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png b/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png index a3b5b81b..27209c4a 100644 Binary files a/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png and b/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png differ diff --git a/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_popup1-AUS.png b/image/page_payment_en/page_payment/img_popup1-AUS.png new file mode 100644 index 00000000..92420fef Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup1-AUS.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/inter/aus/image/payment_cash/bd_pay_qrcode.png b/inter/aus/image/payment_cash/bd_pay_qrcode.png index 7aea9419..30f76e99 100644 Binary files a/inter/aus/image/payment_cash/bd_pay_qrcode.png and b/inter/aus/image/payment_cash/bd_pay_qrcode.png differ diff --git a/inter/aus/image/payment_cash/bn_pay_qrcode.png b/inter/aus/image/payment_cash/bn_pay_qrcode.png index f0591823..4b85e2b8 100644 Binary files a/inter/aus/image/payment_cash/bn_pay_qrcode.png and b/inter/aus/image/payment_cash/bn_pay_qrcode.png differ diff --git a/inter/aus/image/payment_cash/bp_pay_qrcode.png b/inter/aus/image/payment_cash/bp_pay_qrcode.png index 14d77137..f2f88e27 100644 Binary files a/inter/aus/image/payment_cash/bp_pay_qrcode.png and b/inter/aus/image/payment_cash/bp_pay_qrcode.png differ diff --git a/inter/aus/support_langs b/inter/aus/support_langs new file mode 100644 index 00000000..062e5982 --- /dev/null +++ b/inter/aus/support_langs @@ -0,0 +1 @@ +ENG \ No newline at end of file diff --git a/inter/hkg/support_langs b/inter/hkg/support_langs new file mode 100644 index 00000000..062e5982 --- /dev/null +++ b/inter/hkg/support_langs @@ -0,0 +1 @@ +ENG \ No newline at end of file diff --git a/inter/mys/adv/taobin_adv_menu_25.mp4 b/inter/mys/adv/taobin_adv_menu_25.mp4 index f4989ed2..080c4332 100644 Binary files a/inter/mys/adv/taobin_adv_menu_25.mp4 and b/inter/mys/adv/taobin_adv_menu_25.mp4 differ diff --git a/inter/mys/support_langs b/inter/mys/support_langs index 9ea36cbe..c3d30223 100644 --- a/inter/mys/support_langs +++ b/inter/mys/support_langs @@ -1 +1 @@ -ENG,THAI,CHINA,JAPAN,MALAY \ No newline at end of file +ENG,-,CHINA,JAPAN,MALAY diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev index 4e868931..a60a1c16 100644 --- a/inter/mys/xml/event/event_profile.ev +++ b/inter/mys/xml/event/event_profile.ev @@ -5,75 +5,121 @@ DEBUGVAR XMLProfile STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce -DEBUGVAR HasProYuzu250Concat -DEBUGVAR ProReducedPriceEnable -DEBUGVAR IgnoreProfileFromRunEV +Var refresh_str = "-RefreshProf" +STRCONTAIN refresh_str XMLProfile HasRefreshProf -If ProReducedPriceEnable = 1 Then +DEBUGVAR HasRefreshProf +DEBUGVAR NeedRefreshProfile -Else - DEBUGVAR "Case pro reduce end" - ; case-pro-reduce-end - If IgnoreProfileFromRunEV = 1 Then - DEBUGVAR "Pro yuzu ongoing" - ; concat-profile - If HasProYuzu250Concat = "true" Then - DEBUGVAR "Pro yuzu concat" +; refresh-profile-after-promo-end +If NeedRefreshProfile = 1 Then + + READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_3.json" ProfileSlot3MYS + READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS + + STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop + STRCONTAIN "Drop" ProfileSlot4MYS PromoYuzuDis50Drop + + DEBUGVAR PromoYuzuDrop + DEBUGVAR PromoYuzuDis50Drop + + If HasRefreshProf = "true" Then + + DEBUGVAR "case already refresh" + + ; restore-profile + CacheVarStr "get" XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + Var NeedRefreshProfile = 0 + Else + ; save-current-as-pre + CacheVarStr "put" XMLProfilePreEvent + + If PromoYuzuDrop = "true" Then + DEBUGVAR "case yuzu drop --> refresh" + Var XMLProfile = XMLProfile + refresh_str Else + If PromoYuzuDis50Drop = "true" Then + DEBUGVAR "case yuzu drop discount 50% --> refresh" + Var XMLProfile = XMLProfile + refresh_str + EndIf + EndIf + + EndIf +Else + + DEBUGVAR HasProYuzu250Concat + DEBUGVAR ProReducedPriceEnable + DEBUGVAR IgnoreProfileFromRunEV + + If ProReducedPriceEnable = 1 Then + + Else + DEBUGVAR "Case pro reduce end" + ; case-pro-reduce-end + If IgnoreProfileFromRunEV = 1 Then + DEBUGVAR "Pro yuzu ongoing" + ; concat-profile + If HasProYuzu250Concat = "true" Then + DEBUGVAR "Pro yuzu concat" + Else + + If IsProfileReduce = "true" Then + DEBUGVAR "Pro reduce was set but disabled from trick" + CacheVarStr "get" XMLProfilePreEvent + If XMLProfilePreEvent = "" Then + DEBUGVAR "Get PreEvent Empty" + Var XMLProfile = "General" + Else + DEBUGVAR "Restore profile by pre-event, also concat Yuzu" + DEBUGVAR XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + "-" + Var XMLProfile = XMLProfile + "PromoYuzu250" + + EndIf - If IsProfileReduce = "true" Then - DEBUGVAR "Pro reduce was set but disabled from trick" - CacheVarStr "get" XMLProfilePreEvent - If XMLProfilePreEvent = "" Then - DEBUGVAR "Get PreEvent Empty" - Var XMLProfile = "General" Else - DEBUGVAR "Restore profile by pre-event, also concat Yuzu" - DEBUGVAR XMLProfilePreEvent - Var XMLProfile = XMLProfilePreEvent + "-" + DEBUGVAR "No pro reduce, concat pro yuzu" + CacheVarStr "put" XMLProfilePreEvent + + Var XMLProfile = XMLProfile + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" EndIf - - Else - DEBUGVAR "No pro reduce, concat pro yuzu" - CacheVarStr "put" XMLProfilePreEvent - - Var XMLProfile = XMLProfile + "-" - Var XMLProfile = XMLProfile + "PromoYuzu250" - EndIf - EndIf - Else - If IsProfileReduce = "true" Then - DEBUGVAR "No yuzu but set pro reduce" - CacheVarStr "get" XMLProfilePreEvent - If XMLProfilePreEvent = "" Then - DEBUGVAR "PreEvent empty, set General" - Var XMLProfile = "General" - Else - DEBUGVAR "Restore profile by pre-event" - Var XMLProfile = XMLProfilePreEvent - EndIf - Else - - If HasProYuzu250Concat = "true" Then + If IsProfileReduce = "true" Then + DEBUGVAR "No yuzu but set pro reduce" CacheVarStr "get" XMLProfilePreEvent - Var XMLProfile = XMLProfilePreEvent + If XMLProfilePreEvent = "" Then + DEBUGVAR "PreEvent empty, set General" + Var XMLProfile = "General" + Else + DEBUGVAR "Restore profile by pre-event" + Var XMLProfile = XMLProfilePreEvent + EndIf + + Else + + If HasProYuzu250Concat = "true" Then + CacheVarStr "get" XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + EndIf + + DEBUGVAR "Store profile pre event" + DEBUGVAR XMLProfilePreEvent + CacheVarStr "put" XMLProfilePreEvent EndIf - DEBUGVAR "Store profile pre event" - DEBUGVAR XMLProfilePreEvent - CacheVarStr "put" XMLProfilePreEvent EndIf EndIf -EndIf - - - -If IgnoreProfileFromRunEV = 1 Then - Var ToggleAfterEventProfileOff = 1 + + + If IgnoreProfileFromRunEV = 1 Then + Var ToggleAfterEventProfileOff = 1 + EndIf + + EndIf diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index fd1c1581..0fc1ba68 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -58,8 +58,25 @@ If SystemDateMonthInt = 9 Then EndIf EndIf +If SystemDateMonthInt = 10 Then + + Var IgnoreProfileFromRunEV = 0 + +EndIf + +If SystemDateMonthInt = 11 Then + + Var IgnoreProfileFromRunEV = 0 +EndIf + +If SystemDateMonthInt = 12 Then + Var IgnoreProfileFromRunEV = 0 + +EndIf + If SystemDateMonthInt < 10 Then Var ProReducedPriceEnable = 0 + Var IgnoreProfileFromRunEV = 0 EndIf If ProReducedPriceEnable = 0 Then @@ -69,6 +86,23 @@ If ProReducedPriceEnable = 0 Then EndIf EndIf + +; zone-refresh-once + +READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr +STRCONTAIN "1" NeedRefreshStr need_refresh + +If need_refresh = "true" Then + + Var NeedRefreshProfile = 1 + WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0" + +Else + Var NeedRefreshProfile = 0 +EndIf + + + If BoxID = 177746 Then Var ProThaiTeaEnable = 1 Var ProYuzuEnable = 1 diff --git a/inter/sgp/animation01/play_list.tsv b/inter/sgp/animation01/play_list.tsv index d0e86aa0..a3a1ca45 100644 --- a/inter/sgp/animation01/play_list.tsv +++ b/inter/sgp/animation01/play_list.tsv @@ -570,9 +570,9 @@ Coke 52-05-03-0019 1 23 37 13 41 24 49 0:49 23 ไมโลเย็น 52-03-03-0048 1 7 61 16 23 41 24 120 8:00 23 ไมโลปั่นภูเขาไฟ 52-03-03-0049 1 7 15 61 41 61 24 120 8:00 23 - - - +รีเมียมเอสเพรสโซ่คาราเมลโอริโอ้ 52-21-03-0078 1 2 3 4 14 23 41 24 49 11:01 23 +พรีเมียมมัทฉะคาราเมลโอริโอ้ 52-02-03-0057 1 6 22 40 8 9 23 41 24 133 14:13 22 +พรีเมียมชาไทยคาราเมลโอริโอ้ 52-02-03-0058 1 1 6 10 22 40 23 41 24 133 14:13 22 diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..eec67da2 Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..a6897c4a Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..8ec58b6d Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..cb6d7c78 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..589c6fb8 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..0d04e424 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..4ecab465 Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..4aea8004 Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..8149b0aa Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..9dae84a7 Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..f4390602 Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..25af310f Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/support_langs b/inter/sgp/support_langs new file mode 100644 index 00000000..16c4bfe8 --- /dev/null +++ b/inter/sgp/support_langs @@ -0,0 +1 @@ +ENG diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev index a79dcdd2..6910325e 100644 --- a/inter/sgp/video/script_thank.ev +++ b/inter/sgp/video/script_thank.ev @@ -11,3 +11,17 @@ If EventTurnOn = 1 Then EndIf +If UsePepsiTheme = 1 Then + + ; expect-wtc + If SaveTheWorldCount = 0 Then + GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 5184722 Then + Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" + EndIf + Else + + EndIf + +EndIf diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index 46691448..f97879c4 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -690,7 +690,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 60 +; menu_new_list 61 ; ==================> Len = 3 ; 52-01-01-0001 - - @@ -23279,6 +23279,281 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - - 52-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 52-21-03-0078.Button,$Sum5221030078) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM ESPRESSO\nCARAMEL OREO + + PREMIUM ESPRESSO\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coffee, Milk, Caramel Syrup, Oreo + + Coffee, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-21-03-0078.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-21-03-0078.Button + StringFmt( $52-21-03-0078.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-21-03-0078.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5221030078 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index bf5dbacc..82850d37 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -692,7 +692,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 46 +; menu_new_list 48 ; ==================> Len = 3 ; 52-02-01-0001 52-02-02-0001 52-02-03-0001 @@ -13865,6 +13865,556 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - - 52-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0057.Button,$Sum5202030057) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM GREEN TEA\nCARAMEL OREO + + PREMIUM GREEN TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Matcha, Milk, Caramel Syrup, Oreo + + Matcha, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0057.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0057.Button + StringFmt( $52-02-03-0057.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0057.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030057 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 52-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0058.Button,$Sum5202030058) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM THAI TEA\nCARAMEL OREO + + PREMIUM THAI TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Thai Tea, Milk, Caramel Syrup, Oreo + + Thai Tea, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0058.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0058.Button + StringFmt( $52-02-03-0058.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0058.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030058 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/tha/.special/RoadShow.ev b/inter/tha/.special/RoadShow.ev index 2e176a07..5dc8b102 100644 --- a/inter/tha/.special/RoadShow.ev +++ b/inter/tha/.special/RoadShow.ev @@ -1,5 +1,5 @@ -SAVELOG "RoadShow.ev Nov 11 day 2" +SAVELOG "RoadShow.ev Nov 11 175500 day 10" Var RoadShow = "false" @@ -13,8 +13,8 @@ If SystemDateYearInt = 2024 Then If SystemDateMonthInt = 11 Then - If SystemDateDayInt = 2 Then - If BoxID = 201729 Then + If SystemDateDayInt = 10 Then + If BoxID = 175500 Then Var RoadShow = "true" EndIf EndIf @@ -24,5 +24,3 @@ If SystemDateYearInt = 2024 Then EndIf DEBUGVAR RoadShow - -DEBUGVAR RobinsonBeautyPro diff --git a/inter/whatthecup/common/video/wtc_thankyou.mp4 b/inter/whatthecup/common/video/wtc_thankyou.mp4 new file mode 100644 index 00000000..52a5ea4c Binary files /dev/null and b/inter/whatthecup/common/video/wtc_thankyou.mp4 differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 3294b984..27526ca4 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1012,7 +1012,7 @@ Name=WeekdayDiscount,file=page_catalog_group_pro_weekday_discount_event_on.skt Name=Oreo11.11,file=page_catalog_group_pro_oreo_11.skt ลาเต้ปั่นโอรีโอภูเขาไฟ Iced Cafe Latte Oreo\nSmoothie กาแฟ นม น้ำตาล และโอรีโอ Coffee, Milk, \nSugar, Oreo - - 12-01-03-0043 bn_Cafe_Latte_Oreo_smoothie_oreo_11 - - - posi1 - ชานมไทยโอรีโอภูเขาไฟ Thai Milk tea Oreo\nSmoothie ชาไทย นม น้ำตาล และโอรีโอ Thai Tea, Milk,\nSugar, Oreo - - 12-02-03-0044 bn_ThaiTeaOreo_smoothie_oreo_11 - - - posi1 + ชานมไทยโอรีโอ\nภูเขาไฟ Thai Milk tea Oreo\nSmoothie ชาไทย นม น้ำตาล และโอรีโอ Thai Tea, Milk,\nSugar, Oreo - - 12-02-03-0044 bn_ThaiTeaOreo_smoothie_oreo_11 - - - posi1 โอรีโอปั่นภูเขาไฟ OREO SMOOTHIE\nVOLCANO นม น้ำตาล โอรีโอ \n Milk, Sugar, Oreo, Ice - - 12-03-03-0009 bn_smoothie_oreo_oreo_11 - - - posi1 นมชมพูปั่นโอรีโอ\nภูเขาไฟ Pink Oreo\nvolcano น้ำแดงกลิ่นสละ นม น้ำตาล \nโอรีโอ Salak Syrup, Milk,\nSugar Oreo - - 12-03-03-0026 bn_PinkOreo_smoothie_oreo_11 - - - posi1 สตอเบอร์รี่ปั่นโอรีโอ\nภูเขาไฟ Strawberry Milk Oreo\nSmoothie น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล \nโอรีโอ Strawberry Syrup, Milk,\nSugar, Oreo - - 12-03-03-0027 bn_StrawberrOreo_smoothie_oreo_11 - - - posi1 @@ -1024,13 +1024,19 @@ Name=Oreo11.11,file=page_catalog_group_pro_oreo_11.skt เมล่อนปั่นโอรีโอ\nภูเขาไฟ Melon Milk Oreo\nSmoothie น้ำเชื่อมเมล่อน นม น้ำตาล \nโอรีโอ Melon Syrup, Milk,\nSugar, Oreo - - 12-03-03-0028 bn_MelonOreo_smoothie_oreo_11 - - - posi1 นมกล้วยปั่นภูเขาไฟ Banana Milk Oreo\nSmoothie น้ำเชื่อมกล้วย นม น้ำตาล \nโอรีโอ Banana Syrup, Milk,\nSugar, Oreo - - 12-03-03-0029 bn_BananaOreo_smoothie_oreo_11 - - - posi1 มินต์โอรีโอภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \nโอรีโอ Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 bn_Mint_Oreo_smoothie_oreo_11 - - - posi1 - ชานมขิงโอรีโอปั่น GINGER MILK TEA\nOREO SMOOTHIE ขิง นม น้ำตาล \nโอรีโอ Hojicha, Milk,\nSugar, Oreo - - 12-02-03-0056 bn_Ginger_milk_Oreo_smoothie_oreo_11 - - - posi1 + ชานมขิงโอรีโอปั่น GINGER MILK TEA\nOREO SMOOTHIE ขิง นม น้ำตาล \nโอรีโอ Ginger, Milk,\nSugar, Oreo - - 12-02-03-0056 bn_Ginger_milk_Oreo_smoothie_oreo_11 - - - posi1 นมมะพร้าวปั่นโอรีโอ\nภูเขาไฟ coconut milk oreo\nsmoothie น้ำเชื่อมมะพร้าว นม น้ำตาล \nโอรีโอ Coconut Syrup, Milk,\nSugar, Oreo - - 12-03-03-0086 bn_Coconut_Oreo_smoothie_oreo_11 - - - posi1 นมยูสุปั่นโอรีโอภูเขาไฟ Yuzu Milk Oreo\nSmoothie น้ำเชื่อมยูซุ นม น้ำตาล \nโอรีโอ Yuzu Syrup, Milk,\nSugar, Oreo - - 12-03-03-0087 bn_YUZU_Oreo_smoothie_oreo_11 - - - posi1 - พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ PREMIUM ESPRESSO\nCARAMEL OREO กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel Syrup, Oreo - - 12-01-03-0078 bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11 - - - posi1 + พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ PREMIUM ESPRESSO\nCARAMEL OREO กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel Syrup, Oreo - - 12-01-03-0078 bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11 - - 12-21-03-0078 posi1 พรีเมียมมัทฉะ\nคาราเมลโอรีโอ PREMIUM MATCHA\nCARAMEL OREO มัทฉะ นม คาราเมล และโอรีโอ Matcha, Milk, Caramel Syrup, Oreo - - 12-02-03-0057 bn_Caramel_Matcha_Oreo_smoothie_oreo_11 - - - posi1 พรีเมียมชาไทย\nคาราเมลโอรีโอ PREMIUM THAI TEA\nCARAMEL OREO ชาไทย นม คาราเมล และโอรีโอ Thai Tea, Milk, Caramel Syrup, Oreo - - 12-02-03-0058 bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11 - - - posi1 +Name=HappyTrios,file=page_catalog_group_pro_happy_trios.skt + พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ PREMIUM ESPRESSO\nCARAMEL OREO กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel Syrup, Oreo - - 12-01-03-0078 bn_super_oreo_volcano_Caramel_happy_trios.png - - 12-21-03-0078 posi1 + พรีเมียมมัทฉะ\nคาราเมลโอรีโอ PREMIUM MATCHA\nCARAMEL OREO มัทฉะ นม คาราเมล และโอรีโอ Matcha, Milk, Caramel Syrup, Oreo - - 12-02-03-0057 bn_super_oreo_volcano_Matcha_happy_trios.png - - - posi1 + พรีเมียมชาไทย\nคาราเมลโอรีโอ PREMIUM THAI TEA\nCARAMEL OREO ชาไทย นม คาราเมล และโอรีโอ Thai Tea, Milk, Caramel Syrup, Oreo - - 12-02-03-0058 bn_super_oreo_volcano_ThaiTea_happy_trios.png - - - posi1 + + Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt ลาเต้ LATTE กาแฟ นม และ ฟองนม Espresso, Milk, Foamed milk - 12-21-62-0002 12-21-63-0002 มอคค่า MOCHA กาแฟ นม โกโก้ และ น้ำตาล Espresso, Cocoa, Milk, Sugar - 12-21-62-0003 12-21-63-0003 diff --git a/ui/lang.tsv b/ui/lang.tsv index 7fa21585..49323896 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -2,7 +2,7 @@ Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center Font=Kanit,Type=Medium,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center 000001 Page catalog head Welcome ยินดีต้อนรับ 欢迎 ようこそ Welcome ကြိုဆိုပါတယ်။ - Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=32,Color=0x513C2F,Align=Center + Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center 000002 Please Select Drink Type กรุณาเลือกประเภทเครื่องดื่ม 请按键打开饮料门 ドリンクメニューを選ぶ Please Select Drink Type အချိုရည်အမျိုးစားကိုရွေးချယ်ပါ @@ -45,7 +45,7 @@ 000040 Not sweet ไม่หวาน 无糖 Not sweet မချိုဘူး။ 000041 Little หวานจุบจิบ 少糖 Little အချိုပေါ့ 000042 Less หวานน้อย 微糖 Less အချိုနည်း -000043 Perfect หวานพอดี 原味 Perfect ပြီးပြည့်စုံသော +000043 Perfect หวานพอดี 原味 Perfect အချိုပုံမှန် 000044 Extra หวานจึ้ง 非常甜 Extra အချိုများ 000045 Sweetest หวานสุขิต 超级甜 Sweetest အချိုဆုံး Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center @@ -92,7 +92,7 @@ Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 -000073 Pay now ซื้อเลย 现在付款 Pay now ယခုပေးချေပါ။ +000073 Pay now ซื้อเลย 现在付款 Pay now ဝယ်မယ် Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF 000074 Cancel ยกเลิก 取消 Cancel ပယ်ဖျက်ပါ။ diff --git a/video/brewing_adv16.mp4 b/video/brewing_adv16.mp4 new file mode 100755 index 00000000..a5365d85 Binary files /dev/null and b/video/brewing_adv16.mp4 differ diff --git a/video/brewing_adv17.mp4 b/video/brewing_adv17.mp4 new file mode 100755 index 00000000..6741bc90 Binary files /dev/null and b/video/brewing_adv17.mp4 differ diff --git a/video/brewing_txt_adv16.png b/video/brewing_txt_adv16.png new file mode 100644 index 00000000..d0043d05 Binary files /dev/null and b/video/brewing_txt_adv16.png differ diff --git a/video/brewing_txt_adv16_en.png b/video/brewing_txt_adv16_en.png new file mode 100644 index 00000000..25da78a3 Binary files /dev/null and b/video/brewing_txt_adv16_en.png differ diff --git a/video/brewing_txt_adv17.png b/video/brewing_txt_adv17.png new file mode 100644 index 00000000..29bf3c9b Binary files /dev/null and b/video/brewing_txt_adv17.png differ diff --git a/video/brewing_txt_adv17_en.png b/video/brewing_txt_adv17_en.png new file mode 100644 index 00000000..e832787c Binary files /dev/null and b/video/brewing_txt_adv17_en.png differ diff --git a/video/script3_brew.ev b/video/script3_brew.ev index e6548761..48fde37f 100644 --- a/video/script3_brew.ev +++ b/video/script3_brew.ev @@ -1,70 +1,9 @@ ; Need var brew_vdo2 ; Need var brew_txt2 -DEBUGVAR script3_brewing_ignore -If script3_brewing_ignore = "" Then - - - If BoxID = 175689 Then - Var ShopeePayLaterOn = 1 - EndIf - If BoxID = 173873 Then - Var ShopeePayLaterOn = 1 - EndIf - If BoxID = 173149 Then - Var ShopeePayLaterOn = 1 - EndIf - If BoxID = 200001 Then - Var ShopeePayLaterOn = 1 - EndIf +Var adver_brewing_play_index = 1 +Var adver_brewing_count_down = 0 +Var SelectMenuBetweenBrewEnable1Blink = "Enable" +Var SelectMenuBetweenBrewEnable1Text = "Enable" - If SystemDateMonthInt = 9 Then - Var ShopeePayLaterOn = 1 - - If SystemDateDayInt > 14 Then - Var EDC_ThailandOn = 1 - EndIf - EndIf - - - If SystemDateMonthInt = 10 Then - - Var EDC_ThailandOn = 1 - EndIf - - If SystemDateMonthInt = 11 Then - - Var EDC_ThailandOn = 1 - EndIf - - - If ShopeePayLaterOn = 1 Then - - - GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv_size - DEBUGVAR brewing_adv_size - If brewing_adv_size = 3687715 Then - - Var adver_brewing_play_index = 1 - Var adver_brewing_count_down = 15 - - Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv12.mp4" - If show_eng = "true" Then - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12_en.png" - Else - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12.png" - EndIf - SAVELOG "Play adv11 ShopeePayLaterOn " - EndIf - - ; comment for change this file size - - EndIf -Else - Var adver_brewing_play_index = 1 - Var adver_brewing_count_down = 0 - Var SelectMenuBetweenBrewEnable1Blink = "Enable" - Var SelectMenuBetweenBrewEnable1Text = "Enable" - -EndIf diff --git a/video/script3_first_brewing.ev b/video/script3_first_brewing.ev index 3254725e..4bdb84b7 100644 --- a/video/script3_first_brewing.ev +++ b/video/script3_first_brewing.ev @@ -5,6 +5,8 @@ If BrewingAdvertiseShowSlot = "" Then Var BrewingAdvertiseShowSlot = 0 EndIf +Var PremiumTriosEnable = 0 +Var GiftNewYearEnable = 0 If SystemDateMonthInt = 10 Then @@ -16,17 +18,27 @@ EndIf If SystemDateMonthInt = 11 Then Var EDC_ThailandOn = 1 + + If SystemDateDayInt > 20 Then + Var PremiumTriosEnable = 1 + Var GiftNewYearEnable = 1 + EndIf EndIf If SystemDateMonthInt = 12 Then Var EDC_ThailandOn = 1 + Var GiftNewYearEnable = 1 EndIf If SystemDateMonthInt = 1 Then If SystemDateDayInt < 20 Then Var EDC_ThailandOn = 1 EndIf + If SystemDateDayInt < 16 Then + Var GiftNewYearEnable = 1 + EndIf + EndIf @@ -57,6 +69,8 @@ Var BrewingAdvertiseEnable[2] = 0 Var BrewingAdvertiseEnable[3] = 0 Var BrewingAdvertiseEnable[4] = 0 Var BrewingAdvertiseEnable[5] = 0 +Var BrewingAdvertiseEnable[6] = 0 +Var BrewingAdvertiseEnable[7] = 0 DEBUGVAR RobinsonBeautyPro @@ -73,7 +87,7 @@ Else Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv1.png" EndIf -Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 10 +Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 10 Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 1 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 @@ -94,7 +108,7 @@ If brewing_adv11_size = 9800005 Then Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv11.png" EndIf - Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15 + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 15 Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 @@ -118,7 +132,7 @@ If brewing_adv12_size = 3687715 Then Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv12.png" EndIf - Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15 + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 15 Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 @@ -142,7 +156,7 @@ If brewing_adv13_size = 4223917 Then Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv13.png" EndIf - Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 12 + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 12 Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 @@ -165,7 +179,7 @@ If brewing_adv14_size = 10634530 Then Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv14.png" EndIf - Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 28 + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 28 Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 @@ -188,7 +202,7 @@ If brewing_adv15_size = 8455461 Then Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv15.png" EndIf - Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15 + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 15 Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 @@ -200,8 +214,62 @@ EndIf +If brewing_adv16_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv16.mp4" brewing_adv16_size +EndIf + + +DEBUGVAR brewing_adv16_size +If brewing_adv16_size = 7422861 Then + If GiftNewYearEnable = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv16.mp4"; + If show_eng = "true" Then + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv16_en.png" + Else + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv16.png" + EndIf + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 18 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + EndIf +EndIf + + +If brewing_adv17_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv17.mp4" brewing_adv17_size +EndIf + + +DEBUGVAR brewing_adv17_size +If brewing_adv17_size = 9244716 Then + If PremiumTriosEnable = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17.mp4"; + If show_eng = "true" Then + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv17_en.png" + Else + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv17.png" + EndIf + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 13 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + EndIf +EndIf + + + +Var BrewingAdvertiseShowSlot = BrewingAdvertiseShowSlot_SAVE_TEST + + + DEBUGVAR BrewingAdvertiseShowSlot +DEBUGVAR BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] Var brew_vdo1 = BrewingAdvertiseVideo[BrewingAdvertiseShowSlot] Var brew_txt1 = BrewingAdvertiseImage[BrewingAdvertiseShowSlot] diff --git a/video/sync_1.file b/video/sync_1.file index 43ebd60e..3e830132 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,9 +1,11 @@ -total 187292 +total 203812 -rw-rw---- 1 root sdcard_rw 9800005 2024-10-10 14:37 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 9415247 2024-10-08 14:40 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 4223917 2024-11-01 10:02 brewing_adv13.mp4 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 brewing_adv14.mp4 -rw-rw---- 1 root sdcard_rw 8455461 2024-10-04 09:52 brewing_adv15.mp4 +-rw-rw---- 1 root sdcard_rw 7422861 2024-11-05 16:08 brewing_adv16.mp4 +-rw-rw---- 1 root sdcard_rw 9244716 2024-11-05 10:57 brewing_adv17.mp4 -rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9368231 2024-07-19 15:00 brewing_adv4.mp4 -rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png @@ -17,6 +19,10 @@ total 187292 -rw-rw---- 1 root sdcard_rw 41395 2024-09-17 14:18 brewing_txt_adv14_en.png -rw-rw---- 1 root sdcard_rw 44262 2024-10-04 14:41 brewing_txt_adv15.png -rw-rw---- 1 root sdcard_rw 43432 2024-10-04 14:41 brewing_txt_adv15_en.png +-rw-rw---- 1 root sdcard_rw 49830 2024-11-05 16:48 brewing_txt_adv16.png +-rw-rw---- 1 root sdcard_rw 50931 2024-11-05 16:49 brewing_txt_adv16_en.png +-rw-rw---- 1 root sdcard_rw 47482 2024-11-05 21:28 brewing_txt_adv17.png +-rw-rw---- 1 root sdcard_rw 51544 2024-11-05 16:49 brewing_txt_adv17_en.png -rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png -rw-rw---- 1 root sdcard_rw 30982 2023-09-18 18:44 brewing_txt_adv3.png -rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png @@ -26,9 +32,9 @@ total 187292 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 1218 2024-10-31 21:53 script1.ev -rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev --rw-rw---- 1 root sdcard_rw 1401 2024-09-02 10:37 script3_brew.ev --rw-rw---- 1 root sdcard_rw 7272 2024-11-01 10:09 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2024-11-01 10:09 sync_1.file +-rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev +-rw-rw---- 1 root sdcard_rw 9564 2024-11-10 16:24 script3_first_brewing.ev +-rw-rw---- 1 root sdcard_rw 0 2024-11-10 16:23 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 313fd83a..f0a6522f 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -56,14 +56,10 @@ Else If ProEnableCount > 1 Then - If FromBeforeGoToOreo = 1 Then - If WeekdayDiscountProEventOn = 1 Then - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml" - Else - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml" - EndIf + If WeekdayDiscountProEventOn = 1 Then + Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml" Else - Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml" + Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml" EndIf Else diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 6b23a6c0..f6dd69f7 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -138,7 +138,7 @@ Var JemilaRewardOutOfStock = 0 Var HalloweenPro = 0 Var FromHalloweenPro = 0 -; Weekday discount, 4 Nov - 31 Dec +; Weekday discount, 4 Nov - 30 Nov Var WeekdayDiscountPro = 0 Var WeekdayDiscountProEventOn = 0 Var FromWeekdayDiscountProEventOn = 0 @@ -342,6 +342,9 @@ If BoxID = 172644 Then Var WeekdayDiscountPro = 1 Var WeekdayDiscountProEventOn = 1 Var OreoDiscount11Pro = 1 + + Var New_Payment = 1 + Var NewFlowPaymentCode = 1 EndIf Var XMLLiveInfoEnable = 1 @@ -475,7 +478,7 @@ EndIf If OreoEnable = "true" Then - + Else Var OreoDiscount11Pro = 0 EndIf @@ -489,6 +492,14 @@ Var CurrentMainVideoTemp = 0 READ_FILE "/mnt/sdcard/coffeevending/jemila_reward_out_of_stock" JemilaRewardOutOfStock DEBUGVAR JemilaRewardOutOfStock +READ_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" Oreo11DisableFromFile +DEBUGVAR Oreo11DisableFromFile +DEBUGVAR OreoEnable +If Oreo11DisableFromFile = 1 Then + Var OreoDiscount11Pro = 0 +EndIf + +DEBUGVAR OreoDiscount11Pro ; Control collect promotion point behavior Var New_Payment = 0 @@ -540,10 +551,13 @@ EndIf ; If BoxID > 200000 Then - If BoxID < 202000 Then - Var New_Payment = 1 - Var NewFlowPaymentCode = 1 - EndIf + Var New_Payment = 1 + Var NewFlowPaymentCode = 1 +EndIf + +If BoxID > 178000 Then + Var New_Payment = 1 + Var NewFlowPaymentCode = 1 EndIf Var SaveOrderNameAndPictureEnable = 0 diff --git a/xml/event/weekday_discount/before_go_to_oreo_discount.xml b/xml/event/weekday_discount/before_go_to_oreo_discount.xml index 2b70c753..1929ad5f 100644 --- a/xml/event/weekday_discount/before_go_to_oreo_discount.xml +++ b/xml/event/weekday_discount/before_go_to_oreo_discount.xml @@ -7,8 +7,6 @@ Var Timeout = 0 - Var FromBeforeGoToOreo = 1 - Var SELLONLINE = 0 If SELLSTATUS = "SELLONLINE" Then Var SELLONLINE = 1 @@ -19,16 +17,16 @@ Var GettingDiscountStatus = 0 - If SELLONLINE = 1 Then - If GettingDiscountStatus = 0 Then - Var GettingDiscountStatus = 1 - Var AC = "2/0899999999" - GETACCEXT AC 38 - EndIf - Else - Var OreoDiscount11Pro = 0 - TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" - EndIf + If SELLONLINE = 1 Then + If GettingDiscountStatus = 0 Then + Var GettingDiscountStatus = 1 + Var AC = "2/0899999999" + GETACCEXT AC 38 + EndIf + Else + Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml" + EndIf + @@ -38,33 +36,41 @@ Var Timeout = Timeout + 1 If Timeout > 5 Then - Var OreoDiscount11Pro = 0 - TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml" EndIf + + Refresh + TimerReset If GettingDiscountStatus = 1 Then - + DEBUGVAR Ext1a If Ext1a = "ok" Then - Var cupCount = Ext1b - INT cupCount + Var cupCount = Ext1b + INT cupCount - DEBUGVAR cupCount - SAVELOG "Ext1a=ok get oreo qoutar" - Else - SAVELOG "Ext1a=error not oreo qoutar" + DEBUGVAR cupCount + + Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml" + Else + If Ext1a = "error" Then + WRITE_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" "1" + + Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml" + EndIf EndIf - TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" EndIf + ;include="ROOT/taobin_project/xml/menu_catalog_new.xml" + 493 968 94 94 - LOADING_STATE + "Enable "ROOT/taobin_project/image/page_payment_en/page_payment/loading.gif" \ No newline at end of file diff --git a/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml b/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml index 6f3c230e..9978a123 100644 --- a/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml +++ b/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml @@ -118,7 +118,7 @@ "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png" - Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml" + Open "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml" @@ -147,6 +147,8 @@ ;TAGESP ; ==================> Len = 12 ; - - 12-99-03-0074 + ; ==================> Len = 12 + ; - - 12-99-03-0074 33 22 @@ -163,8 +165,8 @@ SoundVolume Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -237,7 +239,7 @@ 0x322B26 showthaiText "พรีเมียมเอสเพรสโซ่ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -247,7 +249,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม คาลาเมล และ Oreo" + "กาแฟ นม คาราเมล และโอรีโอ" 16 @@ -414,8 +416,8 @@ CARAMEL OREO" xmlpro( 12-99-03-0075, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -488,7 +490,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมเอสเพรสโซ่ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -498,7 +500,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม คาลาเมล และ Oreo" + "กาแฟ นม คาราเมล และโอรีโอ" 16 @@ -665,9 +667,9 @@ CARAMEL OREO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo" + Var NameDrink = "PREMIUM MATCHA CARAMEL OREO" + Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -740,7 +742,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมมัทฉะ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -750,7 +752,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "มัทฉะ นม คาลาเมล และ Oreo" + "มัทฉะ นม คาราเมล และโอรีโอ" 16 @@ -761,7 +763,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showengText - "PREMIUM GREEN TEA + "PREMIUM MATCHA CARAMEL OREO" @@ -919,8 +921,8 @@ CARAMEL OREO" SoundVolume Var NameDrink = "PREMIUM THAI TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "ชาไทย นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "ชาไทย นม คาราเมล และโอรีโอ" Var DrinkDescription = "Thai Tea, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -993,7 +995,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมชาไทย -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -1003,7 +1005,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย นม คาลาเมล และ Oreo" + "ชาไทย นม คาราเมล และโอรีโอ" 16 @@ -1173,7 +1175,7 @@ CARAMEL OREO" Var NameDrink = "COCONUT MILK SMOOTHIE" Var NameDrinkTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" - Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" + Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นม" Var DrinkDescription = "Coconut syrup, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -1257,7 +1259,7 @@ CARAMEL OREO" 0x6F5F51 showthaiText "มะพร้าวน้ำหอมปั่น -นมนิวซีแลนด์" +นม" 16 @@ -1933,7 +1935,7 @@ SMOOTHIE" Var NameDrink = "ICED THAI MILK TEA COCONUT" Var NameDrinkTH = "มะพร้าวชาไทย นมนิวซีแลนด์" - Var DrinkDescriptionTH = "มะพร้าว ชาไทย นมนิวซีแลนด์" + Var DrinkDescriptionTH = "มะพร้าว ชาไทย นม" Var DrinkDescription = "Coconut syrup, Thai tea, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2016,7 +2018,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "มะพร้าว ชาไทย นมนิวซีแลนด์" + "มะพร้าว ชาไทย นม" 16 @@ -2420,7 +2422,7 @@ SMOOTHIE" ; - - - - ; ==================> Len = 11 + ; ==================> Len = 12 ; - - 12-99-03-0010 33 @@ -2533,7 +2535,8 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "COCOA STRAW SMOOTHIE" + "COCOA STRAW +SMOOTHIE" 16 @@ -2671,255 +2674,7 @@ SMOOTHIE" center-vertical-horizontal - ; - - posi1 - - 33 - 22 - 225 - 296 - Flag( posi1.Button,$Sumposi1) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "COCOA STRAW SMOOTHIE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "Cocoa, Strawberry syrup, Milk" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "นม น้ำเชื่อมสตอเบอร์รี่ -โกโก้ และน้ำแข็ง" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "-" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $posi1.Button - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $posi1.Button - StringFmt( $posi1.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sumposi1 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $posi1.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sumposi1 - text_unavailable - center-vertical-horizontal - - + ; - - - ; ==================> Len = 12 ; - - 12-99-03-0032 @@ -2939,7 +2694,7 @@ SMOOTHIE" Var NameDrink = "SUPER VOCANO" Var NameDrinkTH = "ซูเปอร์โอริภูเขาไฟ" - Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้" + Var DrinkDescriptionTH = "นม น้ำตาล โอรีโอ" Var DrinkDescription = "Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_super_oreo_volcano_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3021,7 +2776,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้" + "นม น้ำตาล โอรีโอ" 16 @@ -3190,7 +2945,7 @@ SMOOTHIE" Var NameDrink = "ICED SUPER COCOA X3" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3" - Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3272,7 +3027,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 2x นม และน้ำตาล" + "โกโก้ 3x นม และน้ำตาล" 16 @@ -3441,7 +3196,7 @@ SMOOTHIE" Var NameDrink = "ICE SUPER COCOA X2" Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2" - Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล" + Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล" Var DrinkDescription = "Milk, Cocoa, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3523,7 +3278,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ 3x นม และน้ำตาล" + "โกโก้ 2x นม และน้ำตาล" 16 diff --git a/xml/event/weekday_discount/oreo_discount_11_error.xml b/xml/event/weekday_discount/oreo_discount_11_error.xml new file mode 100644 index 00000000..ef5f35ef --- /dev/null +++ b/xml/event/weekday_discount/oreo_discount_11_error.xml @@ -0,0 +1,53 @@ + + "Enable" + 1080 + 1920 + ; "0xeae6e1" + SoundVolume + + Var Timeout = 0 + + If show_eng = "true" Then + Var ImageError = "ROOT/taobin_project/image/event/oreo_11/error_en.png" + Var ButtonImg = "ROOT/taobin_project/image/event/oreo_11/bn_close_en.png" + Var ButtonPressedImg = "ROOT/taobin_project/image/event/oreo_11/bp_close_en.png" + Else + Var ImageError = "ROOT/taobin_project/image/event/oreo_11/error_th.png" + Var ButtonImg = "ROOT/taobin_project/image/event/oreo_11/bn_close_th.png" + Var ButtonPressedImg = "ROOT/taobin_project/image/event/oreo_11/bp_close_th.png" + EndIf + + + + 1000 + + Var Timeout = Timeout + 1 + + If Timeout > 5 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + Refresh + TimerReset + + + + + + 0 + 380 + ImageError + + + + + + \ No newline at end of file diff --git a/xml/event/weekday_discount/promotion_oreo_discount_11.xml b/xml/event/weekday_discount/promotion_oreo_discount_11.xml index 3a63457a..f204e7ae 100644 --- a/xml/event/weekday_discount/promotion_oreo_discount_11.xml +++ b/xml/event/weekday_discount/promotion_oreo_discount_11.xml @@ -98,250 +98,250 @@ ;TAGESP ; ==================> Len = 12 - - 33 - 22 - 225 - 296 - "Enable" - + + 16 + 164 + 24 +220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "น้ำดื่ม" + + + 16 + 220 + 14 +220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำ" + + + 16 + 164 + 22 +220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "DRINKING WATER" + + + 16 + 220 + 14 +220 + KanitMediumTTF + 0x6F5F51 + showengText + "Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize +220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0016.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize +220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0016.Button + StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize +220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205020016 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" EndIf - EndIf - Var menu_name_eng_hot = $##-##-##-####.NameE - Var menu_desc_eng_hot = $##-##-##-####.descriptionE - Var menu_name_thai_hot = $##-##-##-####.Name - Var menu_desc_thai_hot = $##-##-##-####.description - - Var menu_name_eng_cold = $12-05-02-0016.NameE - Var menu_desc_eng_cold = $12-05-02-0016.descriptionE - Var menu_name_thai_cold = $12-05-02-0016.Name - Var menu_desc_thai_cold = $12-05-02-0016.description - - Var menu_name_eng_blender = $##-##-##-####.NameE - Var menu_desc_eng_blender = $##-##-##-####.descriptionE - Var menu_name_thai_blender = $##-##-##-####.Name - Var menu_desc_thai_blender = $##-##-##-####.description - - DEBUGVAR PD_STAGE_1 - DEBUGVAR PD_STAGE_2 - DEBUGVAR PD_STAGE_3 - Var SelectDrinkType = 0 - - - Open "ROOT/taobin_project/xml/page_topping_select5.xml" - - - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "น้ำดื่ม" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "น้ำ" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "DRINKING WATER" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Water" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0016.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0016.Button - StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020016 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020016 - text_unavailable - center-vertical-horizontal - + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 +128 +64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1205020016 + text_unavailable + center-vertical-horizontal + 33 @@ -606,8 +606,8 @@ SoundVolume Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png" Var OpenFromXML = CurrentXMLFileName2 @@ -680,7 +680,7 @@ 0x322B26 showthaiText "พรีเมียมมัทฉะ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -690,7 +690,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "มัทฉะ นม คาลาเมล และ Oreo" + "มัทฉะ นม คาราเมล และโอรีโอ" 16 @@ -1331,13 +1331,12 @@ CARAMEL OREO" -; - - 12-01-03-0078 33 22 225 296 - Flag( 12-01-03-0078.Button,$Sum1201030078) + Flag( 12-01-03-0078.Button,Disable=Invisible,$Sum1201030078) - - - - - 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 + + + + + +; 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 + + + + + + + + + + 10 497 @@ -1246,7 +1230,7 @@ KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -1502,7 +1486,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -2270,7 +2254,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -2526,7 +2510,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -3784,7 +3768,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -3795,7 +3779,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -3807,7 +3791,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -3818,7 +3802,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -4045,7 +4029,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -4056,7 +4040,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -4068,7 +4052,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -4079,7 +4063,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -4306,7 +4290,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต CHOPIN" @@ -4317,7 +4301,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -4329,7 +4313,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ESPRESSO" @@ -4340,7 +4324,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -4567,7 +4551,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MANDARINE" @@ -4589,7 +4573,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ESPRESSO" @@ -4826,7 +4810,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต OPUS ONE" @@ -4848,7 +4832,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ESPRESSO" @@ -5085,7 +5069,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -5096,7 +5080,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -5108,7 +5092,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -5119,7 +5103,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -5346,7 +5330,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -5357,7 +5341,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -5369,7 +5353,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -5380,7 +5364,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -5607,7 +5591,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -5618,7 +5602,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -5630,7 +5614,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -5641,7 +5625,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -5868,7 +5852,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -5879,7 +5863,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -5891,7 +5875,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -5902,7 +5886,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -6129,7 +6113,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -6140,7 +6124,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -6152,7 +6136,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -6389,7 +6373,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -6647,7 +6631,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -6658,7 +6642,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -6680,7 +6664,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -7410,7 +7394,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -7421,7 +7405,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -7433,7 +7417,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -7444,7 +7428,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -7671,7 +7655,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -7682,7 +7666,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -7694,7 +7678,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -7705,7 +7689,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -7932,7 +7916,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน CHOPIN" @@ -7943,7 +7927,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -7955,7 +7939,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN AMERICANO" @@ -7966,7 +7950,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -8193,7 +8177,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MANDARINE" @@ -8215,7 +8199,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE AMERICANO" @@ -8452,7 +8436,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน OPUS ONE" @@ -8474,7 +8458,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE AMERICANO" @@ -8711,7 +8695,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -8722,7 +8706,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -8734,7 +8718,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -8745,7 +8729,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -8972,7 +8956,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -8983,7 +8967,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -8995,7 +8979,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -9006,7 +8990,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -9233,7 +9217,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -9244,7 +9228,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -9256,7 +9240,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -9267,7 +9251,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -9494,7 +9478,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -9505,7 +9489,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -9517,7 +9501,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -9528,7 +9512,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -9755,7 +9739,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -9766,7 +9750,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -9778,7 +9762,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -10015,7 +9999,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -10037,7 +10021,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -10274,7 +10258,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -10285,7 +10269,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -10297,7 +10281,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN AMERICANO" @@ -10308,7 +10292,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -10535,7 +10519,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -10546,7 +10530,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -10558,7 +10542,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -10569,7 +10553,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -10792,7 +10776,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MOZART + "MOZART ALMOST DIRTY" @@ -10803,7 +10787,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -10815,7 +10799,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ALMOST DIRTY" @@ -10826,7 +10810,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -11049,7 +11033,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -11060,7 +11044,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -11072,7 +11056,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -11083,7 +11067,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -11306,7 +11290,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -11328,7 +11312,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -11561,7 +11545,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -11583,7 +11567,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -11816,7 +11800,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -11827,7 +11811,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -11839,7 +11823,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -11850,7 +11834,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -12073,7 +12057,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -12084,7 +12068,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -12096,7 +12080,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -12107,7 +12091,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -12330,7 +12314,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -12341,7 +12325,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -12353,7 +12337,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -12364,7 +12348,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -12587,7 +12571,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -12598,7 +12582,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -12610,7 +12594,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -12621,7 +12605,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -12844,7 +12828,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -12855,7 +12839,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -12867,7 +12851,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -13100,7 +13084,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -13122,7 +13106,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -13355,7 +13339,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -13366,7 +13350,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -13378,7 +13362,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -13389,7 +13373,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -13633,7 +13617,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -13885,7 +13869,7 @@ ICED ESPRESSO" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -15660,7 +15644,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -15682,7 +15666,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -15917,7 +15901,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -15939,7 +15923,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -16175,7 +16159,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16187,7 +16171,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -16432,7 +16416,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16444,7 +16428,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -16690,7 +16674,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16702,7 +16686,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -16947,7 +16931,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -16959,7 +16943,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -17205,7 +17189,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -17217,7 +17201,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -17228,7 +17212,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -17463,7 +17447,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -17475,7 +17459,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -17486,7 +17470,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -17722,7 +17706,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -17734,7 +17718,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -17979,7 +17963,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -17991,7 +17975,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -18237,7 +18221,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -18249,7 +18233,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -18260,7 +18244,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18495,7 +18479,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -18507,7 +18491,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -18518,7 +18502,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18765,7 +18749,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19021,7 +19005,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19278,7 +19262,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19534,7 +19518,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -19780,7 +19764,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -19792,7 +19776,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -19803,7 +19787,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -20038,7 +20022,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -20050,7 +20034,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -20061,7 +20045,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -20318,7 +20302,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -20574,7 +20558,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -20831,7 +20815,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -21087,7 +21071,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -21334,7 +21318,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -21345,7 +21329,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -21591,7 +21575,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -21602,7 +21586,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -21859,7 +21843,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -22115,7 +22099,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -22372,7 +22356,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -22628,7 +22612,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -22885,7 +22869,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -23141,7 +23125,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -23398,7 +23382,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -23654,7 +23638,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -24383,7 +24367,7 @@ Sugar, Milk" KanitMediumTTF 0x322B26 showthaiText - "กาแฟดำ + "กาแฟดำ มะพร้าวน้ำหอม" @@ -24415,7 +24399,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Coconut Syrup, + "Espresso, Coconut Syrup, Sugar, Water" @@ -24636,7 +24620,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showthaiText - "กาแฟดำ + "กาแฟดำ มะพร้าวน้ำหอม" @@ -24668,7 +24652,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Coconut Syrup, + "Espresso, Coconut Syrup, Sugar, Water" @@ -24890,7 +24874,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟบ๊วยโซดา" @@ -24912,7 +24896,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "7UP PLUM LIME + "7UP PLUM LIME COFFEE" @@ -25143,7 +25127,7 @@ COFFEE" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟบ๊วยโซดา" @@ -25165,7 +25149,7 @@ COFFEE" KanitMediumTTF 0x322B26 showengText - "7UP PLUM LIME + "7UP PLUM LIME COFFEE" @@ -25397,7 +25381,7 @@ COFFEE" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟสละโซดา" @@ -25419,7 +25403,7 @@ COFFEE" KanitMediumTTF 0x322B26 showengText - "7UP PLUM SALAK + "7UP PLUM SALAK LIME COFFEE" @@ -25430,7 +25414,7 @@ LIME COFFEE" KanitMediumTTF 0x6F5F51 showengText - "Espreeso, 7UP, Lime + "Espreeso, 7UP, Lime Salak, Ice" @@ -25651,7 +25635,7 @@ LIME COFFEE" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ กาแฟสละโซดา" @@ -25673,7 +25657,7 @@ LIME COFFEE" KanitMediumTTF 0x322B26 showengText - "7UP PLUM SALAK + "7UP PLUM SALAK LIME COFFEE" @@ -25684,7 +25668,7 @@ LIME COFFEE" KanitMediumTTF 0x6F5F51 showengText - "Espreeso, 7UP, Lime + "Espreeso, 7UP, Lime Salak, Ice" @@ -25827,9 +25811,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 587bfb25..9be8e965 100644 --- a/xml/menutab/page_catalog_group_forkid.xml +++ b/xml/menutab/page_catalog_group_forkid.xml @@ -1,623 +1,608 @@ - - - - "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 - - - - - - - - - - - + + + + "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 + + + + + + + + + + + 10 497 @@ -1258,7 +1243,7 @@ KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR MILK" @@ -1505,7 +1490,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -2273,7 +2258,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" @@ -2285,7 +2270,7 @@ MILK" KanitMediumTTF 0x322B26 showengText - "STRAWCOCOA + "STRAWCOCOA SMOOTHIE" @@ -2539,7 +2524,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -2793,7 +2778,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "COCOA OVALTINE + "COCOA OVALTINE VOLCANO" @@ -3542,7 +3527,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมเมล่อน โซดา + "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" @@ -3796,7 +3781,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ โซดา + "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" @@ -4050,7 +4035,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -4062,7 +4047,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -4316,7 +4301,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "TOKYO + "TOKYO BANANA MILK" @@ -4553,7 +4538,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "นมช็อกโกโตเกียว + "นมช็อกโกโตเกียว บานาน่า" @@ -4575,7 +4560,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "CHOCO TOKYO + "CHOCO TOKYO BANANA MILK" @@ -6345,7 +6330,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "โกโก้ + "โกโก้ บิสคอฟ" @@ -6356,7 +6341,7 @@ BANANA MILK" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล บิสคอฟ" @@ -6368,7 +6353,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "COCOA MILK + "COCOA MILK BISCOFF VOLCANO" @@ -6379,7 +6364,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk, + "Cocoa, Milk, Sugar, Biscof" @@ -6523,7 +6508,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 6fe60083..4fce89c5 100644 --- a/xml/menutab/page_catalog_group_health.xml +++ b/xml/menutab/page_catalog_group_health.xml @@ -1,611 +1,595 @@ - - - - "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 - - - - - - - + + + + "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 + + + + + + + 10 497 @@ -721,7 +705,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ และน้ำร้อน + "กาแฟ และน้ำร้อน (อเมริกาโน)" @@ -977,7 +961,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ และน้ำร้อน + "กาแฟ และน้ำร้อน (อเมริกาโน)" @@ -1255,7 +1239,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -1511,7 +1495,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -1747,7 +1731,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ผสมช็อกโกแลต + "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" @@ -1769,7 +1753,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Cocoa, + "Espresso, Cocoa, Milk, Sugar" @@ -2004,7 +1988,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ผสมช็อกโกแลต + "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" @@ -2026,7 +2010,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Cocoa, + "Espresso, Cocoa, Milk, Sugar" @@ -2283,7 +2267,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -2539,7 +2523,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -3043,7 +3027,7 @@ Foamed milk" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE MILK TEA" @@ -3054,7 +3038,7 @@ MILK TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwanese Tea, Sugar, + "Taiwanese Tea, Sugar, and Milk" @@ -4073,7 +4057,7 @@ and Milk" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA LIMENADE" @@ -4567,7 +4551,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชาดำไต้หวัน + "ชาดำไต้หวัน มะนาว" @@ -4589,7 +4573,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE LBLACK TEA" @@ -4600,7 +4584,7 @@ LBLACK TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwan tea, Limenade, + "Taiwan tea, Limenade, Water, and Ice" @@ -5876,7 +5860,7 @@ Water, and Ice" KanitMediumTTF 0x322B26 showengText - "ICED LIMENADE + "ICED LIMENADE SODA" @@ -9581,7 +9565,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 8de84915..3ef516d8 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -1,613 +1,595 @@ - - - - "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 - - - - - - - - - + + + + "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 + + + + + + + + + 10 497 @@ -1237,7 +1219,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล น้ำเชื่อมคาราเมล" @@ -1259,7 +1241,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk,Sugar, + "Cocoa, Milk,Sugar, Caramel Syrup" @@ -1507,7 +1489,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR MILK" @@ -1754,7 +1736,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -2771,7 +2753,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" @@ -2783,7 +2765,7 @@ MILK" KanitMediumTTF 0x322B26 showengText - "STRAWCOCOA + "STRAWCOCOA SMOOTHIE" @@ -3026,7 +3008,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" @@ -3038,7 +3020,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "STRAWMILK + "STRAWMILK SMOOTHIE" @@ -3281,7 +3263,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -3293,7 +3275,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -3804,7 +3786,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -4047,7 +4029,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -4059,7 +4041,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "SUPER OREO + "SUPER OREO VOLCANO" @@ -4313,7 +4295,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "COCOA OVALTINE + "COCOA OVALTINE VOLCANO" @@ -5060,7 +5042,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showthaiText - "นมชมพูปั่น + "นมชมพูปั่น โอรีโอภูเขาไฟ" @@ -5071,7 +5053,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม น้ำตาล + "น้ำแดงกลิ่นสละ นม น้ำตาล Oreo" @@ -5083,7 +5065,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "PINK MILK + "PINK MILK OREO VOLCANO" @@ -5094,7 +5076,7 @@ OREO VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Milk, + "Salak Syrup, Milk, Sugar Oreo" @@ -5338,7 +5320,7 @@ Sugar Oreo" KanitMediumTTF 0x322B26 showengText - "TOKYO + "TOKYO BANANA MILK" @@ -5575,7 +5557,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "นมช็อกโกโตเกียว + "นมช็อกโกโตเกียว บานาน่า" @@ -5597,7 +5579,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "CHOCO TOKYO + "CHOCO TOKYO BANANA MILK" @@ -5844,7 +5826,7 @@ BANANA MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมมินต์ นม น้ำตาล + "น้ำเชื่อมมินต์ นม น้ำตาล Oreo" @@ -5856,7 +5838,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "MINT + "MINT OREO VOLCANO" @@ -5867,7 +5849,7 @@ OREO VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Oreo" @@ -6121,7 +6103,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Cocoa" @@ -6626,7 +6608,7 @@ Sugar, Cocoa" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY MINT MILK" @@ -6637,7 +6619,7 @@ MINT MILK" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Strawberry Syrup" @@ -7148,7 +7130,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showengText - "Peach Syrup, Milk, + "Peach Syrup, Milk, Sugar, Cocoa" @@ -7381,7 +7363,7 @@ Sugar, Cocoa" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมพีช นม น้ำตาล + "น้ำเชื่อมพีช นม น้ำตาล Oreo" @@ -7403,7 +7385,7 @@ Sugar, Cocoa" KanitMediumTTF 0x6F5F51 showengText - "Peach Syrup, Milk, + "Peach Syrup, Milk, Sugar, Oreo" @@ -7626,7 +7608,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมคาราเมล + "นมคาราเมล บิสคอฟ" @@ -7637,7 +7619,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมคาราเมล นม น้ำตาล + "น้ำเชื่อมคาราเมล นม น้ำตาล บิสคอฟ" @@ -7649,7 +7631,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CARAMEL MILK + "CARAMEL MILK BISCOFF VOLCANO" @@ -7660,7 +7642,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Caramel Syrup, Milk, + "Caramel Syrup, Milk, Sugar, Biscof" @@ -7883,7 +7865,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "นมสตรอเบอร์รี่ + "นมสตรอเบอร์รี่ บิสคอฟ" @@ -7894,7 +7876,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล + "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล บิสคอฟ" @@ -7906,7 +7888,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY MILK + "STRAWBERRY MILK BISCOFF VOLCANO" @@ -7917,7 +7899,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, Milk, + "Strawberry Syrup, Milk, Sugar, Biscof" @@ -8140,7 +8122,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "นมมินต์ + "นมมินต์ บิสคอฟ" @@ -8151,7 +8133,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมมินต์ นม น้ำตาล + "น้ำเชื่อมมินต์ นม น้ำตาล บิสคอฟ" @@ -8163,7 +8145,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "Mint MILK + "Mint MILK BISCOFF VOLCANO" @@ -8174,7 +8156,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Biscof" @@ -8397,7 +8379,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "โกโก้ + "โกโก้ บิสคอฟ" @@ -8408,7 +8390,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล บิสคอฟ" @@ -8420,7 +8402,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "COCOA MILK + "COCOA MILK BISCOFF VOLCANO" @@ -8431,7 +8413,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk, + "Cocoa, Milk, Sugar, Biscof" @@ -8654,7 +8636,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอมปั่น + "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" @@ -8686,7 +8668,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showengText - "Coconut syrup, Milk, + "Coconut syrup, Milk, Water" @@ -8909,7 +8891,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวโกโก้ปั่น + "มะพร้าวโกโก้ปั่น นมนิวซีแลนด์" @@ -8941,7 +8923,7 @@ Water" KanitMediumTTF 0x6F5F51 showengText - "Coconut syrup, Cocoa, Milk, + "Coconut syrup, Cocoa, Milk, Water" @@ -9085,14 +9067,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 fde09d6f..2d4e9de1 100644 --- a/xml/menutab/page_catalog_group_other.xml +++ b/xml/menutab/page_catalog_group_other.xml @@ -1,616 +1,597 @@ - - - - "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 - - - - - - - - - - + + + + "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 + + + + + + + + + + 10 497 @@ -1485,7 +1466,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง โซดา + "เครื่องดื่มเต่าทรงพลัง โซดา (มีคาเฟอีน)" @@ -1497,7 +1478,7 @@ KanitMediumTTF 0x322B26 showengText - "TAO POWER + "TAO POWER DRINK SODA" @@ -1730,7 +1711,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพชูกำลัง + "เซเว่นอัพชูกำลัง บ๊วยโซดา" @@ -1752,7 +1733,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showengText - "7UP TAO POWER + "7UP TAO POWER PLUM SODA" @@ -1995,7 +1976,7 @@ PLUM SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมเมล่อน โซดา + "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" @@ -2249,7 +2230,7 @@ PLUM SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ โซดา + "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" @@ -2514,7 +2495,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showengText - "LIMENADE + "LIMENADE SODA" @@ -3010,7 +2991,7 @@ SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมลิ้นจี่ มะนาว + "น้ำเชื่อมลิ้นจี่ มะนาว โซดา " @@ -3022,7 +3003,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "LYCHEE + "LYCHEE LIMENADE SODA" @@ -3033,7 +3014,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, + "Lychee Syrup, Limenade, Soda & Ice" @@ -3256,7 +3237,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพลิ้นจี่ + "เซเว่นอัพลิ้นจี่ มะนาวโซดา" @@ -4290,7 +4271,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x322B26 showengText - "LIME + "LIME SALAK SODA" @@ -4301,7 +4282,7 @@ SALAK SODA" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Limenade, + "Salak Syrup, Limenade, Soda & Ice" @@ -4524,7 +4505,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพสละ + "เซเว่นอัพสละ มะนาวโซดา" @@ -5052,7 +5033,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "PLUM + "PLUM LIMENADE SODA" @@ -5063,7 +5044,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showengText - "Ume Syrup, Limenade, + "Ume Syrup, Limenade, Soda & Ice" @@ -6045,7 +6026,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพบ๊วย + "เซเว่นอัพบ๊วย มะนาวโซดา" @@ -6299,7 +6280,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ สตรอเบอรี่ร์บ๊วยโซดา" @@ -6321,7 +6302,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "7UP PLUM + "7UP PLUM STRAWBERRY LIME" @@ -8072,7 +8053,7 @@ STRAWBERRY LIME" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพยูซุ + "เซเว่นอัพยูซุ มะนาวโซดา" @@ -9359,7 +9340,7 @@ STRAWBERRY LIME" KanitMediumTTF 0x322B26 showengText - "GINGER LIME + "GINGER LIME SODA" @@ -9866,7 +9847,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "GINGER LIME + "GINGER LIME SODA" @@ -10352,7 +10333,7 @@ SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพมินต์ + "เซเว่นอัพมินต์ มะนาวโซดา" @@ -10606,7 +10587,7 @@ SODA" KanitMediumTTF 0x322B26 showthaiText - "สตรอเบอร์รี่ + "สตรอเบอร์รี่ มินต์โซดา" @@ -10628,7 +10609,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY MINT SODA" @@ -11114,7 +11095,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showthaiText - "บ๊วยมะนาว + "บ๊วยมะนาว มินต์โซดา" @@ -11136,7 +11117,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showengText - "PLUM LIMENADE + "PLUM LIMENADE MINT SODA" @@ -11369,7 +11350,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showthaiText - "มินต์ลิ้นจี่ + "มินต์ลิ้นจี่ มะนาวโซดา" @@ -11391,7 +11372,7 @@ MINT SODA" KanitMediumTTF 0x322B26 showengText - "MINT LYCHEE + "MINT LYCHEE LEMON SODA" @@ -14660,7 +14641,7 @@ LEMON SODA" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอม + "มะพร้าวน้ำหอม ลิ้นจี่โซดา" @@ -14682,7 +14663,7 @@ LEMON SODA" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Lychee Soda" @@ -15684,7 +15665,7 @@ Lychee Soda" KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง + "เครื่องดื่มเต่าทรงพลัง (มีคาเฟอีน)" @@ -15938,7 +15919,7 @@ Lychee Soda" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ น้ำมะนาว + "น้ำแดงกลิ่นสละ น้ำมะนาว " @@ -15960,7 +15941,7 @@ Lychee Soda" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Limenade, + "Salak Syrup, Limenade, Water & Ice" @@ -16214,7 +16195,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, Sugar, + "Lychee Syrup, Sugar, Water & Ice" @@ -16447,7 +16428,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ + "น้ำแดงกลิ่นสละ " @@ -16701,7 +16682,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตอเบอร์รี่ น้ำ + "น้ำเชื่อมสตอเบอร์รี่ น้ำ " @@ -16723,7 +16704,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Water & Ice" @@ -17487,7 +17468,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, Sugar, + "Lychee Syrup, Sugar, Water & Ice" @@ -17741,7 +17722,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Water, Ice" @@ -18237,7 +18218,7 @@ Water, Ice" KanitMediumTTF 0x322B26 showengText - "CONGEE WITH + "CONGEE WITH PLANT PROTEIN" @@ -19415,7 +19396,7 @@ PLANT PROTEIN" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/menutab/page_catalog_group_pepsi_7up.xml b/xml/menutab/page_catalog_group_pepsi_7up.xml index a2c3371d..74bd522e 100644 --- a/xml/menutab/page_catalog_group_pepsi_7up.xml +++ b/xml/menutab/page_catalog_group_pepsi_7up.xml @@ -1,613 +1,596 @@ - - - - "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 - ; - - - - - - - - - - - - - - - - - - - ; pepsi 7up - Var Menu61Selected = "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 = 9 Then - Var SlientRefreshIndex = 0 - 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_show9 - ;DEBUGVAR inst_show9 - - - - If inst_show9 = 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 = 9 Then - If inst_show9 = 0 Then - GetXMLFileNameCurrentRunning CurrentOpenFile5 - Open CurrentOpenFile5 - Else - Var SlientRefreshIndex = 0 - 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 + ; + + + + + + + + + + + + + + + + + + + ; pepsi 7up + Var Menu61Selected = "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 + + + + + + + + + 10 497 @@ -1472,7 +1455,7 @@ KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพชูกำลัง + "เซเว่นอัพชูกำลัง บ๊วยโซดา" @@ -1494,7 +1477,7 @@ KanitMediumTTF 0x322B26 showengText - "7UP TAO POWER + "7UP TAO POWER PLUM SODA" @@ -1727,7 +1710,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพลิ้นจี่ + "เซเว่นอัพลิ้นจี่ มะนาวโซดา" @@ -1981,7 +1964,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพสละ + "เซเว่นอัพสละ มะนาวโซดา" @@ -2994,7 +2977,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพบ๊วย + "เซเว่นอัพบ๊วย มะนาวโซดา" @@ -3248,7 +3231,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพ + "เซเว่นอัพ สตรอเบอรี่ร์บ๊วยโซดา" @@ -3270,7 +3253,7 @@ PLUM SODA" KanitMediumTTF 0x322B26 showengText - "7UP PLUM + "7UP PLUM STRAWBERRY LIME" @@ -5021,7 +5004,7 @@ STRAWBERRY LIME" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพยูซุ + "เซเว่นอัพยูซุ มะนาวโซดา" @@ -6034,7 +6017,7 @@ STRAWBERRY LIME" KanitMediumTTF 0x322B26 showthaiText - "เซเว่นอัพมินต์ + "เซเว่นอัพมินต์ มะนาวโซดา" @@ -7980,14 +7963,14 @@ STRAWBERRY LIME" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - RefreshAll - - - - + + + + + + + RefreshAll + + + + diff --git a/xml/menutab/page_catalog_group_pro_oreo_11.xml b/xml/menutab/page_catalog_group_pro_oreo_11.xml index c284e91e..322dd945 100644 --- a/xml/menutab/page_catalog_group_pro_oreo_11.xml +++ b/xml/menutab/page_catalog_group_pro_oreo_11.xml @@ -307,7 +307,7 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Thai Milk tea Oreo Smoothie" - Var NameDrinkTH = "ชานมไทยโอรีโอภูเขาไฟ" + Var NameDrinkTH = "ชานมไทยโอรีโอ ภูเขาไฟ" Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล และโอรีโอ" Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ThaiTeaOreo_smoothie_oreo_11" @@ -382,7 +382,8 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ชานมไทยโอรีโอภูเขาไฟ" + "ชานมไทยโอรีโอ +ภูเขาไฟ" 16 @@ -3383,7 +3384,7 @@ Sugar, Oreo" Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE" Var NameDrinkTH = "ชานมขิงโอรีโอปั่น" Var DrinkDescriptionTH = "ขิง นม น้ำตาล โอรีโอ" - Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" + Var DrinkDescription = "Ginger, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11" Var OpenFromXML = CurrentXMLFileName2 GetInstanceIDMenuTab OpenFromInstMenuTab @@ -3489,7 +3490,7 @@ OREO SMOOTHIE" KanitMediumTTF 0x6F5F51 showengText - "Hojicha, Milk, + "Ginger, Milk, Sugar, Oreo" @@ -4386,7 +4387,259 @@ CARAMEL OREO" center-vertical-horizontal - ; - - - + ; - - 12-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-21-03-0078.Button,$Sum1221030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่ +คาราเมลโอรีโอ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาราเมล และโอรีโอ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO +CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-21-03-0078.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0078.Button + Var( "฿" + $12-21-03-0078.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-21-03-0078.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1221030078 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; - - 12-02-03-0057 diff --git a/xml/menutab/page_catalog_group_tea.xml b/xml/menutab/page_catalog_group_tea.xml index 1b076d28..3c39ee2c 100644 --- a/xml/menutab/page_catalog_group_tea.xml +++ b/xml/menutab/page_catalog_group_tea.xml @@ -1,605 +1,600 @@ - - - - "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 - - - - - - - - - - - - + + + + "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 + + + + + + + + + + + + 10 497 @@ -2011,7 +2006,7 @@ KanitMediumTTF 0x322B26 showengText - "LIME + "LIME GINGER TEA" @@ -2269,7 +2264,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showengText - "LIME + "LIME GINGER TEA" @@ -5076,7 +5071,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่นมะนาว + "ชาเขียวญี่ปุ่นมะนาว " @@ -5098,7 +5093,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA LIMENADE" @@ -5592,7 +5587,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่นมะนาว + "ชาเขียวญี่ปุ่นมะนาว " @@ -5614,7 +5609,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA LIMENADE" @@ -7132,7 +7127,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอม + "มะพร้าวน้ำหอม มัทฉะลาเต้" @@ -7154,7 +7149,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Matcha latte" @@ -7165,7 +7160,7 @@ Matcha latte" KanitMediumTTF 0x6F5F51 showengText - "Coconut Syrup, Matcha Milk + "Coconut Syrup, Matcha Milk Water" @@ -7388,7 +7383,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่น + "ชาเขียวญี่ปุ่น มะพร้าวน้ำหอม" @@ -7642,7 +7637,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าว + "มะพร้าว ชาไทยนมนิวซีแลนด์" @@ -7664,7 +7659,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Thai Milk Tea" @@ -7675,7 +7670,7 @@ Thai Milk Tea" KanitMediumTTF 0x6F5F51 showengText - "Coconut Syrup, Thai Tea, Milk + "Coconut Syrup, Thai Tea, Milk Water" @@ -7898,7 +7893,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "ชาดำเย็น + "ชาดำเย็น มะพร้าวน้ำหอม" @@ -7920,7 +7915,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Thai Black Tea" @@ -8153,7 +8148,7 @@ Thai Black Tea" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าว + "มะพร้าว ชามะลินมนิวซีแลนด์" @@ -8175,7 +8170,7 @@ Thai Black Tea" KanitMediumTTF 0x322B26 showengText - "Coconut + "Coconut Jasmine milk tea" @@ -8186,7 +8181,7 @@ Jasmine milk tea" KanitMediumTTF 0x6F5F51 showengText - "Coconut Syrup, Jasmine Tea, Milk + "Coconut Syrup, Jasmine Tea, Milk Water" @@ -8409,7 +8404,7 @@ Water" KanitMediumTTF 0x322B26 showthaiText - "ชามะลิ + "ชามะลิ มะพร้าวน้ำหอม" @@ -8930,7 +8925,7 @@ Water" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมน้ำตาลแดง + "ชาไทย น้ำเชื่อมน้ำตาลแดง นม " @@ -8942,7 +8937,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR TEA" @@ -9703,7 +9698,7 @@ TEA" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมสตอเบอร์รี่ + "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " @@ -9725,7 +9720,7 @@ TEA" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Strawberry Syrup, + "Thai tea, Strawberry Syrup, Water" @@ -9962,7 +9957,7 @@ Water" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมสตอเบอร์รี่ + "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " @@ -9984,7 +9979,7 @@ Water" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Strawberry Syrup, + "Thai tea, Strawberry Syrup, Water" @@ -10746,7 +10741,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA LIMENADE" @@ -11004,7 +10999,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE BLACK TEA" @@ -11262,7 +11257,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE LIME TEA" @@ -11273,7 +11268,7 @@ LIME TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwanese tea, Limenade, + "Taiwanese tea, Limenade, Water" @@ -11678,7 +11673,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 bbe44923..ebeee54e 100644 --- a/xml/menutab/page_catalog_group_whey.xml +++ b/xml/menutab/page_catalog_group_whey.xml @@ -1,622 +1,603 @@ - - - - "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 - - - - - - - - - - + + + + "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 + + + + + + + + + + 10 497 @@ -753,7 +734,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Matcha, & Milk" @@ -1007,7 +988,7 @@ Matcha, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Matcha, & Milk" @@ -1261,7 +1242,7 @@ Matcha, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Cocoa, & Milk" @@ -1494,7 +1475,7 @@ Cocoa, & Milk" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ + "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ นม" @@ -1506,7 +1487,7 @@ Cocoa, & Milk" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY SHAKE" @@ -1517,7 +1498,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein,Milk, + "Whey protein,Milk, Strawberry Syrup" @@ -1750,7 +1731,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ + "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ นม" @@ -1762,7 +1743,7 @@ Strawberry Syrup" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY + "STRAWBERRY SHAKE" @@ -1773,7 +1754,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein,Milk, + "Whey protein,Milk, Strawberry Syrup" @@ -2006,7 +1987,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน น้ำเชื่อมเมล่อน + "เวย์โปรตีน น้ำเชื่อมเมล่อน นม" @@ -2028,7 +2009,7 @@ Strawberry Syrup" KanitMediumTTF 0x6F5F51 showengText - "Whey protein,Milk, + "Whey protein,Milk, Melon Syrup" @@ -2282,7 +2263,7 @@ Melon Syrup" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Espresso + "Whey protein, Espresso & Milk" @@ -2536,7 +2517,7 @@ Melon Syrup" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Thai Tea, & Milk" @@ -2790,7 +2771,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Thai Tea, & Milk" @@ -3044,7 +3025,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, + "Whey protein, Thai Tea, & Milk" @@ -3277,7 +3258,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม น้ำเชื่อมน้ำตาลแดง" @@ -3289,7 +3270,7 @@ Thai Tea, & Milk" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR SHAKE" @@ -3300,7 +3281,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Kokuto syrup" @@ -3533,7 +3514,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม ชาไต้หวัน" @@ -3545,7 +3526,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA SHAKE" @@ -3556,7 +3537,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Taiwanese Tea, Sugar" @@ -3789,7 +3770,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม ชาไต้หวัน" @@ -3801,7 +3782,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA SHAKE" @@ -3812,7 +3793,7 @@ SHAKE" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Taiwanese Tea, Sugar" @@ -4045,7 +4026,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "เวย์โปรตีน นม + "เวย์โปรตีน นม น้ำเชื่อมคาราเมล" @@ -4067,7 +4048,7 @@ Taiwanese Tea, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Whey protein, Milk, + "Whey protein, Milk, Caramel Syrup" @@ -4717,7 +4698,7 @@ Caramel Syrup" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index 6e71993e..4ced44d9 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -442,12 +442,52 @@ If ChangeOK = 3 Then If ActionOKCase = 0 Then + Var SVT = "coffee" + Var ACC = "0899999999" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + + If NextOrderStatus = "Disable" Then + Var PayDetail="1/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + Else + DEBUGVAR error_code_stop_now + If error_code_stop_now > 0 Then + Var PayDetail="1/F:" + error_code_stop_now + Var PayDetail = PayDetail + "/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + Else + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "" + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + EndIf + + EndIf + + + Var DEE = PayDetail + + PAYEXT SVT ACC VendingTSIDTmp DEE + Var ActionOKCase = 1 If Seeker.CodeChannel = 0 Then SAVELOG "back_to_main from line > 391." Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf - + Var waitAckPay = 2 Var Timeout = 5 diff --git a/xml/page_board.xml b/xml/page_board.xml index 3a26302d..a7b9cc59 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -98,6 +98,8 @@ Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf" Var OpunBoldTTF = "ROOT/taobin_project/font/Opun/Opun-Bold.ttf" + Var NotoSansThaiBold = "ROOT/taobin_project/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf" + Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" Var BlinkStar = "ROOT/taobin_project/image/animation/blink_star.gif" @@ -667,6 +669,7 @@ Var UsePepsiTheme = 0 Var NoTrickPriceProfile = 0 + Var NeedRefreshProfile = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1631,7 +1634,7 @@ PRICE "Reset" "-" - Var XMLProfile = "Discount50" + Var XMLProfile = "General" Var TimeProfilePrice = 0 @@ -2327,5 +2330,46 @@ PRICE "Reset" "-" ShowNetworkProblemText + + + + eval( + If LangProcess = "LoadConfig" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0x000000 + eval( + If LangProcess = "LoadConfig" Then + Var return = "Loading ..." + Else + Var return = "" + EndIf +) + + diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index 6c768144..38473e12 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -598,8 +598,6 @@ EndIf - - Var DEE = PayDetail PAYEXT SVT ACC VendingTSIDTmp DEE diff --git a/xml/page_catalog_group_pro_oreo_11.xml b/xml/page_catalog_group_pro_oreo_11.xml index e8c3bd83..7a255418 100644 --- a/xml/page_catalog_group_pro_oreo_11.xml +++ b/xml/page_catalog_group_pro_oreo_11.xml @@ -306,7 +306,7 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Thai Milk tea Oreo Smoothie" - Var NameDrinkTH = "ชานมไทยโอรีโอภูเขาไฟ" + Var NameDrinkTH = "ชานมไทยโอรีโอ ภูเขาไฟ" Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล และโอรีโอ" Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ThaiTeaOreo_smoothie_oreo_11" @@ -380,7 +380,8 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ชานมไทยโอรีโอภูเขาไฟ" + "ชานมไทยโอรีโอ +ภูเขาไฟ" 16 @@ -3370,7 +3371,7 @@ Sugar, Oreo" Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE" Var NameDrinkTH = "ชานมขิงโอรีโอปั่น" Var DrinkDescriptionTH = "ขิง นม น้ำตาล โอรีโอ" - Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" + Var DrinkDescription = "Ginger, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -3475,7 +3476,7 @@ OREO SMOOTHIE" KanitMediumTTF 0x6F5F51 showengText - "Hojicha, Milk, + "Ginger, Milk, Sugar, Oreo" @@ -4369,7 +4370,258 @@ CARAMEL OREO" center-vertical-horizontal - ; - - - + ; - - 12-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-21-03-0078.Button,$Sum1221030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่ +คาราเมลโอรีโอ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาราเมล และโอรีโอ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO +CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-21-03-0078.Button + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0078.Button + StringFmt( $12-21-03-0078.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-21-03-0078.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1221030078 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; - - 12-02-03-0057 diff --git a/xml/page_catalog_group_pro_oreo_11_fixed.xml b/xml/page_catalog_group_pro_oreo_11_fixed.xml index 4a730129..fe69936f 100644 --- a/xml/page_catalog_group_pro_oreo_11_fixed.xml +++ b/xml/page_catalog_group_pro_oreo_11_fixed.xml @@ -40,7 +40,7 @@ Var block_index_move = 0 ; menu_new_list 19 - ; ==================> Len = 12 +; ==================> Len = 12 ; - - 12-01-03-0043 33 @@ -58,8 +58,8 @@ SoundVolume Var NameDrink = "Iced Cafe Latte Oreo Smoothie" - Var NameDrinkTH = "ลาเต้ปั่นโอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล Oero" + Var NameDrinkTH = "ลาเต้ปั่นโอรีโอภูเขาไฟ" + Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล และโอรีโอ" Var DrinkDescription = "Coffee, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Cafe_Latte_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -134,7 +134,7 @@ KanitMediumTTF 0x322B26 showthaiText - "ลาเต้ปั่นโอริโอ้ภูเขาไฟ" + "ลาเต้ปั่นโอรีโอภูเขาไฟ" 16 @@ -144,8 +144,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม น้ำตาล -Oero" + "กาแฟ นม น้ำตาล และโอรีโอ" 16 @@ -315,8 +314,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Thai Milk tea Oreo Smoothie" - Var NameDrinkTH = "ชานมไทยโอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล Oreo" + Var NameDrinkTH = "ชานมไทยโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล และโอรีโอ" Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ThaiTeaOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -391,7 +390,8 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ชานมไทยโอริโอ้ภูเขาไฟ" + "ชานมไทยโอริโอ +ภูเขาไฟ" 16 @@ -401,8 +401,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย นม น้ำตาล -Oreo" + "ชาไทย นม น้ำตาล และโอรีโอ" 16 @@ -572,8 +571,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "OREO SMOOTHIE VOLCANO " - Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ" - Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ " + Var NameDrinkTH = "โอรีโอปั่นภูเขาไฟ" + Var DrinkDescriptionTH = "นม น้ำตาล โอรีโอ " Var DrinkDescription = "Milk, Sugar, Oreo, Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -648,7 +647,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "โอริโอ้ปั่นภูเขาไฟ" + "โอรีโอปั่นภูเขาไฟ" 16 @@ -658,7 +657,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้ + "นม น้ำตาล โอรีโอ " @@ -828,8 +827,8 @@ VOLCANO " SoundVolume Var NameDrink = "Pink Oreo volcano " - Var NameDrinkTH = "นมชมพูปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล Oreo" + Var NameDrinkTH = "นมชมพูปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Salak Syrup, Milk, Sugar Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PinkOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -904,7 +903,7 @@ VOLCANO " KanitMediumTTF 0x322B26 showthaiText - "นมชมพูปั่นโอริโอ้ + "นมชมพูปั่นโอรีโอ ภูเขาไฟ" @@ -916,7 +915,7 @@ VOLCANO " 0x6F5F51 showthaiText "น้ำแดงกลิ่นสละ นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -1086,8 +1085,8 @@ Sugar Oreo" SoundVolume Var NameDrink = "Strawberry Milk Oreo Smoothie" - Var NameDrinkTH = "สตอเบอร์รี่ปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล Oreo" + Var NameDrinkTH = "สตอเบอร์รี่ปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Strawberry Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_StrawberrOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -1162,7 +1161,7 @@ Sugar Oreo" KanitMediumTTF 0x322B26 showthaiText - "สตอเบอร์รี่ปั่นโอริโอ้ + "สตอเบอร์รี่ปั่นโอรีโอ ภูเขาไฟ" @@ -1174,7 +1173,7 @@ Sugar Oreo" 0x6F5F51 showthaiText "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -1344,8 +1343,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Choco Oreo Smoothie" - Var NameDrinkTH = "โกโก้ปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล Oreo" + Var NameDrinkTH = "โกโก้ปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Cocoa, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -1420,7 +1419,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "โกโก้ปั่นโอริโอ้ + "โกโก้ปั่นโอรีโอ ภูเขาไฟ" @@ -1432,7 +1431,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "โกโก้ นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -1602,8 +1601,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Caramel Milk Oreo Smoothie" - Var NameDrinkTH = "นมคาราเมลปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล Oreo" + Var NameDrinkTH = "นมคาราเมลปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล โอรีโอ" Var DrinkDescription = "Caramel Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_CaramelOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -1678,7 +1677,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมคาราเมลปั่นโอริโอ้ + "นมคาราเมลปั่นโอรีโอ ภูเขาไฟ" @@ -1690,7 +1689,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "น้ำเชื่อมคาราเมล นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -1860,8 +1859,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "SUPER OOCANO " - Var NameDrinkTH = "ซูเปอร์โอริโอ้ปั่น ภูเขาไฟ" - Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้" + Var NameDrinkTH = "ซูเปอร์โอรีโอปั่น ภูเขาไฟ" + Var DrinkDescriptionTH = "นม น้ำตาล โอรีโอ" Var DrinkDescription = "Milk, Sugar, Oreo, Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_super_oreo_volcano_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -1936,7 +1935,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ซูเปอร์โอริโอ้ปั่น + "ซูเปอร์โอรีโอปั่น ภูเขาไฟ" @@ -1947,7 +1946,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้" + "นม น้ำตาล โอรีโอ" 16 @@ -2115,8 +2114,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Jasmine Milk Tea oreo smoothie" - Var NameDrinkTH = "ชานมมะลิปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "ชามะลิ นม น้ำตาล Oreo" + Var NameDrinkTH = "ชานมมะลิปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "ชามะลิ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Jasmine Tea, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -2191,7 +2190,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ชานมมะลิปั่นโอริโอ้ + "ชานมมะลิปั่นโอรีโอ ภูเขาไฟ" @@ -2203,7 +2202,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "ชามะลิ นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -2373,8 +2372,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Hojicha Oreo Smoothie" - Var NameDrinkTH = "ชานมโฮจิฉะโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล Oreo" + Var NameDrinkTH = "ชานมโฮจิฉะโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_HojichaOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -2449,7 +2448,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ชานมโฮจิฉะโอริโอ้ + "ชานมโฮจิฉะโอรีโอ ภูเขาไฟ" @@ -2461,7 +2460,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "โฮจิฉะ นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -2631,8 +2630,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Melon Milk Oreo Smoothie" - Var NameDrinkTH = "เมล่อนปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน นม น้ำตาล Oreo" + Var NameDrinkTH = "เมล่อนปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน นม น้ำตาล โอรีโอ" Var DrinkDescription = "Melon Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_MelonOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -2707,7 +2706,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "เมล่อนปั่นโอริโอ้ + "เมล่อนปั่นโอรีโอ ภูเขาไฟ" @@ -2719,7 +2718,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "น้ำเชื่อมเมล่อน นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -2890,7 +2889,7 @@ Sugar, Oreo" Var NameDrink = "Banana Milk Oreo Smoothie" Var NameDrinkTH = "นมกล้วยปั่นภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" + Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล โอรีโอ" Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -2975,7 +2974,8 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" + "น้ำเชื่อมกล้วย นม น้ำตาล +โอรีโอ" 16 @@ -3145,8 +3145,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "MINT OREO VOLCANO" - Var NameDrinkTH = "มินต์โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมมินต์ นม น้ำตาล Oreo" + Var NameDrinkTH = "มินต์โอรีโอภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมมินต์ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Mint Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -3221,7 +3221,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "มินต์โอริโอ้ภูเขาไฟ" + "มินต์โอรีโอภูเขาไฟ" 16 @@ -3232,7 +3232,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "น้ำเชื่อมมินต์ นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -3401,9 +3401,14 @@ Sugar, Oreo" SoundVolume Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE" +<<<<<<< HEAD Var NameDrinkTH = "ชานมขิงโอริโอ้ปั่น" Var DrinkDescriptionTH = "ขิง นม น้ำตาล Oreo" - Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" +======= + Var NameDrinkTH = "ชานมขิงโอรีโอปั่น" + Var DrinkDescriptionTH = "ขิง นม น้ำตาล โอรีโอ" +>>>>>>> 60d7978f96f90bf627023963827e19d9b7d9a52a + Var DrinkDescription = "Ginger, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension Var OpenFromXML = CurrentXMLFileName2 @@ -3477,7 +3482,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "ชานมขิงโอริโอ้ปั่น" + "ชานมขิงโอรีโอปั่น" 16 @@ -3488,7 +3493,7 @@ Sugar, Oreo" 0x6F5F51 showthaiText "ขิง นม น้ำตาล -Oreo" +โอรีโอ" 16 @@ -3510,7 +3515,7 @@ OREO SMOOTHIE" KanitMediumTTF 0x6F5F51 showengText - "Hojicha, Milk, + "Ginger, Milk, Sugar, Oreo" @@ -3658,8 +3663,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "coconut milk oreo smoothie" - Var NameDrinkTH = "นมมะพร้าวปั่นโอริโอ้ ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว นม น้ำตาล Oreo" + Var NameDrinkTH = "นมมะพร้าวปั่นโอรีโอ ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว นม น้ำตาล โอรีโอ" Var DrinkDescription = "Coconut Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Coconut_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -3734,7 +3739,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมมะพร้าวปั่นโอริโอ้ + "นมมะพร้าวปั่นโอรีโอ ภูเขาไฟ" @@ -3745,7 +3750,8 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมมะพร้าว นม น้ำตาล Oreo" + "น้ำเชื่อมมะพร้าว นม น้ำตาล +โอรีโอ" 16 @@ -3915,8 +3921,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "Yuzu Milk Oreo Smoothie" - Var NameDrinkTH = "นมยูสุปั่นโอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมยูซุ นม น้ำตาล Oreo" + Var NameDrinkTH = "นมยูสุปั่นโอรีโอภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมยูซุ นม น้ำตาล โอรีโอ" Var DrinkDescription = "Yuzu Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_YUZU_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -3991,7 +3997,8 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมยูสุปั่นโอริโอ้ภูเขาไฟ" + "นมยูสุปั่นโอรีโอ +ภูเขาไฟ" 16 @@ -4001,7 +4008,8 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ นม น้ำตาล Oreo" + "น้ำเชื่อมยูซุ นม น้ำตาล +โอรีโอ" 16 @@ -4171,8 +4179,8 @@ Sugar, Oreo" SoundVolume Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -4248,7 +4256,7 @@ Sugar, Oreo" 0x322B26 showthaiText "พรีเมียมเอสเพรสโซ่ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -4258,7 +4266,7 @@ Sugar, Oreo" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม คาลาเมล และ Oreo" + "กาแฟ นม คาราเมล และโอรีโอ" 16 @@ -4408,7 +4416,260 @@ CARAMEL OREO" center-vertical-horizontal - ; - - - + ; - - 12-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-21-03-0078.Button,$Sum1221030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่ +คาราเมลโอรีโอ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาราเมล และโอรีโอ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO +CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-21-03-0078.Button + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0078.Button + StringFmt( $12-21-03-0078.Price - 11 , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-21-03-0078.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1221030078 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; - - 12-02-03-0057 @@ -4426,9 +4687,9 @@ CARAMEL OREO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo" + Var NameDrink = "PREMIUM MATCHA CARAMEL OREO" + Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Matcha_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -4504,7 +4765,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมมัทฉะ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -4514,7 +4775,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "มัทฉะ นม คาลาเมล และ Oreo" + "มัทฉะ นม คาราเมล และโอรีโอ" 16 @@ -4525,7 +4786,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showengText - "PREMIUM GREEN TEA + "PREMIUM MATCHA CARAMEL OREO" @@ -4683,8 +4944,8 @@ CARAMEL OREO" SoundVolume Var NameDrink = "PREMIUM THAI TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "ชาไทย นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "ชาไทย นม คาราเมล และโอรีโอ" Var DrinkDescription = "Thai Tea, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11" Var PictureDrink = PictureDrink + Extension @@ -4760,7 +5021,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมชาไทย -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -4770,7 +5031,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย นม คาลาเมล และ Oreo" + "ชาไทย นม คาราเมล และโอรีโอ" 16 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 46115261..842d9d63 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -1,470 +1,51 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml" - - Var Menu1Selected = "PressForever" - - Var OreoBigButtonEnable = "Enable" - - If $12-01-01-0001.Button = "Invisible" Then - Var esp102101001Enable = "Invisible" - Var esp122101001Enable = "Enable" - - Else - Var esp102101001Enable = "Enable" - Var esp122101001Enable = "Invisible" - - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml" - - - - - -; 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - ;Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - - EndIf - - - ; zone cup on arm - ; zone cup on arm - If Seeker = "curr" Then - If CupOnArm = "true" Then - - If CheckCupStateDoorCupClose = "" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - - If CheckCupStateDoorCupClose = "done" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - Refresh - EndIf - EndIf - Else - Var buttonRemoveCup = "Invisible" - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; 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 - - - - -; - - 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 + ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml" + + Var Menu1Selected = "PressForever" + + Var OreoBigButtonEnable = "Enable" + + If $12-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml" + + + + +;include="ROOT/taobin_project/xml/menu_catalog_new.xml" + + + + 16 10 @@ -862,7 +443,7 @@ KanitMediumTTF 0x322B26 showthaiText - "พรีเมียมเอสเพรสโซ่ + "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" @@ -884,7 +465,7 @@ KanitMediumTTF 0x322B26 showengText - "PREMIUM ESPRESSO + "PREMIUM ESPRESSO CARAMEL OREO" @@ -1113,7 +694,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showthaiText - "พรีเมียมเอสเพรสโซ่ + "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" @@ -1135,7 +716,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showengText - "PREMIUM ESPRESSO + "PREMIUM ESPRESSO CARAMEL OREO" @@ -1365,7 +946,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showthaiText - "พรีเมียมมัทฉะ + "พรีเมียมมัทฉะ คาราเมลโอรีโอ" @@ -1387,7 +968,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showengText - "PREMIUM GREEN TEA + "PREMIUM GREEN TEA CARAMEL OREO" @@ -1618,7 +1199,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showthaiText - "พรีเมียมชาไทย + "พรีเมียมชาไทย คาราเมลโอรีโอ" @@ -1640,7 +1221,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showengText - "PREMIUM THAI TEA + "PREMIUM THAI TEA CARAMEL OREO" @@ -2122,7 +1703,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showthaiText - "มะพร้าวน้ำหอมปั่น + "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" @@ -2154,7 +1735,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showengText - "Coconut syrup, Milk, + "Coconut syrup, Milk, Water" @@ -2887,7 +2468,7 @@ Water" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอรีโอ + "นม น้ำตาล โอรีโอ " @@ -2899,7 +2480,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -3385,7 +2966,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showthaiText - "นมกล้วยปั่น + "นมกล้วยปั่น โอรีโอภูเขาไฟ" @@ -3407,7 +2988,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "BANANA MILK OREO + "BANANA MILK OREO VOLCANO" @@ -3418,7 +2999,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Banana Syrup, Milk, + "Banana Syrup, Milk, Sugar, Oreo" @@ -3639,7 +3220,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมช็อกโกโตเกียว + "นมช็อกโกโตเกียว บานาน่า" @@ -3661,7 +3242,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CHOCO TOKYO + "CHOCO TOKYO BANANA MILK" @@ -3896,7 +3477,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showthaiText - "นมคาราเมล + "นมคาราเมล บิสคอฟ" @@ -3907,7 +3488,7 @@ BANANA MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมคาราเมล นม น้ำตาล + "น้ำเชื่อมคาราเมล นม น้ำตาล บิสคอฟ" @@ -3919,7 +3500,7 @@ BANANA MILK" KanitMediumTTF 0x322B26 showengText - "CARAMEL MILK + "CARAMEL MILK BISCOFF VOLCANO" @@ -3930,7 +3511,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Caramel Syrup, Milk, + "Caramel Syrup, Milk, Sugar, Biscof" @@ -4151,7 +3732,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "นมสตรอเบอร์รี่ + "นมสตรอเบอร์รี่ บิสคอฟ" @@ -4162,7 +3743,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล + "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล บิสคอฟ" @@ -4174,7 +3755,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY MILK + "STRAWBERRY MILK BISCOFF VOLCANO" @@ -4185,7 +3766,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, Milk, + "Strawberry Syrup, Milk, Sugar, Biscof" @@ -4406,7 +3987,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "นมมินต์ + "นมมินต์ บิสคอฟ" @@ -4417,7 +3998,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมมินต์ นม น้ำตาล + "น้ำเชื่อมมินต์ นม น้ำตาล บิสคอฟ" @@ -4429,7 +4010,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "Mint MILK + "Mint MILK BISCOFF VOLCANO" @@ -4440,7 +4021,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Mint Syrup, Milk, + "Mint Syrup, Milk, Sugar, Biscof" @@ -4661,7 +4242,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "โกโก้ + "โกโก้ บิสคอฟ" @@ -4672,7 +4253,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล บิสคอฟ" @@ -4684,7 +4265,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "COCOA MILK + "COCOA MILK BISCOFF VOLCANO" @@ -4695,7 +4276,7 @@ BISCOFF VOLCANO" KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk, + "Cocoa, Milk, Sugar, Biscof" @@ -6176,7 +5757,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่ + "นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่ และน้ำแข็ง" @@ -6428,7 +6009,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "นมโอ๊ต น้ำเชื่อมยูซุ + "นมโอ๊ต น้ำเชื่อมยูซุ และน้ำแข็ง" @@ -6680,7 +6261,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "นมโอ๊ต น้ำเชื่อมลิ้นจี่ + "นมโอ๊ต น้ำเชื่อมลิ้นจี่ และน้ำแข็ง" @@ -6932,7 +6513,7 @@ Sugar, Biscof" KanitMediumTTF 0x6F5F51 showthaiText - "นมโอ๊ต มะนาว + "นมโอ๊ต มะนาว และน้ำแข็ง" @@ -8956,7 +8537,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -8967,7 +8548,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -8979,7 +8560,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -8990,7 +8571,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -9215,7 +8796,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -9226,7 +8807,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -9238,7 +8819,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -9249,7 +8830,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -9474,7 +9055,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -9485,7 +9066,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -9497,7 +9078,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -9508,7 +9089,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -9733,7 +9314,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -9744,7 +9325,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -9756,7 +9337,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -9767,7 +9348,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -9992,7 +9573,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -10003,7 +9584,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -10015,7 +9596,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -10026,7 +9607,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -10251,7 +9832,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -10262,7 +9843,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -10274,7 +9855,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -10285,7 +9866,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -10510,7 +10091,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -10521,7 +10102,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -10533,7 +10114,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -10768,7 +10349,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -10790,7 +10371,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -11025,7 +10606,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -11036,7 +10617,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -11048,7 +10629,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN AMERICANO" @@ -11059,7 +10640,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -11284,7 +10865,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน CHOPIN" @@ -11295,7 +10876,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -11307,7 +10888,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN AMERICANO" @@ -11318,7 +10899,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -11543,7 +11124,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MANDARINE" @@ -11565,7 +11146,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE AMERICANO" @@ -11800,7 +11381,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน OPUS ONE" @@ -11822,7 +11403,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE AMERICANO" @@ -12832,7 +12413,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -12854,7 +12435,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Milk, + "Salak Syrup, Milk, Sugar" @@ -13085,7 +12666,7 @@ Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" @@ -13097,7 +12678,7 @@ Sugar" KanitMediumTTF 0x322B26 showengText - "STRAWMILK + "STRAWMILK SMOOTHIE" @@ -13851,7 +13432,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "TAO POWER + "TAO POWER DRINK SODA" @@ -14103,7 +13684,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showengText - "PLUM + "PLUM LIMENADE SODA" @@ -14257,30 +13838,30 @@ LIMENADE SODA" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - -;BigLogoLayout - - - - - - + + + + + + +;BigLogoLayout + + + + + + diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index b7046697..b3703b49 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -15,7 +15,7 @@ EndIf If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Var NextPage = "-" @@ -29,26 +29,26 @@ Var web_telnumOK = "" Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" - - If CocktailShow = "true" Then - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + + If CocktailShow = "true" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" EndIf - + If TermTemOnline = "true" Then Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" EndIf - + ;Machine DoorLidClose Var GetPayInfoFlag = 0 Var countDownRetrun = 30 CoinVending OFF - + ; Clear value Topping "clear" "-" - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page2_en/page2" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -56,13 +56,13 @@ Play PlaySoundLag Var DirImageCart = "ROOT/taobin_project/image/cart_en" - + Else Var DirImage = "ROOT/taobin_project/image/page2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" - + If SoundThaiIndex = 1 Then Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/taobin_sawade.wav" EndIf @@ -74,7 +74,7 @@ EndIf Play PlaySoundLag - + Var DirImageCart = "ROOT/taobin_project/image/cart_th" EndIf @@ -104,7 +104,7 @@ ;GenHashWithTimeStamp QRCODE99x WEB "ENABLE" - + Else Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" @@ -117,9 +117,12 @@ EndIf + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" + + ; 1035 is Coke. - STRCONTAIN "1035" MaterialAvailable CokeUI + STRCONTAIN "1035" MaterialAvailable CokeUI Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" @@ -134,8 +137,8 @@ Var QRCODE99_Y = 1718 Var showCart = "Invisible" - If MultiPayEnable = "true" Then - + If MultiPayEnable = "true" Then + If CART_COUNT = 1 Then Var showCart = "Enable" Var cart_image_bn = DirImageCart + "/bn_cart1.png" @@ -144,7 +147,7 @@ Var QRCODE99_Y = 1580 EndIf - + If CART_COUNT = 2 Then Var showCart = "Enable" Var cart_image_bn = DirImageCart + "/bn_cart2.png" @@ -154,7 +157,7 @@ EndIf - + If CART_COUNT = 3 Then Open "ROOT/taobin_project/xml/page_payment_multi.xml" @@ -170,11 +173,11 @@ If XMLProfile = "taobin_notopup" Then Var ButtontoTopupMenu = "Invisible" - + EndIf 1000 - + ;SAVELOG SoundPlaying @@ -183,21 +186,21 @@ EndIf If countDownRetrun = 0 Then - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf EndIf - + Refresh TimerReset - + - ;If ChangeStatus = "payout-end" Then + ;If ChangeStatus = "payout-end" Then ; Var ChangeOK = 1 ;EndIf @@ -210,15 +213,15 @@ Cart "DeleteMenuID" "ALL" Var web_readyOK = web_ready Var web_telnumOK = web_telnum - - + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" EndIf - + Else EndIf - + @@ -242,9 +245,9 @@ "ROOT/taobin_project/image/page2/bn_back_arrow.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf @@ -258,9 +261,9 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng - If show_eng = "true" Then + If show_eng = "true" Then Var show_eng = "false" Else Var show_eng = "true" @@ -288,13 +291,13 @@ Var(DirImage + "/bp_diy.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" ; eng - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" - + @@ -305,10 +308,10 @@ Var(DirImage + "/bp_vending_machine.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" ; eng - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -321,9 +324,9 @@ Var(DirImage + "/bp_coffee.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" @@ -335,9 +338,9 @@ Var(DirImage + "/bp_tea.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" @@ -348,9 +351,9 @@ Var(DirImage + "/bp_cho_caramel.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" @@ -361,9 +364,9 @@ bpSodaAndOther "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" @@ -378,13 +381,13 @@ Var(DirImage + "/bp_protein.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" + Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" EndIf @@ -397,12 +400,12 @@ Var(DirImage + "/bp_appfast.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" + Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" EndIf @@ -415,10 +418,10 @@ Var(DirImage + "/bn_kidmenu.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" - + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" + ;------------------------------------------------------------- @@ -432,11 +435,11 @@ Var(DirImage + "/bp_HealthyOption.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - - Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" - + + Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" + @@ -452,10 +455,10 @@ Var(DirImage + "/bp_main_page_member.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng - Open "ROOT/taobin_project/xml/page_before_check_member.xml" - + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + @@ -468,11 +471,11 @@ Var(DirImage + "/bp_main_page_topup.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng Var PayDetail="" - Open "ROOT/taobin_project/xml/page_back_to_topup.xml" - + Open "ROOT/taobin_project/xml/page_back_to_topup.xml" + @@ -502,7 +505,7 @@ 200 50 SoundVolume - + Var countClick = countClick + 1 If countClick = 3 Then @@ -546,12 +549,12 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume 400 - + + - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - + + @@ -563,7 +566,7 @@ Var web_readyOK = web_ready Var web_telnumOK = web_telnum - + Var web_app_prepar = "true" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" @@ -571,7 +574,7 @@ EndIf Else EndIf - + diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 5c67530b..3b4b8624 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -241,6 +241,13 @@ DEBUGVAR DrinkImageOnArm[DrinkArmCupID] DEBUGVAR DrinkNameOnArm[DrinkArmCupID] + Var TextDoorJamStage = "Invisible" + Var CountUpDoorJamAlert = 0 + Var BlinkUpDoorJamAlert = 0 + + + Var EnableDoorJamAlert = 0 + 500 @@ -407,10 +414,56 @@ If txtDrinkOKState = "Enable" Then Var TextBottomShow = "Invisible" Else - Var TextBottomShow = "Enable" + ;Var TextBottomShow = "Enable" EndIf + If EnableDoorJamAlert = 1 Then + + Var BlinkUpDoorJamAlert = BlinkUpDoorJamAlert + 1 + + If DOOR_CUP_OPEN_ERROR = "true" Then + Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1 + EndIf + If DOOR_CUP_CLOSE_ERROR = "true" Then + Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1 + EndIf + If CountUpDoorJamAlert > 0 Then + DEBUGVAR CountUpDoorJamAlert + EndIf + + If CountUpDoorJamAlert > 8 Then + DEBUGVAR DOOR_CUP_OPEN_ERROR + DEBUGVAR DOOR_CUP_CLOSE_ERROR + Var TextBottomShow = "Invisible" + ;Var TextDoorJamStage = "Enable" + + + + If BlinkUpDoorJamAlert > 1 Then + Var TextDoorJamStage = "Enable" + Var BlinkUpDoorJamAlert = 0 + Else + Var TextDoorJamStage = "Invisible" + EndIf + + EndIf + + If CountUpDoorJamAlert > 50 Then + Var CountUpDoorJamAlert = 1 + Var TextBottomShow = "Enable" + Var TextDoorJamStage = "Invisible" + EndIf + + If show_eng = "true" Then + Var TextDoorJamString = " Door Error. " + Else + Var TextDoorJamString = " ประตูมีปัญหา " + + EndIf + + + EndIf TimerReset Refresh @@ -485,6 +538,18 @@ text_bottom + + 0 + 1418 + 87 + Center + 0xEF4D2C + KanitLightTTF + TextDoorJamStage + TextDoorJamString + + + 757 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 9f34937d..ba1e3e63 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -22,6 +22,8 @@ Var QRCODE99 = "" Var QRCODETMP = "" + Var QRPopupOpenFlag = 0 + Var QRChannel = 0 ;Var PriceDrink = 2 @@ -92,6 +94,10 @@ Var PriceDrink = OriginalPrice + TOPPING_PRICE EndIf + If FromOreoDiscount11Pro = 1 Then + Var PriceDrink = OriginalPrice + TOPPING_PRICE + EndIf + If FromPowerUpPro = 1 Then Var PriceDrink = OriginalPrice EndIf diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index fb22898b..15a8e7b2 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -230,27 +230,6 @@ Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" - If show_eng = "true" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - Else - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - - EndIf - - Var X_CASH = 216 - - If RoadShow = "true" Then - Var X_CASH = 287 - If show_eng = "true" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - Else - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - EndIf - EndIf If GetFreeFromError = 1 Then Var Seeker.FreeVendingCampaign = 1 @@ -1447,36 +1426,9 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - + + @@ -2424,14 +2505,14 @@ 375 623 - eval( + eval( If IsSmoRet = "true" Then Var return = "Enable" Else Var return = "Invisible" EndIf -) - +) + "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2444,7 +2525,7 @@ FilenameShowbuttonCashBP "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then @@ -2458,9 +2539,9 @@ Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + EndIf Else @@ -2485,15 +2566,15 @@ pay_with_code_image "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" - Open "ROOT/taobin_project/xml/page_payment_code.xml" + Open "ROOT/taobin_project/xml/page_payment_code.xml" EndIf EndIf @@ -2507,10 +2588,10 @@ PayState3 Var( DirImage + "/bn_prompt_pay.png") Var( DirImage + "/bp_prompt_pay.png") - Var( DirImage + "/bd_prompt_pay.png") + Var( DirImage + "/bd_prompt_pay.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If Timeout < 120 Then @@ -2528,13 +2609,15 @@ Var QRCODE99 = "" Var LOADING_STATE = "Enable" + Var CancelingPopupFlag = "Invisible" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -2545,11 +2628,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" If IndoQR = 1 Then Var ECommerceQR = ECommerceQR + "IND:2/" @@ -2557,7 +2640,7 @@ Var ECommerceQR = ECommerceQR + "KBA:2/" EndIf - + @@ -2591,14 +2674,14 @@ Var GetScore = "" Var OperatorName = "" Var SessionID = "" - + Var PayDetail2 = Seeker.PayDetail2 GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 1 Refresh - - + + ;If CoinAmount > 0 Then ; Change CoinAmount @@ -2606,7 +2689,7 @@ ; Var CancelFlag = 1x ; Var CancelCounter = 0 ; Var NoGotoMenupage = "true" - ; + ; ;EndIf EndIf EndIf @@ -2618,7 +2701,7 @@ ; Var PayState1 = "Enable" ; Var PayState2 = "PressForever" ; Var QRChannel = 1 -; Open "ROOT/taobin_project/xml/page_payment_qr.xml" +; Open "ROOT/taobin_project/xml/page_payment_qr.xml" ; ; EndIf @@ -2635,16 +2718,16 @@ pay_with_credit_image "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" - Open "ROOT/taobin_project/xml/page_payment_credit.xml" + Open "ROOT/taobin_project/xml/page_payment_credit.xml" EndIf EndIf @@ -2663,7 +2746,7 @@ Var( DirImage + "/bd_pay_with_ccard.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then If CoinInFlag = 0 Then @@ -2691,14 +2774,14 @@ Var( DirImage + "/bd_pay_with_ewallet.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then - Open "ROOT/taobin_project/xml/page_payment_cashOther.xml" + Open "ROOT/taobin_project/xml/page_payment_cashOther.xml" EndIf EndIf @@ -2717,15 +2800,15 @@ Var( DirImage + "/bp_pay_with_codeOther.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" - Open "ROOT/taobin_project/xml/page_payment_codeOther.xml" + Open "ROOT/taobin_project/xml/page_payment_codeOther.xml" EndIf EndIf @@ -2743,10 +2826,10 @@ Var( DirImage + "/bp_cancel_all.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;VendingQR OFF - + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleMain > Cancle Order." @@ -2759,20 +2842,20 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 + Var CashlessPayFlag = 0 CashlessReq FAIL EndIf - + EndIf EndIf Refresh - + @@ -2827,6 +2910,26 @@ + + 267 + 1065 + CancelingPopupFlag + 546 + 75 + NotoSansThaiBold + 58 + 0x5A5A5A + +eval( + If show_eng = "true" Then + Var return = "Canceling..." + Else + Var return = "กำลังยกเลิก..." + EndIf +) + + center-vertical-horizontal + 267 @@ -2835,10 +2938,6 @@ Var( DirImage + "/loadingText.png" ) - - - - + + ; begin cash popup 0 @@ -2913,9 +3004,9 @@ Var( DirImage + "/bp_cancel_all.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;VendingQR OFF - + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleMain > Cancle Order." @@ -2928,10 +3019,10 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf - + EndIf EndIf @@ -2962,9 +3053,9 @@ Var( DirImage + "/bp_cancel_all.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;VendingQR OFF - + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleMain > Cancle Order." @@ -2977,17 +3068,17 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf - + EndIf EndIf Refresh - + @@ -3067,9 +3158,9 @@ Var( DirImage2 + "/bp_keep.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + - Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" + Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" @@ -3081,7 +3172,7 @@ Var( DirImage2 + "/bp_cancel2.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + CoinVending BILLREJECT Var alphaState3 = "Invisible" @@ -3113,7 +3204,7 @@ Var( DirImage2 + "/bp_cancel2.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + CoinVending BILLREJECT Var alphaState3_offline = "Invisible" @@ -3164,7 +3255,7 @@ Var( DirImage + "/QRError.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + @@ -3199,14 +3290,30 @@ 968 94 94 - LOADING_STATE + +eval( + Var should_show = 0 + If LOADING_STATE = "Enable" Then + Var should_show = 1 + EndIf + + If CancelingPopupFlag = "Enable" Then + Var should_show = 1 + EndIf + + If should_show = 1 Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + Var( DirImage + "/loading.gif" ) - - - Open "/media/bt/xml/security_alarm.xml" + + Open "/media/bt/xml/security_alarm.xml" ; @@ -3232,13 +3339,13 @@ DEBUGVAR IgnoreNetCore If IgnoreNetCore = "true" Then - If Seeker = "curr" Then - + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID Else - + EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index fca25e22..4e87e8fc 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -12,23 +12,23 @@ Var Seeker.FreeVendingCampaign = 0 Var Timeout = 0 - + Var GetPayInfoFlag = 0 ;Var Seeker.CodeChannel = 0 ;Var VendingQRCode = "ERROR" ;VendingQR ON ;Var QRCODE99 = "" - + ;CoinVending OFF VendingQR OFF - + Var ShowTextNumber = "Enable" Var ShowErrorText = "Invisible" Var Tel_Confirm_State = "Invisible" Var ErrorCause = "" - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" Else Var DirImage = "ROOT/taobin_project/image/collectiing" @@ -68,37 +68,37 @@ Var WalletEnable = "Disable" EndIf - + ;Var InvisibleCCard = "Invisible" - + 1000 - - ;Open "ROOT/xml/page_board.xml" + + ;Open "ROOT/xml/page_board.xml" + - Var Timeout = Timeout + 1 If Timeout > 30 Then ;VendingQR OFF - ;Open menu_back_to_main + ;Open menu_back_to_main Var PayState1 = "PressForever" Var PayState2 = "Enable" ;Var QRChannel = 0 ;Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf Refresh EndIf TimerReset - + @@ -116,11 +116,11 @@ If ViewBill > 0 Then CoinVending BILLREJECT EndIf - + VendingQR OFF CoinVending OFF - + If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID @@ -128,7 +128,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -141,7 +141,7 @@ Var CreditCardRef = "" GenHashWithTimeStamp CreditCardRef - DEBUGVAR VendingCashless + DEBUGVAR VendingCashless If VendingCashless = "READY" Then CashlessPay PriceDrink CreditCardRef @@ -174,20 +174,21 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_true.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - Var QR_POPUP = "/img_popup3.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -198,11 +199,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "TWN:2/" @@ -213,7 +214,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -226,7 +227,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 3 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -241,19 +242,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_paotang.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup1.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -264,11 +266,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "KBA:2/" @@ -279,7 +281,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -292,7 +294,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 1 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -306,19 +308,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_linepay.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup9.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -329,11 +332,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "LPY:2/" @@ -344,7 +347,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -357,7 +360,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 5 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -374,19 +377,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_shoppy.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup2.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -397,11 +401,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "AIR:2/" @@ -412,7 +416,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -425,7 +429,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 2 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -439,19 +443,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_maxme.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup11.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -462,11 +467,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "MAX:2/" @@ -477,7 +482,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -490,7 +495,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 7 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -504,19 +509,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_wechat.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup13.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -527,11 +533,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "WEC:2/" @@ -542,7 +548,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -555,7 +561,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 8 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -570,19 +576,20 @@ "ROOT/taobin_project/image/collectiing/bn_pay_with_make.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup1.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -593,11 +600,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "KBA:2/" @@ -608,7 +615,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -621,9 +628,9 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 1 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + - @@ -631,25 +638,26 @@ @@ -702,20 +710,21 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_cashUnion.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - Var QR_POPUP = "/img_popup21.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -726,11 +735,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "UNP:2/" @@ -741,7 +750,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -754,12 +763,79 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 10 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + + @@ -785,9 +861,9 @@ "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - @@ -801,9 +877,9 @@ "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - @@ -817,13 +893,13 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_ccard1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup8.png" Var alphaState = "Enable" Coin CARD Var ReqPayInfoFromCashOther = 2 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -839,15 +915,15 @@ Var( DirImage + "/bn_cancel2.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + Var PayState1 = "PressForever" Var PayState2 = "Enable" ;Var QRChannel = 0 ;Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf @@ -863,9 +939,9 @@ - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index c9eda745..435c871b 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -161,6 +161,14 @@ Else TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev" EndIf + Else + If InternationalEnable = 1 Then + If UsePepsiTheme = 1 Then + Var script_thankyou = CountryRootPath + "video/script_thank.ev" + TRY script_thankyou + EndIf + EndIf + EndIf diff --git a/xml/process/discount_from_promotion.ev b/xml/process/discount_from_promotion.ev index a60c1d54..04c2ba00 100644 --- a/xml/process/discount_from_promotion.ev +++ b/xml/process/discount_from_promotion.ev @@ -1,11 +1,11 @@ If FromOreoDiscount11Pro = 1 Then - Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE Var Seeker.VendingCode = "PMD11" - Var Seeker.CodeNumber = IDNum + Var Seeker.CodeNumber = "00000000" Var Seeker.CodeChannel = 1 + Var Seeker.FreeVendingCampaign = 0 Var Seeker.IntVendingCampaign = 11 - Var PriceDrink = OriginalPriceWithTopping + Var Seeker.VendingCampaignRI3 = 11 EndIf If FromMomCocoaPro = 1 Then diff --git a/xml/testscanQRcode.xml b/xml/testscanQRcode.xml index a8debc30..f432bd77 100644 --- a/xml/testscanQRcode.xml +++ b/xml/testscanQRcode.xml @@ -27,6 +27,7 @@ If scanresult = "true" Then + CLOSESCANQR Open "ROOT/taobin_project/xml/testscanQRcodeResult.xml" EndIf diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 6c87ca4c..ab360899 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -928,39 +928,6 @@ - - 5 - 1200 - "ROOT/taobin_project/image/tab_1.png" - - Open "ROOT/taobin_project/xml/testscanQRcode.xml" - - - - - 30 - 1210 - 30 - fontType1 - 0x000000 - "TestScanQRCode" - - - - -; -; 930 -; info_cancel_y -; 150 -; "0xEFEDEA" -; "0xE61A5F" -; 150 -; "Enable" -; "Herr" -; - - -