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

This commit is contained in:
Pakin 2025-03-03 09:07:23 +07:00
commit 6ec9bde198
282 changed files with 57679 additions and 30089 deletions

View file

@ -1949,7 +1949,13 @@
If CoinInOK = 1 Then
Else
Var Timeout = 0
If KBankCashlessMachine = 1 Then
; popup will close after 30 second
Var Timeout = 90
Var cancelButtonQRPopupState = "Enable"
Else
Var Timeout = 0
EndIf
EndIf
;Var QRErrorFlag = 1
@ -2197,7 +2203,11 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
If KBankCashlessMachine = 1 Then
Else
CashlessReq CANCEL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
Var CancelCounter = 0
@ -2354,7 +2364,11 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
If KBankCashlessMachine = 1 Then
Else
CashlessReq CANCEL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
EndIf
EndIf
@ -2740,7 +2754,11 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
If KBankCashlessMachine = 1 Then
Else
CashlessReq CANCEL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
EndIf
@ -3105,7 +3123,11 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
If KBankCashlessMachine = 1 Then
Else
CashlessReq CANCEL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
EndIf