From 0529613887f0cc2ad1f8ce3432b992271376d05b Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 6 Jun 2023 15:20:51 +0700 Subject: [PATCH] SNAP 7.28 --- xml/page_board.xml | 1 + xml/page_catalog_group_coffee.lxml | 20 +- xml/page_catalog_group_milk.lxml | 20 +- xml/page_catalog_group_tea.lxml | 536 +---------------------------- xml/page_catalog_group_tea.xml | 8 +- xml_main/startup.xml | 4 +- 6 files changed, 29 insertions(+), 560 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 106f1970..73bcb3cb 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1223,6 +1223,7 @@ + ShowNetworkProblem 5 1880 24 diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index 9c70dccb..f6e31327 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -5598,16 +5598,16 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "" - Var NameLang[1][1] = "" - Var NameLang[1][2] = "" - Var NameLang[1][3] = "" - Var NameLang[1][4] = "" - Var DescLang[1][0] = "" - Var DescLang[1][1] = "" - Var DescLang[1][2] = "" - Var DescLang[1][3] = "" - Var DescLang[1][4] = "" + Var NameLang[1][0] = "SODACANO" + Var NameLang[1][1] = "โซดากาโน่" + Var NameLang[1][2] = "-" + Var NameLang[1][3] = "-" + Var NameLang[1][4] = "SODACANO" + Var DescLang[1][0] = "Espresso & Soda" + Var DescLang[1][1] = "กาแฟ และ โซดา" + Var DescLang[1][2] = "-" + Var DescLang[1][3] = "-" + Var DescLang[1][4] = "Espresso, Soda" Var NameLang[2][0] = "" Var NameLang[2][1] = "" Var NameLang[2][2] = "" diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index e51203b7..dedb7c57 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -4763,16 +4763,16 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "SUSU KOKO PISANG\nTOKYO" Var aliasDesc[4] = "Sirap Pisang Tokyo, Susu, Gula" - Var NameLang[0][0] = "Hot Lychee MILK" - Var NameLang[0][1] = "นมลิ้นจี่ร้อน" - Var NameLang[0][2] = "" - Var NameLang[0][3] = "" - Var NameLang[0][4] = "SUSU LAICI PANAS" - Var DescLang[0][0] = "Milk, Lychee Syrup" - Var DescLang[0][1] = "นม และ น้ำเชื่อมลิ้นจี่" - Var DescLang[0][2] = "" - Var DescLang[0][3] = "" - Var DescLang[0][4] = "Susu, Sirap Laici" + Var NameLang[0][0] = "CHOCO TOKYO\nBANANA MILK" + Var NameLang[0][1] = "นมช็อกโกโตเกียว\nบานาน่า" + Var NameLang[0][2] = "-" + Var NameLang[0][3] = "-" + Var NameLang[0][4] = "SUSU KOKO PISANG\nTOKYO" + Var DescLang[0][0] = "Tokyo Banana Syrup, Milk, Sugar" + Var DescLang[0][1] = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + Var DescLang[0][2] = "-" + Var DescLang[0][3] = "-" + Var DescLang[0][4] = "Sirap Pisang Tokyo, Susu, Gula" Var NameLang[1][0] = "Iced Lychee MILK" Var NameLang[1][1] = "นมลิ้นจี่เย็น" Var NameLang[1][2] = "" diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index b14ddeac..8a7993a9 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -4494,272 +4494,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 - - 33 - 22 - 225 - 296 - Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,$Sum120201003912020200391202030039) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - THAI MILK TEA - ชานมไทย - THAI MILK TEA - ชานมไทย - TEH SUSU THAI - ชานมไทย - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Thai tea, Sugar, Warm milk - ชาไทย และ นมอุ่น - Thai tea, Sugar, Warm milk - ชาไทย และ นมอุ่น - Teh Thai, Gula, Susu - ชาไทย และ นมอุ่น - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-02-01-0039.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-01-0039.Button - StringFmt( $12-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-02-02-0039.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-02-0039.Button - StringFmt( $12-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-02-03-0039.Button - - - 174 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-03-0039.Button - StringFmt( $12-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120201003912020200391202030039 = "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 $Sum120201003912020200391202030039 = "Disable" Then - STRCONTAIN "ERR" $12-02-01-0039.TAG tag1_is_disable - STRCONTAIN "ERR" $12-02-02-0039.TAG tag2_is_disable - STRCONTAIN "ERR" $12-02-03-0039.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum120201003912020200391202030039 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; 12-02-01-0027 12-02-02-0027 12-02-03-0027 @@ -7420,272 +7154,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; 12-02-01-0027 12-02-02-0027 12-02-03-0027 - - 33 - 22 - 225 - 296 - Flag( 12-02-01-0027.Button,12-02-02-0027.Button,12-02-03-0027.Button,$Sum120201002712020200271202030027) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - MATCHA - ชาเขียวญี่ปุ่น - MATCHA - ชาเขียวญี่ปุ่น - MATCHA - ชาเขียวญี่ปุ่น - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Matcha & Water - ชาเชียว และน้ำ - Matcha & Water - ชาเชียว และน้ำ - Matcha, Air - ชาเชียว และน้ำ - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-02-01-0027.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-01-0027.Button - StringFmt( $12-02-01-0027.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-02-02-0027.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-02-0027.Button - StringFmt( $12-02-02-0027.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-02-03-0027.Button - - - 174 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-03-0027.Button - StringFmt( $12-02-03-0027.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120201002712020200271202030027 = "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 $Sum120201002712020200271202030027 = "Disable" Then - STRCONTAIN "ERR" $12-02-01-0027.TAG tag1_is_disable - STRCONTAIN "ERR" $12-02-02-0027.TAG tag2_is_disable - STRCONTAIN "ERR" $12-02-03-0027.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum120201002712020200271202030027 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; 12-02-01-0028 12-02-02-0028 12-02-03-0028 @@ -10380,7 +9848,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH O THAI LIMAU AIS" + Var aliasName[4] = "TEH O THAI LIMAU\nAIS" Var aliasDesc[4] = "Teh Thai, Sirap Limau, Air" Var NameLang[0][0] = "Hot THAI TEA LIMENADE" Var NameLang[0][1] = "ชาดำมะนาวร้อน" @@ -10463,7 +9931,7 @@ ชาดำมะนาว THAI TEA \nLIMENADE ชาดำมะนาว - TEH O THAI LIMAU AIS + TEH O THAI LIMAU\nAIS ชาดำมะนาว diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index b39377cb..cbb6b19d 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -3326,9 +3326,9 @@ GINGER TEA" Flag( 12-02-01-0025.Button,12-02-02-0025.Button,12-02-03-0025.Button,$Sum120201002512020200251202030025)