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

This commit is contained in:
Ittipat Lusuk 2025-05-19 16:42:26 +07:00
commit 1b19ec4e64
2 changed files with 15 additions and 12 deletions

View file

@ -9,7 +9,7 @@
RootLayoutVisible 3 "hide"
DEBUGVAR CountryName
SAVELOG "cash version 1.1"
Var cash_disable = "0"
@ -1392,6 +1392,8 @@
If VendingQRTypeResult = "KBA:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var PopupTimeoutEnable = "Enable"
Var PopupTimeout = 15
Var QRCODE99KBANK = SessionID
Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
SAVELOG Ext1a
@ -1949,6 +1951,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var PopupTimeoutEnable = "Invisible"
Var QRCODE99 = ""
EndIf
EndIf
@ -2445,19 +2448,19 @@
EndIf
EndIf
EndIf
If PopupTimeoutEnable = "Enable" Then
If PopupTimeout > 0 Then
Var PopupTimeout = PopupTimeout - 1
Else
Var PopupTimeoutEnable = "Invisible"
Var cancelButtonQRPopupState = "Enable"
EndIf
EndIf
EndIf
EndIf
EndIf
If PopupTimeoutEnable = "Enable" Then
If PopupTimeout > 0 Then
Var PopupTimeout = PopupTimeout - 1
Else
Var PopupTimeoutEnable = "Invisible"
Var cancelButtonQRPopupState = "Enable"
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
@ -2996,7 +2999,7 @@
Var FlagQROpened = 1
Var alphaState = "Enable"
Var cancelButtonQRPopupState = "Enable"
Var cancelButtonQRPopupState = "Invisible"
Var QRCodeImageState = "Enable"
;CoinVending OFF
VendingQR ON
@ -3270,7 +3273,7 @@
<Y> 938 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<MaxSize> 66 </MaxSize>
<MaxSize> 66 </MaxSize>
<Size> Auto </Size>
<MaxLine> 1 </MaxLine>
<Font> KanitMediumTTF </Font>