Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

This commit is contained in:
Ittipat Lusuk 2025-02-26 11:11:55 +07:00
commit a54adb7b12
39 changed files with 8792 additions and 1663 deletions

View file

@ -346,21 +346,21 @@
Var FirstTimeDelayEnableButton = 1
Var FirstTimeDelayEnableButtonCountDown = 5
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
If CreditCardButtonState = "Enable" Then
Coin CARD
Var UserChoosePayment = "CreditCard"
Var CreditCardButtonState = "Disable"
Var QRCodeButtonState = "Disable"
Var LOADING_STATE = "Enable"
Var AlphaLoadingState = "Enable"
Var EnablingCreditCard = 1
Var EnablingCountDown = 5
Var RequestCreditCardCountDown = 1
EndIf
EndIf
EndIf
;If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; If CreditCardButtonState = "Enable" Then
; Coin CARD
; Var UserChoosePayment = "CreditCard"
; Var CreditCardButtonState = "Disable"
; Var QRCodeButtonState = "Disable"
; Var LOADING_STATE = "Enable"
; Var AlphaLoadingState = "Enable"
; Var EnablingCreditCard = 1
; Var EnablingCountDown = 5
; Var RequestCreditCardCountDown = 1
; EndIf
; EndIf
;EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@ -753,6 +753,9 @@
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
CashlessReq SUCCESS ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -991,7 +994,7 @@
Var stringLog = stringLog + PayOK
If Timeout > 180 Then
If Timeout >= 120 Then
If PayOK = 1 Then
If Seeker = "curr" Then
@ -1013,7 +1016,7 @@
Else
If CancelFlag = 0 Then
SAVELOG "Timeout > 180 s."
SAVELOG "Timeout > 120 s."
If ViewBill > 0 Then
CoinVending BILLREJECT