diff --git a/inc/video.inc b/inc/video.inc index db659618..973a173a 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -18,7 +18,7 @@ Var DefaultLargeBanner = PepsiLargeBanner Var DefaultNormBanner = PepsiNormBanner EndIf - + If showMultiAds = "true" Then @@ -47,7 +47,7 @@ If CountDownPauseVideo2 = -1 Then Var CountDownPauseVideo2 = 0 EndIf - + ; Default. Do not edit here. Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] @@ -103,7 +103,7 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf If UseSlideShowVideo = 1 Then @@ -198,7 +198,7 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf If UseSlideShowVideo = 1 Then @@ -238,7 +238,7 @@ DEBUGVAR a_video_menu[ads_idx] Var ads_idx = 0 EndIf - + ; Default. Do not edit here. Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" @@ -297,7 +297,7 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf If UseSlideShowVideo = 1 Then @@ -355,7 +355,7 @@ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev index 12da7f98..d3bcc8bf 100644 --- a/inter/mys/xml/event/event_profile.ev +++ b/inter/mys/xml/event/event_profile.ev @@ -7,14 +7,14 @@ STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce DEBUGVAR HasProYuzu250Concat DEBUGVAR ProReducedPriceEnable -DEBUGVAR ProYuzu250Enable +DEBUGVAR IgnoreProfileFromRunEV If ProReducedPriceEnable = 1 Then Else DEBUGVAR "Case pro reduce end" ; case-pro-reduce-end - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then DEBUGVAR "Pro yuzu ongoing" ; concat-profile If HasProYuzu250Concat = "true" Then @@ -32,6 +32,12 @@ Else DEBUGVAR XMLProfilePreEvent Var XMLProfile = XMLProfilePreEvent + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" + + ; case-local-profile + If XMLProfile = "Discount50-PromoYuzu250" Then + DEBUGVAR "Restore Discount50 profile, also concat Yuzu" + Var XMLProfile = "NoDis50ForProYuzu25" + EndIf EndIf Else @@ -40,6 +46,12 @@ Else Var XMLProfile = XMLProfile + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" + + ; case-local-profile + If XMLProfile = "Discount50-PromoYuzu250" Then + DEBUGVAR "No pro reduce but Discount50, concat pro yuzu" + Var XMLProfile = "NoDis50ForProYuzu25" + EndIf EndIf EndIf Else diff --git a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev index 899bc931..3bc27fe0 100644 --- a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev +++ b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev @@ -5,12 +5,12 @@ DEBUGVAR FruityRayaEnable DEBUGVAR ProThaiTeaEnable DEBUGVAR ProYuzuEnable -DEBUGVAR ProYuzu250Enable +DEBUGVAR IgnoreProfileFromRunEV If OpenFromPageBoard = 1 Then ; has-ongoing-pro - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml" Var OpenFromPageBoard = 0 @@ -20,7 +20,7 @@ If OpenFromPageBoard = 1 Then Else ; has-ongoing-pro - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml" Var OpenFromPageBoard = 0 diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index f84d0c42..768ea340 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -21,7 +21,7 @@ Var ProYuzuEnable = 0 Var FromProYuzu = 0 ; Yuzu Promo -Var ProYuzu250Enable = 0 +Var IgnoreProfileFromRunEV = 0 Var FromProYuzu250 = 0 @@ -63,7 +63,7 @@ If SystemDateMonthInt = 10 Then Var ProReducedPriceEnable = 1 EndIf - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 EndIf If SystemDateMonthInt = 11 Then @@ -71,11 +71,11 @@ If SystemDateMonthInt = 11 Then Var ProReducedPriceEnable = 1 EndIf - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 EndIf If SystemDateMonthInt = 12 Then - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 If SetProReduceByBO = 1 Then Var ProReducedPriceEnable = 0 @@ -85,9 +85,9 @@ EndIf If SystemDateMonthInt = 1 Then If SystemDateDayInt < 16 Then - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 Else - Var ProYuzu250Enable = 0 + Var IgnoreProfileFromRunEV = 0 EndIf EndIf @@ -114,7 +114,7 @@ If BoxID = 177746 Then Var UseSlideShowVideo = 0 ;Var ProReducedPriceEnable = 0 - ;Var ProYuzu250Enable = 1 + ;Var IgnoreProfileFromRunEV = 1 EndIf If BoxID = 210037 Then diff --git a/inter/mys/xml/page_catalog_group_forkid.lxml b/inter/mys/xml/page_catalog_group_forkid.lxml index d4e5ad74..b9cff860 100644 --- a/inter/mys/xml/page_catalog_group_forkid.lxml +++ b/inter/mys/xml/page_catalog_group_forkid.lxml @@ -2353,11 +2353,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE STRAWKOKO" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk, Mango Syrup, and Iced" + Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup" Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Susu, Sirap Mangga, Ais" + Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" diff --git a/inter/mys/xml/page_catalog_group_fruity_raya.lxml b/inter/mys/xml/page_catalog_group_fruity_raya.lxml index 01627d8c..42d65163 100644 --- a/inter/mys/xml/page_catalog_group_fruity_raya.lxml +++ b/inter/mys/xml/page_catalog_group_fruity_raya.lxml @@ -2876,11 +2876,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE STRAWKOKO" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk, Mango Syrup, and Iced" + Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup" Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Susu, Sirap Mangga, Ais" + Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" diff --git a/inter/mys/xml/page_catalog_group_milk.lxml b/inter/mys/xml/page_catalog_group_milk.lxml index e19d6eff..b43a7c00 100644 --- a/inter/mys/xml/page_catalog_group_milk.lxml +++ b/inter/mys/xml/page_catalog_group_milk.lxml @@ -1,625 +1,625 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu4Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en/" - Var ice_tab_text = "Ice will be ready at " - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 400 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - 0x6F5F51 - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + Var Menu4Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en/" + Var ice_tab_text = "Ice will be ready at " + EndIf + + SAVELOG "EventLanguageOnChange menu -list" + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + + + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + 0x6F5F51 + PriceUnitText + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + 10 497 @@ -2610,11 +2610,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE STRAWKOKO" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk, Mango Syrup, and Iced" + Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup" Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Susu, Sirap Mangga, Ais" + Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" @@ -7985,15 +7985,15 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - - RefreshAll - - - - + + + + + + + + RefreshAll + + + + diff --git a/inter/sgp/xml/page_collect_point_1.lxml b/inter/sgp/xml/page_collect_point_1.lxml index e51628df..d201e24e 100644 --- a/inter/sgp/xml/page_collect_point_1.lxml +++ b/inter/sgp/xml/page_collect_point_1.lxml @@ -1188,7 +1188,7 @@ Var TaobinLevel = "2" - Var CoffeePoint = 55 + Var CoffeePoint = 54 diff --git a/inter/sgp/xml/page_collect_point_2.lxml b/inter/sgp/xml/page_collect_point_2.lxml index 55be3f3f..55671fbf 100644 --- a/inter/sgp/xml/page_collect_point_2.lxml +++ b/inter/sgp/xml/page_collect_point_2.lxml @@ -43,11 +43,12 @@ Var Seeker.TNumberTaobinMember= TelephoneNumber Var TaobinLevel = 2 - Var CoffeePointRank = 55 + Var CoffeePointRank = 54 DEBUGVAR TaobinLevel ; reset Var DebugBypassCollectPt2 = 0 + Var DebugCupSGP = 1 Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml" EndIf @@ -143,6 +144,8 @@ Var TelephoneNumber = TelephoneNumberX If UseSGPCollectFlag = 1 Then + DEBUGVAR Param1 + DEBUGVAR "ActionOk GETACCEXT 35" GETACCEXT Param1 35 Else GETACCEXT TelephoneNumber 14 diff --git a/inter/sgp/xml/page_collect_point_3.lxml b/inter/sgp/xml/page_collect_point_3.lxml index c7435ba3..57696d74 100644 --- a/inter/sgp/xml/page_collect_point_3.lxml +++ b/inter/sgp/xml/page_collect_point_3.lxml @@ -52,6 +52,10 @@ Var pImage = pImage / 55 Var pImageStr = "/taobinPoint55.png" + If DebugCupSGP = 1 Then + Var pImageStr = "/taobinPoint55_debug.png" + EndIf + If UsePepsiTheme = 1 Then Var pImageStr = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member" + pImageStr Else @@ -276,7 +280,10 @@ Var TaobinLevelDesc1More = "SILVER LEVEL" Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 150 + ; reset-rank + DEBUGVAR CoffeePointRank + Var CoffeePointRank = 0 + DEBUGVAR CoffeePointRank EndIf @@ -285,14 +292,19 @@ If TaobinLevel = "3" Then ;Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp - Var PointDiff = 350 - CoffeePointRank - Var TaobinLevelDesc2 = "Earn " + PointDiff - Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " - Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" + ;Var PointDiff = 350 - CoffeePointRank + ;Var TaobinLevelDesc2 = "Earn " + PointDiff + ;Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " + ;Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" Var TaobinLeveImg = "/WTCLevel2.png" + Var TaobinLevelDesc1 = "CUPPING" + Var TaobinLevelDesc1Cont = "BETTER!" - If CoffeePointRank > 349 Then + + Var TaobinLevelDesc1More = "SILVER LEVEL" + + If CoffeePointRank > 199 Then Var TaobinLeveImg = "/WTCLevel3.png" Var TaobinLevelDesc1 = "CUPPING" @@ -300,7 +312,10 @@ Var TaobinLevelDesc1More = "GOLD LEVEL" Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 350 + ;Var CoffeePointRank = CoffeePointRank - 199 + DEBUGVAR CoffeePointRank + Var CoffeePointRank = 0 + DEBUGVAR CoffeePointRank EndIf @@ -312,18 +327,28 @@ Var TaobinLevelDesc2 = "" Var TaobinLeveImg = "/WTCLevel3.png" + + Var TaobinLevelDesc1 = "CUPPING" + Var TaobinLevelDesc1Cont = "BEST!" + + Var TaobinLevelDesc1More = "GOLD LEVEL" + Var TaobinLevelDesc2 = "" EndIf EndIf - + DEBUGVAR TaobinLevel + DEBUGVAR TaobinLevelDesc1 + DEBUGVAR TaobinLevelDesc1Cont + DEBUGVAR TaobinLevelDesc1More + DEBUGVAR CoffeePointRank Var CheckCoupons = 0 Var MakeDrinkState = 0 ; X Y taobin - Var ShellXCol1 = 170 + Var ShellXCol1 = 168 Var ShellXCol2 = 268 Var ShellXCol3 = 367 Var ShellXCol4 = 467 @@ -333,19 +358,19 @@ Var ShellXCol8 = 860 ; 1-8 - Var ShellYRow1 = 1042 + Var ShellYRow1 = 1045 ; 9-16 Var ShellYRow2 = 1125 ; 17-24 - Var ShellYRow3 = 1213 + Var ShellYRow3 = 1208 ; 25-32 Var ShellYRow4 = 1292 ; 33-40 Var ShellYRow5 = 1375 ; 41-48 - Var ShellYRow6 = 1458 + Var ShellYRow6 = 1453 ; 49-55 - Var ShellYRow7 = 1541 + Var ShellYRow7 = 1536 Var taobinP1 = "Invisible" @@ -939,7 +964,7 @@ Var Timeout = 0 EndIf - If Timeout > 5 Then + If Timeout > 25 Then ; goto lid straw If CoffeePoint > 54 Then @@ -1528,8 +1553,8 @@ ; free diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv index 48c8db4a..fd3875d4 100644 --- a/inter/uae_dubai/menu/lang.tsv +++ b/inter/uae_dubai/menu/lang.tsv @@ -1,12 +1,13 @@ TextID Note English arabic - Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center + Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center 000001 Page catalog head Welcome مرحباً - Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center + Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center 000002 Please Select Drink Type الرجاء تحديد نوع المشروب - Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 + Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30 + Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30 000003 Page catalog body Our Specialty تخصصنا 000004 Vending\nMachine آلة البيع\n 000005 Coffee قهوة @@ -23,8 +24,8 @@ TextID Note English arabic 000013 UNAVAILABLE غير متوفره - Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All - Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All + Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All + Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All 000014 our specialty تخصصنا 000015 Coffee قهوة 000016 Tea شاي @@ -39,89 +40,89 @@ TextID Note English arabic page_toopping_select - Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center - Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center - Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center + Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center + Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center + Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center 000040 Not sweet ليس لطيفا 000041 Little قليل 000042 Less أقل 000043 Perfect ممتاز 000044 Extra إضافي 000045 Sweetest أحلى - Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center + Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center - Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center + Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center 000046 0% 0% 000047 20% 20% 000048 40% 40% 000049 60% 60% 000050 80% 80% 000051 100% 100% - Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center - Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center + Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center + Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center 000052 No added sugar السكر لا تضاف 000053 Less sweet أقل حلاوة 000054 Healthy sweet صحي حلو 000055 Just right مجرد حق - 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=0x8092FF,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center -000056 #ERROR! #ERROR! -000057 #ERROR! #ERROR! -000058 #ERROR! #ERROR! -000059 #ERROR! #ERROR! +000056 =+ SUGAR 0 g (0 cal) =+ سكر 0 جم (0 سعر حراري) +000057 =+ SUGAR 3 g (11 cal) =+ سكر3 جم (11 سعر حراري) +000058 =+ SUGAR 7 g (26 cal) =+ سكر 7 جم (26 سعر حراري) +000059 =+ SUGAR 10 g (38 cal) =+ سكر 10 جم (38 سعر حراري) -000060 #ERROR! #ERROR! -000061 #ERROR! #ERROR! -000062 #ERROR! #ERROR! -000063 #ERROR! #ERROR! +000060 =+ SUGAR 0 g (0 cal) =+ سكر 0 جم (0 سعر حراري) +000061 =+ SUGAR 2 g (8 cal) =+ سكر 2 جم (8 سعر حراري) +000062 =+ SUGAR 5 g (19 cal) =+ سكر 5 جم (19 سعر حراري) +000063 =+ SUGAR 7 g (26 cal) =+ سكر 7 جم (26 سعر حراري) - Font=Kanit,Type=Medium,Size=36,Color=0xDE794E Font=Kanit,Type=Medium,Size=36,Color=0xDE794E + Font=Kanit,Type=Medium,Size=36,Color=0x0025FF Font=Kanit,Type=Medium,Size=36,Color=0x0025FF 000064 Extra topping تتصدر اضافية 000065 Sweetness level مستوى الحلاوة 000066 Straw and Lid القش والغطاء 000067 Drink Type نوع الشراب 000103 Vegan substitution استبدال نباتي Text - Font=Kanit,Type=Regular,Size=36,Color=0x513C2F Font=Kanit,Type=Regular,Size=36,Color=0x513C2F + Font=Kanit,Type=Regular,Size=36,Color=0x0025FF Font=Kanit,Type=Regular,Size=36,Color=0x0025FF 000070 I want a straw أريد القش 000071 I want a lid أريد غطاء - Font=Opun,Type=Medium,Size=10,Color=0xDE794E Font=Opun,Type=Medium,Size=10,Color=0xDE794E + Font=Opun,Type=Medium,Size=10,Color=0x8092FF Font=Opun,Type=Medium,Size=10,Color=0x8092FF 000072 Ice will be ready at سيكون الثلج جاهزًا في Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF - Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 + Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 000073 Pay now ادفع الآن - Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 + Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF 000074 Cancel يلغي Font=Kanit,Type=Light,Size=36,Color=0xFF0000 Font=Kanit,Type=Light,Size=36,Color=0xFF0000 000075 Please choose drink type الرجاء اختيار نوع المشروب - Font=Kanit,Type=Regular,Size=28,Color=0x513C2F Font=Kanit,Type=Regular,Size=28,Color=0x513C2F - Font=Kanit,Type=Medium,Size=28,Color=0x513C2F Font=Kanit,Type=Medium,Size=28,Color=0x513C2F - Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D - Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF + Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF + Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF + Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF + Font=Kanit,Type=Regular,Size=28,Color=0x8092FF Font=Kanit,Type=Regular,Size=28,Color=0x8092FF 000081 Hot حار 000082 Iced مثلج 000083 Blend يمزج - Font=Kanit,Type=Regular,Size=24,Color=0x513C2F Font=Kanit,Type=Regular,Size=24,Color=0x513C2F + Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF 000084 Normal طبيعي Left of check box - Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30 + Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=31 000090 Out of straw من القش 000091 Out of lid خارج الغطاء 000092 Only smoothie\n avalible يتوفر عصير\n فقط 000093 Extra shot unavalible for\nsmoothie اللقطة الإضافية غير متاحة\nللعصير Text topping extra - Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 + Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=47 000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] جرعة واحدة من قهوة الإسبريسو\n[ستتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15] 000101 Add extra Oreo crunchy أضف كمية إضافية من الأوريو المقرمش 000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] جرعة واحدة من قهوة الإسبريسو ذات الأصل الواحد\n[ستتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15] @@ -141,8 +142,8 @@ TextID Note English arabic 000401 Notify us about straw problem أخبرنا عن مشكلة القش - Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center - Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,Align=Center + Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=31 + Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=31 000402 Get another straw احصل على قشة أخرى 000403 Get a lid احصل على غطاء 000404 In progress في تَقَدم @@ -157,11 +158,12 @@ TextID Note English arabic 000407 Order next drink اطلب المشروب التالي Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center 000408 Next customer can order while waiting يمكن للعميل التالي الطلب أثناء الانتظار - Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 + Font=Roboto,Type=Bold,Size=80,Color=0x0025FF,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x0025FF,Align=Center,LineHeight=91 000409 The Previous Drink\nHas Not Been Collected لم يتم جمع المشروب السابق\n - Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 + Font=Roboto,Type=Regular,Size=36,Color=0x0025FF,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=36,Color=0x0025FF,Align=Center,LineHeight=51 000410 Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink. الرجاء الضغط على الزر أدناه لفتح الباب.\nأخرج المشروب.\nوابدأ في تقديم مشروبك. - Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 + Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=51 + Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=51 000411 Press Here اضغط هنا @@ -1076,7 +1078,7 @@ TextID Note English arabic 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง @@ -1089,7 +1091,7 @@ TextID Note English arabic 1300016 Brew time:sec เวลาชง: วินาที 1300017 Test grind sizes ทดสอบขนาดบด 1300018 Coffee module type : ประเภทชุดกาแฟ : -1300019 1. Select grind sizes 1. เลือกขนาดการบด +1300019 1. Select grind sizes 1. เลือกขนาดบด 1300020 More coarse หยาบขึ้น 1300021 More fine ละเอียดขึ้น 1300022 2. Test grinding 2. ทดสอบการบด diff --git a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml index ad05edf7..77c70576 100644 --- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml @@ -18219,7 +18219,7 @@ Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE" - Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي" + Var NameLang[2][1] = "شاي تايلاندي كافيه لاتيه سموثي" Var NameLang[2][2] = "" Var NameLang[2][3] = "" Var NameLang[2][4] = "" @@ -22810,6 +22810,546 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 53-01-02-0068 - + + 33 + 22 + 225 + 296 + Flag( 53-01-02-0068.Button,$Sum5301020068) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + + + + 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" ) + $53-01-02-0068.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-01-02-0068.Button + StringFmt( $53-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5301020068 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-01-02-0068.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5301020068 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-21-02-0068 - + + 33 + 22 + 225 + 296 + Flag( 53-21-02-0068.Button,$Sum5321020068) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + COCONUT\nAMERICANO + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + Espresso, Coconut Syrup, Sugar, Water + + + + 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" ) + $53-21-02-0068.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-21-02-0068.Button + StringFmt( $53-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5321020068 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-21-02-0068.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5321020068 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml index 4a3504e2..1064b916 100644 --- a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml @@ -2937,7 +2937,7 @@ Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO" - Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية" + Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية" Var NameLang[2][2] = "" Var NameLang[2][3] = "" Var NameLang[2][4] = "" diff --git a/inter/uae_dubai/xml/page_catalog_group_health.lxml b/inter/uae_dubai/xml/page_catalog_group_health.lxml index d3fd9b91..a7225d25 100644 --- a/inter/uae_dubai/xml/page_catalog_group_health.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml @@ -4288,7 +4288,7 @@ Var NameLang[0][4] = "" Var NameLang[0][5] = "" Var DescLang[0][0] = "Matcha and Hot water" - Var DescLang[0][1] = "ماتشا وماء ساخن" + Var DescLang[0][1] = "ماتشا والماء الساخن" Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" @@ -5384,7 +5384,7 @@ Var NameLang[0][4] = "" Var NameLang[0][5] = "" Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice" - Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج" + Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج" Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" @@ -5396,7 +5396,7 @@ Var NameLang[1][4] = "" Var NameLang[1][5] = "" Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice" - Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج" + Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" diff --git a/inter/uae_dubai/xml/page_catalog_group_milk.lxml b/inter/uae_dubai/xml/page_catalog_group_milk.lxml index 629a0a7a..fdb91559 100644 --- a/inter/uae_dubai/xml/page_catalog_group_milk.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_milk.lxml @@ -3738,7 +3738,7 @@ Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO" - Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية" + Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية" Var NameLang[2][2] = "" Var NameLang[2][3] = "" Var NameLang[2][4] = "" diff --git a/inter/uae_dubai/xml/page_catalog_group_other.lxml b/inter/uae_dubai/xml/page_catalog_group_other.lxml index 0f1ddecd..59f32a78 100644 --- a/inter/uae_dubai/xml/page_catalog_group_other.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml @@ -10133,6 +10133,1356 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 53-05-02-0090 - + + 33 + 22 + 225 + 296 + Flag( 53-05-02-0090.Button,$Sum5305020090) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT SODA + COCONUT SODA + COCONUT SODA + COCONUT SODA + COCONUT SODA + COCONUT SODA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup and Soda + Coconut Syrup and Soda + Coconut Syrup and Soda + Coconut Syrup and Soda + Coconut Syrup and Soda + Coconut Syrup and Soda + + + + 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" ) + $53-05-02-0090.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-02-0090.Button + StringFmt( $53-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5305020090 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-05-02-0090.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5305020090 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-05-02-0103 - + + 33 + 22 + 225 + 296 + Flag( 53-05-02-0103.Button,$Sum5305020103) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT 7UP + COCONUT 7UP + COCONUT 7UP + COCONUT 7UP + COCONUT 7UP + COCONUT 7UP + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, 7UP and Soda + Coconut Syrup, 7UP and Soda + Coconut Syrup, 7UP and Soda + Coconut Syrup, 7UP and Soda + Coconut Syrup, 7UP and Soda + Coconut Syrup, 7UP and Soda + + + + 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" ) + $53-05-02-0103.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-02-0103.Button + StringFmt( $53-05-02-0103.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5305020103 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-05-02-0103.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5305020103 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-05-02-0091 53-05-03-0091 + + 33 + 22 + 225 + 296 + Flag( 53-05-02-0091.Button,53-05-03-0091.Button,$Sum53050200915305030091) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + + + + 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" ) + $53-05-02-0091.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-02-0091.Button + StringFmt( $53-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-05-03-0091.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-03-0091.Button + StringFmt( $53-05-03-0091.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 $Sum53050200915305030091 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-05-02-0091.TAG tag2_is_disable + STRCONTAIN "ERR" $53-05-03-0091.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53050200915305030091 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-05-02-0114 53-05-03-0114 + + 33 + 22 + 225 + 296 + Flag( 53-05-02-0114.Button,53-05-03-0114.Button,$Sum53050201145305030114) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + COCONUT PEPSI + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + Coconut Syrup, Pepsi and Soda + + + + 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" ) + $53-05-02-0114.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-02-0114.Button + StringFmt( $53-05-02-0114.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-05-03-0114.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-03-0114.Button + StringFmt( $53-05-03-0114.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 $Sum53050201145305030114 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-05-02-0114.TAG tag2_is_disable + STRCONTAIN "ERR" $53-05-03-0114.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53050201145305030114 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-05-02-0093 - + + 33 + 22 + 225 + 296 + Flag( 53-05-02-0093.Button,$Sum5305020093) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT LYCHEE\nSODA + COCONUT LYCHEE\nSODA + COCONUT LYCHEE\nSODA + COCONUT LYCHEE\nSODA + COCONUT LYCHEE\nSODA + COCONUT LYCHEE\nSODA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Lychee Syrup and Soda + Coconut Syrup, Lychee Syrup and Soda + Coconut Syrup, Lychee Syrup and Soda + Coconut Syrup, Lychee Syrup and Soda + Coconut Syrup, Lychee Syrup and Soda + Coconut Syrup, Lychee Syrup and Soda + + + + 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" ) + $53-05-02-0093.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-05-02-0093.Button + StringFmt( $53-05-02-0093.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5305020093 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-05-02-0093.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5305020093 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 53-05-02-0015 - diff --git a/inter/uae_dubai/xml/page_catalog_group_tea.lxml b/inter/uae_dubai/xml/page_catalog_group_tea.lxml index 8f81b507..40f60614 100644 --- a/inter/uae_dubai/xml/page_catalog_group_tea.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_tea.lxml @@ -11143,7 +11143,7 @@ Var NameLang[0][4] = "" Var NameLang[0][5] = "" Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice" - Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج" + Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج" Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" @@ -11155,7 +11155,7 @@ Var NameLang[1][4] = "" Var NameLang[1][5] = "" Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice" - Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج" + Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -11646,6 +11646,1900 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 53-03-01-0058 53-03-02-0058 53-03-03-0058 + + 33 + 22 + 225 + 296 + Flag( 53-03-01-0058.Button,53-03-02-0058.Button,53-03-03-0058.Button,$Sum530301005853030200585303030058) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT MILK + COCONUT MILK + COCONUT MILK + COCONUT MILK + COCONUT MILK + COCONUT MILK + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut syrup, Milk, Water + Coconut syrup, Milk, Water + Coconut syrup, Milk, Water + Coconut syrup, Milk, Water + Coconut syrup, Milk, Water + Coconut syrup, Milk, Water + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $53-03-01-0058.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-03-01-0058.Button + StringFmt( $53-03-01-0058.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $53-03-02-0058.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-03-02-0058.Button + StringFmt( $53-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-03-03-0058.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-03-03-0058.Button + StringFmt( $53-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum530301005853030200585303030058 = "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 $Sum530301005853030200585303030058 = "Disable" Then + STRCONTAIN "ERR" $53-03-01-0058.TAG tag1_is_disable + STRCONTAIN "ERR" $53-03-02-0058.TAG tag2_is_disable + STRCONTAIN "ERR" $53-03-03-0058.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum530301005853030200585303030058 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-02-02-0060 53-02-03-0060 + + 33 + 22 + 225 + 296 + Flag( 53-02-02-0060.Button,53-02-03-0060.Button,$Sum53020200605302030060) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT MATCHA\nLATTE + COCONUT MATCHA\nLATTE + COCONUT MATCHA\nLATTE + COCONUT MATCHA\nLATTE + COCONUT MATCHA\nLATTE + COCONUT MATCHA\nLATTE + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Matcha Milk Water + Coconut Syrup, Matcha Milk Water + Coconut Syrup, Matcha Milk Water + Coconut Syrup, Matcha Milk Water + Coconut Syrup, Matcha Milk Water + Coconut Syrup, Matcha Milk Water + + + + 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" ) + $53-02-02-0060.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-02-0060.Button + StringFmt( $53-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-02-03-0060.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-03-0060.Button + StringFmt( $53-02-03-0060.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 $Sum53020200605302030060 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-02-02-0060.TAG tag2_is_disable + STRCONTAIN "ERR" $53-02-03-0060.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53020200605302030060 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-02-02-0061 53-02-03-0061 + + 33 + 22 + 225 + 296 + Flag( 53-02-02-0061.Button,53-02-03-0061.Button,$Sum53020200615302030061) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT MATCHA + COCONUT MATCHA + COCONUT MATCHA + COCONUT MATCHA + COCONUT MATCHA + COCONUT MATCHA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Matcha and Water + Coconut Syrup, Matcha and Water + Coconut Syrup, Matcha and Water + Coconut Syrup, Matcha and Water + Coconut Syrup, Matcha and Water + Coconut Syrup, Matcha and Water + + + + 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" ) + $53-02-02-0061.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-02-0061.Button + StringFmt( $53-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-02-03-0061.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-03-0061.Button + StringFmt( $53-02-03-0061.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 $Sum53020200615302030061 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-02-02-0061.TAG tag2_is_disable + STRCONTAIN "ERR" $53-02-03-0061.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53020200615302030061 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-02-02-0062 53-02-03-0062 + + 33 + 22 + 225 + 296 + Flag( 53-02-02-0062.Button,53-02-03-0062.Button,$Sum53020200625302030062) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT THAI\nMILK TEA + COCONUT THAI\nMILK TEA + COCONUT THAI\nMILK TEA + COCONUT THAI\nMILK TEA + COCONUT THAI\nMILK TEA + COCONUT THAI\nMILK TEA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Thai Tea, Milk Water + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea, Milk Water + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea, Milk Water + Coconut Syrup, Thai Tea and Water + + + + 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" ) + $53-02-02-0062.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-02-0062.Button + StringFmt( $53-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-02-03-0062.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-03-0062.Button + StringFmt( $53-02-03-0062.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 $Sum53020200625302030062 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-02-02-0062.TAG tag2_is_disable + STRCONTAIN "ERR" $53-02-03-0062.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53020200625302030062 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-02-02-0063 53-02-03-0063 + + 33 + 22 + 225 + 296 + Flag( 53-02-02-0063.Button,53-02-03-0063.Button,$Sum53020200635302030063) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT THAI\nBLACK TEA + COCONUT THAI\nBLACK TEA + COCONUT THAI\nBLACK TEA + COCONUT THAI\nBLACK TEA + COCONUT THAI\nBLACK TEA + COCONUT THAI\nBLACK TEA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea and Water + Coconut Syrup, Thai Tea and Water + + + + 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" ) + $53-02-02-0063.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-02-0063.Button + StringFmt( $53-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-02-03-0063.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-03-0063.Button + StringFmt( $53-02-03-0063.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 $Sum53020200635302030063 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-02-02-0063.TAG tag2_is_disable + STRCONTAIN "ERR" $53-02-03-0063.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53020200635302030063 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-02-02-0064 53-02-03-0064 + + 33 + 22 + 225 + 296 + Flag( 53-02-02-0064.Button,53-02-03-0064.Button,$Sum53020200645302030064) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT JASMINE\nMILK TEA + COCONUT JASMINE\nMILK TEA + COCONUT JASMINE\nMILK TEA + COCONUT JASMINE\nMILK TEA + COCONUT JASMINE\nMILK TEA + COCONUT JASMINE\nMILK TEA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Jasmine Tea, Milk Water + Coconut Syrup, Jasmine Tea, Milk Water + Coconut Syrup, Jasmine Tea, Milk Water + Coconut Syrup, Jasmine Tea, Milk Water + Coconut Syrup, Jasmine Tea, Milk Water + Coconut Syrup, Jasmine Tea, Milk Water + + + + 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" ) + $53-02-02-0064.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-02-0064.Button + StringFmt( $53-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-02-03-0064.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-03-0064.Button + StringFmt( $53-02-03-0064.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 $Sum53020200645302030064 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-02-02-0064.TAG tag2_is_disable + STRCONTAIN "ERR" $53-02-03-0064.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53020200645302030064 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 53-02-02-0065 53-02-03-0065 + + 33 + 22 + 225 + 296 + Flag( 53-02-02-0065.Button,53-02-03-0065.Button,$Sum53020200655302030065) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + COCONUT JASMINE\nTEA + COCONUT JASMINE\nTEA + COCONUT JASMINE\nTEA + COCONUT JASMINE\nTEA + COCONUT JASMINE\nTEA + COCONUT JASMINE\nTEA + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coconut Syrup, Jasmine Tea and Water + Coconut Syrup, Jasmine Tea and Water + Coconut Syrup, Jasmine Tea and Water + Coconut Syrup, Jasmine Tea and Water + Coconut Syrup, Jasmine Tea and Water + Coconut Syrup, Jasmine Tea and Water + + + + 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" ) + $53-02-02-0065.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-02-0065.Button + StringFmt( $53-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $53-02-03-0065.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $53-02-03-0065.Button + StringFmt( $53-02-03-0065.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 $Sum53020200655302030065 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $53-02-02-0065.TAG tag2_is_disable + STRCONTAIN "ERR" $53-02-03-0065.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum53020200655302030065 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/whatthecup/sgp/image/page_member/points_alert.png b/inter/whatthecup/sgp/image/page_member/points_alert.png index 4947d0d5..dd0bf126 100644 Binary files a/inter/whatthecup/sgp/image/page_member/points_alert.png and b/inter/whatthecup/sgp/image/page_member/points_alert.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 45750219..e20ff2e7 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1195,10 +1195,11 @@ EndIf EndIf - If ProYuzu250Enable = "" Then - Var ProYuzu250Enable = 0 + If IgnoreProfileFromRunEV = "" Then + Var IgnoreProfileFromRunEV = 0 EndIf - If ProYuzu250Enable = 0 Then + + If IgnoreProfileFromRunEV = 0 Then TRY "ROOT/taobin_project/xml/profile/run.ev" EndIf @@ -1328,7 +1329,12 @@ ; lang-lock-until-done If LangProcess = "Done" Then Var ShowButtonClick = "Enable" - ;Var ShowButtonClickFull = "Enable" + + If UsePepsiTheme = 1 Then + Var ShowButtonClickFull = "Enable" + EndIf + + Else Var ShowButtonClick = "Invisible" Var ShowButtonClickFull = "Invisible"