From 196cf251a3e87f4a40819f1baee4a7299b3e2ba0 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Thu, 8 Jun 2023 17:42:17 +0530
Subject: [PATCH] gwm

---
 app/Controllers/Member_controller.php | 10 ++++++++--
 app/Controllers/PaymentController.php |  6 ++++--
 app/Views/cart.php                    | 12 ++++++------
 app/Views/checkout.php                |  3 ++-
 app/Views/memberaccess.php            |  4 ++--
 app/Views/payment.php                 | 14 +++++++-------
 app/Views/payment_failed.php          | 12 ++++++------
 7 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 12c9bd1..e54dd42 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -596,8 +596,14 @@ class Member_controller extends BaseController
 		}
 		$creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('id' , 'ASC')->findAll();
 		$recent_expiry = $this->creditsModel->select('expiring_date')->selectSum('running_balance', 'no_of_credits')->groupBy('expiring_date')->orderBy('expiring_date', 'asc')->where('member_id',$this->session->get('logged_user'))->where('is_active',1)->first();
-		$data['no_of_credits'] = $recent_expiry['no_of_credits'];
-		$data['expiring_date'] = $recent_expiry['expiring_date'];
+		if($recent_expiry){
+			$data['no_of_credits'] = $recent_expiry['no_of_credits'];
+			$data['expiring_date'] = $recent_expiry['expiring_date'];
+		}else{
+			$data['no_of_credits'] = '';
+			$data['expiring_date'] = '';
+		}
+		
 		
 		$data['credit_data'] = [];
 		$data['avaiable_credit'] = 0;
diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index 6edf58b..5ce3836 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -146,8 +146,10 @@ class PaymentController extends BaseController
                 $data['gst'] = $gst;
                 $data['pst'] = $pst;
                 $data['packageArray'] = $packageArray;
