THAI: Update loading and prevent insert cash while pressed pay with credit card

This commit is contained in:
Kenta420 2025-04-21 17:05:00 +07:00
parent 3762cdbb8b
commit 9fa4e9a943

View file

@ -142,9 +142,13 @@
Var PayAmount = PriceDrink
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
; Below original
; On open
Var CreditCardLoading = 0
Var CreditCardLoadingTimeout = 0
SAVELOG "payment case 1"
Var cancelState = "Invisible"
@ -1964,7 +1968,14 @@
; popup will close after 30 second
Var Timeout = 90
Var PopupTimeoutEnable = "Invisible"
If alphaState = "Enable" Then
Var cancelButtonQRPopupState = "Enable"
EndIf
Var AlphaPopupLoadingState = "Invisible"
Var LOADING_STATE = "Invisible"
Var CreditCardLoading = 0
CoinVending XBILL
Else
Var Timeout = 0
EndIf
@ -2400,6 +2411,26 @@
If KBankCashlessMachine = 1 Then
If alphaState = "Enable" Then
If ReqPayInfoFromCashOther = 2 Then
If CreditCardLoading = 1 Then
If CreditCardLoadingTimeout > 0 Then
Var CreditCardLoadingTimeout = CreditCardLoadingTimeout - 1
Else
Var AlphaPopupLoadingState = "Invisible"
Var LOADING_STATE = "Invisible"
Var PopupTimeoutEnable = "Enable"
Var PopupTimeout = 20
Var CreditCardLoading = 0
If CoinAmount > 0 Then
Change CoinAmount
EndIf
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
EndIf
EndIf
If PopupTimeoutEnable = "Enable" Then
If PopupTimeout > 0 Then
Var PopupTimeout = PopupTimeout - 1
@ -2563,6 +2594,9 @@
DEBUGVAR CoinInOK
If CreditCardLoading = 1 Then
; do nothing
Else
If CashButtonState = "Enable" Then
Var CoinInFlag = 1
@ -2674,11 +2708,8 @@
Var RemainAmount = RemainAmount - Seeker.IntVendingCredit
Var RemainAmountStr = "" + RemainAmount
EndIf
Refresh
EndIf
</EventCoin>
<EventVDCancle>
If CoinInFlag = 1 Then
@ -3063,14 +3094,19 @@
If KBankCashlessMachine = 1 Then
Var QR_POPUP = "/img_popup8_with_service_charge.png"
Var cancelButtonQRPopupState = "Invisible"
Var PopupTimeoutEnable = "Enable"
Var PopupTimeout = 20
Var AlphaPopupLoadingState = "Enable"
Var LOADING_STATE = "Enable"
Var CreditCardLoading = 1
Var CreditCardLoadingTimeout = 3
VendingQR OFF
CoinVending OFF
Coin CARD
Else
Var QR_POPUP = "/img_popup8.png"
Var cancelButtonQRPopupState = "Enable"
Coin CARD
EndIf
Var alphaState = "Enable"
Coin CARD
Var ReqPayInfoFromCashOther = 2
EndIf
EndIf
@ -3290,9 +3326,12 @@ eval(
Var CancelingPopupCountDown = 0
If KBankCashlessMachine = 1 Then
If ReqPayInfoFromCashOther = 2 Then
If ServiceCharge > 0 Then
Var ServiceCharge = 0
EndIf
CoinVending XBILL
EndIf
EndIf
Refresh
@ -3635,6 +3674,13 @@ eval(
;<Filename> Var( DirImage + "/loading.gif" )</Filename>
;</GIF>
<Image>
<X> 249 </X>
<Y> 748 </Y>
<State> AlphaPopupLoadingState </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha_popup.png" </Filename>
</Image>
<GIF>
<X> 493 </X>
<Y> 968 </Y>