From a822ae02915571a81211403ee617c1ef5c9c3175 Mon Sep 17 00:00:00 2001 From: Pakin Date: Mon, 13 May 2024 09:49:39 +0700 Subject: [PATCH 1/3] SGP & MYS: update tel num setting in drink fail. --- inter/mys/xml/page_brewing3.lxml | 5 +++++ inter/mys/xml/tel_num_script.ev | 9 +++++++++ inter/sgp/xml/page_brewing3.lxml | 5 +++++ inter/sgp/xml/tel_num_script.ev | 9 +++++++++ xml/page_drinkfail2.xml | 15 +++++++-------- 5 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 inter/mys/xml/tel_num_script.ev create mode 100644 inter/sgp/xml/tel_num_script.ev diff --git a/inter/mys/xml/page_brewing3.lxml b/inter/mys/xml/page_brewing3.lxml index 1aa936ef..d1bc0c1c 100644 --- a/inter/mys/xml/page_brewing3.lxml +++ b/inter/mys/xml/page_brewing3.lxml @@ -2080,6 +2080,11 @@ + + ; test drinkfail with phone number + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + ; test drinkfail with phone number Var TelephoneNumberProblem = "1234567890" diff --git a/inter/mys/xml/tel_num_script.ev b/inter/mys/xml/tel_num_script.ev new file mode 100644 index 00000000..c38d265e --- /dev/null +++ b/inter/mys/xml/tel_num_script.ev @@ -0,0 +1,9 @@ +;inter-max-number +If CountryName = "Malaysia" Then + Var MaxNumber = 11 +Else + Var MaxNumber = 10 +EndIf + +DEBUGVAR CountryName +DEBUGVAR MaxNumber \ No newline at end of file diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index 63e5d228..c1a94191 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -1852,6 +1852,11 @@ + + ; test drinkfail + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + ; test drinkfail with phone number Var TelephoneNumberProblem = "1234567890" diff --git a/inter/sgp/xml/tel_num_script.ev b/inter/sgp/xml/tel_num_script.ev new file mode 100644 index 00000000..247c0e13 --- /dev/null +++ b/inter/sgp/xml/tel_num_script.ev @@ -0,0 +1,9 @@ +;inter-max-number +If CountryName = "Singapore" Then + Var MaxNumber = 8 +Else + Var MaxNumber = 10 +EndIf + +DEBUGVAR CountryName +DEBUGVAR MaxNumber \ No newline at end of file diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 20a40e98..a11128b3 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -164,9 +164,11 @@ Var MaxNumber = 10 - ;inter-max-number - If CountryName = "Malaysia" Then - Var MaxNumber = 11 + ;inter-from-consent + If InternationalEnable = 1 Then + Var tel_setting = CountryRootPath + "xml/tel_num_script.ev" + DEBUGVAR tel_setting + TRY tel_setting EndIf ;inter-from-consent @@ -174,11 +176,8 @@ Var MaxNumber = 12 EndIf - ;inter-from-consent - If CountryName = "Singapore" Then - Var MaxNumber = 10 - EndIf - + DEBUGVAR CountryName + DEBUGVAR MaxNumber 1000 From c746c740f89fb7c3a4bc9d9656e5be43e7125e25 Mon Sep 17 00:00:00 2001 From: Pakin Date: Mon, 13 May 2024 11:16:45 +0700 Subject: [PATCH 2/3] SGP & MYS: (drink fail) change tel num setting to read from file. --- inter/mys/max_tel_num | 1 + inter/mys/xml/tel_num_script.ev | 9 --------- inter/sgp/max_tel_num | 1 + inter/sgp/xml/tel_num_script.ev | 9 --------- xml/page_board.xml | 9 ++++++++- xml/page_drinkfail2.xml | 21 ++++++++++++++++++--- 6 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 inter/mys/max_tel_num delete mode 100644 inter/mys/xml/tel_num_script.ev create mode 100644 inter/sgp/max_tel_num delete mode 100644 inter/sgp/xml/tel_num_script.ev diff --git a/inter/mys/max_tel_num b/inter/mys/max_tel_num new file mode 100644 index 00000000..9d607966 --- /dev/null +++ b/inter/mys/max_tel_num @@ -0,0 +1 @@ +11 \ No newline at end of file diff --git a/inter/mys/xml/tel_num_script.ev b/inter/mys/xml/tel_num_script.ev deleted file mode 100644 index c38d265e..00000000 --- a/inter/mys/xml/tel_num_script.ev +++ /dev/null @@ -1,9 +0,0 @@ -;inter-max-number -If CountryName = "Malaysia" Then - Var MaxNumber = 11 -Else - Var MaxNumber = 10 -EndIf - -DEBUGVAR CountryName -DEBUGVAR MaxNumber \ No newline at end of file diff --git a/inter/sgp/max_tel_num b/inter/sgp/max_tel_num new file mode 100644 index 00000000..301160a9 --- /dev/null +++ b/inter/sgp/max_tel_num @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/inter/sgp/xml/tel_num_script.ev b/inter/sgp/xml/tel_num_script.ev deleted file mode 100644 index 247c0e13..00000000 --- a/inter/sgp/xml/tel_num_script.ev +++ /dev/null @@ -1,9 +0,0 @@ -;inter-max-number -If CountryName = "Singapore" Then - Var MaxNumber = 8 -Else - Var MaxNumber = 10 -EndIf - -DEBUGVAR CountryName -DEBUGVAR MaxNumber \ No newline at end of file diff --git a/xml/page_board.xml b/xml/page_board.xml index 19718b2f..da3145bd 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -633,7 +633,8 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." - Var CountryRootPath = "ROOT/taobin_project/inter/mys/" + Var CountryRootPath = "ROOT/taobin_project/inter/mys/" + Var CountryShortName = "mys" Var PriceUnitText = "Prices in MYR" @@ -680,6 +681,8 @@ Var CountryRootPath = "ROOT/taobin_project/inter/ids/" Var CountDownShowButton = 35 + Var CountryShortName = "ids" + If Not#LanguageLoaded = "" Then LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/ids/menu/lang.tsv" EndIf @@ -710,6 +713,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/aus/" + Var CountryShortName = "aus" ar TextPriceMenuSize = 12 Var TextPriceMenuY = 264 @@ -756,6 +760,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/usaNY/" + Var CountryShortName = "usaNY" ar TextPriceMenuSize = 12 Var TextPriceMenuY = 264 @@ -799,6 +804,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/sgp/" + Var CountryShortName = "sgp" ar TextPriceMenuSize = 12 Var TextPriceMenuY = 264 @@ -852,6 +858,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/uae_dubai/" + Var CountryShortName = "uae_dubai" Var TextPriceMenuSize = 12 Var TextPriceMenuY = 264 diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index a11128b3..cc8b7db3 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -166,9 +166,24 @@ ;inter-from-consent If InternationalEnable = 1 Then - Var tel_setting = CountryRootPath + "xml/tel_num_script.ev" - DEBUGVAR tel_setting - TRY tel_setting + ;Var tel_setting = CountryRootPath + "xml/tel_num_script.ev" + ;DEBUGVAR tel_setting + ;TRY tel_setting + + Var InterNumSetting = "/mnt/sdcard/coffeevending/taobin_project/inter/" + CountryShortName + Var InterNumSetting = InterNumSetting + "/max_tel_num" + + DEBUGVAR CountryShortName + + READ_FILE InterNumSetting MaxNumber2 + DEBUGVAR MaxNumber2 + + If MaxNumber2 = "" Then + + Else + Var MaxNumber = MaxNumber2 + EndIf + EndIf ;inter-from-consent From 8cfdaafb5977264158a0cd4597375a7b9146ff3d Mon Sep 17 00:00:00 2001 From: Pakin Date: Mon, 13 May 2024 13:19:38 +0700 Subject: [PATCH 3/3] UAE_DUBAI: fix sound at drinkok --- xml/page_drinkok.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 8c6a4cc9..886c0342 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -468,6 +468,10 @@ Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a" EndIf + If CountryName = "UnitedArabEmirates Dubai" Then + Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a" + EndIf + Play PlaySoundStraw Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"