diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_mint_mocha.png b/inter/aus/image/page_drink_disable_n2/bn_hot_mint_mocha.png new file mode 100644 index 00000000..bb207d35 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_hot_mint_mocha.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_melon.png b/inter/aus/image/page_drink_disable_n2/bn_iced_melon.png new file mode 100644 index 00000000..3e57bae0 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_melon.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu.png b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu.png new file mode 100644 index 00000000..cbf704cc Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_mint_mocha.png b/inter/aus/image/page_drink_n/bn_hot_mint_mocha.png new file mode 100644 index 00000000..a53292ae Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_hot_mint_mocha.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_melon.png b/inter/aus/image/page_drink_n/bn_iced_melon.png new file mode 100644 index 00000000..680d64cb Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_melon.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_yuzu.png b/inter/aus/image/page_drink_n/bn_iced_yuzu.png new file mode 100644 index 00000000..b53ef53e Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_yuzu.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_mint_mocha.png b/inter/aus/image/page_drink_picture2_n/bn_hot_mint_mocha.png new file mode 100644 index 00000000..67ab87aa Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_hot_mint_mocha.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_melon.png b/inter/aus/image/page_drink_picture2_n/bn_iced_melon.png new file mode 100644 index 00000000..eb1ebe8b Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_melon.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu.png b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu.png new file mode 100644 index 00000000..2724c444 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_mint_mocha.png b/inter/aus/image/page_drink_press_n/bn_hot_mint_mocha.png new file mode 100644 index 00000000..df76db07 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_hot_mint_mocha.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_melon.png b/inter/aus/image/page_drink_press_n/bn_iced_melon.png new file mode 100644 index 00000000..8b8276c7 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_melon.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_yuzu.png b/inter/aus/image/page_drink_press_n/bn_iced_yuzu.png new file mode 100644 index 00000000..a39d1e5c Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_yuzu.png differ diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml index 6eabc996..29252deb 100644 --- a/inter/aus/xml/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/page_catalog_group_coffee.lxml @@ -1,634 +1,634 @@ - - - - "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 - - - 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 - - - - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - 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 Menu2Selected = "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 - 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 - - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/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" - - Refresh - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - - - - -; 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 + + + 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 + + + + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + 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 Menu2Selected = "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 + 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 + + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/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" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + + + + +; 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 @@ -14408,6 +14408,272 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-01-01-0064 51-01-02-0064 51-01-03-0064 + + 33 + 22 + 225 + 296 + Flag( 51-01-01-0064.Button,51-01-02-0064.Button,51-01-03-0064.Button,$Sum510101006451010200645101030064) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MINT MOCHA + มอคค่า + MINT MOCHA + มอคค่า + + มอคค่า + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso Mint, Cocoa, Milk, Sugar, Ice + กาแฟ นม โกโก้ และ น้ำตาล + Espresso Mint, Cocoa, Milk, Sugar, Ice + กาแฟ นม โกโก้ และ น้ำตาล + + กาแฟ นม โกโก้ และ น้ำตาล + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-01-01-0064.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-01-01-0064.Button + StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-01-02-0064.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-01-02-0064.Button + StringFmt( $51-01-02-0064.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-01-03-0064.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-01-03-0064.Button + StringFmt( $51-01-03-0064.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum510101006451010200645101030064 = "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 $Sum510101006451010200645101030064 = "Disable" Then + STRCONTAIN "ERR" $51-01-01-0064.TAG tag1_is_disable + STRCONTAIN "ERR" $51-01-02-0064.TAG tag2_is_disable + STRCONTAIN "ERR" $51-01-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum510101006451010200645101030064 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; 51-01-01-0007 51-01-02-0004 51-01-03-0004 @@ -21339,10 +21605,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index c5722cc7..647a0790 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -1425,6 +1425,268 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-05-02-0088 51-05-03-0088 + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0088.Button,51-05-03-0088.Button,$Sum51050200885105030088) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MELON + เมล่อนโซดา + MELON + เมล่อนโซดา + + เมล่อนโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Melon Syrup, Ice + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + Melon Syrup, Ice + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + + + + 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" ) + $51-05-02-0088.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0088.Button + StringFmt( $51-05-02-0088.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-05-03-0088.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-03-0088.Button + StringFmt( $51-05-03-0088.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 $Sum51050200885105030088 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0088.TAG tag2_is_disable + STRCONTAIN "ERR" $51-05-03-0088.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" + $Sum51050200885105030088 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 51-05-02-0044 - @@ -1687,6 +1949,268 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-05-02-0089 51-05-03-0089 + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0089.Button,51-05-03-0089.Button,$Sum51050200895105030089) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + YUZU + ยูซุโซดา + YUZU + ยูซุโซดา + + ยูซุโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Ice + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + Yuzu Syrup, Ice + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + + + + 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" ) + $51-05-02-0089.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0089.Button + StringFmt( $51-05-02-0089.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-05-03-0089.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-03-0089.Button + StringFmt( $51-05-03-0089.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 $Sum51050200895105030089 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0089.TAG tag2_is_disable + STRCONTAIN "ERR" $51-05-03-0089.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" + $Sum51050200895105030089 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 51-05-02-0045 - diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml index 1e54a326..8a172d16 100644 --- a/inter/aus/xml/page_catalog_group_recommend.lxml +++ b/inter/aus/xml/page_catalog_group_recommend.lxml @@ -9942,6 +9942,268 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-05-02-0088 51-05-03-0088 + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0088.Button,51-05-03-0088.Button,Disable=Invisible,$Sum51050200885105030088) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MELON + เมล่อนโซดา + MELON + เมล่อนโซดา + + เมล่อนโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Melon Syrup, Ice + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + Melon Syrup, Ice + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + + + + 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" ) + $51-05-02-0088.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0088.Button + StringFmt( $51-05-02-0088.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-05-03-0088.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-03-0088.Button + StringFmt( $51-05-03-0088.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 $Sum51050200885105030088 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0088.TAG tag2_is_disable + STRCONTAIN "ERR" $51-05-03-0088.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" + $Sum51050200885105030088 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; 51-03-01-0022 51-03-02-0022 51-03-03-0022 @@ -10208,6 +10470,268 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-05-02-0089 51-05-03-0089 + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0089.Button,51-05-03-0089.Button,Disable=Invisible,$Sum51050200895105030089) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + YUZU + ยูซุโซดา + YUZU + ยูซุโซดา + + ยูซุโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Ice + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + Yuzu Syrup, Ice + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + + + + 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" ) + $51-05-02-0089.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0089.Button + StringFmt( $51-05-02-0089.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-05-03-0089.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-03-0089.Button + StringFmt( $51-05-03-0089.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 $Sum51050200895105030089 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0089.TAG tag2_is_disable + STRCONTAIN "ERR" $51-05-03-0089.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" + $Sum51050200895105030089 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - - 51-03-03-0009 diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml index 225c1752..77064d2d 100644 --- a/inter/aus/xml/page_topping_select6.lxml +++ b/inter/aus/xml/page_topping_select6.lxml @@ -1723,9 +1723,9 @@ - 26 + 10 8 - 75 + 200 42 000083