diff --git a/image/img_menu_err2.png b/image/img_menu_err2.png index 0fb80e25..0926cd24 100644 Binary files a/image/img_menu_err2.png and b/image/img_menu_err2.png differ diff --git a/image/page_drink_disable_n/bn_hot_double_espresso.png b/image/page_drink_disable_n/bn_hot_double_espresso.png index 513974ef..9f36384f 100644 Binary files a/image/page_drink_disable_n/bn_hot_double_espresso.png and b/image/page_drink_disable_n/bn_hot_double_espresso.png differ diff --git a/image/page_drink_disable_n/bn_hot_espresso.png b/image/page_drink_disable_n/bn_hot_espresso.png index 8d5a3b5d..cc9a80e3 100644 Binary files a/image/page_drink_disable_n/bn_hot_espresso.png and b/image/page_drink_disable_n/bn_hot_espresso.png differ diff --git a/image/page_drink_disable_n/bn_protein_Chocolate_BDMS.png b/image/page_drink_disable_n/bn_protein_Chocolate_BDMS.png index 31fbb49f..ac5da37e 100644 Binary files a/image/page_drink_disable_n/bn_protein_Chocolate_BDMS.png and b/image/page_drink_disable_n/bn_protein_Chocolate_BDMS.png differ diff --git a/image/page_drink_disable_n/bn_protein_Matcha_BDMS.png b/image/page_drink_disable_n/bn_protein_Matcha_BDMS.png index 59af905b..3f5caf89 100644 Binary files a/image/page_drink_disable_n/bn_protein_Matcha_BDMS.png and b/image/page_drink_disable_n/bn_protein_Matcha_BDMS.png differ diff --git a/image/page_drink_disable_n/bn_protein_Thaitea_BDMS.png b/image/page_drink_disable_n/bn_protein_Thaitea_BDMS.png index c71f150c..f91b00ef 100644 Binary files a/image/page_drink_disable_n/bn_protein_Thaitea_BDMS.png and b/image/page_drink_disable_n/bn_protein_Thaitea_BDMS.png differ diff --git a/image/page_drink_disable_n/bn_protein_espresso_BDMS.png b/image/page_drink_disable_n/bn_protein_espresso_BDMS.png index b4c62d52..22a315bc 100644 Binary files a/image/page_drink_disable_n/bn_protein_espresso_BDMS.png and b/image/page_drink_disable_n/bn_protein_espresso_BDMS.png differ diff --git a/image/page_drink_disable_n/bn_protein_original_BDMS.png b/image/page_drink_disable_n/bn_protein_original_BDMS.png index 0baf4cda..55bf326f 100644 Binary files a/image/page_drink_disable_n/bn_protein_original_BDMS.png and b/image/page_drink_disable_n/bn_protein_original_BDMS.png differ diff --git a/image/page_drink_disable_n2/CHOCO & CARAMEL.png b/image/page_drink_disable_n2/CHOCO & CARAMEL.png new file mode 100644 index 00000000..1bdb59ad Binary files /dev/null and b/image/page_drink_disable_n2/CHOCO & CARAMEL.png differ diff --git a/image/page_drink_disable_n2/COFFEE.png b/image/page_drink_disable_n2/COFFEE.png new file mode 100644 index 00000000..82bc95b1 Binary files /dev/null and b/image/page_drink_disable_n2/COFFEE.png differ diff --git a/image/page_drink_disable_n2/Protein-1.png b/image/page_drink_disable_n2/Protein-1.png new file mode 100644 index 00000000..46e667d1 Binary files /dev/null and b/image/page_drink_disable_n2/Protein-1.png differ diff --git a/image/page_drink_disable_n2/Protein.png b/image/page_drink_disable_n2/Protein.png new file mode 100644 index 00000000..cd5316e8 Binary files /dev/null and b/image/page_drink_disable_n2/Protein.png differ diff --git a/image/page_drink_disable_n2/Softdrink & other.png b/image/page_drink_disable_n2/Softdrink & other.png new file mode 100644 index 00000000..d3718bb8 Binary files /dev/null and b/image/page_drink_disable_n2/Softdrink & other.png differ diff --git a/image/page_drink_disable_n2/TEA.png b/image/page_drink_disable_n2/TEA.png new file mode 100644 index 00000000..d56e2c84 Binary files /dev/null and b/image/page_drink_disable_n2/TEA.png differ diff --git a/image/page_drink_disable_n2/bn_Congee.png b/image/page_drink_disable_n2/bn_Congee.png new file mode 100644 index 00000000..7d296378 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Congee.png differ diff --git a/image/page_drink_disable_n2/bn_Lychee_lime_soda.png b/image/page_drink_disable_n2/bn_Lychee_lime_soda.png new file mode 100644 index 00000000..319f7671 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Lychee_lime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_Melon_smoothie.png b/image/page_drink_disable_n2/bn_Melon_smoothie.png new file mode 100644 index 00000000..eb582366 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Melon_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_americano.png b/image/page_drink_disable_n2/bn_Yuzu_americano.png new file mode 100644 index 00000000..c4c6ba69 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Yuzu_americano.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png new file mode 100644 index 00000000..22924ce6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light.png b/image/page_drink_disable_n2/bn_dirty_light.png new file mode 100644 index 00000000..fe515c31 Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light__peacher.png b/image/page_drink_disable_n2/bn_dirty_light__peacher.png new file mode 100644 index 00000000..a70fb775 Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png b/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png new file mode 100644 index 00000000..fa0be693 Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_bluedaddy.png b/image/page_drink_disable_n2/bn_dirty_light_bluedaddy.png new file mode 100644 index 00000000..ca70d79d Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_geisha.png b/image/page_drink_disable_n2/bn_dirty_light_geisha.png new file mode 100644 index 00000000..9a88370b Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_mozart.png b/image/page_drink_disable_n2/bn_dirty_light_mozart.png new file mode 100644 index 00000000..afd59e2e Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light_mozart.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png b/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png new file mode 100644 index 00000000..8a4ce040 Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png b/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png new file mode 100644 index 00000000..6ad0f427 Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png b/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png new file mode 100644 index 00000000..dc0a16b5 Binary files /dev/null and b/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_disable_n2/bn_diy.png b/image/page_drink_disable_n2/bn_diy.png new file mode 100644 index 00000000..6af5ade2 Binary files /dev/null and b/image/page_drink_disable_n2/bn_diy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink_disable_n2/bn_hot_Black_Sugar_Milk_Tea.png new file mode 100644 index 00000000..3e659415 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png b/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png new file mode 100644 index 00000000..19797d4b Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Ginger_lemon_tea.png b/image/page_drink_disable_n2/bn_hot_Ginger_lemon_tea.png new file mode 100644 index 00000000..6067b99f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Ginger_lemon_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Ginger_tea.png b/image/page_drink_disable_n2/bn_hot_Ginger_tea.png new file mode 100644 index 00000000..de8c855e Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Ginger_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_america_no.png b/image/page_drink_disable_n2/bn_hot_america_no.png new file mode 100644 index 00000000..e59f7242 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_america_no.png differ diff --git a/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png b/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png new file mode 100644 index 00000000..2fd6e038 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_honey.png b/image/page_drink_disable_n2/bn_hot_americano_honey.png new file mode 100644 index 00000000..b97bb99f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_honey.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light.png b/image/page_drink_disable_n2/bn_hot_americano_light.png new file mode 100644 index 00000000..52331272 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_bluedaddy.png b/image/page_drink_disable_n2/bn_hot_americano_light_bluedaddy.png new file mode 100644 index 00000000..aae16ad6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png new file mode 100644 index 00000000..b869e0f5 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_mozart.png b/image/page_drink_disable_n2/bn_hot_americano_light_mozart.png new file mode 100644 index 00000000..88ba4a83 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_mozart.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png b/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png new file mode 100644 index 00000000..1663317f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png b/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png new file mode 100644 index 00000000..f5a444b9 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png b/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png new file mode 100644 index 00000000..ecf57b93 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png b/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png new file mode 100644 index 00000000..038db4bf Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png b/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png new file mode 100644 index 00000000..9d1310c6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_disable_n2/bn_hot_blacktea.png b/image/page_drink_disable_n2/bn_hot_blacktea.png new file mode 100644 index 00000000..524d4243 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_blacktea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_blueberry_tea.png b/image/page_drink_disable_n2/bn_hot_blueberry_tea.png new file mode 100644 index 00000000..03012aa7 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_cappuccino.png b/image/page_drink_disable_n2/bn_hot_cappuccino.png new file mode 100644 index 00000000..eb07c6ed Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_cappuccino.png differ diff --git a/image/page_drink_disable_n2/bn_hot_caramel_latte.png b/image/page_drink_disable_n2/bn_hot_caramel_latte.png new file mode 100644 index 00000000..a7b74ad6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_caramel_latte.png differ diff --git a/image/page_drink_disable_n2/bn_hot_chrysanthemum_tea.png b/image/page_drink_disable_n2/bn_hot_chrysanthemum_tea.png new file mode 100644 index 00000000..3107b2a6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_chrysanthemum_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png new file mode 100644 index 00000000..83f4084a Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_double_espresso-1.png b/image/page_drink_disable_n2/bn_hot_double_espresso-1.png new file mode 100644 index 00000000..9f36384f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_double_espresso-1.png differ diff --git a/image/page_drink_disable_n2/bn_hot_double_espresso.png b/image/page_drink_disable_n2/bn_hot_double_espresso.png new file mode 100644 index 00000000..e558277f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_double_espresso.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso-1.png b/image/page_drink_disable_n2/bn_hot_espresso-1.png new file mode 100644 index 00000000..cc9a80e3 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso-1.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso.png b/image/page_drink_disable_n2/bn_hot_espresso.png new file mode 100644 index 00000000..6ebbbb59 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light.png b/image/page_drink_disable_n2/bn_hot_espresso_light.png new file mode 100644 index 00000000..3fc2e21e Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_disable_n2/bn_hot_espresso_light_bluedaddy.png new file mode 100644 index 00000000..13027cda Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png new file mode 100644 index 00000000..fb276f8a Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_mozart.png b/image/page_drink_disable_n2/bn_hot_espresso_light_mozart.png new file mode 100644 index 00000000..3614f0ac Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_mozart.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png b/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png new file mode 100644 index 00000000..c7798f48 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png new file mode 100644 index 00000000..ded3297b Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png b/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png new file mode 100644 index 00000000..56e51c3c Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png b/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png new file mode 100644 index 00000000..517fe302 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png b/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png new file mode 100644 index 00000000..99db29a2 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png b/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png new file mode 100644 index 00000000..bd68df48 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png differ diff --git a/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing.png b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing.png new file mode 100644 index 00000000..882f5676 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing.png differ diff --git a/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png new file mode 100644 index 00000000..8a1d3d9e Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_hojicha_tea_sing.png b/image/page_drink_disable_n2/bn_hot_hojicha_tea_sing.png new file mode 100644 index 00000000..2a08e299 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_hojicha_tea_sing.png differ diff --git a/image/page_drink_disable_n2/bn_hot_honey_latte.png b/image/page_drink_disable_n2/bn_hot_honey_latte.png new file mode 100644 index 00000000..8138a4ab Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_honey_latte.png differ diff --git a/image/page_drink_disable_n2/bn_hot_latte.png b/image/page_drink_disable_n2/bn_hot_latte.png new file mode 100644 index 00000000..47c8ef5f Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_latte.png differ diff --git a/image/page_drink_disable_n2/bn_hot_latte_Healthy.png b/image/page_drink_disable_n2/bn_hot_latte_Healthy.png new file mode 100644 index 00000000..7189add7 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Matcha.png b/image/page_drink_disable_n2/bn_hot_lime_Matcha.png new file mode 100644 index 00000000..6d9122fc Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_Matcha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Matcha_Honey.png b/image/page_drink_disable_n2/bn_hot_lime_Matcha_Honey.png new file mode 100644 index 00000000..952916e5 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_Matcha_Honey.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Oolong_Honey_tea.png b/image/page_drink_disable_n2/bn_hot_lime_Oolong_Honey_tea.png new file mode 100644 index 00000000..0c781b5a Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_Oolong_Honey_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png new file mode 100644 index 00000000..5dbf4827 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png new file mode 100644 index 00000000..a1f562a4 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_tea.png b/image/page_drink_disable_n2/bn_hot_lime_tea.png new file mode 100644 index 00000000..ccc7c7e7 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_tea_Honey.png b/image/page_drink_disable_n2/bn_hot_lime_tea_Honey.png new file mode 100644 index 00000000..f86a561c Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lime_tea_Honey.png differ diff --git a/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png new file mode 100644 index 00000000..23afe160 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_limeblack_tea.png b/image/page_drink_disable_n2/bn_hot_limeblack_tea.png new file mode 100644 index 00000000..b8933a38 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_limeblack_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lychee_espresso.png b/image/page_drink_disable_n2/bn_hot_lychee_espresso.png new file mode 100644 index 00000000..b927a6a2 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lychee_espresso.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lychee_tea.png b/image/page_drink_disable_n2/bn_hot_lychee_tea.png new file mode 100644 index 00000000..dbff556d Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_lychee_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_marijuana_tea.png b/image/page_drink_disable_n2/bn_hot_marijuana_tea.png new file mode 100644 index 00000000..ad793057 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_marijuana_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png new file mode 100644 index 00000000..697988df Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png b/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png new file mode 100644 index 00000000..85cce6ce Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png b/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png new file mode 100644 index 00000000..85cce6ce Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_tea.png b/image/page_drink_disable_n2/bn_hot_matcha_tea.png new file mode 100644 index 00000000..00aba11d Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png new file mode 100644 index 00000000..865ea871 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png b/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png new file mode 100644 index 00000000..00aba11d Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png differ diff --git a/image/page_drink_disable_n2/bn_hot_mocha.png b/image/page_drink_disable_n2/bn_hot_mocha.png new file mode 100644 index 00000000..69139a26 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_mocha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png b/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png new file mode 100644 index 00000000..3d1fba27 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_oolong_tea.png b/image/page_drink_disable_n2/bn_hot_oolong_tea.png new file mode 100644 index 00000000..57238fd6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_oolong_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png new file mode 100644 index 00000000..2a2365d9 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_strawberry_tea.png b/image/page_drink_disable_n2/bn_hot_strawberry_tea.png new file mode 100644 index 00000000..034a63b8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea.png b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea.png new file mode 100644 index 00000000..3746e6e0 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason.png b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..5c675b5d Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png new file mode 100644 index 00000000..e2c7ce38 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_taiwantea_macchiato.png b/image/page_drink_disable_n2/bn_hot_taiwantea_macchiato.png new file mode 100644 index 00000000..ac42b766 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_taiwantea_macchiato.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png b/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png new file mode 100644 index 00000000..3197a528 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png new file mode 100644 index 00000000..bb82f09e Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_tacc.png b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_tacc.png new file mode 100644 index 00000000..3197a528 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_tea.png b/image/page_drink_disable_n2/bn_hot_thai_tea.png new file mode 100644 index 00000000..cdc578fb Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_tea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_tea_coffee.png b/image/page_drink_disable_n2/bn_hot_thai_tea_coffee.png new file mode 100644 index 00000000..36baa02a Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_tea_coffee.png differ diff --git a/image/page_drink_disable_n2/bn_hot_ume_tea.png b/image/page_drink_disable_n2/bn_hot_ume_tea.png new file mode 100644 index 00000000..1f35409e Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_ume_tea.png differ diff --git a/image/page_drink_disable_n2/bn_iced.png b/image/page_drink_disable_n2/bn_iced.png new file mode 100644 index 00000000..29d1d2d4 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up.png b/image/page_drink_disable_n2/bn_iced_7up.png new file mode 100644 index 00000000..0ad18ebd Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_7up.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Black_Sugar_Milk.png b/image/page_drink_disable_n2/bn_iced_Black_Sugar_Milk.png new file mode 100644 index 00000000..97a4d50e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Black_Sugar_Milk.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Black_Sugar_Milk_smoothie.png b/image/page_drink_disable_n2/bn_iced_Black_Sugar_Milk_smoothie.png new file mode 100644 index 00000000..9d699205 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Black_Sugar_Milk_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Cokecola.png b/image/page_drink_disable_n2/bn_iced_Cokecola.png new file mode 100644 index 00000000..4b52eab5 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Cokecola.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Ginger_soda.png b/image/page_drink_disable_n2/bn_iced_Ginger_soda.png new file mode 100644 index 00000000..692c7131 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Ginger_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Gingerlime_soda.png b/image/page_drink_disable_n2/bn_iced_Gingerlime_soda.png new file mode 100644 index 00000000..ba85228d Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Gingerlime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Lychee.png b/image/page_drink_disable_n2/bn_iced_Lychee.png new file mode 100644 index 00000000..eb777712 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Lychee.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Lychee_smoothie.png b/image/page_drink_disable_n2/bn_iced_Lychee_smoothie.png new file mode 100644 index 00000000..dd0792b1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Lychee_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Lychee_soda.png b/image/page_drink_disable_n2/bn_iced_Lychee_soda.png new file mode 100644 index 00000000..f0f83572 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Lychee_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Mango_soda.png b/image/page_drink_disable_n2/bn_iced_Mango_soda.png new file mode 100644 index 00000000..84e5a07f Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Mango_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png new file mode 100644 index 00000000..b96fae12 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Ovalcocoa_smoothie.png b/image/page_drink_disable_n2/bn_iced_Ovalcocoa_smoothie.png new file mode 100644 index 00000000..d2f8dd1c Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Ovalcocoa_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_americano_soda.png b/image/page_drink_disable_n2/bn_iced_americano_soda.png new file mode 100644 index 00000000..5bc95876 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_americano_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_blueberry.png b/image/page_drink_disable_n2/bn_iced_blueberry.png new file mode 100644 index 00000000..841429bf Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_blueberry.png differ diff --git a/image/page_drink_disable_n2/bn_iced_blueberry_soda.png b/image/page_drink_disable_n2/bn_iced_blueberry_soda.png new file mode 100644 index 00000000..dd82fab8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_blueberry_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_caramel.png b/image/page_drink_disable_n2/bn_iced_caramel.png new file mode 100644 index 00000000..3443be4f Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_caramel.png differ diff --git a/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png new file mode 100644 index 00000000..0b88a888 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png differ diff --git a/image/page_drink_disable_n2/bn_iced_caramel_latte_smoothie.png b/image/page_drink_disable_n2/bn_iced_caramel_latte_smoothie.png new file mode 100644 index 00000000..7a7308d8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_caramel_latte_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_caramelcocoa_smoothie.png b/image/page_drink_disable_n2/bn_iced_caramelcocoa_smoothie.png new file mode 100644 index 00000000..227e6ba1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_caramelcocoa_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa.png b/image/page_drink_disable_n2/bn_iced_cocoa.png new file mode 100644 index 00000000..31422d41 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_cocoa.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png new file mode 100644 index 00000000..08c11d66 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa_smoothie.png b/image/page_drink_disable_n2/bn_iced_cocoa_smoothie.png new file mode 100644 index 00000000..e55b4ad0 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_cocoa_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_energy_drink.png b/image/page_drink_disable_n2/bn_iced_energy_drink.png new file mode 100644 index 00000000..7eaa4632 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_energy_drink.png differ diff --git a/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda.png b/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda.png new file mode 100644 index 00000000..2fe932a3 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png b/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png new file mode 100644 index 00000000..e048fd01 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_epsresso.png b/image/page_drink_disable_n2/bn_iced_epsresso.png new file mode 100644 index 00000000..69185d57 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_epsresso.png differ diff --git a/image/page_drink_disable_n2/bn_iced_epsresso_smoothie.png b/image/page_drink_disable_n2/bn_iced_epsresso_smoothie.png new file mode 100644 index 00000000..bff32a5f Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_epsresso_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_hemp_lime_soda.png b/image/page_drink_disable_n2/bn_iced_hemp_lime_soda.png new file mode 100644 index 00000000..1bfa9ffa Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_hemp_lime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_hemp_soda.png b/image/page_drink_disable_n2/bn_iced_hemp_soda.png new file mode 100644 index 00000000..10f6603e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_hemp_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_honeymilk.png b/image/page_drink_disable_n2/bn_iced_honeymilk.png new file mode 100644 index 00000000..b55d5185 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_honeymilk.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade.png b/image/page_drink_disable_n2/bn_iced_lemonade.png new file mode 100644 index 00000000..f46dccd0 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_honey.png b/image/page_drink_disable_n2/bn_iced_lemonade_honey.png new file mode 100644 index 00000000..51238b77 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_honey.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_honey_soda.png b/image/page_drink_disable_n2/bn_iced_lemonade_honey_soda.png new file mode 100644 index 00000000..e8c45d58 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_honey_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_smoothie.png b/image/page_drink_disable_n2/bn_iced_lemonade_smoothie.png new file mode 100644 index 00000000..78a83881 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_soda.png b/image/page_drink_disable_n2/bn_iced_lemonade_soda.png new file mode 100644 index 00000000..d29b43a1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png new file mode 100644 index 00000000..630a5c4e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_mango.png b/image/page_drink_disable_n2/bn_iced_mango.png new file mode 100644 index 00000000..350d890e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_mango.png differ diff --git a/image/page_drink_disable_n2/bn_iced_matcha_milk_tea_smoothie-1.png b/image/page_drink_disable_n2/bn_iced_matcha_milk_tea_smoothie-1.png new file mode 100644 index 00000000..60695b9b Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_matcha_milk_tea_smoothie-1.png differ diff --git a/image/page_drink_disable_n2/bn_iced_matcha_milk_tea_smoothie.png b/image/page_drink_disable_n2/bn_iced_matcha_milk_tea_smoothie.png new file mode 100644 index 00000000..d7ce3c36 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_matcha_milk_tea_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_melon_soda.png b/image/page_drink_disable_n2/bn_iced_melon_soda.png new file mode 100644 index 00000000..adad0e58 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_melon_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk.png b/image/page_drink_disable_n2/bn_iced_milk.png new file mode 100644 index 00000000..250100e6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_milk.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_Healthy.png b/image/page_drink_disable_n2/bn_iced_milk_Healthy.png new file mode 100644 index 00000000..3eb78327 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ovaltine.png b/image/page_drink_disable_n2/bn_iced_ovaltine.png new file mode 100644 index 00000000..8aee79a8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_ovaltine.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi.png b/image/page_drink_disable_n2/bn_iced_pepsi.png new file mode 100644 index 00000000..e237d59e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_Melon.png b/image/page_drink_disable_n2/bn_iced_pepsi_Melon.png new file mode 100644 index 00000000..6e87c64b Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_Melon.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_plum.png b/image/page_drink_disable_n2/bn_iced_pepsi_plum.png new file mode 100644 index 00000000..1277766d Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_plum.png differ diff --git a/image/page_drink_disable_n2/bn_iced_slushie.png b/image/page_drink_disable_n2/bn_iced_slushie.png new file mode 100644 index 00000000..ceec7b24 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_slushie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_slushieplum.png b/image/page_drink_disable_n2/bn_iced_slushieplum.png new file mode 100644 index 00000000..10a8e416 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_slushieplum.png differ diff --git a/image/page_drink_disable_n2/bn_iced_sprite.png b/image/page_drink_disable_n2/bn_iced_sprite.png new file mode 100644 index 00000000..88c4ac8e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_sprite.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberry.png b/image/page_drink_disable_n2/bn_iced_strawberry.png new file mode 100644 index 00000000..a9e29097 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_strawberry.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberry_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberry_smoothie.png new file mode 100644 index 00000000..c49c963f Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_strawberry_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberry_soda.png b/image/page_drink_disable_n2/bn_iced_strawberry_soda.png new file mode 100644 index 00000000..680a5f75 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_strawberry_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png new file mode 100644 index 00000000..f5cde2b6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png new file mode 100644 index 00000000..49b96fde Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ume_drink.png b/image/page_drink_disable_n2/bn_iced_ume_drink.png new file mode 100644 index 00000000..8710f912 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_ume_drink.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ume_drink_smoothie.png b/image/page_drink_disable_n2/bn_iced_ume_drink_smoothie.png new file mode 100644 index 00000000..689f6ea8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_ume_drink_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ume_lime_soda.png b/image/page_drink_disable_n2/bn_iced_ume_lime_soda.png new file mode 100644 index 00000000..ec0e1819 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_ume_lime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ume_soda.png b/image/page_drink_disable_n2/bn_iced_ume_soda.png new file mode 100644 index 00000000..8e46ff64 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_ume_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_yuzu_soda.png b/image/page_drink_disable_n2/bn_iced_yuzu_soda.png new file mode 100644 index 00000000..5e234efe Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_yuzu_soda.png differ diff --git a/image/page_drink_disable_n2/bn_kuromitsu_coffee.png b/image/page_drink_disable_n2/bn_kuromitsu_coffee.png new file mode 100644 index 00000000..12d4cece Binary files /dev/null and b/image/page_drink_disable_n2/bn_kuromitsu_coffee.png differ diff --git a/image/page_drink_disable_n2/bn_limande_Healthy.png b/image/page_drink_disable_n2/bn_limande_Healthy.png new file mode 100644 index 00000000..59a87ca9 Binary files /dev/null and b/image/page_drink_disable_n2/bn_limande_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_melon_americano.png b/image/page_drink_disable_n2/bn_melon_americano.png new file mode 100644 index 00000000..4bd50c8c Binary files /dev/null and b/image/page_drink_disable_n2/bn_melon_americano.png differ diff --git a/image/page_drink_disable_n2/bn_pink_milk.png b/image/page_drink_disable_n2/bn_pink_milk.png new file mode 100644 index 00000000..80bcba95 Binary files /dev/null and b/image/page_drink_disable_n2/bn_pink_milk.png differ diff --git a/image/page_drink_disable_n2/bn_pink_milk_smoothie.png b/image/page_drink_disable_n2/bn_pink_milk_smoothie.png new file mode 100644 index 00000000..ba3f8279 Binary files /dev/null and b/image/page_drink_disable_n2/bn_pink_milk_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Blueberry.png b/image/page_drink_disable_n2/bn_protein_Blueberry.png new file mode 100644 index 00000000..dc71eaaf Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Blueberry.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Chocolate.png b/image/page_drink_disable_n2/bn_protein_Chocolate.png new file mode 100644 index 00000000..2304281a Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Chocolate.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Chocolate_BDMS.png b/image/page_drink_disable_n2/bn_protein_Chocolate_BDMS.png new file mode 100644 index 00000000..ac5da37e Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Chocolate_BDMS.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Mango.png b/image/page_drink_disable_n2/bn_protein_Mango.png new file mode 100644 index 00000000..f864a9a6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Mango.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Matcha.png b/image/page_drink_disable_n2/bn_protein_Matcha.png new file mode 100644 index 00000000..d5118fb7 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Matcha.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Matcha_BDMS.png b/image/page_drink_disable_n2/bn_protein_Matcha_BDMS.png new file mode 100644 index 00000000..3f5caf89 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Matcha_BDMS.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Strawberry.png b/image/page_drink_disable_n2/bn_protein_Strawberry.png new file mode 100644 index 00000000..f96804f0 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Strawberry.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Taiwantea.png b/image/page_drink_disable_n2/bn_protein_Taiwantea.png new file mode 100644 index 00000000..64106f27 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Taiwantea.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Thaitea.png b/image/page_drink_disable_n2/bn_protein_Thaitea.png new file mode 100644 index 00000000..afe82bd8 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Thaitea.png differ diff --git a/image/page_drink_disable_n2/bn_protein_Thaitea_BDMS.png b/image/page_drink_disable_n2/bn_protein_Thaitea_BDMS.png new file mode 100644 index 00000000..f91b00ef Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_Thaitea_BDMS.png differ diff --git a/image/page_drink_disable_n2/bn_protein_caramel.png b/image/page_drink_disable_n2/bn_protein_caramel.png new file mode 100644 index 00000000..95b2caa7 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_caramel.png differ diff --git a/image/page_drink_disable_n2/bn_protein_espresso.png b/image/page_drink_disable_n2/bn_protein_espresso.png new file mode 100644 index 00000000..45130836 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_espresso.png differ diff --git a/image/page_drink_disable_n2/bn_protein_espresso_BDMS.png b/image/page_drink_disable_n2/bn_protein_espresso_BDMS.png new file mode 100644 index 00000000..22a315bc Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_espresso_BDMS.png differ diff --git a/image/page_drink_disable_n2/bn_protein_isolated.png b/image/page_drink_disable_n2/bn_protein_isolated.png new file mode 100644 index 00000000..808447fd Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_isolated.png differ diff --git a/image/page_drink_disable_n2/bn_protein_kokuto.png b/image/page_drink_disable_n2/bn_protein_kokuto.png new file mode 100644 index 00000000..45a87c93 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_kokuto.png differ diff --git a/image/page_drink_disable_n2/bn_protein_melon.png b/image/page_drink_disable_n2/bn_protein_melon.png new file mode 100644 index 00000000..56bb42fc Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_melon.png differ diff --git a/image/page_drink_disable_n2/bn_protein_milk.png b/image/page_drink_disable_n2/bn_protein_milk.png new file mode 100644 index 00000000..229c7dba Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_milk.png differ diff --git a/image/page_drink_disable_n2/bn_protein_oreo.png b/image/page_drink_disable_n2/bn_protein_oreo.png new file mode 100644 index 00000000..585ec071 Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_oreo.png differ diff --git a/image/page_drink_disable_n2/bn_protein_original_BDMS.png b/image/page_drink_disable_n2/bn_protein_original_BDMS.png new file mode 100644 index 00000000..55bf326f Binary files /dev/null and b/image/page_drink_disable_n2/bn_protein_original_BDMS.png differ diff --git a/image/page_drink_disable_n2/bn_sala.png b/image/page_drink_disable_n2/bn_sala.png new file mode 100644 index 00000000..762ff354 Binary files /dev/null and b/image/page_drink_disable_n2/bn_sala.png differ diff --git a/image/page_drink_disable_n2/bn_sala_lime.png b/image/page_drink_disable_n2/bn_sala_lime.png new file mode 100644 index 00000000..d56adfec Binary files /dev/null and b/image/page_drink_disable_n2/bn_sala_lime.png differ diff --git a/image/page_drink_disable_n2/bn_sala_lime_soda.png b/image/page_drink_disable_n2/bn_sala_lime_soda.png new file mode 100644 index 00000000..6be8496a Binary files /dev/null and b/image/page_drink_disable_n2/bn_sala_lime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_sala_soda.png b/image/page_drink_disable_n2/bn_sala_soda.png new file mode 100644 index 00000000..74bd379f Binary files /dev/null and b/image/page_drink_disable_n2/bn_sala_soda.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_oreo.png b/image/page_drink_disable_n2/bn_smoothie_oreo.png new file mode 100644 index 00000000..e0bd50d6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_smoothie_oreo.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_ovaltine.png b/image/page_drink_disable_n2/bn_smoothie_ovaltine.png new file mode 100644 index 00000000..b14c7a44 Binary files /dev/null and b/image/page_drink_disable_n2/bn_smoothie_ovaltine.png differ diff --git a/image/page_drink_disable_n2/bn_soda.png b/image/page_drink_disable_n2/bn_soda.png new file mode 100644 index 00000000..33ea6ec9 Binary files /dev/null and b/image/page_drink_disable_n2/bn_soda.png differ diff --git a/image/page_drink_disable_n2/bn_strawberry_lime_soda.png b/image/page_drink_disable_n2/bn_strawberry_lime_soda.png new file mode 100644 index 00000000..e11dc640 Binary files /dev/null and b/image/page_drink_disable_n2/bn_strawberry_lime_soda.png differ diff --git a/image/page_drink_disable_n2/bn_water_roomtemp.png b/image/page_drink_disable_n2/bn_water_roomtemp.png new file mode 100644 index 00000000..03bdbeff Binary files /dev/null and b/image/page_drink_disable_n2/bn_water_roomtemp.png differ diff --git a/image/page_drink_n/bn_hot_Cappu_Healthy.png b/image/page_drink_n/bn_hot_Cappu_Healthy.png index 5fdbd840..2c5aace5 100644 Binary files a/image/page_drink_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_america_no_Healthy.png b/image/page_drink_n/bn_hot_america_no_Healthy.png index bb741299..3c11f6cb 100644 Binary files a/image/page_drink_n/bn_hot_america_no_Healthy.png and b/image/page_drink_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_blacktea.png b/image/page_drink_n/bn_hot_blacktea.png index 7c7cfa68..6e66e347 100644 Binary files a/image/page_drink_n/bn_hot_blacktea.png and b/image/page_drink_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index 63f62ac0..f525d9f0 100644 Binary files a/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_latte_Healthy.png b/image/page_drink_n/bn_hot_latte_Healthy.png index 87d8ec11..9d7b5f6b 100644 Binary files a/image/page_drink_n/bn_hot_latte_Healthy.png and b/image/page_drink_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png index 47358c26..cdc1c9fc 100644 Binary files a/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_n/bn_hot_limeblack tea_Healthy.png index 5f2612a7..20b605ca 100644 Binary files a/image/page_drink_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png index 862b48fc..d6b81782 100644 Binary files a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_n/bn_hot_matcha_tea_Healthy.png index bf349dca..6023289d 100644 Binary files a/image/page_drink_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_mocha_Healthy.png b/image/page_drink_n/bn_hot_mocha_Healthy.png index b48b524a..36328525 100644 Binary files a/image/page_drink_n/bn_hot_mocha_Healthy.png and b/image/page_drink_n/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_n/bn_hot_oolong_tea_Healthy.png index f9819e0f..6d5038cd 100644 Binary files a/image/page_drink_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index 361a11dd..8797d3a3 100644 Binary files a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png index 0b273b45..09d0d9e5 100644 Binary files a/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_cocoa_Healthy.png b/image/page_drink_n/bn_iced_cocoa_Healthy.png index 750cf983..bb6860ee 100644 Binary files a/image/page_drink_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png index 724c09da..88e3af53 100644 Binary files a/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_milk_Healthy.png b/image/page_drink_n/bn_iced_milk_Healthy.png index d7f1149e..c14ccbdf 100644 Binary files a/image/page_drink_n/bn_iced_milk_Healthy.png and b/image/page_drink_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_n/bn_limande_Healthy.png b/image/page_drink_n/bn_limande_Healthy.png index 91f64d3b..923ad59f 100644 Binary files a/image/page_drink_n/bn_limande_Healthy.png and b/image/page_drink_n/bn_limande_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png index 29e7bdfc..44c406c0 100644 Binary files a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png index b1c38297..b332f1de 100644 Binary files a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png and b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png index f13c036e..d7d06947 100644 Binary files a/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png and b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_blacktea.png b/image/page_drink_picture2_n/bn_hot_blacktea.png index 3b5fb89e..c854c69b 100644 Binary files a/image/page_drink_picture2_n/bn_hot_blacktea.png and b/image/page_drink_picture2_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index bc6e1461..410dc84b 100644 Binary files a/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_latte_Healthy.png b/image/page_drink_picture2_n/bn_hot_latte_Healthy.png index 432af78e..10571d48 100644 Binary files a/image/page_drink_picture2_n/bn_hot_latte_Healthy.png and b/image/page_drink_picture2_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png index 2036eb90..298c7cd8 100644 Binary files a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png index 43535645..1e66cb38 100644 Binary files a/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png index 8939ab6a..b461140f 100644 Binary files a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png index df5de8e2..b821ee93 100644 Binary files a/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png index 90594df6..06e30146 100644 Binary files a/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index eeaf20a1..757703b4 100644 Binary files a/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png index 2b063efc..f1cae048 100644 Binary files a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png b/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png index 336f0195..6ea527c2 100644 Binary files a/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png index fc2cb7cc..9b0dcdbd 100644 Binary files a/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png b/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png index 9aab23dc..f9d6d80b 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png and b/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_Healthy.png b/image/page_drink_picture2_n/bn_iced_milk_Healthy.png index cb601ef3..57faa232 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_Healthy.png and b/image/page_drink_picture2_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_Cappu_Healthy.png b/image/page_drink_press_n/bn_hot_Cappu_Healthy.png index bdba71a9..0ba97263 100644 Binary files a/image/page_drink_press_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_press_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_america_no_Healthy.png b/image/page_drink_press_n/bn_hot_america_no_Healthy.png index b14a2bbd..167a2691 100644 Binary files a/image/page_drink_press_n/bn_hot_america_no_Healthy.png and b/image/page_drink_press_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_blacktea.png b/image/page_drink_press_n/bn_hot_blacktea.png index e6a1dbcd..a33bafc2 100644 Binary files a/image/page_drink_press_n/bn_hot_blacktea.png and b/image/page_drink_press_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index a23cba1f..905f638b 100644 Binary files a/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_latte_Healthy.png b/image/page_drink_press_n/bn_hot_latte_Healthy.png index 4ddd898c..e8816612 100644 Binary files a/image/page_drink_press_n/bn_hot_latte_Healthy.png and b/image/page_drink_press_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png index 93fbc54e..75e74d0e 100644 Binary files a/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png index 398cf05e..25e3543f 100644 Binary files a/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png index 8cb65059..e8d78ccd 100644 Binary files a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png index 2e54c867..28767328 100644 Binary files a/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_mocha_Healthy.png b/image/page_drink_press_n/bn_hot_mocha_Healthy.png index a62b1b9c..9619152e 100644 Binary files a/image/page_drink_press_n/bn_hot_mocha_Healthy.png and b/image/page_drink_press_n/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png index 165a55dd..d1c0be65 100644 Binary files a/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index 08589488..0e52ed4f 100644 Binary files a/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png index d95fd4f7..b6544249 100644 Binary files a/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_cocoa_Healthy.png b/image/page_drink_press_n/bn_iced_cocoa_Healthy.png index 6c3a3e59..87e398f5 100644 Binary files a/image/page_drink_press_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_press_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png index aafdd356..07fa87c3 100644 Binary files a/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_milk_Healthy.png b/image/page_drink_press_n/bn_iced_milk_Healthy.png index c8eeacbf..0370fc8b 100644 Binary files a/image/page_drink_press_n/bn_iced_milk_Healthy.png and b/image/page_drink_press_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_press_n/bn_limande_Healthy.png b/image/page_drink_press_n/bn_limande_Healthy.png index da63a608..9af27553 100644 Binary files a/image/page_drink_press_n/bn_limande_Healthy.png and b/image/page_drink_press_n/bn_limande_Healthy.png differ diff --git a/image/topping2/bn_sugarlevel3.png b/image/topping2/bn_sugarlevel3.png new file mode 100644 index 00000000..1aa0620c Binary files /dev/null and b/image/topping2/bn_sugarlevel3.png differ diff --git a/image/topping2/bp_sugarlevel3.png b/image/topping2/bp_sugarlevel3.png new file mode 100644 index 00000000..d76fffd1 Binary files /dev/null and b/image/topping2/bp_sugarlevel3.png differ diff --git a/image/topping2/bu_sugarlevel3.png b/image/topping2/bu_sugarlevel3.png new file mode 100644 index 00000000..a20877a0 Binary files /dev/null and b/image/topping2/bu_sugarlevel3.png differ diff --git a/image/topping2_en/bn_sugarlevel3.png b/image/topping2_en/bn_sugarlevel3.png new file mode 100644 index 00000000..bf407bb0 Binary files /dev/null and b/image/topping2_en/bn_sugarlevel3.png differ diff --git a/image/topping2_en/bp_sugarlevel3.png b/image/topping2_en/bp_sugarlevel3.png new file mode 100644 index 00000000..cf1c5506 Binary files /dev/null and b/image/topping2_en/bp_sugarlevel3.png differ diff --git a/image/topping2_en/bu_sugarlevel3.png b/image/topping2_en/bu_sugarlevel3.png new file mode 100644 index 00000000..e47337a4 Binary files /dev/null and b/image/topping2_en/bu_sugarlevel3.png differ diff --git a/spiral/image/page_spiral/01-00-00-0001.png b/spiral/image/page_spiral/01-00-00-0001.png new file mode 100644 index 00000000..e67a1801 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0001.png differ diff --git a/spiral/image/page_spiral/01-00-00-0002.png b/spiral/image/page_spiral/01-00-00-0002.png new file mode 100644 index 00000000..703eaacf Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0002.png differ diff --git a/spiral/image/page_spiral/01-00-00-0003.png b/spiral/image/page_spiral/01-00-00-0003.png new file mode 100644 index 00000000..24aa3b64 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0003.png differ diff --git a/spiral/image/page_spiral/01-00-00-0004.png b/spiral/image/page_spiral/01-00-00-0004.png new file mode 100644 index 00000000..fa17d60c Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0004.png differ diff --git a/spiral/image/page_spiral/01-00-00-0005.png b/spiral/image/page_spiral/01-00-00-0005.png new file mode 100644 index 00000000..cf647443 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0005.png differ diff --git a/spiral/image/page_spiral/01-00-00-0006.png b/spiral/image/page_spiral/01-00-00-0006.png new file mode 100644 index 00000000..e67a1801 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0006.png differ diff --git a/spiral/image/page_spiral/01-00-00-0007.png b/spiral/image/page_spiral/01-00-00-0007.png new file mode 100644 index 00000000..e67a1801 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0007.png differ diff --git a/spiral/image/page_spiral/01-00-00-0008.png b/spiral/image/page_spiral/01-00-00-0008.png new file mode 100644 index 00000000..703eaacf Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0008.png differ diff --git a/spiral/image/page_spiral/01-00-00-0009.png b/spiral/image/page_spiral/01-00-00-0009.png new file mode 100644 index 00000000..703eaacf Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0009.png differ diff --git a/spiral/image/page_spiral/01-00-00-0010.png b/spiral/image/page_spiral/01-00-00-0010.png new file mode 100644 index 00000000..24aa3b64 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0010.png differ diff --git a/spiral/image/page_spiral/01-00-00-0011.png b/spiral/image/page_spiral/01-00-00-0011.png new file mode 100644 index 00000000..24aa3b64 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0011.png differ diff --git a/spiral/image/page_spiral/01-00-00-0012.png b/spiral/image/page_spiral/01-00-00-0012.png new file mode 100644 index 00000000..fa17d60c Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0012.png differ diff --git a/spiral/image/page_spiral/01-00-00-0013.png b/spiral/image/page_spiral/01-00-00-0013.png new file mode 100644 index 00000000..fa17d60c Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0013.png differ diff --git a/spiral/image/page_spiral/01-00-00-0014.png b/spiral/image/page_spiral/01-00-00-0014.png new file mode 100644 index 00000000..cf647443 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0014.png differ diff --git a/spiral/image/page_spiral/01-00-00-0015.png b/spiral/image/page_spiral/01-00-00-0015.png new file mode 100644 index 00000000..cf647443 Binary files /dev/null and b/spiral/image/page_spiral/01-00-00-0015.png differ diff --git a/spiral/image/page_spiral/spiral_en_price.png b/spiral/image/page_spiral/spiral_en_price.png new file mode 100644 index 00000000..20da8839 Binary files /dev/null and b/spiral/image/page_spiral/spiral_en_price.png differ diff --git a/spiral/image/page_spiral/spiral_fail.png b/spiral/image/page_spiral/spiral_fail.png new file mode 100644 index 00000000..b813919a Binary files /dev/null and b/spiral/image/page_spiral/spiral_fail.png differ diff --git a/spiral/image/page_spiral/spiral_product_01-00-00-0001.png b/spiral/image/page_spiral/spiral_product_01-00-00-0001.png new file mode 100644 index 00000000..dda4874a Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_01-00-00-0001.png differ diff --git a/spiral/image/page_spiral/spiral_product_01-00-00-0002.png b/spiral/image/page_spiral/spiral_product_01-00-00-0002.png new file mode 100644 index 00000000..c3b0ddea Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_01-00-00-0002.png differ diff --git a/spiral/image/page_spiral/spiral_product_01-00-00-0003.png b/spiral/image/page_spiral/spiral_product_01-00-00-0003.png new file mode 100644 index 00000000..e9e944e9 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_01-00-00-0003.png differ diff --git a/spiral/image/page_spiral/spiral_product_01-00-00-0004.png b/spiral/image/page_spiral/spiral_product_01-00-00-0004.png new file mode 100644 index 00000000..36dcaf70 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_01-00-00-0004.png differ diff --git a/spiral/image/page_spiral/spiral_product_01-00-00-0005.png b/spiral/image/page_spiral/spiral_product_01-00-00-0005.png new file mode 100644 index 00000000..3527cca8 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_01-00-00-0005.png differ diff --git a/spiral/image/page_spiral/spiral_text_appfast.png b/spiral/image/page_spiral/spiral_text_appfast.png new file mode 100644 index 00000000..f41dd6da Binary files /dev/null and b/spiral/image/page_spiral/spiral_text_appfast.png differ diff --git a/spiral/image/page_spiral/spiral_text_choose_money.png b/spiral/image/page_spiral/spiral_text_choose_money.png new file mode 100644 index 00000000..6244c368 Binary files /dev/null and b/spiral/image/page_spiral/spiral_text_choose_money.png differ diff --git a/spiral/image/page_spiral/spiral_text_choose_money_en.png b/spiral/image/page_spiral/spiral_text_choose_money_en.png new file mode 100644 index 00000000..7e9ff315 Binary files /dev/null and b/spiral/image/page_spiral/spiral_text_choose_money_en.png differ diff --git a/spiral/image/page_spiral/spiral_text_detail.png b/spiral/image/page_spiral/spiral_text_detail.png new file mode 100644 index 00000000..e0993b90 Binary files /dev/null and b/spiral/image/page_spiral/spiral_text_detail.png differ diff --git a/spiral/image/page_spiral/spiral_text_detail_en.png b/spiral/image/page_spiral/spiral_text_detail_en.png new file mode 100644 index 00000000..9a578cc3 Binary files /dev/null and b/spiral/image/page_spiral/spiral_text_detail_en.png differ diff --git a/spiral/image/page_spiral/spiral_text_fail.png b/spiral/image/page_spiral/spiral_text_fail.png new file mode 100644 index 00000000..e1d315e7 Binary files /dev/null and b/spiral/image/page_spiral/spiral_text_fail.png differ diff --git a/spiral/image/page_spiral/spiral_th_price.png b/spiral/image/page_spiral/spiral_th_price.png new file mode 100644 index 00000000..f68f60c7 Binary files /dev/null and b/spiral/image/page_spiral/spiral_th_price.png differ diff --git a/spiral/image/page_spiral/spiral_wait.png b/spiral/image/page_spiral/spiral_wait.png new file mode 100644 index 00000000..f7d877b5 Binary files /dev/null and b/spiral/image/page_spiral/spiral_wait.png differ diff --git a/spiral/image/page_spiral/thankyou.png b/spiral/image/page_spiral/thankyou.png new file mode 100644 index 00000000..ecf18cb3 Binary files /dev/null and b/spiral/image/page_spiral/thankyou.png differ diff --git a/spiral/image/page_spiral_disable/21-00-00-0001.png b/spiral/image/page_spiral_disable/21-00-00-0001.png new file mode 100644 index 00000000..89750dfc Binary files /dev/null and b/spiral/image/page_spiral_disable/21-00-00-0001.png differ diff --git a/spiral/image/page_spiral_disable/21-00-00-0002.png b/spiral/image/page_spiral_disable/21-00-00-0002.png new file mode 100644 index 00000000..89750dfc Binary files /dev/null and b/spiral/image/page_spiral_disable/21-00-00-0002.png differ diff --git a/spiral/image/page_spiral_disable/21-00-00-0003.png b/spiral/image/page_spiral_disable/21-00-00-0003.png new file mode 100644 index 00000000..89750dfc Binary files /dev/null and b/spiral/image/page_spiral_disable/21-00-00-0003.png differ diff --git a/spiral/image/page_spiral_disable/21-00-00-0004.png b/spiral/image/page_spiral_disable/21-00-00-0004.png new file mode 100644 index 00000000..89750dfc Binary files /dev/null and b/spiral/image/page_spiral_disable/21-00-00-0004.png differ diff --git a/spiral/image/page_spiral_disable/21-00-00-0005.png b/spiral/image/page_spiral_disable/21-00-00-0005.png new file mode 100644 index 00000000..89750dfc Binary files /dev/null and b/spiral/image/page_spiral_disable/21-00-00-0005.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0001.png b/spiral/image/page_spiral_press/01-00-00-0001.png new file mode 100644 index 00000000..30ffe090 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0001.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0002.png b/spiral/image/page_spiral_press/01-00-00-0002.png new file mode 100644 index 00000000..145cc152 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0002.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0003.png b/spiral/image/page_spiral_press/01-00-00-0003.png new file mode 100644 index 00000000..7123367c Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0003.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0004.png b/spiral/image/page_spiral_press/01-00-00-0004.png new file mode 100644 index 00000000..244b4ab0 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0004.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0005.png b/spiral/image/page_spiral_press/01-00-00-0005.png new file mode 100644 index 00000000..0c24b311 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0005.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0006.png b/spiral/image/page_spiral_press/01-00-00-0006.png new file mode 100644 index 00000000..30ffe090 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0006.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0007.png b/spiral/image/page_spiral_press/01-00-00-0007.png new file mode 100644 index 00000000..30ffe090 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0007.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0008.png b/spiral/image/page_spiral_press/01-00-00-0008.png new file mode 100644 index 00000000..145cc152 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0008.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0009.png b/spiral/image/page_spiral_press/01-00-00-0009.png new file mode 100644 index 00000000..145cc152 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0009.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0010.png b/spiral/image/page_spiral_press/01-00-00-0010.png new file mode 100644 index 00000000..7123367c Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0010.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0011.png b/spiral/image/page_spiral_press/01-00-00-0011.png new file mode 100644 index 00000000..7123367c Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0011.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0012.png b/spiral/image/page_spiral_press/01-00-00-0012.png new file mode 100644 index 00000000..244b4ab0 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0012.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0013.png b/spiral/image/page_spiral_press/01-00-00-0013.png new file mode 100644 index 00000000..244b4ab0 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0013.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0014.png b/spiral/image/page_spiral_press/01-00-00-0014.png new file mode 100644 index 00000000..0c24b311 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0014.png differ diff --git a/spiral/image/page_spiral_press/01-00-00-0015.png b/spiral/image/page_spiral_press/01-00-00-0015.png new file mode 100644 index 00000000..0c24b311 Binary files /dev/null and b/spiral/image/page_spiral_press/01-00-00-0015.png differ diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index 7a351c00..34a33b8c 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -1,6 +1,7 @@ + "Enable" 1080 @@ -8,6 +9,19 @@ "0xeae6e1" SoundVolume + + Var ColorBrown = 0x746253 + Var ColorBrown2 = 0x513C2F + + Var ColorBlack = 0x000000 + Var ColorBlack1 = 0x322B26 + + Var ColorWhite = 0xFFFFFF + + Var ColorOrange = 0xDE794E + + Var PayDetail="" + GenHashWithTimeStamp SpiralRef If show_eng = "true" Then Var showthaiText = "Invisible" Var showengText = "Enable" @@ -15,6 +29,8 @@ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var ImageShowPrice ="ROOT/taobin_project/spiral/image/page_spiral/spiral_en_price.png" + Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -22,6 +38,8 @@ Var DirImage = "ROOT/taobin_project/image/page3" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var ImageShowPrice ="ROOT/taobin_project/spiral/image/page_spiral/spiral_th_price.png" + EndIf ; SpiralOnline @@ -476,6 +494,1916 @@ + + 10 + 497 + 1080 + "auto" + "Vertical" + 4 + + ; button i=1 01-00-00-0001 + + 33 + 22 + 225 + 296 + $01-00-00-0001.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0001.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0001.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0001.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0001.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0001.descriptionE + + + + + +; button i=1 01-00-00-0002 + + 33 + 22 + 225 + 296 + $01-00-00-0002.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0002.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0002.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0002.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0002.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0002.descriptionE + + + + +; button i=1 01-00-00-0003 + + 33 + 22 + 225 + 296 + $01-00-00-0003.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0003.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0003.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0003.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0003.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0003.descriptionE + + + + + + + + ; button i=1 01-00-00-0004 + + 33 + 22 + 225 + 296 + $01-00-00-0004.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0004.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0004.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0004.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0004.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0004.descriptionE + + + + +; button i=1 01-00-00-0005 + + 33 + 22 + 225 + 296 + $01-00-00-0005.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0005.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0005.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0005.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0005.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0005.descriptionE + + + + + ; button i=1 01-00-00-0006 + + 33 + 22 + 225 + 296 + $01-00-00-0006.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0006.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0006.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0006.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0006.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0006.descriptionE + + + + + +; button i=1 01-00-00-0007 + + 33 + 22 + 225 + 296 + $01-00-00-0007.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0007.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0007.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0007.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0007.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0007.descriptionE + + + + + + +; button i=1 01-00-00-0008 + + 33 + 22 + 225 + 296 + $01-00-00-0008.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0008.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0008.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0008.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0008.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0008.descriptionE + + + + + + + + ; button i=1 01-00-00-0009 + + 33 + 22 + 225 + 296 + $01-00-00-0009.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0009.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0009.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0009.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0009.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0009.descriptionE + + + + +; button i=1 01-00-00-0010 + + 33 + 22 + 225 + 296 + $01-00-00-0010.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0010.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0010.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0010.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0010.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0010.descriptionE + + + + + ; button i=1 01-00-00-0011 + + 33 + 22 + 225 + 296 + $01-00-00-0011.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0011.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0011.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0011.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0011.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0011.descriptionE + + + + + + +; button i=1 01-00-00-0012 + + 33 + 22 + 225 + 296 + $01-00-00-0012.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0012.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0012.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0012.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0012.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0012.descriptionE + + + + + +; button i=1 01-00-00-0013 + + 33 + 22 + 225 + 296 + $01-00-00-0013.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0013.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0013.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0013.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0013.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0013.descriptionE + + + + + + + + ; button i=1 01-00-00-0014 + + 33 + 22 + 225 + 296 + $01-00-00-0014.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0014.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0014.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0014.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0014.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0014.descriptionE + + + + +; button i=1 01-00-00-0015 + + 33 + 22 + 225 + 296 + $01-00-00-0015.Button + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $01-00-00-0015.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 170 + 24 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $01-00-00-0015.Name + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $01-00-00-0015.description + + + + 16 + 170 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $01-00-00-0015.NameE + + + + 16 + 230 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $01-00-00-0015.descriptionE + + + + + + + + + +; Cart + + + diff --git a/spiral/xml/page_spiral_check.xml b/spiral/xml/page_spiral_check.xml new file mode 100644 index 00000000..9c30ceb4 --- /dev/null +++ b/spiral/xml/page_spiral_check.xml @@ -0,0 +1,107 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var cancelState = "Enable" + Var Timeout = 0 + Var LastMakeSpiralResult = 0 + Var MachineSpiralStage = "" + + 100 + + Var Timeout = Timeout + 1 + + If Timeout > 100 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + If Timeout >= 1 Then + If MachineSpiralStage = "spiral-valid" Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_select.xml" + EndIf + If MachineSpiralStage = "spiral-invalid" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + If MachineSpiralStage = "spiral-failed" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + Refresh + TimerReset + + + +; +; 89 +; 700 +; 902 +; 902 +; "ROOT/taobin_project/spiral/image/page_spiral/spiral_wait.png" +; + + + + 493 + 960 + 94 + 94 + cancelState + Var( DirImage + "/loading.gif" ) + + + + + + +; +; 492 +; 1121 +;150 +; 60 +; KanitTTF +; 0xB78F24 +; Timeout +; +; +; +; +; 92 +; 501 +; 60 +; KanitTTF +; 0xB78F24 +; SpiralRef +; +; +; +; 92 +; 551 +; 60 +; KanitTTF +; 0xB78F24 +; ServiceCredit +; +; +; +; +; 92 +; 600 +; 60 +; KanitTTF +; 0xB78F24 +; MachineSpiralStage +; + + diff --git a/spiral/xml/page_spiral_check_cash.xml b/spiral/xml/page_spiral_check_cash.xml new file mode 100644 index 00000000..205f7cf5 --- /dev/null +++ b/spiral/xml/page_spiral_check_cash.xml @@ -0,0 +1,135 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var Timeout = 0 + Var GotoStoreCredit0 = 0 + Var LastMakeSpiralResult = 0 + Var MachineSpiralStage = "" + + 1000 + + Var Timeout = Timeout + 1 + + If Timeout = 3 Then + If Seeker.PayWithQR = 0 Then + If Seeker.FreeVendingCampaign = 0 Then + If Seeker.IntVendingCampaign < PayAmount Then + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + + If SumCoinAmount >= PayAmount Then + Var Canout = SumCoinAmount - PayAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf + EndIf + EndIf + Else + + Var Canout = CoinAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf + + EndIf + Else + + Var Canout = CoinAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf + + EndIf + If GotoStoreCredit0 = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit0.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + + If Timeout >= 10 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + Refresh + TimerReset + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_wait.png" + + + + + +; +; 492 +; 1121 +;150 +; 60 +; KanitTTF +; 0xB78F24 +; Timeout +; + + +; +; 92 +; 501 +; 60 +; KanitTTF +; 0xB78F24 +; GotoStoreCredit0 +; +; +; +; 92 +; 551 +; 60 +; KanitTTF +; 0xB78F24 +; Canout +; +; +; +; 92 +; 601 +; 60 +; KanitTTF +; 0xB78F24 +; clickedChangeFlag +; +; +; +; +; 92 +; 651 +; 60 +; KanitTTF +; 0xB78F24 +; StoreCreditAmount +; + + + + diff --git a/spiral/xml/page_spiral_fail.xml b/spiral/xml/page_spiral_fail.xml new file mode 100644 index 00000000..8a6f1faa --- /dev/null +++ b/spiral/xml/page_spiral_fail.xml @@ -0,0 +1,542 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var Timeout = 0 + Var ShowPictureFail = 0 + If ChangeOK = 1 Then + Var ChangeOK = 2 + EndIf + + 1000 +; +; Var Timeout = Timeout + 1 +; If Timeout >= 5 Then +; Open "ROOT/taobin_project/xml/page_back_to_main.xml" +; EndIf +; Refresh +; TimerReset +; + + + + + + + If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail2.xml" + EndIf + EndIf + + + + + + DEBUGVAR LastMakeSpiralResult + Var Timeout = Timeout + 1 + Var ChangeTimeout = ChangeTimeout - 1 + Var CheckAckCodeTimer = CheckAckCodeTimer - 1 + + + If ChangeTimeout < 1 Then + If ChangeOK = 1 Then + Var ChangeOK = 2 + Var ChangeTimeout = 30 + EndIf + EndIf + If ChangeTimeout < 1 Then + If ChangeFlag2 = 1 Then + Var ChangeOK = 3 + Var ChangeFlag2 = 2 + Var ChangeTimeout = 30 + EndIf + EndIf + +If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + If CheckAckCodeTimer < 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + EndIf + + + + If LastMakeSpiralResult = 2 Then + If ChangeOK = 3 Then + If PayOk = 0 Then + Var PayOk = 1 + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + + Var SessionID3 = SessionID3 + MachineSpiralID + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + MachineSpiralSlotID + + If SpiralCodeOk = 1 Then + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf + + + ;Var PayDetail="1/F:1221/0/" + Var PayDetail="1/F:" + Var PayDetail = PayDetail + MachineSpiralErrorCode + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SessionID4 + + If Seeker.PayWithQR = 1 Then + If waitAckPay = 0 Then + Var waitAckPay = 1 + Var SVT = "locker" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinCredit = "" Then + Else + Var ACC = Seeker.TNumberTaobinCredit + EndIf + PAYEXT SVT ACC VendingTSIDTmp DEE + If SpiralCodeOk = 1 Then + Var CheckAckCode = 1 + Var CheckAckCodeTimer = 10 + Else + Var ShowPictureFail = 1 + EndIf + EndIf + Else + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + If SpiralCodeOk = 1 Then + Var CheckAckCode = 1 + Var CheckAckCodeTimer = 10 + Else + Var ShowPictureFail = 1 + EndIf + EndIf + EndIf + EndIf + EndIf + + + If LastMakeSpiralResult = 2 Then + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 3 + Else + Change ServiceAmount2 + Var ChangeTimeout = 30 + Var ChangeFlag2 = 1 + EndIf + EndIf + Else + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount3 + Var ChangeFlag2 = 1 + Var ChangeTimeout = 30 + EndIf + EndIf + Else + Var ChangeOK = 2 + EndIf + EndIf + Else + Var ChangeOK = 3 + EndIf + EndIf + + If Timeout >= 5 Then + If ShowPictureFail = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If Timeout >= 120 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + + Refresh + TimerReset + + + + + If ChangeOK = 2 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 3 + EndIf + EndIf + If ChangeOK = 1 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + Var ChangeTimeout = 999 + EndIf + EndIf + + + + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_fail.png" + + + + + + +; +; 92 +; 1121 +;150 +; 40 +; KanitTTF +; 0xB78F24 +; Timeout +; +; +; +; 92 +; 1181 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeTimeout +; +; +; +; +; 92 +; 650 +; 40 +; KanitTTF +; 0xB78F24 +; LastMakeSpiralResult +; +; +; +; +; +; 292 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; "CheckAckCode" +; +; +; +; +; 92 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; CheckAckCode +; +; +; +; +; 292 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; "PayOk" +; +; +; +; +; 92 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; PayOk +; +; +; +; 292 +; 1400 +; 40 KanitTTF +; 0xB78F24 +; "ChangeOK" +; +; +; +; 92 +; 1400 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeOK +; +; +; +; 292 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.StoreCreditFlag" +; +; +; +; 92 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.StoreCreditFlag +; +; +; +; 292 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag2" +; +; +; +; +; 92 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag2 +; +; +; +; +; 292 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.PayWithQR" +; +; +; +; +; 92 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.PayWithQR +; +; +; +; 292 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.CodeChannel" +; +; +; +; 92 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.CodeChannel +; +; +; +; 292 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag" +; +; +; +; 92 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag +; +; +; +; 292 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; "Canout" +; +; +; +; 92 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; Canout +; +; +; +; 292 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; "SpiralCodeOk" +; +; +; +; 92 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; SpiralCodeOk +; +; +; +; 292 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; "CheckAckCodeTimer" +; +; +; +; 92 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; CheckAckCodeTimer +; + + + + + + diff --git a/spiral/xml/page_spiral_fail2.xml b/spiral/xml/page_spiral_fail2.xml new file mode 100644 index 00000000..aeaa2d19 --- /dev/null +++ b/spiral/xml/page_spiral_fail2.xml @@ -0,0 +1,265 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var Timeout = 0 + + 1000 + + Var Timeout = Timeout + 1 + If Timeout >= 5 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + Refresh + TimerReset + + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_fail.png" + + + + + + + + 92 + 1121 +150 + 40 + KanitTTF + 0xB78F24 + Timeout + + + + 92 + 1181 + 40 + KanitTTF + 0xB78F24 + ChangeTimeout + + + + + 92 + 650 + 40 + KanitTTF + 0xB78F24 + LastMakeSpiralResult + + + + + 292 + 1350 + 40 + KanitTTF + 0xB78F24 + "PayOk" + + + + + 92 + 1350 + 40 + KanitTTF + 0xB78F24 + PayOk + + + + 292 + 1400 + 40 KanitTTF + 0xB78F24 + "ChangeOK" + + + + 92 + 1400 + 40 + KanitTTF + 0xB78F24 + ChangeOK + + + + 292 + 1450 + 40 + KanitTTF + 0xB78F24 + "Seeker.StoreCreditFlag" + + + + 92 + 1450 + 40 + KanitTTF + 0xB78F24 + Seeker.StoreCreditFlag + + + + 292 + 1500 + 40 + KanitTTF + 0xB78F24 + "ChangeFlag2" + + + + + 92 + 1500 + 40 + KanitTTF + 0xB78F24 + ChangeFlag2 + + + + + 292 + 1550 + 40 + KanitTTF + 0xB78F24 + "Seeker.PayWithQR" + + + + + 92 + 1550 + 40 + KanitTTF + 0xB78F24 + Seeker.PayWithQR + + + + 292 + 1600 + 40 + KanitTTF + 0xB78F24 + "Seeker.CodeChannel" + + + + 92 + 1600 + 40 + KanitTTF + 0xB78F24 + Seeker.CodeChannel + + + + 292 + 1650 + 40 + KanitTTF + 0xB78F24 + "ChangeFlag" + + + + 92 + 1650 + 40 + KanitTTF + 0xB78F24 + ChangeFlag + + + + 292 + 1700 + 40 + KanitTTF + 0xB78F24 + "Canout" + + + + 92 + 1700 + 40 + KanitTTF + 0xB78F24 + Canout + + + + 292 + 1750 + 40 + KanitTTF + 0xB78F24 + "SpiralCodeOk" + + + + 92 + 1750 + 40 + KanitTTF + 0xB78F24 + SpiralCodeOk + + + + 292 + 1800 + 40 + KanitTTF + 0xB78F24 + "CheckAckCodeTimer" + + + + 92 + 1800 + 40 + KanitTTF + 0xB78F24 + CheckAckCodeTimer + + + + diff --git a/spiral/xml/page_spiral_payment.xml b/spiral/xml/page_spiral_payment.xml new file mode 100644 index 00000000..9cb9a21f --- /dev/null +++ b/spiral/xml/page_spiral_payment.xml @@ -0,0 +1,290 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + + ; On open + Var GetPayInfoFlag = 0 + Var SessionID2 = "" + Var testservice = "kbank" + Var QRCODE99 = "" + Var QRCODETMP = "" + Var PayO2 = "" + Var Checktube = 0 + Var QRChannel = 0 + Var HaveCup = "true" + Var ChangeFlag2 = 0 + Var DiscountDrink = 0 + Var SelectSlot = "1" + Var SpiralCodeOk = 0 + + SAVELOG BoxID + Var SpiralKeepCredit = 0 + Var QRCODE1 = "A000000677010112" + Var QRCODE2 = "010755600066301" + Var QRCODE3 = "VDGN" + Var QRCODE4 = BoxID + Var QRCODE5 = SelectSlot + Var QRCODE6 = ServiceCredit + Var QRCODE7 = PriceDrink + Var QRCODE8 = "" + + Var CountStepPackPayment = 0 + + Var Seeker.VendingCode = "C00" + Var Seeker.VendingCampaignRI3 = 0 + Var Seeker.IntVendingCampaign = 0 + Var Seeker.FreeVendingCampaign = 0 + Var Seeker.CodeChannel = 0 + Var CoinVendingOnFlag = 0 + + Var Seeker.IntVendingCredit = 0 + + Var Seeker.StoreCreditFlag = 0 + Var Seeker.pageStoreCredit0 = 0 + Var Seeker.TNumberTaobinCredit = "" + Var Seeker.TNumberTaobinMember = "" + Var Seeker.CoffeePinNumber = "" + + Var Seeker.VendingDiscount = 0 + Var Seeker.VendingCampaign = 0 + Var Seeker.VendingTSID = "" + + + Var PayType = "" + Var CART_INDEX = 0 + + Var QRCODE99KBANK = "" + Var QRCODE99Shoppy = "" + Var LOADING_STATE = "Invisible" + Var QR_POPUP = "/img_popup2.png" + + If show_eng = "true" Then + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png" + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3" + Var PlaySoundCodeLang = "ROOT/sounds_eng/Code8digit.m4a" + + Else + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png" + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3" + Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a" + EndIf + + SAVELOG MachineStage + + + READ_FILE "/mnt/sdcard/can_sell" ReadyForBrew + + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Var ReadyForBrew = "false" + EndIf + + + Var MachineStage = "-" + + Var PayReference = "" + Var Seeker.CreditReferenceTmp = "" + + If web_app_prepar = "true" Then + Var web_app_prepar = "false" + __CMD "ui-load-playlist" 0 SelectDrink "-" + EndIf + + + + + Var ServiceAmount2 = PriceDrink + Var TelephoneNumber = "" + Var ServiceType = "coffee" + + Var VendingCreditRemain = "" + + + + DEBUGVAR Seeker.thankLidFlag + DEBUGVAR Seeker.thankStrawFlag + + + + + 900 + + + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Var ReadyForBrew = "false" + EndIf + + Var CountStepPackPayment = CountStepPackPayment + 1 + If CountStepPackPayment = 1 Then + + + + SAVELOG ExtendData + + If GetPayInfoFlag = 0 Then + If RoadShow = "false" Then + ;CoinVending ON + CoinVending XBILL + EndIf + + + Var RemainAmount = 0 + + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + ;Var CreditAmount1 = "" + ;Var ServiceAmountFlow = "" + ;Var TelephoneNumberQR = "0899999999" + ;Var ServiceType = "coffee" + ;Var ECommerceQR = "" + ;Var ECommerceQR = ECommerceQR + PriceDrink + ;Var ECommerceQR = ECommerceQR + "/" + ;Var ECommerceQR = ECommerceQR + DiscountDrink + ;Var ECommerceQR = ECommerceQR + "/" + ;Var ECommerceQR = ECommerceQR + SessionID2 + ;Var ECommerceQR = ECommerceQR + "/" + ;Var ECommerceQR = ECommerceQR + SelectDrink + ;Var ECommerceQR = ECommerceQR + "/" + ;Var ECommerceQR = ECommerceQR + "KBA:2" + ;Var ServiceParameter = "max" + ;Var ServiceCharge = 0 + ;Var AccountType = "new" + ;Var testservice = "kbank" + ;Var tc = "" + ;Var GetScore = "" + ;Var OperatorName = "" + ;Var SessionID = "" + + + ;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + ;Var GetPayInfoFlag = 1 + ;Var ReqPayInfoFlag = 1 + + EndIf + + ; Reset + Var LastMakeSpiralResult = 0 + + + DEBUGVAR ExtendData + + + If web_readyOK = "true" Then + + Var Seeker.selected_a_drink = SelectDrink + Var Seeker.ServiceAmount2 = PayAmount + + If web_payment = "CODE" Then + Open "ROOT/taobin_project/xml/page_payment_code.xml" + EndIf + + If web_payment = "CREDIT" Then + Open "ROOT/taobin_project/xml/page_payment_credit.xml" + EndIf + + EndIf + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + + EndIf + + TimerReset + Refresh + + + + 0 + 380 + 1080 + 864 + 0xFFFFFF + + + + 0 + 555 + 1080 + 437 + SpiralProduct + + + + + +; +; 375 +; 623 +; 331 +; 435 +; PictureDrink +; + + + + + 0 + 1127 + 1080 + Center + 80 + KanitMediumTTF + ColorOrange + PriceDrinkTmpShow + + + + + 0 + 982 + 1080 + Center + 65 + KanitMediumTTF + ColorBrown2 + showname + + + + + 0 + 1058 + 1080 + Center + 40 + KanitTTF + ColorBrown + showdesc + + + + 143 + 360 + ShowHeadSpiralCash + + +; +; 144 +; 323 +; Var( DirImage + "/text_1.png" ) +; + + + diff --git a/spiral/xml/page_spiral_payment_cash.xml b/spiral/xml/page_spiral_payment_cash.xml new file mode 100644 index 00000000..3b662f1b --- /dev/null +++ b/spiral/xml/page_spiral_payment_cash.xml @@ -0,0 +1,1830 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + PlaySoundLag + + + DEBUGVAR QRCODETMP + + DEBUGVAR IsSmoRet + Var countClick2 = 0 + ;SAVELOG SelectDrink + ;SAVELOG NameDrink + ;SAVELOG NameDrinkTH + ;SAVELOG DrinkDescription + SAVELOG PriceDrink + ;SAVELOG topping1 + ;SAVELOG topping2 + ;SAVELOG topping3 + DEBUGVAR SelectDrink + + DEBUGVAR video_menu_0 + + Var PayDetail = "" + Var FlagQROpened = 0 + Var PayInfoCFlag = 0 + Var ActionOKCase = 0 + Var VendingCampaign = Seeker.IntVendingCampaign + Var Seeker.VendingCampaign = Seeker.IntVendingCampaign + + Var PayAmount = PriceDrink + + Var LOADING_STATE = "Invisible" + ; Below original + ; On open + + + + Var cancelState = "Invisible" + + + Var alphaState = "Invisible" + Var alphaState2 = "Invisible" + Var alphaState3 = "Invisible" + + + Var CoinInFlag = 0 + ;Var CoinAmount = 0 + Var CancelFlag = 0 + Var CancelCounter = 0 + Var CoinInCounter = 0 + Var CancelNumber = 3 + + Var PayAmount = PriceDrink + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var RemainAmountStr = "" + RemainAmount + Var Timeout = 0 + Var PayOK = 0 + Var ChangeOK = 0 + Var CoinInOK = 0 + + Var RemainAmountKeep = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + + Var VendingREFID = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + +; Var ServiceCredit = SelectDrink + Var ServiceAmount2 = PayAmount + Var Seeker.ServiceAmount2 = PayAmount + Var ServiceCharge = 0 + Var Donate = "" + Var SuggestID = "" + Var CancleState = "Enable" + + Var Seeker.VendingDiscount = DiscountDrink + + + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRErrorFlag = 0 + + + SAVELOG SelectDrink + + SAVELOG QRChannel + SAVELOG QRCODE99 + DEBUGVAR QRCODE99 + + SAVELOG VendingCampaign + SAVELOG Seeker.VendingCode + SAVELOG Seeker.CodeChannel + + + If Seeker.VendingCode = "C00" Then + Var Seeker.CodeChannel = 0 + EndIf + + DEBUGVAR QRCODE99KBANK + + If RoadShow = "true" Then + Var PayState1 = "Enable" + Var PayState2 = "Invisible" + Var PayState3 = "Invisible" + Var PayState4 = "Invisible" + Var PayState5 = "Invisible" + Var showRemaining = "Free" + + Else + Var PayState1 = "Enable" + If Seeker.IntVendingCampaign = 0 Then + Var PayState2 = "Enable" + Var PayState4 = "Enable" + Var PayState5 = "Enable" + Else + SAVELOG "Cash only IntVendingCampaign" + Var PayState2 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + EndIf + Var PayState3 = "Enable" + + + DEBUGVAR CoinAmount + If CoinAmount > 0 Then + SAVELOG "Cash only CoinAmount" + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var CoinInFlag = 1 + EndIf + + If Seeker.IntVendingCredit > 0 Then + SAVELOG "Cash only IntVendingCredit" + Var PayState2 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + EndIf + + + Var showRemaining = charOfBaht + RemainAmountStr + + If show_eng = "true" Then + Var showRemaining = charOfBaht + RemainAmountStr + Else + Var showRemaining = RemainAmountStr + " บาท" + EndIf + + EndIf + + + + + 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 + + If RoadShow = "true" Then + If show_eng = "true" Then + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash_2.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash_2.png" + Else + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash_2.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png" + EndIf + EndIf + + If GetFreeFromError = 1 Then + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit + + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + EndIf + + ;Var RemainAmount = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + If RoadShow = "true" Then + Var showRemaining = "Free" + EndIf + + EndIf + + If show_eng = "true" Then + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png" + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png" + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + + Var EnoughChange = "yes" + + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + If SELLONLINE = 0 Then + SAVELOG "Cash only NetworkStatus down" + + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var PayState6 = "Disable" + + Var PayOfflineMode = 1 + + Var ShowNetworkProblem = "Enable" + Var ShowButtonClick2 = "Invisible" + Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + + Else + Var PayOfflineMode = 0 + + Var ShowNetworkProblem = "Invisible" + Var ShowNetworkProblemText = "" + EndIf + + If NOCashFlag = 1 Then + Var PayState1 = "Disable" + EndIf + + + + + + ;If NetworkStatus = "DOWN" Then + ; SAVELOG "Cash only NetworkStatus down" + ; + ; Var PayState2 = "Disable" + ; Var PayState3 = "Disable" + ; Var PayState4 = "Disable" + ; Var PayState5 = "Disable" +; + ; Var PayOfflineMode = 1 + ;Else + ; Var PayOfflineMode = 0 + ;EndIf + + ;If NetworkStatus = "ACTIVATE" Then + ; Var ShowNetworkProblem = "Invisible" + ; Var ShowNetworkProblemText = "" + ; + ;Else + ; Var ShowNetworkProblem = "Enable" + ; Var ShowButtonClick2 = "Invisible" + ; Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + ;EndIf + + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" + Var pay_with_chanel_text = DirImage + "/text_1.png" + + + If DisableUsingCode = "true" Then + SAVELOG "Diable code because using topping." + Var PayState2 = "Disable" + Var pay_with_code_image = DirImage + "/bn_pay_with_codeSmall_error.png" + Else + + If Seeker.IntVendingCredit > 0 Then + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" + + Var pay_with_chanel_text = DirImage + "/text_2.png" + + Else + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + EndIf + EndIf + + Machine DoorClose + + + If ShoppyPayEnable = "true" Then + Else + Var PayState5 = "Disable" + EndIf + + + If web_readyOK = "true" Then + + Var web_readyOK = "false" + + If web_payment = "CASH" Then + Var alphaState2 = "Enable" + EndIf + + If web_payment = "QR" Then + + Var QR_POPUP = "/img_popup1.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "KBA:2/" + + + + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + EndIf + + If Seeker.IntVendingCredit > 0 Then + Var ECommerceQR = ECommerceQR + "CRD" + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit + EndIf + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 1 + EndIf + + If web_payment = "SHOPEE" Then + + Var QR_POPUP = "/img_popup2.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "AIR:2/" + + + + ;If Seeker.IntVendingCampaign > 0 Then + ; Var ECommerceQR = ECommerceQR + Seeker.VendingCode + ; Var ECommerceQR = ECommerceQR + ":" + ; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + ; Var ECommerceQR = ECommerceQR + ":" + ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + ;EndIf + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 2 + EndIf + + EndIf + + __CMD "prepar-cup-from-order" 0 "-" "-" + + If ReqPayInfoFromCashOther = 1 Then + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + + VendingQR ON + + Var ReqPayInfoFromCashOther = 0 + EndIf + + + + + + Var VendingQRTypeResult = "" + + DEBUGVAR ECommerceQR + SPLIT ECommerceQR "/" 6 VendingQRTypeResult + + DEBUGVAR ActionOKCase + + If ActionOKCase = 0 Then + DEBUGVAR VendingREFID + If VendingREFID = "" Then + SAVELOG "menu_page4-QR.xml > ActOK_REFID" + Refresh + Else + DEBUGVAR VendingREFID + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + SAVELOG "menu_page4-QR.xml > ActOK_make" + ;Var VendingQRCode = "ERROR" + ;Coin STANDBY + VendingQR OFF + CoinVending OFF + + If Seeker = "curr" Then + ; MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.PayWithQR = 1 + Var Seeker.VendingTSID = VendingTSID + + + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var BrewingTextThai = "เตรียมแก้ว" + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou_qr.xml" + + EndIf + + If ReqPayInfoFlag = 1 Then + If VendingQRTypeResult = "KBA:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99KBANK = "" + Var QRCODE99KBANK = QRCODE99KBANK + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99KBANK + Var QRCODE99KBANK = QRCODE99KBANK + Ext21 + Var QRCODE99KBANK = QRCODE99KBANK + Ext31 + Var QRCODETMP = QRCODE99KBANK + Var ReqPayInfoFlag = 0 + SAVELOG QRCODE99KBANK + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99KBANK + Var LOADING_STATE = "Invisible" + EndIf + + + EndIf + + If ReqPayInfoFlag = 2 Then + If VendingQRTypeResult = "AIR:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1 + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext2 + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext31 + Var ReqPayInfoFlag = 0 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + If ReqPayInfoFlag = 3 Then + If VendingQRTypeResult = "TWN:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1 + DEBUGVAR Ext2 + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext2 + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext31 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 3 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + If ReqPayInfoFlag = 4 Then + If VendingQRTypeResult = "DOL:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1 + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext2 + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext31 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 4 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + Else + Var PayInfoCFlag = 1 + EndIf + + + + + + If ActionOKCase = 0 Then + If ReqPayInfoFlag = 1 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 2 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 3 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 4 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + Else + Var PayInfoCFlag = 1 + EndIf + + Refresh + + + + + 1000 + + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + EndIf + + + + + Var Timeout = Timeout + 1 + + + If Timeout >= 120 Then + Var alphaState = "Invisible" + Var PayState3 = "Disable" + Var PayState5 = "Disable" + + Var LOADING_STATE = "Invisible" + Var QRErrorState = "Invisible" + + EndIf + + + If Timeout > 210 Then + If ActionOKCase = 1 Then + Var PayInfoCFlag = 1 + EndIf + EndIf + + If PayInfoCFlag = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + + + If TestLoopMakeDrink = 1 Then + ; MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + + If CoinInOK = 1 Then + Var CoinInCounter = CoinInCounter + 1 + If CoinInCounter = 1 Then + + ;Var ChangeOK = 1 + Var Timeout = 180 + Var PayOK = 1 + + EndIf + EndIf + + Var stringLog = "Timeout " + Timeout + Var stringLog = stringLog + " PayOK" + Var stringLog = stringLog + PayOK + + + If Timeout > 180 Then + If PayOK = 1 Then + + + Open "ROOT/taobin_project/spiral/xml/page_spiral_check_cash.xml" + + Else + If CancelFlag = 0 Then + SAVELOG "Timeout > 180 s." + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + + Var CancelCounter = 0 + If CoinAmount = 0 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + EndIf + + + + If Seeker.IntVendingCampaign = 0 Then + VendingQR OFF + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + EndIf + + EndIf + EndIf + EndIf + + + If CancelFlag = 1 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + EndIf + + Var CancelCounter = CancelCounter + 1 + If CancelCounter = CancelNumber Then + ;Change CoinAmount + If CoinAmount > 0 Then + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 1 + Else + Change CoinAmount + EndIf + + Else + If ActionOKCase = 0 Then + Var ActionOKCase = 1 + Var PayInfoCFlag = 1 + EndIf + EndIf + + VendingQR OFF + EndIf + + If CancelCounter >= 43 Then + Var ChangeOK = 1 + EndIf + + ; This copy in file menu_catalog.xml + + If ChangeOK = 1 Then + If ActionOKCase = 0 Then + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "locker" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var PayCredit = 1 + + Var ActionOKCase = 1 + If Seeker = "curr" Then + If Seeker.IntVendingCampaign = 0 Then + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + Else + ;wait ack + EndIf + EndIf + EndIf + + EndIf + + + Refresh + TimerReset + + + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 1 + EndIf + + + + TimerReset + + If CoinInFlag = 0 Then + ;VendingQR OFF + Var alphaState = "Invisible" + EndIf + + + + Var CoinInFlag = 1 + + + + If ViewBill > 0 Then + + If PayOfflineMode = 1 Then + CoinVending BILLREJECT + Else + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + If ViewBill > RemainAmount Then + Var RemainAmountKeep = ViewBill - RemainAmount + Else + Var RemainAmountKeep = ViewBill + EndIf + + Var Timeout = 0 + + + Var RemainAmountStr = "" + RemainAmount + Var showRemaining = charOfBaht + RemainAmountStr + + + + + Var alphaState3 = "Enable" + EndIf + + + Else + + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + VendingQR OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + EndIf + + Var Timeout = 0 + + ;Var RemainAmount = 0 + Var showRemaining = charOfBaht + RemainAmountStr + Var alphaState2 = "Enable" + + + EndIf + + EndIf + + + + + Refresh + + + If CoinInFlag = 1 Then + If CoinInOK = 0 Then + If CancelFlag = 0 Then + SAVELOG "VDCancle > Cancle Order." + Machine CancelWepApp + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + Var CancelCounter = 0 + ;If CoinAmount = 0 Then + ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ;EndIf + + Var showRemaining = "คืนเงิน" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + If FlagQROpened = 1 Then + Var CancelNumber = 12 + EndIf + + EndIf + EndIf + ;VendingQR OFF + Refresh + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + EndIf + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + 0 + 380 + 1080 + 864 + 0xFFFFFF + + + +; +; 155 +; 991 +; 774 +; 129 +; "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_appfast.png" +; + + + + 143 + 360 + ShowHeadSpiralCash + + + +;; back +; +; + + +; +; 375 +; 623 +; 331 +; 435 +; PictureDrink +; + + + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + + + + + + + + + + +; +; 184 +; 1530 +; Var( DirImage3 + "/spiral_payment_bd_code.png") +; + + + + + + +; +; 680 +; 1530 +; Var( DirImage3 + "/bd_pay_with_codeOther.png") +; + + + + + +;; + + + + + + 0 + 555 + 1080 + 437 + SpiralProduct + + + + 0 + 1127 + 1080 + Center + 80 + KanitMediumTTF + ColorOrange + showRemaining + + + + + + 0 + 982 + 1080 + Center + 65 + KanitMediumTTF + ColorBrown2 + showname + + + + + 0 + 1058 + 1080 + Center + 40 + KanitTTF + ColorBrown + showdesc + + +; QR popup + + 0 + 380 + alphaState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 249 + 748 + alphaState + Var( DirImage + QR_POPUP ) + + + + 493 + 968 + 94 + 94 + LOADING_STATE + Var( DirImage + "/loading.gif" ) + + + + 267 + 1065 + LOADING_STATE + Var( DirImage + "/loadingText.png" ) + + + + + + +; begin cash popup + + 0 + 380 + alphaState2 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState2 + Var( DirImage2 + "/img_popup11.png" ) + + + + + + + + 0 + 1041 + 144 + Center + 1080 + KanitRegularTTF + alphaState2 + 0xDE794E + RemainAmountStr + +; end case popup + + + 0 + 380 + alphaState3 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState3 + Var( DirImage2 + "/img_popup12.png" ) + + + + + + +; +; 0 +; 1041 +; 100 +; Center +; 1080 +; KanitRegularTTF +; alphaState3 +; 0xDE794E +; RemainAmountKeep +; + + + + 270 + 1000 +550 + Center + 30 + KanitRegularTTF + alphaState + 0xFF0000 + CashTextWarning + + + + + 399 + 905 + WQR + HQR + alphaState + testservice + + + + + + 0 + 380 + cancelState + Var( DirImage + "/CancelOrder.png" ) + + + + 493 + 960 + 94 + 94 + cancelState + Var( DirImage + "/loading.gif" ) + + + + + + Open "/media/bt/xml/security_alarm.xml" + + +; +; 0 +; 1880 +; 14 +; "Left" +; 1080 +; KanitThinTTF +; 0x513C2F +; SelectDrink +; + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + +; +; 92 +; 600 +; 60 +; KanitTTF +; 0xB78F24 +; Seeker.TNumberTaobinMember +; +; +; +; 92 +; 700 +; 60 +; KanitTTF +; 0xB78F24 +; Seeker.TNumberTaobinCredit +; + + + diff --git a/spiral/xml/page_spiral_payment_cashOther.xml b/spiral/xml/page_spiral_payment_cashOther.xml new file mode 100644 index 00000000..95f69924 --- /dev/null +++ b/spiral/xml/page_spiral_payment_cashOther.xml @@ -0,0 +1,424 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var TelephoneNumber# = "" + + Var PlaySoundLag = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + ;VendingQR OFF + ;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" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 712 + Var( DirImage + "/img_popup17.png") + + + + + + + + + + + + + + + + + + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/spiral/xml/page_spiral_payment_code.xml b/spiral/xml/page_spiral_payment_code.xml new file mode 100644 index 00000000..6b263e99 --- /dev/null +++ b/spiral/xml/page_spiral_payment_code.xml @@ -0,0 +1,846 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + If web_readyOK = "true" Then + Var web_readyOK = "false" + + If web_code = "" Then + Else + Var ShowTextNumber = "Invisible" + Var Tel_Confirm_State = "Enable" + + Var GetPayInfoFlag = 1 + + VendingQR OFF + + Var TelephoneNumber = web_code + + Var Seeker.CodeNumber = TelephoneNumber + Var RemainAmount = 0 + ;PrepareDrink SelectDrink SelectSugarID + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber2 = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + + GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var Timeout = 0 + + Var TelephoneNumber = Seeker.CodeNumber + Var Seeker.CodeChannel = 1 + EndIf + + EndIf + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + ;VendingQR OFF + ;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" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + Refresh + EndIf + + TimerReset + + + + + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + CoinVending OFF + Open "ROOT/taobin_project/xml/page_show_consent2.xml" + EndIf + EndIf + EndIf + + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + DEBUGVAR ECommerce + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + EndIf + + + + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + ;SAVELOG "Seeker.CodeChannel 2 > ActOK." + ; + ;Var CreditAmount = 0 + ;Var QRCODE99 = SessionID + ;Var QRCODE99 = QRCODE99 + Ext1a + ;Var QRCODE99 = QRCODE99 + Ext21 + ;Var QRCODETMP = QRCODE99 + ;Var Seeker.CodeChannel = 1 + ; + ;If CART_COUNT >= 1 Then + ; Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + ;Else + ; Open "ROOT/taobin_project/xml/page_payment_cash.xml" + ;EndIf + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + If Seeker.CodeChannel = 2 Then + Var Seeker.CodeChannel = 1 + Var QRCODE99 = "" + Var QRCODETMP = "" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 601 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 802 + Var( DirImage + "/img3.png" ) + + + + 244 + 816 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 817 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 636 + Var( DirImage + "/text_11.png" ) + + + + 152 + 935 + "Enable" + ShowErrorText + text_show_error + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeAIS.xml b/spiral/xml/page_spiral_payment_codeAIS.xml new file mode 100644 index 00000000..084f6322 --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeAIS.xml @@ -0,0 +1,699 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_31.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupAIS.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeDtac.xml b/spiral/xml/page_spiral_payment_codeDtac.xml new file mode 100644 index 00000000..69f88241 --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeDtac.xml @@ -0,0 +1,703 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_34.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupDtac.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeGLX.xml b/spiral/xml/page_spiral_payment_codeGLX.xml new file mode 100644 index 00000000..c87ff52d --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeGLX.xml @@ -0,0 +1,703 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_37.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupGLX.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeLH.xml b/spiral/xml/page_spiral_payment_codeLH.xml new file mode 100644 index 00000000..b4409afb --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeLH.xml @@ -0,0 +1,700 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_38.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupLH.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeLotus.xml b/spiral/xml/page_spiral_payment_codeLotus.xml new file mode 100644 index 00000000..19449894 --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeLotus.xml @@ -0,0 +1,703 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_32.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupLotus.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeOther.xml b/spiral/xml/page_spiral_payment_codeOther.xml new file mode 100644 index 00000000..e05b578e --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeOther.xml @@ -0,0 +1,279 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + ;VendingQR OFF + ;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" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 567 + Var( DirImage + "/img_popup16.png") + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/spiral/xml/page_spiral_payment_codeSCG.xml b/spiral/xml/page_spiral_payment_codeSCG.xml new file mode 100644 index 00000000..92aa4b19 --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeSCG.xml @@ -0,0 +1,702 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_36.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupSCG.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeThe1.xml b/spiral/xml/page_spiral_payment_codeThe1.xml new file mode 100644 index 00000000..9d75df92 --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeThe1.xml @@ -0,0 +1,703 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_33.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupThe1.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_codeTrue.xml b/spiral/xml/page_spiral_payment_codeTrue.xml new file mode 100644 index 00000000..1c014fb6 --- /dev/null +++ b/spiral/xml/page_spiral_payment_codeTrue.xml @@ -0,0 +1,702 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 6 Seeker.VendingCode + SPLIT ECommerce "/" 8 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 9 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Var SpiralCodeOk = 1 + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_35.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupTrue.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_credit.xml b/spiral/xml/page_spiral_payment_credit.xml new file mode 100644 index 00000000..b9b0f334 --- /dev/null +++ b/spiral/xml/page_spiral_payment_credit.xml @@ -0,0 +1,700 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + "Partial" + + ; On open + + VendingQR OFF + + Var Timeout = 0 + + Var TelephoneNumber = "" + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + + Var GetCreditFlag = 0 + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var number7 = "" + Var number8 = "" + Var number9 = "" + Var number10 = "" + + Var Ext1a = "" + + Var GetAccFlag = 0 + + Var AcceptAuto = "false" + + If web_readyOK = "true" Then + Var web_readyOK = "false" + Var AcceptAuto = "true" + Var ShowTextNumber = "Invisible" + + + + Var PinNumber = "" + Var TelephoneNumber = web_telnum + + Var DataTmp = TelephoneNumber + "/" + Var DataTmp = DataTmp + PinNumber + + GETACCEXT DataTmp 19 + Var GetAccFlag = 1 + + EndIf + + + + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + 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" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + EndIf + + + TimerReset + + + + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + ;Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_credit2.xml" + If GetAccFlag = 1 Then + If Ext1a = "ok" Then + Var PinNumberUser = Ext1c + Var CoffeeCredit = Ext1b + INT CoffeeCredit + + ;Var CoffeeCredit = 5 + + + DEBUGVAR PinNumberUser + + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_credit2.xml" + Else + Var ShowErrorText = "Enable" + EndIf + EndIf + + Refresh + + + + If GetAccFlag = 1 Then + Var ShowErrorText = "Enable" + EndIf + Refresh + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 601 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 802 + Var( DirImage + "/img3.png" ) + + + + 244 + 817 + ShowTextNumber + "Enable" + Var( DirImage + "/text14.png" ) + + + + 248 + 836 + ShowTextNumber + "Enable" + Var( DirImage + "/Group.png" ) + + + + + 0 + 817 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber + Telnum-mask-1 + + + + + + + 188 + 626 + Var( DirImage + "/text_13.png" ) + + + + 444 + 945 + ShowErrorText + "Enable" + Var( DirImage + "/text_show_notfound.png") + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_credit2.xml b/spiral/xml/page_spiral_payment_credit2.xml new file mode 100644 index 00000000..8561cddf --- /dev/null +++ b/spiral/xml/page_spiral_payment_credit2.xml @@ -0,0 +1,933 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + "Partial" + + ; On open + + Var Timeout = 0 + Var TimeoutSMS = 0 + Var StateBGetSMS = "Enable" + + + Var ShowSentSmsText = "Invisible" + + Var ShowTextNumber1 = "Invisible" + Var ShowTextNumber2 = "Invisible" + Var ShowTextNumber3 = "Invisible" + Var ShowTextNumber4 = "Invisible" + + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + + Var PinNumber = "" + + Var ReqFlag = 0 + + Var Xtext = 246 + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Var Xtext = 246 + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var Ext1a = "" + + Var ReqAdddata22 = 0 + Var timeout_Adddata22 = 0 + GenHashWithTimeStamp PointCrm + + If AcceptAuto = "true" Then + + Var AcceptAuto = "false" + + Var Tel_Confirm_State = "Enable" + + Var ShowTextNumber1 = "Enable" + Var ShowTextNumber2= "Enable" + Var ShowTextNumber3= "Enable" + Var ShowTextNumber4= "Enable" + + Var PinNumber = web_pin + Var TelephoneNumber = web_telnum + + If PinNumberUser = PinNumber Then + + Var SumCreditAmount = CoffeeCredit + + If SumCreditAmount >= PayAmount Then + + If ReqAdddata22 = 0 Then + Var BmiYear = PayAmount + Var GetScore = "useCredit" + AddData 22 TelephoneNumber BmiYear PointCrm GetScore + Var ReqAdddata22 = 1 + EndIf + + + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_credit3.xml" + EndIf + + Else + + Var ShowErrorText = "Enable" + Var PinNumber = "" + Var ShowTextNumber1 = "Invisible" + Var ShowTextNumber2 = "Invisible" + Var ShowTextNumber3 = "Invisible" + Var ShowTextNumber4 = "Invisible" + + EndIf + + EndIf + + + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + 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" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + EndIf + + If StateBGetSMS = "Disable" Then + + Var TimeoutSMS = TimeoutSMS + 1 + If TimeoutSMS > 30 Then + + Var StateBGetSMS = "Enable" + Var TimeoutSMS = 0 + + Refresh + + EndIf + + EndIf + + TimerReset + + + + + + + + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If ReqFlag = 0 Then + + If ReqAdddata22 = 1 Then + Var Seeker.CreditReferenceTmp = "" + PayAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + + CoinVending OFF + + + Var Seeker.TNumberTaobinCredit = TelephoneNumber + Var Seeker.CoffeePinNumber = PinNumber + + Var Seeker.StoreCreditFlag = 1 + + Var SumCreditAmount = SumCreditAmount - PayAmount + + Var VendingCreditRemain = "" + SumCreditAmount + + If CART_COUNT >= 1 Then + Var ChangeOK = 3 + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + Else + Var CART_INDEX = 0 + Var ChangeOK = 3 + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + + Var ReqAdddata22 = 0 + + EndIf + + + + + ;If Ext1a = "ok" Then + + ; If Ext1c = "" Then + ; + ; Open "ROOT/taobin_project/xml/page_payment_credit3.xml" + ; Else + + ; EndIf + ;Else + ; Var ShowErrorText = "Enable" + ; Var PinNumber = "" + ; Var ShowTextNumber1 = "Invisible" + ; Var ShowTextNumber2 = "Invisible" + ; Var ShowTextNumber3 = "Invisible" + ; Var ShowTextNumber4 = "Invisible" + ;EndIf + Else + + EndIf + + Refresh + + + + Var ShowErrorText = "Enable" + Refresh + + If ReqAdddata22 = 1 Then + + Var ReqAdddata22 = 0 + + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 601 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 242 + 830 + Var( DirImage + "/img4.png" ) + + + + 289 + 870 + ShowTextNumber1 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 446 + 870 + ShowTextNumber2 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 603 + 870 + ShowTextNumber3 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 758 + 870 + ShowTextNumber4 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + + + + + + + + + 188 + 699 + Var( DirImage + "/text_16.png" ) + + + + 444 + 945 + "Enable" + ShowErrorText + Var( DirImage + "/text_show_notfound.png") + + + + Xtext + 945 + "Enable" + ShowSentSmsText + Var( DirImage + "/text_show_sentSMS.png") + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_credit3.xml b/spiral/xml/page_spiral_payment_credit3.xml new file mode 100644 index 00000000..6227c111 --- /dev/null +++ b/spiral/xml/page_spiral_payment_credit3.xml @@ -0,0 +1,381 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + + + ; On open + + Var Timeout = 0 + + Var Tel_Confirm_State = "Disable" + Var ShowNotEnoughText = "Invisible" + + ;Var CoffeeCredit = Ext1b + ;INT CoffeeCredit + + Var SumCreditAmount = CoffeeCredit + ;Var SumCreditAmount = 5 + + Var NotEnoughFlag = 0 + + Var timeCountUp = 0 + + If SumCreditAmount >= PayAmount Then + Var Tel_Confirm_State = "Enable" + + + + + Else + Var Tel_Confirm_State = "Enable" + Var ShowNotEnoughText = "Enable" + Var NotEnoughFlag = 1 + + Var AcceptAuto = "false" + + EndIf + + Var ShowLoadingText = "Invisible" + Var ShowErrorText = "Invisible" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var PrepareFlag = 0 + Var PrepareTime = 0 + + Var ReqAdddata22 = 0 + Var timeout_Adddata22 = 0 + GenHashWithTimeStamp PointCrm + + ;Var Tel_Confirm_State = "Invisible" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + If ReqAdddata22 = 0 Then + Var Timeout = Timeout + 1 + Else + Var timeout_Adddata22 = timeout_Adddata22 + 1 + + If timeout_Adddata22 > 30 Then + + Var Tel_Confirm_State = "Enable" + Var ShowLoadingText = "Invisible" + Var ReqAdddata22 = 0 + Var timeout_Adddata22 = 0 + + Var ShowErrorText = "Enable" + + EndIf + + EndIf + + + If AcceptAuto = "true" Then + If Timeout > 3 Then + + Var AcceptAuto = "false" + + + Var BmiYear = PayAmount + Var GetScore = "useCredit" + + AddData 22 TelephoneNumber BmiYear PointCrm GetScore + Var ReqAdddata22 = 1 + + EndIf + EndIf + + + + If Timeout > 60 Then + 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" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + EndIf + + + + Refresh + TimerReset + + + + + + + + If ReqAdddata22 = 1 Then + + If NotEnoughFlag = 0 Then + + Var Seeker.CreditReferenceTmp = "" + PayAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + + CoinVending OFF + + + Var Seeker.TNumberTaobinCredit = TelephoneNumber + Var Seeker.CoffeePinNumber = PinNumber + + Var Seeker.StoreCreditFlag = 1 + + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + Else + + + Var PayState1 = "PressForever" + Var PayState2 = "Enable" + Var QRChannel = 0 + Var Seeker.CodeChannel = 0 + + Var Seeker.TNumberTaobinCredit = TelephoneNumber + Var Seeker.CoffeePinNumber = PinNumber + + Var Seeker.IntVendingCredit = SumCreditAmount + + Var Seeker.CreditReferenceTmp = "" + SumCreditAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + + + Var Seeker.StoreCreditFlag = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Var SpiralKeepCredit = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + EndIf + + Var ReqAdddata22 = 0 + + EndIf + + + + If ReqAdddata22 = 1 Then + Var Tel_Confirm_State = "Enable" + Var ShowLoadingText = "Invisible" + Var ReqAdddata22 = 0 + Var timeout_Adddata22 = 0 + Var ShowErrorText = "Enable" + EndIf + + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 182 + 748 + Var( DirImage + "/img_popup11.png" ) + + + + 0 + 1041 + 144 + Center + 1080 + KanitRegularTTF + + 0xDE794E + SumCreditAmount + + + + + + + + + + + + + + 230 + 920 + + ShowNotEnoughText + Var( DirImage + "/text_show_notEnough.png") + + + + + 260 + 920 + + ShowLoadingText + Var( DirImage + "/loadingText.png") + + + + 260 + 920 + + ShowErrorText + Var( DirImage + "/loadingTextError.png") + + + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/spiral/xml/page_spiral_payment_storeCredit.xml b/spiral/xml/page_spiral_payment_storeCredit.xml new file mode 100644 index 00000000..6a2caa11 --- /dev/null +++ b/spiral/xml/page_spiral_payment_storeCredit.xml @@ -0,0 +1,742 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + "Partial" + + ; On open + + Var Timeout = 0 + + Var TelephoneNumber = "" + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + + Var GetCreditFlag = 0 + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var FlagWaitUpdateCoinAmount = 0 + + Var number7 = "" + Var number8 = "" + Var number9 = "" + Var number10 = "" + + Var Ext1a = "" + Var GetAccFlag = 0 + + + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + If Seeker.pageStoreCredit0 = 1 Then + Change StoreCreditAmount + Var ChangeFlag2 = 1 + If Seeker.FreeVendingCampaign = 1 Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + Else + CoinVending BILLREJECT + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + + EndIf + EndIf + + If FlagWaitUpdateCoinAmount = 1 Then + If Timeout > 2 Then + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf + EndIf + + EndIf + + + TimerReset + + + + + + + + + If GetAccFlag = 1 Then + If Ext1a = "ok" Then + Var CoffeeCredit = Ext1b + INT CoffeeCredit + Var Seeker.CoffeePinNumber = Ext1c + + Var Seeker.TNumberTaobinCredit = TelephoneNumber + + If Seeker.pageStoreCredit0 = 1 Then + + Var Seeker.StoreCreditFlag = 1 + + + + Var CoffeeCreditKeep = StoreCreditAmount + CoffeeCredit + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit2-2.xml" + Else + + Var Seeker.StoreCreditFlag = 1 + + + If ViewBill < RemainAmount Then + + CoinVending BILLSTACKALL + + Var FlagWaitUpdateCoinAmount = 1 + Var Timeout = 0 + Else + + CoinVending BILLSTACKALL + Var SpiralKeepCredit = 1 + Var CoffeeCreditKeep = RemainAmountKeep + CoffeeCredit + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit3.xml" + + EndIf + + + + EndIf + + Else + If Ext1a = "new customer" Then + Var CoffeeCreditKeep = 0 + Var Seeker.TNumberTaobinCredit = TelephoneNumber + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit2.xml" + Else + If Ext1a = "invalid password" Then + Var ShowErrorText = "Enable" + EndIf + + EndIf + + EndIf + EndIf + + Refresh + + + + + + If GetAccFlag = 1 Then + Var ShowErrorText = "Enable" + EndIf + Refresh + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 601 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 802 + Var( DirImage + "/img3.png" ) + + + + 244 + 817 + ShowTextNumber + "Enable" + Var( DirImage + "/text14.png" ) + + + + 248 + 836 + ShowTextNumber + "Enable" + Var( DirImage + "/Group.png" ) + + + + + 0 + 817 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber + Telnum-mask-1 + + + + + + + 188 + 626 + Var( DirImage + "/text_17.png" ) + + + + 444 + 942 + ShowErrorText + "Enable" + "ROOT/taobin_project/image/collectiing/text_show_notfound.png" + + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + diff --git a/spiral/xml/page_spiral_payment_storeCredit0.xml b/spiral/xml/page_spiral_payment_storeCredit0.xml new file mode 100644 index 00000000..b745c6fd --- /dev/null +++ b/spiral/xml/page_spiral_payment_storeCredit0.xml @@ -0,0 +1,196 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + + + ; On open + + Var Timeout = 0 + + Var TelephoneNumber = "" + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + + Var GetCreditFlag = 0 + Var clickedChangeFlag = 0 + + Var Seeker.pageStoreCredit0 = 1 + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" + + + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" + + EndIf + + If SpiralKeepCredit = 1 Then + Var SpiralKeepCredit = 1 + If Seeker.TNumberTaobinCredit = "" Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit.xml" + Else + Var Seeker.StoreCreditFlag = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Change StoreCreditAmount + Var ChangeFlag2 = 1 + + If Seeker.FreeVendingCampaign = 1 Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + Refresh + TimerReset + + + + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + Var( DirImage2 + "/img_popup14.png" ) + + + +; +; 0 +; 1041 +; 100 +; Center +; 1080 +; KanitRegularTTF +; 0xDE794E +; StoreCreditAmount +; + + + + + + + + + + + + + + + + + + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + diff --git a/spiral/xml/page_spiral_payment_storeCredit2-2.xml b/spiral/xml/page_spiral_payment_storeCredit2-2.xml new file mode 100644 index 00000000..22f1d07c --- /dev/null +++ b/spiral/xml/page_spiral_payment_storeCredit2-2.xml @@ -0,0 +1,836 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + "Partial" + + ; On open + + Var Timeout = 0 + + Var TimeoutSMS = 0 + Var StateBGetSMS = "Enable" + + + Var ShowSentSmsText = "Invisible" + + + + Var ShowTextNumber1 = "Invisible" + Var ShowTextNumber2 = "Invisible" + Var ShowTextNumber3 = "Invisible" + Var ShowTextNumber4 = "Invisible" + + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + + Var PinNumber = "" + + Var Xtext = 246 + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Var Xtext = 246 + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var FlagWaitUpdateCoinAmount = 0 + + Var FlagOKButton = 0 + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit.xml" + EndIf + + If FlagWaitUpdateCoinAmount = 1 Then + If Timeout > 2 Then + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + EndIf + + EndIf + + TimerReset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 601 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 242 + 830 + Var( DirImage + "/img4.png" ) + + + + 289 + 870 + ShowTextNumber1 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 446 + 870 + ShowTextNumber2 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 603 + 870 + ShowTextNumber3 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 758 + 870 + ShowTextNumber4 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + + + + + + + + + 188 + 706 + Var( DirImage + "/text_29.png" ) + + + + 525 + 760 + 1080 + 30 + RobotoBlack + 0x513C2F + "Enable" + Seeker.TNumberTaobinCredit + Telnum + Telnum-mask-1 + + + + 444 + 945 + "Enable" + ShowErrorText + Var( DirImage + "/text_show_notfound.png" ) + + + + Xtext + 945 + "Enable" + ShowSentSmsText + Var( DirImage + "/text_show_sentSMS.png") + + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + diff --git a/spiral/xml/page_spiral_payment_storeCredit2.xml b/spiral/xml/page_spiral_payment_storeCredit2.xml new file mode 100644 index 00000000..065ef74c --- /dev/null +++ b/spiral/xml/page_spiral_payment_storeCredit2.xml @@ -0,0 +1,800 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + "Partial" + + ; On open + + Var Timeout = 0 + + + + Var ShowTextNumber1 = "Invisible" + Var ShowTextNumber2 = "Invisible" + Var ShowTextNumber3 = "Invisible" + Var ShowTextNumber4 = "Invisible" + + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + + Var PinNumber = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + Var FlagWaitUpdateCoinAmount = 0 + + Var FlagOKButton = 0 + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + Open "ROOT/taobin_project/xml/page_spiral_payment_storeCredit.xml" + EndIf + + If FlagWaitUpdateCoinAmount = 1 Then + If Timeout > 2 Then + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + EndIf + + EndIf + + + TimerReset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 601 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 242 + 830 + Var( DirImage + "/img4.png" ) + + + + 289 + 870 + ShowTextNumber1 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 446 + 870 + ShowTextNumber2 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 603 + 870 + ShowTextNumber3 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + 758 + 870 + ShowTextNumber4 + "Enable" + Var( DirImage + "/text_X.png" ) + + + + + + + + + + + 188 + 706 + Var( DirImage + "/text_28.png" ) + + + + 525 + 760 + 1080 + 30 + RobotoBlack + 0x513C2F + "Enable" + Seeker.TNumberTaobinCredit + Telnum + Telnum-mask-1 + + + + 330 + 942 + "Enable" + ShowErrorText + Var( DirImage + "text_show_notfound.png" ) + + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + If FlagOKButton = 0 Then + + Var FlagOKButton = 1 + + Var Seeker.StoreCreditFlag = 1 + Var Seeker.CoffeePinNumber = PinNumber + + + If Seeker.pageStoreCredit0 = 1 Then + + + Var CoffeeCreditKeep = StoreCreditAmount + 0 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit3.xml" + + Else + + + + + + If ViewBill < RemainAmount Then + CoinVending BILLSTACKALL + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var FlagWaitUpdateCoinAmount = 1 + Var Timeout = 0 + Else + + CoinVending BILLSTACKALL + Var SpiralKeepCredit = 1 + Var CoffeeCreditKeep = RemainAmountKeep + 0 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit3.xml" + + EndIf + + EndIf + + EndIf + + + + + + Refresh + + + + + + diff --git a/spiral/xml/page_spiral_payment_storeCredit3.xml b/spiral/xml/page_spiral_payment_storeCredit3.xml new file mode 100644 index 00000000..0ab3a028 --- /dev/null +++ b/spiral/xml/page_spiral_payment_storeCredit3.xml @@ -0,0 +1,183 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + + SoundVolume + "Partial" + + ; On open + + Var Timeout = 0 + + + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + If Seeker.pageStoreCredit0 = 1 Then + + + Else + VendingQR OFF + CoinVending OFF + EndIf + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + Var Timeout = Timeout + 1 + If Timeout > 5 Then + + If Seeker.pageStoreCredit0 = 1 Then + + + + If Seeker.FreeVendingCampaign = 1 Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + + Else + + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + ; MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf + + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + + + EndIf + + TimerReset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 157 + 786 + Var( DirImage + "/img_popup15.png" ) + + + + + 460 + 980 + 1080 + 35 + RobotoBlack + 0x513C2F + "Enable" + Seeker.TNumberTaobinCredit + Telnum-mask-1 + + + + + 0 + 1215 + 144 + Center + 1080 + KanitRegularTTF + 0xDE794E + CoffeeCreditKeep + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + diff --git a/spiral/xml/page_spiral_select.xml b/spiral/xml/page_spiral_select.xml new file mode 100644 index 00000000..dacf39b5 --- /dev/null +++ b/spiral/xml/page_spiral_select.xml @@ -0,0 +1,523 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + Var y_topping_bg = 912 + + WEB "DISABLE" +; Var DrinkDescriptionTH = $01-00-00-0001.description + + + + + DEBUGVAR video_menu_0 + + Var DisableUsingCode = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowCollagenOnly = "Invisible" + + ; On open + Var lidAndStrawOldPageIgnore = "true" + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "Invisible" + Var SugarState4 = "Invisible" + Var SugarState5 = "Invisible" + + Var AddShotEnable = "Invisible" + + Var BGSugar = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Invisible" + Var ShotCoffeePremium = "Invisible" + + + Var StarwState = "Enable" + + ; On open + Var LidState = Lid1Status + + ;SAVELOG PreviseXMLFileName2 + + + Var topping1 = "1" + Var topping2 = "31" + Var topping3 = "31" + + + Var BugFlag = 0 + + If show_eng = "true" Then + + Var SpiralSelectdetail = SpiralSelectdetail1E + Var SpiralSelectheader = SpiralSelectheader2E + Var SpiralSelectdetail = SpiralSelectdetail2E + + Var DirImage = "ROOT/taobin_project/image/topping_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png" + + Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" + + Else + + Var SpiralSelectdetail = SpiralSelectdetail1 + Var SpiralSelectheader = SpiralSelectheader2 + Var SpiralSelectdetail = SpiralSelectdetail2 + + Var DirImage = "ROOT/taobin_project/image/topping" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png + + EndIf + + ; Move to catalog. + ;Machine DoorClose + + + + + Var backGroundAddExtra = DirImage + "/img_ontop_shot.png" + Var backGroundAddExtra2 = DirImage + "/img_ontop_shot2.png" + + CRLFToSpace showname + CRLFToSpace showdesc + + ;- Begin + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + SAVELOG PriceDrinkTmp + ;- End + + If RoadShow = "true" Then + Var PriceDrinkTmp = "Free" + EndIf + + If ShowPrice = "Invisible" Then + Var PriceDrinkTmpShow = "Free" + EndIf + + STRCONTAIN "ID=1058" MaterialAvailable sugarKeto + DEBUGVAR sugarKeto + If sugarKeto = "true" Then + Open "ROOT/taobin_project/xml/page_topping_select2.xml" + EndIf + + + Var ToppingGotoPayment = "true" + + Var ButtonNext = "false" + + + 2000 + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout > 20 Then + Var Timeout = 0 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + TimerReset + + + + + + + + +;; back +; + + + ;Var BugFlag = 1 + If CartUpdate = "true" Then + Var CartUpdate = "-" + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + If ButtonNext = "true" Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + EndIf + + + + + + + + + 0 + 380 + 1080 + 864 + 0xFFFFFF + + + + 0 + 555 + 1080 + 437 + SpiralProduct + + + + 143 + 360 + ShowHeadSpiralSelect + + + + + + 0 + 982 + 1080 + Center + 65 + KanitMediumTTF + ColorBrown2 + showname + + + + + 0 + 1058 + 1080 + Center + 40 + KanitTTF + ColorBrown + showdesc + + + + + + 85 + 1232 + 956 + 405 + Spiraldetail + + + + 0 + 1127 + 1080 + Center + 80 + KanitMediumTTF + ColorOrange + PriceDrinkTmpShow + + + +; back + + + +;; add backet +; + +; next + + + + 50 + 1302 + 32 + KanitTTF + ColorBrown2 + SpiralSelectdetail + + + + 50 + 1490 + 27 + KanitBoldTTF + ColorBrown2 + SpiralSelectheader + + + + 50 + 1535 + 27 + KanitTTF + ColorBrown2 + SpiralSelectdetail + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/spiral/xml/page_spiral_thankyou.xml b/spiral/xml/page_spiral_thankyou.xml new file mode 100644 index 00000000..c41f4d2e --- /dev/null +++ b/spiral/xml/page_spiral_thankyou.xml @@ -0,0 +1,757 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var PayFlagCoinQR = 0 + Var SetFlagCoinQR = 0 + Var SetFlagCoinQRTimer = 999999 + Var waitAckPay = 0 + Var Timeout = 0 + Var ServiceType = "locker" + Var ServiceCharge = 0 + If TelephoneNumber = "" Then + Var TelephoneNumber = "0899999999" + EndIf + Var Donate = "" + Var SuggestID = "CRM00A00P000" + Var SessionID3 = "locker4/" + Var SessionID4 = "" + Var VendingCampaign = IntVendingCampaign + + Var PayType = "" + + Var PayOk = 0 + Var ChangeFlag = 0 + + Var CheckAckCode = 0 + Var CheckAckCodeTimer = 9999999 + Var ChangeTimeout = 9999999 + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var CreditReference = "" + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + + ;SendSpiralResult = spiral-success , spiral-failed , spiral-valid , spiral-invalid + SPIRAL_SELL ServiceCredit SpiralRef + + + 1000 + + DEBUGVAR LastMakeSpiralResult + Var Timeout = Timeout + 1 + Var ChangeTimeout = ChangeTimeout - 1 + Var CheckAckCodeTimer = CheckAckCodeTimer - 1 + Var SetFlagCoinQRTimer = SetFlagCoinQRTimer - 1 + + If Timeout = 3 Then + If Seeker.PayWithQR = 0 Then + If Seeker.FreeVendingCampaign = 0 Then + If Seeker.IntVendingCampaign <= PayAmount Then + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + + If SumCoinAmount >= PayAmount Then + Var Canout = SumCoinAmount - PayAmount + If Canout > 0 Then + ;Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + If SpiralKeepCredit = 0 Then + Change StoreCreditAmount + EndIf + Var ChangeOK = 1 + Var ChangeTimeout = 120 + If SpiralKeepCredit = 1 Then + Var ChangeOK = 3 + EndIf + Else + Var ChangeOK = 2 + EndIf + EndIf + EndIf + Else + + Var Canout = CoinAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf + + EndIf + Else + Var ChangeOK = 2 + Var VendingTSIDTmp = Seeker.VendingTSID + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + If ChangeFlag2 = 1 Then + Var Canout = CoinAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + Var SetFlagCoinQR = 1 + Var SetFlagCoinQRTimer = 30 + Change StoreCreditAmount + EndIf + + ;Var TelephoneNumber = "0899999999" + ;Var PayO2 = "" + ;Var VendingDiscount = 0 + ;Var VendingCampaign = 0 + ;Var CreditReference = "" + ;Var ServiceType = "credit" + ;Var SessionID2 = SelectDrink + ;Var ServiceCredit = "locker" + ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + If Seeker.StoreCreditFlag = 1 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var CreditReference = "" + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "locker" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + EndIf + EndIf + EndIf + + If ChangeTimeout < 1 Then + If ChangeOK = 1 Then + Var ChangeOK = 2 + Var ChangeTimeout = 60 + EndIf + EndIf + If ChangeTimeout < 1 Then + If ChangeFlag2 = 1 Then + Var ChangeOK = 3 + Var ChangeFlag2 = 2 + Var ChangeTimeout = 60 + EndIf + EndIf + If SetFlagCoinQRTimer < 1 Then + If PayFlagCoinQR = 0 Then + Var SetFlagCoinQR = 2 + Var SetFlagCoinQRTimer = 99999 + EndIf + EndIf + + If SetFlagCoinQR = 2 Then + DEBUGVAR "tube2" + Var SetFlagCoinQR = 3 + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var CreditReference = "" + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "locker" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + If LastMakeSpiralResult = 1 Then + If ChangeOK = 2 Then + If PayOk = 0 Then + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + + Var SessionID3 = SessionID3 + MachineSpiralID + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + MachineSpiralSlotID + + If SpiralCodeOk = 1 Then + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf + + Var PayOk = 1 + Var PayDetail="1/S:0/" + Var PayDetail = PayDetail + SessionID4 + + If Seeker.PayWithQR = 1 Then + If waitAckPay = 0 Then + Var waitAckPay = 1 + Var SVT = "locker" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinCredit = "" Then + Else + Var ACC = Seeker.TNumberTaobinCredit + EndIf + PAYEXT SVT ACC VendingTSIDTmp DEE + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + Else + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + EndIf + EndIf + EndIf + If LastMakeSpiralResult = 1 Then + If ChangeOK = 3 Then + If PayOk = 0 Then + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + + Var SessionID3 = SessionID3 + MachineSpiralID + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + MachineSpiralSlotID + + If SpiralCodeOk = 1 Then + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf + + Var PayOk = 1 + Var PayDetail="1/S:0/" + Var PayDetail = PayDetail + SessionID4 + + If Seeker.PayWithQR = 1 Then + If waitAckPay = 0 Then + Var waitAckPay = 1 + Var SVT = "locker" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinCredit = "" Then + Else + Var ACC = Seeker.TNumberTaobinCredit + EndIf + PAYEXT SVT ACC VendingTSIDTmp DEE + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + Else + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + + EndIf + EndIf + EndIf + + If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + If CheckAckCodeTimer < 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail2.xml" + EndIf + EndIf + EndIf + + If LastMakeSpiralResult = 2 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + EndIf + + ;If LastMakeSpiralResult = 2 Then + ; If ChangeOK = 3 Then + ; If PayOk = 0 Then + ; Var PayOk = 1 + ; Var SessionID4 = MachineSpiralID + ; Var SessionID4 = SessionID4 + ":" + ; Var SessionID4 = SessionID4 + MachineSpiralSlotID + ; + ; Var SessionID3 = SessionID3 + MachineSpiralID + ; Var SessionID3 = SessionID3 + "/" + ; Var SessionID3 = SessionID3 + MachineSpiralSlotID +; + ; If SpiralCodeOk = 1 Then + ; Var SessionID3 = SessionID3 + "/" + ; Var SessionID3 = SessionID3 + Seeker.VendingCode + ; Var SessionID3 = SessionID3 + "/" + ; Var SessionID3 = SessionID3 + Seeker.CodeNumber + ; EndIf +; +; + ; ;Var PayDetail="1/F:1221/0/" + ; Var PayDetail="1/F:" + ; Var PayDetail = PayDetail + MachineSpiralErrorCode + ; Var PayDetail = PayDetail + "/" + ; Var PayDetail = PayDetail + SessionID4 +; + ; If Seeker.PayWithQR = 1 Then + ; If waitAckPay = 0 Then + ; Var waitAckPay = 1 + ; Var SVT = "locker" + ; Var ACC = "0899999999" + ; Var DEE = PayDetail +; + ; If Seeker.TNumberTaobinCredit = "" Then + ; Else + ; Var ACC = Seeker.TNumberTaobinCredit + ; EndIf + ; PAYEXT SVT ACC VendingTSIDTmp DEE + ; If SpiralCodeOk = 1 Then + ; Var CheckAckCode = 1 + ; Var CheckAckCodeTimer = 10 + ; Else + ; Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + ; EndIf + ; EndIf + ; Else + ; Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + ; If SpiralCodeOk = 1 Then + ; Var CheckAckCode = 1 + ; Var CheckAckCodeTimer = 10 + ; Else + ; Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + ; EndIf + ; EndIf + ; EndIf + ; EndIf + ;EndIf + + If Timeout > 210 Then + Var LastMakeSpiralResult = 2 + SAVELOG "Spiral Timeout 210 sec" + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + EndIf + + + + ;If LastMakeSpiralResult = 2 Then + ; If Seeker.PayWithQR = 0 Then + ; If Seeker.CodeChannel = 0 Then + ; If ChangeFlag = 0 Then + ; Var ChangeFlag = 1 + ; If Seeker.StoreCreditFlag = 1 Then + ; Var ChangeOK = 3 + ; Else + ; Change ServiceAmount2 + ; Var ChangeTimeout = 50 + ; Var ChangeFlag2 = 1 + ; EndIf + ; EndIf + ; Else + ; If CoinAmount > 0 Then + ; If ChangeFlag = 0 Then + ; Var ChangeFlag = 1 + ; Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign + ; If Seeker.StoreCreditFlag = 1 Then + ; Var ChangeOK = 2 + ; Else + ; Change ServiceAmount3 + ; Var ChangeFlag2 = 1 + ; Var ChangeTimeout = 50 + ; EndIf + ; EndIf + ; Else + ; Var ChangeOK = 2 + ; EndIf + ; EndIf + ; Else + ; Var ChangeOK = 3 + ; EndIf + ;EndIf + + Refresh + TimerReset + + + + If SetFlagCoinQR = 1 Then + If ChangeStatus = "payout-end" Then + Var SetFlagCoinQR = 2 + Var PayFlagCoinQR = 1 + DEBUGVAR "tube1" + EndIf + EndIf + If ChangeOK = 2 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 3 + EndIf + EndIf + If ChangeOK = 1 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + Var ChangeTimeout = 999 + EndIf + EndIf + + + + + + + + + + + + If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail2.xml" + EndIf + EndIf + + + +; +; 89 +; 700 +; 902 +; 902 +; "ROOT/taobin_project/spiral/image/page_spiral/thankyou.png" +; + + + + +; +; 92 +; 1121 +;150 +; 40 +; KanitTTF +; 0xB78F24 +; Timeout +; +; +; +; 92 +; 1181 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeTimeout +; +; +; +; +; 92 +; 650 +; 40 +; KanitTTF +; 0xB78F24 +; LastMakeSpiralResult +; +; +; +; +; 292 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; "SetFlagCoinQRTimer" +; +; +; +; +; 92 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; SetFlagCoinQRTimer +; +; +; +; +; 292 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; "PayOk" +; +; +; +; +; 92 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; PayOk +; +; +; +; 292 +; 1400 +; 40 KanitTTF +; 0xB78F24 +; "ChangeOK" +; +; +; +; 92 +; 1400 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeOK +; +; +; +; 292 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.StoreCreditFlag" +; +; +; +; 92 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.StoreCreditFlag +; +; +; +; 292 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag2" +; +; +; +; +; 92 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag2 +; +; +; +; +; 292 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.PayWithQR" +; +; +; +; +; 92 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.PayWithQR +; +; +; +; 292 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.CodeChannel" +; +; +; +; 92 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.CodeChannel +; +; +; +; 292 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag" +; +; +; +; 92 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag +; +; +; +; 292 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; "Canout" +; +; +; +; 92 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; Canout +; +; +; +; 292 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; "SpiralCodeOk" +; +; +; +; 92 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; SpiralCodeOk +; +; +; +; 292 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; "CheckAckCodeTimer" +; +; +; +; 92 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; CheckAckCodeTimer +; + + \ No newline at end of file diff --git a/spiral/xml/page_spiral_thankyou2.xml b/spiral/xml/page_spiral_thankyou2.xml new file mode 100644 index 00000000..b42c3314 --- /dev/null +++ b/spiral/xml/page_spiral_thankyou2.xml @@ -0,0 +1,41 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var Timeout = 0 + + 1000 + + Var Timeout = Timeout + 1 + If Timeout >= 12 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + Refresh + TimerReset + + + + + + + + diff --git a/spiral/xml/page_spiral_thankyou_qr.xml b/spiral/xml/page_spiral_thankyou_qr.xml new file mode 100644 index 00000000..2507274b --- /dev/null +++ b/spiral/xml/page_spiral_thankyou_qr.xml @@ -0,0 +1,90 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var waitAckPay = 0 + Var Timeout = 0 + Var ServiceType = "locker" + Var ServiceCharge = 0 + If TelephoneNumber = "" Then + Var TelephoneNumber = "0899999999" + EndIf + Var Donate = "" + Var SuggestID = "CRM00A00P000" + Var SessionID3 = "locker4/" + Var SessionID4 = "" + Var VendingCampaign = IntVendingCampaign + Var CreditReference = Seeker.CreditReferenceT + Var PayType = "" + + Var PayOk = 0 + Var ChangeFlag = 0 + + Var ChangeTimeout = 0 + + Var GotoStoreCredit0 = 0 + + 1000 + + Var Timeout = Timeout + 1 + If Timeout = 3 Then + + Var Canout = CoinAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf + + + + + If GotoStoreCredit0 = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit0.xml" + Else + Var ChangeOK = 3 + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou.xml" + EndIf + EndIf + + + Refresh + TimerReset + + + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/thankyou.png" + + + + + +; +; 492 +; 1121 +;150 +; 60 +; KanitTTF +; 0xB78F24 +; Timeout +; + + + diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index 5f77ccd6..98ec7e60 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -33,9 +33,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -51,6 +49,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" diff --git a/xml/menu_head.py b/xml/menu_head.py index 3c20a12f..a380f198 100644 --- a/xml/menu_head.py +++ b/xml/menu_head.py @@ -9,7 +9,7 @@ new_default_dir = 'ROOT/taobin_project/image/page_drink_n/' new_default_dir2 = 'ROOT/taobin_project/image/page_drink_picture2_n/' new_default_dir_press = 'ROOT/taobin_project/image/page_drink_press_n/' - new_default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable_n/' + new_default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable_n2/' menu_count = 0 diff --git a/xml/page_board.xml b/xml/page_board.xml index 4fc4b945..5f176473 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -975,7 +975,7 @@ Var NextPage = "-" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" TopView "show" diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index ede80b36..e69de29b 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -1,567 +0,0 @@ - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - - TopView "show" - ; On open - - Var NextPage = "-" - - - DEBUGVAR CameraStatus - - - READCARDID - - Var Seeker.thankLidFlag = 0 - Var Seeker.thankStrawFlag = 0 - - WEB "DISABLE" - - Var web_readyOK = "false" - 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" - 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" "-" - - - - - Var StrawAutoRelease1 = "false" - Var StrawAutoRelease2 = "false" - - Var SELLONLINE = 0 - If SELLSTATUS = "SELLONLINE" Then - Var SELLONLINE = 1 - EndIf - If SELLSTATUS = "SELLNOCASH" Then - Var SELLONLINE = 1 - EndIf - - - If SELLONLINE = 1 Then - Var ShowButtonClick2 = "Enable" - Else - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - EndIf - - If SELLONLINE = 1 Then - Var ShowNetworkProblem = "Invisible" - Var ShowNetworkProblemText = "" - - ;GenHashWithTimeStamp QRCODE99x - WEB "ENABLE" - - Else - Var ShowNetworkProblem = "Enable" - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" - - Var QRCODE99 = "" - WEB "DISABLE" - - EndIf - - ; 1035 is Coke. - STRCONTAIN "1035" MaterialAvailable CokeUI - - Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" - Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" - - - Var countClick = 0 - - - DEBUGVAR CART_COUNT - - - Var QRCODE99_Y = 1718 - - Var showCart = "Invisible" - If MultiPayEnable = "true" Then - - If CART_COUNT = 1 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart1.png" - Var cart_image_bp = DirImageCart + "/bp_cart1.png" - - Var QRCODE99_Y = 1580 - - EndIf - - If CART_COUNT = 2 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart2.png" - Var cart_image_bp = DirImageCart + "/bp_cart2.png" - - Var QRCODE99_Y = 1580 - - EndIf - - - - If CART_COUNT = 3 Then - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - EndIf - - EndIf - - If Seeker = "next" Then - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - EndIf - - - If XMLProfile = "taobin_notopup" Then - Var ButtontoTopupMenu = "Disable" - - EndIf - - - Var menu_name_eng_hot = "" - Var menu_desc_eng_hot = "" - Var menu_name_thai_hot = "" - Var menu_desc_thai_hot = "" - - Var menu_name_eng_cold = "" - Var menu_desc_eng_cold = "" - Var menu_name_thai_cold = "" - Var menu_desc_thai_cold = "" - - - Var menu_name_eng_blender = "" - Var menu_desc_eng_blender = "" - Var menu_name_thai_blender = "" - Var menu_desc_thai_blender = "" - - If CameraCount = 1 Then - - CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0" - EndIf - - - 1000 - - - ;SAVELOG SoundPlaying - - DEBUGVAR countDownRetrun - If countDownRetrun > 0 Then - Var countDownRetrun = countDownRetrun - 1 - EndIf - - If countDownRetrun = 0 Then - 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 - - - - - DEBUGVAR IDFullNameEng - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99 Then - 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 - - - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - -; - - - -; back - - - - - -;include=ROOT/taobin_project/inc/button_lang.inc - - - - DEBUGVAR show_lang - - If show_lang = "ENG" 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" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_en" - EndIf - - If show_lang = "THAI" Then - 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" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_th" - EndIf - - Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" - Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" - - RefreshAll - - - - - 70 - 583 - Var(DirImage + "/text1.png") - - - - -; menu row 1 - - - - -; menu row 2 - - - - - - - - - - - - - - - - - - - - - - 5 - 1880 - 24 - Center - 1080 - RobotoRegular - 0xFFFFFF - ShowNetworkProblemText - - - - -; -; 895 -; QRCODE99_Y -; 178 -; 178 -; "Enable" -; testservice -; - - - -; Cart - - - - - 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" - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - diff --git a/xml/page_catalog_2.xml b/xml/page_catalog_2.xml index f5f4ba8e..e69de29b 100644 --- a/xml/page_catalog_2.xml +++ b/xml/page_catalog_2.xml @@ -1,576 +0,0 @@ - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - - TopView "show" - ; On open - - READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow - DEBUGVAR ToppingNewShow - - Var NextPage = "-" - - Var Seeker.thankLidFlag = 0 - Var Seeker.thankStrawFlag = 0 - - WEB "DISABLE" - - Var web_readyOK = "false" - 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" - 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 - 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" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_en" - - Var text_unavailable = "UNAVAILABLE###size=16" - - 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" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_th" - - Var text_unavailable = "หมด###size=32" - EndIf - - - Var StrawAutoRelease1 = "false" - Var StrawAutoRelease2 = "false" - - - Var SELLONLINE = 0 - If SELLSTATUS = "SELLONLINE" Then - Var SELLONLINE = 1 - EndIf - If SELLSTATUS = "SELLNOCASH" Then - Var SELLONLINE = 1 - EndIf - - - - If SELLONLINE = 1 Then - Var ShowButtonClick2 = "Enable" - Else - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - EndIf - - If SELLONLINE = 1 Then - Var ShowNetworkProblem = "Invisible" - Var ShowNetworkProblemText = "" - - ;GenHashWithTimeStamp QRCODE99x - WEB "ENABLE" - - Else - Var ShowNetworkProblem = "Enable" - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" - - Var QRCODE99 = "" - WEB "DISABLE" - - EndIf - - ; 1035 is Coke. - STRCONTAIN "1035" MaterialAvailable CokeUI - - Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" - Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" - - - Var countClick = 0 - - - DEBUGVAR CART_COUNT - - - Var QRCODE99_Y = 1718 - - Var showCart = "Invisible" - If MultiPayEnable = "true" Then - - If CART_COUNT = 1 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart1.png" - Var cart_image_bp = DirImageCart + "/bp_cart1.png" - - Var QRCODE99_Y = 1580 - - EndIf - - If CART_COUNT = 2 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart2.png" - Var cart_image_bp = DirImageCart + "/bp_cart2.png" - - Var QRCODE99_Y = 1580 - - EndIf - - - - If CART_COUNT = 3 Then - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - EndIf - - EndIf - - If Seeker = "next" Then - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - EndIf - - - If XMLProfile = "taobin_notopup" Then - Var ButtontoTopupMenu = "Disable" - - EndIf - - - Var menu_name_eng_hot = "" - Var menu_desc_eng_hot = "" - Var menu_name_thai_hot = "" - Var menu_desc_thai_hot = "" - - Var menu_name_eng_cold = "" - Var menu_desc_eng_cold = "" - Var menu_name_thai_cold = "" - Var menu_desc_thai_cold = "" - - - Var menu_name_eng_blender = "" - Var menu_desc_eng_blender = "" - Var menu_name_thai_blender = "" - Var menu_desc_thai_blender = "" - - - - - If BoxID = 0 Then - RebootWithCause "BoxID was zero" - EndIf - - - 1000 - - - ;SAVELOG SoundPlaying - - If countDownRetrun > 0 Then - Var countDownRetrun = countDownRetrun - 1 - EndIf - - If countDownRetrun = 0 Then - 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 - ; Var ChangeOK = 1 - ;EndIf - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99 Then - 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 - - - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - -; - - - -; back - - - - - - - - - 70 - 583 - Var(DirImage + "/text1.png") - - - - -; menu row 1 - - - - -; menu row 2 - - - - - - - - - -;============================================================================= - - - - - -;============================================================================= - - - - - - - - - - - 5 - 1880 - 24 - Center - 1080 - RobotoRegular - 0xFFFFFF - ShowNetworkProblemText - - - - -; -; 895 -; QRCODE99_Y -; 178 -; 178 -; "Enable" -; testservice -; - - - -; Cart - - - - - 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" - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt index 029a4063..07621bed 100644 --- a/xml/page_catalog_group_appfast.skt +++ b/xml/page_catalog_group_appfast.skt @@ -16,17 +16,6 @@ ?> - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf - Else - If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" Var Menu7Selected = "Invisible" @@ -34,7 +23,6 @@ Var Menu11Selected = "Invisible" Var Menu7Selected = "PressForever" EndIf - EndIf diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 5bdbc8b6..28f44809 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,17 +102,6 @@ - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf - Else - If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" Var Menu7Selected = "Invisible" @@ -118,7 +109,6 @@ Var Menu11Selected = "Invisible" Var Menu7Selected = "PressForever" EndIf - EndIf @@ -531,7 +521,7 @@ $Sum1204021018 "ROOT/taobin_project/image/page_drink_n//bn_protein_original_BDMS.png" "ROOT/taobin_project/image/page_drink_press_n//bn_protein_original_BDMS.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_protein_original_BDMS.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_original_BDMS.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -779,7 +769,7 @@ essential nutrients" $Sum1204021019 "ROOT/taobin_project/image/page_drink_n//bn_protein_espresso_BDMS.png" "ROOT/taobin_project/image/page_drink_press_n//bn_protein_espresso_BDMS.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_protein_espresso_BDMS.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_espresso_BDMS.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1026,7 +1016,7 @@ essential nutrients" $Sum1204021020 "ROOT/taobin_project/image/page_drink_n//bn_protein_Chocolate_BDMS.png" "ROOT/taobin_project/image/page_drink_press_n//bn_protein_Chocolate_BDMS.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_protein_Chocolate_BDMS.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_Chocolate_BDMS.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1274,7 +1264,7 @@ essential nutrients" $Sum1204021021 "ROOT/taobin_project/image/page_drink_n//bn_protein_Thaitea_BDMS.png" "ROOT/taobin_project/image/page_drink_press_n//bn_protein_Thaitea_BDMS.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_protein_Thaitea_BDMS.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_Thaitea_BDMS.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1522,7 +1512,7 @@ essential nutrients" $Sum1204021022 "ROOT/taobin_project/image/page_drink_n//bn_protein_Matcha_BDMS.png" "ROOT/taobin_project/image/page_drink_press_n//bn_protein_Matcha_BDMS.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_protein_Matcha_BDMS.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_protein_Matcha_BDMS.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/page_catalog_group_cocktail.skt b/xml/page_catalog_group_cocktail.skt index adfc0768..eb45f1d8 100644 --- a/xml/page_catalog_group_cocktail.skt +++ b/xml/page_catalog_group_cocktail.skt @@ -16,24 +16,12 @@ ?> ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 10887aa9..a132a420 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,24 +102,12 @@ ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_coffee.skt b/xml/page_catalog_group_coffee.skt index 57e3251e..d8d3cda9 100644 --- a/xml/page_catalog_group_coffee.skt +++ b/xml/page_catalog_group_coffee.skt @@ -14,13 +14,8 @@ #include=menu_catalog_default_init.xml ?> - If SpiralOnline = "true" Then - Var Menu2Selected2 = "PressForever" - Else - ; coffee show - Var Menu2Selected = "PressForever" - EndIf - + Var Menu2Selected = "PressForever" + SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 8ed9d765..27f41810 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -99,13 +101,8 @@ Var Menu22Selected = "Enable" - If SpiralOnline = "true" Then - Var Menu2Selected2 = "PressForever" - Else - ; coffee show - Var Menu2Selected = "PressForever" - EndIf - + Var Menu2Selected = "PressForever" + SAVELOG PreviseXMLFileName2 @@ -515,7 +512,7 @@ $Sum1201010001 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -764,7 +761,7 @@ $Sum1211010001 "ROOT/taobin_project/image/page_drink_n//bn_hot_double_espresso.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_double_espresso.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_double_espresso.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_double_espresso.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1014,7 +1011,7 @@ ESPRESSO" $Sum12010100031201020001 "ROOT/taobin_project/image/page_drink_n//bn_hot_america_no.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_america_no.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_america_no.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_america_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1263,7 +1260,7 @@ ESPRESSO" $Sum1201010013 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1516,7 +1513,7 @@ Strawberry, Orange, Floral" $Sum1201010020 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_bluedaddy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_bluedaddy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_bluedaddy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_bluedaddy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1769,7 +1766,7 @@ Note: Blue Berry & Floral" $Sum1201010022 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_mozart.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_mozart.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_mozart.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_mozart.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2022,7 +2019,7 @@ Note: Strawberry & Floral" $Sum1201010024 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_snowwhite.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_snowwhite.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_snowwhite.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_snowwhite.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2275,7 +2272,7 @@ Note: Jasmine & Honey" $Sum1201010026 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_whiskydude.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_whiskydude.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_whiskydude.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_whiskydude.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2528,7 +2525,7 @@ Note: Whisky & Vanilla" $Sum1201010028 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_peacher.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_peacher.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_peacher.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_peacher.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2781,7 +2778,7 @@ Note: Peach, tea, chocolate" $Sum1201010033 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_pure_beauty.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_pure_beauty.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_pure_beauty.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_pure_beauty.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3033,7 +3030,7 @@ ESPRESSO" $Sum1201010036 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_geisha.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_geisha.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_geisha.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_geisha.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3283,7 +3280,7 @@ GEISHA" $Sum1201010037 "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_rosalyn.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_rosalyn.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_rosalyn.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso_light_rosalyn.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3535,7 +3532,7 @@ Pink​ Rose & Berry" $Sum1201020041 "ROOT/taobin_project/image/page_drink_n//bn_iced_americano_soda.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_americano_soda.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_americano_soda.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_americano_soda.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3781,7 +3778,7 @@ Pink​ Rose & Berry" $Sum12010100141201020011 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4034,7 +4031,7 @@ Strawberry, Orange, Floral" $Sum12010100191201020019 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_bluedaddy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_bluedaddy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_bluedaddy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_bluedaddy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4287,7 +4284,7 @@ Note: Blue Berry & Floral" $Sum12010100211201020021 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_mozart.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_mozart.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_mozart.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_mozart.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4540,7 +4537,7 @@ Note: Strawberry & Floral" $Sum12010100251201020025 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_whiskydude.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_whiskydude.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_whiskydude.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_whiskydude.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4793,7 +4790,7 @@ Note: Whisky & Vanilla" $Sum12010100231201020023 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_snowwhite.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_snowwhite.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_snowwhite.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_snowwhite.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -5046,7 +5043,7 @@ Note: Jasmine & Honey" $Sum12010100271201020027 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_peacher.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_peacher.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_peacher.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_peacher.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -5299,7 +5296,7 @@ Note: Peach, tea, chocolate" $Sum12010100321201020032 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_pure_beauty.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_pure_beauty.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_pure_beauty.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_pure_beauty.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -5551,7 +5548,7 @@ AMERICANO" $Sum12010100351201020035 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_geisha.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_geisha.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_geisha.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_geisha.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -5802,7 +5799,7 @@ AMERICANO" $Sum12010100381201020038 "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_rosalyn.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_rosalyn.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_rosalyn.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_light_rosalyn.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6055,7 +6052,7 @@ Pink​ Rose & Berry" $Sum1201020020 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_bluedaddy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_bluedaddy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_bluedaddy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light_bluedaddy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6304,7 +6301,7 @@ Note: Blue Berry & Floral" $Sum1201020022 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_mozart.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_mozart.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_mozart.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light_mozart.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6553,7 +6550,7 @@ Note: Strawberry & Floral" $Sum1201020026 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_whiskydude.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_whiskydude.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_whiskydude.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light_whiskydude.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6802,7 +6799,7 @@ Note: Whisky & Vanilla" $Sum1201020024 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light__snowwhite.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light__snowwhite.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light__snowwhite.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light__snowwhite.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7051,7 +7048,7 @@ Note: Jasmine & Honey" $Sum1201020018 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7300,7 +7297,7 @@ Strawberry, Orange, Floral" $Sum1201020028 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light__peacher.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light__peacher.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light__peacher.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light__peacher.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7549,7 +7546,7 @@ Note: Peach, tea, chocolate" $Sum1201020033 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_pure_beauty.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_pure_beauty.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_pure_beauty.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light_pure_beauty.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7797,7 +7794,7 @@ ALMOST DIRTY" $Sum1201020036 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_geisha.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_geisha.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_geisha.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light_geisha.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -8044,7 +8041,7 @@ ALMOST DIRTY" $Sum1201020037 "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_rosalyn.png" "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_rosalyn.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_rosalyn.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_dirty_light_rosalyn.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -8293,7 +8290,7 @@ Pink​ Rose & Berry" $Sum12110200011211030001 "ROOT/taobin_project/image/page_drink_n//bn_iced_epsresso.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_epsresso.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_epsresso.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_epsresso.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -8539,7 +8536,7 @@ ICED ESPRESSO" $Sum120101000412010200021201030002 "ROOT/taobin_project/image/page_drink_n//bn_hot_latte.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_latte.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_latte.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -8788,7 +8785,7 @@ ICED ESPRESSO" $Sum120101000512110200021211030002 "ROOT/taobin_project/image/page_drink_n//bn_hot_cappuccino.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_cappuccino.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_cappuccino.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_cappuccino.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9037,7 +9034,7 @@ ICED ESPRESSO" $Sum120101000612010200031201030003 "ROOT/taobin_project/image/page_drink_n//bn_hot_mocha.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_mocha.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_mocha.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9286,7 +9283,7 @@ ICED ESPRESSO" $Sum120101000712010200041201030004 "ROOT/taobin_project/image/page_drink_n//bn_hot_caramel_latte.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_caramel_latte.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9537,7 +9534,7 @@ Caramel Syrup" $Sum120101003112010200311201030031 "ROOT/taobin_project/image/page_drink_n//bn_hot_greenteacoffee_lattle.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_greenteacoffee_lattle.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_greenteacoffee_lattle.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9788,7 +9785,7 @@ CAFÉ LATTE" $Sum120101000812010200051201030005 "ROOT/taobin_project/image/page_drink_n//bn_hot_greenteacoffee_lattle.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_greenteacoffee_lattle.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_greenteacoffee_lattle.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10039,7 +10036,7 @@ CAFÉ LATTE" $Sum120101001112010200081201030008 "ROOT/taobin_project/image/page_drink_n//bn_kuromitsu_coffee.png" "ROOT/taobin_project/image/page_drink_press_n//bn_kuromitsu_coffee.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_kuromitsu_coffee.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_kuromitsu_coffee.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10291,7 +10288,7 @@ Kokuto syrup" $Sum12010100391201020039 "ROOT/taobin_project/image/page_drink_n//bn_melon_americano.png" "ROOT/taobin_project/image/page_drink_press_n//bn_melon_americano.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_melon_americano.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_melon_americano.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10542,7 +10539,7 @@ CAFÉ LATTE" $Sum120101000912010200061201030006 "ROOT/taobin_project/image/page_drink_n//bn_hot_taiwantea_macchiato.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_taiwantea_macchiato.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_taiwantea_macchiato.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_taiwantea_macchiato.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10794,7 +10791,7 @@ Milk, Sugar" $Sum120101001012010200071201030007 "ROOT/taobin_project/image/page_drink_n//bn_hot_coffee_thai_milk_tea.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_coffee_thai_milk_tea.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_coffee_thai_milk_tea.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_coffee_thai_milk_tea.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11045,7 +11042,7 @@ CAFÉ LATTE" $Sum120101002912010200291201030029 "ROOT/taobin_project/image/page_drink_n//bn_hot_coffee_thai_milk_tea.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_coffee_thai_milk_tea.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_coffee_thai_milk_tea.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_coffee_thai_milk_tea.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11295,7 +11292,7 @@ CAFÉ LATTE" $Sum120101003012010200301201030030 "ROOT/taobin_project/image/page_drink_n//bn_hot_taiwantea_macchiato.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_taiwantea_macchiato.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_taiwantea_macchiato.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_taiwantea_macchiato.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11547,7 +11544,7 @@ Milk, Sugar" $Sum12010100121201020009 "ROOT/taobin_project/image/page_drink_n//bn_hot_lychee_espresso.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lychee_espresso.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11798,7 +11795,7 @@ Sugar, Water" $Sum12010100171201020017 "ROOT/taobin_project/image/page_drink_n//bn_hot_lychee_espresso.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lychee_espresso.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -12049,7 +12046,7 @@ Sugar, Water" $Sum12030100231203020023 "ROOT/taobin_project/image/page_drink_n//bn_Yuzu_americano.png" "ROOT/taobin_project/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_Yuzu_americano.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/page_catalog_group_forkid.skt b/xml/page_catalog_group_forkid.skt index 7f501c05..1b1ea351 100644 --- a/xml/page_catalog_group_forkid.skt +++ b/xml/page_catalog_group_forkid.skt @@ -16,28 +16,14 @@ ?> ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index f3660432..49b7ede5 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,28 +102,14 @@ ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "PressForever" EndIf @@ -533,7 +521,7 @@ $Sum120301000512030200051203030005 "ROOT/taobin_project/image/page_drink_n//bn_iced_milk.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_milk.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_milk.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_milk.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -782,7 +770,7 @@ $Sum120301000112030200011203030001 "ROOT/taobin_project/image/page_drink_n//bn_iced_caramel.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_caramel.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_caramel.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_caramel.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1031,7 +1019,7 @@ $Sum120301000312030200031203030003 "ROOT/taobin_project/image/page_drink_n//bn_iced_Black_Sugar_Milk.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Black_Sugar_Milk.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_Black_Sugar_Milk.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Black_Sugar_Milk.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1281,7 +1269,7 @@ MILK" $Sum12030200061203030006 "ROOT/taobin_project/image/page_drink_n//bn_pink_milk.png" "ROOT/taobin_project/image/page_drink_press_n//bn_pink_milk.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_pink_milk.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_pink_milk.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1527,7 +1515,7 @@ MILK" $Sum120301000212030200021203030002 "ROOT/taobin_project/image/page_drink_n//bn_iced_cocoa.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_cocoa.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_cocoa.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_cocoa.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1776,7 +1764,7 @@ MILK" $Sum120301002212030200221203030022 "ROOT/taobin_project/image/page_drink_n//bn_Melon_smoothie.png" "ROOT/taobin_project/image/page_drink_press_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_Melon_smoothie.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2025,7 +2013,7 @@ MILK" $Sum1203030010 "ROOT/taobin_project/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2272,7 +2260,7 @@ SMOOTHIE" $Sum1203030020 "ROOT/taobin_project/image/page_drink_n//bn_smoothie_ovaltine.png" "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_ovaltine.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_smoothie_ovaltine.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_ovaltine.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2518,7 +2506,7 @@ VOLCANO" $Sum1203030021 "ROOT/taobin_project/image/page_drink_n//bn_iced_Ovalcocoa_smoothie.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Ovalcocoa_smoothie.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_Ovalcocoa_smoothie.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Ovalcocoa_smoothie.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2764,7 +2752,7 @@ VOLCANO" $Sum12050200411205030041 "ROOT/taobin_project/image/page_drink_n//bn_iced_strawberry_soda.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3009,7 +2997,7 @@ VOLCANO" $Sum12050200081205030008 "ROOT/taobin_project/image/page_drink_n//bn_sala_soda.png" "ROOT/taobin_project/image/page_drink_press_n//bn_sala_soda.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_sala_soda.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_sala_soda.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3254,7 +3242,7 @@ VOLCANO" $Sum1205020044 "ROOT/taobin_project/image/page_drink_n//bn_iced_melon_soda.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_melon_soda.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3500,7 +3488,7 @@ VOLCANO" $Sum1205020045 "ROOT/taobin_project/image/page_drink_n//bn_iced_yuzu_soda.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index b5f2579e..9f532dba 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -510,7 +512,7 @@ $Sum12010110031201021001 "ROOT/taobin_project/image/page_drink_n//bn_hot_america_no_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_america_no_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_america_no_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -761,7 +763,7 @@ $Sum12010110041201021002 "ROOT/taobin_project/image/page_drink_n//bn_hot_latte_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_latte_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_latte_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1011,7 +1013,7 @@ Foamed milk" $Sum12010110061201021003 "ROOT/taobin_project/image/page_drink_n//bn_hot_Mocha_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_Mocha_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_Mocha_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1262,7 +1264,7 @@ Milk, Sugar" $Sum12010110991201021099 "ROOT/taobin_project/image/page_drink_n//bn_hot_Cappu_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_Cappu_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_Cappu_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1512,7 +1514,7 @@ Foamed milk" $Sum12020110241202021024 "ROOT/taobin_project/image/page_drink_n//bn_hot_thai_milk_tea_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_thai_milk_tea_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_thai_milk_tea_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1761,7 +1763,7 @@ Foamed milk" $Sum12020110251202021025 "ROOT/taobin_project/image/page_drink_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_taiwan_milk_tea_Jason_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2012,7 +2014,7 @@ and Milk" $Sum12020110261202021026 "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_latte_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_latte_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_latte_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2261,7 +2263,7 @@ and Milk" $Sum12020110271202021027 "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_matcha_tea_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2510,7 +2512,7 @@ and Milk" $Sum12020110291202021029 "ROOT/taobin_project/image/page_drink_n//bn_hot_blacktea.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blacktea.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_blacktea.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blacktea.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2759,7 +2761,7 @@ and Milk" $Sum12020110301202021030 "ROOT/taobin_project/image/page_drink_n//bn_hot_limeblack tea_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_limeblack tea_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_limeblack tea_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_limeblack tea_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3009,7 +3011,7 @@ LIMENADE" $Sum12020110311202021031 "ROOT/taobin_project/image/page_drink_n//bn_hot_oolong_tea_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_oolong_tea_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_oolong_tea_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_oolong_tea_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3258,7 +3260,7 @@ LIMENADE" $Sum12020110321202021032 "ROOT/taobin_project/image/page_drink_n//bn_hot_lime_Oolong_tea_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lime_Oolong_tea_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_lime_Oolong_tea_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_lime_Oolong_tea_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3510,7 +3512,7 @@ Water, and Ice" $Sum12020110371202021037 "ROOT/taobin_project/image/page_drink_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_hojicha_milk_tea_sing_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3759,7 +3761,7 @@ Water, and Ice" $Sum12030110021203021002 "ROOT/taobin_project/image/page_drink_n//bn_iced_cocoa_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_cocoa_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_cocoa_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_cocoa_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4008,7 +4010,7 @@ Water, and Ice" $Sum12030110051203021005 "ROOT/taobin_project/image/page_drink_n//bn_iced_milk_Healthy.png" "ROOT/taobin_project/image/page_drink_press_n//bn_iced_milk_Healthy.png" - "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_milk_Healthy.png" + "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_milk_Healthy.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4246,18 +4248,18 @@ Water, and Ice" center-vertical-horizontal - ; 12-05-01-1001 12-05-01-1001 - + ; 12-05-01-1001 12-05-02-1001 - 33 22 225 296 - Flag( 12-05-01-1001.Button,12-05-01-1001.Button,$Sum12050110011205011001) + Flag( 12-05-01-1001.Button,12-05-02-1001.Button,$Sum12050110011205021001) @@ -302,11 +298,7 @@ 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_coffee.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" @@ -320,11 +312,7 @@ 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_tea.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" @@ -337,18 +325,28 @@ 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_milk.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" + + - EndIf + ; row 3 +;------------------------------------------------------------- + +;------------------------------------------------------------- + ; top menu + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + +; sugar6 + +;- END topping1 + + + ; ; ; @@ -1788,16 +2131,7 @@ Var topping1 = toppingID1index2 EndIf - If ShiftSugarStep = 2 Then - - Var SugarState2 = "PressForever" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index1 - EndIf - - Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -1832,24 +2166,7 @@ Var topping1 = toppingID1index3 EndIf - If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" - Var SugarState3 = "PressForever" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index2 - EndIf - - If ShiftSugarStep = 3 Then - - Var SugarState3 = "PressForever" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index1 - - EndIf - - Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -1883,23 +2200,7 @@ Var topping1 = toppingID1index4 EndIf - If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "PressForever" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index3 - EndIf - - If ShiftSugarStep = 3 Then - - Var SugarState3 = "Enable" - Var SugarState4 = "PressForever" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index2 - EndIf - - Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -1968,7 +2269,7 @@ Var topping1 = toppingID1index1 EndIf - Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 EndIf @@ -2005,15 +2306,6 @@ Var topping1 = toppingID1index2 EndIf - If ShiftSugarStep = 2 Then - - Var SugarState2 = "PressForever" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index1 - EndIf - Var UserSeletedSugar = 1 EndIf @@ -2049,24 +2341,7 @@ Var topping1 = toppingID1index3 EndIf - If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" - Var SugarState3 = "PressForever" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index2 - EndIf - - If ShiftSugarStep = 3 Then - - Var SugarState3 = "PressForever" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index1 - - EndIf - - Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1 @@ -2100,23 +2375,8 @@ Var topping1 = toppingID1index4 EndIf - If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "PressForever" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 3 Then - - Var SugarState3 = "Enable" - Var SugarState4 = "PressForever" - Var SugarState5 = "Enable" - Var topping1 = toppingID1index2 - EndIf - - Var UserSeletedSugar = 1 + ;Var UserSeletedSugar = 1 EndIf DEBUGVAR topping1