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

This commit is contained in:
wanlop run 2024-09-24 23:47:54 +07:00
commit 6317a68847
5 changed files with 280 additions and 274 deletions

View file

@ -476,7 +476,6 @@
Var XPercent = 0
EndIf
CashlessReq SUCCESS
</EventOpen>
<EventLanguageOnChange>

View file

@ -584,8 +584,6 @@
EndIf
EndIf
CashlessReq SUCCESS
</EventOpen>
<EventLanguageOnChange>
Var XPosiShowCountDownBrew = 768

View file

@ -736,6 +736,8 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"

View file

@ -741,6 +741,8 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -784,7 +786,11 @@
If VendingCashless = "ERROR" Then
If CoinInOK = 1 Then
Else
Var Timeout = 0
EndIf
;Var QRErrorFlag = 1
If alphaState = "Enable" Then
@ -801,10 +807,7 @@
</EventActionError>
<EventCashlessCard>
Refresh
</EventCashlessCard>
@ -1486,17 +1489,15 @@
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable"
Coin CARD
;Coin CARD
Var ReqPayInfoFromCashOther = 2
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
@ -1509,17 +1510,23 @@ If alphaState = "Invisible" Then
Var CreditCardRef = CreditCardRef + SelectDrink
DEBUGVAR CreditCardRef
;Var QR_POPUP = "/img_popup8-2.png"
If CoinInOK = 1 Then
Else
Var Timeout = 0
EndIf
Var QRErrorState = "Invisible"
Var VendingCashless = "-"
;Var LOADING_STATE = "Enable"
;Var alphaState = "Enable"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
EndIf
EndIf
EndIf
Refresh
</EventClick>
</Button>