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

Mulitple updated MYS: new payment & update lang SGP: update lang &

Browse source 
remove season pass bug UAE_DUBAI: update lang NewUI: move init ipc
service
This commit is contained in:
Pakin 2025-08-04 08:16:10 +07:00
parent 6316d785c6
commit 847a4660fa
22 changed files with 2732 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

70
xml/page_payment_cash-MYR.xml
View file

@ -269,20 +269,7 @@
If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@ -530,6 +517,15 @@
EndIf
If RoadShow = "true" Then
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
</EventOpen>
@ -564,18 +560,14 @@
EndIf
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
;Var TxRef1 = ""
;CreateTxRef1 TxRef1
EndIf
Var Seeker.PayWithQR = 1
Var Seeker.VendingTSID = VendingTSID
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -665,13 +657,10 @@
CoinVending OFF
Refresh
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@ -747,6 +736,7 @@
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
DEBUGVAR CashlessAmount
If VendingCashless = "READY" Then
Var QRCODE99 = ""
@ -758,6 +748,18 @@
Var alphaState = "Enable"
DEBUGVAR PayAmount
DEBUGVAR Seeker.IntVendingCampaign
DEBUGVAR CashlessAmount
If PayAmount = CashlessAmount Then
Else
DEBUGVAR "Detect cashless amount not equal, fix now"
Var CashlessAmount = PayAmount
EndIf
DEBUGVAR CashlessAmount
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
@ -778,6 +780,7 @@
DEBUGVAR CashlessPayFlag
DEBUGVAR ReadyForBrew
DEBUGVAR CashlessAmount
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
@ -912,6 +915,13 @@
If Seeker = "curr" Then
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
@ -1720,6 +1730,18 @@ If alphaState = "Invisible" Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable"
DEBUGVAR CashlessAmount
If PayAmount = CashlessAmount Then
Else
DEBUGVAR "Detect cashless amount not equal, fix now"
Var CashlessAmount = PayAmount
EndIf
DEBUGVAR CashlessAmount
Coin CARDON
Var CardOnActed = "true"
DEBUGVAR CardOnActed