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

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

Browse source
This commit is contained in:
Pakin 2025-02-20 08:40:02 +07:00
commit 4cb42e148e
157 changed files with 24010 additions and 1712 deletions
Download patch file Download diff file Expand all files Collapse all files

80
xml/page_payment_cash.xml
View file

@ -562,6 +562,10 @@
Var EWalletButtonState = "Disable"
Var ThirdPartyCodeButtonState = "Disable"
Var X_CASH1 = 216 - 113
Var X_CASH2 = 439 - 113
Var X_CASH3 = 664 - 113
Var PayOfflineMode = 1
Var ShowNetworkProblem = "Enable"
@ -1880,8 +1884,19 @@
EndIf
DEBUGVAR VendingCashless
If VendingCashless = "OK" Then
DEBUGVAR CashlessCode
If KBankCashlessMachine = 1 Then
Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
DEBUGVAR VendingTrackNumber
DEBUGVAR Var Seeker.CashlessVendingTrackNumber
EndIf
Var Timeout = 0
Var QRErrorState = "Invisible"
@ -1958,23 +1973,43 @@
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
If VendingCashless = "READY" Then
Var QRCODE99 = ""
If CoinInOK = 1 Then
If KBankCashlessMachine = 1 Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
If CoinInOK = 1 Then
Else
Var Timeout = 0
Else
Var Timeout = 0
EndIf
Var QRErrorState = "Invisible"
Var VendingCashless = "-"
Var ServiceCharge = 3
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
Var RemainAmountX = RemainAmountX + ServiceCharge
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
Else
If VendingCashless = "READY" Then
Var QRCODE99 = ""
If CoinInOK = 1 Then
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
Else
Var Timeout = 0
EndIf
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
EndIf
Refresh
</EventCashlessCard>
@ -2162,7 +2197,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
Var CancelCounter = 0
@ -2313,13 +2348,13 @@
EndIf
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF by user"
CashlessReq OFF
DEBUGVAR "CashlessReq OFF "" by user"
CashlessReq OFF Seeker.CashlessVendingTrackNumber
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
EndIf
@ -2705,7 +2740,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
@ -2967,9 +3002,14 @@
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png"
If KBankCashlessMachine = 1 Then
Var QR_POPUP = "/img_popup8_with_service_charge.png"
Var cancelButtonQRPopupState = "Invisible"
Else
Var QR_POPUP = "/img_popup8.png"
Var cancelButtonQRPopupState = "Enable"
EndIf
Var alphaState = "Enable"
Var cancelButtonQRPopupState = "Enable"
Coin CARD
Var ReqPayInfoFromCashOther = 2
EndIf
@ -3065,7 +3105,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
EndIf