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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-05-14 23:49:28 +07:00
commit 2aaac9bd89
10 changed files with 368 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xml/page_board.xml
View file

@ -630,7 +630,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"
@ -677,6 +678,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
@ -707,6 +710,7 @@
Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
Var CountryShortName = "aus"
Var TextPriceMenuSize = 12
Var TextPriceMenuY = 264
@ -753,6 +757,7 @@
Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var CountryRootPath = "ROOT/taobin_project/inter/usaNY/"
Var CountryShortName = "usaNY"
ar TextPriceMenuSize = 12
Var TextPriceMenuY = 264
@ -796,6 +801,7 @@
Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var CountryRootPath = "ROOT/taobin_project/inter/sgp/"
Var CountryShortName = "sgp"
ar TextPriceMenuSize = 12
Var TextPriceMenuY = 264
@ -854,6 +860,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 = 266

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"

62
xml/page_topping_select7.xml
View file

@ -1458,6 +1458,8 @@
If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever"
Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
If toppingID1index2 = toppingID1Default Then
@ -1492,6 +1494,8 @@
If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever"
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
EndIf
@ -1511,6 +1515,8 @@
If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever"
Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
If toppingID1index2 = toppingID1Default Then
@ -1538,6 +1544,8 @@
If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever"
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
EndIf
@ -1757,6 +1765,8 @@
If toppingID1index2 = toppingID1Default Then
Var SugarState3 = "PressForever"
Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
If toppingID1index3 = toppingID1Default Then
@ -1812,6 +1822,8 @@
If toppingID1index2 = toppingID1Default Then
Var SugarState4 = "PressForever"
Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
If toppingID1index3 = toppingID1Default Then
@ -1863,6 +1875,8 @@
If toppingID1index2 = toppingID1Default Then
Var SugarState3 = "PressForever"
Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf
If toppingID1index3 = toppingID1Default Then
@ -1915,6 +1929,7 @@
; Sugar Zero Cal
DEBUGVAR SugarZeroCalEnable
DEBUGVAR SugarZeroCalCheck
If SugarZeroCalEnable = "true" Then
Var SugarZeroCalPrice = 10
@ -2739,6 +2754,7 @@
Var topping1 = toppingID1index1
EndIf
Var SugarZeroCalOption = "Invisible"
Var UserSeletedSugar = 1
EndIf
@ -3856,17 +3872,14 @@
EndIf
Var topping1 = toppingID1index1
EndIf
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
Else
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
EndIf
Var SugarZeroCalOption = "Enable"
Var UserSeletedSugar = 1
EndIf
@ -3930,12 +3943,22 @@
EndIf
Var topping1 = toppingID1index2
EndIf
; select no sugar
Var SugarNormalCheck = "PressForever"
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Disable"
EndIf
EndIf
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
Var topping1 = toppingID1index2
Else
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
EndIf
@ -4028,14 +4051,15 @@
EndIf
Var topping1 = toppingID1index2
Else
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
EndIf
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1
EndIf