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

DUBAI: rm sound thai & fix bug next order (dubai) not show

Browse source
This commit is contained in:
Pakin 2024-10-02 15:14:06 +07:00
parent c86afed35d
commit 95025531da
12 changed files with 132 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_drink_stuck.xml
View file

@ -256,7 +256,11 @@
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout2 = 0
EndIf

12
xml/page_drinkok.xml
View file

@ -459,7 +459,11 @@
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout2 = 0
EndIf
@ -473,7 +477,11 @@
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout2 = 0
EndIf

31
xml/page_payment_cash-UAE.xml
View file

@ -501,6 +501,7 @@
EndIf
DEBUGVAR DirImage2
Var CancelContinue = 0
</EventOpen>
<EventActionOk>
@ -915,9 +916,22 @@
;Var Timeout = 0
EndIf
If Seeker = "curr" Then
DEBUGVAR CancelContinue
Var UserChoosePayment = ""
If CancelContinue = 2 Then
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
If CancelContinue = 2 Then
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
DEBUGVAR brewing3ContiInter
Open brewing3ContiInter
@ -1040,6 +1054,10 @@
Var ActionOKCase = 1
Var PayInfoCFlag = 1
EndIf
If CancelContinue = 1 Then
Var CancelContinue = 2
EndIf
EndIf
VendingQR OFF
@ -1431,6 +1449,8 @@
CashlessReq FAIL
EndIf
Var CancelContinue = 0
EndIf
EndIf
@ -1753,6 +1773,8 @@
CashlessReq FAIL
EndIf
Var CancelContinue = 1
Refresh
</EventClick>
</Button>
@ -1932,6 +1954,9 @@
EndIf
Var alphaState2 = "Invisible"
Var CancelContinue = 1
Refresh
@ -1994,6 +2019,9 @@
CoinVending BILLREJECT
Var alphaState3 = "Invisible"
Var CancelContinue = 0
Refresh
</EventClick>
</Button>
@ -2024,6 +2052,9 @@
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Var CancelContinue = 1
Refresh
</EventClick>
</Button>

22
xml/page_pickup_cup_from_error.xml
View file

@ -64,15 +64,21 @@
Else
If HaveCup = "true" Then
If Timeout = 4 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 54 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 90 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
If Timeout = 4 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 54 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 90 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
EndIf

4
xml/page_remove_cup.xml
View file

@ -52,6 +52,10 @@
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
If InternationalEnable = 1 Then
Var MachineErrorDetailAll = MachineErrorDetailEng
EndIf
;DEBUGVAR HaveCup
;DEBUGVAR CupOnArm