From d5c2dd90441e4ebe87320d50318e08bf98b7acff Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 13 Sep 2024 18:45:06 +0700 Subject: [PATCH 1/4] DUBAI: Fix bugs --- .../{bn_pay_wtih_code.png => bn_pay_with_code.png} | Bin inter/uae_dubai/xml/page_topping_select6.lxml | 4 +--- xml/page_payment_cash-UAE.xml | 4 ++++ xml/page_show_error.lxml | 12 ++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) rename inter/uae_dubai/image/page_payment_cash/{bn_pay_wtih_code.png => bn_pay_with_code.png} (100%) diff --git a/inter/uae_dubai/image/page_payment_cash/bn_pay_wtih_code.png b/inter/uae_dubai/image/page_payment_cash/bn_pay_with_code.png similarity index 100% rename from inter/uae_dubai/image/page_payment_cash/bn_pay_wtih_code.png rename to inter/uae_dubai/image/page_payment_cash/bn_pay_with_code.png diff --git a/inter/uae_dubai/xml/page_topping_select6.lxml b/inter/uae_dubai/xml/page_topping_select6.lxml index 2a2a8c61..972a36a9 100644 --- a/inter/uae_dubai/xml/page_topping_select6.lxml +++ b/inter/uae_dubai/xml/page_topping_select6.lxml @@ -485,7 +485,6 @@ Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 - Var text_show_blend_x = 872 Var text_milk_choice_price_x = 265 Var SugarZeroCalPrice_X = 540 @@ -498,7 +497,6 @@ Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 600 Var text_show_normal_x = 528 - Var text_show_blend_x = 872 Var text_milk_choice_price_x = 295 Var SugarZeroCalPrice_X = 540 EndIf @@ -1773,7 +1771,7 @@ ; x for blend rng. - text_show_blend_x + 860 85 KanitRegularTTF 23 diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml index 636409f1..79e70389 100644 --- a/xml/page_payment_cash-UAE.xml +++ b/xml/page_payment_cash-UAE.xml @@ -384,6 +384,10 @@ Var SELLONLINE = 1 EndIf + If IgnoreNetCore = "true" Then + Var SELLONLINE = 1 + EndIf + If SELLONLINE = 0 Then SAVELOG "Cash only NetworkStatus down" diff --git a/xml/page_show_error.lxml b/xml/page_show_error.lxml index b9a2502f..deb66cee 100644 --- a/xml/page_show_error.lxml +++ b/xml/page_show_error.lxml @@ -213,6 +213,9 @@ If LanguageShow = "MALAY" Then Var DirImage = CountryRootPath + "image/vending_error_en" EndIf + If LanguageShow = "UAE_DUBAI" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf EndIf If NeedUpgrade = "true" Then @@ -231,6 +234,9 @@ If LanguageShow = "MALAY" Then Var DirImage = CountryRootPath + "image/vending_error_en" EndIf + If LanguageShow = "UAE_DUBAI" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf EndIf DEBUGVAR MachineStage @@ -253,6 +259,9 @@ If LanguageShow = "MALAY" Then Var DirImage = CountryRootPath + "image/vending_error_en" EndIf + If LanguageShow = "UAE_DUBAI" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf Else Var show_error_normal = "Enable" Var show_error_sp1 = "Invisible" @@ -272,6 +281,9 @@ If LanguageShow = "MALAY" Then Var DirImage = CountryRootPath + "image/close_en" EndIf + If LanguageShow = "UAE_DUBAI" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf EndIf EndIf From cbe9c7b8df8b0057e2b990596032c69c668c83b2 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 16 Sep 2024 10:07:57 +0700 Subject: [PATCH 2/4] UNIVERSE: Fix verify number inter --- xml/page_payment_credit.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 062ebb9e..f11ef116 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -633,7 +633,12 @@ Var Tel2DFlag = 0 - TRY "ROOT/taobin_project/xml/verify_number.ev" + If InternationalEnable = 1 Then + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV + Else + TRY "ROOT/taobin_project/xml/verify_number.ev" + EndIf If Tel2DFlag = 1 Then From d2afd680bd2e16ce15cf8a8dc3c77f1019e9234c Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 16 Sep 2024 10:42:10 +0700 Subject: [PATCH 3/4] DUBAI: Update menus --- inter/uae_dubai/menu/lang.tsv | 4 +- .../xml/page_catalog_group_coffee.lxml | 14 +-- .../xml/page_catalog_group_health.lxml | 10 +- .../xml/page_catalog_group_other.lxml | 92 +++++++++---------- .../xml/page_catalog_group_recommend.lxml | 6 +- ...age_catalog_group_recommend_multi_pro.lxml | 6 +- .../uae_dubai/xml/page_catalog_group_tea.lxml | 10 +- 7 files changed, 71 insertions(+), 71 deletions(-) diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv index 3f9080f6..98ceae5c 100644 --- a/inter/uae_dubai/menu/lang.tsv +++ b/inter/uae_dubai/menu/lang.tsv @@ -1018,7 +1018,7 @@ TextID Note English arabic 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. เลือกทิศทาง @@ -1031,7 +1031,7 @@ TextID Note English arabic 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. ทดสอบการบด diff --git a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml index f19449d5..f7e37aa7 100644 --- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml @@ -3469,7 +3469,7 @@ Var NameLang[0][4] = "" Var NameLang[0][5] = "" Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." - Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." + Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" @@ -6755,7 +6755,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "MANDARINE \nIced AMERICANO" - Var NameLang[1][1] = "مندرين \nأمريكان مثلج" + Var NameLang[1][1] = "مندرين \nأمريكانو مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" @@ -7023,7 +7023,7 @@ Var NameLang[0][4] = "" Var NameLang[0][5] = "" Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." - Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." + Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" @@ -7035,7 +7035,7 @@ Var NameLang[1][4] = "" Var NameLang[1][5] = "" Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." - Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." + Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -10311,7 +10311,7 @@ Var NameLang[1][4] = "" Var NameLang[1][5] = "" Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." - Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." + Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -14645,7 +14645,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "Iced MOCHA" - Var NameLang[1][1] = "موكا مثلجة" + Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" @@ -18219,7 +18219,7 @@ Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE" - Var NameLang[2][1] = "عصير الشاي التايلاندي والقهوة واللاتيه" + Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي" Var NameLang[2][2] = "" Var NameLang[2][3] = "" Var NameLang[2][4] = "" diff --git a/inter/uae_dubai/xml/page_catalog_group_health.lxml b/inter/uae_dubai/xml/page_catalog_group_health.lxml index e78174ed..516cee3e 100644 --- a/inter/uae_dubai/xml/page_catalog_group_health.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml @@ -1828,7 +1828,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "Iced MOCHA" - Var NameLang[1][1] = "موكا مثلجة" + Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" @@ -2102,7 +2102,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "Iced MOCHA" - Var NameLang[1][1] = "موكا مثلجة" + Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" @@ -5384,7 +5384,7 @@ Var NameLang[0][4] = "" Var NameLang[0][5] = "" Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice" - Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج" + Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج" Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" @@ -5396,7 +5396,7 @@ Var NameLang[1][4] = "" Var NameLang[1][5] = "" Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice" - Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج" + Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -7040,7 +7040,7 @@ Var NameLang[1][4] = "" Var NameLang[1][5] = "" Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice" - Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج" + Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" diff --git a/inter/uae_dubai/xml/page_catalog_group_other.lxml b/inter/uae_dubai/xml/page_catalog_group_other.lxml index e2837423..8a34b9cc 100644 --- a/inter/uae_dubai/xml/page_catalog_group_other.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml @@ -955,15 +955,15 @@ ; ==================> Len = 3 - ; - 53-05-02-0062 53-05-03-0062 + ; - 53-05-02-0062 - 33 22 225 296 - Flag( 53-05-02-0062.Button,53-05-03-0062.Button,$Sum53050200625305030062) + Flag( 53-05-02-0062.Button,$Sum5305020062) + + diff --git a/xml/page_payment_changePin2.xml b/xml/page_payment_changePin2.xml index 291aa584..5233c39d 100644 --- a/xml/page_payment_changePin2.xml +++ b/xml/page_payment_changePin2.xml @@ -52,7 +52,11 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then If ReqFlag = 0 Then - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf EndIf Open "ROOT/taobin_project/xml/page_payment_changePinFailed.xml" EndIf @@ -750,7 +754,11 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf diff --git a/xml/page_payment_changePinFailed.xml b/xml/page_payment_changePinFailed.xml index 3eec0b00..ea76552b 100644 --- a/xml/page_payment_changePinFailed.xml +++ b/xml/page_payment_changePinFailed.xml @@ -29,7 +29,11 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf EndIf TimerReset @@ -103,7 +107,11 @@ SoundVolume - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf diff --git a/xml/page_payment_changePinSMS.xml b/xml/page_payment_changePinSMS.xml index 8babea05..e9691be6 100644 --- a/xml/page_payment_changePinSMS.xml +++ b/xml/page_payment_changePinSMS.xml @@ -40,7 +40,11 @@ If PinSMSFlag = 1 Then Open "ROOT/taobin_project/xml/page_check_member1.xml" Else - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf EndIf EndIf @@ -105,7 +109,11 @@ If PinSMSFlag = 1 Then Open "ROOT/taobin_project/xml/page_check_member1.xml" Else - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf EndIf diff --git a/xml/page_payment_changePinSuccess.xml b/xml/page_payment_changePinSuccess.xml index e80682d8..01e8de69 100644 --- a/xml/page_payment_changePinSuccess.xml +++ b/xml/page_payment_changePinSuccess.xml @@ -29,7 +29,11 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf EndIf TimerReset @@ -101,7 +105,11 @@ SoundVolume - Open "ROOT/taobin_project/xml/page_check_member2.xml" + If ChangeMemberPassword = 1 Then + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf