From f73bf2013f4c992f070528c7a646c19a4a0c8b17 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 8 Mar 2024 16:36:04 +0530
Subject: [PATCH] dashboard alignment fixes  : ps

---
 app/Views/dashboard.php       | 561 +++++++++++++++++-----------------
 app/Views/template/topbar.php |   2 +-
 2 files changed, 274 insertions(+), 289 deletions(-)

diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index b3150fe2..4b18df08 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -1,278 +1,270 @@
-    <?php if ($business_id == 2 && $loggedin_person_role !== 'manager') : ?>
-    
-        <div class="row">
-        <div class="col-xl-4 col-md-6">
-                                <div class="card">
-                                    <div class="card-body">
-                                        <div class="dropdown float-right">
-                                            <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
-                                                <i class="mdi mdi-dots-horizontal"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right">
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Another action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Something else</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
-                                            </div>
-                                        </div>
+<?php if ($business_id == 2 && $loggedin_person_role !== 'manager') : ?>
 
-                                        <h4 class="header-title mt-0">Sales</h4>
-
-                                        <div class="mt-3">
-                                            <div class="media">
-                                                <div dir="ltr">
-                                                <h3 class="mt-0 mb-1"><span data-plugin="counterup"><?= $invoice['today']['count']; ?></span></h3>
-                                                <p class="text-muted mb-0">Books</p>
-                                                    <!-- <input data-plugin="knob" data-width="64" data-height="64" data-fgColor="#675db7"
-                                                        data-bgColor="#e8e7f4" value=""
-                                                        data-skin="tron" data-angleOffset="" data-readOnly=true
-                                                        data-thickness=".15"    style="font: bold 18px Arial;"/> -->
-                                                </div>
-                                                <div class="media-body text-right align-self-center">
-                                                    <h3 class="mt-0 mb-1">₹<?= $invoice['today']['total_amount']; ?></h3>
-                                                    <p class="text-muted mb-0">Today sale</p>
-                                                </div>
-                                                
-                                            </div>
-                                            <br>
-                                            <div class="text-success">
-                                <span class="float-left"> MTD : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $invoice['month']['count']; ?></span>-₹<?= $invoice['month']['total_amount']; ?></span>
-                                <span class="float-right"> YTD : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $invoice['year']['count']; ?></span>-₹<?= $invoice['year']['total_amount']; ?></span>
-                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div><!-- end col -->
-                            
-       
-                        
-      
-            <?php if (!empty($active_schemes) && isset($active_schemes[0])) : ?>
-                <div class="col-xl-4 col-md-6">
-                                <div class="card">
-                                    <div class="card-body">
-                                    <?php $firstScheme = $active_schemes[0]; ?>
-                                        <div class="dropdown float-right">
-                                            <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
-                                                <i class="mdi mdi-dots-horizontal"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right">
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Another action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Something else</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
-                                            </div>
-                                        </div>
-
-                                        <h4 class="header-title mt-0"><?= $firstScheme['short_code']; ?></h4>
-
-                                        <div class="mt-3">
-                                            <div class="media">
-                                                <div dir="ltr">
-                                                <!-- <h3 class="my-2 py-1"><span data-plugin="counterup"><?= $firstScheme['activeoverall']; ?></span></h3> -->
-                                                    <!-- <input data-plugin="knob" data-width="64" data-height="64" data-fgColor="#675db7"
-                                                        data-bgColor="#e8e7f4" value=""
-                                                        data-skin="tron" data-angleOffset="" data-readOnly=true
-                                                        data-thickness=".15"    style="font: bold 18px Arial;"/> -->
-                                                </div>
-                                                <div class="media-body text-center align-self-center">
-                                                    <h3 class="mt-0 mb-1"><?= $firstScheme['activeoverall']; ?></h3>
-                                                    <p class="text-muted mb-0">Total Subscriber</p>
-                                                </div>
-                                                
-                                            </div>
-                                            <br>
-                                            <div class="text-success">
-                                <span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
-                                <span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
-                            </div>
-                            <?php endif; ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                
-                            </div><!-- end col -->
-                            
-                            
-             
-                                      
-            
-                              <?php if (!empty($active_schemes) && isset($active_schemes[1])) : ?>
-                <div class="col-xl-4 col-md-6">
-                                <div class="card">
-                                    <div class="card-body">
-                                    <?php $firstScheme = $active_schemes[1]; ?>
-                                        <div class="dropdown float-right">
-                                            <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
-                                                <i class="mdi mdi-dots-horizontal"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right">
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Another action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Something else</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
-                                            </div>
-                                        </div>
-
-                                        <h4 class="header-title mt-0"><?= $firstScheme['short_code']; ?></h4>
-
-                                        <div class="mt-3">
-                                            <div class="media">
-                                                <div dir="ltr">
-                                                    
-                                                </div>
-                                                <div class="media-body text-center align-self-center">
-                                                    <h3 class="mt-0 mb-1"><?= $firstScheme['activeoverall']; ?></h3>
-                                                    <p class="text-muted mb-0">Total Subscriber</p>
-                                                </div>
-                                                
-                                            </div>
-                                            <br>
-                                            <div class="text-success">
-                                <span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
-                                <span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
-                            </div>
-                            <?php endif; ?>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div><!-- end col -->
-                            <?php if (!empty($active_schemes) && isset($active_schemes[9])) : ?>
-    <div class="col-lg-4">
+<div class="row">
+    <div class="col-xl-4 col-md-6">
         <div class="card">
