From 94fc611168617feadf7ad8d2b4f4fdfc928c370f Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Wed, 7 Jun 2023 18:20:35 +0530
Subject: [PATCH] dashboard:susee

---
 app/Controllers/Member_controller.php |  7 +++--
 app/Views/cart.php                    |  7 ++++-
 app/Views/memberaccess.php            | 39 ++++++++++++++++++---------
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 8924d7a..8f9e918 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -569,9 +569,11 @@ class Member_controller extends BaseController
 
 	public function member_dashboard()
 	{
-		$creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('created_at' , 'DESC')->findAll();
+		$creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('id' , 'ASC')->findAll();
 		$data['credit_data'] = [];
 		$data['avaiable_credit'] = 0;
+		// $data['no_of_credits'];
+		// $data['expiry_date'];
 		$data['profile'] = $this->MemberModel->where('id',$this->session->get('logged_user'))->find();
 	    foreach ($creditsData as $creditsDataindex => $creditsDataValue) 
 		{
@@ -595,7 +597,8 @@ class Member_controller extends BaseController
 												->selectCount('package_name', 'pack_count')
 												->groupBy('package_name')
 			                                    ->where('order_id',$TransactionDatavalue['order_id'])
-											    ->where('is_active',1)->findAll();
+											    ->where('is_active',1)
+												->findAll();
 			$TransactionDatavalue['credit_data'] = $credit_data;
 			array_push($data['TransactionData'] ,$TransactionDatavalue);
 		}
diff --git a/app/Views/cart.php b/app/Views/cart.php
index 4f8a945..1210d18 100644
--- a/app/Views/cart.php
+++ b/app/Views/cart.php
@@ -128,7 +128,12 @@
         <?php } ?>
            <!-- Product Sub total-->
            <div class="row pt-4 pb-4">
-                <div class="col-3 pb-4">
+           <?php if (!isset($msg)) { 
+                echo '<div class="col-3 pb-4">';
+           } 
+           else {
+                echo '<div class="col-12 pb-4 text-center">';
+           } ?>
                         <form class="coupon-field">
                             
                             <a href="<?= base_url('/continue_shopping/').md5($token); ?>"  class="shopping-btn">Continue Shopping</a>
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 14365d1..07968e9 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -88,17 +88,24 @@
                         <th>Credit Transactions</th>
                         <th>Available Credits</th>
                     </tr>
-                    <?php foreach ($credit_data as $key => $value) { ?>
+                    <?php for( $i = count($credit_data) - 1; $i >= 0 ; $i--) { ?>
                        <tr>
-                       <td><?= $value['created_at'] ?></td>
-                       <td><p>Credit Expiry</p><p>Expiry Date:<?= $value['expiring_date'] ?></p></td>
+                       <td><?php $date = new DateTime($credit_data[$i]['created_at']);    echo $date->format('d-M-Y');  ?></td>
+                       <td>
                        <?php 
-                       if($value['running_balance'] > 0) 
-                       echo '<td><i class="fa fa-caret-up" aria-hidden="true">'.$value['running_balance'].'</i> </td>';
+                       if($credit_data[$i]['expiring_date'] <  date('m-d-Y', time())) 
+                       echo '<p>Credit Expiry</p>';
                        else
-                       echo '<td class="red-content"><i class="fa fa-sort-desc" aria-hidden="true">'.$value['used_points'].'</i> </td>';
+                       echo '<p>'.$credit_data[$i]['package_name'].'</p>';
                        ?>
-                       <td><i class="fa" aria-hidden="true"><?= $value['avaiable_credit'] ?></i> </td>
+                        <p>Expiry Date:<?= $credit_data[$i]['expiring_date'] ?></p></td>
+                       <?php 
+                       if($credit_data[$i]['running_balance'] > 0) 
+                       echo '<td><i class="fa fa-caret-up" aria-hidden="true">'.$credit_data[$i]['running_balance'].'</i> </td>';
+                       else
+                       echo '<td class="red-content"><i class="fa fa-sort-desc" aria-hidden="true">'.$credit_data[$i]['used_points'].'</i> </td>';
+                       ?>
+                       <td><i class="fa" aria-hidden="true"><?= $credit_data[$i]['avaiable_credit'] ?></i> </td>
                    </tr>
                     <?php } ?>
                 </table>
@@ -107,12 +114,16 @@
                         <div class="col-lg-4">
                             <div>Upcoming Credit Expiry:</div>
                         </div>
-                        <div class="col-lg-4">
-                            <div>No of Credit: <span>20</span></div>
-                        </div>
-                        <div class="col-lg-4">
-                            <div>Expiry Date: <span>12-12-2026</span></div>
-                        </div>
+                    <?php foreach ($credit_data as $key => $value) { 
+                        if($value['running_balance'] != 0) { ?>
+                            <div class="col-lg-4">
+                            <div>No of Credit: <span><?= $value['running_balance'] ?></span></div>
+                            </div>
+                            <div class="col-lg-4">
+                            <div>Expiry Date: <span><?= $value['expiring_date'] ?></span></div>
+                            </div>
+                        <?php } 
+                    break; } ?>
                 </div>
             </div>
         </div>
@@ -316,6 +327,8 @@ $(document).ready(function(){
     $("."+id+"").slideToggle();
   });
 });
+
+
 </script> 
 </body>
 </html>    
\ No newline at end of file