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 2025-05-08 12:42:46 +07:00
commit 8e8b0edf57
5 changed files with 34 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

62
xml/page_payment_cash.xml
View file

@ -431,31 +431,7 @@
If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@ -1403,27 +1379,11 @@
Var Seeker.PayWithQR = 1
Var Seeker.VendingTSID = VendingTSID
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
;Var TxRef1 = ""
;CreateTxRef1 TxRef1
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
EndIf
@ -1965,25 +1925,11 @@
CoinVending OFF
Refresh
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
EndIf
EndIf
EndIf

26
xml/page_payment_credit2.xml
View file

@ -216,31 +216,7 @@
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
Var ReqAdddata22 = 0

18
xml/page_payment_credit3-0.xml
View file

@ -113,23 +113,7 @@
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
DEBUGVAR Seeker
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
Var ReqAdddata22 = 0

22
xml/page_payment_credit3-TopupSuccess.xml
View file

@ -97,25 +97,7 @@
If FlagPayCredit = 1 Then
Var FlagPayCredit = 0
If Seeker = "curr" Then
DEBUGVAR "MakeDrinkV1"
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Var Seeker.StoreCreditFlag = 1
Var Seeker.StoreCreditFlag = 1
EndIf
@ -123,7 +105,7 @@
Var Timeout = Timeout + 1
If Timeout > 3 Then
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
TimerReset

26
xml/sometime/make_drink.xml Normal file
View file

@ -0,0 +1,26 @@
SAVELOG "[MAKE_DRINK]"
DEBUGVAR Seeker
DEBUGVAR SmoothieToPayment
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf