Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
d97531eee2
1 changed files with 1 additions and 16 deletions
|
|
@ -376,22 +376,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
|
||||
Else
|
||||
If ShouldCollectPoint = 1 Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue