add Internet Plan and Location in expired list Dashboard

hotspotbilling · May 14, 2024 · 895bb26 · 895bb26
1 parent a5affdb
commit 895bb26
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/system/lan/english.json b/system/lan/english.json
@@ -577,5 +577,7 @@
     "Extend_Days": "Extend Days",
     "Confirmation_Message": "Confirmation Message",
     "You_are_already_logged_in": "You are already logged in",
-    "Extend": "Extend"
+    "Extend": "Extend",
+    "Created___Expires": "Created \/ Expires",
+    "Created___Expired": "Created \/ Expired"
 }
diff --git a/ui/ui/dashboard.tpl b/ui/ui/dashboard.tpl
@@ -74,8 +74,7 @@
                     <div class="box-tools pull-right">
                         <button type="button" class="btn bg-teal btn-sm" data-widget="collapse"><i class="fa fa-minus"></i>
                         </button>
-                        <a href="{$_url}dashboard&refresh" class="btn bg-teal btn-sm"><i
-                                class="fa fa-refresh"></i>
+                        <a href="{$_url}dashboard&refresh" class="btn bg-teal btn-sm"><i class="fa fa-refresh"></i>
                         </a>
                     </div>
                 </div>
@@ -96,8 +95,7 @@
                     <div class="box-tools pull-right">
                         <button type="button" class="btn bg-teal btn-sm" data-widget="collapse"><i class="fa fa-minus"></i>
                         </button>
-                        <a href="{$_url}dashboard&refresh" class="btn bg-teal btn-sm"><i
-                                class="fa fa-refresh"></i>
+                        <a href="{$_url}dashboard&refresh" class="btn bg-teal btn-sm"><i class="fa fa-refresh"></i>
                         </a>
                     </div>
                 </div>
@@ -146,18 +144,24 @@
                         <thead>
                             <tr>
                                 <th>{Lang::T('Username')}</th>
-                                <th>{Lang::T('Created On')}</th>
-                                <th>{Lang::T('Expires On')}</th>
+                                <th>{Lang::T('Created / Expired')}</th>
+                                <th>{Lang::T('Internet Plan')}</th>
+                                <th>{Lang::T('Location')}</th>
                             </tr>
                         </thead>
                         <tbody>
                             {foreach $expire as $expired}
+                                {assign var="rem_exp" value="{$expired['expiration']} {$expired['time']}"}
+                                {assign var="rem_started" value="{$expired['recharged_on']} {$expired['recharged_time']}"}
                                 <tr>
                                     <td><a href="{$_url}customers/viewu/{$expired['username']}">{$expired['username']}</a></td>
-                                    <td>{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}
-                                    </td>
-                                    <td>{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}
+                                    <td><small data-toggle="tooltip" data-placement="top"
+                                    title="{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}">{Lang::timeElapsed($rem_started)}</small> /
+                                        <span data-toggle="tooltip" data-placement="top"
+                                            title="{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}">{Lang::timeElapsed($rem_exp)}</span>
                                     </td>
+                                    <td>{$expired['namebp']}</td>
+                                    <td>{$expired['routers']}</td>
                                 </tr>
                             </tbody>
                         {/foreach}

diff --git a/ui/ui/sections/footer.tpl b/ui/ui/sections/footer.tpl
@@ -86,6 +86,10 @@
                     }
                     return null;
                 }
+
+                $(function() {
+                    $('[data-toggle="tooltip"]').tooltip()
+                })
             </script>
         {/literal}