diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index f5813485..91662fba 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -264,9 +264,9 @@ ICED THAI TEA LIMENADE 12-02-02-0030 1 10 12 23 24 1 1 32 - - - +นมเมล่อน 12-03-01-0022 1 17 24 1 1 32 +นมเมล่อน 12-03-02-0022 1 17 23 24 1 1 32 +นมเมล่อน 12-03-03-0022 1 17 23 41 24 1 1 32 diff --git a/image/page_drink_disable_n/bn_Melon_smoothie.png b/image/page_drink_disable_n/bn_Melon_smoothie.png new file mode 100644 index 00000000..eafccc37 Binary files /dev/null and b/image/page_drink_disable_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_disable_n/bn_iced_Ovalcocoa_smoothie.png b/image/page_drink_disable_n/bn_iced_Ovalcocoa_smoothie.png new file mode 100644 index 00000000..143fb674 Binary files /dev/null and b/image/page_drink_disable_n/bn_iced_Ovalcocoa_smoothie.png differ diff --git a/image/page_drink_disable_n/bn_smoothie_ovaltine.png b/image/page_drink_disable_n/bn_smoothie_ovaltine.png index 17d18f91..894c3c9f 100644 Binary files a/image/page_drink_disable_n/bn_smoothie_ovaltine.png and b/image/page_drink_disable_n/bn_smoothie_ovaltine.png differ diff --git a/image/page_drink_n/bn_Melon_smoothie.png b/image/page_drink_n/bn_Melon_smoothie.png new file mode 100644 index 00000000..f669797a Binary files /dev/null and b/image/page_drink_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_Ovalcocoa_smoothie.png b/image/page_drink_n/bn_iced_Ovalcocoa_smoothie.png new file mode 100644 index 00000000..ce2714a2 Binary files /dev/null and b/image/page_drink_n/bn_iced_Ovalcocoa_smoothie.png differ diff --git a/image/page_drink_n/bn_smoothie_ovaltine.png b/image/page_drink_n/bn_smoothie_ovaltine.png index c9fc74c7..e1014466 100644 Binary files a/image/page_drink_n/bn_smoothie_ovaltine.png and b/image/page_drink_n/bn_smoothie_ovaltine.png differ diff --git a/image/page_drink_picture2_n/bn_Melon_smoothie.png b/image/page_drink_picture2_n/bn_Melon_smoothie.png new file mode 100644 index 00000000..6bec6fa5 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Ovalcocoa_smoothie.png b/image/page_drink_picture2_n/bn_iced_Ovalcocoa_smoothie.png new file mode 100644 index 00000000..2022bee1 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_Ovalcocoa_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_ovaltine.png b/image/page_drink_picture2_n/bn_smoothie_ovaltine.png index c25347a9..f007382a 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_ovaltine.png and b/image/page_drink_picture2_n/bn_smoothie_ovaltine.png differ diff --git a/image/page_drink_press_n/bn_Melon_smoothie.png b/image/page_drink_press_n/bn_Melon_smoothie.png new file mode 100644 index 00000000..d2a903b6 Binary files /dev/null and b/image/page_drink_press_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_Ovalcocoa_smoothie.png b/image/page_drink_press_n/bn_iced_Ovalcocoa_smoothie.png new file mode 100644 index 00000000..88a312da Binary files /dev/null and b/image/page_drink_press_n/bn_iced_Ovalcocoa_smoothie.png differ diff --git a/image/page_drink_press_n/bn_smoothie_ovaltine.png b/image/page_drink_press_n/bn_smoothie_ovaltine.png index 36aa3b68..23fdc8bc 100644 Binary files a/image/page_drink_press_n/bn_smoothie_ovaltine.png and b/image/page_drink_press_n/bn_smoothie_ovaltine.png differ diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 64c6fed8..c3e8920d 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -632,7 +632,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 44 +; menu_new_list 46 ; 12-01-01-0001 - - 33 @@ -9907,482 +9907,6 @@ Milk, Sugar" ice_tab_process_show ice_show_open - - ; 12-01-01-0012 12-01-02-0009 - - - 33 - 22 - 225 - 296 - Flag( 12-01-01-0012.Button,12-01-02-0009.Button,$Sum12010100121201020009) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "อเมริกาโนลิ้นจี่" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ น้ำ และ ลิ้นจี่" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "LYCHEE -AMERICANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso, Lychee, -Sugar, Water" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-01-01-0012.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - 265 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-01-0012.Button - Var( "฿" + $12-01-01-0012.Price ) - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-01-02-0009.Button - - - 115 - 265 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-02-0009.Button - Var( "฿" + $12-01-02-0009.Price ) - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - 265 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - Var( "฿" + $-.Price ) - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum12010100121201020009 = "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 $Sum12010100121201020009 = "Disable" Then - STRCONTAIN "ERR" $12-01-01-0012.TAG tag1_is_disable - STRCONTAIN "ERR" $12-01-02-0009.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_err.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - ; 12-01-01-0017 12-01-02-0017 - - - 33 - 22 - 225 - 296 - Flag( 12-01-01-0017.Button,12-01-02-0017.Button,$Sum12010100171201020017) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "อเมริกาโนลิ้นจี่" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ น้ำ และ ลิ้นจี่" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "LYCHEE -AMERICANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso, Lychee, -Sugar, Water" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-01-01-0017.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - 265 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-01-0017.Button - Var( "฿" + $12-01-01-0017.Price ) - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-01-02-0017.Button - - - 115 - 265 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-02-0017.Button - Var( "฿" + $12-01-02-0017.Price ) - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - 265 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - Var( "฿" + $-.Price ) - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum12010100171201020017 = "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 $Sum12010100171201020017 = "Disable" Then - STRCONTAIN "ERR" $12-01-01-0017.TAG tag1_is_disable - STRCONTAIN "ERR" $12-01-02-0017.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_err.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - ; 12-01-01-0010 12-01-02-0007 12-01-03-0007 @@ -11097,6 +10621,958 @@ Milk, Sugar" ice_tab_process_show ice_show_open + + ; 12-01-01-0012 12-01-02-0009 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0012.Button,12-01-02-0009.Button,$Sum12010100121201020009) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนลิ้นจี่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ ลิ้นจี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "LYCHEE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Lychee, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0012.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0012.Button + Var( "฿" + $12-01-01-0012.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0009.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0009.Button + Var( "฿" + $12-01-02-0009.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100121201020009 = "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 $Sum12010100121201020009 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0012.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0009.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + ; 12-01-01-0017 12-01-02-0017 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0017.Button,12-01-02-0017.Button,$Sum12010100171201020017) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนลิ้นจี่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ ลิ้นจี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "LYCHEE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Lychee, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0017.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0017.Button + Var( "฿" + $12-01-01-0017.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0017.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0017.Button + Var( "฿" + $12-01-02-0017.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100171201020017 = "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 $Sum12010100171201020017 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0017.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0017.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + ; 12-03-01-0022 12-03-02-0022 - + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0022.Button,12-03-02-0022.Button,$Sum12030100221203020022) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนเมล่อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ เมล่อน" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MELON +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Melon, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0022.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0022.Button + Var( "฿" + $12-03-01-0022.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0022.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0022.Button + Var( "฿" + $12-03-02-0022.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12030100221203020022 = "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 $Sum12030100221203020022 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0022.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0022.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + ; 12-03-01-0023 12-03-02-0023 - + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0023.Button,12-03-02-0023.Button,$Sum12030100231203020023) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโนยูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ ยูซุ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "YUZU +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Yuzu, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0023.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0023.Button + Var( "฿" + $12-03-01-0023.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0023.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0023.Button + Var( "฿" + $12-03-02-0023.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12030100231203020023 = "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 $Sum12030100231203020023 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0023.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0023.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + ; Cart diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 5905a6f6..7835671b 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -631,7 +631,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 11 +; menu_new_list 15 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005 33 @@ -2066,7 +2066,7 @@ MILK" Var NameDrink = "STRAWCOCOA SMOOTHIE" Var NameDrinkTH = "โกโก้สตอเบอร์รี่ปั่น" Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" - Var DrinkDescription = "Milk, Strawberry Syrup" + Var DrinkDescription = "Milk, Cocoa, Strawberry Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2167,7 +2167,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showengText - "Milk, Strawberry Syrup" + "Milk, Cocoa, Strawberry Syrup" 16 @@ -3218,6 +3218,943 @@ VOLCANO" ice_tab_process_show ice_show_open + + ; - - 12-03-03-0021 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0021.Button,$Sum1203030021) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้โอดิบภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ โอวัลติน น้ำตาล และ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA OVALTINE +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Ovaltine, Cocoa, Sugar, milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0021.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0021.Button + Var( "฿" + $12-03-03-0021.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1203030021 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0021.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + ; - - 12-03-03-0022 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0022.Button,$Sum1203030022) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมเมล่อน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "นม และ น้ำเชื่อมเมล่อน" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MELON MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk & Melon Syrup" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0022.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0022.Button + Var( "฿" + $12-03-03-0022.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1203030022 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0022.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + ; 12-03-01-0023 12-03-02-0023 12-03-03-0023 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0023.Button,12-03-02-0023.Button,12-03-03-0023.Button,$Sum120301002312030200231203030023) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมยูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "นม และ น้ำเชื่อมยูซุ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "YUZU MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk & Yuzu Syrup" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0023.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0023.Button + Var( "฿" + $12-03-01-0023.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0023.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0023.Button + Var( "฿" + $12-03-02-0023.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0023.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0023.Button + Var( "฿" + $12-03-03-0023.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002312030200231203030023 = "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 $Sum120301002312030200231203030023 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0023.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0023.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0023.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + ; 12-03-01-0024 12-03-02-0024 12-03-03-0024 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,$Sum120301002412030200241203030024) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมลิ้นจี่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "นม และ น้ำเชื่อมลิ้นจี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "LYCHEE MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk & Lychee Syrup" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0024.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0024.Button + Var( "฿" + $12-03-01-0024.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0024.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0024.Button + Var( "฿" + $12-03-02-0024.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0024.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0024.Button + Var( "฿" + $12-03-03-0024.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0024.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_err.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + ; Cart diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 87018b6b..0f66b3c1 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -7170,7 +7170,7 @@ Water & Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWBERRY" + Var NameDrink = "STRAWBERRY DRINK" Var NameDrinkTH = "น้ำสตอเบอร์รี่ " Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ " Var DrinkDescription = "Strawberry Syrup, Water, Ice" @@ -7262,7 +7262,7 @@ Water & Ice" KanitMediumTTF 0x322B26 showengText - "STRAWBERRY" + "STRAWBERRY DRINK" 16 diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 8f1d62c2..a977ebc1 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -183,6 +183,12 @@ EndIf EndIf + + If MachineStage = "remove-cup" Then + Var buttonRemoveCup = "Enable" + Var txtDrinkOKState = "Enable" + EndIf + If MachineStage = "close-maintenance" Then If stop_now = "true" Then diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 18ec8a6e..c5ceed9d 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -81,6 +81,17 @@ Cart "DeleteMenuID" "ALL" + + Var birthday = "25280905" + DEBUGVAR birthday + SUBSTRING birthday 0 4 StrYear + SUBSTRING birthday 4 6 StrMon + SUBSTRING birthday 6 8 StrDay + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay + + 1000