diff --git a/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png new file mode 100644 index 00000000..8535c469 Binary files /dev/null and b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png differ diff --git a/image/page_drink_disable_n2/bn_thai_black_tea_SingPark_Healthy.png b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark_Healthy.png new file mode 100644 index 00000000..cc4f1b2f Binary files /dev/null and b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..e576837a Binary files /dev/null and b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark_Healthy.png b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark_Healthy.png new file mode 100644 index 00000000..1a28863c Binary files /dev/null and b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_n/b_limeblack_tea_SingPark.png b/image/page_drink_n/bn_limeblack_tea_SingPark.png similarity index 100% rename from image/page_drink_n/b_limeblack_tea_SingPark.png rename to image/page_drink_n/bn_limeblack_tea_SingPark.png diff --git a/image/page_drink_picture2_n/b_limeblack_tea_SingPark.png b/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png similarity index 100% rename from image/page_drink_picture2_n/b_limeblack_tea_SingPark.png rename to image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png diff --git a/image/page_drink_picture2_n/bn_thai_black_tea_SingPark_Healthy.png b/image/page_drink_picture2_n/bn_thai_black_tea_SingPark_Healthy.png new file mode 100644 index 00000000..b04a9e81 Binary files /dev/null and b/image/page_drink_picture2_n/bn_thai_black_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark_Healthy.png b/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark_Healthy.png new file mode 100644 index 00000000..ebf15547 Binary files /dev/null and b/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_press_n/bn_thai_black_tea_SingPark.png b/image/page_drink_press_n/bn_thai_black_tea_SingPark.png new file mode 100644 index 00000000..332e141a Binary files /dev/null and b/image/page_drink_press_n/bn_thai_black_tea_SingPark.png differ diff --git a/image/page_drink_press_n/bn_thai_black_tea_SingPark_Healthy.png b/image/page_drink_press_n/bn_thai_black_tea_SingPark_Healthy.png new file mode 100644 index 00000000..e33619b8 Binary files /dev/null and b/image/page_drink_press_n/bn_thai_black_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png b/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..d9405b6a Binary files /dev/null and b/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_press_n/bn_thai_milk_tea_SingPark_Healthy.png b/image/page_drink_press_n/bn_thai_milk_tea_SingPark_Healthy.png new file mode 100644 index 00000000..0bf222ad Binary files /dev/null and b/image/page_drink_press_n/bn_thai_milk_tea_SingPark_Healthy.png differ diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 55bb59f2..95f0c562 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -524,7 +524,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 55 +; menu_new_list 56 ; ==================> Len = 16 ; 12-01-01-0001 - - @@ -17202,6 +17202,509 @@ CAFÉ LATTE" text_unavailable center-vertical-horizontal + + ; ==================> Len = 11 + ; 12-01-01-0055 12-01-02-0055 12-01-03-0055 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0055.Button,12-01-02-0055.Button,12-01-03-0055.Button,$Sum120101005512010200551201030055) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟชาไทย" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ ชาไทย นม น้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "THAI TEA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Thai tea, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0055.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0055.Button + StringFmt( $12-01-01-0055.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0055.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0055.Button + StringFmt( $12-01-02-0055.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-01-03-0055.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-03-0055.Button + StringFmt( $12-01-03-0055.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120101005512010200551201030055 = "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 $Sum120101005512010200551201030055 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0055.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0055.TAG tag2_is_disable + STRCONTAIN "ERR" $12-01-03-0055.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" + $Sum120101005512010200551201030055 + text_unavailable + center-vertical-horizontal + + + ; 12-21-01-0055 12-21-02-0055 12-21-03-0055 + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0055.Button,12-21-02-0055.Button,12-21-03-0055.Button,$Sum122101005512210200551221030055) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟชาไทย" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ ชาไทย นม น้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "THAI TEA +CAFÉ LATTE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Thai tea, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0055.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0055.Button + StringFmt( $12-21-01-0055.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-21-02-0055.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0055.Button + StringFmt( $12-21-02-0055.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-21-03-0055.Button + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0055.Button + StringFmt( $12-21-03-0055.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum122101005512210200551221030055 = "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 $Sum122101005512210200551221030055 = "Disable" Then + STRCONTAIN "ERR" $12-21-01-0055.TAG tag1_is_disable + STRCONTAIN "ERR" $12-21-02-0055.TAG tag2_is_disable + STRCONTAIN "ERR" $12-21-03-0055.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" + $Sum122101005512210200551221030055 + text_unavailable + center-vertical-horizontal + ; ==================> Len = 16 ; 12-01-01-0030 12-01-02-0030 12-01-03-0030 diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 4716b4be..019a6da4 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -6331,9 +6331,9 @@ SODA" Flag( 12-02-01-1040.Button,12-02-02-1040.Button,$Sum12020110401202021040) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชานมไทยโปรตีน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เวย์โปรตีน ชาไทย นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "THAI TEA SHAKE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Whey protein, +Thai Tea, & Milk" + + + 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-04-02-0055.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-04-02-0055.Button + StringFmt( $12-04-02-0055.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 $Sum1204020055 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-04-02-0055.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" + $Sum1204020055 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16