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

Merge origin/masterpiece into smoothie_tbp

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-13 09:59:33 +07:00
commit 678a79ae83
80 changed files with 10192 additions and 14079 deletions
Download patch file Download diff file Expand all files Collapse all files

68
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
@ -1404,27 +1380,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
@ -1966,25 +1926,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
@ -3322,9 +3268,11 @@
<Text>
<X> 0 </X>
<Y> 938 </Y>
<Width> 1080</Width>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 72 </Size>
<MaxSize> 66 </MaxSize>
<Size> Auto </Size>
<MaxLine> 1 </MaxLine>
<Font> KanitMediumTTF </Font>
<Color> HeadlineColor </Color>
<Value> showname </Value>