From 9f8c225a94620a5cef915472eb345d2c3a5f4481 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 29 Jan 2024 16:56:36 +0700 Subject: [PATCH] AUS rename catalog group milk name --- inter/aus/image/page3_2_en/bn_cho_ca2.png | Bin 0 -> 3396 bytes inter/aus/image/page3_2_en/bp_cho_ca2.png | Bin 0 -> 3405 bytes inter/aus/menu/lang.tsv | 2 +- inter/aus/xml/menu_catalog_new.lxml | 175 +++--- inter/aus/xml/menu_catalog_new_menu.lxml | 2 +- inter/aus/xml/menu_tab.py | 28 +- inter/aus/xml/page_catalog_group_appfast.lxml | 177 +++--- inter/aus/xml/page_catalog_group_coffee.lxml | 349 ++++++------ inter/aus/xml/page_catalog_group_forkid.lxml | 177 +++--- inter/aus/xml/page_catalog_group_health.lxml | 197 +++---- inter/aus/xml/page_catalog_group_milk.lxml | 177 +++--- inter/aus/xml/page_catalog_group_other.lxml | 177 +++--- .../aus/xml/page_catalog_group_recommend.lxml | 195 +++---- inter/aus/xml/page_catalog_group_tea.lxml | 177 +++--- inter/aus/xml/page_catalog_group_whey.lxml | 177 +++--- xml/event/promotion_15THB.xml | 511 +++++++++++++++++ xml/event/promotion_peach.xml | 511 +++++++++++++++++ xml/event/promotion_rerun.xml | 511 +++++++++++++++++ xml/page_catalog_group_recommend.xml | 513 +++++++++++++++++- 19 files changed, 3055 insertions(+), 1001 deletions(-) create mode 100644 inter/aus/image/page3_2_en/bn_cho_ca2.png create mode 100644 inter/aus/image/page3_2_en/bp_cho_ca2.png diff --git a/inter/aus/image/page3_2_en/bn_cho_ca2.png b/inter/aus/image/page3_2_en/bn_cho_ca2.png new file mode 100644 index 0000000000000000000000000000000000000000..62f1c3b281b5fc1400dd244bc3d79e5c68471338 GIT binary patch literal 3396 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 literal 0 HcmV?d00001 diff --git a/inter/aus/image/page3_2_en/bp_cho_ca2.png b/inter/aus/image/page3_2_en/bp_cho_ca2.png new file mode 100644 index 0000000000000000000000000000000000000000..303a75b1b44123ffab62e2105c850643d92b584b GIT binary patch literal 3405 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 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 @@ -41,8 +41,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -56,12 +56,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -74,23 +74,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -104,6 +104,7 @@ 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 @@ -115,12 +116,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -148,15 +149,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -169,13 +170,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -286,20 +287,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -310,20 +311,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -336,17 +337,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -362,17 +363,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -386,16 +387,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -409,20 +410,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -433,9 +434,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -461,13 +462,13 @@ 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 - + diff --git a/inter/aus/xml/menu_catalog_new_menu.lxml b/inter/aus/xml/menu_catalog_new_menu.lxml index 06beafe7..bd00873c 100644 --- a/inter/aus/xml/menu_catalog_new_menu.lxml +++ b/inter/aus/xml/menu_catalog_new_menu.lxml @@ -1,5 +1,5 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" diff --git a/inter/aus/xml/menu_tab.py b/inter/aus/xml/menu_tab.py index 80c190fe..0d6827d6 100644 --- a/inter/aus/xml/menu_tab.py +++ b/inter/aus/xml/menu_tab.py @@ -8,8 +8,8 @@ out_xml(' ; bn_bestseller Var( DirName + "/bp_bestseller.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" + + Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -20,7 +20,7 @@ out_xml(' ; bn_bestseller Var( DirName + "/bp_coffee.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -32,20 +32,20 @@ out_xml(' ; bn_bestseller Var( DirName + "/bp_tea.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" + + Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -56,8 +56,8 @@ out_xml(' ; bn_bestseller Var( DirName + "/bp_fruit.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" + + Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" @@ -69,7 +69,7 @@ out_xml(' ; bn_bestseller Var( DirName + "/bp_sodada.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" + + Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" - \ No newline at end of file + diff --git a/inter/aus/xml/page_catalog_group_appfast.lxml b/inter/aus/xml/page_catalog_group_appfast.lxml index e0694b75..217ea5bb 100644 --- a/inter/aus/xml/page_catalog_group_appfast.lxml +++ b/inter/aus/xml/page_catalog_group_appfast.lxml @@ -144,7 +144,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -171,9 +171,9 @@ 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 @@ -200,8 +200,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -215,12 +215,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -233,23 +233,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -263,6 +263,7 @@ 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 @@ -274,12 +275,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -307,15 +308,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -328,13 +329,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -445,20 +446,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -469,20 +470,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -495,17 +496,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -521,17 +522,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -545,16 +546,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -568,20 +569,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -592,9 +593,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -620,14 +621,14 @@ 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 - + diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml index b45c5f6c..db647950 100644 --- a/inter/aus/xml/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/page_catalog_group_coffee.lxml @@ -137,7 +137,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -163,9 +163,9 @@ 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 @@ -192,8 +192,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -207,12 +207,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -225,23 +225,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -255,6 +255,7 @@ 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 @@ -266,12 +267,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -299,15 +300,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -320,13 +321,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -437,20 +438,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -461,20 +462,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -487,17 +488,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -513,17 +514,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -537,16 +538,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -560,20 +561,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -584,9 +585,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -612,14 +613,14 @@ 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 - + @@ -1729,7 +1730,7 @@ Var PD_CODE2 = "51-01-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "AMERICANO" + Var aliasName[0] = "LONG BLACK" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "กาแฟดำ(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำ" @@ -1739,7 +1740,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot AMERICANO" + Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -1749,7 +1750,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Air" - Var NameLang[1][0] = "Iced AMERICANO" + Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1816,9 +1817,9 @@ KanitMediumTTF 0x322B26 - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) กาแฟดำ(อเมริกาโน) @@ -1995,7 +1996,7 @@ Var PD_CODE2 = "51-21-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "AMERICANO" + Var aliasName[0] = "LONG BLACK" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "กาแฟดำ(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำ" @@ -2005,7 +2006,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot AMERICANO" + Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -2015,7 +2016,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Air" - Var NameLang[1][0] = "Iced AMERICANO" + Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -2082,9 +2083,9 @@ KanitMediumTTF 0x322B26 - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) กาแฟดำ(อเมริกาโน) @@ -5453,7 +5454,7 @@ Var PD_CODE2 = "51-01-02-0041" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "SODACANO" + Var aliasName[0] = "SPARCKING ESPRESSO" Var aliasDesc[0] = "Espresso & Soda" Var aliasName[1] = "โซดากาโน่" Var aliasDesc[1] = "กาแฟ และ โซดา" @@ -5540,9 +5541,9 @@ KanitMediumTTF 0x322B26 - SODACANO + SPARCKING ESPRESSO โซดากาโน่ - SODACANO + SPARCKING ESPRESSO โซดากาโน่ โซดากาโน่ @@ -5715,7 +5716,7 @@ Var PD_CODE2 = "51-21-02-0041" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "SODACANO" + Var aliasName[0] = "SPARCKING ESPRESSO" Var aliasDesc[0] = "Espresso & Soda" Var aliasName[1] = "โซดากาโน่" Var aliasDesc[1] = "กาแฟ และ โซดา" @@ -5735,7 +5736,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "SODACANO" + Var NameLang[1][0] = "SPARCKING ESPRESSO" Var NameLang[1][1] = "โซดากาโน่" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -5802,9 +5803,9 @@ KanitMediumTTF 0x322B26 - SODACANO + SPARCKING ESPRESSO โซดากาโน่ - SODACANO + SPARCKING ESPRESSO โซดากาโน่ โซดากาโน่ @@ -12333,7 +12334,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "THAI Iced ESPRESSO" + Var NameLang[1][0] = "THAI Iced COFFEE" Var NameLang[1][1] = "เอสเย็นแบบไทยๆ" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -12343,7 +12344,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var NameLang[2][0] = "THAI Iced ESPRESSO SMOOTHIE" + Var NameLang[2][0] = "THAI Iced COFFEE SMOOTHIE" Var NameLang[2][1] = "เอสเพรสโซ่ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -12595,7 +12596,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "THAI Iced ESPRESSO" + Var NameLang[1][0] = "THAI Iced COFFEE" Var NameLang[1][1] = "เอสเย็นแบบไทยๆ" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -12605,7 +12606,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var NameLang[2][0] = "THAI Iced ESPRESSO SMOOTHIE" + Var NameLang[2][0] = "THAI Iced COFFEE SMOOTHIE" Var NameLang[2][1] = "เอสเพรสโซ่ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -14995,7 +14996,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais" - Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE" + Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE" Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -15261,7 +15262,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais" - Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE" + Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE" Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -15527,7 +15528,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais" - Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE" + Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE" Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -15793,7 +15794,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais" - Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE" + Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE" Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -16571,7 +16572,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MELON CAFÉ LATTE" + Var NameLang[0][0] = "Hot MELON COFFEE LATTE" Var NameLang[0][1] = "กาแฟเมล่อนลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -16581,7 +16582,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Sirap Melon, Gula, Air" - Var NameLang[1][0] = "Iced MELON CAFÉ LATTE" + Var NameLang[1][0] = "Iced MELON COFFEE LATTE" Var NameLang[1][1] = "กาแฟเมล่อนลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -16837,7 +16838,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MELON CAFÉ LATTE" + Var NameLang[0][0] = "Hot MELON COFFEE LATTE" Var NameLang[0][1] = "กาแฟเมล่อนลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -16847,7 +16848,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Sirap Melon, Gula, Air" - Var NameLang[1][0] = "Iced MELON CAFÉ LATTE" + Var NameLang[1][0] = "Iced MELON COFFEE LATTE" Var NameLang[1][1] = "กาแฟเมล่อนลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -17093,7 +17094,7 @@ Var PD_CODE2 = "51-01-02-0006" Var PD_CODE3 = "51-01-03-0006" ; begin lang - Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE" + Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar" Var aliasName[1] = "กาแฟชานมไต้หวัน" Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม" @@ -17103,7 +17104,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE" + Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE" Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -17113,7 +17114,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula" - Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE" + Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE" Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -17180,9 +17181,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน กาแฟชานมไต้หวัน @@ -17359,7 +17360,7 @@ Var PD_CODE2 = "51-21-02-0006" Var PD_CODE3 = "51-21-03-0006" ; begin lang - Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE" + Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar" Var aliasName[1] = "กาแฟชานมไต้หวัน" Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม" @@ -17369,7 +17370,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE" + Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE" Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -17379,7 +17380,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula" - Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE" + Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE" Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -17446,9 +17447,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน กาแฟชานมไต้หวัน @@ -17645,7 +17646,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced THAI TEA CAFÉ LATTE" + Var NameLang[1][0] = "Iced THAI TEA COFFEE LATTE" Var NameLang[1][1] = "กาแฟชาไทยเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -17655,7 +17656,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Teh Thai, Susu, Gula, Ais" - Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE" + Var NameLang[2][0] = "THAI TEA COFFEE LATTE SMOOTHIE" Var NameLang[2][1] = "กาแฟชาไทยปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -17901,7 +17902,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot THAI TEA CAFÉ LATTE" + Var NameLang[0][0] = "Hot THAI TEA COFFEE LATTE" Var NameLang[0][1] = "กาแฟชาไทยร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -17911,7 +17912,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Teh Thai, Susu, Gula" - Var NameLang[1][0] = "Iced THAI TEA CAFÉ LATTE" + Var NameLang[1][0] = "Iced THAI TEA COFFEE LATTE" Var NameLang[1][1] = "กาแฟชาไทยเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -17921,7 +17922,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Teh Thai, Susu, Gula, Ais" - Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE" + Var NameLang[2][0] = "THAI TEA COFFEE LATTE SMOOTHIE" Var NameLang[2][1] = "กาแฟชาไทยปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -18689,7 +18690,7 @@ Var PD_CODE2 = "51-01-02-0017" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "LYCHEECANO" + Var aliasName[0] = "LYCHEE ESPRESSO" Var aliasDesc[0] = "Espresso, Lychee,\nSugar, Water" Var aliasName[1] = "ลิ้นจี่กาโน่" Var aliasDesc[1] = "กาแฟ น้ำ และ ลิ้นจี่" @@ -18776,9 +18777,9 @@ KanitMediumTTF 0x322B26 - LYCHEECANO + LYCHEE ESPRESSO ลิ้นจี่กาโน่ - LYCHEECANO + LYCHEE ESPRESSO ลิ้นจี่กาโน่ ลิ้นจี่กาโน่ @@ -18955,7 +18956,7 @@ Var PD_CODE2 = "51-21-02-0017" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "LYCHEECANO" + Var aliasName[0] = "LYCHEE ESPRESSO" Var aliasDesc[0] = "Espresso, Lychee,\nSugar, Water" Var aliasName[1] = "ลิ้นจี่กาโน่" Var aliasDesc[1] = "กาแฟ น้ำ และ ลิ้นจี่" @@ -19042,9 +19043,9 @@ KanitMediumTTF 0x322B26 - LYCHEECANO + LYCHEE ESPRESSO ลิ้นจี่กาโน่ - LYCHEECANO + LYCHEE ESPRESSO ลิ้นจี่กาโน่ ลิ้นจี่กาโน่ @@ -19221,7 +19222,7 @@ Var PD_CODE2 = "51-01-02-0040" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "YUZUCANO" + Var aliasName[0] = "YUZU ESPRESSO" Var aliasDesc[0] = "Espresso, Yuzu,\nSugar, Water" Var aliasName[1] = "ยูซุกาโน่" Var aliasDesc[1] = "กาแฟ น้ำ และ ยูซุ" @@ -19308,9 +19309,9 @@ KanitMediumTTF 0x322B26 - YUZUCANO + YUZU ESPRESSO ยูซุกาโน่ - YUZUCANO + YUZU ESPRESSO ยูซุกาโน่ ยูซุกาโน่ @@ -19487,7 +19488,7 @@ Var PD_CODE2 = "51-21-02-0040" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "YUZUCANO" + Var aliasName[0] = "YUZU ESPRESSO" Var aliasDesc[0] = "Espresso, Yuzu,\nSugar, Water" Var aliasName[1] = "ยูซุกาโน่" Var aliasDesc[1] = "กาแฟ น้ำ และ ยูซุ" @@ -19574,9 +19575,9 @@ KanitMediumTTF 0x322B26 - YUZUCANO + YUZU ESPRESSO ยูซุกาโน่ - YUZUCANO + YUZU ESPRESSO ยูซุกาโน่ ยูซุกาโน่ @@ -19753,7 +19754,7 @@ Var PD_CODE2 = "51-01-02-0042" Var PD_CODE3 = "51-01-03-0042" ; begin lang - Var aliasName[0] = "TOKYO BANANA \nLATTE" + Var aliasName[0] = "TOKYO BANANA \nESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water" Var aliasName[1] = "ลาเต้โตเกียวบานาน่า" Var aliasDesc[1] = "กาแฟ น้ำ นม และ กล้วย" @@ -19763,7 +19764,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TOKYO BANANA \nLATTE" + Var NameLang[0][0] = "Hot TOKYO BANANA \nESPRESSO LATTE" Var NameLang[0][1] = "ลาเต้โตเกียวบานาน่าร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -19773,7 +19774,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Sirap Pisang Tokyo, Gula, Air" - Var NameLang[1][0] = "Iced TOKYO BANANA \nLATTE" + Var NameLang[1][0] = "Iced TOKYO BANANA \nESPRESSO LATTE" Var NameLang[1][1] = "ลาเต้โตเกียวบานาน่าเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -19783,7 +19784,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Sirap Pisang Tokyo, Gula, Air, Ais" - Var NameLang[2][0] = "TOKYO BANANA \nLATTE SMOOTHIE" + Var NameLang[2][0] = "Hot TOKYO BANANA \nESPRESSO LATTE" Var NameLang[2][1] = "ลาเต้โตเกียวบานาน่าปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -19840,9 +19841,9 @@ KanitMediumTTF 0x322B26 - TOKYO BANANA \nLATTE + TOKYO BANANA \nESPRESSO LATTE ลาเต้โตเกียวบานาน่า - TOKYO BANANA \nLATTE + TOKYO BANANA \nESPRESSO LATTE ลาเต้โตเกียวบานาน่า ลาเต้โตเกียวบานาน่า @@ -20019,7 +20020,7 @@ Var PD_CODE2 = "51-21-02-0042" Var PD_CODE3 = "51-21-03-0042" ; begin lang - Var aliasName[0] = "TOKYO BANANA \nLATTE" + Var aliasName[0] = "TOKYO BANANA \nESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water" Var aliasName[1] = "ลาเต้โตเกียวบานาน่า" Var aliasDesc[1] = "กาแฟ น้ำ นม และ กล้วย" @@ -20106,9 +20107,9 @@ KanitMediumTTF 0x322B26 - TOKYO BANANA \nLATTE + TOKYO BANANA \nESPRESSO LATTE ลาเต้โตเกียวบานาน่า - TOKYO BANANA \nLATTE + TOKYO BANANA \nESPRESSO LATTE ลาเต้โตเกียวบานาน่า ลาเต้โตเกียวบานาน่า @@ -20285,7 +20286,7 @@ Var PD_CODE2 = "51-21-02-0057" Var PD_CODE3 = "51-21-03-0057" ; begin lang - Var aliasName[0] = "MINT CAFE LATTE" + Var aliasName[0] = "MINT ESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Mint Syrup,\nSugar, Milk" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -20295,7 +20296,7 @@ Var aliasDesc[3] = "" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MINT CAFE LATTE" + Var NameLang[0][0] = "Hot MINT ESPRESSO LATTE" Var NameLang[0][1] = "กาแฟมินต์ลาเต้ร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" @@ -20305,7 +20306,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced MINT CAFE LATTE" + Var NameLang[1][0] = "Iced MINT ESPRESSO LATTE" Var NameLang[1][1] = "กาแฟมินต์ลาเต้เย็น" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -20315,7 +20316,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" - Var NameLang[2][0] = " MINT CAFE LATTE\nSMOOTHIE" + Var NameLang[2][0] = "MINT ESPRESSO LATTE\nSMOOTHIE" Var NameLang[2][1] = "กาแฟมินต์ลาเต้ปั่น" Var NameLang[2][2] = "-" Var NameLang[2][3] = "-" @@ -20372,9 +20373,9 @@ KanitMediumTTF 0x322B26 - MINT CAFE LATTE + MINT ESPRESSO LATTE - MINT CAFE LATTE + MINT ESPRESSO LATTE @@ -20551,7 +20552,7 @@ Var PD_CODE2 = "51-21-02-0058" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MINTCANO" + Var aliasName[0] = "MINT ESPRESSO" Var aliasDesc[0] = "Espresso, Mint Syrup,\nSugar, Water" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -20561,7 +20562,7 @@ Var aliasDesc[3] = "" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MINTCANO" + Var NameLang[0][0] = "Hot MINT ESPRESSO" Var NameLang[0][1] = "มินต์กาโน่ร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" @@ -20571,7 +20572,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced MINTCANO" + Var NameLang[1][0] = "Iced MINT ESPRESSO" Var NameLang[1][1] = "มินต์กาโน่เย็น" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -20638,9 +20639,9 @@ KanitMediumTTF 0x322B26 - MINTCANO + MINT ESPRESSO - MINTCANO + MINT ESPRESSO @@ -20817,7 +20818,7 @@ Var PD_CODE2 = "51-01-02-0030" Var PD_CODE3 = "51-01-03-0030" ; begin lang - Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE" + Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar" Var aliasName[1] = "กาแฟชานมไต้หวัน" Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม" @@ -20827,7 +20828,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE" + Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE" Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -20837,7 +20838,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula" - Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE" + Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE" Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -20904,9 +20905,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน กาแฟชานมไต้หวัน @@ -21083,7 +21084,7 @@ Var PD_CODE2 = "51-21-02-0030" Var PD_CODE3 = "51-21-03-0030" ; begin lang - Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE" + Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE" Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar" Var aliasName[1] = "กาแฟชานมไต้หวัน" Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม" @@ -21093,7 +21094,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE" + Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE" Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -21103,7 +21104,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula" - Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE" + Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE" Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -21170,9 +21171,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน - TAIWANESE TEA\nCAFÉ LATTE + DIRTY TEA\nESPRESSO LATTE กาแฟชานมไต้หวัน กาแฟชานมไต้หวัน diff --git a/inter/aus/xml/page_catalog_group_forkid.lxml b/inter/aus/xml/page_catalog_group_forkid.lxml index cdefe583..c983e014 100644 --- a/inter/aus/xml/page_catalog_group_forkid.lxml +++ b/inter/aus/xml/page_catalog_group_forkid.lxml @@ -145,7 +145,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -172,9 +172,9 @@ 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 @@ -201,8 +201,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -216,12 +216,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -234,23 +234,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -264,6 +264,7 @@ 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 @@ -275,12 +276,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -308,15 +309,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -329,13 +330,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -446,20 +447,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -470,20 +471,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -496,17 +497,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -522,17 +523,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -546,16 +547,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -569,20 +570,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -593,9 +594,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -621,14 +622,14 @@ 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 - + diff --git a/inter/aus/xml/page_catalog_group_health.lxml b/inter/aus/xml/page_catalog_group_health.lxml index 7a04d30d..c75ecd85 100644 --- a/inter/aus/xml/page_catalog_group_health.lxml +++ b/inter/aus/xml/page_catalog_group_health.lxml @@ -136,7 +136,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -163,9 +163,9 @@ 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 @@ -192,8 +192,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -207,12 +207,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -225,23 +225,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -255,6 +255,7 @@ 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 @@ -266,12 +267,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -299,15 +300,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -320,13 +321,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -437,20 +438,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -461,20 +462,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -487,17 +488,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -513,17 +514,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -537,16 +538,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -560,20 +561,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -584,9 +585,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -612,14 +613,14 @@ 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 - + @@ -662,7 +663,7 @@ Var PD_CODE2 = "51-01-02-1001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "AMERICANO" + Var aliasName[0] = "LONG BLACK" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)" @@ -672,7 +673,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot AMERICANO" + Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -682,7 +683,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Air" - Var NameLang[1][0] = "Iced AMERICANO" + Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -749,9 +750,9 @@ KanitMediumTTF 0x322B26 - AMERICANO + LONG BLACK กาแฟดำ\n(อเมริกาโน) - AMERICANO + LONG BLACK กาแฟดำ\n(อเมริกาโน) กาแฟดำ\n(อเมริกาโน) @@ -928,7 +929,7 @@ Var PD_CODE2 = "51-21-02-1001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "AMERICANO" + Var aliasName[0] = "LONG BLACK" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)" @@ -938,7 +939,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot AMERICANO" + Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -948,7 +949,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Air" - Var NameLang[1][0] = "Iced AMERICANO" + Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1015,9 +1016,9 @@ KanitMediumTTF 0x322B26 - AMERICANO + LONG BLACK กาแฟดำ\n(อเมริกาโน) - AMERICANO + LONG BLACK กาแฟดำ\n(อเมริกาโน) กาแฟดำ\n(อเมริกาโน) diff --git a/inter/aus/xml/page_catalog_group_milk.lxml b/inter/aus/xml/page_catalog_group_milk.lxml index 791a711b..8c773fe6 100644 --- a/inter/aus/xml/page_catalog_group_milk.lxml +++ b/inter/aus/xml/page_catalog_group_milk.lxml @@ -135,7 +135,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -161,9 +161,9 @@ 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 @@ -190,8 +190,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -205,12 +205,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -223,23 +223,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -253,6 +253,7 @@ 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 @@ -264,12 +265,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -297,15 +298,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -318,13 +319,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -435,20 +436,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -459,20 +460,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -485,17 +486,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -511,17 +512,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -535,16 +536,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -558,20 +559,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -582,9 +583,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -610,14 +611,14 @@ 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 - + diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index 97e409c7..562bb00e 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -136,7 +136,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -162,9 +162,9 @@ 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 @@ -191,8 +191,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -206,12 +206,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -224,23 +224,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -254,6 +254,7 @@ 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 @@ -265,12 +266,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -298,15 +299,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -319,13 +320,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -436,20 +437,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -460,20 +461,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -486,17 +487,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -512,17 +513,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -536,16 +537,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -559,20 +560,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -583,9 +584,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -611,14 +612,14 @@ 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 - + diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml index 73108fc1..83676b02 100644 --- a/inter/aus/xml/page_catalog_group_recommend.lxml +++ b/inter/aus/xml/page_catalog_group_recommend.lxml @@ -169,9 +169,9 @@ 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 @@ -198,8 +198,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -213,12 +213,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -231,23 +231,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -261,6 +261,7 @@ 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 @@ -272,12 +273,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -305,15 +306,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -326,13 +327,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -443,20 +444,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -467,20 +468,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -493,17 +494,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -519,17 +520,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -543,16 +544,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -566,20 +567,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -590,9 +591,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -618,14 +619,14 @@ 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 - + @@ -1463,7 +1464,7 @@ Var PD_CODE2 = "51-01-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "AMERICANO" + Var aliasName[0] = "LONG BLACK" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "กาแฟดำ(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำ" @@ -1473,7 +1474,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot AMERICANO" + Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -1483,7 +1484,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Air" - Var NameLang[1][0] = "Iced AMERICANO" + Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1550,9 +1551,9 @@ KanitMediumTTF 0x322B26 - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) กาแฟดำ(อเมริกาโน) @@ -1729,7 +1730,7 @@ Var PD_CODE2 = "51-21-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "AMERICANO" + Var aliasName[0] = "LONG BLACK" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "กาแฟดำ(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำ" @@ -1739,7 +1740,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot AMERICANO" + Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -1749,7 +1750,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Air" - Var NameLang[1][0] = "Iced AMERICANO" + Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1816,9 +1817,9 @@ KanitMediumTTF 0x322B26 - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) - AMERICANO + LONG BLACK กาแฟดำ(อเมริกาโน) กาแฟดำ(อเมริกาโน) diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml index a46a0bbc..152a11bd 100644 --- a/inter/aus/xml/page_catalog_group_tea.lxml +++ b/inter/aus/xml/page_catalog_group_tea.lxml @@ -136,7 +136,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -163,9 +163,9 @@ 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 @@ -192,8 +192,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -207,12 +207,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -225,23 +225,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -255,6 +255,7 @@ 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 @@ -266,12 +267,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -299,15 +300,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -320,13 +321,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -437,20 +438,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -461,20 +462,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -487,17 +488,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -513,17 +514,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -537,16 +538,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -560,20 +561,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -584,9 +585,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -612,14 +613,14 @@ 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 - + diff --git a/inter/aus/xml/page_catalog_group_whey.lxml b/inter/aus/xml/page_catalog_group_whey.lxml index 1cf53c10..8ffc48a0 100644 --- a/inter/aus/xml/page_catalog_group_whey.lxml +++ b/inter/aus/xml/page_catalog_group_whey.lxml @@ -141,7 +141,7 @@ - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -168,9 +168,9 @@ 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 @@ -197,8 +197,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -212,12 +212,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -230,23 +230,23 @@ 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 + 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 + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -260,6 +260,7 @@ 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 @@ -271,12 +272,12 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - + @@ -304,15 +305,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -325,13 +326,13 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -442,20 +443,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -466,20 +467,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -492,17 +493,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -518,17 +519,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -542,16 +543,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -565,20 +566,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -589,9 +590,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -617,14 +618,14 @@ 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 - + diff --git a/xml/event/promotion_15THB.xml b/xml/event/promotion_15THB.xml index a80c2a16..92d7d2b6 100644 --- a/xml/event/promotion_15THB.xml +++ b/xml/event/promotion_15THB.xml @@ -2083,6 +2083,517 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; - - 12-03-03-0029 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมกล้วยปั่น +โอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "BANANA MILK OREO +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Banana Syrup, Milk, +Sugar, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0029.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0029.Button + StringFmt( $12-03-03-0029.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 $Sum1203030029 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0029.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030029 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; 12-03-01-0024 12-03-02-0024 12-03-03-0024 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมช็อกโกโตเกียว +บานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CHOCO TOKYO +BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0024.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0024.Button + StringFmt( $12-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0024.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0024.Button + StringFmt( $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0024.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0024.Button + StringFmt( $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0024.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum120301002412030200241203030024 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 diff --git a/xml/event/promotion_peach.xml b/xml/event/promotion_peach.xml index 44e29582..fb105507 100644 --- a/xml/event/promotion_peach.xml +++ b/xml/event/promotion_peach.xml @@ -2083,6 +2083,517 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; - - 12-03-03-0029 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมกล้วยปั่น +โอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "BANANA MILK OREO +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Banana Syrup, Milk, +Sugar, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0029.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0029.Button + StringFmt( $12-03-03-0029.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 $Sum1203030029 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0029.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030029 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; 12-03-01-0024 12-03-02-0024 12-03-03-0024 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมช็อกโกโตเกียว +บานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CHOCO TOKYO +BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0024.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0024.Button + StringFmt( $12-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0024.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0024.Button + StringFmt( $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0024.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0024.Button + StringFmt( $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0024.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum120301002412030200241203030024 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 diff --git a/xml/event/promotion_rerun.xml b/xml/event/promotion_rerun.xml index aa9ddad0..9155962f 100644 --- a/xml/event/promotion_rerun.xml +++ b/xml/event/promotion_rerun.xml @@ -2083,6 +2083,517 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; - - 12-03-03-0029 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมกล้วยปั่น +โอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "BANANA MILK OREO +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Banana Syrup, Milk, +Sugar, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0029.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0029.Button + StringFmt( $12-03-03-0029.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 $Sum1203030029 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0029.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030029 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; 12-03-01-0024 12-03-02-0024 12-03-03-0024 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมช็อกโกโตเกียว +บานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CHOCO TOKYO +BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0024.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0024.Button + StringFmt( $12-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0024.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0024.Button + StringFmt( $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0024.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0024.Button + StringFmt( $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0024.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum120301002412030200241203030024 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 7c539236..1bc8b30b 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -595,7 +595,7 @@ ;dummy_layout.inc -; menu_new_list 38 +; menu_new_list 40 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -1104,6 +1104,517 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; - - 12-03-03-0029 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมกล้วยปั่น +โอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "BANANA MILK OREO +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Banana Syrup, Milk, +Sugar, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0029.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0029.Button + StringFmt( $12-03-03-0029.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 $Sum1203030029 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0029.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030029 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; 12-03-01-0024 12-03-02-0024 12-03-03-0024 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมช็อกโกโตเกียว +บานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CHOCO TOKYO +BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0024.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0024.Button + StringFmt( $12-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0024.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0024.Button + StringFmt( $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0024.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0024.Button + StringFmt( $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0024.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum120301002412030200241203030024 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17