diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 98202afa..59ecee07 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -6,7 +6,7 @@ SoundVolume - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev" Var SendNotiPaySuccess = 2 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index d02247f6..ee8c011b 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -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 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 9c6c0a2e..7c4a0c0c 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -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 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 6561a456..424ebcd1 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -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 diff --git a/xml/page_payment_codeAEON.xml b/xml/page_payment_codeAEON.xml index 030d6a91..0fe541c9 100644 --- a/xml/page_payment_codeAEON.xml +++ b/xml/page_payment_codeAEON.xml @@ -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 diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml index d8f29215..60f05005 100644 --- a/xml/page_payment_codeAIS.xml +++ b/xml/page_payment_codeAIS.xml @@ -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 diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index 2c073b35..5ed75e46 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -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 diff --git a/xml/page_payment_codeGLX.xml b/xml/page_payment_codeGLX.xml index 89946879..02009a0a 100644 --- a/xml/page_payment_codeGLX.xml +++ b/xml/page_payment_codeGLX.xml @@ -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 diff --git a/xml/page_payment_codeGrab.xml b/xml/page_payment_codeGrab.xml index 9b31351e..9ff293ef 100644 --- a/xml/page_payment_codeGrab.xml +++ b/xml/page_payment_codeGrab.xml @@ -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 diff --git a/xml/page_payment_codeInfinyx.xml b/xml/page_payment_codeInfinyx.xml index f14d434e..df4fb50f 100644 --- a/xml/page_payment_codeInfinyx.xml +++ b/xml/page_payment_codeInfinyx.xml @@ -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 diff --git a/xml/page_payment_codeKBANK.xml b/xml/page_payment_codeKBANK.xml index ae492ac3..043e5aa9 100644 --- a/xml/page_payment_codeKBANK.xml +++ b/xml/page_payment_codeKBANK.xml @@ -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 diff --git a/xml/page_payment_codeLH.xml b/xml/page_payment_codeLH.xml index 168c9a3a..fde0dcb9 100644 --- a/xml/page_payment_codeLH.xml +++ b/xml/page_payment_codeLH.xml @@ -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 diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml index b741584a..c66e1277 100644 --- a/xml/page_payment_codeLotus.xml +++ b/xml/page_payment_codeLotus.xml @@ -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 diff --git a/xml/page_payment_codeMCard.xml b/xml/page_payment_codeMCard.xml index 8f06c033..512e3969 100644 --- a/xml/page_payment_codeMCard.xml +++ b/xml/page_payment_codeMCard.xml @@ -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 diff --git a/xml/page_payment_codeRabbit.xml b/xml/page_payment_codeRabbit.xml index 9882ddc1..3bc4bc60 100644 --- a/xml/page_payment_codeRabbit.xml +++ b/xml/page_payment_codeRabbit.xml @@ -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 diff --git a/xml/page_payment_codeSCG.xml b/xml/page_payment_codeSCG.xml index bb6a609d..bd87bce4 100644 --- a/xml/page_payment_codeSCG.xml +++ b/xml/page_payment_codeSCG.xml @@ -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 diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index e4934221..0dafd672 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -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 diff --git a/xml/page_payment_codeTrue.xml b/xml/page_payment_codeTrue.xml index 08568b5b..65dac302 100644 --- a/xml/page_payment_codeTrue.xml +++ b/xml/page_payment_codeTrue.xml @@ -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 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 946be9e4..05673538 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -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 diff --git a/xml/page_payment_credit3-0.xml b/xml/page_payment_credit3-0.xml index 44dee105..57f6bfe4 100644 --- a/xml/page_payment_credit3-0.xml +++ b/xml/page_payment_credit3-0.xml @@ -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 diff --git a/xml/page_payment_credit3-TopupSuccess.xml b/xml/page_payment_credit3-TopupSuccess.xml index f1f81a45..1d3854ec 100644 --- a/xml/page_payment_credit3-TopupSuccess.xml +++ b/xml/page_payment_credit3-TopupSuccess.xml @@ -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 diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index f31c8b8d..6afdba84 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -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 = "" diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 7214c94d..b7a7be1f 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -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 diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index dd8220c4..e9f11a88 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -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 diff --git a/xml/process/payext_setup.ev b/xml/process/payext_setup.ev index 54f82e5b..f55f24e7 100644 --- a/xml/process/payext_setup.ev +++ b/xml/process/payext_setup.ev @@ -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 \ No newline at end of file +DEBUGVAR TelephoneNumber +Var TelephoneNumberExt = TelephoneNumber +If TelephoneNumberExt = "" Then + Var TelephoneNumberExt = "0899999999" +EndIf +__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID diff --git a/xml/process/payment.ev b/xml/process/payment.ev index 5a20724a..425d5080 100644 --- a/xml/process/payment.ev +++ b/xml/process/payment.ev @@ -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