diff --git a/image/page_drink_disable_n2/blended_mango_only.png b/image/page_drink_disable_n2/blended_mango_only.png new file mode 100644 index 00000000..6639e49f Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_only.png differ diff --git a/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png b/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png index 6878818f..6f311338 100644 Binary files a/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png and b/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png differ diff --git a/image/page_drink_n/blended_mango_only.png b/image/page_drink_n/blended_mango_only.png new file mode 100644 index 00000000..358e2ec6 Binary files /dev/null and b/image/page_drink_n/blended_mango_only.png differ diff --git a/image/page_drink_picture2_n/blended_mango_only.png b/image/page_drink_picture2_n/blended_mango_only.png new file mode 100644 index 00000000..df29a383 Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_only.png differ diff --git a/image/page_drink_press_n/blended_mango_only.png b/image/page_drink_press_n/blended_mango_only.png new file mode 100644 index 00000000..9fee5615 Binary files /dev/null and b/image/page_drink_press_n/blended_mango_only.png differ diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev index e24af969..33a19d14 100644 --- a/inter/tha/configure.ev +++ b/inter/tha/configure.ev @@ -8,7 +8,7 @@ Var EnableMultiInstanceFromBoxID = 1 EndIf If BoxID = 105005 Then - + Var EnableMultiInstanceFromBoxID = 1 EndIf If BoxID = 176277 Then @@ -31,4 +31,5 @@ If BoxID = 201729 Then Var EnableMultiInstanceFromBoxID = 1 EndIf - \ No newline at end of file + + \ No newline at end of file diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index 838f191f..8a4f562a 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -171,8 +171,15 @@ + + Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 000200 Use/Check coupon ใช้/ดูคูปองสะสม 使用 / 查看优惠券 Use/Check coupon ကူပွန်ကို အသုံးပြု/စစ်ဆေးပါ။ + Page payment + Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=36,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center +000250 Order summary สรุปคำสั่งซื้อ 订单摘要 အမှာစာအကျဉ်း + Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F Font=Kanit,Type=Medium,Size=36,Color=0x513C2F Font=Kanit,Type=Bold,Size=36,Color=0x513C2F Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F +000251 Subtotal รวมทั้งหมด 小计 စုစုပေါင်းငွေခန့်မှန်း Page brewing @@ -1256,7 +1263,7 @@ 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/inter/tha/xml/menu_catalog_default_init.lxml b/inter/tha/xml/menu_catalog_default_init.lxml deleted file mode 100644 index e43bd7f2..00000000 --- a/inter/tha/xml/menu_catalog_default_init.lxml +++ /dev/null @@ -1,132 +0,0 @@ - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - ;inter-image - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - If LanguageShow = "MYANMAR" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/" - Var ice_tab_text = "ရေခဲပြင်မှာ ထားမယ်။ " - EndIf - If LanguageShow = "MSC" Then - Var show_eng = "true" - Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/" - Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/" - EndIf - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ;pepsi & 7up - Var Menu61Selected = "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 - - If WinterWarmersCatalogFlag = 1 Then - Var MenuWinterWarmersCatalogState = "Enable" - Else - Var MenuWinterWarmersCatalogState = "Invisible" - EndIf - DEBUGVAR WinterWarmersCatalogFlag - DEBUGVAR MenuWinterWarmersCatalogState - ; - diff --git a/inter/tha/xml/menu_catalog_new.lxml b/inter/tha/xml/menu_catalog_new.lxml deleted file mode 100644 index c79261ca..00000000 --- a/inter/tha/xml/menu_catalog_new.lxml +++ /dev/null @@ -1,463 +0,0 @@ - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - ;inter-image - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - If LanguageShow = "MYANMAR" Then - Var show_eng = "true" - DEBUGVAR show_eng - Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/" - EndIf - If LanguageShow = "MSC" Then - Var show_eng = "true" - Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/" - Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/" - EndIf - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - If CountryName = "australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - RefreshAll - - Var LanguageButtonEnable = "Enable" - - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - 0x6F5F51 - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - diff --git a/inter/tha/xml/menu_catalog_new.py b/inter/tha/xml/menu_catalog_new.py deleted file mode 100644 index 6637d6b6..00000000 --- a/inter/tha/xml/menu_catalog_new.py +++ /dev/null @@ -1,22 +0,0 @@ - -print("directory_to_process =" + directory_to_process) -if param == "old": - print("old layout catalog enable.") - f = open( directory_to_process + "/menu_catalog.xml", "r") - #print(f.read()) - out_xml(f.read()) - f.close() -else: - if "v2" in param: - print("new layout catalog ============================> inter.") - f = open( directory_to_process + "/menu_catalog_new.lxml", "r") - #print(f.read()) - out_xml(f.read()) - f.close() - else: - print("new layout catalog enable.") - f = open( directory_to_process + "/menu_catalog_new.xml", "r") - #print(f.read()) - out_xml(f.read()) - f.close() - diff --git a/inter/tha/xml/menu_catalog_new_menu.lxml b/inter/tha/xml/menu_catalog_new_menu.lxml deleted file mode 100644 index bd00873c..00000000 --- a/inter/tha/xml/menu_catalog_new_menu.lxml +++ /dev/null @@ -1,9 +0,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 \ No newline at end of file diff --git a/inter/tha/xml/menu_gen.py b/inter/tha/xml/menu_gen.py deleted file mode 100644 index a6db9e1a..00000000 --- a/inter/tha/xml/menu_gen.py +++ /dev/null @@ -1,149 +0,0 @@ - - out_xml(' \r\n') - out_xml(' 10 \r\n') - out_xml(' 497 \r\n') - out_xml(' 1080 \r\n') - out_xml(' "auto" \r\n') - out_xml(' "Vertical" \r\n') - out_xml(' 4 \r\n') - - for i in range( menu_count): - i_str = str(i + 1) - out_xml( '\t; button i='+ i_str + ' ' + product_code[i]+ ' \r\n') - - out_xml( '\r\n') - out_xml('\t 33 \r\n') - out_xml('\t 22 \r\n') - out_xml('\t 225 \r\n') - out_xml('\t 296 \r\n') - out_xml( '\t $' + product_code[i] + '.Button \r\n') - - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 182 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t ShowPrice \r\n') - out_xml( '\t "Hurr" \r\n') - out_xml( '\t150\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t $' + product_code[i] + '.Price \r\n') - #out_xml( '\t eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n EndIf\n) \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 164 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t ShowPrice \r\n') - out_xml( '\t20\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "฿"" \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 190 \r\n') - out_xml( '\t 24 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t $' + product_code[i] + '.Name \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 246 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t $' + product_code[i] + '.description \r\n') - out_xml( '\t\r\n') - - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 190 \r\n') - out_xml( '\t 22 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t $' + product_code[i] + '.NameE \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 246 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t $' + product_code[i] + '.descriptionE \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 2 \r\n') - out_xml( '\t 2 \r\n') - out_xml( '\t eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n EndIf\n) \r\n') - out_xml( '\t "ROOT/taobin_project/image/topping2/blender_icon.png" \r\n') - out_xml( '\t\r\n') - - out_xml( '\r\n') - - - out_xml('\r\n') - - - out_xml('; Cart\r\n') - out_xml('\r\n') - - diff --git a/inter/tha/xml/menu_gen_alter.py b/inter/tha/xml/menu_gen_alter.py deleted file mode 100644 index f91b626c..00000000 --- a/inter/tha/xml/menu_gen_alter.py +++ /dev/null @@ -1,118 +0,0 @@ - - out_xml(' \r\n') - out_xml(' 10 \r\n') - out_xml(' 497 \r\n') - out_xml(' 1080 \r\n') - out_xml(' "auto" \r\n') - out_xml(' "Vertical" \r\n') - out_xml(' 4 \r\n') - - for i in range( menu_count): - i_str = str(i + 1) - out_xml( '\t; button i='+ i_str + ' ' + product_code[i]+ ' \r\n') - - out_xml( '\r\n') - out_xml('\t 33 \r\n') - out_xml('\t 22 \r\n') - out_xml('\t 225 \r\n') - out_xml('\t 296 \r\n') - out_xml( '\t $' + product_code[i] + '.Button \r\n') - - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 182 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t ShowPrice \r\n') - out_xml( '\t "Hurr" \r\n') - out_xml( '\t150\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t $' + product_code[i] + '.Price \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 164 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t ShowPrice \r\n') - out_xml( '\t20\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "฿"" \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 190 \r\n') - out_xml( '\t 24 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t $' + product_code[i] + '.Name \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 246 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t $' + product_code[i] + '.description \r\n') - out_xml( '\t\r\n') - - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 190 \r\n') - out_xml( '\t 22 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t $' + product_code[i] + '.NameE \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 246 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t $' + product_code[i] + '.descriptionE \r\n') - out_xml( '\t\r\n') - - out_xml( '\r\n') - - - out_xml('\r\n') diff --git a/inter/tha/xml/menu_gen_org.py b/inter/tha/xml/menu_gen_org.py deleted file mode 100644 index 639868eb..00000000 --- a/inter/tha/xml/menu_gen_org.py +++ /dev/null @@ -1,132 +0,0 @@ - if menu_count >= 16: - scroll_height = 1670 - else: - scroll_height = 1400 - - out_xml(' \r\n') - out_xml(' 0 \r\n') - out_xml(' 497 \r\n') - out_xml(' 1080 \r\n') - out_xml(' 1500 \r\n') - out_xml(' ' + str(scroll_height) + ' \r\n') - out_xml(' "Vertical" \r\n') - - for i in range( menu_count): - i_str = str(i + 1) - out_xml( '\t; button i='+ i_str + ' ' + product_code[i]+ ' \r\n') - - - out_xml( '\t\r\n') - - for i in range( menu_count): - if RoadShow : - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 164) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 12) + ' \r\n') - out_xml( '\t200\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "Free!" \r\n') - out_xml( '\t\r\n') - out_xml( '\t\r\n') - else: - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 182) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 12) + ' \r\n') - out_xml( '\t ShowPrice \r\n') - out_xml( '\t "Hurr" \r\n') - out_xml( '\t150\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t $' + product_code[i] + '.Price \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 164) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 12) + ' \r\n') - out_xml( '\t ShowPrice \r\n') - out_xml( '\t20\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "฿"" \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 16) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 190) + ' \r\n') - out_xml( '\t 24 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t $' + product_code[i] + '.Name \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 16) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 246) + ' \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t $' + product_code[i] + '.description \r\n') - out_xml( '\t\r\n') - - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 16) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 190) + ' \r\n') - out_xml( '\t 22 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t $' + product_code[i] + '.NameE \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 16) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 246) + ' \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t $' + product_code[i] + '.descriptionE \r\n') - out_xml( '\t\r\n') - - - - out_xml('\r\n') diff --git a/inter/tha/xml/menu_head.py b/inter/tha/xml/menu_head.py deleted file mode 100644 index dfd34582..00000000 --- a/inter/tha/xml/menu_head.py +++ /dev/null @@ -1,106 +0,0 @@ - - RoadShow = False - - default_dir = 'ROOT/taobin_project/image/page_drink/' - default_dir2 = 'ROOT/taobin_project/image/page_drink_select/' - default_dir_press = 'ROOT/taobin_project/image/page_drink_press/' - default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/' - - new_default_dir = 'ROOT/taobin_project/inter/tha/image/page_drink_n/' - new_default_dir2 = 'ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/' - new_default_dir_press = 'ROOT/taobin_project/inter/tha/image/page_drink_press_n/' - new_default_dir_disable = 'ROOT/taobin_project/inter/tha/image/page_drink_disable_n2/' - - menu_count = 0 - - x1 = 44 - x2 = 301 - x3 = 558 - x4 = 815 - - ystep = 899 - 571 - y1 = 20 - y2 = y1 + ystep*1 - y3 = y1 + ystep*2 - y4 = y1 + ystep*3 - y5 = y1 + ystep*4 - y6 = y1 + ystep*5 - y7 = y1 + ystep*6 - - - - x_button = [ - x1, - x2, - x3, - x4, - - x1, - x2, - x3, - x4, - - x1, - x2, - x3, - x4, - - x1, - x2, - x3, - x4, - - x1, - x2, - x3, - x4, - - x1, - x2, - x3, - x4, - - x1, - x2, - x3, - x4 - - ] - y_button = [ - y1, - y1, - y1, - y1, - - y2, - y2, - y2, - y2, - - y3, - y3, - y3, - y3, - - y4, - y4, - y4, - y4, - - y5, - y5, - y5, - y5, - - y6, - y6, - y6, - y6, - - y7, - y7, - y7, - y7 - - ] - \ No newline at end of file diff --git a/inter/tha/xml/multi/menu_catalog_default_init.lxml b/inter/tha/xml/multi/menu_catalog_default_init.lxml index 5cfbe2b0..de41f2b4 100644 --- a/inter/tha/xml/multi/menu_catalog_default_init.lxml +++ b/inter/tha/xml/multi/menu_catalog_default_init.lxml @@ -161,6 +161,10 @@ Var MenuVSelected2 = "Enable" EndIf + If SpiralModeGoods = 0 Then + Var MenuVSelected2 = "Invisible" + EndIf + If SpiralModeFrozenFruit = 1 Then If SpiralModeGoods = 1 Then @@ -168,7 +172,7 @@ EndIf EndIf - + DEBUGVAR MenuVSelected2 EndIf diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index b10b00ae..9bacd350 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -86,9 +86,12 @@ If BoxID = 123456 Then Var SpiralModeGoods = 0 - Var ButtonSpiralStage = "Enable" + Var ButtonSpiralStage = "Invisible" EndIf EndIf + If SpiralModeFrozenFruit = 1 Then + Var SpiralModeGoods = 0 + EndIf DEBUGVAR SpiralModeGoods DEBUGVAR SpiralModeFrozenFruit @@ -252,10 +255,7 @@ Var MultiProcess = "Invisible" ; setvar SpiralOnline true - Var ButtonSpiralStage = "Invisible" - If SpiralOnline = "true" Then - Var ButtonSpiralStage = "Enable" - EndIf + DEBUGVAR SpiralOnline diff --git a/inter/tha/xml/multi/tab_menu.lxml b/inter/tha/xml/multi/tab_menu.lxml index 0e9d64a9..670cc17b 100644 --- a/inter/tha/xml/multi/tab_menu.lxml +++ b/inter/tha/xml/multi/tab_menu.lxml @@ -35,12 +35,6 @@ DEBUGVAR Menu1Selected - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - - EndIf - EndIf 10000 diff --git a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py index 580d45ec..b9a1a0d8 100644 --- a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py +++ b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py @@ -458,7 +458,9 @@ count_test = 0 count = 0 pd_code_available = '##-##-##-####' -# +# + print('menu_new_list=' + str(menu_new_list)) + for spl in menu_new_list: #product_code = s diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml index 5804be23..bff9094d 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml @@ -138,9 +138,9 @@ ;banners ; ==================> Len = 3 - ; - - 12-00-07-0001 + ; - - 12-00-07-0000 - Flag( 12-00-07-0001.Button,$Sum1200070001) + Flag( 12-00-07-0000.Button,$Sum1200070000) "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" @@ -164,12 +164,12 @@ - - $12-00-07-0001.Button + $12-00-07-0000.Button eval( - If $12-00-07-0001.Price = -1 Then + If $12-00-07-0000.Price = -1 Then Var return = "Free" Else - Var return !assigned StringFmt( $12-00-07-0001.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $12-00-07-0000.Price , DisplayFormat, PreScaleConvertShow) EndIf ) @@ -190,31 +190,31 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum1200070001TextID - $Sum1200070001TextValue + $Sum1200070000TextID + $Sum1200070000TextValue Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_frozen_mango.png" @@ -222,219 +222,10 @@ Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price Var PriceD2 = $##-##-##-####.Price - Var PriceD3 = $12-00-07-0001.Price + Var PriceD3 = $12-00-07-0000.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####" - Var PD_CODE3 = "12-00-07-0001" - ; begin lang - Var aliasName[0] = "Mango Smoothie" - Var aliasDesc[0] = "Frozen mango smoothies" - Var aliasName[1] = "มะม่วงปั่น" - Var aliasDesc[1] = "มะม่วงปั่น แช่แข็ง" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" - Var aliasName[4] = "-" - Var aliasDesc[4] = "-" - Var aliasName[5] = "-" - Var aliasDesc[5] = "-" - Var NameLang[0][0] = "" - Var NameLang[0][1] = "" - Var NameLang[0][2] = "" - Var NameLang[0][3] = "" - Var NameLang[0][4] = "" - Var NameLang[0][5] = "" - Var DescLang[0][0] = "" - Var DescLang[0][1] = "" - Var DescLang[0][2] = "" - Var DescLang[0][3] = "" - Var DescLang[0][4] = "" - Var DescLang[0][5] = "" - Var NameLang[1][0] = "" - Var NameLang[1][1] = "" - Var NameLang[1][2] = "" - Var NameLang[1][3] = "" - Var NameLang[1][4] = "" - Var NameLang[1][5] = "" - Var DescLang[1][0] = "" - Var DescLang[1][1] = "" - Var DescLang[1][2] = "" - Var DescLang[1][3] = "" - Var DescLang[1][4] = "" - Var DescLang[1][5] = "" - Var NameLang[2][0] = "Mango Smoothie SMOOTHIE" - Var NameLang[2][1] = "มะม่วงปั่น" - Var NameLang[2][2] = "-" - Var NameLang[2][3] = "-" - Var NameLang[2][4] = "-" - Var NameLang[2][5] = "-" - Var DescLang[2][0] = "Frozen mango smoothies" - Var DescLang[2][1] = "มะม่วงปั่น แช่แข็ง" - Var DescLang[2][2] = "-" - Var DescLang[2][3] = "-" - Var DescLang[2][4] = "-" - Var DescLang[2][5] = "-" - ; end lang - Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = "Disable2" - Var PD_STAGE_3 = $12-00-07-0001.Button - Var SelectCountDrinkType = 0 - Var DefaultDrinkType = 0 - If PD_STAGE_1 = "Enable" Then - Var SelectCountDrinkType = SelectCountDrinkType + 1 - Var DefaultDrinkType = 1 - EndIf - If PD_STAGE_2 = "Enable" Then - Var SelectCountDrinkType = SelectCountDrinkType + 1 - Var DefaultDrinkType = 2 - EndIf - If PD_STAGE_3 = "Enable" Then - Var SelectCountDrinkType = SelectCountDrinkType + 1 - Var DefaultDrinkType = 3 - EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else - Topping "Load" "12-00-07-0001" - EndIf - EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_frozen_fruit.lxml" - - - TabMenuVisibleInst 99 - DEBUGVAR RedirectToNormalVersion - DEBUGVAR ToppingNewUINewSystem - If RedirectToNormalVersion = 1 Then - Var menu_name_eng_hot = NameLang[0][0] - Var menu_desc_eng_hot = DescLang[0][0] - Var menu_name_eng_cold = NameLang[1][0] - Var menu_desc_eng_cold = DescLang[1][0] - Var menu_name_eng_blender = NameLang[2][0] - Var menu_desc_eng_blender = DescLang[2][0] - - - - Var menu_name_thai_hot = NameLang[0][1] - Var menu_desc_thai_hot = DescLang[0][1] - Var menu_name_thai_cold = NameLang[1][1] - Var menu_desc_thai_cold = DescLang[1][1] - Var menu_name_thai_blender = NameLang[2][1] - Var menu_desc_thai_blender = DescLang[2][1] - DEBUGVAR menu_name_thai_cold - DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else - Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" - Else - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" - EndIf - - - - - - - ; ==================> Len = 3 - ; None None None - - Flag( None.Button,None.Button,None.Button,$SumNoneNoneNone) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" - - - Mango Smoothie - มะม่วงปั่น - - - - - - - - - - - - - Frozen mango smoothies - มะม่วงปั่น แช่แข็ง - - - - - - - - - - - $None.Button - eval( - If $None.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $None.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - - eval( - If ICE_PROCESS_STATUS = 2 Then - If $Sum510201003951020200395102030039 = "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" - - - $SumNoneNoneNoneTextID - $SumNoneNoneNoneTextValue - - - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_frozen_mango.png" - GetInstanceIDMenuTab OpenFromInstMenuTab - Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $None.Price - Var PriceD2 = $None.Price - Var PriceD3 = $None.Price - Var PD_CODE1 = "None" - Var PD_CODE2 = "None" - Var PD_CODE3 = "None" + Var PD_CODE3 = "12-00-07-0000" ; begin lang Var aliasName[0] = "Mango Smoothie" Var aliasDesc[0] = "Frozen mango smoothies" @@ -485,9 +276,9 @@ Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $None.Button - Var PD_STAGE_2 = $None.Button - Var PD_STAGE_3 = $None.Button + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = $12-00-07-0000.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -503,12 +294,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "None" + Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "None" + Topping "Load" "-" Else - Topping "Load" "None" + Topping "Load" "12-00-07-0000" EndIf EndIf ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" @@ -545,9 +336,9 @@ Else Var show_eng = "true" EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml" Else - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml" EndIf diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index bdbe3cd9..4bc6f130 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1363,14 +1363,14 @@ Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt เต่าติมไข่มุก Tao Tim Bubble Tea ไอศครีมนม คาราเมล และบุกไข่มุก Icecream, Caramel and Pearl Carrageenan 12-41-03-0028 - - - - -Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_topping_frozen_fruit_select.xml,parameter=show-blend-only +Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_topping_frozen_fruit_select.lxml,parameter=show-blend-only มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0000 bn_frozen_mango.png - - - - - 12-06-03-0001 - 12-06-03-0002 blended_mango_lychee.png - 12-06-03-0003 blended_mango_strawberry.png - 12-06-03-0004 blended_mango_sala.png - 12-06-03-0005 blended_mango_greentea.png - 12-06-03-0006 blended_mango_taiwanese_tea.png + มะม่วงเต่าปั่น Mango Tao Pun มะม่วง Real Mango - - 12-06-03-0001 blended_mango_only.png + มะม่่วงลิ้นจี่เต่าปั่น Mango Lychee Tao Pun มะม่วง ลิ้นจี่ Real Mango Lychee - - 12-06-03-0002 blended_mango_lychee.png + มะม่วงสตรอเบอรีเต่าปั่น Mango Strawberry Tao Pun มะม่วง สตรอเบอรี Real Mango Strawberry - - 12-06-03-0003 blended_mango_strawberry.png + มะม่วงสละเต่าปั่น Mango Salak Tao Pun มะม่วง สละ Real Mango Salak - - 12-06-03-0004 blended_mango_sala.png + มะม่วงมัทฉะเต่าปั่น Mango Pure Matcha Tao Pun มะม่วง มัทฉะ Real Mango Matcha - - 12-06-03-0005 blended_mango_greentea.png + มะม่วงชาไต้หวันเต่าปั่น Mango Taiwanese Tea Tao Pun มะม่วง ชาไต้หวัน Real Mango TaiwaneseTea - - 12-06-03-0006 blended_mango_taiwanese_tea.png diff --git a/ui/lang.tsv b/ui/lang.tsv index 838f191f..8a4f562a 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -171,8 +171,15 @@ + + Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 Font=Kanit,Type=Regular,Size=46,Color=0xFFFFFF,PressColor=0x746253 000200 Use/Check coupon ใช้/ดูคูปองสะสม 使用 / 查看优惠券 Use/Check coupon ကူပွန်ကို အသုံးပြု/စစ်ဆေးပါ။ + Page payment + Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=36,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=36,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F,Align=Center +000250 Order summary สรุปคำสั่งซื้อ 订单摘要 အမှာစာအကျဉ်း + Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F Font=Kanit,Type=Medium,Size=36,Color=0x513C2F Font=Kanit,Type=Bold,Size=36,Color=0x513C2F Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F Font=Montserrat,Type=Bold,Size=36,Color=0x513C2F +000251 Subtotal รวมทั้งหมด 小计 စုစုပေါင်းငွေခန့်မှန်း Page brewing @@ -1256,7 +1263,7 @@ 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/xml/page_catalog_group_other_other_pro.xml b/xml/page_catalog_group_other_other_pro.xml index 33132e49..d88c6c97 100644 --- a/xml/page_catalog_group_other_other_pro.xml +++ b/xml/page_catalog_group_other_other_pro.xml @@ -2849,9 +2849,9 @@ Soda" Flag( 12-05-02-0148.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020148) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เป๊ปซี่ทรอปิคอล" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "Pepsi Tropical" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Pepsi Medicine Drink Coconut Soda" - - - 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" ) - $12-05-02-0148.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0148.Button - StringFmt( $12-05-02-0148.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020148 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0148.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020148 - text_unavailable - center-vertical-horizontal - - + ; - - - ; ==================> Len = 16 ; - 12-05-02-0150 - diff --git a/xml/page_catalog_group_pro_buble_tea.xml b/xml/page_catalog_group_pro_buble_tea.xml index f9585e1f..9826ce41 100644 --- a/xml/page_catalog_group_pro_buble_tea.xml +++ b/xml/page_catalog_group_pro_buble_tea.xml @@ -34,7 +34,7 @@ ;banner_shifting ;dummy_layout.inc -; menu_new_list 17 +; menu_new_list 23 ; ==================> Len = 16 ; - 12-21-62-0002 12-21-63-0002 @@ -8527,6 +8527,255 @@ Soda & Ice" text_unavailable center-vertical-horizontal + + ; ==================> Len = 8 + ; - - 12-06-03-0001 + + 33 + 22 + 225 + 296 + Flag( 12-06-03-0001.Button,$Sum1206030001) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "มะม่วงเต่าปั่น" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มะม่วง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Mango Tao Pun" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Real Mango" + + + 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-06-03-0001.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-06-03-0001.Button + StringFmt( $12-06-03-0001.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 $Sum1206030001 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-06-03-0001.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" + $Sum1206030001 + text_unavailable + center-vertical-horizontal + ; Cart