new payment
This commit is contained in:
parent
e57b8cedf0
commit
1301258344
26 changed files with 43 additions and 42 deletions
|
|
@ -6,7 +6,7 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"
|
||||
|
||||
Var SendNotiPaySuccess = 2
|
||||
|
||||
|
|
|
|||
|
|
@ -462,6 +462,7 @@
|
|||
__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
|
||||
|
||||
;new payment coffee-payment
|
||||
Var New_Payment = 1
|
||||
If New_Payment = 1 Then
|
||||
Var Seeker.ORDER_ID = ""
|
||||
GenHashWithTimeStamp Seeker.ORDER_ID
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@
|
|||
CoinVending OFF
|
||||
If Seeker = "curr" Then
|
||||
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
@ -390,7 +390,7 @@
|
|||
CoinVending OFF
|
||||
If Seeker = "curr" Then
|
||||
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
@ -1129,14 +1129,16 @@
|
|||
|
||||
|
||||
|
||||
|
||||
Var Seeker.PayWithQR = 1
|
||||
Var Seeker.VendingTSID = VendingTSID
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
;Var TxRef1 = ""
|
||||
;CreateTxRef1 TxRef1
|
||||
EndIf
|
||||
Var Seeker.PayWithQR = 1
|
||||
Var Seeker.VendingTSID = VendingTSID
|
||||
|
||||
|
||||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
|
|
@ -1629,7 +1631,7 @@
|
|||
Refresh
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
Var Seeker.CreditCard = 1
|
||||
|
|
@ -1853,7 +1855,7 @@
|
|||
|
||||
If Seeker = "curr" Then
|
||||
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
If Seeker = "curr" Then
|
||||
|
||||
DEBUGVAR "MakeDrinkV1"
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
|
||||
Var TxRef1 = ""
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
Var CART_INDEX = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@
|
|||
|
||||
Else
|
||||
Var LastMakeDrinkResult = "-"
|
||||
__CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
Var SVT = "coffee"
|
||||
Var ACC = TelephoneNumber
|
||||
Var DEE = PayDetail
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
PAYEXT_SETUP SVT ACC Seeker.VendingTSID Seeker.ORDER_ID
|
||||
DEBUGVAR TelephoneNumber
|
||||
Var TelephoneNumberExt = TelephoneNumber
|
||||
If TelephoneNumberExt = "" Then
|
||||
Var TelephoneNumberExt = "0899999999"
|
||||
EndIf
|
||||
__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
|
||||
|
||||
|
||||
If Seeker.PayWithQR = 1 Then
|
||||
;pay credit if coinAmount > 0
|
||||
DEBUGVAR "MIGGAZE0"
|
||||
If Seeker.PayWithQR = 1 Then
|
||||
|
||||
|
||||
Var ServiceAmount2 = Seeker.ServiceAmount2
|
||||
Var CreditReference = ""
|
||||
|
|
@ -37,12 +35,13 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
|
||||
;TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
|
||||
|
||||
Else
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
|
||||
|
||||
|
||||
Var SelectDrink = Seeker.selected_a_drink
|
||||
Var ExtendData = Seeker.ExtendData
|
||||
Var ServiceAmount2 = Seeker.ServiceAmount2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue