From 8c2c0e56a1747796a5d2535ce2e984202b578a9c Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sat, 4 Jun 2022 22:20:25 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Member.php       |   7 +-
 www/application/models/Report_model.php      |  12 ++
 www/application/views/users/view_balance.php | 137 +++++++++----------
 3 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php
index 866d8402..acad6dbd 100644
--- a/www/application/controllers/Member.php
+++ b/www/application/controllers/Member.php
@@ -662,10 +662,6 @@ class Member extends Users_Controller {
     public function balance() {
 
         $data = $this->getSessionArray();
-        
-        
-
-        
         $data['add_error'] = '';
         $data['amount'] = 0;
         $this->load->model('combo_model');
@@ -692,8 +688,9 @@ class Member extends Users_Controller {
         $this->table->set_heading('Date', 'Amount','Fee','Recipient','Confirmation', 'Status');
         $data['sendmoney_table'] = $this->table->generate($query);
         $data['sendmoney_table_result'] = $query->result();
-
         $data['card_payment_data_result'] = $this->report_model->getCardPurchase(6)['card_payment_data_result'];
+        $data['card_coupon_data_result'] = $this->report_model->getRedeemCouponsList(6)['card_coupon_data_result'];
+
         $data['wallet'] = $this->account_model->getUserWallet( $_SESSION['member_id']);
 
 
diff --git a/www/application/models/Report_model.php b/www/application/models/Report_model.php
index 71d61425..95afd5e2 100644
--- a/www/application/models/Report_model.php
+++ b/www/application/models/Report_model.php
@@ -21,4 +21,16 @@ class Report_model extends CI_Model {
     return $data;
     }
 
+    public function getRedeemCouponsList($limit){
+        $data = array();
+        $mysql = "SELECT id,code,amount,active::date ,added::date 
+                  FROM coupons_allocation 
+                  WHERE member_id =" . $_SESSION['member_id'] . " AND 
+                  active IS NOT NULL ORDER BY active DESC LIMIT ". $limit;
+
+        $query = $this->db->query($mysql);
+        $data['card_coupon_data_result'] = $query->result();
+        return $data;
+    }
+
 }
diff --git a/www/application/views/users/view_balance.php b/www/application/views/users/view_balance.php
index 7196a2dd..51fbcaef 100644
--- a/www/application/views/users/view_balance.php
+++ b/www/application/views/users/view_balance.php
@@ -15,13 +15,9 @@ function getAddWithdrawButtons(){
 }
 
 ?>
-<!--begin::Row-->
 <div class="row g-5 g-xl-8">
-    <!--begin::Col-->
     <div class="col-xl-6">
-        <!--begin::Table Widget 7-->
         <div class="card card-xl-stretch mb-xl-8">
-            <!--begin::Header-->
             <div class="card-header border-0 pt-5">
                 <h3 class="card-title align-items-start flex-column">
                     <span class="card-label fw-bolder fs-3 mb-1">Wallet</span>
@@ -32,17 +28,11 @@ function getAddWithdrawButtons(){
                     </ul>
                 </div>
             </div>
-            <!--end::Header-->
-            <!--begin::Body-->
             <div class="card-body py-3">
                 <div class="tab-content">
-                    <!--begin::Tap pane-->
                     <div class="tab-pane fade show active" id="kt_table_widget_7_tab_1">
-                        <!--begin::Table container-->
                         <div class="table-responsive">
-                            <!--begin::Table-->
                             <table class="table align-middle gs-0 gy-3">
-                                <!--begin::Table head-->
                                 <thead>
                                 <tr>
                                     <th class="p-0 min-w-50px">Currency</th>
@@ -51,8 +41,6 @@ function getAddWithdrawButtons(){
                                     <th class="p-0 min-w-50px"></th>
                                 </tr>
                                 </thead>
-                                <!--end::Table head-->
-                                <!--begin::Table body-->
                                 <tbody>
                                 <?php
                                 foreach ($wallet as $wlt){
@@ -76,18 +64,14 @@ function getAddWithdrawButtons(){
                                                     break;
 
                                                 case "AC_AD_FD_ONLY":
-                                                    echo "<a href=\"/paymnt/paymus\" type=\"submit\" class=\"btn btn-sm btn-secondary btn-xs btn-block\">Depost Fund</a>";
+                                                    echo "<a href=\"/paymnt/paymus\" type=\"submit\" class='btn btn-sm btn-warning btn-xs btn-block'>Top Up</a>";
                                                     break;
-
                                             }
-
                                             ?>
-
                                         </td>
                                     </tr>
                                     <?php
                                 }
-
                                 if ( isset($_SESSION['wallet']) && $_SESSION['wallet'] == true){
                                     ?>
                                     <tr style="background-color: aliceblue;">
@@ -108,28 +92,17 @@ function getAddWithdrawButtons(){
                                 <?php
                                 }
                                 ?>
-
-
-
                                 </tbody>
-                                <!--end::Table body-->
                             </table>
                         </div>
-                        <!--end::Table-->
                     </div>
-                    <!--end::Tap pane-->
                 </div>
             </div>
-            <!--end::Body-->
         </div>
-        <!--end::Tables Widget 7-->
     </div>
-    <!--end::Col-->
-    <!--begin::Col-->
+
     <div class="col-xl-6">
-        <!--begin::Table Widget 8-->
         <div class="card card-xl-stretch mb-5 mb-xl-8">
-            <!--begin::Header-->
             <div class="card-header border-0 pt-5">
                 <h3 class="card-title align-items-start flex-column">
                     <span class="card-label fw-bolder fs-3 mb-1">Recent Activities</span>
@@ -139,8 +112,6 @@ function getAddWithdrawButtons(){
 
                 </div>
             </div>
-            <!--end::Header-->
-            <!--begin::Body-->
             <div class="card-body py-3">
                 <div class="tab-content">
                     <!--begin::Tap pane-->
@@ -159,11 +130,8 @@ function getAddWithdrawButtons(){
                                     <th class="p-0 w-100px">Conf/Status</th>
                                 </tr>
                                 </thead>
-                                <!--end::Table head-->
-                                <!--begin::Table body-->
                                 <tbody>
                                 <?php
-                                //var_dump($sendmoney_table_result);
                                 foreach( $sendmoney_table_result as $row){
                                     ?>
                                     <tr>
@@ -193,32 +161,17 @@ function getAddWithdrawButtons(){
 
 
                                 </tbody>
-                                <!--end::Table body-->
                             </table>
-
-
                         </div>
-                        <!--end::Table-->
                     </div>
-                    <!--end::Tap pane-->
-                  
                 </div>
             </div>
-            <!--end::Body-->
         </div>
-        <!--end::Tables Widget 8-->
     </div>
-    <!--end::Col-->
 </div>
-<!--end::Row-->
-
-<!--begin::Row-->
 <div class="row g-5 g-xl-8">
-    <!--begin::Col-->
     <div class="col-xl-6">
-        <!--begin::Table Widget 7-->
         <div class="card card-xl-stretch mb-xl-8">
-            <!--begin::Header-->
             <div class="card-header border-0 pt-5">
                 <h3 class="card-title align-items-start flex-column">
                     <span class="card-label fw-bolder fs-3 mb-1">Purchases</span>
@@ -230,17 +183,11 @@ function getAddWithdrawButtons(){
                     </ul>
                 </div>
             </div>
-            <!--end::Header-->
-            <!--begin::Body-->
             <div class="card-body py-3">
                 <div class="tab-content">
-                    <!--begin::Tap pane-->
                     <div class="tab-pane fade show active" id="kt_table_widget_7_tab_1">
-                        <!--begin::Table container-->
                         <div class="table-responsive">
-                            <!--begin::Table-->
                             <table class="table align-middle gs-0 gy-3">
-                                <!--begin::Table head-->
                                 <thead>
                                 <tr>
                                     <th class="p-0 w-100px">Date</th>
@@ -250,13 +197,8 @@ function getAddWithdrawButtons(){
                                     <th class="p-0 w-80px"></th>
                                 </tr>
                                 </thead>
-                                <!--end::Table head-->
-                                <!--begin::Table body-->
                                 <tbody>
                                 <?php
-
-                                //var_dump($payment_data_result);
-
                                 foreach ($card_payment_data_result as $row)
                                 {
                                     ?>
@@ -284,32 +226,77 @@ function getAddWithdrawButtons(){
                                     <?php
                                 }
                                 ?>
-
-
-                                <!--end::Table body-->
                             </table>
                         </div>
-                        <!--end::Table-->
                     </div>
-                    <!--end::Tap pane-->
                 </div>
             </div>
-            <!--end::Body-->
         </div>
-        <!--end::Tables Widget 7-->
     </div>
-    <!--end::Col-->
-    <!--begin::Col-->
+
     <div class="col-xl-6">
-        <!--begin::Table Widget 8-->
-        <div class="card card-xl-stretch mb-5 mb-xl-8">
-          
+        <div class="card card-xl-stretch mb-xl-8">
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Coupons</span>
+                    <span class="text-muted mt-1 fw-bold fs-7"></span>
+                </h3>
+                <div class="card-toolbar">
+                    <ul class="nav">
+
+                    </ul>
+                </div>
+            </div>
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <div class="tab-pane fade show active" id="kt_table_widget_7_tab_1">
+                        <div class="table-responsive">
+                            <table class="table align-middle gs-0 gy-3">
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-100px">Date</th>
+                                    <th class="p-0 min-w-150px">Description</th>
+                                    <th class="p-0 w-120px">Amount</th>
+                                    <th class="p-0 w-100px">Active</th>
+                                    <th class="p-0 w-80px"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <?php
+                                foreach ($card_coupon_data_result as $row)
+                                {
+                                    ?>
+                                    <tr>
+                                        <td>
+                                            <?=$row->added?>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->code?> </a>
+                                        </td>
+                                        <td class="text-start">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->amount*0.01?></span>
+                                        </td>
+                                        <td class="text-start">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->active?></span>
+                                        </td>
+
+                                        <td class="text-end">
+                                            <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <i class="bi bi-three-dots fs-5"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <?php
+                                }
+                                ?>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
-        <!--end::Tables Widget 8-->
     </div>
-    <!--end::Col-->
 </div>
-<!--end::Row-->