-            <div class="card-body" style="width:119%;">
-                <div class="media">
-                    <?php $firstScheme = $active_schemes[2]; ?>
-                    <div class="avatar-md mr-3">
-                        <div>
-                            <?php if (!empty($firstScheme['wp_img_url'])) { ?>
-                                <img src="<?= $firstScheme['wp_img_url']; ?>" alt="table-user" class="mr-3 rounded avatar-md">
-                            <?php } else { ?>
-                                <div class="avatar-title bg-light rounded text-body font-20 font-weight-semibold">
-                                    <?= $firstScheme['first_letter']; ?>
-                                </div>
-                            <?php } ?>
-                        </div>
-                    </div>
-                    <div class="media-body">
-                        <h5 class="my-1"><a href="javascript:void(0);" class="text-dark"><?= $firstScheme['short_code']; ?></a></h5>
-                        <p class="text-muted mb-0">
-                           
-                        </p>
+            <div class="card-body">
+                <div class="dropdown float-right">
+                    <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
+                        <i class="mdi mdi-dots-horizontal"></i>
+                    </a>
+                    <div class="dropdown-menu dropdown-menu-right">
+                        <!-- item-->
+                        <a href="javascript:void(0);" class="dropdown-item">Action</a>
+                        <!-- item-->
+                        <a href="javascript:void(0);" class="dropdown-item">Another action</a>
+                        <!-- item-->
+                        <a href="javascript:void(0);" class="dropdown-item">Something else</a>
+                        <!-- item-->
+                        <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
                     </div>
                 </div>
-                <hr>
-                <div class="text-muted">
-                    <div class="row">
-                        <div class="col-sm-4 col-6">
-                            <div>
-                                <p class="mb-0">Total Subscribers</p>
-                                <h5 class="mb-sm-0"><?= $firstScheme['activeoverall']; ?></h5>
-                            </div>
+
+                <h4 class="header-title mt-0">Sales</h4>
+
+                <div class="mt-3">
+                    <div class="media">
+                        <div dir="ltr">
+                            <h3 class="mt-0 mb-1"><span data-plugin="counterup"><?= $invoice['today']['count']; ?></span></h3>
+                            <p class="text-muted mb-0">Books</p>
+                            <!-- <input data-plugin="knob" data-width="64" data-height="64" data-fgColor="#675db7"
+                                                data-bgColor="#e8e7f4" value=""
+                                                data-skin="tron" data-angleOffset="" data-readOnly=true
+                                                data-thickness=".15"    style="font: bold 18px Arial;"/> -->
                         </div>
-                        <div class="col-sm-4 col-6">
-                            <div>
-                                <p class="mb-0">New Subscribers</p>
-                                <h5 class="mb-sm-0"><?= $firstScheme['nonrenewal']; ?></h5>
-                            </div>
-                        </div>
-                        <div class="col-sm-4 col-6">
-                            <div class="mt-3 mt-sm-0">
-                                <p class="mb-0">Renewed</p>
-                                <h5 class="mb-0"><?=$firstScheme['renewal'];?> </h5>
-                            </div>
+                        <div class="media-body text-right align-self-center">
+                            <h3 class="mt-0 mb-1">₹<?= $invoice['today']['total_amount']; ?></h3>
+                            <p class="text-muted mb-0">Today sale</p>
                         </div>
