merge from masterpiece

This commit is contained in:
Pakin 2025-04-04 14:34:43 +07:00
parent 845c5f1637
commit 736af0e6dc
65 changed files with 481100 additions and 1087 deletions

View file

@ -118,6 +118,12 @@
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
If New_PaymentInter = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_NewBrewing3_blue.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_NewBrewing3Conti_blue.xml"
EndIf
If Seeker = "next" Then
;CoinBack
Open Brew3ConInter
@ -204,4 +210,4 @@
<Value> StoreCreditAmountStr </Value>
</Text>
</Popup>
</Popup>

View file

@ -266,6 +266,10 @@
CoinVending OFF
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
@ -283,6 +287,31 @@
EndIf
If Seeker.FreeVendingCampaign = 1 Then
Var RemainAmountStr = "Free###size=150"
CoinVending OFF
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
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If CoinInOK = 0 Then
@ -535,6 +564,10 @@
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
@ -735,7 +768,10 @@
Refresh
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
@ -1184,6 +1220,10 @@
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