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/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/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/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/xml/page_board.xml b/xml/page_board.xml index a953f780..dc40b6a7 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -634,7 +634,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" @@ -681,6 +682,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 @@ -711,6 +714,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/aus/" + Var CountryShortName = "aus" ar TextPriceMenuSize = 12 Var TextPriceMenuY = 264 @@ -757,6 +761,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/usaNY/" + Var CountryShortName = "usaNY" ar TextPriceMenuSize = 12 Var TextPriceMenuY = 264 @@ -800,6 +805,7 @@ Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/sgp/" + Var CountryShortName = "sgp" ar TextPriceMenuSize = 12 Var TextPriceMenuY = 264 @@ -853,6 +859,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 20a40e98..cc8b7db3 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -164,9 +164,26 @@ 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 + + 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 @@ -174,11 +191,8 @@ Var MaxNumber = 12 EndIf - ;inter-from-consent - If CountryName = "Singapore" Then - Var MaxNumber = 10 - EndIf - + DEBUGVAR CountryName + DEBUGVAR MaxNumber 1000 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"