+
+                    </div>
+                    <br>
+                    <div class="text-success">
+                        <span class="float-left"> MTD : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $invoice['month']['count']; ?></span>-₹<?= $invoice['month']['total_amount']; ?></span>
+                        <span class="float-right"> YTD : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $invoice['year']['count']; ?></span>-₹<?= $invoice['year']['total_amount']; ?></span>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-<?php endif; ?>
-<?php if (!empty($active_schemes) && isset($active_schemes[2])) : ?>
-                <div class="col-xl-4 col-md-6">
-                                <div class="card">
-                                    <div class="card-body">
-                                    <?php $firstScheme = $active_schemes[2]; ?>
-                                        <div class="dropdown float-right">
-                                            <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
-                                                <i class="mdi mdi-dots-horizontal"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right">
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Another action</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Something else</a>
-                                                <!-- item-->
-                                                <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
-                                            </div>
-                                        </div>
+    </div><!-- end col -->
 
-                                        <h4 class="header-title mt-0"><?= $firstScheme['short_code']; ?></h4>
+        <?php if (!empty($active_schemes) && isset($active_schemes[0])) : ?>
+            <div class="col-xl-4 col-md-6">
+                <div class="card">
+                    <div class="card-body">
+                        <?php $firstScheme = $active_schemes[0]; ?>
+                        <div class="dropdown float-right">
+                            <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
+                                <i class="mdi mdi-dots-horizontal"></i>
+                            </a>
+                            <div class="dropdown-menu dropdown-menu-right">
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Action</a>
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Another action</a>
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Something else</a>
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
+                            </div>
+                        </div>
 
-                                        <div class="mt-3">
-                                            <div class="media">
-                                                <div dir="ltr">
-                                                <!-- <h3 class="my-2 py-1"><span data-plugin="counterup"><?= $firstScheme['activeoverall']; ?></span></h3> -->
-                                                    <!-- <input data-plugin="knob" data-width="64" data-height="64" data-fgColor="#675db7"
-                                                        data-bgColor="#e8e7f4" value=""
-                                                        data-skin="tron" data-angleOffset="" data-readOnly=true
-                                                        data-thickness=".15"    style="font: bold 18px Arial;"/> -->
-                                                </div>
-                                                <div class="media-body text-center align-self-center">
-                                                    <h3 class="mt-0 mb-1"><?= $firstScheme['activeoverall']; ?></h3>
-                                                    <p class="text-muted mb-0">Total Subscriber</p>
-                                                </div>
-                                                
-                                            </div>
-                                            <br>
-                                            <div class="text-success">
+                        <h4 class="header-title mt-0"><?= $firstScheme['short_code']; ?></h4>
+
+                        <div class="mt-3">
+                            <div class="media">
+                                <div dir="ltr">
+                                    <!-- <h3 class="my-2 py-1"><span data-plugin="counterup"><?= $firstScheme['activeoverall']; ?></span></h3> -->
+                                    <!-- <input data-plugin="knob" data-width="64" data-height="64" data-fgColor="#675db7"
+                                                    data-bgColor="#e8e7f4" value=""
+                                                    data-skin="tron" data-angleOffset="" data-readOnly=true
+                                                    data-thickness=".15"    style="font: bold 18px Arial;"/> -->
+                                </div>
+                                <div class="media-body text-center align-self-center">
+                                    <h3 class="mt-0 mb-1"><?= $firstScheme['activeoverall']; ?></h3>
+                                    <p class="text-muted mb-0">Total Subscriber</p>
+                                </div>
+
+                            </div>
+                            <br>
+                            <div class="text-success">
                                 <span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
                                 <span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
                             </div>
