diff --git a/inter/mys/animation01/play_list.tsv b/inter/mys/animation01/play_list.tsv new file mode 100644 index 00000000..e69de29b diff --git a/xml/menutab/menu_catalog_new.xml b/xml/menutab/menu_catalog_new.xml index 3967fdc7..15be3b2c 100644 --- a/xml/menutab/menu_catalog_new.xml +++ b/xml/menutab/menu_catalog_new.xml @@ -23,6 +23,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_appfast.xml b/xml/menutab/page_catalog_group_appfast.xml index 0e6648f0..14f4a0c8 100644 --- a/xml/menutab/page_catalog_group_appfast.xml +++ b/xml/menutab/page_catalog_group_appfast.xml @@ -187,6 +187,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_cocktail.xml b/xml/menutab/page_catalog_group_cocktail.xml index 80331be8..2f66b109 100644 --- a/xml/menutab/page_catalog_group_cocktail.xml +++ b/xml/menutab/page_catalog_group_cocktail.xml @@ -179,6 +179,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_coffee.xml b/xml/menutab/page_catalog_group_coffee.xml index 7737611c..4bc98d67 100644 --- a/xml/menutab/page_catalog_group_coffee.xml +++ b/xml/menutab/page_catalog_group_coffee.xml @@ -1,520 +1,542 @@ - - - - "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" - - InstanceSetString "ShowEng" - 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" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - Var Menu2Selected = "PressForever" - - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - - - TimerReset - - - -; 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 - - - - - - InstanceGetString SaveStringInst - DEBUGVAR show_eng - DEBUGVAR SaveStringInst - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 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" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; 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" + + InstanceSetString "ShowEng" + 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" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + Var Menu2Selected = "PressForever" + + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + + + + TimerReset + + + +; 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 + + + + + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 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" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + 10 497 @@ -1143,7 +1165,7 @@ KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -1396,7 +1418,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -2134,7 +2156,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -2145,7 +2167,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -2157,7 +2179,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -2168,7 +2190,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -2392,7 +2414,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -2403,7 +2425,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -2415,7 +2437,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -2426,7 +2448,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -2650,7 +2672,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต CHOPIN" @@ -2661,7 +2683,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -2673,7 +2695,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ESPRESSO" @@ -2684,7 +2706,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -2908,7 +2930,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MANDARINE" @@ -2930,7 +2952,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ESPRESSO" @@ -3164,7 +3186,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต OPUS ONE" @@ -3186,7 +3208,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ESPRESSO" @@ -3420,7 +3442,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -3431,7 +3453,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -3443,7 +3465,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -3454,7 +3476,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -3678,7 +3700,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -3689,7 +3711,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -3701,7 +3723,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -3712,7 +3734,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -3936,7 +3958,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -3947,7 +3969,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -3959,7 +3981,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -3970,7 +3992,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -4194,7 +4216,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -4205,7 +4227,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -4217,7 +4239,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -4228,7 +4250,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -4452,7 +4474,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -4463,7 +4485,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -4475,7 +4497,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -4709,7 +4731,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -4964,7 +4986,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -4975,7 +4997,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -4997,7 +5019,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -5718,7 +5740,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -5729,7 +5751,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -5741,7 +5763,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -5752,7 +5774,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -5976,7 +5998,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -5987,7 +6009,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -5999,7 +6021,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -6010,7 +6032,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -6234,7 +6256,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน CHOPIN" @@ -6245,7 +6267,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -6257,7 +6279,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN AMERICANO" @@ -6268,7 +6290,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -6492,7 +6514,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MANDARINE" @@ -6514,7 +6536,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE AMERICANO" @@ -6748,7 +6770,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน OPUS ONE" @@ -6770,7 +6792,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE AMERICANO" @@ -7004,7 +7026,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -7015,7 +7037,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -7027,7 +7049,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -7038,7 +7060,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -7262,7 +7284,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -7273,7 +7295,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -7285,7 +7307,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -7296,7 +7318,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -7520,7 +7542,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -7531,7 +7553,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -7543,7 +7565,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -7554,7 +7576,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -7778,7 +7800,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -7789,7 +7811,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -7801,7 +7823,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -7812,7 +7834,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -8036,7 +8058,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -8047,7 +8069,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -8059,7 +8081,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -8293,7 +8315,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -8315,7 +8337,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -8549,7 +8571,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -8560,7 +8582,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -8572,7 +8594,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN AMERICANO" @@ -8583,7 +8605,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -8807,7 +8829,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -8818,7 +8840,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -8830,7 +8852,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -8841,7 +8863,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -9061,7 +9083,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MOZART + "MOZART ALMOST DIRTY" @@ -9072,7 +9094,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -9084,7 +9106,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ALMOST DIRTY" @@ -9095,7 +9117,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -9315,7 +9337,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -9326,7 +9348,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -9338,7 +9360,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -9349,7 +9371,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -9569,7 +9591,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -9591,7 +9613,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -9821,7 +9843,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -9843,7 +9865,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -10073,7 +10095,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -10084,7 +10106,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -10096,7 +10118,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -10107,7 +10129,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -10327,7 +10349,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -10338,7 +10360,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -10350,7 +10372,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -10361,7 +10383,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -10581,7 +10603,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -10592,7 +10614,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -10604,7 +10626,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -10615,7 +10637,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -10835,7 +10857,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -10846,7 +10868,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -10858,7 +10880,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -10869,7 +10891,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -11089,7 +11111,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -11100,7 +11122,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -11112,7 +11134,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -11342,7 +11364,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -11364,7 +11386,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -11594,7 +11616,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -11605,7 +11627,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -11617,7 +11639,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -11628,7 +11650,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -11869,7 +11891,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -12118,7 +12140,7 @@ ICED ESPRESSO" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -13872,7 +13894,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -13894,7 +13916,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -14126,7 +14148,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -14148,7 +14170,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -14381,7 +14403,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -14393,7 +14415,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -14635,7 +14657,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -14647,7 +14669,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -14890,7 +14912,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -14902,7 +14924,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -15144,7 +15166,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -15156,7 +15178,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -15399,7 +15421,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -15411,7 +15433,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -15422,7 +15444,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -15654,7 +15676,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -15666,7 +15688,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -15677,7 +15699,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -15910,7 +15932,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -15922,7 +15944,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -16164,7 +16186,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -16176,7 +16198,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -16419,7 +16441,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -16431,7 +16453,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -16442,7 +16464,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -16674,7 +16696,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -16686,7 +16708,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -16697,7 +16719,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -16941,7 +16963,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17194,7 +17216,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17448,7 +17470,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17701,7 +17723,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17944,7 +17966,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -17956,7 +17978,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -17967,7 +17989,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18199,7 +18221,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -18211,7 +18233,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -18222,7 +18244,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18476,7 +18498,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -18729,7 +18751,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -18983,7 +19005,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -19236,7 +19258,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -19480,7 +19502,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -19491,7 +19513,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -19734,7 +19756,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -19745,7 +19767,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -19999,7 +20021,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -20252,7 +20274,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -20506,7 +20528,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -20759,7 +20781,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -21013,7 +21035,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -21266,7 +21288,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -21520,7 +21542,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -21773,7 +21795,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -21920,11 +21942,11 @@ Sugar, Milk" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - + + + + + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + diff --git a/xml/menutab/page_catalog_group_forkid.xml b/xml/menutab/page_catalog_group_forkid.xml index 07f0f300..d8f5bfbe 100644 --- a/xml/menutab/page_catalog_group_forkid.xml +++ b/xml/menutab/page_catalog_group_forkid.xml @@ -188,6 +188,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_health.xml b/xml/menutab/page_catalog_group_health.xml index 868f653a..a5a1d172 100644 --- a/xml/menutab/page_catalog_group_health.xml +++ b/xml/menutab/page_catalog_group_health.xml @@ -179,6 +179,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml index 162f9537..ca59615c 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -177,6 +177,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_oreo.xml b/xml/menutab/page_catalog_group_oreo.xml index 5d1343d8..fd43a193 100644 --- a/xml/menutab/page_catalog_group_oreo.xml +++ b/xml/menutab/page_catalog_group_oreo.xml @@ -175,6 +175,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_other.xml b/xml/menutab/page_catalog_group_other.xml index 48622b3a..aac43897 100644 --- a/xml/menutab/page_catalog_group_other.xml +++ b/xml/menutab/page_catalog_group_other.xml @@ -178,6 +178,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_pepsi_pro.xml b/xml/menutab/page_catalog_group_pepsi_pro.xml index 0f360252..fe34ac28 100644 --- a/xml/menutab/page_catalog_group_pepsi_pro.xml +++ b/xml/menutab/page_catalog_group_pepsi_pro.xml @@ -175,6 +175,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_pro_15THB.xml b/xml/menutab/page_catalog_group_pro_15THB.xml index 85ffc07a..9484157f 100644 --- a/xml/menutab/page_catalog_group_pro_15THB.xml +++ b/xml/menutab/page_catalog_group_pro_15THB.xml @@ -197,6 +197,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_pro_melon.xml b/xml/menutab/page_catalog_group_pro_melon.xml index 105e3107..b6f839bd 100644 --- a/xml/menutab/page_catalog_group_pro_melon.xml +++ b/xml/menutab/page_catalog_group_pro_melon.xml @@ -173,6 +173,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_pro_mymint.xml b/xml/menutab/page_catalog_group_pro_mymint.xml index 3bb6a34e..e81a3afd 100644 --- a/xml/menutab/page_catalog_group_pro_mymint.xml +++ b/xml/menutab/page_catalog_group_pro_mymint.xml @@ -176,6 +176,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_pro_pepween.xml b/xml/menutab/page_catalog_group_pro_pepween.xml index a471ee17..733147aa 100644 --- a/xml/menutab/page_catalog_group_pro_pepween.xml +++ b/xml/menutab/page_catalog_group_pro_pepween.xml @@ -204,6 +204,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml index 5dd2d81d..c514ec0b 100644 --- a/xml/menutab/page_catalog_group_recommend.xml +++ b/xml/menutab/page_catalog_group_recommend.xml @@ -196,6 +196,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_soft_serve.xml b/xml/menutab/page_catalog_group_soft_serve.xml index a93b301c..c394d959 100644 --- a/xml/menutab/page_catalog_group_soft_serve.xml +++ b/xml/menutab/page_catalog_group_soft_serve.xml @@ -175,6 +175,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_songkran.xml b/xml/menutab/page_catalog_group_songkran.xml index f275ac36..1af04a8b 100644 --- a/xml/menutab/page_catalog_group_songkran.xml +++ b/xml/menutab/page_catalog_group_songkran.xml @@ -175,6 +175,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_tea.xml b/xml/menutab/page_catalog_group_tea.xml index 9f16dec6..f282e250 100644 --- a/xml/menutab/page_catalog_group_tea.xml +++ b/xml/menutab/page_catalog_group_tea.xml @@ -179,6 +179,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_group_whey.xml b/xml/menutab/page_catalog_group_whey.xml index 8e529c5f..68d0daff 100644 --- a/xml/menutab/page_catalog_group_whey.xml +++ b/xml/menutab/page_catalog_group_whey.xml @@ -184,6 +184,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/menutab/page_catalog_momday.xml b/xml/menutab/page_catalog_momday.xml index 2b82c4ca..99d787c8 100644 --- a/xml/menutab/page_catalog_momday.xml +++ b/xml/menutab/page_catalog_momday.xml @@ -175,6 +175,28 @@ EndIf + If RoutineSlientRefresh > 0 Then + If RoutineSlientRefresh = 2 Then + InstanceGetString SaveStringInst + + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + EndIf + + TimerReset diff --git a/xml/page_board.xml b/xml/page_board.xml index 024a3c41..db361aba 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1249,6 +1249,9 @@ Var OpenFromPageBoard = 1 + Var RoutineSlientRefresh = 6 + + If InternationalEnable = 1 Then ; show language icon @@ -1287,7 +1290,7 @@ DEBUGVAR CountUpReloadAll ; Original value is 40 - If CountUpReloadAll > 80 Then + If CountUpReloadAll > 100 Then Var NeedReboot = "false" Var StartUpExt = "-" @@ -1627,6 +1630,8 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + Var RoutineSlientRefresh = 8 + Var OpenFromPageBoard = 1 If InternationalEnable = 1 Then diff --git a/xml/topview2.xml b/xml/topview2.xml index 591e68c1..649dacae 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -43,6 +43,16 @@ IF Not#CountDownForMulti = "" Then Var Not#CountDownForMulti = 99 EndIf + + If EnableMultiInstance = "true" Then + Var OpenRedirectSize = -1 + GetRedirectCount OpenRedirectSize + If OpenRedirectSize = 0 Then + SAVELOG "OpenRedirectSize zero size" + Var Not#CountDownForMulti = 5 + EndIf + + EndIf 1000 @@ -110,6 +120,8 @@ Var Not#CountDownForMulti = Not#CountDownForMulti - 1 EndIf EndIf + + EndIf @@ -132,6 +144,10 @@ EndIf EndIf + If RoutineSlientRefresh > 0 Then + Var RoutineSlientRefresh = RoutineSlientRefresh - 1 + EndIf + TimerReset diff --git a/xml_main/startup.xml b/xml_main/startup.xml index a4523418..daa04e83 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.98" - Var XMLPageVersionInt = 798 + Var XMLPageVersion = "7.99" + Var XMLPageVersionInt = 799 ;Oreo Var OreoGuarantee = 0