diff --git a/adv/taobin_adv_15.mp4 b/adv/taobin_adv_15.mp4 old mode 100644 new mode 100755 index a3b7e0c5..cedfcc48 Binary files a/adv/taobin_adv_15.mp4 and b/adv/taobin_adv_15.mp4 differ diff --git a/adv/taobin_adv_15_.mp4 b/adv/taobin_adv_15_.mp4 new file mode 100644 index 00000000..a3b7e0c5 Binary files /dev/null and b/adv/taobin_adv_15_.mp4 differ diff --git a/adv/taobin_adv_menu2_15.mp4 b/adv/taobin_adv_menu2_15.mp4 old mode 100644 new mode 100755 index 9e9ca5db..f765e32c Binary files a/adv/taobin_adv_menu2_15.mp4 and b/adv/taobin_adv_menu2_15.mp4 differ diff --git a/adv/taobin_adv_menu2_15_.mp4 b/adv/taobin_adv_menu2_15_.mp4 new file mode 100644 index 00000000..9e9ca5db Binary files /dev/null and b/adv/taobin_adv_menu2_15_.mp4 differ diff --git a/adv/taobin_adv_menu_15.mp4 b/adv/taobin_adv_menu_15.mp4 old mode 100644 new mode 100755 index c2480121..278e768f Binary files a/adv/taobin_adv_menu_15.mp4 and b/adv/taobin_adv_menu_15.mp4 differ diff --git a/adv/taobin_adv_menu_15_.mp4 b/adv/taobin_adv_menu_15_.mp4 new file mode 100644 index 00000000..c2480121 Binary files /dev/null and b/adv/taobin_adv_menu_15_.mp4 differ diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 478ffc2d..079f5221 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -220,9 +220,17 @@ HOT MELON TAIWANESE 12-02-01-0035 1 6 7 10 25 24 120 7:00 23 เป๊ปซี่บ๊วยปั่น 12-05-03-0046 1 14 33 23 41 13 24 120 3:00 23 เป๊ปซี่เมล่อน 12-05-02-0047 1 14 52 23 13 24 120 4:00 23 เป๊ปซี่เมล่อนปั่น 12-05-03-0047 1 14 52 23 41 13 24 120 5:00 23 - - - + 24 120 6:00 23 +สตอเบอร์รี่ปั่นโอริโอ้ภูเขาไฟ 12-03-03-0027 1 17 23 19 40 41 24 120 7:00 23 +เมล่อนปั่นโอริโอ้ภูเขาไฟ 12-03-03-0028 1 17 23 52 40 41 24 120 8:00 23 +นมกล้วยปั่นโอริโอ้ภูเขาไฟ 12-03-03-0029 1 17 23 56 40 41 24 120 9:00 23 +โกโก้ปั่นโอริโอ้ภูเขาไฟ 12-03-03-0030 1 17 23 15 40 41 24 120 10:00 23 +นมคาราเมลปั่นโอริโอ้ภูเขาไฟ 12-03-03-0031 1 17 23 22 40 41 24 120 11:00 23 +ลาเต้ปั่น โอริโอ้ภูเขาไฟ 12-01-03-0043 1 17 23 5 40 41 24 120 12:00 23 +โฮจิฉะโอริโอ้ภูเขาไฟ 12-02-03-0043 1 17 23 55 40 41 24 120 13:00 23 +ชานมไทยโอริโอ้ภูเขาไฟ 12-02-03-0044 1 17 23 55 40 41 24 120 14:00 23 +PEPSI YUZU 12-05-02-0053 1 14 53 23 13 24 120 4:00 23 +PEPSI BANANA 12-05-02-0054 1 14 56 23 13 24 120 4:00 23 diff --git a/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png b/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..6ccc8842 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png b/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..04c89584 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png b/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..a66a558e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png differ diff --git a/image/page_drink_n/bn_iced_energy_drink_melon_soda.png b/image/page_drink_n/bn_iced_energy_drink_melon_soda.png new file mode 100644 index 00000000..8affa2d0 Binary files /dev/null and b/image/page_drink_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/image/page_drink_n/bn_iced_energy_drink_plum_soda.png b/image/page_drink_n/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..a3e8bd0f Binary files /dev/null and b/image/page_drink_n/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_n/bn_iced_pepsi_Banana.png b/image/page_drink_n/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..fe4134a8 Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_n/bn_iced_pepsi_yuzu.png b/image/page_drink_n/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..f0004c8d Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_yuzu.png differ diff --git a/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png b/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png new file mode 100644 index 00000000..056e818e Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/image/page_drink_picture2_n/bn_iced_energy_drink_plum_soda.png b/image/page_drink_picture2_n/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..74c172ae Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png b/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..762fc653 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png b/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..bc6bb3fd Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png differ diff --git a/image/page_drink_press_n/bn_iced_energy_drink_plum_soda.png b/image/page_drink_press_n/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..9c3a70aa Binary files /dev/null and b/image/page_drink_press_n/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_press_n/bn_iced_pepsi_Banana.png b/image/page_drink_press_n/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..364388c3 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_press_n/bn_iced_pepsi_yuzu.png b/image/page_drink_press_n/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..4ae51615 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_yuzu.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index a7afd79f..400e99a2 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -301,6 +301,11 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf + If NeedReboot = "true" Then + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" + EndIf + DEBUGVAR NeedUpgrade Var bg_lidProblem_ST2 = bg_lidProblem_ST diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index e577985e..098f893e 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -522,7 +522,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 49 +; menu_new_list 53 ; ==================> Len = 16 ; 12-01-01-0001 - - @@ -2794,6 +2794,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0046 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0046.Button,.Button,.Button,$Sum1201010046) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0046.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0046.Button + StringFmt( $12-01-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum1201010046 = "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 $Sum1201010046 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0046.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201010046 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0049 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0049.Button,.Button,.Button,$Sum1201010049) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0049.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0049.Button + StringFmt( $12-01-01-0049.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum1201010049 = "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 $Sum1201010049 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0049.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201010049 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -5844,6 +6352,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0047 12-01-02-0047 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0047.Button,12-01-02-0047.Button,$Sum12010100471201020047) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0047.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0047.Button + StringFmt( $12-01-01-0047.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0047.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0047.Button + StringFmt( $12-01-02-0047.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100471201020047 = "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 $Sum12010100471201020047 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0047.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0047.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12010100471201020047 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0050 12-01-02-0050 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0050.Button,12-01-02-0050.Button,$Sum12010100501201020050) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0050.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0050.Button + StringFmt( $12-01-01-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0050.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0050.Button + StringFmt( $12-01-02-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100501201020050 = "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 $Sum12010100501201020050 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0050.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0050.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12010100501201020050 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index 834d470c..c75740d7 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -2041,7 +2041,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CARAMEL MILK OREO VOLCANO" + Var NameDrink = "12-01-01-0043" Var NameDrinkTH = "นมคาราเมลปั่น โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล Oreo" Var DrinkDescription = "Caramel Syrup, Milk, Sugar, Oreo" @@ -2136,8 +2136,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CARAMEL MILK OREO -VOLCANO" + "12-01-01-0043" 16 @@ -2293,7 +2292,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "HOJICHA OREO SMOOTHIE" + Var NameDrink = "HOJICHA OREO VOLCANO" Var NameDrinkTH = "โฮจิฉะ โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล Oreo" Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" @@ -2388,7 +2387,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "HOJICHA OREO SMOOTHIE" + "HOJICHA OREO VOLCANO" 16 @@ -2544,7 +2543,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI MILK TEA OREO SMOOTHIE" + Var NameDrink = "THAI MILK TEA OREO VOLCANO" Var NameDrinkTH = "ชานมไทย โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล Oreo" Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo" @@ -2639,7 +2638,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "THAI MILK TEA OREO SMOOTHIE" + "THAI MILK TEA OREO VOLCANO" 16 @@ -2795,7 +2794,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CAFE LATTE OREO SMOOTHIE" + Var NameDrink = "CAFE LATTE OREO VOLCANO" Var NameDrinkTH = "ลาเต้ปั่น โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล Oero" Var DrinkDescription = "Coffee, Milk, Sugar, Oreo" @@ -2890,7 +2889,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CAFE LATTE OREO SMOOTHIE" + "CAFE LATTE OREO VOLCANO" 16 diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 34d9a852..5081a38f 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -521,7 +521,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 36 +; menu_new_list 38 ; ==================> Len = 16 ; - 12-05-02-0007 12-05-03-0007 @@ -4753,6 +4753,502 @@ Soda & Ice" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 11 + ; - 12-05-02-0053 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0053.Button,$Sum1205020053) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่ยูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ น้ำเชื่อมยูซุ โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEPSI YUZU" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Yuzu Syrup& Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0053.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0053.Button + StringFmt( $12-05-02-0053.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205020053 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0053.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1205020053 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 11 + ; - 12-05-02-0054 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0054.Button,$Sum1205020054) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่กล้วย" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ น้ำเชื่อมกล้วย โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEPSI BANANA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Banana Syrup& Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0054.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0054.Button + StringFmt( $12-05-02-0054.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205020054 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0054.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1205020054 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index be0aac77..1cad6e4e 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -561,7 +561,7 @@ testservice -; menu_new_list 40 +; menu_new_list 44 ; ==================> Len = 16 ; 12-06-01-0001 - - @@ -5124,6 +5124,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0046 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0046.Button,.Button,.Button,Disable=Invisible,$Sum1201010046) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0046.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0046.Button + StringFmt( $12-01-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum1201010046 = "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 $Sum1201010046 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0046.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201010046 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0049 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0049.Button,.Button,.Button,Disable=Invisible,$Sum1201010049) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0049.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0049.Button + StringFmt( $12-01-01-0049.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum1201010049 = "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 $Sum1201010049 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0049.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201010049 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -7681,6 +8189,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0047 12-01-02-0047 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0047.Button,12-01-02-0047.Button,Disable=Invisible,$Sum12010100471201020047) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0047.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0047.Button + StringFmt( $12-01-01-0047.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0047.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0047.Button + StringFmt( $12-01-02-0047.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100471201020047 = "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 $Sum12010100471201020047 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0047.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0047.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12010100471201020047 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0050 12-01-02-0050 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0050.Button,12-01-02-0050.Button,Disable=Invisible,$Sum12010100501201020050) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0050.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0050.Button + StringFmt( $12-01-01-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0050.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0050.Button + StringFmt( $12-01-02-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100501201020050 = "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 $Sum12010100501201020050 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0050.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0050.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12010100501201020050 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 6e72fd78..d2870653 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -524,7 +524,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 27 +; menu_new_list 28 ; ==================> Len = 11 ; 12-02-01-0001 12-02-02-0001 12-02-03-0001 @@ -7344,6 +7344,499 @@ Water" ; - - - + ; ==================> Len = 13 + ; 12-02-02-0043 + + 33 + 22 + 225 + 296 + Flag( .Button,12-02-02-0043.Button,.Button,$Sum1202020043) + + + 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 + "Thai tea, Limenade,soda" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0043.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0043.Button + StringFmt( $12-02-02-0043.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1202020043 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0043.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202020043 + text_unavailable + center-vertical-horizontal + + + ; + + 33 + 22 + 225 + 296 + Flag( .Button,.Button,.Button,$Sum) + + + 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 + "Thai tea, Limenade,soda" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 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 $Sum = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum + text_unavailable + center-vertical-horizontal + + ; Cart