From 3da0c356dec917b30680fdafe9f6de290358fe1d Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:02:29 +0700
Subject: [PATCH 1/8] Update invoice-print.tpl

Change print template design
---
 ui/ui/invoice-print.tpl | 212 +++++++++++++++++++++++++++++++---------
 1 file changed, 165 insertions(+), 47 deletions(-)
diff --git a/ui/ui/invoice-print.tpl b/ui/ui/invoice-print.tpl
index de351f42..5c6b3afd 100644
--- a/ui/ui/invoice-print.tpl
+++ b/ui/ui/invoice-print.tpl
@@ -1,13 +1,117 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
-    <title>{$_title}</title>
+    <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link href="ui/ui/styles/bootstrap.min.css" rel="stylesheet">
+    <title>{$_title}</title>
     <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f8f9fa;
+            margin: 0;
+            padding: 10px;
+        }
 
+        .invoice {
+            width: 100%;
+            max-width: 70mm; /* Maximum width for thermal printing */
+            background: white;
+            border-radius: 8px;
+            padding: 10px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+
+        .header {
+            text-align: center;
+            margin-bottom: 10px;
+        }
+
+        .header h1 {
+            margin: 0;
+            font-size: 14px;
+            font-weight: bold;
+        }
+
+        .details {
+            margin-bottom: 10px;
+            border-bottom: 2px solid #0056b3;
+            padding-bottom: 5px;
+            text-align: left;
+        }
+
+        .details div {
+            margin: 5px 0;
+            font-weight: bold; /* Bold text for details */
+            color: black; /* Ensure text is black */
+        }
+
+        .invoice-info {
+            margin: 10px 0;
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        .invoice-info th,
+        .invoice-info td {
+            padding: 5px;
+            text-align: left;
+            color: black; /* Ensure text is black */
+            font-weight: bold; /* Bold text for table content */
+        }
+
+        .invoice-info th {
+            background-color: #0056b3;
+            color: white;
+        }
+
+        .footer {
+            margin-top: 10px;
+            text-align: left; /* Align footer text to left */
+        }
+
+        @media print {
+            body {
+                margin: 0;
+                padding: 0;
+                font-size: 12px;
+            }
+
+            .invoice {
+                width: 70mm; /* Fixed width for thermal printer */
+                padding: 5px; /* Reduced padding for print */
+                box-shadow: none; /* Remove shadow for clearer print */
+                border: none; /* Remove border for print */
+            }
+
+            .details {
+                margin-bottom: 5px;
+                text-align: left;
+            }
+
+            .invoice-info {
+                border-collapse: collapse;
+            }
+
+            .invoice-info th,
+            .invoice-info td {
+                padding: 5px; /* Reduced padding */
+                text-align: left;
+                font-weight: bold; /* Bold text for print */
+                color: black; /* Ensure text is black */
+                border: none; /* Remove borders for print */
+            }
+
+            hr {
+                border: 1px solid #000; /* Darker line for print */
+            }
+
+            .btn {
+                display: none; /* Hide buttons when printing */
+            }
+        }
+    </style>
     <script type="text/javascript">
         function printpage() {
             window.print();
@@ -15,58 +119,72 @@
     </script>
 </head>
 
-<body topmargin="0" leftmargin="0" {if !$nuxprint} onload="printpage()" {/if}>
-    <div class="row">
-        <div class="col-md-6">
-            <table width="200">
-                <tr>
-                    <td>
-                        {if $content}
-                        <pre style="border-style: none; background-color: white;">{$content}</pre>{else}
-                            <pre style="border-style: none; background-color: white;"><b>{Lang::pad($_c['CompanyName'],' ', 2)}</b>
-                    {Lang::pad($_c['address'],' ', 2)}
-                    {Lang::pad($_c['phone'],' ', 2)}
-                    {Lang::pad("", '=')}
-                    {Lang::pads("Invoice", $in['invoice'], ' ')}
-                    {Lang::pads(Lang::T('Date'), $date, ' ')}
-                    {Lang::pads(Lang::T('Sales'), $_admin['fullname'], ' ')}
-                    {Lang::pad("", '=')}
-                    {Lang::pads(Lang::T('Type'), $in['type'], ' ')}
-                    {Lang::pads(Lang::T('Package Name'), $in['plan_name'], ' ')}
-                    {Lang::pads(Lang::T('Package Price'), Lang::moneyFormat($in['price']), ' ')}
-                    {Lang::pad($in['method'], ' ', 2)}
+<body {if !$nuxprint} onload="printpage()" {/if}>
+    <div class="container">
+        <div class="invoice">
+            <div class="header">
+                <h1>{Lang::pad($_c['CompanyName'], ' ', 2)}</h1>
+                <p>{Lang::pad($_c['address'], ' ', 2)} | {Lang::pad($_c['phone'], ' ', 2)}</p>
+            </div>
+            <div class="details">
+                <div><strong>{Lang::pad(Lang::T('Invoice'), ' ', 2)}:</strong> {$in['invoice']}</div>
+                <div><strong>{Lang::pad(Lang::T('Date'), ' ', 2)}:</strong> {$date}</div>
+                <div><strong>{Lang::pad(Lang::T('Sales'), ' ', 2)}:</strong> {Lang::pad($_admin['fullname'], ' ', 2)}</div>
+            </div>
 
-                    {Lang::pads(Lang::T('Username'), $in['username'], ' ')}
-                    {Lang::pads(Lang::T('Password'), '**********', ' ')}
-                    {if $in['type'] != 'Balance'}
-                                    {Lang::pads(Lang::T('Created On'), Lang::dateAndTimeFormat($in['recharged_on'],$in['recharged_time']), ' ')}
-                                    {Lang::pads(Lang::T('Expires On'), Lang::dateAndTimeFormat($in['expiration'],$in['time']), ' ')}
-                    {/if}
-                    {Lang::pad("", '=')}
-                    {Lang::pad($_c['note'],' ', 2)}</pre>
-                        {/if}
-                    </td>
+            <table class="invoice-info">
+                <tr>
+                    <th>{Lang::pad(Lang::T('Type'), ' ', 2)}</th>
+                    <td>{$in['type']}</td>
                 </tr>
+                <tr>
+                    <th>{Lang::pad(Lang::T('Package Name'), ' ', 2)}</th>
+                    <td>{$in['plan_name']}</td>
+                </tr>
+                <tr>
+                    <th>{Lang::pad(Lang::T('Package Price'), ' ', 2)}</th>
+                    <td>{Lang::moneyFormat($in['price'])}</td>
+                </tr>
+                <tr>
+                    <th>{Lang::pad(Lang::T('Username'), ' ', 2)}</th>
+                    <td>{$in['username']}</td>
+                </tr>
+                <tr>
+                    <th>{Lang::pad(Lang::T('Password'), ' ', 2)}</th>
+                    <td>**********</td>
+                </tr>
+                <tr>
+                    <th>{Lang::pad(Lang::T('Payment Method'), ' ', 2)}</th>
+                    <td>{$in['method']}</td>
+                </tr>
+                {if $in['type'] != 'Balance'}
+                <tr>
+                    <th>{Lang::pad(Lang::T('Created On'), ' ', 2)}</th>
+                    <td>{Lang::dateAndTimeFormat($in['recharged_on'], $in['recharged_time'])}</td>
+                </tr>
+                <tr>
+                    <th>{Lang::pad(Lang::T('Expires On'), ' ', 2)}</th>
+                    <td>{Lang::dateAndTimeFormat($in['expiration'], $in['time'])}</td>
+                </tr>
+                {/if}
             </table>
-            {if $nuxprint}
-                <a href="{$nuxprint}" class="btn btn-success text-black btn-sm" name="nux" value="print">
-                    <i class="glyphicon glyphicon-print"></i>
-                    Nux Print
-                    <i class="glyphicon glyphicon-phone"></i>
+
+            <hr style="border: 2px solid #0056b3; margin-top: 10px;">
+
+            <div class="footer">
+                <p>{Lang::pad($_c['note'], ' ', 2)}</p>
+                {if $nuxprint}
+                <a href="{$nuxprint}" class="btn btn-success" name="nux" value="print">
+                    <i class="glyphicon glyphicon-print"></i> Nux Print
                 </a>
-                <br>
-                <iframe src="{$nuxprint}" style="height: 2px;"><iframe>
-            {/if}
+                {/if}
+            </div>
         </div>
     </div>
 
     <script src="ui/ui/scripts/jquery.min.js"></script>
     <script src="ui/ui/scripts/bootstrap.min.js"></script>
-    {if isset($xfooter)}
-        {$xfooter}
-    {/if}
-
-
+    {if isset($xfooter)} {$xfooter} {/if}
 </body>
 
 </html>

From 9552783eeeea1dd77421798814dea2788f94dee6 Mon Sep 17 00:00:00 2001
From: AGSTR <144728914+agstrxyz@users.noreply.github.com>
Date: Fri, 4 Oct 2024 21:16:26 +0700
Subject: [PATCH 2/8] Update radius.php

*Fix shared user limit
---
 radius.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/radius.php b/radius.php
index 5b646d9b..36aced40 100644
--- a/radius.php
+++ b/radius.php
@@ -364,6 +364,10 @@ function process_radiust_rest($tur, $code)
     global $config;
     $plan = ORM::for_table('tbl_plans')->where('id', $tur['plan_id'])->find_one();
     $bw = ORM::for_table("tbl_bandwidth")->find_one($plan['id_bw']);
+	$USRon = ORM::for_table('radacct')->where('username', $tur['username'])->where_raw("acctstoptime IS NULL")->count();
+	if ($USRon >= $plan['shared_users']) {
+		show_radius_result(["control:Auth-Type" => "Accept", 'Reply-Message' => 'You are already logged in - access denied ('.$USRon.')'], 401);
+	}
     if ($bw['rate_down_unit'] == 'Kbps') {
         $unitdown = 'K';
     } else {

From fbde8b0056fd7e80b0325b230e3e2fa27cd11115 Mon Sep 17 00:00:00 2001
From: AGSTR <144728914+agstrxyz@users.noreply.github.com>
Date: Fri, 4 Oct 2024 22:20:42 +0700
Subject: [PATCH 3/8] Update radius.php

*Fix shared user limit
---
 radius.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radius.php b/radius.php
index 36aced40..b14c5551 100644
--- a/radius.php
+++ b/radius.php
@@ -365,7 +365,7 @@ function process_radiust_rest($tur, $code)
     $plan = ORM::for_table('tbl_plans')->where('id', $tur['plan_id'])->find_one();
     $bw = ORM::for_table("tbl_bandwidth")->find_one($plan['id_bw']);
 	$USRon = ORM::for_table('radacct')->where('username', $tur['username'])->where_raw("acctstoptime IS NULL")->count();
-	if ($USRon >= $plan['shared_users']) {
+	if ($USRon >= $plan['shared_users'] && $plan['type'] == 'Hotspot') {
 		show_radius_result(["control:Auth-Type" => "Accept", 'Reply-Message' => 'You are already logged in - access denied ('.$USRon.')'], 401);
 	}
     if ($bw['rate_down_unit'] == 'Kbps') {

From da1341d9711e8cc59336d14f8b5657ca2c594277 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 7 Oct 2024 14:49:43 +0700
Subject: [PATCH 4/8] Fix Invoice Print

---
 system/controllers/plan.php |   4 +-
 ui/ui/invoice-print.tpl     | 163 ++++++++++++++++++++----------------
 ui/ui/invoice.tpl           |  19 +++--
 3 files changed, 107 insertions(+), 79 deletions(-)

diff --git a/system/controllers/plan.php b/system/controllers/plan.php
index dc92ba6f..c8b81443 100644
--- a/system/controllers/plan.php
+++ b/system/controllers/plan.php
@@ -228,11 +228,13 @@ switch ($action) {
             $ui->assign('content', $content);
         } else {
             $id = _post('id');
+            if(empty($id)) {
+                $id = $routes['2'];
+            }
             $d = ORM::for_table('tbl_transactions')->where('id', $id)->find_one();
             $ui->assign('in', $d);
             $ui->assign('date', Lang::dateAndTimeFormat($d['recharged_on'], $d['recharged_time']));
         }
-
         run_hook('print_invoice'); #HOOK
         $ui->display('invoice-print.tpl');
         break;
diff --git a/ui/ui/invoice-print.tpl b/ui/ui/invoice-print.tpl
index 5c6b3afd..07b0647d 100644
--- a/ui/ui/invoice-print.tpl
+++ b/ui/ui/invoice-print.tpl
@@ -16,7 +16,8 @@
 
         .invoice {
             width: 100%;
-            max-width: 70mm; /* Maximum width for thermal printing */
+            max-width: 70mm;
+            /* Maximum width for thermal printing */
             background: white;
             border-radius: 8px;
             padding: 10px;
@@ -43,8 +44,10 @@
 
         .details div {
             margin: 5px 0;
-            font-weight: bold; /* Bold text for details */
-            color: black; /* Ensure text is black */
+            font-weight: bold;
+            /* Bold text for details */
+            color: black;
+            /* Ensure text is black */
         }
 
         .invoice-info {
@@ -57,8 +60,10 @@
         .invoice-info td {
             padding: 5px;
             text-align: left;
-            color: black; /* Ensure text is black */
-            font-weight: bold; /* Bold text for table content */
+            color: black;
+            /* Ensure text is black */
+            font-weight: bold;
+            /* Bold text for table content */
         }
 
         .invoice-info th {
@@ -68,7 +73,8 @@
 
         .footer {
             margin-top: 10px;
-            text-align: left; /* Align footer text to left */
+            text-align: left;
+            /* Align footer text to left */
         }
 
         @media print {
@@ -79,10 +85,14 @@
             }
 
             .invoice {
-                width: 70mm; /* Fixed width for thermal printer */
-                padding: 5px; /* Reduced padding for print */
-                box-shadow: none; /* Remove shadow for clearer print */
-                border: none; /* Remove border for print */
+                width: 70mm;
+                /* Fixed width for thermal printer */
+                padding: 5px;
+                /* Reduced padding for print */
+                box-shadow: none;
+                /* Remove shadow for clearer print */
+                border: none;
+                /* Remove border for print */
             }
 
             .details {
@@ -96,19 +106,25 @@
 
             .invoice-info th,
             .invoice-info td {
-                padding: 5px; /* Reduced padding */
+                padding: 5px;
+                /* Reduced padding */
                 text-align: left;
-                font-weight: bold; /* Bold text for print */
-                color: black; /* Ensure text is black */
-                border: none; /* Remove borders for print */
+                font-weight: bold;
+                /* Bold text for print */
+                color: black;
+                /* Ensure text is black */
+                border: none;
+                /* Remove borders for print */
             }
 
             hr {
-                border: 1px solid #000; /* Darker line for print */
+                border: 1px solid #000;
+                /* Darker line for print */
             }
 
             .btn {
-                display: none; /* Hide buttons when printing */
+                display: none;
+                /* Hide buttons when printing */
             }
         }
     </style>
@@ -122,63 +138,68 @@
 <body {if !$nuxprint} onload="printpage()" {/if}>
     <div class="container">
         <div class="invoice">
-            <div class="header">
-                <h1>{Lang::pad($_c['CompanyName'], ' ', 2)}</h1>
-                <p>{Lang::pad($_c['address'], ' ', 2)} | {Lang::pad($_c['phone'], ' ', 2)}</p>
-            </div>
-            <div class="details">
-                <div><strong>{Lang::pad(Lang::T('Invoice'), ' ', 2)}:</strong> {$in['invoice']}</div>
-                <div><strong>{Lang::pad(Lang::T('Date'), ' ', 2)}:</strong> {$date}</div>
-                <div><strong>{Lang::pad(Lang::T('Sales'), ' ', 2)}:</strong> {Lang::pad($_admin['fullname'], ' ', 2)}</div>
-            </div>
+            {if $content}
+                <pre style="border-style: none; background-color: white;">{$content}</pre>
+            {else}
+                <div class="header">
+                    <h1>{Lang::pad($_c['CompanyName'], ' ', 2)}</h1>
+                    <p>{Lang::pad($_c['address'], ' ', 2)} | {Lang::pad($_c['phone'], ' ', 2)}</p>
+                </div>
+                <div class="details">
+                    <div><strong>{Lang::pad(Lang::T('Invoice'), ' ', 2)}:</strong> {$in['invoice']}</div>
+                    <div><strong>{Lang::pad(Lang::T('Date'), ' ', 2)}:</strong> {$date}</div>
+                    <div><strong>{Lang::pad(Lang::T('Sales'), ' ', 2)}:</strong> {Lang::pad($_admin['fullname'], ' ', 2)}
+                    </div>
+                </div>
 
-            <table class="invoice-info">
-                <tr>
-                    <th>{Lang::pad(Lang::T('Type'), ' ', 2)}</th>
-                    <td>{$in['type']}</td>
-                </tr>
-                <tr>
-                    <th>{Lang::pad(Lang::T('Package Name'), ' ', 2)}</th>
-                    <td>{$in['plan_name']}</td>
-                </tr>
-                <tr>
-                    <th>{Lang::pad(Lang::T('Package Price'), ' ', 2)}</th>
-                    <td>{Lang::moneyFormat($in['price'])}</td>
-                </tr>
-                <tr>
-                    <th>{Lang::pad(Lang::T('Username'), ' ', 2)}</th>
-                    <td>{$in['username']}</td>
-                </tr>
-                <tr>
-                    <th>{Lang::pad(Lang::T('Password'), ' ', 2)}</th>
-                    <td>**********</td>
-                </tr>
-                <tr>
-                    <th>{Lang::pad(Lang::T('Payment Method'), ' ', 2)}</th>
-                    <td>{$in['method']}</td>
-                </tr>
-                {if $in['type'] != 'Balance'}
-                <tr>
-                    <th>{Lang::pad(Lang::T('Created On'), ' ', 2)}</th>
-                    <td>{Lang::dateAndTimeFormat($in['recharged_on'], $in['recharged_time'])}</td>
-                </tr>
-                <tr>
-                    <th>{Lang::pad(Lang::T('Expires On'), ' ', 2)}</th>
-                    <td>{Lang::dateAndTimeFormat($in['expiration'], $in['time'])}</td>
-                </tr>
-                {/if}
-            </table>
+                <table class="invoice-info">
+                    <tr>
+                        <th>{Lang::pad(Lang::T('Type'), ' ', 2)}</th>
+                        <td>{$in['type']}</td>
+                    </tr>
+                    <tr>
+                        <th>{Lang::pad(Lang::T('Package Name'), ' ', 2)}</th>
+                        <td>{$in['plan_name']}</td>
+                    </tr>
+                    <tr>
+                        <th>{Lang::pad(Lang::T('Package Price'), ' ', 2)}</th>
+                        <td>{Lang::moneyFormat($in['price'])}</td>
+                    </tr>
+                    <tr>
+                        <th>{Lang::pad(Lang::T('Username'), ' ', 2)}</th>
+                        <td>{$in['username']}</td>
+                    </tr>
+                    <tr>
+                        <th>{Lang::pad(Lang::T('Password'), ' ', 2)}</th>
+                        <td>**********</td>
+                    </tr>
+                    <tr>
+                        <th>{Lang::pad(Lang::T('Payment Method'), ' ', 2)}</th>
+                        <td>{$in['method']}</td>
+                    </tr>
+                    {if $in['type'] != 'Balance'}
+                        <tr>
+                            <th>{Lang::pad(Lang::T('Created On'), ' ', 2)}</th>
+                            <td>{Lang::dateAndTimeFormat($in['recharged_on'], $in['recharged_time'])}</td>
+                        </tr>
+                        <tr>
+                            <th>{Lang::pad(Lang::T('Expires On'), ' ', 2)}</th>
+                            <td>{Lang::dateAndTimeFormat($in['expiration'], $in['time'])}</td>
+                        </tr>
+                    {/if}
+                </table>
 
-            <hr style="border: 2px solid #0056b3; margin-top: 10px;">
+                <hr style="border: 2px solid #0056b3; margin-top: 10px;">
 
-            <div class="footer">
-                <p>{Lang::pad($_c['note'], ' ', 2)}</p>
-                {if $nuxprint}
-                <a href="{$nuxprint}" class="btn btn-success" name="nux" value="print">
-                    <i class="glyphicon glyphicon-print"></i> Nux Print
-                </a>
-                {/if}
-            </div>
+                <div class="footer">
+                    <p>{Lang::pad($_c['note'], ' ', 2)}</p>
+                    {if $nuxprint}
+                        <a href="{$nuxprint}" class="btn btn-success" name="nux" value="print">
+                            <i class="glyphicon glyphicon-print"></i> Nux Print
+                        </a>
+                    {/if}
+                </div>
+            {/if}
         </div>
     </div>
 
@@ -187,4 +208,4 @@
     {if isset($xfooter)} {$xfooter} {/if}
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/ui/ui/invoice.tpl b/ui/ui/invoice.tpl
index 321bedc6..3f208413 100644
--- a/ui/ui/invoice.tpl
+++ b/ui/ui/invoice.tpl
@@ -12,19 +12,24 @@
                     <a href="{$_url}plan/list" class="btn btn-default btn-sm"><i
                             class="ion-reply-all"></i>{Lang::T('Finish')}</a>
                     <a href="https://api.whatsapp.com/send/?text={$whatsapp}" target="_blank"
-                    class="btn btn-primary btn-sm">
-                    <i class="glyphicon glyphicon-share"></i> WhatsApp</a>
+                        class="btn btn-primary btn-sm">
+                        <i class="glyphicon glyphicon-share"></i> WhatsApp</a>
                     <a href="{$_url}plan/view/{$in['id']}/send" class="btn btn-info text-black btn-sm"><i
                             class="glyphicon glyphicon-envelope"></i> {Lang::T("Resend")}</a>
-                        <button type="submit" class="btn btn-info text-black btn-sm"><i class="glyphicon glyphicon-print"></i>
-                        {Lang::T('Print')}</button>
+                    <hr>
+                    <a href="{$_url}plan/print/{$in['id']}" target="_print" class="btn btn-info text-black btn-sm"><i
+                            class="glyphicon glyphicon-print"></i>
+                        {Lang::T('Print')} HTML</a>
+                    <button type="submit" class="btn btn-info text-black btn-sm"><i
+                            class="glyphicon glyphicon-print"></i>
+                        {Lang::T('Print')} Text</button>
                     <a href="nux://print?text={urlencode($invoice)}"
-                    class="btn btn-success text-black btn-sm hidden-md hidden-lg">
+                        class="btn btn-success text-black btn-sm hidden-md hidden-lg">
                         <i class="glyphicon glyphicon-phone"></i>
                         NuxPrint
                     </a>
                     <a href="https://github.com/hotspotbilling/android-printer"
-                    class="btn btn-success text-black btn-sm hidden-xs hidden-sm" target="_blank">
+                        class="btn btn-success text-black btn-sm hidden-xs hidden-sm" target="_blank">
                         <i class="glyphicon glyphicon-phone"></i>
                         NuxPrint
                     </a>
@@ -37,4 +42,4 @@
     var s5_taf_parent = window.location;
     document.getElementById('content').innerHTML = document.getElementById('formcontent').innerHTML;
 </script>
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file

From 3407571474c0796981e7d4328f907db4444b14a5 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 7 Oct 2024 14:50:11 +0700
Subject: [PATCH 5/8] Show is Customer Online in the customer list

---
 system/controllers/autoload.php    | 55 ++++++++++++++++++++++++++----
 system/devices/MikrotikHotspot.php |  5 +--
 ui/ui/customers.tpl                |  2 +-
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/system/controllers/autoload.php b/system/controllers/autoload.php
index e0920b5e..92f7688c 100644
--- a/system/controllers/autoload.php
+++ b/system/controllers/autoload.php
@@ -85,15 +85,56 @@ switch ($action) {
         $ui->display('autoload.tpl');
         break;
     case 'customer_is_active':
-        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $routes['2'])->findOne();
-        if ($d) {
-            if ($d['status'] == 'on') {
-                die('<span class="label label-success" title="Expired ' . Lang::dateAndTimeFormat($d['expiration'], $d['time']) . '">' . $d['namebp'] . '</span>');
-            } else {
-                die('<span class="label label-danger" title="Expired ' . Lang::dateAndTimeFormat($d['expiration'], $d['time']) . '">' . $d['namebp'] . '</span>');
+        $c = ORM::for_table('tbl_customers')->where('username', $routes['2'])->find_one();
+        $p = ORM::for_table('tbl_plans')->find_one($routes['3']);
+        $dvc = Package::getDevice($p);
+        if ($_app_stage != 'demo') {
+            if (file_exists($dvc)) {
+                require_once $dvc;
+                try {
+                    //don't wait more than 5 seconds for response from device, otherwise we get timeout error.
+                    ini_set('default_socket_timeout', 5);
+                    if ((new $p['device'])->online_customer($c, $p['routers'])) {
+                        echo '<span class="label label-success" title="online">&nbsp;</span>';
+                    }
+                } catch (Exception $e) {
+                    echo '<span class="label label-danger" title="error">&nbsp;</span>';
+                }
             }
+        }
+        break;
+    case 'plan_is_active':
+        $ds = ORM::for_table('tbl_user_recharges')->where('customer_id', $routes['2'])->find_array();
+        if ($ds) {
+            $ps = [];
+            $c = ORM::for_table('tbl_customers')->find_one($routes['2']);
+            foreach ($ds as $d) {
+                if ($d['status'] == 'on') {
+                    $p = ORM::for_table('tbl_plans')->find_one($d['plan_id']);
+                    $dvc = Package::getDevice($p);
+                    $status = "";
+                    if ($_app_stage != 'demo') {
+                        if (file_exists($dvc)) {
+                            require_once $dvc;
+                            try {
+                                //don't wait more than 5 seconds for response from device, otherwise we get timeout error.
+                                ini_set('default_socket_timeout', 5);
+                                if ((new $p['device'])->online_customer($c, $p['routers'])) {
+                                    $status = '<span class="label label-success" title="online">&nbsp;</span>';
+                                }
+                            } catch (Exception $e) {
+                                $status = '<span class="label label-danger" title="error">&nbsp;</span>';
+                            }
+                        }
+                    }
+                    $ps[] = ('<span class="label label-primary m-1" title="Expired ' . Lang::dateAndTimeFormat($d['expiration'], $d['time']) . '">' . $d['namebp'] . ' ' . $status . '</span>');
+                } else {
+                    $ps[] = ('<span class="label label-danger m-1" title="Expired ' . Lang::dateAndTimeFormat($d['expiration'], $d['time']) . '">' . $d['namebp'] . '</span>');
+                }
+            }
+            echo implode("<br>", $ps);
         } else {
-            die('<span class="label label-danger">&bull;</span>');
+            die('');
         }
         break;
     case 'customer_select2':
diff --git a/system/devices/MikrotikHotspot.php b/system/devices/MikrotikHotspot.php
index f3b6226a..84c041f4 100644
--- a/system/devices/MikrotikHotspot.php
+++ b/system/devices/MikrotikHotspot.php
@@ -109,9 +109,10 @@ class MikrotikHotspot
         $client = $this->getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
         $printRequest = new RouterOS\Request(
             '/ip hotspot active print',
-            RouterOS\Query::where('name', $customer['username'])
+            RouterOS\Query::where('user', $customer['username'])
         );
-        return $client->sendSync($printRequest)->getProperty('.id');
+        $id =  $client->sendSync($printRequest)->getProperty('.id');
+        return $id;
     }
 
     function connect_customer($customer, $ip, $mac_address, $router_name)
diff --git a/ui/ui/customers.tpl b/ui/ui/customers.tpl
index 7829ffcd..7bb00743 100644
--- a/ui/ui/customers.tpl
+++ b/ui/ui/customers.tpl
@@ -132,7 +132,7 @@
                                                     class="glyphicon glyphicon-map-marker"></i></a>
                                         {/if}
                                     </td>
-                                    <td align="center" api-get-text="{$_url}autoload/customer_is_active/{$ds['id']}">
+                                    <td align="center" api-get-text="{$_url}autoload/plan_is_active/{$ds['id']}">
                                         <span class="label label-default">&bull;</span>
                                     </td>
                                     <td>{$ds['service_type']}</td>

From d4eaaad5356a9d377cdf5b303fc5f080bc98c3e5 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 7 Oct 2024 14:50:28 +0700
Subject: [PATCH 6/8] show is customer online in the Active List

---
 ui/ui/plan.tpl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ui/ui/plan.tpl b/ui/ui/plan.tpl
index 32111f4a..518c0289 100644
--- a/ui/ui/plan.tpl
+++ b/ui/ui/plan.tpl
@@ -94,15 +94,18 @@
                                     <a href="{$_url}customers/viewu/{$ds['username']}">{$ds['username']}</a>
                                     {/if}
                                 </td>
+                                <td>
                                 {if $ds['type'] == 'Hotspot'}
-                                    <td><a href="{$_url}services/edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
-								{/if}
-                                {if $ds['type'] == 'PPPOE'}
-                                    <td><a href="{$_url}services/pppoe-edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
-                                {/if}
-                                {if $ds['type'] == 'VPN'}
-                                    <td><a href="{$_url}services/vpn-edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
+                                    <a href="{$_url}services/edit/{$ds['plan_id']}">{$ds['namebp']}</a>
+                                    <span api-get-text="{$_url}autoload/customer_is_active/{$ds['username']}/{$ds['plan_id']}"></span>
+								{elseif $ds['type'] == 'PPPOE'}
+                                    <a href="{$_url}services/pppoe-edit/{$ds['plan_id']}">{$ds['namebp']}</a>
+                                    <span api-get-text="{$_url}autoload/customer_is_active/{$ds['username']}/{$ds['plan_id']}"></span>
+                                {elseif $ds['type'] == 'VPN'}
+                                    <a href="{$_url}services/vpn-edit/{$ds['plan_id']}">{$ds['namebp']}</a>
                                 {/if}
+
+                                </td>
                                 <td>{$ds['type']}</td>
                                 <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
                                 <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>

From 05eab22062a6bed402d58b09857fdd5da2cacb19 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 7 Oct 2024 15:04:44 +0700
Subject: [PATCH 7/8] show customer is online or not and Rearange Customer View

---
 CHANGELOG.md             |   6 +
 ui/ui/customers-view.tpl | 273 ++++++++++++++++++++-------------------
 version.json             |   2 +-
 3 files changed, 149 insertions(+), 132 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27896602..f37c8b17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # CHANGELOG
 
+## 2024.10.7
+
+- Show Customer is Online or not
+- Change Invoice Theme for printing
+- Rearange Customer View
+
 ## 2024.9.23
 
 - Discount Price
diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl
index 7dd0ca0e..61c9d83d 100644
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@@ -100,7 +100,8 @@
                         <li class="list-group-item">
                             <b>{Lang::T('Coordinates')}</b> <span class="pull-right">
                                 <i class="glyphicon glyphicon-road"></i> <a style="color: black;"
-                                    href="https://www.google.com/maps/dir//{$d['coordinates']}/" target="_blank">{Lang::T('Get Directions')}</a>
+                                    href="https://www.google.com/maps/dir//{$d['coordinates']}/"
+                                    target="_blank">{Lang::T('Get Directions')}</a>
                             </span>
                             <div id="map" style="width: '100%'; height: 100px;"></div>
                         </li>
@@ -119,141 +120,151 @@
                 </div>
             </div>
         </div>
-        {foreach $packages as $package}
-            <div class="box box-{if $package['status']=='on'}success{else}danger{/if}">
-                <div class="box-body box-profile">
-                    <h4 class="text-center">{$package['type']} - {$package['namebp']}</h4>
-                    <ul class="list-group list-group-unbordered">
-                        <li class="list-group-item">
-                            {Lang::T('Active')} <span class="pull-right">{if
-                            $package['status']=='on'}yes{else}no
-                            {/if}</span>
-                    </li>
-                    <li class="list-group-item">
-                        {Lang::T('Type')} <span class="pull-right">
-                            {if $package['prepaid'] eq yes}Prepaid{else}<b>Postpaid</b>{/if}</span>
-                    </li>
-                    <li class="list-group-item">
-                        {Lang::T('Bandwidth')} <span class="pull-right">
-                            {$package['name_bw']}</span>
-                    </li>
-                    <li class="list-group-item">
-                        {Lang::T('Created On')} <span
-                            class="pull-right">{Lang::dateAndTimeFormat($package['recharged_on'],$package['recharged_time'])}</span>
-                    </li>
-                    <li class="list-group-item">
-                        {Lang::T('Expires On')} <span class="pull-right">{Lang::dateAndTimeFormat($package['expiration'],
-                            $package['time'])}</span>
-                    </li>
-                    <li class="list-group-item">
-                        {$package['routers']} <span class="pull-right">{$package['method']}</span>
-                    </li>
-                </ul>
-                <div class="row">
-                    <div class="col-xs-4">
-                        <a href="{$_url}customers/deactivate/{$d['id']}/{$package['plan_id']}" id="{$d['id']}"
-                            class="btn btn-danger btn-block btn-sm"
-                            onclick="return confirm('This will deactivate Customer Plan, and make it expired')">{Lang::T('Deactivate')}</a>
-                    </div>
-                    <div class="col-xs-8">
-                        <a href="{$_url}customers/recharge/{$d['id']}/{$package['plan_id']}"
-                            class="btn btn-success btn-sm btn-block">{Lang::T('Recharge')}</a>
+    </div>
+    <div class="col-sm-8 col-md-8">
+        <div class="box box-info">
+            <ul class="nav nav-tabs">
+                <li role="presentation" {if $v=='order' }class="active" {/if}><a
+                        href="{$_url}customers/view/{$d['id']}/order">30 {Lang::T('Order History')}</a></li>
+                <li role="presentation" {if $v=='activation' }class="active" {/if}><a
+                        href="{$_url}customers/view/{$d['id']}/activation">30 {Lang::T('Activation History')}</a></li>
+            </ul>
+            <div class="table-responsive" style="background-color: white;">
+                <table id="datatable" class="table table-bordered table-striped">
+                    {if Lang::arrayCount($activation)}
+                        <thead>
+                            <tr>
+                                <th>{Lang::T('Invoice')}</th>
+                                <th>{Lang::T('Username')}</th>
+                                <th>{Lang::T('Plan Name')}</th>
+                                <th>{Lang::T('Plan Price')}</th>
+                                <th>{Lang::T('Type')}</th>
+                                <th>{Lang::T('Created On')}</th>
+                                <th>{Lang::T('Expires On')}</th>
+                                <th>{Lang::T('Method')}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {foreach $activation as $ds}
+                                <tr onclick="window.location.href = '{$_url}plan/view/{$ds['id']}'" style="cursor:pointer;">
+                                    <td>{$ds['invoice']}</td>
+                                    <td>{$ds['username']}</td>
+                                    <td>{$ds['plan_name']}</td>
+                                    <td>{Lang::moneyFormat($ds['price'])}</td>
+                                    <td>{$ds['type']}</td>
+                                    <td class="text-success">
+                                        {Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}
+                                    </td>
+                                    <td class="text-danger">{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
+                                    <td>{$ds['method']}</td>
+                                </tr>
+                            {/foreach}
+                        </tbody>
+                    {/if}
+                    {if Lang::arrayCount($order)}
+                        <thead>
+                            <tr>
+                                <th>{Lang::T('Plan Name')}</th>
+                                <th>{Lang::T('Gateway')}</th>
+                                <th>{Lang::T('Routers')}</th>
+                                <th>{Lang::T('Type')}</th>
+                                <th>{Lang::T('Plan Price')}</th>
+                                <th>{Lang::T('Created On')}</th>
+                                <th>{Lang::T('Expires On')}</th>
+                                <th>{Lang::T('Date Done')}</th>
+                                <th>{Lang::T('Method')}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {foreach $order as $ds}
+                                <tr>
+                                    <td>{$ds['plan_name']}</td>
+                                    <td>{$ds['gateway']}</td>
+                                    <td>{$ds['routers']}</td>
+                                    <td>{$ds['payment_channel']}</td>
+                                    <td>{Lang::moneyFormat($ds['price'])}</td>
+                                    <td class="text-primary">{Lang::dateTimeFormat($ds['created_date'])}</td>
+                                    <td class="text-danger">{Lang::dateTimeFormat($ds['expired_date'])}</td>
+                                    <td class="text-success">{if $ds['status']!=1}{Lang::dateTimeFormat($ds['paid_date'])}{/if}
+                                    </td>
+                                    <td>{if $ds['status']==1}{Lang::T('UNPAID')}
+                                        {elseif $ds['status']==2}{Lang::T('PAID')}
+                                        {elseif $ds['status']==3}{$_L['FAILED']}
+                                        {elseif $ds['status']==4}{Lang::T('CANCELED')}
+                                        {elseif $ds['status']==5}{Lang::T('UNKNOWN')}
+                                        {/if}</td>
+                                </tr>
+                            {/foreach}
+                        </tbody>
+                    {/if}
+                </table>
+            </div>
+            {include file="pagination.tpl"}
+        </div>
+        <div class="row">
+            {foreach $packages as $package}
+                <div class="col-md-6">
+                    <div class="box box-{if $package['status']=='on'}success{else}danger{/if}">
+                        <div class="box-body box-profile">
+                            <h4 class="text-center">{$package['type']} - {$package['namebp']} <span
+                                    api-get-text="{$_url}autoload/customer_is_active/{$package['username']}/{$package['plan_id']}"></span>
+                            </h4>
+                            <ul class="list-group list-group-unbordered">
+                                <li class="list-group-item">
+                                    {Lang::T('Active')} <span class="pull-right">{if
+                        $package['status']=='on'}yes{else}no
+                                    {/if}</span>
+                            </li>
+                            <li class="list-group-item">
+                                {Lang::T('Type')} <span class="pull-right">
+                                    {if $package['prepaid'] eq yes}Prepaid{else}<b>Postpaid</b>{/if}</span>
+                            </li>
+                            <li class="list-group-item">
+                                {Lang::T('Bandwidth')} <span class="pull-right">
+                                    {$package['name_bw']}</span>
+                            </li>
+                            <li class="list-group-item">
+                                {Lang::T('Created On')} <span
+                                    class="pull-right">{Lang::dateAndTimeFormat($package['recharged_on'],$package['recharged_time'])}</span>
+                            </li>
+                            <li class="list-group-item">
+                                {Lang::T('Expires On')} <span class="pull-right">{Lang::dateAndTimeFormat($package['expiration'],
+                        $package['time'])}</span>
+                            </li>
+                            <li class="list-group-item">
+                                {$package['routers']} <span class="pull-right">{$package['method']}</span>
+                            </li>
+                        </ul>
+                        <div class="row">
+                            <div class="col-xs-4">
+                                <a href="{$_url}customers/deactivate/{$d['id']}/{$package['plan_id']}" id="{$d['id']}"
+                                    class="btn btn-danger btn-block btn-sm"
+                                    onclick="return confirm('This will deactivate Customer Plan, and make it expired')">{Lang::T('Deactivate')}</a>
+                            </div>
+                            <div class="col-xs-8">
+                                <a href="{$_url}customers/recharge/{$d['id']}/{$package['plan_id']}"
+                                    class="btn btn-success btn-sm btn-block">{Lang::T('Recharge')}</a>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        {/foreach}
-        <div class="row">
-            <div class="col-xs-4">
-                <a href="{$_url}customers/list" class="btn btn-primary btn-sm btn-block">{Lang::T('Back')}</a>
-            </div>
-            <div class="col-xs-4">
-                <a href="{$_url}customers/sync/{$d['id']}"
-                    onclick="return confirm('This will sync Customer to Mikrotik?')"
-                    class="btn btn-info btn-sm btn-block">{Lang::T('Sync')}</a>
-            </div>
-            <div class="col-xs-4">
-                <a href="{$_url}message/send/{$d['id']}" class="btn btn-success btn-sm btn-block">{Lang::T('Send
-                    Message')}</a>
-            </div>
+            {/foreach}
         </div>
     </div>
-    <div class="col-sm-8 col-md-8">
-        <ul class="nav nav-tabs">
-            <li role="presentation" {if $v=='order' }class="active" {/if}><a
-                    href="{$_url}customers/view/{$d['id']}/order">30 {Lang::T('Order History')}</a></li>
-            <li role="presentation" {if $v=='activation' }class="active" {/if}><a
-                    href="{$_url}customers/view/{$d['id']}/activation">30 {Lang::T('Activation History')}</a></li>
-        </ul>
-        <div class="table-responsive" style="background-color: white;">
-            <table id="datatable" class="table table-bordered table-striped">
-                {if Lang::arrayCount($activation)}
-                    <thead>
-                        <tr>
-                            <th>{Lang::T('Invoice')}</th>
-                            <th>{Lang::T('Username')}</th>
-                            <th>{Lang::T('Plan Name')}</th>
-                            <th>{Lang::T('Plan Price')}</th>
-                            <th>{Lang::T('Type')}</th>
-                            <th>{Lang::T('Created On')}</th>
-                            <th>{Lang::T('Expires On')}</th>
-                            <th>{Lang::T('Method')}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {foreach $activation as $ds}
-                            <tr onclick="window.location.href = '{$_url}plan/view/{$ds['id']}'" style="cursor:pointer;">
-                                <td>{$ds['invoice']}</td>
-                                <td>{$ds['username']}</td>
-                                <td>{$ds['plan_name']}</td>
-                                <td>{Lang::moneyFormat($ds['price'])}</td>
-                                <td>{$ds['type']}</td>
-                                <td class="text-success">{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}
-                                </td>
-                                <td class="text-danger">{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
-                                <td>{$ds['method']}</td>
-                            </tr>
-                        {/foreach}
-                    </tbody>
-                {/if}
-                {if Lang::arrayCount($order)}
-                    <thead>
-                        <tr>
-                            <th>{Lang::T('Plan Name')}</th>
-                            <th>{Lang::T('Gateway')}</th>
-                            <th>{Lang::T('Routers')}</th>
-                            <th>{Lang::T('Type')}</th>
-                            <th>{Lang::T('Plan Price')}</th>
-                            <th>{Lang::T('Created On')}</th>
-                            <th>{Lang::T('Expires On')}</th>
-                            <th>{Lang::T('Date Done')}</th>
-                            <th>{Lang::T('Method')}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {foreach $order as $ds}
-                            <tr>
-                                <td>{$ds['plan_name']}</td>
-                                <td>{$ds['gateway']}</td>
-                                <td>{$ds['routers']}</td>
-                                <td>{$ds['payment_channel']}</td>
-                                <td>{Lang::moneyFormat($ds['price'])}</td>
-                                <td class="text-primary">{Lang::dateTimeFormat($ds['created_date'])}</td>
-                                <td class="text-danger">{Lang::dateTimeFormat($ds['expired_date'])}</td>
-                                <td class="text-success">{if $ds['status']!=1}{Lang::dateTimeFormat($ds['paid_date'])}{/if}</td>
-                                <td>{if $ds['status']==1}{Lang::T('UNPAID')}
-                                    {elseif $ds['status']==2}{Lang::T('PAID')}
-                                    {elseif $ds['status']==3}{$_L['FAILED']}
-                                    {elseif $ds['status']==4}{Lang::T('CANCELED')}
-                                    {elseif $ds['status']==5}{Lang::T('UNKNOWN')}
-                                    {/if}</td>
-                            </tr>
-                        {/foreach}
-                    </tbody>
-                {/if}
-            </table>
-        </div>
-        {include file="pagination.tpl"}
+</div>
+<hr>
+<div class="row">
+    <div class="col-xs-4">
+        <a href="{$_url}customers/list" class="btn btn-primary btn-sm btn-block">{Lang::T('Back')}</a>
+    </div>
+    <div class="col-xs-4">
+        <a href="{$_url}customers/sync/{$d['id']}" onclick="return confirm('This will sync Customer to Mikrotik?')"
+            class="btn btn-info btn-sm btn-block">{Lang::T('Sync')}</a>
+    </div>
+    <div class="col-xs-4">
+        <a href="{$_url}message/send/{$d['id']}" class="btn btn-success btn-sm btn-block">{Lang::T('Send
+        Message')}</a>
     </div>
 </div>
 
diff --git a/version.json b/version.json
index 217c3e99..33f2616c 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.9.25"
+    "version": "2024.10.7"
 }
\ No newline at end of file

From 5b51af1b6e658438659fbaf311d466d1429aa72a Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Tue, 8 Oct 2024 09:50:23 +0700
Subject: [PATCH 8/8] change variable user to name to check pppoe online
 customer

---
 system/devices/MikrotikPppoe.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/devices/MikrotikPppoe.php b/system/devices/MikrotikPppoe.php
index ef407781..6ad96475 100644
--- a/system/devices/MikrotikPppoe.php
+++ b/system/devices/MikrotikPppoe.php
@@ -297,7 +297,7 @@ class MikrotikPppoe
         $client = $this->getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
         $printRequest = new RouterOS\Request(
             '/ppp active print',
-            RouterOS\Query::where('user', $customer['username'])
+            RouterOS\Query::where('name', $customer['username'])
         );
         return $client->sendSync($printRequest)->getProperty('.id');
     }

{Lang::pad(Lang::T('Type'), ' ', 2)}	{$in['type']}
{Lang::pad(Lang::T('Package Name'), ' ', 2)}	{$in['plan_name']}
{Lang::pad(Lang::T('Package Price'), ' ', 2)}	{Lang::moneyFormat($in['price'])}
{Lang::pad(Lang::T('Username'), ' ', 2)}	{$in['username']}
{Lang::pad(Lang::T('Password'), ' ', 2)}	**********
{Lang::pad(Lang::T('Payment Method'), ' ', 2)}	{$in['method']}
{Lang::pad(Lang::T('Created On'), ' ', 2)}	{Lang::dateAndTimeFormat($in['recharged_on'], $in['recharged_time'])}
{Lang::pad(Lang::T('Expires On'), ' ', 2)}	{Lang::dateAndTimeFormat($in['expiration'], $in['time'])}