diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 31e90e82..98202afa 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -7,8 +7,7 @@ - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev" - + Var SendNotiPaySuccess = 2 Var GetMoreStrawCount = 2 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index a38b04f8..9c6c0a2e 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -367,7 +367,7 @@ CoinVending OFF If Seeker = "curr" Then - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 @@ -390,7 +390,7 @@ CoinVending OFF If Seeker = "curr" Then - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 @@ -1130,7 +1130,7 @@ If Seeker = "curr" Then - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID MakeDrinkV1 SelectDrink SelectSugarID ;Var TxRef1 = "" ;CreateTxRef1 TxRef1 @@ -1629,7 +1629,7 @@ Refresh If Seeker = "curr" Then - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID MakeDrinkV1 SelectDrink SelectSugarID EndIf Var Seeker.CreditCard = 1 @@ -1853,7 +1853,7 @@ If Seeker = "curr" Then - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 7ed16f4b..6561a456 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 3dd84573..030d6a91 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 749356ab..d8f29215 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 683dfc61..2c073b35 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 9b1750a8..89946879 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 3af785c4..9b31351e 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 1c6b09db..f14d434e 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 ffb7e9f3..ae492ac3 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 c7c51967..168c9a3a 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 2d49d892..b741584a 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 56763c13..8f06c033 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 e438ab1e..9882ddc1 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 de66cf38..bb6a609d 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 15fb4de3..e4934221 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 f89375ed..08568b5b 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 fa93150f..946be9e4 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 f36dadff..44dee105 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 df5782e5..f1f81a45 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" - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 3ce63053..f31c8b8d 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 e745048a..7214c94d 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 - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" 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 5bd9254b..dd8220c4 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -309,7 +309,7 @@ Else Var LastMakeDrinkResult = "-" - Topping "SetOrderID" Seeker.ORDER_ID + __CMD "SetPay" "Coffee" Seeker.VendingTSID Seeker.ORDER_ID MakeDrinkV1 Seeker.selected_a_drink SelectSugarID EndIf