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

This commit is contained in:
wanlop run 2025-07-01 21:25:40 +07:00
commit c0a7d90a4d

View file

@ -1915,7 +1915,7 @@
Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
DEBUGVAR VendingTrackNumber DEBUGVAR VendingTrackNumber
DEBUGVAR Var Seeker.CashlessVendingTrackNumber DEBUGVAR Seeker.CashlessVendingTrackNumber
EndIf EndIf
@ -2407,8 +2407,10 @@
EndIf EndIf
If ReqPayInfoFromCashOther = 2 Then If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF "" by user" SAVELOG "CashlessReq OFF "" by user"
Var Seeker.ServiceCharge = 0
CashlessReq OFF Seeker.CashlessVendingTrackNumber CashlessReq OFF Seeker.CashlessVendingTrackNumber
CoinVending XBILL
EndIf EndIf
If CashlessPayFlag = 1 Then If CashlessPayFlag = 1 Then
@ -3371,13 +3373,6 @@ eval(
Var CancelingPopupFlag = "Enable" Var CancelingPopupFlag = "Enable"
Var CancelingPopupCountDown = 0 Var CancelingPopupCountDown = 0
If KBankCashlessMachine = "1" Then
If ReqPayInfoFromCashOther = 2 Then
Var Seeker.ServiceCharge = 0
CoinVending XBILL
EndIf
EndIf
Refresh Refresh
EndIf EndIf
</EventClick> </EventClick>