-                            <?php endif; ?>
+                        
+                        </div>
+                    </div>
+                </div>
+            </div><!-- end col -->
+        <?php endif; ?>
+
+        <?php if (!empty($active_schemes) && isset($active_schemes[1])) : ?>
+            <div class="col-xl-4 col-md-6">
+                <div class="card">
+                    <div class="card-body">
+                        <?php $firstScheme = $active_schemes[1]; ?>
+                        <div class="dropdown float-right">
+                            <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
+                                <i class="mdi mdi-dots-horizontal"></i>
+                            </a>
+                            <div class="dropdown-menu dropdown-menu-right">
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Action</a>
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Another action</a>
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Something else</a>
+                                <!-- item-->
+                                <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
+                            </div>
+                        </div>
+
+                        <h4 class="header-title mt-0"><?= $firstScheme['short_code']; ?></h4>
+
+                        <div class="mt-3">
+                            <div class="media">
+                                <div dir="ltr">
+
+                                </div>
+                                <div class="media-body text-center align-self-center">
+                                    <h3 class="mt-0 mb-1"><?= $firstScheme['activeoverall']; ?></h3>
+                                    <p class="text-muted mb-0">Total Subscriber</p>
+                                </div>
+
+                            </div>
+                            <br>
+                            <div class="text-success">
+                                <span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
+                                <span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div><!-- end col -->
+        <?php endif; ?>
+
+        <?php if (!empty($active_schemes) && isset($active_schemes[9])) : ?>
+                <div class="col-lg-4">
+                    <div class="card">
+                        <div class="card-body" style="width:119%;">
+                            <div class="media">
+                                <?php $firstScheme = $active_schemes[2]; ?>
+                                <div class="avatar-md mr-3">
+                                    <div>
+                                        <?php if (!empty($firstScheme['wp_img_url'])) { ?>
+                                            <img src="<?= $firstScheme['wp_img_url']; ?>" alt="table-user" class="mr-3 rounded avatar-md">
+                                        <?php } else { ?>
+                                            <div class="avatar-title bg-light rounded text-body font-20 font-weight-semibold">
+                                                <?= $firstScheme['first_letter']; ?>
+                                            </div>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                                <div class="media-body">
+                                    <h5 class="my-1"><a href="javascript:void(0);" class="text-dark"><?= $firstScheme['short_code']; ?></a></h5>
+                                    <p class="text-muted mb-0">
+
+                                    </p>
+                                </div>
+                            </div>
+                            <hr>
+                            <div class="text-muted">
+                                <div class="row">
+                                    <div class="col-sm-4 col-6">
+                                        <div>
+                                            <p class="mb-0">Total Subscribers</p>
+                                            <h5 class="mb-sm-0"><?= $firstScheme['activeoverall']; ?></h5>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-4 col-6">
+                                        <div>
+                                            <p class="mb-0">New Subscribers</p>
+                                            <h5 class="mb-sm-0"><?= $firstScheme['nonrenewal']; ?></h5>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-4 col-6">
+                                        <div class="mt-3 mt-sm-0">
+                                            <p class="mb-0">Renewed</p>
+                                            <h5 class="mb-0"><?= $firstScheme['renewal']; ?> </h5>
                                         </div>
                                     </div>
                                 </div>
-                            </div><!-- end col -->
                             </div>
-                            
-      
+                        </div>
+                    </div>
+                </div>
+        <?php endif; ?>
 
-      
-        <div class="col-lg-12">
-                <div class="card">
-                    <div class="card-body">
-                        <h4 class="header-title mt-1">Expiring Membership List</h4>
-                        <div class="conversation-list" data-simplebar style="max-height: 255px !important">
-                            <div class="table-responsive">
-                                <table class="table table-sm table-centered mb-0 font-14">
-                                    <thead class="thead-light">
-                                        <tr>
-                                            <th style="width: 5%;">#</th>
-                                            <th style="width: 20%;">Name</th>
-                                            <th style="width: 20%;">Mobile No</th>
-                                            <th style="width: 20%;">Email</th>
-                                            <th style="width: 50%;">Scheme Name</th>
-                                            <th style="width: 25%;">Expiring In</th>
-                                            <th style="width: 25%;">Notification On</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <?php
+        <?php if (!empty($active_schemes) && isset($active_schemes[2])) : ?>
+                <div class="col-xl-4 col-md-6">
+                    <div class="card">
+                        <div class="card-body">
+                            <?php $firstScheme = $active_schemes[2]; ?>
+                            <div class="dropdown float-right">
+                                <a href="#" class="dropdown-toggle arrow-none card-drop" data-toggle="dropdown" aria-expanded="false">
+                                    <i class="mdi mdi-dots-horizontal"></i>
+                                </a>
+                                <div class="dropdown-menu dropdown-menu-right">
+                                    <!-- item-->
+                                    <a href="javascript:void(0);" class="dropdown-item">Action</a>
+                                    <!-- item-->
+                                    <a href="javascript:void(0);" class="dropdown-item">Another action</a>
+                                    <!-- item-->
+                                    <a href="javascript:void(0);" class="dropdown-item">Something else</a>
+                                    <!-- item-->
+                                    <a href="javascript:void(0);" class="dropdown-item">Separated link</a>
+                                </div>
+                            </div>
+
+                            <h4 class="header-title mt-0"><?= $firstScheme['short_code']; ?></h4>
+
+                            <div class="mt-3">
+                                <div class="media">
+                                    <div dir="ltr">
+                                        <!-- <h3 class="my-2 py-1"><span data-plugin="counterup"><?= $firstScheme['activeoverall']; ?></span></h3> -->
+                                        <!-- <input data-plugin="knob" data-width="64" data-height="64" data-fgColor="#675db7"
+                                                data-bgColor="#e8e7f4" value=""
+                                                data-skin="tron" data-angleOffset="" data-readOnly=true
+                                                data-thickness=".15"    style="font: bold 18px Arial;"/> -->
+                                    </div>
+                                    <div class="media-body text-center align-self-center">
+                                        <h3 class="mt-0 mb-1"><?= $firstScheme['activeoverall']; ?></h3>
+                                        <p class="text-muted mb-0">Total Subscriber</p>
+                                    </div>
+
+                                </div>
+                                <br>
+                                <div class="text-success">
+                                    <span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
+                                    <span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div><!-- end col -->
+        <?php endif; ?>
+</div>
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card">
+            <div class="card-body">
+                <h4 class="header-title mt-1">Expiring Membership List</h4>
+                <div class="conversation-list" data-simplebar style="max-height: 255px !important">
+                    <div class="table-responsive">
+                        <table class="table table-sm table-centered mb-0 font-14">
+                            <thead class="thead-light">
+                                <tr>
+                                    <th style="width: 5%;">#</th>
+                                    <th style="width: 20%;">Name</th>
+                                    <th style="width: 20%;">Mobile No</th>
+                                    <th style="width: 20%;">Email</th>
+                                    <th style="width: 50%;">Scheme Name</th>
+                                    <th style="width: 25%;">Expiring In</th>
+                                    <th style="width: 25%;">Notification On</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
                                         // print "<pre>";
                                         // print_r($expiring_membership);
                                         //  print "</pre>"; 
@@ -280,39 +272,32 @@
                                         foreach ($expiring_membership as $e) :
                                             $daysincount = (int)$e['countdays'];
                                             $daysincountstring = ($daysincount == 0 ? 'Today' : ($daysincount == 1 ? 'Tomorrow' : $daysincount . ' days'));
+                                ?>
+                                <tr>
+                                    <!-- <td><?= $e['sub_id']; ?></td> -->
+                                    <td><?= ++$tempinx; ?></td>
+                                    <td><h5 class="mt-0 mb-1"><?= $e['customer_name']; ?></h5></td>
+                                    <td><?= $e['customer_mobile'];?></td>
+                                    <td><?= $e['customer_email'];?></td>
+                                    <td><?= $e['short_code']; ?></td>
+                                    <td><span class="badge badge-success badge-pill"><?= $daysincountstring; ?></span> <span class="font-13"><br><?= $e['to_subscription_date_format']; ?></span></td>
+                                    <td>
+                                        <?php
+                                        $startDateTime = isset($e['notifications'][0]['start_date_time']) ? $e['notifications'][0]['start_date_time'] : '';
+                                        echo $startDateTime ? date('d-m-Y', strtotime($startDateTime)) : '';
                                         ?>
-                                            <tr>
-                                                <!-- <td><?= $e['sub_id']; ?></td> -->
-                                                <td><?= ++$tempinx; ?></td>
-                                                <td>
-                                                    <h5 class="mt-0 mb-1"><?= $e['customer_name']; ?></h5>
-                                           
-                                                </td>
-                                                <td><?= $e['customer_mobile'];?></td>
-                                                <td><?= $e['customer_email'];?></td>
-                                                <td><?= $e['short_code']; ?></td>
-                                                <td><span class="badge badge-success badge-pill"><?= $daysincountstring; ?></span> <span class="font-13"><br><?= $e['to_subscription_date_format']; ?></span></td>
-                                                
-                                               
-                                                <td>
-    <?php
-    $startDateTime = isset($e['notifications'][0]['start_date_time']) ? $e['notifications'][0]['start_date_time'] : '';
-    echo $startDateTime ? date('d-m-Y', strtotime($startDateTime)) : '';
-    ?>
-</td>
-
-
-
-                                            </tr>
+                                    </td>
+                                </tr>
                                         <?php endforeach; ?>
-                                      
-                                    </tbody>
-                                </table>
-                            </div> <!-- end table-responsive-->
-                        </div>
-                    </div> <!-- end card-body-->
-                </div> <!-- end card-->
-            </div> <!-- end col-->
+                            </tbody>
+                        </table>
+                    </div> <!-- end table-responsive-->
+                </div>
+            </div> <!-- end card-body-->
+        </div> <!-- end card-->
+    </div> <!-- end col-->
+</div>
 
-            
-    <?php endif; ?>
\ No newline at end of file
+<?php endif; ?>    
+
+    
\ No newline at end of file
diff --git a/app/Views/template/topbar.php b/app/Views/template/topbar.php
index 19bf8437..06040520 100644
--- a/app/Views/template/topbar.php
+++ b/app/Views/template/topbar.php
@@ -54,7 +54,7 @@
                         </div>
 
                     </div>
-                </li> --> -->
+                </li> -->
 
                 <li class="dropdown notification-list topbar-dropdown">
                     <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">