diff --git a/image/close_en/Frame17.png b/image/close_en/Frame17.png new file mode 100644 index 00000000..50870424 Binary files /dev/null and b/image/close_en/Frame17.png differ diff --git a/image/close_en/Frame18.png b/image/close_en/Frame18.png new file mode 100644 index 00000000..b5ae0cde Binary files /dev/null and b/image/close_en/Frame18.png differ diff --git a/image/close_en/Frame19.png b/image/close_en/Frame19.png new file mode 100644 index 00000000..fa991c07 Binary files /dev/null and b/image/close_en/Frame19.png differ diff --git a/image/close_en/Frame20.png b/image/close_en/Frame20.png new file mode 100644 index 00000000..677d294c Binary files /dev/null and b/image/close_en/Frame20.png differ diff --git a/image/close_en/Frame5.png b/image/close_en/Frame5.png index f7d877b5..5cfde2bd 100644 Binary files a/image/close_en/Frame5.png and b/image/close_en/Frame5.png differ diff --git a/image/display_point_en/imgCouponC38.png b/image/display_point_en/imgCouponC38.png index 0845e89b..6423d9bf 100644 Binary files a/image/display_point_en/imgCouponC38.png and b/image/display_point_en/imgCouponC38.png differ diff --git a/image/drink_option/blend.png b/image/drink_option/blend.png new file mode 100644 index 00000000..15638e16 Binary files /dev/null and b/image/drink_option/blend.png differ diff --git a/image/drink_option/cold.png b/image/drink_option/cold.png new file mode 100644 index 00000000..6d2fba2d Binary files /dev/null and b/image/drink_option/cold.png differ diff --git a/image/drink_option/hot.png b/image/drink_option/hot.png new file mode 100644 index 00000000..e4210029 Binary files /dev/null and b/image/drink_option/hot.png differ diff --git a/image/drink_option/option_deactive.png b/image/drink_option/option_deactive.png new file mode 100644 index 00000000..7eb72094 Binary files /dev/null and b/image/drink_option/option_deactive.png differ diff --git a/image/drink_option_en/blend.png b/image/drink_option_en/blend.png new file mode 100644 index 00000000..e053b598 Binary files /dev/null and b/image/drink_option_en/blend.png differ diff --git a/image/drink_option_en/cold.png b/image/drink_option_en/cold.png new file mode 100644 index 00000000..5faf2028 Binary files /dev/null and b/image/drink_option_en/cold.png differ diff --git a/image/drink_option_en/hot.png b/image/drink_option_en/hot.png new file mode 100644 index 00000000..afdd8c96 Binary files /dev/null and b/image/drink_option_en/hot.png differ diff --git a/image/drink_option_en/option_deactive.png b/image/drink_option_en/option_deactive.png new file mode 100644 index 00000000..92966a2d Binary files /dev/null and b/image/drink_option_en/option_deactive.png differ diff --git a/image/page_doing/txt_34.png b/image/page_doing/txt_34.png index 4cc6f488..6de95654 100644 Binary files a/image/page_doing/txt_34.png and b/image/page_doing/txt_34.png differ diff --git a/image/page_doing/txt_34_en.png b/image/page_doing/txt_34_en.png index 340eb98e..72c3f734 100644 Binary files a/image/page_doing/txt_34_en.png and b/image/page_doing/txt_34_en.png differ diff --git a/image/page_drink_n/Peacher.svg b/image/page_drink_n/Peacher.svg new file mode 100644 index 00000000..0878be2b --- /dev/null +++ b/image/page_drink_n/Peacher.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/image/page_drink_n/bn_dirty_light.png b/image/page_drink_n/bn_dirty_light.png new file mode 100644 index 00000000..10faf268 Binary files /dev/null and b/image/page_drink_n/bn_dirty_light.png differ diff --git a/image/page_drink_n/bn_dirty_light__peacher.png b/image/page_drink_n/bn_dirty_light__peacher.png new file mode 100644 index 00000000..94c71ca0 Binary files /dev/null and b/image/page_drink_n/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_n/bn_dirty_light__snowwhite.png b/image/page_drink_n/bn_dirty_light__snowwhite.png new file mode 100644 index 00000000..6e201e9b Binary files /dev/null and b/image/page_drink_n/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_n/bn_dirty_light_bluedaddy.png b/image/page_drink_n/bn_dirty_light_bluedaddy.png new file mode 100644 index 00000000..9760a1ab Binary files /dev/null and b/image/page_drink_n/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_n/bn_dirty_light_mozart.png b/image/page_drink_n/bn_dirty_light_mozart.png new file mode 100644 index 00000000..dde9040f Binary files /dev/null and b/image/page_drink_n/bn_dirty_light_mozart.png differ diff --git a/image/page_drink_n/bn_dirty_light_whiskydude.png b/image/page_drink_n/bn_dirty_light_whiskydude.png new file mode 100644 index 00000000..c0da6b30 Binary files /dev/null and b/image/page_drink_n/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_n/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink_n/bn_hot_Black_Sugar_Milk_Tea.png new file mode 100644 index 00000000..fb3dca54 Binary files /dev/null and b/image/page_drink_n/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_n/bn_hot_Ginger_lemon_tea.png b/image/page_drink_n/bn_hot_Ginger_lemon_tea.png new file mode 100644 index 00000000..8a638af3 Binary files /dev/null and b/image/page_drink_n/bn_hot_Ginger_lemon_tea.png differ diff --git a/image/page_drink_n/bn_hot_Ginger_tea.png b/image/page_drink_n/bn_hot_Ginger_tea.png new file mode 100644 index 00000000..d6813c7d Binary files /dev/null and b/image/page_drink_n/bn_hot_Ginger_tea.png differ diff --git a/image/page_drink_n/bn_hot_america_no.png b/image/page_drink_n/bn_hot_america_no.png new file mode 100644 index 00000000..455c8718 Binary files /dev/null and b/image/page_drink_n/bn_hot_america_no.png differ diff --git a/image/page_drink_n/bn_hot_americano_honey.png b/image/page_drink_n/bn_hot_americano_honey.png new file mode 100644 index 00000000..40f81ebd Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_honey.png differ diff --git a/image/page_drink_n/bn_hot_americano_light.png b/image/page_drink_n/bn_hot_americano_light.png new file mode 100644 index 00000000..10c487bd Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_light.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_bluedaddy.png b/image/page_drink_n/bn_hot_americano_light_bluedaddy.png new file mode 100644 index 00000000..02269f57 Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_mozart.png b/image/page_drink_n/bn_hot_americano_light_mozart.png new file mode 100644 index 00000000..78ea4f13 Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_light_mozart.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_peacher.png b/image/page_drink_n/bn_hot_americano_light_peacher.png new file mode 100644 index 00000000..6bf88335 Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_snowwhite.png b/image/page_drink_n/bn_hot_americano_light_snowwhite.png new file mode 100644 index 00000000..b452260b Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_whiskydude.png b/image/page_drink_n/bn_hot_americano_light_whiskydude.png new file mode 100644 index 00000000..e49661e9 Binary files /dev/null and b/image/page_drink_n/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_n/bn_hot_blueberry_tea.png b/image/page_drink_n/bn_hot_blueberry_tea.png new file mode 100644 index 00000000..69f3d075 Binary files /dev/null and b/image/page_drink_n/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink_n/bn_hot_cappuccino.png b/image/page_drink_n/bn_hot_cappuccino.png new file mode 100644 index 00000000..deb72747 Binary files /dev/null and b/image/page_drink_n/bn_hot_cappuccino.png differ diff --git a/image/page_drink_n/bn_hot_caramel_latte.png b/image/page_drink_n/bn_hot_caramel_latte.png new file mode 100644 index 00000000..86e0d820 Binary files /dev/null and b/image/page_drink_n/bn_hot_caramel_latte.png differ diff --git a/image/page_drink_n/bn_hot_chrysanthemum_tea.png b/image/page_drink_n/bn_hot_chrysanthemum_tea.png new file mode 100644 index 00000000..6e5bad1f Binary files /dev/null and b/image/page_drink_n/bn_hot_chrysanthemum_tea.png differ diff --git a/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png b/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png new file mode 100644 index 00000000..b39edc17 Binary files /dev/null and b/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png differ diff --git a/image/page_drink_n/bn_hot_double_espresso.png b/image/page_drink_n/bn_hot_double_espresso.png new file mode 100644 index 00000000..b87c8c0e Binary files /dev/null and b/image/page_drink_n/bn_hot_double_espresso.png differ diff --git a/image/page_drink_n/bn_hot_espresso.png b/image/page_drink_n/bn_hot_espresso.png new file mode 100644 index 00000000..df7f2a6c Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light.png b/image/page_drink_n/bn_hot_espresso_light.png new file mode 100644 index 00000000..b8441f2f Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso_light.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_n/bn_hot_espresso_light_bluedaddy.png new file mode 100644 index 00000000..a6acb149 Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_mozart.png b/image/page_drink_n/bn_hot_espresso_light_mozart.png new file mode 100644 index 00000000..fa206fe5 Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso_light_mozart.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_peacher.png b/image/page_drink_n/bn_hot_espresso_light_peacher.png new file mode 100644 index 00000000..7a67aef1 Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_snowwhite.png b/image/page_drink_n/bn_hot_espresso_light_snowwhite.png new file mode 100644 index 00000000..02c51a74 Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_whiskydude.png b/image/page_drink_n/bn_hot_espresso_light_whiskydude.png new file mode 100644 index 00000000..10332d04 Binary files /dev/null and b/image/page_drink_n/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_n/bn_hot_greenteacoffee_lattle.png b/image/page_drink_n/bn_hot_greenteacoffee_lattle.png new file mode 100644 index 00000000..b8facc71 Binary files /dev/null and b/image/page_drink_n/bn_hot_greenteacoffee_lattle.png differ diff --git a/image/page_drink_n/bn_hot_honey_latte.png b/image/page_drink_n/bn_hot_honey_latte.png new file mode 100644 index 00000000..14090627 Binary files /dev/null and b/image/page_drink_n/bn_hot_honey_latte.png differ diff --git a/image/page_drink_n/bn_hot_latte.png b/image/page_drink_n/bn_hot_latte.png new file mode 100644 index 00000000..21a2bc12 Binary files /dev/null and b/image/page_drink_n/bn_hot_latte.png differ diff --git a/image/page_drink_n/bn_hot_lime_Matcha.png b/image/page_drink_n/bn_hot_lime_Matcha.png new file mode 100644 index 00000000..b8c0cf32 Binary files /dev/null and b/image/page_drink_n/bn_hot_lime_Matcha.png differ diff --git a/image/page_drink_n/bn_hot_lime_Matcha_Honey.png b/image/page_drink_n/bn_hot_lime_Matcha_Honey.png new file mode 100644 index 00000000..7e9dc0bb Binary files /dev/null and b/image/page_drink_n/bn_hot_lime_Matcha_Honey.png differ diff --git a/image/page_drink_n/bn_hot_lime_Oolong_Honey_tea.png b/image/page_drink_n/bn_hot_lime_Oolong_Honey_tea.png new file mode 100644 index 00000000..32f31103 Binary files /dev/null and b/image/page_drink_n/bn_hot_lime_Oolong_Honey_tea.png differ diff --git a/image/page_drink_n/bn_hot_lime_Oolong_tea.png b/image/page_drink_n/bn_hot_lime_Oolong_tea.png new file mode 100644 index 00000000..2e959b38 Binary files /dev/null and b/image/page_drink_n/bn_hot_lime_Oolong_tea.png differ diff --git a/image/page_drink_n/bn_hot_lime_tea.png b/image/page_drink_n/bn_hot_lime_tea.png new file mode 100644 index 00000000..8a3d5cdf Binary files /dev/null and b/image/page_drink_n/bn_hot_lime_tea.png differ diff --git a/image/page_drink_n/bn_hot_lime_tea_Honey.png b/image/page_drink_n/bn_hot_lime_tea_Honey.png new file mode 100644 index 00000000..c1407e3b Binary files /dev/null and b/image/page_drink_n/bn_hot_lime_tea_Honey.png differ diff --git a/image/page_drink_n/bn_hot_lychee_espresso.png b/image/page_drink_n/bn_hot_lychee_espresso.png new file mode 100644 index 00000000..b811bb35 Binary files /dev/null and b/image/page_drink_n/bn_hot_lychee_espresso.png differ diff --git a/image/page_drink_n/bn_hot_lychee_tea.png b/image/page_drink_n/bn_hot_lychee_tea.png new file mode 100644 index 00000000..81a87a93 Binary files /dev/null and b/image/page_drink_n/bn_hot_lychee_tea.png differ diff --git a/image/page_drink_n/bn_hot_marijuana_tea.png b/image/page_drink_n/bn_hot_marijuana_tea.png new file mode 100644 index 00000000..d717fc96 Binary files /dev/null and b/image/page_drink_n/bn_hot_marijuana_tea.png differ diff --git a/image/page_drink_n/bn_hot_matcha_milk_tea.png b/image/page_drink_n/bn_hot_matcha_milk_tea.png new file mode 100644 index 00000000..2b09671c Binary files /dev/null and b/image/page_drink_n/bn_hot_matcha_milk_tea.png differ diff --git a/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png b/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png new file mode 100644 index 00000000..a4b35346 Binary files /dev/null and b/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_n/bn_hot_matcha_tea.png b/image/page_drink_n/bn_hot_matcha_tea.png new file mode 100644 index 00000000..61a7e38e Binary files /dev/null and b/image/page_drink_n/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_n/bn_hot_matcha_tea_sing.png b/image/page_drink_n/bn_hot_matcha_tea_sing.png new file mode 100644 index 00000000..a13a41a1 Binary files /dev/null and b/image/page_drink_n/bn_hot_matcha_tea_sing.png differ diff --git a/image/page_drink_n/bn_hot_mocha.png b/image/page_drink_n/bn_hot_mocha.png new file mode 100644 index 00000000..5b6ad597 Binary files /dev/null and b/image/page_drink_n/bn_hot_mocha.png differ diff --git a/image/page_drink_n/bn_hot_oolong_tea.png b/image/page_drink_n/bn_hot_oolong_tea.png new file mode 100644 index 00000000..c7aaa80c Binary files /dev/null and b/image/page_drink_n/bn_hot_oolong_tea.png differ diff --git a/image/page_drink_n/bn_hot_strawberry_tea.png b/image/page_drink_n/bn_hot_strawberry_tea.png new file mode 100644 index 00000000..b6c867c1 Binary files /dev/null and b/image/page_drink_n/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink_n/bn_hot_taiwan_milk_tea.png b/image/page_drink_n/bn_hot_taiwan_milk_tea.png new file mode 100644 index 00000000..da27b45d Binary files /dev/null and b/image/page_drink_n/bn_hot_taiwan_milk_tea.png differ diff --git a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason.png b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..6ebe4e0d Binary files /dev/null and b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_n/bn_hot_taiwantea_macchiato.png b/image/page_drink_n/bn_hot_taiwantea_macchiato.png new file mode 100644 index 00000000..071600c2 Binary files /dev/null and b/image/page_drink_n/bn_hot_taiwantea_macchiato.png differ diff --git a/image/page_drink_n/bn_hot_thai_milk_tea.png b/image/page_drink_n/bn_hot_thai_milk_tea.png new file mode 100644 index 00000000..5c584e6b Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_milk_tea.png differ diff --git a/image/page_drink_n/bn_hot_thai_milk_tea_tacc.png b/image/page_drink_n/bn_hot_thai_milk_tea_tacc.png new file mode 100644 index 00000000..1ec05f27 Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_n/bn_hot_thai_tea.png b/image/page_drink_n/bn_hot_thai_tea.png new file mode 100644 index 00000000..37465f18 Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_tea.png differ diff --git a/image/page_drink_n/bn_hot_thai_tea_coffee.png b/image/page_drink_n/bn_hot_thai_tea_coffee.png new file mode 100644 index 00000000..2b79a30c Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_tea_coffee.png differ diff --git a/image/page_drink_n/bn_hot_ume_tea.png b/image/page_drink_n/bn_hot_ume_tea.png new file mode 100644 index 00000000..e2bca488 Binary files /dev/null and b/image/page_drink_n/bn_hot_ume_tea.png differ diff --git a/image/page_drink_n/bn_kuromitsu_coffee.png b/image/page_drink_n/bn_kuromitsu_coffee.png new file mode 100644 index 00000000..268ae3af Binary files /dev/null and b/image/page_drink_n/bn_kuromitsu_coffee.png differ diff --git a/image/topping2_en/block_bottom.png b/image/topping2_en/block_bottom.png new file mode 100644 index 00000000..b6fe363c Binary files /dev/null and b/image/topping2_en/block_bottom.png differ diff --git a/image/topping2_en/block_middle.png b/image/topping2_en/block_middle.png new file mode 100644 index 00000000..2a3b3980 Binary files /dev/null and b/image/topping2_en/block_middle.png differ diff --git a/image/topping2_en/block_top.png b/image/topping2_en/block_top.png new file mode 100644 index 00000000..5a99a93e Binary files /dev/null and b/image/topping2_en/block_top.png differ diff --git a/image/topping2_en/img_oreo_top.png b/image/topping2_en/img_oreo_top.png new file mode 100644 index 00000000..ff25a721 Binary files /dev/null and b/image/topping2_en/img_oreo_top.png differ diff --git a/image/topping2_en/img_shot_esp.png b/image/topping2_en/img_shot_esp.png new file mode 100644 index 00000000..d612a938 Binary files /dev/null and b/image/topping2_en/img_shot_esp.png differ diff --git a/image/topping2_en/img_shot_single.png b/image/topping2_en/img_shot_single.png new file mode 100644 index 00000000..20e441a9 Binary files /dev/null and b/image/topping2_en/img_shot_single.png differ diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index 0565e16f..e3e34e65 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -35,7 +35,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/menu_head.py b/xml/menu_head.py index 8e4c6fe8..45bf59c7 100644 --- a/xml/menu_head.py +++ b/xml/menu_head.py @@ -6,6 +6,11 @@ default_dir_press = 'ROOT/taobin_project/image/page_drink_press/' default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/' + new_default_dir = 'ROOT/taobin_project/image/page_drink_n/' + new_default_dir2 = 'ROOT/taobin_project/image/page_drink_select_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/' + menu_count = 0 x1 = 44 diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py new file mode 100644 index 00000000..e25f4fed --- /dev/null +++ b/xml/menu_new_layout_gen.py @@ -0,0 +1,183 @@ + + out_xml(' \r\n') + out_xml(' 10 \r\n') + out_xml(' 497 \r\n') + out_xml(' 1080 \r\n') + out_xml(' "auto" \r\n') + out_xml(' "Vertical" \r\n') + out_xml(' 4 \r\n') + + count_test = 0 + out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') + for spl in menu_new_list: + #product_code = s + menu_img = spl[7] + out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n') + out_xml( '\r\n') + out_xml('\t 33 \r\n') + out_xml('\t 22 \r\n') + out_xml('\t 225 \r\n') + out_xml('\t 296 \r\n') + out_xml( '\t Flag( \" ' + spl[4] + '.Button,' + spl[5] + '.Button,' + spl[6] + '.Button\") \r\n') + + out_xml( '\t\r\n') + + + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 164 \r\n') + out_xml( '\t 24 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t "multi2" \r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x322B26 \r\n') + out_xml( '\t showthaiText \r\n') + out_xml( '\t "' + spl[0] + '" \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 220 \r\n') + out_xml( '\t 14 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t showthaiText \r\n') + out_xml( '\t "' + spl[2] + '" \r\n') + out_xml( '\t\r\n') + + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 164 \r\n') + out_xml( '\t 22 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t "multi2" \r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x322B26 \r\n') + out_xml( '\t showengText \r\n') + out_xml( '\t "' + spl[1] + '" \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 220 \r\n') + out_xml( '\t 14 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t showengText \r\n') + out_xml( '\t "' + spl[3] + '" \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 264 \r\n') + out_xml( '\t Var( DirImage2 + "option_deactive.png" ) \r\n') + out_xml( '\t\r\n') + + shw = "Enable" + if spl[4] == "-" : + shw = "Invisible" + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 264 \r\n') + out_xml( '\t "' + shw + '" \r\n') + out_xml( '\t Var( DirImage2 + "hot.png" ) \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 50 \r\n') + out_xml( '\t 265 \r\n') + out_xml( '\t 14 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t "' + shw + '" \r\n') + + out_xml( '\t Var( "฿" + $' + spl[4] + '.Price ) \r\n') + out_xml( '\t\r\n') + + shw = "Enable" + if spl[5] == "-" : + shw = "Invisible" + + out_xml( '\t\r\n') + out_xml( '\t 81 \r\n') + out_xml( '\t 264 \r\n') + out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n') + out_xml( '\t "' + shw + '" \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 115 \r\n') + out_xml( '\t 265 \r\n') + out_xml( '\t 14 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t "' + shw + '" \r\n') + out_xml( '\t Var( "฿" + $' + spl[5] + '.Price ) \r\n') + out_xml( '\t\r\n') + + shw = "Enable" + if spl[6] == "-" : + shw = "Invisible" + + out_xml( '\t\r\n') + out_xml( '\t 146 \r\n') + out_xml( '\t 264 \r\n') + out_xml( '\t Var( DirImage2 + "blend.png" ) \r\n') + out_xml( '\t "' + shw + '" \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 180 \r\n') + out_xml( '\t 265 \r\n') + out_xml( '\t 14 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t "' + shw + '" \r\n') + out_xml( '\t Var( "฿" + $' + spl[6] + '.Price ) \r\n') + out_xml( '\t\r\n') + + out_xml( '\r\n') + count_test = count_test + 1 + #if count_test > 8 : + # break + + + + out_xml('\r\n') + + + out_xml('; Cart\r\n') + out_xml('\r\n') + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 04493235..ebb6541f 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -558,7 +558,7 @@ EndIf - + If Seeker = "curr" Then If DoorCupPosition = "bottom" Then @@ -567,7 +567,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_show_error.xml" + ;Open "ROOT/taobin_project/xml/page_show_error.xml" EndIf EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index aa104280..dc3a6258 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -197,7 +197,12 @@ Var EnableSelectMenuBetweenBrew = "Invisible" EndIf - + ; Hide + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" + diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 7326a253..98cdff2b 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -101,6 +101,11 @@ Var DirImage = "ROOT/taobin_project/image/complete/" Var next_pic_bg = DirImage + "/Preparing.png" + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" + diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index a3832546..d9b5fefa 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -196,6 +196,11 @@ Var Seeker.lidAction = 2 EndIf + ; Disable + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 92decf96..29863dc1 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -140,6 +140,10 @@ Var ButtontoTopupMenu = "Disable" EndIf + + READ_FILE "/mnt/sdcard/new_layout" new_layout + + 1000 @@ -271,7 +275,11 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.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 diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 6f593c1e..de6fbe4d 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -107,7 +107,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 9a4149da..f3d0fb5b 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -174,7 +174,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml index 6888b950..32bdcafc 100644 --- a/xml/page_catalog_choose_drink11.xml +++ b/xml/page_catalog_choose_drink11.xml @@ -162,7 +162,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index c93f159b..78b10491 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -150,7 +150,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 57b0acf3..4b33f6a3 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -149,7 +149,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index cdf757ba..c1b9ea08 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -147,7 +147,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index b81e526a..0d706e3f 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -140,7 +140,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 8f0783f4..2d674f8e 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -146,7 +146,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index 1b3ffd42..4e5eabaa 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -162,7 +162,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 8373c2e0..c8b7ef72 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -142,7 +142,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_group_coffee.skt b/xml/page_catalog_group_coffee.skt new file mode 100644 index 00000000..4ca84eba --- /dev/null +++ b/xml/page_catalog_group_coffee.skt @@ -0,0 +1,88 @@ + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If SpiralOnline = "true" Then + Var Menu1Selected2 = "PressForever" + Else + ; coffee show + Var Menu1Selected = "PressForever" + EndIf + + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + 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" + 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" + EndIf + + + + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + EndIf + + EndIf + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + EndIf + + + + + + + + + + + + + + + + diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml new file mode 100644 index 00000000..496fac00 --- /dev/null +++ b/xml/page_catalog_group_coffee.xml @@ -0,0 +1,3935 @@ + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + 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" + EndIf + + ; SpiralOnline + If SpiralOnline = "true" Then + Var Menu1Selected2 = "Enable" + Var Menu2Selected2 = "Enable" + Var Menu3Selected2 = "Enable" + Var Menu4Selected2 = "Enable" + + Var Menu6Selected2 = "Enable" + Var Menu7Selected2 = "Enable" + Var MenuVSelected2 = "Enable" + + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + + ; init default + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + ; fuck + Else + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If SpiralOnline = "true" Then + Var Menu1Selected2 = "PressForever" + Else + ; coffee show + Var Menu1Selected = "PressForever" + EndIf + + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + 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" + 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" + EndIf + + + + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + EndIf + + EndIf + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + EndIf + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 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 + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + 10 + 497 + 1080 + "auto" + "Vertical" + 4 +; menu_new_list 29 + ; 12-01-01-0001 - - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0001.Button,-.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ (30 ml)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso (30 ml)" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0001.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-11-01-0001 - - + + 33 + 22 + 225 + 296 + Flag( " 12-11-01-0001.Button,-.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ดับเบิลเอสเพรสโซ่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ (60 ml)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "DOUBLE ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso (60 ml)" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-11-01-0001.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0003 12-01-02-0001 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0003.Button,12-01-02-0001.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำร้อน +(อเมริกาโน)" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำร้อน +(อเมริกาโน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0003.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0001.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0004 12-01-02-0002 12-01-03-0002 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ลาเต้ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ลาเต้ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Milk, +Foamed milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0004.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0002.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0002.Price ) + + + ; 12-01-01-0005 12-11-02-0002 12-11-03-0002 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0005.Button,12-11-02-0002.Button,12-11-03-0002.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "คาปูชิโน่ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT CAPPUCINO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Milk, +Foamed milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0005.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-11-02-0002.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-11-03-0002.Price ) + + + ; 12-01-01-0006 12-01-02-0003 12-01-03-0003 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0006.Button,12-01-02-0003.Button,12-01-03-0003.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "มอคค่าร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม ผสมช็อกโกแลต +น้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT MOCHA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Cocoa, +Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0006.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0003.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0003.Price ) + + + ; 12-01-01-0007 12-01-02-0004 12-01-03-0004 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0007.Button,12-01-02-0004.Button,12-01-03-0004.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "คาราเมลลาเต้ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม และ ฟองนม +น้ำเชื่อมคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT + CARAMEL LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Milk, +Caramel Syrup" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0007.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0004.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0004.Price ) + + + ; 12-01-01-0031 12-01-02-0031 12-01-03-0031 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0031.Button,12-01-02-0031.Button,12-01-03-0031.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟ +มัทฉะลาเต้ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม ชาเขียวมัทฉะ +และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT MATCHA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Matcha, Milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0031.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0031.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0031.Price ) + + + ; 12-01-01-0008 12-01-02-0005 12-01-03-0005 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0008.Button,12-01-02-0005.Button,12-01-03-0005.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟ +มัทฉะลาเต้ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม ชาเขียวมัทฉะ +และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT MATCHA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Matcha, Milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0008.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0005.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0005.Price ) + + + ; 12-01-01-0011 12-01-02-0008 12-01-03-0008 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0011.Button,12-01-02-0008.Button,12-01-03-0008.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "บราวน์ชูการ์ +ลาเต้ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำเชื่อมน้ำตาลแดง +และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT BROWN +SUGAR LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Milk, +Kokuto syrup" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0011.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0008.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0008.Price ) + + + ; 12-01-01-0009 12-01-02-0006 12-01-03-0006 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0009.Button,12-01-02-0006.Button,12-01-03-0006.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟ +ชานมไต้หวันร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ ชาไต้หวัน น้ำตาล +และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT TAIWANESE TEA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Taiwanese Tea, +Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0009.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0006.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0006.Price ) + + + ; 12-01-01-0012 12-01-02-0009 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0012.Button,12-01-02-0009.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนลิ้นจี่ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ ลิ้นจี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT +LYCHEE AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Lychee, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0012.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0009.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0017 12-01-02-0017 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0017.Button,12-01-02-0017.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนลิ้นจี่ร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ ลิ้นจี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT +LYCHEE AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Lychee, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0017.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0017.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0010 12-01-02-0007 12-01-03-0007 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0010.Button,12-01-02-0007.Button,12-01-03-0007.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟ +ชาไทยร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ ชาไทย นม น้ำตาล +และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT THAI TEA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Thai tea, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0010.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0007.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0007.Price ) + + + ; 12-01-01-0029 12-01-02-0029 12-01-03-0029 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0029.Button,12-01-02-0029.Button,12-01-03-0029.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟ +ชาไทยร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ ชาไทย นม น้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT THAI TEA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Thai tea, Milk,\ Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0029.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0029.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0029.Price ) + + + ; 12-01-01-0030 12-01-02-0030 12-01-03-0030 + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0030.Button,12-01-02-0030.Button,12-01-03-0030.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟ +ชานมไต้หวันร้อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ ชาไต้หวัน น้ำตาล +และ ฟองนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT TAIWANESE TEA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Taiwanese Tea, +Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0030.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0030.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Enable" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-03-0030.Price ) + + + ; - 12-01-02-0020 - + + 33 + 22 + 225 + 296 + Flag( " -.Button,12-01-02-0020.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "BLUE DADDY +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Washed process +หอมบลูเบอร์รี และดอกไม้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "BLUE DADDY +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Washed process +Note: Blue Berry and Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0020.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0019 12-01-02-0019 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0019.Button,12-01-02-0019.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนร้อน +BLUE DADDY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Washed process +หอมบลูเบอร์รี และดอกไม้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "BLUE DADDY +HOT AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Washed process +Note: Blue Berry and Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0019.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0019.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; - 12-01-02-0022 - + + 33 + 22 + 225 + 296 + Flag( " -.Button,12-01-02-0022.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "MOZART +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MOZART +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Raisin Honey process +Note: Strawberry & Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0022.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0021 12-01-02-0021 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0021.Button,12-01-02-0021.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนร้อน +MOZART" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MOZART +HOT AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Raisin Honey process +Note: Strawberry & Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0021.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0021.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; - 12-01-02-0026 - + + 33 + 22 + 225 + 296 + Flag( " -.Button,12-01-02-0026.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "WHISKY DUDE +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Washed Sherry cask ferment +หอมวิสกี้ ช็อกโกแลต วนิลา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "WHISKY DUDE +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Washed Sherry cask ferment +Note: Whisky & Vanilla" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0026.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0025 12-01-02-0025 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0025.Button,12-01-02-0025.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนร้อน +WHISKY DUDE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Washed Sherry cask ferment +หอมวิสกี้ ช็อกโกแลต วนิลา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "WHISKY DUDE +HOT AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Washed Sherry cask ferment +Note: Whisky & Vanilla" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0025.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0025.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; - 12-01-02-0024 - + + 33 + 22 + 225 + 296 + Flag( " -.Button,12-01-02-0024.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "SNOWWHITE +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Anaerobic process +หอมมะลิ น้ำผึ้ง เมเปิล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "SNOWWHITE +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Anaerobic process +Note: Jasmine & Honey" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0024.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0023 12-01-02-0023 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0023.Button,12-01-02-0023.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนร้อน +SNOWWHITE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Anaerobic process +หอมมะลิ น้ำผึ้ง เมเปิล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "SNOWWHITE +HOT AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Anaerobic process +Note: Jasmine & Honey" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0023.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0023.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; - 12-01-02-0028 - + + 33 + 22 + 225 + 296 + Flag( " -.Button,12-01-02-0028.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "PURE BEAUTY +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (natural process) +หอมพีช, ชา, ช็อกโกแลต" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PURE BEAUTY +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light roast natural process: +Note: Peach, tea, chocolate" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0028.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0027 12-01-02-0027 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0027.Button,12-01-02-0027.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนร้อน +PEACHER" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Barrel-aged process +หอมพีช, ชา, ช็อกโกแลต" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEACHER +HOT AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Barrel-aged process +Note: Peach, tea, chocolate" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0027.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0027.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0014 12-01-02-0011 - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0014.Button,12-01-02-0011.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนร้อน +Guji Queen Berry" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (natural process) +หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "HOT AMERICANO +ETHIOPAI GUJI" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light roast natural process: +Strawberry, Orange, Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0014.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0011.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; 12-01-01-0013 - - + + 33 + 22 + 225 + 296 + Flag( " 12-01-01-0013.Button,-.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +Guji Queen Berry" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (natural process) +หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ESPRESSO +ETHIOPAI GUJI" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light roast natural process: +Strawberry, Orange, Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Enable" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-01-0013.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + ; - 12-01-02-0018 - + + 33 + 22 + 225 + 296 + Flag( " -.Button,12-01-02-0018.Button,-.Button") + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "QUEEN BERRY +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (washed process) +หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "QUEEN BERRY +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light roast natural process: +Strawberry, Orange, Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + "Enable" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Enable" + Var( "฿" + $12-01-02-0018.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + "Invisible" + + + 180 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + "Invisible" + Var( "฿" + $-.Price ) + + + +; Cart + + + + + diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 37123646..766766c2 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -84,8 +84,8 @@ 1000 - Var CountDownBrewing = CountDownBrewing - 1 - + Var CountDownBrewing = BREW_CNT + ; run test; ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 3a8756e1..850f1c34 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -32,8 +32,8 @@ 1000 - Var CountDownBrewing = CountDownBrewing - 1 - + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 0246e88e..ec74ca56 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -619,9 +619,7 @@ 1000 - Var CountDownBrewing = CountDownBrewing - 1 - - + Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 6f0998a3..6cbff8d5 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -163,8 +163,10 @@ EndIf - - + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" 500 @@ -246,11 +248,14 @@ If CART_INDEX < CART_COUNT Then If HaveCup = "false" Then + If CupChecking = "false" Then - Var CART_INDEX = CART_INDEX + 1 - Cart "PreparID" CART_INDEX - Cart "MakeID" CART_INDEX - Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + Var CART_INDEX = CART_INDEX + 1 + Cart "PreparID" CART_INDEX + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + + EndIf Else If CupOnArm = "true" Then diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 2e0602aa..d3f4ac29 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -172,6 +172,8 @@ Var CountStepPackPayment = CountStepPackPayment + 1 EndIf + ;Var CountStepPackPayment = 1 + DEBUGVAR Seeker DEBUGVAR HaveCup DEBUGVAR CupChecking @@ -185,6 +187,7 @@ SAVELOG ExtendData If GetPayInfoFlag = 0 Then + SaveLog "RoadShow test" If RoadShow = "false" Then ;CoinVending ON CoinVending XBILL diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml index f025044e..297856c5 100644 --- a/xml/page_show_error.xml +++ b/xml/page_show_error.xml @@ -43,27 +43,32 @@ EndIf EndIf + DEBUGVAR stop_now + DEBUGVAR MachineStage If MachineStage = "close-maintenance" Then If stop_now = "true" Then If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/vending_error_en/" - Else Var DirImage = "ROOT/taobin_project/image/vending_error" EndIf Else + Var show_error_normal = "Enable" Var show_error_sp1 = "Invisible" + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/close_en/" - Else Var DirImage = "ROOT/taobin_project/image/close_th" EndIf + EndIf EndIf + DEBUGVAR DirImage + If MachineStage = "drink-failed" Then If stop_now = "true" Then If show_eng = "true" Then @@ -94,7 +99,7 @@ LED LedDoorLid Off 255 255 255 255 EndIf - Var MaintenanceCard = 16 + Var MaintenanceCard = 20 Random MaintenanceCard Var index = 1 + MaintenanceCard @@ -111,6 +116,7 @@ DEBUGVAR DoorLidPosition DEBUGVAR EmergencyStop + Var TimeOut = 0 5000 @@ -158,6 +164,13 @@ EndIf EndIf + + Var TimeOut = TimeOut + 1 + If TimeOut > 12 Then + Var TimeOut = 0 + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf EndIf diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 97169574..4e74144e 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -13,6 +13,13 @@ DEBUGVAR EnableSelectMenuBetweenBrew + READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow + DEBUGVAR ToppingNewShow + + If ToppingNewShow = "true" Then + Open "ROOT/taobin_project/xml/page_topping_select5.xml" + EndIf + If JXMLVersionInt >= 369 Then If EnableSelectMenuBetweenBrew = "Enable" Then Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -21,119 +28,7 @@ Open "ROOT/taobin_project/xml/page_topping_select3.xml" - - DEBUGVAR BrewVersionInt - If BrewVersionInt >= 419 Then - If ConfigNumer >= 380 Then - Open "ROOT/taobin_project/xml/page_topping_select4.xml" - EndIf - EndIf - If JXMLVersionInt > 356 Then - If ConfigNumer >= 380 Then - Open "ROOT/taobin_project/xml/page_topping_select3.xml" - EndIf - EndIf - If ConfigNumer > 360 Then - SAVELOG "Recipe have smoothies" - Open "ROOT/taobin_project/xml/page_topping_select2.xml" - EndIf - - 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 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 lid_straw_bg_iamge = DirImage + "/block_strawonly.png" - - Else - - 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 - - - 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" @@ -153,395 +48,9 @@ - - - - -; back - - - DEBUGVAR TOPPING1 - DEBUGVAR TOPPING2 - DEBUGVAR TOPPING3 - DEBUGVAR TOPPING4 - DEBUGVAR toppingID1index1 - DEBUGVAR toppingID1index2 - DEBUGVAR toppingID1index3 - DEBUGVAR toppingID1index4 - DEBUGVAR toppingID1index5 - DEBUGVAR toppingID1index6 - DEBUGVAR toppingID1index7 - DEBUGVAR toppingID1index8 - DEBUGVAR toppingID1index9 - - DEBUGVAR toppingID2index1 - DEBUGVAR toppingID2index2 - DEBUGVAR toppingID2index3 - DEBUGVAR toppingID2index4 - DEBUGVAR toppingID2index5 - - - - - - DEBUGVAR MenuCodeName - DEBUGVAR toppingID1Default - DEBUGVAR toppingID2Default - DEBUGVAR toppingID3Default - - - DEBUGVAR toppingID2price2 - DEBUGVAR toppingID3price2 - - DEBUGVAR BrewParam - - If BugFlag = 1 Then - - Else - STRCONTAIN "9701" BrewParam IgnoreLidStraw - - DEBUGVAR BrewParam - DEBUGVAR IgnoreLidStraw - - - - If IgnoreLidStraw = "true" Then - Var IgnoreLidStraw = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" - - Else - If LidState = "Enable" Then - Var ShowLidStraw = "Enable" - Var ShowLidOnly = "Invisible" - Else - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Enable" - EndIf - EndIf - - If Service_LidStraw = "Disable" Then - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" - - EndIf - - ;PressForever - If TOPPING1 = "Sugar" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 1 - Var SugarState1 = "Enable" - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState1 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index5 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - If TOPPING1 = "Powder Sugar" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 1 - Var SugarState1 = "Enable" - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState1 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index5 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - - If TOPPING1 = "Sugar Premix 25" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 2 - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - If TOPPING1 = "Powder Sugar Premix 50" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 3 - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - If TOPPING1 = "Powder Sugar Premix 25" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 2 - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - - - Var ShowCollagenOnly = "Enable" - - Var BugFlag = 1 - - Var topping1 = toppingID1Default - - Var ToppingGotoPayment = "false" - - If BGSugar = "Enable" Then - If show_eng = "true" Then - Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" - Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - EndIf - EndIf - Refresh - - Var collagenShow = "true" -;-BEGIN shot layout - - Var topping3 = toppingID3Default - Var shot_h_layout = 218 - - If TOPPING2 = "shot coffee" Then - - Var ShotCoffeeBG = "Enable" - Var showShotEnable = "Enable" - - DEBUGVAR TOPPING3 - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf - Refresh - EndIf - - - If TOPPING2 = "shot coffee termtem" Then - - Var ShotCoffeeBG = "Enable" - Var showShotEnable = "Enable" - - DEBUGVAR TOPPING2 - Refresh - EndIf - - If TOPPING2 = "shot coffee 1003" Then - - Var ShotCoffeePremium = "Enable" - Var showShotEnable = "Enable" - - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf - DEBUGVAR TOPPING2 - Refresh - EndIf - - If TOPPING2 = "shot coffee 1007" Then - - Var ShotCoffeePremium = "Enable" - Var showShotEnable = "Enable" - - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf - DEBUGVAR TOPPING2 - Refresh - EndIf -;-END - If TOPPING3 = "Collagen" Then - Var CollagenState = "Enable" - Else - Var CollagenState = "Invisible" - Var ShowCollagenOnly = "Invisible" - EndIf - - - - SAVELOG ToppingGotoPayment - If ToppingGotoPayment = "true" Then - Topping "Select" SelectDrink - ; Pack - Topping "Pack" ExtendData - Open "ROOT/taobin_project/xml/page_payment.xml" - EndIf - - - If RoadShow = "true" Then - Var PriceShowValue = "Free" - EndIf - - SAVELOG toppingID2price1 - SAVELOG toppingID2price2 - SAVELOG toppingID2price3 - EndIf - - @@ -564,1054 +73,4 @@ - - 374 - 436 - 331 - 436 - PictureDrink - - - - 0 - 752 - 1080 - Center - 72 - KanitMediumTTF - 0x513C2F - showname - - - - 0 - 836 - 1080 - Center - 24 - KanitLightTTF - 0x6F5F51 - showdesc - - -; -; 0 -; 880 -; BGSugar -; 1080 -; Center -; 18 -; KanitTTF -; 0xEE8C62 -; "*ห้ามดื่มเกินวันละ 2 แก้ว เพราะหัวใจสั่น นอนไม่หลับ เด็กและสตรีมีครรภ์ไม่ควรดื่ม ผู้ป่วยควรปรึกษาแพทย์ก่อน" -; - - - - -; back - - - -; add backet - - -; next - - - - - 924 - 1804 - KanitTTF - 36 - 1080 - 0xFFFFFF - - - "OnValueChange" - - PriceDrinkTmpShow - - -;- FRAME SCORELLL - - 44 - y_topping_bg - 1080 - "auto-all" - "Vertical" - 1 - - -;- Begin topping1 - - 986 - 210 - 5 - BGSugar -; sugar layout - - BGSugar - Var( DirImage + "/img_sugar.png" ) - - -; sugar1 - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -; sugar5 - -;- END topping1 - -; -; -; -; -; -; -; -; -; -;-BEGIN shot layout - - 986 - shot_h_layout - 5 - ShotCoffeeBG - - backGroundAddExtra - - -; - - -; - - - -; Collagen left - - - - - -;-END -; -; -; -; -; -; -; -; -; -;-BEGIN shot layout - - 986 - 224 - 5 - ShotCoffeePremium - - backGroundAddExtra2 - - -; - - -; - - - -; Collagen left - - - - -;-END -; -; -; -; -; -; -; -; -; -;-BEGIN Collagen - - 986 - 242 - 5 - ShowCollagenOnly - - "Enable" - Var( DirImage + "/img_ontop_collagen.png" ) - - - -; straw left - - - - - -;- END -; -; -; -;-BEGIN Lid straw - - 986 - 232 - 10 - ShowLidOnly - - "Enable" - Var( DirImage + "/block_strawonly.png" ) - - - -; straw left - - - - - -;- END -; -; -; -; -; -; -; -; -; - -;-BEGIN Lid straw - - 986 - 274 - 10 - ShowLidStraw - - Var( DirImage + "/block_strawlid.png" ) - - -; straw left - - - - -; LID left - - - - -; -; -; -; -; -; -; -; -; - - - - Open "/media/bt/xml/security_alarm.xml" - - - diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index b2c0c307..1ba47568 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -197,7 +197,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index b2c0c307..9d5afd99 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -197,7 +197,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -1252,14 +1252,37 @@ ;-BEGIN shot layout 986 - 157 + 280 20 - ShotCoffeeBG + "Enable" + - backGroundAddExtra + 0 + 10 + Var( DirImage + "/block_top.png" ) + + 0 + 184 + Var( DirImage + "/block_bottom.png" ) + ; + + + + + 0 + 68 + Var( DirImage + "/block_middle.png" ) + + + + 40 + 70 + Var( DirImage + "/img_shot_esp.png" ) + + -; + + + 0 + 140 + Var( DirImage + "/block_middle.png" ) + + + 40 + 142 + Var( DirImage + "/img_shot_esp.png" ) + - - showText4 - 602 - 64 - Var( DirImage + "/text4.png" ) - ;-END ; diff --git a/xml_main/startup.xml b/xml_main/startup.xml index dc7ba630..748bf056 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.09" - Var XMLPageVersionInt = 609 + Var XMLPageVersion = "6.12" + Var XMLPageVersionInt = 612 diff --git a/xml_main/test_coin.xml b/xml_main/test_coin.xml new file mode 100644 index 00000000..c29ac0b7 --- /dev/null +++ b/xml_main/test_coin.xml @@ -0,0 +1,73 @@ +28 +255 + "ROOT/ui/bg_main_menu2.png" + + + 1024 + 600 + "/ROOT/pictures/test_coin.bmp" +; "/ROOT/sounds/securitycfg.wav" + SoundVolume + + Coin ON + Var TestCoinLine1 = "กรุณาใส่เงิน . . ." + Var TestCoinLine2 = "จำนวนเงินทั้งหมด 0 บาท" + Var LastCoin = 0 + + + Var LastCoin = CoinAmount - LastCoin + + Var TestCoinLine1 = "ท่านได้ใส่เงินจำนวน " + Var TestCoinLine1 = TestCoinLine1 + LastCoin + Var TestCoinLine1 = TestCoinLine1 + " บาท" + + Var TestCoinLine2 = "จำนวนเงินทั้งหมด " + Var TestCoinLine2 = TestCoinLine2 + CoinAmount + Var TestCoinLine2 = TestCoinLine2 + " บาท" + + Var LastCoin = CoinAmount + Refresh + + +; Line 1 + + 194 + 288 + 630 + Center + 40 + fontType1 + 0xF08000 + TestCoinLine1 + + +; Line 2 + + 194 + 352 + 630 + Center + 40 + fontType1 + 0xF08000 + TestCoinLine2 + + +; back button + + +