Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
bfac890182
22 changed files with 78 additions and 26 deletions
|
|
@ -368,7 +368,9 @@
|
|||
CoinVending OFF
|
||||
If Seeker = "curr" Then
|
||||
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
@ -391,7 +393,9 @@
|
|||
CoinVending OFF
|
||||
If Seeker = "curr" Then
|
||||
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
@ -1135,7 +1139,9 @@
|
|||
Var Seeker.VendingTSID = VendingTSID
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
;Var TxRef1 = ""
|
||||
;CreateTxRef1 TxRef1
|
||||
|
|
@ -1632,7 +1638,9 @@
|
|||
Refresh
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
Var Seeker.CreditCard = 1
|
||||
|
|
@ -1856,7 +1864,9 @@
|
|||
|
||||
If Seeker = "curr" Then
|
||||
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -255,7 +255,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -197,7 +197,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -111,7 +111,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -81,7 +81,9 @@
|
|||
If Seeker = "curr" Then
|
||||
|
||||
DEBUGVAR "MakeDrinkV1"
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -190,7 +190,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
|
||||
Var TxRef1 = ""
|
||||
|
|
|
|||
|
|
@ -93,7 +93,9 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -309,7 +309,9 @@
|
|||
|
||||
Else
|
||||
Var LastMakeDrinkResult = "-"
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue