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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
inter/sgp/xml/page_brewing3.lxml
View file

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

2
inter/uae_dubai/xml/page_brewing3.lxml
View file

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

2
xml/page_payment_cash-SGP.xml
View file

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

79
xml/page_payment_cash-UAE.xml
View file

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