diff --git a/inter/mys/xml/page_catalog_group_fruity_raya.lxml b/inter/mys/xml/page_catalog_group_fruity_raya.lxml index 70818b8e..7f40e813 100644 --- a/inter/mys/xml/page_catalog_group_fruity_raya.lxml +++ b/inter/mys/xml/page_catalog_group_fruity_raya.lxml @@ -726,7 +726,6 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 - Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1496,11 +1495,11 @@ Var NameLang[1][3] = "-" Var NameLang[1][4] = "SODA PLUM LIMAU" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Ume Syrup, Limenade, Soda, Ice" - Var DescLang[1][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Ume Syrup, Limenade, Soda, Sugar, Ice" + Var DescLang[1][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา น้ำตาล และน้ำแข็ง" Var DescLang[1][2] = "-" Var DescLang[1][3] = "-" - Var DescLang[1][4] = "Sirap Ume,Limau, Soda, Ais" + Var DescLang[1][4] = "Sirap Ume,Limau, Soda, Gula, Ais" Var DescLang[1][5] = "" Var NameLang[2][0] = "PLUM LIMENADE SODA SMOOTHIE" Var NameLang[2][1] = "บ๊วยมะนาวโซดาปั่น" @@ -1508,11 +1507,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE SODA PLUM LIMAU" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Ume Syrup, Limenade, Soda, Ice" - Var DescLang[2][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][0] = "Ume Syrup, Limenade, Soda, Sugar, Ice" + Var DescLang[2][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา น้ำตาล และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Sirap Ume, Limau, Soda, Ais" + Var DescLang[2][4] = "Sirap Ume, Limau, Soda, Gula, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml index 229cead9..4567ea7f 100644 --- a/inter/mys/xml/page_catalog_group_other.lxml +++ b/inter/mys/xml/page_catalog_group_other.lxml @@ -4440,7 +4440,7 @@ Var PD_CODE3 = "12-05-03-0024" ; begin lang Var aliasName[0] = "PLUM SODA" - Var aliasDesc[0] = "Ume Syrup, Soda & Ice" + Var aliasDesc[0] = "Ume Syrup, Soda, Sugar & Ice" Var aliasName[1] = "บ๊วยโซดา" Var aliasDesc[1] = "น้ำเชื่อมบ๊วย โซดา" Var aliasName[2] = "-" @@ -4448,7 +4448,7 @@ Var aliasName[3] = "-" Var aliasDesc[3] = "-" Var aliasName[4] = "SODA PLUM" - Var aliasDesc[4] = "Sirap Ume, Soda, Ais" + Var aliasDesc[4] = "Sirap Ume, Soda, Gula, Ais" Var aliasName[5] = "" Var aliasDesc[5] = "" Var NameLang[0][0] = "" @@ -4469,11 +4469,11 @@ Var NameLang[1][3] = "-" Var NameLang[1][4] = "SODA PLUM" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Ume Syrup, Soda, Ice" - Var DescLang[1][1] = "น้ำเชื่อมบ๊วย โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Ume Syrup, Soda, Sugar, Ice" + Var DescLang[1][1] = "น้ำเชื่อมบ๊วย โซดา น้ำตาล และน้ำแข็ง" Var DescLang[1][2] = "-" Var DescLang[1][3] = "-" - Var DescLang[1][4] = "Sirap Ume, Soda, Ais" + Var DescLang[1][4] = "Sirap Ume, Soda, Gula, Ais" Var DescLang[1][5] = "" Var NameLang[2][0] = "PLUM SODA SMOOTHIE" Var NameLang[2][1] = "บ๊วยโซดาปั่น" @@ -4481,11 +4481,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE SODA PLUM" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Ume Syrup, Soda, Ice" - Var DescLang[2][1] = "น้ำเชื่อมบ๊วย โซดา และน้ำแข็ง" + Var DescLang[2][0] = "Ume Syrup, Soda, Sugar, Ice" + Var DescLang[2][1] = "น้ำเชื่อมบ๊วย โซดา น้ำตาล และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Sirap Ume, Soda, Ais" + Var DescLang[2][4] = "Sirap Ume, Soda, Gula, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" @@ -4550,11 +4550,11 @@ KanitMediumTTF 0x6F5F51 - Ume Syrup, Soda & Ice + Ume Syrup, Soda, Sugar & Ice น้ำเชื่อมบ๊วย โซดา - Ume Syrup, Soda & Ice + Ume Syrup, Soda, Sugar & Ice น้ำเชื่อมบ๊วย โซดา - Sirap Ume, Soda, Ais + Sirap Ume, Soda, Gula, Ais น้ำเชื่อมบ๊วย โซดา @@ -4710,7 +4710,7 @@ Var PD_CODE3 = "12-05-03-0025" ; begin lang Var aliasName[0] = "PLUM \nLIMENADE SODA" - Var aliasDesc[0] = "Ume Syrup, Limenade, \nSoda & Ice" + Var aliasDesc[0] = "Ume Syrup, Limenade, \nSoda, Sugar & Ice" Var aliasName[1] = "บ๊วยมะนาวโซดา" Var aliasDesc[1] = "น้ำเชื่อมบ๊วย มะนาว โซดา \n" Var aliasName[2] = "-" @@ -4718,7 +4718,7 @@ Var aliasName[3] = "-" Var aliasDesc[3] = "-" Var aliasName[4] = "SODA PLUM LIMAU" - Var aliasDesc[4] = "Sirap Ume, Sirap Limau, Soda, Ais" + Var aliasDesc[4] = "Sirap Ume, Sirap Limau, Soda, Gula, Ais" Var aliasName[5] = "" Var aliasDesc[5] = "" Var NameLang[0][0] = "" @@ -4739,11 +4739,11 @@ Var NameLang[1][3] = "-" Var NameLang[1][4] = "SODA PLUM LIMAU" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Ume Syrup, Limenade, Soda, Ice" - Var DescLang[1][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Ume Syrup, Limenade, Soda, Sugar, Ice" + Var DescLang[1][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา น้ำตาล และน้ำแข็ง" Var DescLang[1][2] = "-" Var DescLang[1][3] = "-" - Var DescLang[1][4] = "Sirap Ume,Limau, Soda, Ais" + Var DescLang[1][4] = "Sirap Ume,Limau, Soda, Gula, Ais" Var DescLang[1][5] = "" Var NameLang[2][0] = "PLUM LIMENADE SODA SMOOTHIE" Var NameLang[2][1] = "บ๊วยมะนาวโซดาปั่น" @@ -4751,11 +4751,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE SODA PLUM LIMAU" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Ume Syrup, Limenade, Soda, Ice" - Var DescLang[2][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][0] = "Ume Syrup, Limenade, Soda, Sugar, Ice" + Var DescLang[2][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา น้ำตาล และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Sirap Ume, Limau, Soda, Ais" + Var DescLang[2][4] = "Sirap Ume, Limau, Soda, Gula, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" @@ -4820,11 +4820,11 @@ KanitMediumTTF 0x6F5F51 - Ume Syrup, Limenade, \nSoda & Ice + Ume Syrup, Limenade, \nSoda, Sugar & Ice น้ำเชื่อมบ๊วย มะนาว โซดา \n - Ume Syrup, Limenade, \nSoda & Ice + Ume Syrup, Limenade, \nSoda, Sugar & Ice น้ำเชื่อมบ๊วย มะนาว โซดา \n - Sirap Ume, Sirap Limau, Soda, Ais + Sirap Ume, Sirap Limau, Soda, Gula, Ais น้ำเชื่อมบ๊วย มะนาว โซดา \n diff --git a/inter/mys/xml/page_catalog_group_recommend.lxml b/inter/mys/xml/page_catalog_group_recommend.lxml index 674a30c5..79d79de1 100644 --- a/inter/mys/xml/page_catalog_group_recommend.lxml +++ b/inter/mys/xml/page_catalog_group_recommend.lxml @@ -11905,11 +11905,11 @@ Var NameLang[1][3] = "-" Var NameLang[1][4] = "SODA PLUM LIMAU" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Ume Syrup, Limenade, Soda, Ice" - Var DescLang[1][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Ume Syrup, Limenade, Soda, Sugar, Ice" + Var DescLang[1][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา น้ำตาล และน้ำแข็ง" Var DescLang[1][2] = "-" Var DescLang[1][3] = "-" - Var DescLang[1][4] = "Sirap Ume,Limau, Soda, Ais" + Var DescLang[1][4] = "Sirap Ume,Limau, Soda, Gula, Ais" Var DescLang[1][5] = "" Var NameLang[2][0] = "PLUM LIMENADE SODA SMOOTHIE" Var NameLang[2][1] = "บ๊วยมะนาวโซดาปั่น" @@ -11917,11 +11917,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE SODA PLUM LIMAU" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Ume Syrup, Limenade, Soda, Ice" - Var DescLang[2][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][0] = "Ume Syrup, Limenade, Soda, Sugar, Ice" + Var DescLang[2][1] = "น้ำเชื่อมบ๊วย มะนาว โซดา น้ำตาล และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Sirap Ume, Limau, Soda, Ais" + Var DescLang[2][4] = "Sirap Ume, Limau, Soda, Gula, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" diff --git a/inter/mys/xml/page_topping_select6.lxml b/inter/mys/xml/page_topping_select6.lxml index 52373fd8..3f9b4469 100644 --- a/inter/mys/xml/page_topping_select6.lxml +++ b/inter/mys/xml/page_topping_select6.lxml @@ -472,30 +472,32 @@ DEBUGVAR LanguageShowByIndex DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var topping_shot_price_x = 630 - Var text_x_add_oreo_price = 510 - Var text_show_normal_x = 408 - Var text_show_blend_x = 872 - If BGSugar = "Enable" Then + If SugarSoundFlag = 1 Then + + If LanguageShow = "ENG" Then + Var topping_shot_price_x = 630 + Var text_x_add_oreo_price = 510 + Var text_show_normal_x = 408 + Var text_show_blend_x = 872 + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + EndIf + If LanguageShow = "THAI" Then + Var topping_shot_price_x = 600 + Var text_x_add_oreo_price = 490 + Var text_show_normal_x = 386 + Var text_show_blend_x = 852 + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + EndIf + If LanguageShow = "MALAY" Then + Var topping_shot_price_x = 630 + Var text_x_add_oreo_price = 510 + Var text_show_normal_x = 408 + Var text_show_blend_x = 872 + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf EndIf - If LanguageShow = "THAI" Then - Var topping_shot_price_x = 600 - Var text_x_add_oreo_price = 490 - Var text_show_normal_x = 386 - Var text_show_blend_x = 852 - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - EndIf - If LanguageShow = "MALAY" Then - Var topping_shot_price_x = 630 - Var text_x_add_oreo_price = 510 - Var text_show_normal_x = 408 - Var text_show_blend_x = 872 - Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" - EndIf - + If SelectDrinkType = 1 Then Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv index f80ae8c0..7688f5ac 100644 --- a/inter/sgp/menu/lang.tsv +++ b/inter/sgp/menu/lang.tsv @@ -70,7 +70,8 @@ TextID Note English Thai 000057 =+ SUGAR 3 g (11 cal) =+ น้ำตาล 3 g (11 cal) 000058 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal) 000059 =+ SUGAR 10 g (38 cal) =+ น้ำตาล 10 g (38 cal) - + Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center + Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center 000060 =+ SUGAR 0 g (0 cal) =+ น้ำตาล 0 g (0 cal) 000061 =+ SUGAR 2 g (8 cal) =+ น้ำตาล 2 g (8 cal) 000062 =+ SUGAR 5 g (19 cal) =+ น้ำตาล 5 g (19 cal) diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml index c185816c..8a64697a 100644 --- a/inter/sgp/xml/page_catalog_group_other.lxml +++ b/inter/sgp/xml/page_catalog_group_other.lxml @@ -7556,7 +7556,7 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "GINGER SODA" + Var NameLang[2][0] = "GINGER SODA SMOOTHIE" Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -7831,7 +7831,7 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "GINGER LIME SODA" + Var NameLang[2][0] = "GINGER LIME SODA SMOOTHIE" Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml index 9d383177..9bddb3d8 100644 --- a/inter/sgp/xml/page_catalog_group_recommend.lxml +++ b/inter/sgp/xml/page_catalog_group_recommend.lxml @@ -639,281 +639,6 @@ Var block_index_move = 0 ;dummy_layout.inc - ; ==================> Len = 3 - ; - - 52-03-03-0026 - - 33 - 22 - 225 - 296 - Flag( 52-03-03-0026.Button,Disable=Invisible,$Sum5203030026) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - Pink milk\nOreo Vocalno - นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - Pink milk\nOreo Vocalno - นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - - นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Salak Syrup, Milk,\nSugar Oreo - น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo - Salak Syrup, Milk,\nSugar Oreo - น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo - - น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $52-03-03-0026.Button - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $52-03-03-0026.Button - StringFmt( $52-03-03-0026.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 $Sum5203030026 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $52-03-03-0026.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" - $Sum5203030026 - - 000013 - - center-vertical-horizontal - - ; ==================> Len = 3 ; 52-01-01-0001 - - @@ -11437,7 +11162,7 @@ Var PD_CODE3 = "52-03-03-0049" ; begin lang Var aliasName[0] = "MILO SMOOTHIE \nVOLCANO" - Var aliasDesc[0] = "Milo, Sugar, milk, Oreo" + Var aliasDesc[0] = "Milo, Sugar, milk" Var aliasName[1] = "โอวัลตินปั่นภูเขาไฟ" Var aliasDesc[1] = "โอวัลติน น้ำตาล และ นม" Var aliasName[2] = "-" @@ -11561,9 +11286,9 @@ KanitMediumTTF 0x6F5F51 - Milo, Sugar, milk, Oreo + Milo, Sugar, milk โอวัลติน น้ำตาล และ นม - Milo, Sugar, milk, Oreo + Milo, Sugar, milk โอวัลติน น้ำตาล และ นม โอวัลติน น้ำตาล และ นม @@ -11696,15 +11421,15 @@ ; ==================> Len = 3 - ; - 52-05-02-0062 52-05-03-0062 + ; - 52-05-02-0062 - 33 22 225 296 - Flag( 52-05-02-0062.Button,52-05-03-0062.Button,Disable=Invisible,$Sum52050200625205030062) + Flag( 52-05-02-0062.Button,Disable=Invisible,$Sum5205020062) + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh + +