From 6e998bb1586b13585f064c4ee54fb1b8c5f0aa2b Mon Sep 17 00:00:00 2001 From: kong Date: Fri, 31 Mar 2023 13:05:59 +0700 Subject: [PATCH] DO --- xml/page_catalog_group_other.xml | 6 +- xml/page_catalog_group_recommend.xml | 1482 ++++++++++++------------- xml/page_catalog_group_recommend3.xml | 6 +- xml/page_payment.xml | 62 +- xml_main/startup.xml | 4 +- 5 files changed, 763 insertions(+), 797 deletions(-) diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 2eaaceac..996484b2 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -4047,8 +4047,7 @@ Soda & Ice" Var NameDrink = "PLUM LIMENADE SODA" Var NameDrinkTH = "บ๊วยมะนาวโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา - " + Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา " Var DrinkDescription = "Ume Syrup, Limenade, Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png" @@ -4129,8 +4128,7 @@ Soda & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา - " + "น้ำเชื่อมบ๊วย มะนาว โซดา " 16 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 01247b28..add19bd3 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -1,536 +1,536 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - Var Menu1Selected = "PressForever" - - Var OreoBigButtonEnable = "Enable" - - If $12-01-01-0001.Button = "Invisible" Then - Var esp102101001Enable = "Invisible" - Var esp122101001Enable = "Enable" - - Else - Var esp102101001Enable = "Enable" - Var esp122101001Enable = "Invisible" - - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + Var Menu1Selected = "PressForever" + + Var OreoBigButtonEnable = "Enable" + + If $12-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + 16 10 @@ -596,7 +596,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CONGEE WITH + Var NameDrink = "CONGEE WITH PLANT PROTEIN" Var NameDrinkTH = "โจ๊กใส่โปรตีนจากพืช" Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ" @@ -690,7 +690,7 @@ PLANT PROTEIN" KanitMediumTTF 0x322B26 showengText - "CONGEE WITH + "CONGEE WITH PLANT PROTEIN" @@ -1102,10 +1102,10 @@ PLANT PROTEIN" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OREO SMOOTHIE + Var NameDrink = "OREO SMOOTHIE VOLCANO" Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ" - Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ + Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ " Var DrinkDescription = "Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png" @@ -1186,7 +1186,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้ + "นม น้ำตาล โอริโอ้ " @@ -1198,7 +1198,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -2358,13 +2358,13 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ESPRESSO + Var NameDrink = "ESPRESSO ETHIOPAI GUJI" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต Guji Queen Berry" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" - Var DrinkDescription = "Light roast natural process: + Var DrinkDescription = "Light roast natural process: Strawberry, Orange, Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2434,7 +2434,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -2445,7 +2445,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -2457,7 +2457,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -2468,7 +2468,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -2618,13 +2618,13 @@ Strawberry, Orange, Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BLUE DADDY + Var NameDrink = "BLUE DADDY ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต BLUE DADDY" - Var DrinkDescriptionTH = "Washed process + Var DrinkDescriptionTH = "Washed process หอมบลูเบอร์รี และดอกไม้" - Var DrinkDescription = "Washed process + Var DrinkDescription = "Washed process Note: Blue Berry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_bluedaddy.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2694,7 +2694,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -2705,7 +2705,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -2717,7 +2717,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -2728,7 +2728,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -2878,13 +2878,13 @@ Note: Blue Berry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MOZART + Var NameDrink = "MOZART ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต MOZART " - Var DrinkDescriptionTH = "Raisin Honey process + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_mozart.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2954,7 +2954,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -2965,7 +2965,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -2977,7 +2977,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -2988,7 +2988,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -3138,13 +3138,13 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNOWWHITE + Var NameDrink = "SNOWWHITE ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต SNOWWHITE" - Var DrinkDescriptionTH = "Anaerobic process + Var DrinkDescriptionTH = "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" - Var DrinkDescription = "Anaerobic process + Var DrinkDescription = "Anaerobic process Note: Jasmine & Honey" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_snowwhite.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3214,7 +3214,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -3225,7 +3225,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -3237,7 +3237,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -3248,7 +3248,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -3398,13 +3398,13 @@ Note: Jasmine & Honey" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "WHISKY DUDE + Var NameDrink = "WHISKY DUDE ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต WHISKY DUDE" - Var DrinkDescriptionTH = "Washed Sherry cask ferment + Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" - Var DrinkDescription = "Washed Sherry cask ferment + Var DrinkDescription = "Washed Sherry cask ferment Note: Whisky & Vanilla" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_whiskydude.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3474,7 +3474,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -3485,7 +3485,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -3497,7 +3497,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -3508,7 +3508,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -3658,13 +3658,13 @@ Note: Whisky & Vanilla" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PEACHER + Var NameDrink = "PEACHER ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต PEACHER" - Var DrinkDescriptionTH = "Barrel-aged process + Var DrinkDescriptionTH = "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" - Var DrinkDescription = "Barrel-aged process + Var DrinkDescription = "Barrel-aged process Note: Peach, tea, chocolate" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_peacher.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3734,7 +3734,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -3745,7 +3745,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -3757,7 +3757,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -3768,7 +3768,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -3918,11 +3918,11 @@ Note: Peach, tea, chocolate" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PURE BEAUTY + Var NameDrink = "PURE BEAUTY ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต PURE BEAUTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_pure_beauty.png" @@ -3993,7 +3993,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -4004,7 +4004,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -4016,7 +4016,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -4177,7 +4177,7 @@ ESPRESSO" SoundVolume Var NameDrink = "GEISHA ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต GEISHA" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" @@ -4249,7 +4249,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -4431,11 +4431,11 @@ GEISHA" SoundVolume Var NameDrink = "ROSALYN ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต ROSALYN" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" - Var DrinkDescription = "Light Roast (natural process) + Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_rosalyn.png" Var OpenFromXML = CurrentXMLFileName2 @@ -4505,7 +4505,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -4516,7 +4516,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -4538,7 +4538,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -4688,13 +4688,13 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOPIN + Var NameDrink = "CHOPIN ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต CHOPIN" - Var DrinkDescriptionTH = "Raisin Honey process + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_chopin.png" Var OpenFromXML = CurrentXMLFileName2 @@ -4764,7 +4764,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต CHOPIN" @@ -4775,7 +4775,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -4787,7 +4787,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ESPRESSO" @@ -4798,7 +4798,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -4948,9 +4948,9 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MANDARINE + Var NameDrink = "MANDARINE ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต MANDARINE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต" Var DrinkDescription = "Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar." @@ -5022,7 +5022,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MANDARINE" @@ -5044,7 +5044,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ESPRESSO" @@ -5204,9 +5204,9 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OPUS ONE + Var NameDrink = "OPUS ONE ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต + Var NameDrinkTH = "เอสเพรสโซ่ช็อต OPUS ONE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." @@ -5278,7 +5278,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต OPUS ONE" @@ -5300,7 +5300,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ESPRESSO" @@ -5460,13 +5460,13 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "AMERICANO + Var NameDrink = "AMERICANO ETHIOPAI GUJI" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน Guji Queen Berry" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" - Var DrinkDescription = "กาแฟคั่วอ่อน (natural process) + Var DrinkDescription = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light.png" Var OpenFromXML = CurrentXMLFileName2 @@ -5536,7 +5536,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -5547,7 +5547,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -5559,7 +5559,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -5570,7 +5570,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -5720,13 +5720,13 @@ ETHIOPAI GUJI" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BLUE DADDY + Var NameDrink = "BLUE DADDY AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน BLUE DADDY" - Var DrinkDescriptionTH = "Washed process + Var DrinkDescriptionTH = "Washed process หอมบลูเบอร์รี และดอกไม้" - Var DrinkDescription = "Washed process + Var DrinkDescription = "Washed process Note: Blue Berry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_bluedaddy.png" Var OpenFromXML = CurrentXMLFileName2 @@ -5796,7 +5796,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -5807,7 +5807,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -5819,7 +5819,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -5830,7 +5830,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -5980,13 +5980,13 @@ Note: Blue Berry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MOZART + Var NameDrink = "MOZART AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน MOZART" - Var DrinkDescriptionTH = "Raisin Honey process + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_mozart.png" Var OpenFromXML = CurrentXMLFileName2 @@ -6056,7 +6056,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -6067,7 +6067,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -6079,7 +6079,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -6090,7 +6090,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -6240,13 +6240,13 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "WHISKY DUDE + Var NameDrink = "WHISKY DUDE AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน WHISKY DUDE" - Var DrinkDescriptionTH = "Washed Sherry cask ferment + Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" - Var DrinkDescription = "Washed Sherry cask ferment + Var DrinkDescription = "Washed Sherry cask ferment Note: Whisky & Vanilla" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_whiskydude.png" Var OpenFromXML = CurrentXMLFileName2 @@ -6316,7 +6316,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -6327,7 +6327,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -6339,7 +6339,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -6350,7 +6350,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -6500,13 +6500,13 @@ Note: Whisky & Vanilla" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNOWWHITE + Var NameDrink = "SNOWWHITE AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน SNOWWHITE" - Var DrinkDescriptionTH = "Anaerobic process + Var DrinkDescriptionTH = "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" - Var DrinkDescription = "Anaerobic process + Var DrinkDescription = "Anaerobic process Note: Jasmine & Honey" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_snowwhite.png" Var OpenFromXML = CurrentXMLFileName2 @@ -6576,7 +6576,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -6587,7 +6587,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -6599,7 +6599,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -6610,7 +6610,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -6760,13 +6760,13 @@ Note: Jasmine & Honey" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PEACHER + Var NameDrink = "PEACHER AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน PEACHER" - Var DrinkDescriptionTH = "Barrel-aged process + Var DrinkDescriptionTH = "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" - Var DrinkDescription = "Barrel-aged process + Var DrinkDescription = "Barrel-aged process Note: Peach, tea, chocolate" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_peacher.png" Var OpenFromXML = CurrentXMLFileName2 @@ -6836,7 +6836,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -6847,7 +6847,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -6859,7 +6859,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -6870,7 +6870,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -7020,11 +7020,11 @@ Note: Peach, tea, chocolate" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PURE BEAUTY + Var NameDrink = "PURE BEAUTY AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน PURE BEAUTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_pure_beauty.png" @@ -7095,7 +7095,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -7106,7 +7106,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -7118,7 +7118,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -7278,9 +7278,9 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "GEISHA + Var NameDrink = "GEISHA AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน GEISHA" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" @@ -7352,7 +7352,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -7374,7 +7374,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -7534,13 +7534,13 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ROSALYN + Var NameDrink = "ROSALYN AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน ROSALYN" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" - Var DrinkDescription = "Light Roast (natural process) + Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_rosalyn.png" Var OpenFromXML = CurrentXMLFileName2 @@ -7610,7 +7610,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -7621,7 +7621,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -7633,7 +7633,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN AMERICANO" @@ -7644,7 +7644,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -7794,13 +7794,13 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOPIN + Var NameDrink = "CHOPIN AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน CHOPIN" - Var DrinkDescriptionTH = "Raisin Honey process + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_chopin.png" Var OpenFromXML = CurrentXMLFileName2 @@ -7870,7 +7870,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน CHOPIN" @@ -7881,7 +7881,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -7893,7 +7893,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN AMERICANO" @@ -7904,7 +7904,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -8054,9 +8054,9 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MANDARINE + Var NameDrink = "MANDARINE AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน MANDARINE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต" Var DrinkDescription = "Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar." @@ -8128,7 +8128,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MANDARINE" @@ -8150,7 +8150,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE AMERICANO" @@ -8310,9 +8310,9 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OPUS ONE + Var NameDrink = "OPUS ONE AMERICANO" - Var NameDrinkTH = "อเมริกาโน + Var NameDrinkTH = "อเมริกาโน OPUS ONE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." @@ -8384,7 +8384,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน OPUS ONE" @@ -8406,7 +8406,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE AMERICANO" @@ -8569,7 +8569,7 @@ AMERICANO" Var NameDrink = "LATTE" Var NameDrinkTH = "ลาเต้" Var DrinkDescriptionTH = "กาแฟ นม และ นม" - Var DrinkDescription = "Espresso, Milk, + Var DrinkDescription = "Espresso, Milk, milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png" Var OpenFromXML = CurrentXMLFileName2 @@ -8670,7 +8670,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, milk" @@ -10082,9 +10082,9 @@ AMERICANO" Var NameDrink = "PINK MILK" Var NameDrinkTH = "นมชมพู " - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล " - Var DrinkDescription = "Salak Syrup, Milk, + Var DrinkDescription = "Salak Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_pink_milk.png" Var OpenFromXML = CurrentXMLFileName2 @@ -10164,7 +10164,7 @@ Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -10186,7 +10186,7 @@ Sugar" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Milk, + "Salak Syrup, Milk, Sugar" @@ -10332,10 +10332,10 @@ Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWMILK + Var NameDrink = "STRAWMILK SMOOTHIE" Var NameDrinkTH = "นมสตอเบอร์รี่ปั่น" - Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ + Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" Var DrinkDescription = "Milk, Strawberry Syrup " Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrymilk_smoothie.png" @@ -10416,7 +10416,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" @@ -10428,7 +10428,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "STRAWMILK + "STRAWMILK SMOOTHIE" @@ -10836,7 +10836,7 @@ SMOOTHIE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OVALTINE SMOOTHIE + Var NameDrink = "OVALTINE SMOOTHIE VOLCANO" Var NameDrinkTH = "โอวัลตินปั่นภูเขาไฟ" Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม" @@ -10930,7 +10930,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -11582,7 +11582,7 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAO POWER + Var NameDrink = "TAO POWER DRINK SODA" Var NameDrinkTH = "เต่าทรงพลังโซดา" Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา " @@ -11676,7 +11676,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showengText - "TAO POWER + "TAO POWER DRINK SODA" @@ -11832,11 +11832,10 @@ DRINK SODA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PLUM + Var NameDrink = "PLUM LIMENADE SODA" Var NameDrinkTH = "บ๊วยมะนาวโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา - " + Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา" Var DrinkDescription = "Ume Syrup, Limenade, Soda" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -11916,8 +11915,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา - " + "น้ำเชื่อมบ๊วย มะนาว โซดา" 16 @@ -11928,7 +11926,7 @@ LIMENADE SODA" KanitMediumTTF 0x322B26 showengText - "PLUM + "PLUM LIMENADE SODA" @@ -12082,26 +12080,26 @@ LIMENADE SODA" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - -;BigLogoLayout - - - - + + + + + + +;BigLogoLayout + + + + diff --git a/xml/page_catalog_group_recommend3.xml b/xml/page_catalog_group_recommend3.xml index 3b64179f..2795adc4 100644 --- a/xml/page_catalog_group_recommend3.xml +++ b/xml/page_catalog_group_recommend3.xml @@ -12679,8 +12679,7 @@ DRINK SODA" Var NameDrink = "PLUM LIMENADE SODA" Var NameDrinkTH = "บ๊วยมะนาวโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา - " + Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา" Var DrinkDescription = "Ume Syrup, Limenade, Soda" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -12760,8 +12759,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา - " + "น้ำเชื่อมบ๊วย มะนาว โซดา" 16 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index cb25f638..9e8e4aee 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -260,28 +260,29 @@ If Seeker = "curr" Then If web_ready = "false" Then + If Delay = 0 Then + If MachineStage = "remove-cup" Then + SAVELOG "MachineStage = remove-cup" + If HaveCup = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf - If MachineStage = "remove-cup" Then - SAVELOG "MachineStage = remove-cup" - If HaveCup = "true" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf + + If CupChecking = "true" Then + If HaveCup = "true" Then + SAVELOG "Have cup" + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf EndIf - EndIf - - If CupChecking = "true" Then - If HaveCup = "true" Then - SAVELOG "Have cup" + If DoorCupPosition = "bottom" Then + + Else + SAVELOG "DoorCupPosition not bottom" Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" EndIf EndIf - - If DoorCupPosition = "bottom" Then - - Else - SAVELOG "DoorCupPosition not bottom" - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" - EndIf EndIf Else @@ -360,35 +361,6 @@ Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData - ;Var CreditAmount1 = "" - ;Var ServiceAmountFlow = "" - ;Var TelephoneNumberQR = "0899999999" - ;Var ServiceType = "coffee" - ;Var ECommerceQR = "" - ;Var ECommerceQR = ECommerceQR + PriceDrink - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + DiscountDrink - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + SessionID2 - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + SelectDrink - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + "KBA:2" - ;Var ServiceParameter = "max" - ;Var ServiceCharge = 0 - ;Var AccountType = "new" - ;Var testservice = "kbank" - ;Var tc = "" - ;Var GetScore = "" - ;Var OperatorName = "" - ;Var SessionID = "" - - - ;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - ;Var Timeout = 0 - ;Var GetPayInfoFlag = 1 - ;Var ReqPayInfoFlag = 1 - EndIf ; Reset diff --git a/xml_main/startup.xml b/xml_main/startup.xml index b76186f4..e04d9309 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.06" - Var XMLPageVersionInt = 706 + Var XMLPageVersion = "7.07" + Var XMLPageVersionInt = 707