-                $data['userdata'] = $this->MemberModel->where('id',session()->get('logged_user'))->find();
-
+                $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();
                 $if_trans_exist = $this->TransactionModel->where('member_id', session()->get('logged_user'))
                                                          ->where('order_id', $orderId )->find();
                 if($if_trans_exist){ 
diff --git a/app/Views/cart.php b/app/Views/cart.php
index 1210d18..d81fc57 100644
--- a/app/Views/cart.php
+++ b/app/Views/cart.php
@@ -95,9 +95,9 @@
                             <div class="col-lg-6">
                                 <div class="subtotal-label">Taxes</div>
                             </div>
-                            <div class="col-lg-3"></div>
-                            <div class="col-lg-1 text-end">
-                                <div class="taxes pst-label">PST(7%)</div>                            
+                            <div class="col-lg-2"></div>
+                            <div class="col-lg-2 text-end">
+                                <div class="taxes pst-label">PST (7%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
                                <input id="pst" value="<?= $pst[0]['value'] ?>" type="hidden">
@@ -105,9 +105,9 @@
                             </div>
                             <div class="col-lg-6">                               
                             </div>
-                            <div class="col-lg-3"></div>
-                            <div class="col-lg-1 text-end">
-                                <div class="taxes gst-label">GST(5%)</div>                            
+                            <div class="col-lg-2"></div>
+                            <div class="col-lg-2 text-end">
+                                <div class="taxes gst-label">GST (5%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
                                 <input id="gst" value="<?= $gst[0]['value'] ?>" type="hidden">
diff --git a/app/Views/checkout.php b/app/Views/checkout.php
index 7b60ef1..9641eaf 100644
--- a/app/Views/checkout.php
+++ b/app/Views/checkout.php
@@ -148,6 +148,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
                             <div class="col-lg-4 mb-3">
                                 <label for="zipcode">Zip Code</label>
                                 <select name="pincode" id="pincode">
+                                <option value="<?= $userdata[0]['pincode']; ?>"><?= $userdata[0]['zipcode']; ?></option>
                                 <?= $zipcode ?>
                                 </select>
                             </div>                     
@@ -191,7 +192,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
                          <input type="hidden" value="" name="address_id" id="address_id">
                         <div id="card-container"></div>
                         <span id="payment-flow-message"></span>
-                        <button id="card-button" type="button">Proceed to Pay</button>
+                       <div class="text-end" style="margin-top:-45px;"> <button id="card-button" type="button">Proceed to Pay</button></div>
                     </div>
                     </div>
                 </div>
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index aae73ac..8f7fdb8 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -146,13 +146,13 @@
                                           <td></td>
                                           <td class="down-icon" id="<?= $key."_table-grey" ?>"><i class="fa fa-caret-down" aria-hidden="true"></i></td>
                                       </tr>
-                                      <tr class="table-grey <?= $key."_table-grey" ?>">
+                                      <!-- <tr class="table-grey <?= $key."_table-grey" ?>">
                                           <td><?= $value['order_id'] ?></td>
                                           <td><?php $date = new DateTime($value['created_at']);    echo $date->format('M-d-Y'); ?></td>
                                           <td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
                                           <td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> - </td>
                                           <td></td>
-                                      </tr>
+                                      </tr> -->
                                       <tr class="table-grey <?= $key."_table-grey" ?>">
                                           <td>Items</td>
                                           <td>Description</td>
diff --git a/app/Views/payment.php b/app/Views/payment.php
index cdafc3f..3675934 100644
--- a/app/Views/payment.php
+++ b/app/Views/payment.php
@@ -94,18 +94,18 @@
                             <div class="col-lg-6">
                                 <div class="taxes label">Taxes</div>
                             </div>
-                            <div class="col-lg-3"></div>
-                            <div class="col-lg-1 text-end">
-                                <div class="taxes pst label">PST(<?= $pst; ?>%)</div>                            
+                            <div class="col-lg-2"></div>
+                            <div class="col-lg-2 text-end">
+                                <div class="taxes pst label">PST (<?= $pst; ?>%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
                                <div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>                            
                             </div>
                             <div class="col-lg-6">                               
                             </div>
-                            <div class="col-lg-3"></div>
-                            <div class="col-lg-1 text-end">
-                                <div class="taxes gst label">GST(<?= $gst; ?>%)</div>                            
+                            <div class="col-lg-2"></div>
+                            <div class="col-lg-2 text-end">
+                                <div class="taxes gst label">GST (<?= $gst; ?>%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
                                <div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>                            
@@ -125,7 +125,7 @@
                     <div class="row dashboard">
                         <div class="col-lg-4"></div>
                         <div class="col-lg-4">
-                            <a href="<?= base_url('member_home'); ?>">Return to Dashboard</a>
+                            <a href="<?= base_url('member_home'); ?>" class="custom-btn">Return to Dashboard</a>
                         </div>
                         <div class="col-lg-4"></div>
                     </div>                        
diff --git a/app/Views/payment_failed.php b/app/Views/payment_failed.php
index 5799789..d23c910 100644
--- a/app/Views/payment_failed.php
+++ b/app/Views/payment_failed.php
@@ -26,13 +26,13 @@
             <div class="col-lg-2"></div>
             <div class="col-lg-8">
                 <div class="payment-box">
-                    <div class="row payment-head">
+                    <div class="row payment-head alert">
                         <div class="col-lg-12">
                             <div>
                                 <img src="<?= base_url()."/public"; ?>/assets/member_images/Group_122.png" alt="" width="60" height="60"/>
                                 <h1 style="color: red">Payment Failed!</h1>
                                 <!-- <p>The order confirmation has been sent to your registered mail id</p> -->
-                                    <a href="<?= base_url('payment'); ?>">Retry with other payment options</a>
+                                   
                             </div>
                         </div>
                     </div>
@@ -58,12 +58,12 @@
 
 
                     
-                    <div class="row dashboard">
-                        <div class="col-lg-4"></div>
+                    <div class="row dashboard mt-2">
+                        <div class="col-lg-8"> <a href="<?= base_url('payment'); ?>" class="custom-btn">Retry payment</a></div>
                         <div class="col-lg-4">
-                            <a href="<?= base_url('member_home'); ?>">Return to Dashboard</a>
+                            <a href="<?= base_url('member_home'); ?>" class="custom-btn secondary-btn">Return to Dashboard</a>
                         </div>
-                        <div class="col-lg-4"></div>
+                       
                     </div>                        
                 </div>
             </div>