diff --git a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png new file mode 100644 index 00000000..8a243343 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png new file mode 100644 index 00000000..7c4fabe0 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_n/bn_Matcha_Latte_Premium.png b/image/page_drink_n/bn_Matcha_Latte_Premium.png new file mode 100644 index 00000000..b3963387 Binary files /dev/null and b/image/page_drink_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_n/bn_Matcha_Latte_X3.png b/image/page_drink_n/bn_Matcha_Latte_X3.png new file mode 100644 index 00000000..33e9b663 Binary files /dev/null and b/image/page_drink_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png b/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png new file mode 100644 index 00000000..dc9cfaae Binary files /dev/null and b/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png b/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png new file mode 100644 index 00000000..b9f74ca1 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Latte_Premium.png b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png new file mode 100644 index 00000000..08a5b3c5 Binary files /dev/null and b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Latte_X3.png b/image/page_drink_press_n/bn_Matcha_Latte_X3.png new file mode 100644 index 00000000..b1fdfa9b Binary files /dev/null and b/image/page_drink_press_n/bn_Matcha_Latte_X3.png differ diff --git a/image/topping_revamp_inter/bg_custom_coffee_bean_quantity.png b/image/topping_revamp_inter/bg_custom_coffee_bean_quantity.png new file mode 100644 index 00000000..2b8003dc Binary files /dev/null and b/image/topping_revamp_inter/bg_custom_coffee_bean_quantity.png differ diff --git a/image/topping_revamp_inter/bg_custom_coffee_level.png b/image/topping_revamp_inter/bg_custom_coffee_level.png new file mode 100644 index 00000000..25c74854 Binary files /dev/null and b/image/topping_revamp_inter/bg_custom_coffee_level.png differ diff --git a/image/topping_revamp_inter/bg_custom_coffee_tamping_pressure.png b/image/topping_revamp_inter/bg_custom_coffee_tamping_pressure.png new file mode 100644 index 00000000..8d6874d9 Binary files /dev/null and b/image/topping_revamp_inter/bg_custom_coffee_tamping_pressure.png differ diff --git a/image/topping_revamp_inter/bg_custom_coffee_water_level.png b/image/topping_revamp_inter/bg_custom_coffee_water_level.png new file mode 100644 index 00000000..bfb3cee6 Binary files /dev/null and b/image/topping_revamp_inter/bg_custom_coffee_water_level.png differ diff --git a/image/topping_revamp_inter/bg_custom_energy_level.png b/image/topping_revamp_inter/bg_custom_energy_level.png index ae053e3f..ca0532c5 100644 Binary files a/image/topping_revamp_inter/bg_custom_energy_level.png and b/image/topping_revamp_inter/bg_custom_energy_level.png differ diff --git a/image/topping_revamp_inter/bg_custom_sweet_level_healthy.png b/image/topping_revamp_inter/bg_custom_sweet_level_healthy.png index 2e509bcb..87a962d2 100644 Binary files a/image/topping_revamp_inter/bg_custom_sweet_level_healthy.png and b/image/topping_revamp_inter/bg_custom_sweet_level_healthy.png differ diff --git a/image/topping_revamp_inter/bg_custom_sweet_level_healthy_zero_cal.png b/image/topping_revamp_inter/bg_custom_sweet_level_healthy_zero_cal.png index 2a530b02..e2c52c33 100644 Binary files a/image/topping_revamp_inter/bg_custom_sweet_level_healthy_zero_cal.png and b/image/topping_revamp_inter/bg_custom_sweet_level_healthy_zero_cal.png differ diff --git a/image/topping_revamp_inter/bg_custom_sweet_level_zero_cal.png b/image/topping_revamp_inter/bg_custom_sweet_level_zero_cal.png index 810efe0a..3218b655 100644 Binary files a/image/topping_revamp_inter/bg_custom_sweet_level_zero_cal.png and b/image/topping_revamp_inter/bg_custom_sweet_level_zero_cal.png differ diff --git a/image/topping_revamp_inter/bg_top_custom_special.png b/image/topping_revamp_inter/bg_top_custom_special.png new file mode 100644 index 00000000..a9f3dbe4 Binary files /dev/null and b/image/topping_revamp_inter/bg_top_custom_special.png differ diff --git a/image/topping_revamp_inter/drink_select_type.png b/image/topping_revamp_inter/drink_select_type.png new file mode 100644 index 00000000..6e02d7ae Binary files /dev/null and b/image/topping_revamp_inter/drink_select_type.png differ diff --git a/inc/select_drink_current_multi_topping.inc b/inc/select_drink_current_multi_topping.inc index 5d15e054..a19ac180 100644 --- a/inc/select_drink_current_multi_topping.inc +++ b/inc/select_drink_current_multi_topping.inc @@ -1,5 +1,5 @@ - SAVELOG " select_drink_current.inc select_drink_current.inc " + SAVELOG " select_drink_current_multi select_drink_current_multi select_drink_current_multi select_drink_current_multi " Topping "Select" Seeker.selected_a_drink @@ -25,7 +25,7 @@ Topping "ClearMultiTopping" "Current" DEBUGVAR Seeker.orderFromNewTopping - + If Seeker.orderFromNewTopping = 1 Then Var Seeker.orderFromNewTopping = 0 Topping "Multiply6-ID" Seeker.strMulti6_5 diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv index f33e56aa..ebca206d 100644 --- a/inter/aus/animation01/play_list.tsv +++ b/inter/aus/animation01/play_list.tsv @@ -853,3 +853,14 @@ ICED COCONUT PEPSI 51-05-02-0091 1 62 14 13 23 24 120 17:00 23 COCONUT PEPSI FRAPPE 51-05-03-0091 1 23 62 14 41 24 120 17:00 23 ICED COCONUT LYCHEE SODA 51-05-02-0093 1 62 11 13 23 24 120 17:00 23 ICED COCONUT PEPSI MAX 51-05-02-0117 1 62 14 13 23 24 120 17:00 23 + +Hot coconut latte 51-21-01-0081 1 2 3 4 5 62 6 24 120 17:00 23 +Iced coconut latte 51-21-02-0081 1 2 3 4 5 62 6 23 24 120 17:00 23 +Frappe coconut latte 51-21-03-0081 1 2 3 4 5 62 6 23 41 24 120 17:00 23 +Cafe Mocha protein 51-04-02-0062 1 2 3 4 5 25 26 70 23 24 120 17:00 23 +Hot Mint Matcha Latte 51-02-01-0050 1 8 9 59 70 24 120 17:00 23 +Hot Coconut Matcha Latte 51-02-01-0060 1 8 9 62 70 24 120 17:00 23 +Hot Coconut Matcha tea 51-02-01-0061 1 8 9 62 24 120 17:00 23 +Frappe Vanilla Caramel Latte 51-21-03-0079 1 2 3 4 5 63 22 23 41 24 120 17:00 23 +Hot strawberry matcha 51-02-01-0071 1 8 9 19 70 24 120 17:00 23 +Frappe strawberry matcha latte 51-02-03-0071 1 8 9 19 70 23 41 24 120 17:00 23 diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png new file mode 100644 index 00000000..cbdbda29 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png index 48cf43ce..4ec3d9bf 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_TEA.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_TEA.png new file mode 100644 index 00000000..7d140370 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_TEA.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png index d102930f..93f5dab3 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_mint_matcha_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_mint_matcha_latte.png new file mode 100644 index 00000000..d705c701 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_hot_mint_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_strawberry_matcha_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_strawberry_matcha_latte.png new file mode 100644 index 00000000..a399123a Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_hot_strawberry_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png new file mode 100644 index 00000000..1354c474 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png new file mode 100644 index 00000000..8167917d Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png index 572cf1dd..bcb08b4a 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_TEA.png b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_TEA.png new file mode 100644 index 00000000..176f586c Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_TEA.png differ diff --git a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png index 4973c3e3..795a7e3b 100644 Binary files a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_mint_matcha_latte.png b/inter/aus/image/page_drink_n/bn_hot_mint_matcha_latte.png new file mode 100644 index 00000000..8cff8fe9 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_hot_mint_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_strawberry_matcha_latte.png b/inter/aus/image/page_drink_n/bn_hot_strawberry_matcha_latte.png new file mode 100644 index 00000000..1224b2c0 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_hot_strawberry_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_n/bn_protein_Mocha.png new file mode 100644 index 00000000..dc824e4b Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_protein_Mocha.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png new file mode 100644 index 00000000..7d963b6d Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png index 3dd55ca9..7cbe9568 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_TEA.png new file mode 100644 index 00000000..850f1eb1 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_TEA.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png index 6e87301c..c119d2a7 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_mint_matcha_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_mint_matcha_latte.png new file mode 100644 index 00000000..17d9dbf0 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_hot_mint_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_strawberry_matcha_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_strawberry_matcha_latte.png new file mode 100644 index 00000000..4e79a8ef Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_hot_strawberry_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png new file mode 100644 index 00000000..d8c12e5b Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png new file mode 100644 index 00000000..31d3e62c Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png index cbba69c9..d1cad1df 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_TEA.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_TEA.png new file mode 100644 index 00000000..163c1e04 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_TEA.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png index 1a339140..2333b9b4 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_mint_matcha_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_mint_matcha_latte.png new file mode 100644 index 00000000..5a964d34 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_hot_mint_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_strawberry_matcha_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_strawberry_matcha_latte.png new file mode 100644 index 00000000..3856cd4b Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_hot_strawberry_matcha_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png new file mode 100644 index 00000000..287f4925 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png differ diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml index 6d297424..262034ed 100644 --- a/inter/aus/xml/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/page_catalog_group_coffee.lxml @@ -23804,6 +23804,550 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-21-01-0081 51-21-02-0081 51-21-03-0081 + + 33 + 22 + 225 + 296 + Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,$Sum512101008151210200815121030081) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + COCONUT\nLATTE + + COCONUT\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso, Milk, Coconut Syrup,\nSugar, Water + + Espresso, Milk, Coconut Syrup,\nSugar, Water + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-21-01-0081.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-01-0081.Button + StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-21-02-0081.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-02-0081.Button + StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-21-03-0081.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-03-0081.Button + StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum512101008151210200815121030081 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum512101008151210200815121030081 = "Disable" Then + STRCONTAIN "ERR" $51-21-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $51-21-02-0081.TAG tag2_is_disable + STRCONTAIN "ERR" $51-21-03-0081.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum512101008151210200815121030081 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 51-21-03-0079 + + 33 + 22 + 225 + 296 + Flag( 51-21-03-0079.Button,$Sum5121030079) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + VANILLA CARAMEL\nLATTE + + VANILLA CARAMEL\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso, Caramel,Vanilla Syrup,\nSugar, Water + + Espresso, Caramel,Vanilla Syrup,\nSugar, Water + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-21-03-0079.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-03-0079.Button + StringFmt( $51-21-03-0079.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5121030079 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $51-21-03-0079.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5121030079 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml index bf9e9bc3..7643dd10 100644 --- a/inter/aus/xml/page_catalog_group_tea.lxml +++ b/inter/aus/xml/page_catalog_group_tea.lxml @@ -14780,6 +14780,1102 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-02-01-0050 - - + + 33 + 22 + 225 + 296 + Flag( 51-02-01-0050.Button,$Sum5102010050) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MINT MATCHA\nLATTE + + MINT MATCHA\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha Tea ,Water, Mint Syrup, Milk + + Matcha Tea ,Water, Mint Syrup, Milk + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-02-01-0050.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-01-0050.Button + StringFmt( $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5102010050 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5102010050 = "Disable" Then + STRCONTAIN "ERR" $51-02-01-0050.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5102010050 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 51-02-01-0060 - - + + 33 + 22 + 225 + 296 + Flag( 51-02-01-0060.Button,$Sum5102010060) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + COCONUT MATCHA\nLATTE + + COCONUT MATCHA\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha Tea ,Water, Coconut Syrup, Milk + + Matcha Tea ,Water, Coconut Syrup, Milk + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-02-01-0060.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-01-0060.Button + StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5102010060 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5102010060 = "Disable" Then + STRCONTAIN "ERR" $51-02-01-0060.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5102010060 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 51-02-01-0061 - - + + 33 + 22 + 225 + 296 + Flag( 51-02-01-0061.Button,$Sum5102010061) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + COCONUT MATCHA\nTEA + + COCONUT MATCHA\nTEA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha Tea ,Water, Coconut Syrup + + Matcha Tea ,Water, Coconut Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-02-01-0061.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-01-0061.Button + StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5102010061 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5102010061 = "Disable" Then + STRCONTAIN "ERR" $51-02-01-0061.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5102010061 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 51-02-01-0071 - 51-02-03-0071 + + 33 + 22 + 225 + 296 + Flag( 51-02-01-0071.Button,51-02-03-0071.Button,$Sum51020100715102030071) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + STRAWBERRY MATCHA\nLATTE + + STRAWBERRY MATCHA\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha Tea ,Water, Strawberry Syrup, Milk + + Matcha Tea ,Water, Strawberry Syrup, Milk + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-02-01-0071.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-01-0071.Button + StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-02-03-0071.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-03-0071.Button + StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum51020100715102030071 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum51020100715102030071 = "Disable" Then + STRCONTAIN "ERR" $51-02-01-0071.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $51-02-03-0071.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum51020100715102030071 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/aus/xml/page_catalog_group_whey.lxml b/inter/aus/xml/page_catalog_group_whey.lxml index 8aae650a..e9560a10 100644 --- a/inter/aus/xml/page_catalog_group_whey.lxml +++ b/inter/aus/xml/page_catalog_group_whey.lxml @@ -5173,6 +5173,276 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-04-02-0062 - + + 33 + 22 + 225 + 296 + Flag( 51-04-02-0062.Button,$Sum5104020062) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MOCHA\nPROTEIN SHAKE + + MOCHA\nPROTEIN SHAKE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Whey protein, Espresso\n& Milk, Chocolate + + Whey protein, Espresso\n& Milk, Chocolate + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-04-02-0062.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-04-02-0062.Button + StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5104020062 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-04-02-0062.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5104020062 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/hkg/xml/multi/page_catalog.lxml b/inter/hkg/xml/multi/page_catalog.lxml index 36ff61e4..b203c17f 100644 --- a/inter/hkg/xml/multi/page_catalog.lxml +++ b/inter/hkg/xml/multi/page_catalog.lxml @@ -205,7 +205,7 @@ Var menu_name_thai_blender = "" Var menu_desc_thai_blender = "" - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev" TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev" diff --git a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py index fd4322ee..c03a1cc9 100644 --- a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py +++ b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py @@ -310,6 +310,33 @@ out_xml('\t\t\n') out_xml('\t\t\n\n') + def GenBanner(type, thai_media, eng_media, event_on_click_script, start_date_time, end_date_time, state_var): + str_con = [] + if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', start_date_time.strip()): + str_con.append(f'DateTimeStart="{start_date_time.strip()}"') + if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', end_date_time.strip()): + str_con.append(f'DateTimeEnd="{end_date_time.strip()}"') + + if re.match(r'^\w.*', state_var.strip()): + str_con.append(f'Var={state_var.strip()},') + + out_xml('\t\t\n') + out_xml('\t\t\t Flag( '+ ",".join(str_con) + ' ) \n') + out_xml('\t\t\t ' + type + ' \n') + out_xml('\t\t\t\n') + out_xml('\t\t\t\teval(\n') + out_xml('\t\t\t\t\tIf show_eng = "true" Then\n') + out_xml('\t\t\t\t\t\tVar return = ' + eng_media + '\n') + out_xml('\t\t\t\t\tElse\n') + out_xml('\t\t\t\t\t\tVar return = ' + thai_media + '\n') + out_xml('\t\t\t\t\tEndIf\n') + out_xml('\t\t\t\t)\n') + out_xml('\t\t\t\n') + out_xml('\t\t\t\n') + out_xml('\t\t\t\t' + event_on_click_script.replace('\\n', '\n').replace('\\t', '\t') + '\n') + out_xml('\t\t\t\n') + out_xml('\t\t\n') + idx_lang_myanmar = 6 idx_lang_malay = 5 idx_lang_japan = 4 @@ -409,26 +436,38 @@ out_xml( '\t;' + spl[0] + '\r\n') continue - [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',') - [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',') - [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',') + if spl[idx_desc][idx_lang_eng].startswith("BANNER"): + date_time_start = spl[idx_name][idx_date_time_start] + date_time_end = spl[idx_name][idx_date_time_end] + state_var = spl[idx_name][idx_product_var] - date_time_start = spl[idx_name][idx_date_time_start] - date_time_end = spl[idx_name][idx_date_time_end] - product_var = spl[idx_name][idx_product_var] - try: - default_topping = spl[idx_name][idx_of_default_toppimg] - except: - default_topping = "0" - print(f"spl[{idx_name}] =", spl[idx_name]) - print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var} , default_topping={default_topping}") + type = spl[idx_desc][idx_lang_thai] + eng_media = spl[idx_img][idx_lang_eng] + thai_media = spl[idx_img][idx_lang_thai] + on_click_script = spl[idx_name][idx_lang_thai] - for [hot_pd, cold_pd, blend_pd] in [[hot_pd_v1, cold_pd_v1, blend_pd_v1], [hot_pd_v2, cold_pd_v2, blend_pd_v2]]: - if hot_pd == '-' and cold_pd == '-' and blend_pd == '-': - continue - else: - print(f"Gen ==> hot={hot_pd}, cold={cold_pd}, blend={blend_pd}") - GenMenuV3(hot_pd, cold_pd, blend_pd, date_time_start, date_time_end, product_var, default_topping) + GenBanner(type, thai_media, eng_media, on_click_script, date_time_start, date_time_end, state_var) + else: + [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',') + [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',') + [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',') + + date_time_start = spl[idx_name][idx_date_time_start] + date_time_end = spl[idx_name][idx_date_time_end] + product_var = spl[idx_name][idx_product_var] + try: + default_topping = spl[idx_name][idx_of_default_toppimg] + except: + default_topping = "0" + print(f"spl[{idx_name}] =", spl[idx_name]) + print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var} , default_topping={default_topping}") + + for [hot_pd, cold_pd, blend_pd] in [[hot_pd_v1, cold_pd_v1, blend_pd_v1], [hot_pd_v2, cold_pd_v2, blend_pd_v2]]: + if hot_pd == '-' and cold_pd == '-' and blend_pd == '-': + continue + else: + print(f"Gen ==> hot={hot_pd}, cold={cold_pd}, blend={blend_pd}") + GenMenuV3(hot_pd, cold_pd, blend_pd, date_time_start, date_time_end, product_var, default_topping) out_xml('\t\t\n\n') out_xml('\n') diff --git a/xml/page_payment.xml b/xml/page_payment.xml index da48d0aa..615ba1c3 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -213,6 +213,7 @@ Else Var DirImage = "ROOT/taobin_project/image/page_payment" Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3" + Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a" If SongkranSoundCampaign = 1 Then Var PlaySoundLag = SelectPayMethodSound[SoundCampaignIndex] @@ -220,10 +221,8 @@ If CountryName = "HongKong" Then Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3" + Var PlaySoundCodeLang = "ROOT/taobin_project/sound_eng/Code8digit.mp3" EndIf - - - Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a" EndIf diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index d35f293c..2bacc504 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -860,7 +860,7 @@ Var LOADING_STATE = "Enable" Var alphaState = "Enable" Var PopupCancelButtonState = "Enable" - Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + Var RemainAmountX = RemainAmount CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 EndIf diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml index 9c4d39c0..33236049 100644 --- a/xml/page_payment_cash-HKG.xml +++ b/xml/page_payment_cash-HKG.xml @@ -1137,7 +1137,6 @@ If EnablingCountDown = 0 Then Var Timeout = 0 Var UserChoosePayment = "CreditCard" - Var QRErrorState = "Enable" Var QR_POPUP = DirQR_popup + "/img_tap_card_5_sec.png" Var VendingCashless = "-" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 813ff0d1..61e83e2b 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -2010,7 +2010,7 @@ Var QRErrorState = "Invisible" Var VendingCashless = "-" Var ServiceCharge = 3 - Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + Var RemainAmountX = RemainAmount Var RemainAmountX = RemainAmountX + ServiceCharge CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 @@ -2028,7 +2028,7 @@ Var QR_POPUP = "/img_popup8-2.png" Var VendingCashless = "-" Var LOADING_STATE = "Enable" - Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + Var RemainAmountX = RemainAmount CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 EndIf diff --git a/xml/v3/menu_new_layout_gen_v3.py b/xml/v3/menu_new_layout_gen_v3.py index 84c5a6de..213248fc 100644 --- a/xml/v3/menu_new_layout_gen_v3.py +++ b/xml/v3/menu_new_layout_gen_v3.py @@ -87,229 +87,25 @@ count = 0 pd_code_available = '##-##-##-####' - def GenMenuV3(spl): - out_xml( '\t\t; ==================> Len = ' + str(len(spl)) + '\n') - menu_img = spl[7] - out_xml( '\t\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \n') - str_con = "" - str_con_var = "" - if spl[4] != '-': - str_con += spl[4] + '.Button,' - if spl[5] != '-': - str_con += spl[5] + '.Button,' - if spl[6] != '-': - str_con += spl[6] + '.Button,' - - if spl[4] != '-': - str_con_var += spl[4] + '-' - if spl[5] != '-': - str_con_var += spl[5] + '-' - if spl[6] != '-': - str_con_var += spl[6] + '-' - - str_con_var = str_con_var.replace("-", "") - - if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()): - str_con += f'DateTimeStart="{spl[12].strip()}",' - if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()): - str_con += f'DateTimeEnd="{spl[13].strip()}",' - - if re.match(r'^\w.*', spl[14].strip()): - str_con += f'Var={spl[14].strip()},' - - if recommend_page: - str_con += "Disable=Invisible," - - str_con += "$Sum" + str_con_var - - out_xml('\t\t\n') - out_xml('\t\t Flag( '+ str_con + ') \n') - - pd_code_1 = spl[4] - pd_stage1 = '$' + spl[4] + '.Button' - if spl[4] == "-" or len(spl[4]) == 0 : - pd_code_1 = pd_code_available - pd_stage1 = '"Disable2"' - - pd_code_2 = spl[5] - pd_stage2 = '$' + spl[5] + '.Button' - if spl[5] == "-" or len(spl[5]) == 0: - pd_code_2 = pd_code_available - pd_stage2 = '"Disable2"' - - pd_code_3 = spl[6] - pd_stage3 = '$' + spl[6] + '.Button' - if spl[6] == "-" or len(spl[6]) == 0: - pd_code_3 = pd_code_available - pd_stage3 = '"Disable2"' - - if menu_img.startswith("#"): - out_xml( '\t\t '+ menu_img[1:] + '_resting \n') - out_xml( '\t\t '+ menu_img[1:] + '_press \n') - out_xml( '\t\t '+ menu_img[1:] + '_disable \n') - else: - out_xml( '\t\t "' + new_default_dir + '/'+ menu_img +'" \n') - out_xml( '\t\t "' + new_default_dir_press + '/'+ menu_img +'" \n') - out_xml( '\t\t "' + new_default_dir_disable + '/'+ menu_img +'" \n') - - if spl[1] != "None": - out_xml('\t\t\n') - out_xml('\t\t\teval(\n') - out_xml('\t\t\t\tIf show_eng = "true" Then\n') - out_xml('\t\t\t\t\tVar return = "' + spl[1] + '"\n') - out_xml('\t\t\t\tElse\n') - out_xml('\t\t\t\t\tVar return = "' + spl[0] + '"\n') - out_xml('\t\t\t\tEndIf\n') - out_xml('\t\t\t)\n') - out_xml('\t\t\n') - out_xml('\t\t\n') - out_xml('\t\t\teval(\n') - out_xml('\t\t\t\tIf show_eng = "true" Then\n') - out_xml('\t\t\t\t\tVar return = "' + spl[3] + '"\n') - out_xml('\t\t\t\tElse\n') - out_xml('\t\t\t\t\tVar return = "' + spl[2] + '"\n') - out_xml('\t\t\t\tEndIf\n') - out_xml('\t\t\t)\n') - out_xml('\t\t\n') - - out_xml('\t\t ' + pd_stage1 + ' \n') - out_xml('\t\t ' + pd_stage2 + ' \n') - out_xml('\t\t ' + pd_stage3 + ' \n') - out_xml('\t\t StringFmt( $' + pd_code_1 + '.Price , DisplayFormat, PreScaleConvertShow) \n') - out_xml('\t\t StringFmt( $' + pd_code_2 + '.Price , DisplayFormat, PreScaleConvertShow) \n') - out_xml('\t\t StringFmt( $' + pd_code_3 + '.Price , DisplayFormat, PreScaleConvertShow) \n') - out_xml('\t\t\n') - out_xml('\t\t\teval(\n') - out_xml('\t\t\t\tIf ICE_PROCESS_STATUS = 2 Then\n') - out_xml('\t\t\t\t\tIf $Sum510201003951020200395102030039 = "Disable" Then\n') - out_xml('\t\t\t\t\t\tVar ice_tab_process_show = "Disable"\n') - out_xml('\t\t\t\t\tElse\n') - out_xml('\t\t\t\t\t\tVar ice_tab_process_show = "Enable"\n') - out_xml('\t\t\t\t\tEndIf\n') - out_xml('\t\t\t\tElse\n') - out_xml('\t\t\t\t\tVar ice_tab_process_show = "Invisible"\n') - out_xml('\t\t\t\tEndIf\n') - out_xml('\t\t\t\tVar return = ice_tab_process_show\n') - out_xml('\t\t\t)\n') - out_xml('\t\t\n') - out_xml('\t\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" \n') - out_xml('\t\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" \n') - out_xml('\t\t\n') - if menu_img.startswith("#"): - out_xml( '\t\tVar PictureDrink = bn_oreo_vo_get1_full_path\r\n') - else: - out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n') - out_xml('\t\t\tVar OpenFromXML = CurrentXMLFileName2\n') - out_xml('\t\t\tVar PriceD1 = $' + pd_code_1 + '.Price\n') - out_xml('\t\t\tVar PriceD2 = $' + pd_code_2 + '.Price\n') - out_xml('\t\t\tVar PriceD3 = $' + pd_code_3 + '.Price\n') - out_xml('\t\t\tVar PD_CODE1 = "' + pd_code_1 + '"\n') - out_xml('\t\t\tVar PD_CODE2 = "' + pd_code_2 + '"\n') - out_xml('\t\t\tVar PD_CODE3 = "' + pd_code_3 + '"\n') - out_xml('\t\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\n') - out_xml('\t\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\n') - out_xml('\t\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\n') - - if len( spl) > 11: - if spl[4] != '-': - menu_xml_var = 'xmlpro( '+spl[4]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' - elif spl[6] != '-': - menu_xml_var = 'xmlpro( '+spl[6]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' - else: - menu_xml_var = 'xmlpro( '+spl[5]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' - - - if len( menu_xml_var) > 0: - out_xml( '\t\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\n') - out_xml( '\t\t\tDEBUGVAR OverlayMenuFilter\n') - - - - - out_xml( '\t\t\tVar SelectCountDrinkType = 0\n') - out_xml( '\t\t\tVar DefaultDrinkType = 0\n') - - out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\n') - out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n') - out_xml( '\t\t\t\tVar DefaultDrinkType = 1\n') - out_xml( '\t\t\tEndIf\n') - - - out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n') - out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n') - out_xml( '\t\t\t\tVar DefaultDrinkType = 2\n') - out_xml( '\t\t\tEndIf\n') - - - out_xml( '\t\t\tIf PD_STAGE_3 = "Enable" Then\n') - out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n') - out_xml( '\t\t\t\tVar DefaultDrinkType = 3\n') - out_xml( '\t\t\tEndIf\n') - - - - out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n') - #out_xml( \t'\t\t\tVar PD_STAGE_2 = "Enable"\n') - out_xml( '\t\t\t\tTopping "Load" "'+ spl[5].replace("-alter", "") +'"\n') - out_xml( '\t\t\tElse\n') - out_xml( '\t\t\t\tIf PD_STAGE_1 = "Enable" Then\n') - #out_xml( \t'\t\t\t\tVar PD_STAGE_1 = "Enable"\n') - out_xml( '\t\t\t\tTopping "Load" "'+ spl[4].replace("-alter", "") +'"\n') - out_xml( '\t\t\t\tElse\n') - #out_xml( \t'\t\t\t\tVar PD_STAGE_3 = "Enable"\n') - out_xml( '\t\t\t\tTopping "Load" "'+ spl[6].replace("-alter", "") +'"\n') - out_xml( '\t\t\t\tEndIf\n') - out_xml( '\t\t\tEndIf\n') - - - - out_xml( '\t\t\tVar menu_name_eng_hot = $' + pd_code_1 + '.NameE\n') - out_xml( '\t\t\tVar menu_desc_eng_hot = $' + pd_code_1 + '.descriptionE\n') - out_xml( '\t\t\tVar menu_name_thai_hot = $' + pd_code_1 + '.Name\n') - out_xml( '\t\t\tVar menu_desc_thai_hot = $' + pd_code_1 + '.description\n') - out_xml( '\t\t\t\n') - out_xml( '\t\t\tVar menu_name_eng_cold = $' + pd_code_2 + '.NameE\n') - out_xml( '\t\t\tVar menu_desc_eng_cold = $' + pd_code_2 + '.descriptionE\n') - out_xml( '\t\t\tVar menu_name_thai_cold = $' + pd_code_2 + '.Name\n') - out_xml( '\t\t\tVar menu_desc_thai_cold = $' + pd_code_2 + '.description\n') - out_xml( '\t\t\t\n') - out_xml( '\t\t\tVar menu_name_eng_blender = $' + pd_code_3 + '.NameE\n') - out_xml( '\t\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\n') - out_xml( '\t\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\n') - out_xml( '\t\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\n') - - - - - out_xml( '\t\t\t\n') - out_xml( '\t\t\tDEBUGVAR PD_STAGE_1\n') - out_xml( '\t\t\tDEBUGVAR PD_STAGE_2\n') - out_xml( '\t\t\tDEBUGVAR PD_STAGE_3\n') - out_xml( '\t\t\tVar SelectDrinkType = 0\n') - - out_xml( '\t\t\t'+ button_add_string +'\n') - out_xml( '\t\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\n') - out_xml('\t\t\n') - out_xml('\t\t\n\n') - - if spl[8] != '-' or spl[9] != '-' or spl[10] != '-': + def GenMenuV3(spl): + out_xml( '\t\t; ==================> Len = ' + str(len(spl)) + '\n') menu_img = spl[7] - out_xml( '\t\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \n') + out_xml( '\t\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \n') str_con = "" str_con_var = "" - if spl[8] != '-': - str_con += spl[8] + '.Button,' - if spl[9] != '-': - str_con += spl[9] + '.Button,' - if spl[10] != '-': - str_con += spl[10] + '.Button,' + if spl[4] != '-': + str_con += spl[4] + '.Button,' + if spl[5] != '-': + str_con += spl[5] + '.Button,' + if spl[6] != '-': + str_con += spl[6] + '.Button,' - if spl[8] != '-': - str_con_var += spl[8] + '-' - if spl[9] != '-': - str_con_var += spl[9] + '-' - if spl[10] != '-': - str_con_var += spl[10] + '-' + if spl[4] != '-': + str_con_var += spl[4] + '-' + if spl[5] != '-': + str_con_var += spl[5] + '-' + if spl[6] != '-': + str_con_var += spl[6] + '-' str_con_var = str_con_var.replace("-", "") @@ -329,21 +125,21 @@ out_xml('\t\t\n') out_xml('\t\t Flag( '+ str_con + ') \n') - pd_code_1 = spl[8] - pd_stage1 = '$' + spl[8] + '.Button' - if spl[8] == "-" or len(spl[8]) == 0 : + pd_code_1 = spl[4] + pd_stage1 = '$' + spl[4] + '.Button' + if spl[4] == "-" or len(spl[4]) == 0 : pd_code_1 = pd_code_available pd_stage1 = '"Disable2"' - pd_code_2 = spl[9] - pd_stage2 = '$' + spl[9] + '.Button' - if spl[9] == "-" or len(spl[9]) == 0: + pd_code_2 = spl[5] + pd_stage2 = '$' + spl[5] + '.Button' + if spl[5] == "-" or len(spl[5]) == 0: pd_code_2 = pd_code_available pd_stage2 = '"Disable2"' - pd_code_3 = spl[10] - pd_stage3 = '$' + spl[10] + '.Button' - if spl[10] == "-" or len(spl[10]) == 0: + pd_code_3 = spl[6] + pd_stage3 = '$' + spl[6] + '.Button' + if spl[6] == "-" or len(spl[6]) == 0: pd_code_3 = pd_code_available pd_stage3 = '"Disable2"' @@ -415,12 +211,12 @@ out_xml('\t\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\n') if len( spl) > 11: - if spl[8] != '-': - menu_xml_var = 'xmlpro( '+spl[8]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' - elif spl[9] != '-': - menu_xml_var = 'xmlpro( '+spl[9]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' + if spl[4] != '-': + menu_xml_var = 'xmlpro( '+spl[4]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' + elif spl[6] != '-': + menu_xml_var = 'xmlpro( '+spl[6]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' else: - menu_xml_var = 'xmlpro( '+spl[10]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' + menu_xml_var = 'xmlpro( '+spl[5]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' if len( menu_xml_var) > 0: @@ -454,14 +250,14 @@ out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n') #out_xml( \t'\t\t\tVar PD_STAGE_2 = "Enable"\n') - out_xml( '\t\t\t\tTopping "Load" "'+ spl[10].replace("-alter", "") +'"\n') + out_xml( '\t\t\t\tTopping "Load" "'+ spl[5].replace("-alter", "") +'"\n') out_xml( '\t\t\tElse\n') out_xml( '\t\t\t\tIf PD_STAGE_1 = "Enable" Then\n') #out_xml( \t'\t\t\t\tVar PD_STAGE_1 = "Enable"\n') - out_xml( '\t\t\t\tTopping "Load" "'+ spl[8].replace("-alter", "") +'"\n') + out_xml( '\t\t\t\tTopping "Load" "'+ spl[4].replace("-alter", "") +'"\n') out_xml( '\t\t\t\tElse\n') #out_xml( \t'\t\t\t\tVar PD_STAGE_3 = "Enable"\n') - out_xml( '\t\t\t\tTopping "Load" "'+ spl[9].replace("-alter", "") +'"\n') + out_xml( '\t\t\t\tTopping "Load" "'+ spl[6].replace("-alter", "") +'"\n') out_xml( '\t\t\t\tEndIf\n') out_xml( '\t\t\tEndIf\n') @@ -496,19 +292,254 @@ out_xml('\t\t\n') out_xml('\t\t\n\n') - def GenListMenu(): - for spl in menu_new_list: - #product_code = s - if spl[0] == "IGNORE": - continue + if spl[8] != '-' or spl[9] != '-' or spl[10] != '-': + menu_img = spl[7] + out_xml( '\t\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \n') + str_con = "" + str_con_var = "" + if spl[8] != '-': + str_con += spl[8] + '.Button,' + if spl[9] != '-': + str_con += spl[9] + '.Button,' + if spl[10] != '-': + str_con += spl[10] + '.Button,' - if spl[0].startswith("TAG"): - out_xml( '\t;' + spl[0] + '\r\n') - continue + if spl[8] != '-': + str_con_var += spl[8] + '-' + if spl[9] != '-': + str_con_var += spl[9] + '-' + if spl[10] != '-': + str_con_var += spl[10] + '-' - GenMenuV3(spl) + str_con_var = str_con_var.replace("-", "") - out_xml('\t\t; menu_new_list '+ str(len(menu_new_list))+'\n') - GenListMenu() + if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()): + str_con += f'DateTimeStart="{spl[12].strip()}",' + if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()): + str_con += f'DateTimeEnd="{spl[13].strip()}",' - out_xml('\n') + if re.match(r'^\w.*', spl[14].strip()): + str_con += f'Var={spl[14].strip()},' + + if recommend_page: + str_con += "Disable=Invisible," + + str_con += "$Sum" + str_con_var + + out_xml('\t\t\n') + out_xml('\t\t Flag( '+ str_con + ') \n') + + pd_code_1 = spl[8] + pd_stage1 = '$' + spl[8] + '.Button' + if spl[8] == "-" or len(spl[8]) == 0 : + pd_code_1 = pd_code_available + pd_stage1 = '"Disable2"' + + pd_code_2 = spl[9] + pd_stage2 = '$' + spl[9] + '.Button' + if spl[9] == "-" or len(spl[9]) == 0: + pd_code_2 = pd_code_available + pd_stage2 = '"Disable2"' + + pd_code_3 = spl[10] + pd_stage3 = '$' + spl[10] + '.Button' + if spl[10] == "-" or len(spl[10]) == 0: + pd_code_3 = pd_code_available + pd_stage3 = '"Disable2"' + + if menu_img.startswith("#"): + out_xml( '\t\t '+ menu_img[1:] + '_resting \n') + out_xml( '\t\t '+ menu_img[1:] + '_press \n') + out_xml( '\t\t '+ menu_img[1:] + '_disable \n') + else: + out_xml( '\t\t "' + new_default_dir + '/'+ menu_img +'" \n') + out_xml( '\t\t "' + new_default_dir_press + '/'+ menu_img +'" \n') + out_xml( '\t\t "' + new_default_dir_disable + '/'+ menu_img +'" \n') + + if spl[1] != "None": + out_xml('\t\t\n') + out_xml('\t\t\teval(\n') + out_xml('\t\t\t\tIf show_eng = "true" Then\n') + out_xml('\t\t\t\t\tVar return = "' + spl[1] + '"\n') + out_xml('\t\t\t\tElse\n') + out_xml('\t\t\t\t\tVar return = "' + spl[0] + '"\n') + out_xml('\t\t\t\tEndIf\n') + out_xml('\t\t\t)\n') + out_xml('\t\t\n') + out_xml('\t\t\n') + out_xml('\t\t\teval(\n') + out_xml('\t\t\t\tIf show_eng = "true" Then\n') + out_xml('\t\t\t\t\tVar return = "' + spl[3] + '"\n') + out_xml('\t\t\t\tElse\n') + out_xml('\t\t\t\t\tVar return = "' + spl[2] + '"\n') + out_xml('\t\t\t\tEndIf\n') + out_xml('\t\t\t)\n') + out_xml('\t\t\n') + + out_xml('\t\t ' + pd_stage1 + ' \n') + out_xml('\t\t ' + pd_stage2 + ' \n') + out_xml('\t\t ' + pd_stage3 + ' \n') + out_xml('\t\t StringFmt( $' + pd_code_1 + '.Price , DisplayFormat, PreScaleConvertShow) \n') + out_xml('\t\t StringFmt( $' + pd_code_2 + '.Price , DisplayFormat, PreScaleConvertShow) \n') + out_xml('\t\t StringFmt( $' + pd_code_3 + '.Price , DisplayFormat, PreScaleConvertShow) \n') + out_xml('\t\t\n') + out_xml('\t\t\teval(\n') + out_xml('\t\t\t\tIf ICE_PROCESS_STATUS = 2 Then\n') + out_xml('\t\t\t\t\tIf $Sum510201003951020200395102030039 = "Disable" Then\n') + out_xml('\t\t\t\t\t\tVar ice_tab_process_show = "Disable"\n') + out_xml('\t\t\t\t\tElse\n') + out_xml('\t\t\t\t\t\tVar ice_tab_process_show = "Enable"\n') + out_xml('\t\t\t\t\tEndIf\n') + out_xml('\t\t\t\tElse\n') + out_xml('\t\t\t\t\tVar ice_tab_process_show = "Invisible"\n') + out_xml('\t\t\t\tEndIf\n') + out_xml('\t\t\t\tVar return = ice_tab_process_show\n') + out_xml('\t\t\t)\n') + out_xml('\t\t\n') + out_xml('\t\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" \n') + out_xml('\t\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" \n') + out_xml('\t\t\n') + if menu_img.startswith("#"): + out_xml( '\t\tVar PictureDrink = bn_oreo_vo_get1_full_path\r\n') + else: + out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n') + out_xml('\t\t\tVar OpenFromXML = CurrentXMLFileName2\n') + out_xml('\t\t\tVar PriceD1 = $' + pd_code_1 + '.Price\n') + out_xml('\t\t\tVar PriceD2 = $' + pd_code_2 + '.Price\n') + out_xml('\t\t\tVar PriceD3 = $' + pd_code_3 + '.Price\n') + out_xml('\t\t\tVar PD_CODE1 = "' + pd_code_1 + '"\n') + out_xml('\t\t\tVar PD_CODE2 = "' + pd_code_2 + '"\n') + out_xml('\t\t\tVar PD_CODE3 = "' + pd_code_3 + '"\n') + out_xml('\t\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\n') + out_xml('\t\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\n') + out_xml('\t\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\n') + + if len( spl) > 11: + if spl[8] != '-': + menu_xml_var = 'xmlpro( '+spl[8]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' + elif spl[9] != '-': + menu_xml_var = 'xmlpro( '+spl[9]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' + else: + menu_xml_var = 'xmlpro( '+spl[10]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")' + + + if len( menu_xml_var) > 0: + out_xml( '\t\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\n') + out_xml( '\t\t\tDEBUGVAR OverlayMenuFilter\n') + + + + + out_xml( '\t\t\tVar SelectCountDrinkType = 0\n') + out_xml( '\t\t\tVar DefaultDrinkType = 0\n') + + out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\n') + out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n') + out_xml( '\t\t\t\tVar DefaultDrinkType = 1\n') + out_xml( '\t\t\tEndIf\n') + + + out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n') + out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n') + out_xml( '\t\t\t\tVar DefaultDrinkType = 2\n') + out_xml( '\t\t\tEndIf\n') + + + out_xml( '\t\t\tIf PD_STAGE_3 = "Enable" Then\n') + out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n') + out_xml( '\t\t\t\tVar DefaultDrinkType = 3\n') + out_xml( '\t\t\tEndIf\n') + + + + out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n') + #out_xml( \t'\t\t\tVar PD_STAGE_2 = "Enable"\n') + out_xml( '\t\t\t\tTopping "Load" "'+ spl[10].replace("-alter", "") +'"\n') + out_xml( '\t\t\tElse\n') + out_xml( '\t\t\t\tIf PD_STAGE_1 = "Enable" Then\n') + #out_xml( \t'\t\t\t\tVar PD_STAGE_1 = "Enable"\n') + out_xml( '\t\t\t\tTopping "Load" "'+ spl[8].replace("-alter", "") +'"\n') + out_xml( '\t\t\t\tElse\n') + #out_xml( \t'\t\t\t\tVar PD_STAGE_3 = "Enable"\n') + out_xml( '\t\t\t\tTopping "Load" "'+ spl[9].replace("-alter", "") +'"\n') + out_xml( '\t\t\t\tEndIf\n') + out_xml( '\t\t\tEndIf\n') + + + + out_xml( '\t\t\tVar menu_name_eng_hot = $' + pd_code_1 + '.NameE\n') + out_xml( '\t\t\tVar menu_desc_eng_hot = $' + pd_code_1 + '.descriptionE\n') + out_xml( '\t\t\tVar menu_name_thai_hot = $' + pd_code_1 + '.Name\n') + out_xml( '\t\t\tVar menu_desc_thai_hot = $' + pd_code_1 + '.description\n') + out_xml( '\t\t\t\n') + out_xml( '\t\t\tVar menu_name_eng_cold = $' + pd_code_2 + '.NameE\n') + out_xml( '\t\t\tVar menu_desc_eng_cold = $' + pd_code_2 + '.descriptionE\n') + out_xml( '\t\t\tVar menu_name_thai_cold = $' + pd_code_2 + '.Name\n') + out_xml( '\t\t\tVar menu_desc_thai_cold = $' + pd_code_2 + '.description\n') + out_xml( '\t\t\t\n') + out_xml( '\t\t\tVar menu_name_eng_blender = $' + pd_code_3 + '.NameE\n') + out_xml( '\t\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\n') + out_xml( '\t\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\n') + out_xml( '\t\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\n') + + + + + out_xml( '\t\t\t\n') + out_xml( '\t\t\tDEBUGVAR PD_STAGE_1\n') + out_xml( '\t\t\tDEBUGVAR PD_STAGE_2\n') + out_xml( '\t\t\tDEBUGVAR PD_STAGE_3\n') + out_xml( '\t\t\tVar SelectDrinkType = 0\n') + + out_xml( '\t\t\t'+ button_add_string +'\n') + out_xml( '\t\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\n') + out_xml('\t\t\n') + out_xml('\t\t\n\n') + + def GenBanner(spl): + + if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()): + str_con += f'DateTimeStart="{spl[12].strip()}",' + if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()): + str_con += f'DateTimeEnd="{spl[13].strip()}",' + + if re.match(r'^\w.*', spl[14].strip()): + str_con += f'Var={spl[14].strip()},' + + out_xml('\t\t\n') + out_xml('\t\t\t Flag( '+ str_con + ') \n') + out_xml('\t\t\t ' + spl[4] + '\n') + out_xml('\t\t\t\n') + out_xml('\t\t\t\teval(\n') + out_xml('\t\t\t\t\tIf show_eng = "true" Then') + out_xml('\t\t\t\t\t\tVar return = ' + spl[5] + '\n') + out_xml('\t\t\t\t\tElse\n') + out_xml('\t\t\t\t\t\tVar return = ' + spl[6] + '\n') + out_xml('\t\t\t\t\tEndIf\n') + out_xml('\t\t\t\t)\n') + out_xml('\t\t\t\n') + out_xml('\t\t\t\n') + out_xml('\t\t\t\t' + spl[7] + '\n') + out_xml('\t\t\t\n') + out_xml('\t\t\n') + + def GenListMenu(): + for spl in menu_new_list: + #product_code = s + if spl[0] == "IGNORE": + continue + + if spl[0].startswith("TAG"): + out_xml( '\t;' + spl[0] + '\r\n') + continue + + if spl[0].startswith("BANNER"): + GenBanner(spl) + else: + GenMenuV3(spl) + + out_xml('\t\t; menu_new_list '+ str(len(menu_new_list))+'\n') + GenListMenu() + + out_xml('\t\n') + out_xml('\n') diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 9b928bd1..6779ecff 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -25,9 +25,8 @@ Var info_13Y = 1090 Var info_14Y = 1160 - Var info_15Y = 1230 - Var info_cancel_y = info_15Y + 50 + Var info_cancel_y = info_14Y + 50 Var info_text_startX = info_startX + 22 @@ -47,7 +46,6 @@ Var info_text_13Y = info_13Y + 18 Var info_text_14Y = info_14Y + 18 - Var info_text_15Y = info_15Y + 18 Var info2_startX = 550 @@ -175,7 +173,7 @@ DEBUGVAR TestArrary[2] DEBUGVAR TestArrary[3] - DEBUGVAR SmoothieMode + @@ -286,7 +284,7 @@ Var GPRSStr = "" Var GPRSStr = GPRSStr + GPRSStatus - Var GPRSStr = GPRSStr + ", " + Var GPRSStr = GPRSStr + ", \n" Var GPRSStr = GPRSStr + GPRSState @@ -988,9 +986,13 @@ - info1_text_startX - info_text_13Y - 30 + eval( + Var return = info1_text_startX + 10 +) + eval( + Var return = info_text_13Y - 10 +) + 24 fontType1 0x000000 GPRSStr @@ -998,32 +1000,6 @@ - - - - info1_startX - info_14Y - SmoothieMode - "ROOT/taobin_project/image/tab_1.png" - - ;include="ROOT/taobin_project/xml/open_file_instance0_to_instance2.inc" - OpenInst 2 "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" - - - - - - info1_text_startX - info_text_14Y - 30 - SmoothieMode - fontType1 - 0x000000 - " Smoothie menu." - - - -