pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Kenta420 2024-05-13 15:26:51 +07:00
commit 87233394a4
7 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inter/mys/max_tel_num Normal file
View file

@ -0,0 +1 @@
11

5
inter/mys/xml/page_brewing3.lxml
View file

@ -2080,6 +2080,11 @@
</Language>
</Button>
<EventUnitTest3>
; test drinkfail with phone number
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest3>
<EventUnitTest4>
; test drinkfail with phone number
Var TelephoneNumberProblem = "1234567890"

1
inter/sgp/max_tel_num Normal file
View file

@ -0,0 +1 @@
8

5
inter/sgp/xml/page_brewing3.lxml
View file

@ -1852,6 +1852,11 @@
</Language>
</Button>
<EventUnitTest3>
; test drinkfail
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest3>
<EventUnitTest4>
; test drinkfail with phone number
Var TelephoneNumberProblem = "1234567890"

9
xml/page_board.xml
View file

@ -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

30
xml/page_drinkfail2.xml
View file

@ -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
</EventOpen>
<Timeout> 1000 </Timeout>

4
xml/page_drinkok.xml
View file

@ -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"