From cf8c2131bdb54a495d98d6fad69cf7c95aad8ad3 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sat, 19 Feb 2022 10:08:54 -0500
Subject: [PATCH] www

---
 www/application/controllers/Member.php        |   2 +
 www/application/controllers/Refer.php         |   2 +-
 .../internal/template/view_securehead.php     |   4 +-
 www/application/views/users/view_payment.php  | 110 +++++++++++++++---
 www/application/views/users/view_refer.php    |   2 +-
 5 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php
index 1510748e..e2310407 100644
--- a/www/application/controllers/Member.php
+++ b/www/application/controllers/Member.php
@@ -1020,9 +1020,11 @@ class Member extends Users_Controller {
 
         $this->table->set_heading(array('data' => 'Date', 'style' => 'width:110px'), 'Description', array('data' => 'Amount', 'style' => 'width:100px'), array('data' => 'Fee', 'style' => 'width:70px'), array('data' => 'Confirmation', 'style' => 'width:100px'));
         $data['payment_result'] = $this->table->generate($query);
+        $data['payment_data_result'] = $query->result();
         $data["links"] = $this->pagination->create_links();
 
         // $this->load->view('users/view_header_user', $data);
+        $data['page_title'] ="Payments Report";
         $this->RenderUserPage('users/view_payment', $data);
         //  $this->load->view('users/view_footer_user', $data);
     }
diff --git a/www/application/controllers/Refer.php b/www/application/controllers/Refer.php
index 72f1e0c3..d97f270b 100644
--- a/www/application/controllers/Refer.php
+++ b/www/application/controllers/Refer.php
@@ -95,7 +95,7 @@ class Refer extends Users_Controller {
         $this->table->set_heading(array('data' => 'Added/Name', 'style' => 'width:170px'), 'Email', array('data' => 'Status', 'style' => 'width:80px'));
 
         $data['refer_table'] = $this->table->generate($query);
-
+        $data['refer_table_result'] =$query->result();
         
         $data['page_title'] ="Refer a Friend";
        /*
diff --git a/www/application/views/site3/internal/template/view_securehead.php b/www/application/views/site3/internal/template/view_securehead.php
index 64449dfe..c280214e 100644
--- a/www/application/views/site3/internal/template/view_securehead.php
+++ b/www/application/views/site3/internal/template/view_securehead.php
@@ -129,7 +129,7 @@ $server_name = 'https://'. $_SERVER['HTTP_HOST'];
 											<!--begin::Menu item-->
 											<div class="menu-item px-5" data-kt-menu-trigger="hover" data-kt-menu-placement="right-start">
 												<a href="#" class="menu-link px-5">
-													<span class="menu-title">My Subscription</span>
+													<span class="menu-title">Reports</span>
 													<span class="menu-arrow"></span>
 												</a>
 												<!--begin::Menu sub-->
@@ -146,7 +146,7 @@ $server_name = 'https://'. $_SERVER['HTTP_HOST'];
 													<!--end::Menu item-->
 													<!--begin::Menu item-->
 													<div class="menu-item px-3">
-														<a href="#" class="menu-link px-5">Payments</a>
+														<a href="/member/payments" class="menu-link px-5">Payments</a>
 													</div>
 													<!--end::Menu item-->
 													<!--begin::Menu item-->
diff --git a/www/application/views/users/view_payment.php b/www/application/views/users/view_payment.php
index 946fd11f..0796e630 100644
--- a/www/application/views/users/view_payment.php
+++ b/www/application/views/users/view_payment.php
@@ -1,16 +1,96 @@
-<div class="content-wrapper">
-    <?php include('common/userstrip.php'); ?>
-  
-    <div class="panel panel-flat" style='height: 550px;'>
-        <div class="panel-heading">
-            <h5 class="panel-title">Payments</h5>             
-        </div>
-        <div class="panel-heading">
-            <?php echo $payment_result; ?>
-        </div>
-        <div class="panel-heading">
-            <?php echo $links; ?>
-        </div>
-    </div>
-</div>
+<?php include('common/userstrip.php'); ?>
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <!--begin::Col-->
+    <div class="col-xl-12">
+        <!--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">Payments</span>
+                </h3>
+                <div class="card-toolbar">
+                    <ul class="nav">
+                        <?php echo $links; ?>
+                    </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>
+                                    <th class="p-0 min-w-150px">Description</th>
+                                    <th class="p-0 min-w-140px">Amount</th>
+                                    <th class="p-0 min-w-140px">Fee</th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+
+//var_dump($payment_data_result);
+
+                                foreach ($payment_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->description?></a>
+                                            <span class="text-muted fw-bold d-block fs-7"><?=$row->confirmation?></span>
+                                        </td>
+                                        <td class="text-start">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->amount?></span>
+                                        </td>
+                                        <td class="text-start">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->fee?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <span class="badge badge-light-success fs-7 fw-bolder">Completed</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
+                                }
+                                ?>
+
+
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 7-->
+    </div>
+    <!--end::Col-->
+
+</div>
+<!--end::Row-->
+
+
 
diff --git a/www/application/views/users/view_refer.php b/www/application/views/users/view_refer.php
index 05399839..16030aec 100644
--- a/www/application/views/users/view_refer.php
+++ b/www/application/views/users/view_refer.php
@@ -10,7 +10,7 @@
             <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">Send Referrer</span>
-                    
+
                 </h3>
                 <div class="card-toolbar">