From 8ea71120379dfbaeccdb7e1377d3fb2274332c73 Mon Sep 17 00:00:00 2001 From: pichet Date: Sun, 14 Jul 2024 10:38:17 +0700 Subject: [PATCH] fix bug new payment --- xml/page_payment_cash.xml | 20 +++++++++++++++----- xml/page_payment_code.xml | 4 +++- xml/page_payment_codeAEON.xml | 4 +++- xml/page_payment_codeAIS.xml | 4 +++- xml/page_payment_codeDtac.xml | 4 +++- xml/page_payment_codeGLX.xml | 4 +++- xml/page_payment_codeGrab.xml | 4 +++- xml/page_payment_codeInfinyx.xml | 4 +++- xml/page_payment_codeKBANK.xml | 4 +++- xml/page_payment_codeLH.xml | 4 +++- xml/page_payment_codeLotus.xml | 4 +++- xml/page_payment_codeMCard.xml | 4 +++- xml/page_payment_codeRabbit.xml | 4 +++- xml/page_payment_codeSCG.xml | 4 +++- xml/page_payment_codeThe1.xml | 4 +++- xml/page_payment_codeTrue.xml | 4 +++- xml/page_payment_credit2.xml | 4 +++- xml/page_payment_credit3-0.xml | 4 +++- xml/page_payment_credit3-TopupSuccess.xml | 4 +++- xml/page_payment_credit3.xml | 4 +++- xml/page_payment_storeCredit3.xml | 4 +++- xml/page_thankyouConti.xml | 4 +++- 22 files changed, 78 insertions(+), 26 deletions(-) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index a84f65e9..295cc86e 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -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 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 424ebcd1..a399e200 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -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 diff --git a/xml/page_payment_codeAEON.xml b/xml/page_payment_codeAEON.xml index 0fe541c9..ef61b504 100644 --- a/xml/page_payment_codeAEON.xml +++ b/xml/page_payment_codeAEON.xml @@ -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 diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml index 60f05005..36c0ac9c 100644 --- a/xml/page_payment_codeAIS.xml +++ b/xml/page_payment_codeAIS.xml @@ -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 diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index 5ed75e46..eeaf87af 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -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 diff --git a/xml/page_payment_codeGLX.xml b/xml/page_payment_codeGLX.xml index 02009a0a..6d68ec26 100644 --- a/xml/page_payment_codeGLX.xml +++ b/xml/page_payment_codeGLX.xml @@ -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 diff --git a/xml/page_payment_codeGrab.xml b/xml/page_payment_codeGrab.xml index 9ff293ef..c846b76d 100644 --- a/xml/page_payment_codeGrab.xml +++ b/xml/page_payment_codeGrab.xml @@ -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 diff --git a/xml/page_payment_codeInfinyx.xml b/xml/page_payment_codeInfinyx.xml index df4fb50f..069a84ba 100644 --- a/xml/page_payment_codeInfinyx.xml +++ b/xml/page_payment_codeInfinyx.xml @@ -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 diff --git a/xml/page_payment_codeKBANK.xml b/xml/page_payment_codeKBANK.xml index 043e5aa9..20625d7c 100644 --- a/xml/page_payment_codeKBANK.xml +++ b/xml/page_payment_codeKBANK.xml @@ -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 diff --git a/xml/page_payment_codeLH.xml b/xml/page_payment_codeLH.xml index fde0dcb9..5870772e 100644 --- a/xml/page_payment_codeLH.xml +++ b/xml/page_payment_codeLH.xml @@ -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 diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml index c66e1277..a9ec0f41 100644 --- a/xml/page_payment_codeLotus.xml +++ b/xml/page_payment_codeLotus.xml @@ -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 diff --git a/xml/page_payment_codeMCard.xml b/xml/page_payment_codeMCard.xml index 512e3969..88a31533 100644 --- a/xml/page_payment_codeMCard.xml +++ b/xml/page_payment_codeMCard.xml @@ -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 diff --git a/xml/page_payment_codeRabbit.xml b/xml/page_payment_codeRabbit.xml index 3bc4bc60..62c94a00 100644 --- a/xml/page_payment_codeRabbit.xml +++ b/xml/page_payment_codeRabbit.xml @@ -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 diff --git a/xml/page_payment_codeSCG.xml b/xml/page_payment_codeSCG.xml index bd87bce4..1f999790 100644 --- a/xml/page_payment_codeSCG.xml +++ b/xml/page_payment_codeSCG.xml @@ -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 diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index 0dafd672..e3dc3cdf 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -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 diff --git a/xml/page_payment_codeTrue.xml b/xml/page_payment_codeTrue.xml index 65dac302..b8ee484b 100644 --- a/xml/page_payment_codeTrue.xml +++ b/xml/page_payment_codeTrue.xml @@ -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 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 05673538..1e609d41 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -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 diff --git a/xml/page_payment_credit3-0.xml b/xml/page_payment_credit3-0.xml index 57f6bfe4..f1fdb595 100644 --- a/xml/page_payment_credit3-0.xml +++ b/xml/page_payment_credit3-0.xml @@ -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 diff --git a/xml/page_payment_credit3-TopupSuccess.xml b/xml/page_payment_credit3-TopupSuccess.xml index 1d3854ec..0751aa1e 100644 --- a/xml/page_payment_credit3-TopupSuccess.xml +++ b/xml/page_payment_credit3-TopupSuccess.xml @@ -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 diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index 6afdba84..2d13020f 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -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 = "" diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index b7a7be1f..edd7bc66 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -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 diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index e9f11a88..a31fcc66 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -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