From 44aa7953e479a763632d15174842b0a473521a91 Mon Sep 17 00:00:00 2001 From: sriramv Date: Sat, 24 Jun 2023 14:43:47 +0530 Subject: [PATCH] gwm --- app/Controllers/PaymentController.php | 9 ++------- public/square-js/sq-card-pay.js | 8 +++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php index d0d9d1e..bb5641d 100644 --- a/app/Controllers/PaymentController.php +++ b/app/Controllers/PaymentController.php @@ -291,13 +291,8 @@ class PaymentController extends BaseController $data['country'] = $this->CountryModel->findAll(); - $data['userdata'] = $this->MemberModel->select('member.* , zipcode.code as zipcode') - - ->join('zipcode', 'member.pincode = zipcode.id', 'left') - - ->where('member.id', session()->get('logged_user')) - - ->find(); + $data['userdata'] = $this->MemberModel->where('id', session()->get('logged_user'))->find(); + $if_trans_exist = $this->TransactionModel->where('member_id', session()->get('logged_user')) diff --git a/public/square-js/sq-card-pay.js b/public/square-js/sq-card-pay.js index 0c4ece5..ad405f9 100644 --- a/public/square-js/sq-card-pay.js +++ b/public/square-js/sq-card-pay.js @@ -1,4 +1,5 @@ async function CardPay(fieldEl, buttonEl) { + // Create a card payment object and attach to page const card = await window.payments.card({ style: { @@ -13,13 +14,18 @@ async function CardPay(fieldEl, buttonEl) { await card.attach(fieldEl); async function eventHandler(event) { + // Clear any existing messages window.paymentFlowMessageEl.innerText = ''; + + try { + const result = await card.tokenize(); + if (result.status === 'OK') { - $('#loading-spinner-overlay').css('visibility', 'visible'); + $('#loading-spinner-overlay').css('visibility', 'visible'); // Use global method from sq-payment-flow.js window.createPayment(result.token); }