diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index 7512335b..f4b2d46c 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -376,6 +376,12 @@ 002352 Confirm ยืนยัน 确认 အတည်ပြုပါ Font=Montserrat,Type=Bold,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46 Font=Kanit,Type=Light,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46 Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46 Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46 Font=Montserrat,Type=Bold,Size=36,Color=0xEE8C62,Align=Center,LineHeight=46 002353 Please enter your phone number\n[so we can contact you back.###Font=KanitLight,Size=36] โปรดกรอกเบอร์โทรขอคุณ\n[เพื่อรอการติดต่อกลับจากเรา###Font=KanitLight,Size=36] 请输入您的电话号码\n[以便我们与您联系。###Font=KanitLight,Size=36] ကျေးဇူးပြု၍ သင်၏ဖုန်းနံပါတ်ကို ဖြည့်ပါ\n[ကျွန်ုပ်တို့မှ ပြန်လည်ဆက်သွယ်နိုင်ရန်။###Font=KanitLight,Size=36] + Font=Kanit,Type=Medium,Size=50,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=56,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=26,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=50,Color=0x513C2F,Align=Center,LineHeight=30 +002354 We have received your information. เราได้รับข้อมูลของท่านเรียบร้อยแล้ว 我们已收到您的信息。 သင်၏အချက်အလက်ကို လက်ခံပြီးပါပြီ။ + Font=Kanit,Type=Light,Size=44,Color=0x513C2F,Align=Center,LineHeight=48 Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48 Font=Kanit,Type=Light,Size=44,Color=0x513C2F,Align=Center,LineHeight=48 Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48 Font=Kanit,Type=Light,Size=40,Color=0x513C2F,Align=Center,LineHeight=42 +002355 We apologize for the inconvenience.\n[We will improve as soon as possible.###Font=KanitLight,Size=44] ขออภัยในความไม่สะดวก\n[เราจะรีบปรับปรุงให้ดียิ่งขึ้น###Font=KanitLight,Size=48] 对于带来的不便，我们深感抱歉。\n[我们会尽快改进。###Font=KanitLight,Size=44] အဆင်မပြေတာအတွက် တောင်းပန်ပါတယ်။\n[တတ်နိုင်သမျှ အမြန်ဆုံး ပြုပြင်မည်။###Font=KanitLight,Size=40] + + Smoothie_process Font=Kanit,Type=Medium,Size=54,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=54,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=54,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=54,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=54,Color=0x513C2F,Align=Center 002400 Order summary ยกเลิกออเดอร์ 取消订单 အော်ဒါဖျက်ရန် @@ -1263,7 +1269,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. เลือกทิศทาง @@ -1276,7 +1282,7 @@ 1300016 Brew time:sec เวลาชง: วินาที 1300017 Test grind sizes ทดสอบขนาดบด 1300018 Coffee module type : ประเภทชุดกาแฟ : -1300019 1. Select grind sizes 1. เลือกขนาดบด +1300019 1. Select grind sizes 1. เลือกขนาดการบด 1300020 More coarse หยาบขึ้น 1300021 More fine ละเอียดขึ้น 1300022 2. Test grinding 2. ทดสอบการบด @@ -1295,7 +1301,7 @@ 1300035 Recipes สูตรอาหาร 1300036 Save editing บันทึกการแก้ไข 1300037 Cancel edting ยกเลิกการแก้ไข -1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง +1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดบดที่เลือกและสูตรการชงอีกครั้ง 1300039 Insert cup manually ใส่ถ้วยด้วยตนเอง 1300040 2. Select arm 2. เลือกแขน 1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยลงในแขนที่เลือก diff --git a/inter/tha/xml/page_help_center.lxml b/inter/tha/xml/page_help_center.lxml index 272d3eda..f2d42fe0 100644 --- a/inter/tha/xml/page_help_center.lxml +++ b/inter/tha/xml/page_help_center.lxml @@ -18,6 +18,8 @@ DEBUGVAR FromSmoothieProcess DEBUGVAR FromBrewingProcess + Var ChooseProblem = "" + Var show_btn_next_help = "Invisible" Var Problem_Cash_State[0] = "Enable" @@ -117,23 +119,20 @@ SoundVolume - If Seeker = "next" Then - RootLayoutVisible 3 "hide" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - If BaseOnPageBoard = 1 Then - Var BaseOnPageBoard = 0 - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 608 - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 590 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" - Else - OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" - EndIf - EndIf + If BaseOnPageBoard = 1 Then + Var BaseOnPageBoard = 0 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + Else + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf + @@ -199,6 +198,8 @@ Var Problem_Cash_State[2] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Inserted money, amount unchanged" Refresh @@ -220,6 +221,8 @@ Var show_btn_next_help = "Enable" + Var ChooseProblem = "Bill was rejected by the machine" + Refresh @@ -240,6 +243,8 @@ Var show_btn_next_help = "Enable" + Var ChooseProblem = "Other" + Refresh @@ -306,6 +311,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Found a foreign object" Refresh @@ -332,6 +339,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Some ingredients missing" Refresh @@ -358,6 +367,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Under-filled cup" Refresh @@ -384,6 +395,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Wrong item received" Refresh @@ -410,6 +423,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Drink wasn’t blended" Refresh @@ -436,6 +451,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Drink didn’t dissolve properly" Refresh @@ -462,6 +479,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Cup is messy/dirty" Refresh @@ -488,6 +507,8 @@ Var Problem_Brewing_State[8] = "Enable" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "The cup tipped over / drink spilled" Refresh @@ -514,6 +535,8 @@ Var Problem_Brewing_State[8] = "PressForever" Var show_btn_next_help = "Enable" + + Var ChooseProblem = "Other" Refresh @@ -625,28 +648,30 @@ "auto" FromSmoothieProcess + ; + - - - - 100 - 0 - 500 - 75 - Problem_Process_State[0] - - 002312 - - + ; + ; 100 + ; 0 + ; 500 + ; 75 + ; Problem_Process_State[0] + ; + ; 002312 + ; + ; 100 - 100 + 0 500 75 Problem_Process_State[1] diff --git a/inter/tha/xml/page_help_center_sending.lxml b/inter/tha/xml/page_help_center_sending.lxml index 8ba46d95..2f393e69 100644 --- a/inter/tha/xml/page_help_center_sending.lxml +++ b/inter/tha/xml/page_help_center_sending.lxml @@ -30,15 +30,11 @@ If Timeout > 300 Then If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml" Else - If NextOrder = "true" Then - Var NextOrder = "false" - - TransferVar "next" "curr" - Var Seeker = "curr" - - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + If Seeker = "next" Then + RootLayoutVisible 3 "hide" + OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" @@ -97,17 +93,10 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If Seeker = "next" Then - RootLayoutVisible 3 "hide" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - If BoxID = 210699 Then - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf + + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml" + @@ -505,8 +494,20 @@ "ROOT/sounds/codebuttom.wav" SoundVolume + StrLen TelephoneNumber TelNumLen + If TelNumLen >= MinPhoneNumber Then - Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" + DEBUGVAR TelephoneNumber + DEBUGVAR ChooseProblem + + PROBLEM TelephoneNumber ChooseProblem + + If MachineStage = "remove-cup" Then + OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml" + Else + Open "ROOT/taobin_project/inter/tha/xml/page_help_center_sending_conti.lxml" + EndIf + EndIf diff --git a/inter/tha/xml/page_help_center_sending_conti.lxml b/inter/tha/xml/page_help_center_sending_conti.lxml new file mode 100644 index 00000000..7f070dfd --- /dev/null +++ b/inter/tha/xml/page_help_center_sending_conti.lxml @@ -0,0 +1,99 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + + + 1000 + + + Var Timeout = Timeout + 1 + + If Timeout > 5 Then + If Seeker = "next" Then + RootLayoutVisible 3 "hide" + OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf + EndIf + + TimerReset + Refresh + + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + +; + + + 380 + 724 + 911 + 265 + 361 + 486 + "ROOT/taobin_project/image/collectiing/Businessman_sorry.png" + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" + + + + 0 + 1344 + 1080 + 85 + Center + + 002354 + + + + + 0 + 1430 + Center + + 002355 + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 6a7d9587..0e5bc704 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -60,6 +60,7 @@ Var FromSmoothieProcess = "Enable" Var FromPaymentCash = "Invisible" Var FromBrewingProcess = "Invisible" + Var BaseOnPageBoard = 0 Var TimeOutHandPoint = 0 Var ShowHandPoint = "Invisible" diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml index 6bc53937..bb4b65f6 100644 --- a/xml/page_back_to_main.xml +++ b/xml/page_back_to_main.xml @@ -11,7 +11,17 @@ Var routeManTest = CountryRootPath + "/xml/route_man_test.lxml" OpenInst 0 routeManTest Else - OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" + If EnableHelperShow = 1 Then + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" + Else + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" + EndIf EndIf If showMultiAds = "true" Then diff --git a/xml/page_board.xml b/xml/page_board.xml index 237502aa..051099f5 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -2119,28 +2119,32 @@ PRICE "Reset" "-" DEBUGVAR CountryName Var BaseOnPageBoard = 0 - - If InternationalEnable = 1 Then - If CountryName = "Thailand" Then - SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" - Else - ; show language icon - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - RootLayoutVisible 3 "show" - - - Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" - TRY OpenFileXML - EndIf - + + If CurrHelpCenter = 1 Then + ; do not thing when open the helper Else - If BeerTrapEnable = "true" Then - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + Else + ; show language icon + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + + + Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" + TRY OpenFileXML + EndIf + Else - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + If BeerTrapEnable = "true" Then + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + Else + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + EndIf EndIf - EndIf + EndIf Machine DoorClose @@ -2593,24 +2597,28 @@ PRICE "Reset" "-" Var OpenFromPageBoard = 1 - If InternationalEnable = 1 Then - - If CountryName = "Thailand" Then - SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" - TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" - Else ; show language icon - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - RootLayoutVisible 3 "show" - - Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" - TRY OpenFileXML - EndIf + If CurrHelpCenter = 1 Then + ; do not thing when open the helper Else + If InternationalEnable = 1 Then - If CocktailShow = "true" Then - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + If CountryName = "Thailand" Then + SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" + Else ; show language icon + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + + Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" + TRY OpenFileXML + EndIf Else - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + + If CocktailShow = "true" Then + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + Else + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + EndIf EndIf EndIf diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index a7f1ef96..52b89d6f 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1316,6 +1316,7 @@ Var FromSmoothieProcess = "Invisible" Var FromPaymentCash = "Enable" Var FromBrewingProcess = "Invisible" + Var BaseOnPageBoard = 0 If EnableHelperShow = 1 Then Var Showhelper = "Enable"