diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index 9306bef0..134929ce 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -184,6 +184,24 @@ Geisha 12-01-01-0036 1 2 49 3 4 5 24 66 1:06 32 +โจ๊กผักฮ้องกง 12-06-01-0002 1 46 24 +โอวัลตินปั่นภูเขาไฟ 12-03-03-0020 1 15 17 23 41 24 +โอวัลตินร้อน 12-03-01-0019 1 15 17 16 24 +โอวัลตินเย็น 12-03-02-0019 1 15 17 23 24 +โอวัลตินปั่น 12-03-03-0019 1 15 17 23 41 24 +ROSALYN ALMOST DIRTY 12-01-02-0037 1 7 50 2 3 4 5 24 +อเมริกาโนร้อน ROSALYN 12-01-01-0038 1 2 50 3 4 5 16 24 +อเมริกาโนเย็น ROSALYN 12-01-02-0038 1 2 50 3 4 5 23 16 24 +เอสเพรสโซ่ช็อต ROSALYN 12-01-01-0037 1 2 50 3 4 5 24 + + + + + + + + + โกโก้สตอเบอร์รี่เย็น 12-03-02-0010 1 15 17 19 23 24 125 2:05 40 โกโก้สตอเบอร์รี่ปั่น 12-03-03-0010 1 15 17 19 23 41 24 125 2:05 40 diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv index 83703f1b..9306bef0 100644 --- a/animation01/Menu Description - Sheet1_.tsv +++ b/animation01/Menu Description - Sheet1_.tsv @@ -177,6 +177,12 @@ Pure beauty 12-01-01-0033 1 2 48 3 4 5 24 66 1:06 32 12-02-03-0032 +Geisha 12-01-02-0036 1 7 49 2 3 4 5 24 100 22:40 32 +Geisha 12-01-01-0035 1 2 49 3 4 5 16 24 88 1:28 32 +Geisha 12-01-02-0035 1 2 49 3 4 5 23 16 24 133 2:13 32 +Geisha 12-01-01-0036 1 2 49 3 4 5 24 66 1:06 32 + + โกโก้สตอเบอร์รี่เย็น 12-03-02-0010 1 15 17 19 23 24 125 2:05 40 diff --git a/image/page_doing/txt_49.png b/image/page_doing/txt_49.png new file mode 100644 index 00000000..4c76ea32 Binary files /dev/null and b/image/page_doing/txt_49.png differ diff --git a/image/page_doing/txt_49_en.png b/image/page_doing/txt_49_en.png new file mode 100644 index 00000000..3badc50d Binary files /dev/null and b/image/page_doing/txt_49_en.png differ diff --git a/image/page_doing/txt_50.png b/image/page_doing/txt_50.png new file mode 100644 index 00000000..8249376c Binary files /dev/null and b/image/page_doing/txt_50.png differ diff --git a/image/page_doing/txt_50_en.png b/image/page_doing/txt_50_en.png new file mode 100644 index 00000000..8b596127 Binary files /dev/null and b/image/page_doing/txt_50_en.png differ diff --git a/image/topping2/bg_add_shot_coffee2_only.png b/image/topping2/bg_add_shot_coffee2_only.png index 2c11f0f9..bc1c6e3b 100644 Binary files a/image/topping2/bg_add_shot_coffee2_only.png and b/image/topping2/bg_add_shot_coffee2_only.png differ diff --git a/image/topping2_en/bg_add_shot_coffee2_only.png b/image/topping2_en/bg_add_shot_coffee2_only.png index abebf817..b86f09b3 100644 Binary files a/image/topping2_en/bg_add_shot_coffee2_only.png and b/image/topping2_en/bg_add_shot_coffee2_only.png differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index a0df6ff6..bb22afdb 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -1,5 +1,11 @@ - + if current_file_name == "page_catalog_group_recommend.skt": + touch_less_gen = True + else: + touch_less_gen = False + out_xml(' \r\n') + if touch_less_gen == True: + out_xml(' 16 \r\n') out_xml(' 10 \r\n') out_xml(' 497 \r\n') out_xml(' 1080 \r\n') @@ -10,10 +16,6 @@ print("current_file_name " + current_file_name) - if current_file_name == "page_catalog_group_recommend.skt": - touch_less_gen = True - else: - touch_less_gen = False if touch_less_gen == False: @@ -92,6 +94,9 @@ str_con += spl[5] + '.Button,' if spl[6] != '-': str_con += spl[6] + '.Button,' + + if touch_less_gen == True: + str_con += "Disable=Invisible" out_xml( '\t Flag( '+ str_con + ') \r\n') @@ -112,6 +117,9 @@ if spl[6] == "-" or len(spl[6]) == 0: pd_code_3 = pd_code_available pd_stage3 = '"Disable2"' + + + out_xml( '\t + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +ROSALYN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROSALYN ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0037.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0037.Button + Var( "฿" + $12-01-01-0037.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" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + STRCONTAIN "LOW" $12-01-01-0037.TAG tag_is_low + If tag_is_low = "true" 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( + STRCONTAIN "ERR" $12-01-01-0037.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-0014 12-01-02-0011 - @@ -4984,6 +5211,234 @@ AMERICANO" ice_tab_process_show ice_show_open + + ; 12-01-01-0038 12-01-02-0038 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0038.Button,12-01-02-0038.Button,) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +ROSALYN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROSALYN +ROSALYN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0038.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0038.Button + Var( "฿" + $12-01-01-0038.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0038.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0038.Button + Var( "฿" + $12-01-02-0038.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 + + STRCONTAIN "LOW" $12-01-01-0038.TAG tag_is_low + If tag_is_low = "true" 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( + STRCONTAIN "ERR" $12-01-01-0038.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-02-0020 - @@ -6781,6 +7236,229 @@ ALMOST DIRTY" ice_tab_process_show ice_show_open + + ; - 12-01-02-0037 - + + 33 + 22 + 225 + 296 + Flag( 12-01-02-0037.Button,) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ROSALYN +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROSALYN +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" + + + 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" ) + $12-01-02-0037.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0037.Button + Var( "฿" + $12-01-02-0037.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 + + Var ice_tab_process_show = "Disable" + + 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( + STRCONTAIN "ERR" $##-##-##-####.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-11-02-0001 12-11-03-0001 @@ -9963,6 +10641,229 @@ Milk, Sugar" ice_tab_process_show ice_show_open + + ; - 12-03-02-0006 12-03-03-0006 + + 33 + 22 + 225 + 296 + Flag( 12-03-02-0006.Button,12-03-03-0006.Button,) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมชมพู " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำแดงกลิ่นสละ นม นมข้น +น้ำตาล " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PINK MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Salak Syrup, Milk, +Sugar, Ice" + + + 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" ) + $12-03-02-0006.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0006.Button + Var( "฿" + $12-03-02-0006.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0006.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0006.Button + Var( "฿" + $12-03-03-0006.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Disable" + + 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( + STRCONTAIN "ERR" $##-##-##-####.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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 1a402ec6..00d4fcef 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 10 +; menu_new_list 12 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005 33 @@ -2885,6 +2885,454 @@ VOLCANO" ice_tab_process_show ice_show_open + + ; 12-03-01-0019 12-03-02-0019 12-03-03-0019 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0019.Button,12-03-02-0019.Button,12-03-03-0019.Button,) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอวัลติน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โอวัลติน น้ำตาล และ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OVALTINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Ovaltine, Sugar, milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0019.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0019.Button + Var( "฿" + $12-03-01-0019.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0019.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0019.Button + Var( "฿" + $12-03-02-0019.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0019.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0019.Button + Var( "฿" + $12-03-03-0019.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + STRCONTAIN "LOW" $12-03-01-0019.TAG tag_is_low + If tag_is_low = "true" 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( + STRCONTAIN "ERR" $12-03-01-0019.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-0020 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0020.Button,) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอวัลตินปั่นภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โอวัลติน น้ำตาล และ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OVALTINE SMOOTHIE +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Ovaltine, 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-0020.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0020.Button + Var( "฿" + $12-03-03-0020.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Disable" + + 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( + STRCONTAIN "ERR" $##-##-##-####.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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_recommend.xml b/xml/page_catalog_group_recommend.xml index f4b25fd0..0a14e000 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -620,6 +620,7 @@ + 16 10 497 1080 @@ -665,16 +666,16 @@ testservice -; menu_new_list 43 +; menu_new_list 49 ; 12-06-01-0001 - - 33 22 225 296 - Flag( 12-06-01-0001.Button,) + Flag( 12-06-01-0001.Button,Disable=Invisible) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอวัลติน" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โอวัลติน น้ำตาล และ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OVALTINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Ovaltine, Sugar, milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0019.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0019.Button + Var( "฿" + $12-03-01-0019.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0019.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0019.Button + Var( "฿" + $12-03-02-0019.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0019.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0019.Button + Var( "฿" + $12-03-03-0019.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + STRCONTAIN "LOW" $12-03-01-0019.TAG tag_is_low + If tag_is_low = "true" 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( + STRCONTAIN "ERR" $12-03-01-0019.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-0020 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0020.Button,Disable=Invisible) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอวัลตินปั่นภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โอวัลติน น้ำตาล และ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OVALTINE SMOOTHIE +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Ovaltine, 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-0020.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0020.Button + Var( "฿" + $12-03-03-0020.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Disable" + + 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( + STRCONTAIN "ERR" $##-##-##-####.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-0013 - - @@ -2924,9 +3373,9 @@ VOLCANO" 22 225 296 - Flag( 12-01-01-0013.Button,) + Flag( 12-01-01-0013.Button,Disable=Invisible) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +ROSALYN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (washed process) +กลิ่นกุหลาบ และ เบอร์รี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROSALYN ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light Roast (natural process) +Pink​ Rose & Berry" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0037.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0037.Button + Var( "฿" + $12-01-01-0037.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" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + STRCONTAIN "LOW" $12-01-01-0037.TAG tag_is_low + If tag_is_low = "true" 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( + STRCONTAIN "ERR" $12-01-01-0037.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-0014 12-01-02-0011 - @@ -4760,9 +5438,9 @@ GEISHA" 22 225 296 - Flag( 12-01-01-0014.Button,12-01-02-0011.Button,) + Flag( 12-01-01-0014.Button,12-01-02-0011.Button,Disable=Invisible) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +ROSALYN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (washed process) +กลิ่นกุหลาบ และ เบอร์รี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROSALYN +ROSALYN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light Roast (natural process) +Pink​ Rose & Berry" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0038.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0038.Button + Var( "฿" + $12-01-01-0038.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0038.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0038.Button + Var( "฿" + $12-01-02-0038.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 + + STRCONTAIN "LOW" $12-01-01-0038.TAG tag_is_low + If tag_is_low = "true" 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( + STRCONTAIN "ERR" $12-01-01-0038.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-02-0020 - @@ -6597,9 +7505,9 @@ AMERICANO" 22 225 296 - Flag( 12-01-02-0020.Button,) + Flag( 12-01-02-0020.Button,Disable=Invisible) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ROSALYN +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟคั่วอ่อน (washed process) +กลิ่นกุหลาบ และ เบอร์รี่" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROSALYN +ALMOST DIRTY" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Light Roast (natural process) +Pink​ Rose & Berry" + + + 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" ) + $12-01-02-0037.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0037.Button + Var( "฿" + $12-01-02-0037.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 + + Var ice_tab_process_show = "Disable" + + 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( + STRCONTAIN "ERR" $##-##-##-####.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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-02-0006 12-03-03-0006 @@ -8394,9 +9527,9 @@ ALMOST DIRTY" 22 225 296 - Flag( 12-03-02-0006.Button,12-03-03-0006.Button,) + Flag( 12-03-02-0006.Button,12-03-03-0006.Button,Disable=Invisible) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กัญชาโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมกัญชา (ช่วยผ่อนคลาย) +โซดา " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CANNABIS SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Cannabis Syrup, Soda, Ice" + + + 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" ) + $12-05-02-0028.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0028.Button + Var( "฿" + $12-05-02-0028.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0028.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0028.Button + Var( "฿" + $12-05-03-0028.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Disable" + + 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( + STRCONTAIN "ERR" $##-##-##-####.TAG tag_is_disable + If tag_is_disable = "true" Then + Var return = "Enable" + 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_topping_select4.xml b/xml/page_topping_select4.xml index 36de3ffb..4220c164 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -92,6 +92,8 @@ Var text_show_thai = "Invisible" Var text_show_eng = "Enable" + Var topping_shot_price_x = 630 + Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -102,6 +104,8 @@ Var text_show_thai = "Enable" Var text_show_eng = "Invisible" + + Var topping_shot_price_x = 600 EndIf @@ -344,6 +348,8 @@ Var text_show_thai = "Invisible" Var text_show_eng = "Enable" + Var topping_shot_price_x = 630 + Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -354,6 +360,8 @@ Var text_show_thai = "Enable" Var text_show_eng = "Invisible" + + Var topping_shot_price_x = 600 EndIf @@ -811,7 +819,9 @@ Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" - + Var text_price_topping = "(+฿" + toppingID2price2 + + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -821,6 +831,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -829,6 +840,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -837,6 +849,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -846,6 +859,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -854,6 +868,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -863,6 +878,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -872,6 +888,7 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf @@ -880,10 +897,21 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + Var text_price_topping = "(+฿" + toppingID2price2 DEBUGVAR TOPPING2 Refresh EndIf + If TOPPING2 = "add-show-1105" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + Var text_price_topping = "(+฿" + toppingID2price2 + DEBUGVAR TOPPING2 + Refresh + EndIf + Var text_price_topping = text_price_topping + ")" ;-END If TOPPING3 = "Collagen" Then @@ -1642,6 +1670,16 @@ + + topping_shot_price_x + 77 + KanitRegularTTF + "Enable" + 36 + 0x84776F + text_price_topping + + ;-END diff --git a/xml_main/startup.xml_new_layout b/xml_main/startup.xml_new_layout index b0451561..bf53f918 100644 --- a/xml_main/startup.xml_new_layout +++ b/xml_main/startup.xml_new_layout @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.43" - Var XMLPageVersionInt = 643 + Var XMLPageVersion = "6.44" + Var XMLPageVersionInt = 644