Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend

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'))
 

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);
       }