Merge branch 'Development' into master

.htaccess_firewall

@@ -7,3 +7,8 @@
     Order Allow,Deny
     Allow from all
 </Files>
+
+<Files update.php>
+    Order Allow,Deny
+    Allow from all
+</Files>

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 # CHANGELOG
 
+## 2024.3.26
+
+- Change paginator, to make easy customization using pagination.tpl
+
+## 2024.3.25
+
+- Fix maps on HTTP
+- Fix Cancel payment
+
+## 2024.3.23
+
+- Maps full height
+- Show Get Directions instead Coordinates
+- Maps Label always show
+
+## 2024.3.22
+
+- Fix Broadcast Message by @Focuslinkstech
+- Add Location Picker
+
 ## 2024.3.20
 
 - Fixing some bugs

install/phpnuxbill.sql

@@ -21,7 +21,7 @@ CREATE TABLE `tbl_customers` (
   `id` int(10) NOT NULL,
   `username` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `pppoe_password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT 'For PPPOE Login',
+  `pppoe_password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'For PPPOE Login',
   `fullname` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `address` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
   `phonenumber` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0',

system/autoload/Message.php

@@ -5,6 +5,12 @@
  *  by https://t.me/ibnux
  **/
 
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+use PHPMailer\PHPMailer\SMTP;
+require $root_path . 'system/autoload/mail/Exception.php';
+require $root_path . 'system/autoload/mail/PHPMailer.php';
+require $root_path . 'system/autoload/mail/SMTP.php';
 
 class Message
 {
@@ -66,6 +72,44 @@ class Message
         }
     }
 
+    public static function sendEmail($to, $subject, $body)
+    {
+        global $config;
+        run_hook('send_email'); #HOOK
+        if (empty($config['smtp_host'])) {
+            $attr = "";
+            if (!empty($config['mail_from'])) {
+                $attr .= "From: " . $config['mail_from'] . "\r\n";
+            }
+            if (!empty($config['mail_reply_to'])) {
+                $attr .= "Reply-To: " . $config['mail_reply_to'] . "\r\n";
+            }
+            mail($to, $subject, $body, $attr);
+        } else {
+            $mail = new PHPMailer();
+            $mail->isSMTP();
+            $mail->SMTPDebug = SMTP::DEBUG_SERVER;
+            $mail->Host       = $config['smtp_host'];
+            $mail->SMTPAuth   = true;
+            $mail->Username   = $config['smtp_user'];
+            $mail->Password   = $config['smtp_pass'];
+            $mail->SMTPSecure = $config['smtp_ssltls'];
+            $mail->Port       = $config['smtp_port'];
+            if (!empty($config['mail_from'])) {
+                $mail->setFrom($config['mail_from']);
+            }
+            if (!empty($config['mail_reply_to'])) {
+                $mail->addReplyTo($config['mail_reply_to']);
+            }
+            $mail->isHTML(false);
+            $mail->addAddress($to);
+            $mail->Subject = $subject;
+            $mail->Body    = $body;
+            $mail->send();
+            die();
+        }
+    }
+
     public static function sendPackageNotification($customer, $package, $price, $message, $via)
     {
         global $u;
@@ -73,7 +117,7 @@ class Message
         $msg = str_replace('[[username]]', $customer['username'], $msg);
         $msg = str_replace('[[package]]', $package, $msg);
         $msg = str_replace('[[price]]', $price, $msg);
-        if($u){
+        if ($u) {
             $msg = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($u['expiration'], $u['time']), $msg);
         }
         if (

system/autoload/Package.php

@@ -44,6 +44,7 @@ class Package
                 foreach ($bills as $k => $v) {
                     $note .= $k . " : " . Lang::moneyFormat($v) . "\n";
                 }
+                $note .= $p['name_plan'] . " : " . Lang::moneyFormat($p['price']) . "\n";
             }
         }
 
@@ -286,7 +287,7 @@ class Package
                     "\nRouter: " . $router_name .
                     "\nGateway: " . $gateway .
                     "\nChannel: " . $channel .
-                    "\nPrice: " . Lang::moneyFormat($p['price']) .
+                    "\nPrice: " . Lang::moneyFormat($p['price'] + $add_cost) .
                     "\nNote:\n" . $note);
             } else {
                 if ($p['is_radius']) {
@@ -374,7 +375,7 @@ class Package
                     "\nRouter: " . $router_name .
                     "\nGateway: " . $gateway .
                     "\nChannel: " . $channel .
-                    "\nPrice: " . Lang::moneyFormat($p['price']) .
+                    "\nPrice: " . Lang::moneyFormat($p['price'] + $add_cost) .
                     "\nNote:\n" . $note);
             }
         } else {
@@ -481,7 +482,7 @@ class Package
                     "\nRouter: " . $router_name .
                     "\nGateway: " . $gateway .
                     "\nChannel: " . $channel .
-                    "\nPrice: " . Lang::moneyFormat($p['price']) .
+                    "\nPrice: " . Lang::moneyFormat($p['price'] + $add_cost) .
                     "\nNote:\n" . $note);
             } else {
                 if ($p['is_radius']) {
@@ -520,7 +521,9 @@ class Package
                 $t->plan_name = $p['name_plan'];
                 if ($p['validity_unit'] == 'Period') {
                     // Postpaid price always zero for first time
-                    $t->price = 0 + $add_cost;
+                    $note = '';
+                    $bills = [];
+                    $t->price = 0;
                 } else {
                     $t->price = $p['price'] + $add_cost;
                 }
@@ -569,7 +572,7 @@ class Package
                     "\nRouter: " . $router_name .
                     "\nGateway: " . $gateway .
                     "\nChannel: " . $channel .
-                    "\nPrice: " . Lang::moneyFormat($p['price']) .
+                    "\nPrice: " . Lang::moneyFormat($p['price'] + $add_cost) .
                     "\nNote:\n" . $note);
             }
         }

system/autoload/Paginator.php

@@ -1,14 +1,82 @@
 <?php
 
 /**
- *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ *  PHP Mikrotik Billing (https://github.com/SiberTech/)
  *  by https://t.me/ibnux
  **/
 
 
 class Paginator
 {
-    public static function build($table, $colVal = [], $query='', $per_page = '10')
+    public static function findMany($query, $search = [], $per_page = '10')
+    {
+        global $routes, $ui;
+        $adjacents = "2";
+        $page = _get('p', 1);
+        $page = (empty($page) ? 1 : $page);
+        $url = U . implode('/', $routes);
+        if (count($search) > 0) {
+            $url .= '&' . http_build_query($search);
+        }
+        $url .= '&p=';
+        $totalReq = $query->count();
+        $next = $page + 1;
+        $lastpage = ceil($totalReq / $per_page);
+        $lpm1 = $lastpage - 1;
+        $limit = $per_page;
+        $startpoint = ($page * $limit) - $limit;
+        if ($lastpage >= 1) {
+            $pages = [];
+            if ($lastpage < 7 + ($adjacents * 2)) {
+                for ($counter = 1; $counter <= $lastpage; $counter++) {
+                    $pages[] = $counter;
+                }
+            } elseif ($lastpage > 5 + ($adjacents * 2)) {
+                if ($page < 1 + ($adjacents * 2)) {
+                    for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
+                        $pages[] = $counter;
+                    }
+                    $pages[] = "...";
+                    $pages[] = $lpm1;
+                    $pages[] = $lastpage;
+                } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
+                    $pages[] = "1";
+                    $pages[] = "2";
+                    $pages[] = "...";
+                    for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
+                        $pages[] = $counter;
+                    }
+                    $pages[] = "...";
+                    $pages[] = $lpm1;
+                    $pages[] = $lastpage;
+                } else {
+                    $pages[] = "1";
+                    $pages[] = "2";
+                    $pages[] = "...";
+                    for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
+                        $pages[] = $counter;
+                    }
+                }
+            }
+
+            $result = [
+                'count' => $lastpage,
+                'limit' => $per_page,
+                'startpoint' => $startpoint,
+                'url' => $url,
+                'page' => $page,
+                'pages' => $pages,
+                'prev' => ($page > 0) ? ($page - 1) : "0",
+                'next' => ($page >= $lastpage) ? $lastpage : $page + 1
+            ];
+            if ($ui) {
+                $ui->assign('paginator', $result);
+            }
+            return $query->offset($startpoint)->limit($per_page)->find_many();
+        }
+    }
+
+    public static function build($table, $colVal = [], $query = '', $per_page = '10')
     {
         global $routes;
         global $_L;
@@ -17,13 +85,13 @@ class Paginator
         $adjacents = "2";
         $page = (int)(empty(_get('p')) ? 1 : _get('p'));
         $pagination = "";
-        foreach($colVal as $k=>$v) {
+        foreach ($colVal as $k => $v) {
-            if(!is_array($v) && strpos($v,'%') === false) {
+            if (!is_array($v) && strpos($v, '%') === false) {
                 $table = $table->where($k, $v);
-            }else{
+            } else {
-                if(is_array($v)){
+                if (is_array($v)) {
                     $table = $table->where_in($k, $v);
-                }else{
+                } else {
                     $table = $table->where_like($k, $v);
                 }
             }
@@ -36,60 +104,60 @@ class Paginator
         $limit = $per_page;
         $startpoint = ($page * $limit) - $limit;
         if ($lastpage >= 1) {
-            $pagination .= '<ul class="pagination pagination-sm">';
+            $pagination .= '<ul class="pagination">';
             if ($lastpage < 7 + ($adjacents * 2)) {
                 for ($counter = 1; $counter <= $lastpage; $counter++) {
                     if ($counter == $page)
-                        $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                        $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                     else
-                        $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                        $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                 }
             } elseif ($lastpage > 5 + ($adjacents * 2)) {
                 if ($page < 1 + ($adjacents * 2)) {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
                 } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
-                    $pagination .= "<li><a href='{$url}&p=1&q=$query'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=2&q=$query'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
                 } else {
-                    $pagination .= "<li><a href='{$url}&p=1&q=$query'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=2&q=$query'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a class='disabled'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link disabled'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                     }
                 }
             }
 
             if ($page < $counter - 1) {
-                $pagination .= "<li><a href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>";
             } else {
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Last') . "</a></li>";
             }
             $pagination .= "</ul>";
-
+            $pagination = '<nav>' . $pagination . '</nav>';
             return array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
         }
     }
@@ -103,7 +171,7 @@ class Paginator
         $page = (int)(!isset($routes['2']) ? 1 : $routes['2']);
         $pagination = "";
 
-        if(is_object($table)){
+        if (is_object($table)) {
             if ($w1 != '') {
                 $totalReq = $table->where($w1, $c1)->count();
             } elseif ($w2 != '') {
@@ -115,7 +183,7 @@ class Paginator
             } else {
                 $totalReq = $table->count();
             }
-        }else{
+        } else {
             if ($w1 != '') {
                 $totalReq = ORM::for_table($table)->where($w1, $c1)->count();
             } elseif ($w2 != '') {
@@ -142,59 +210,60 @@ class Paginator
         $startpoint = ($page * $limit) - $limit;
 
         if ($lastpage >= 1) {
-            $pagination .= '<ul class="pagination pagination-sm">';
+            $pagination .= '<ul class="pagination">';
             if ($lastpage < 7 + ($adjacents * 2)) {
                 for ($counter = 1; $counter <= $lastpage; $counter++) {
                     if ($counter == $page)
-                        $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                        $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                     else
-                        $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                        $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                 }
             } elseif ($lastpage > 5 + ($adjacents * 2)) {
                 if ($page < 1 + ($adjacents * 2)) {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } else {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a class='disabled'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link disabled'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
                 }
             }
 
             if ($page < $counter - 1) {
-                $pagination .= "<li><a href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
             } else {
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Last') . "</a></li>";
             }
             $pagination .= "</ul>";
+            $pagination = '<nav>' . $pagination . '</nav>';
 
             $gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
             return $gen;
@@ -209,13 +278,13 @@ class Paginator
         $adjacents = "2";
         $page = (int)(!isset($routes['2']) ? 1 : $routes['2']);
         $pagination = "";
-        if(is_object($table)){
+        if (is_object($table)) {
             if ($w1 != '') {
                 $totalReq = $table->where_raw($w1, $c1)->count();
             } else {
                 $totalReq = $table->count();
             }
-        }else{
+        } else {
             if ($w1 != '') {
                 $totalReq = ORM::for_table($table)->where_raw($w1, $c1)->count();
             } else {
@@ -236,59 +305,60 @@ class Paginator
         $startpoint = ($page * $limit) - $limit;
 
         if ($lastpage >= 1) {
-            $pagination .= '<ul class="pagination pagination-sm">';
+            $pagination .= '<ul class="pagination">';
             if ($lastpage < 7 + ($adjacents * 2)) {
                 for ($counter = 1; $counter <= $lastpage; $counter++) {
                     if ($counter == $page)
-                        $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                        $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                     else
-                        $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                        $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                 }
             } elseif ($lastpage > 5 + ($adjacents * 2)) {
                 if ($page < 1 + ($adjacents * 2)) {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } else {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a class='disabled'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-item disabled'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
                 }
             }
 
             if ($page < $counter - 1) {
-                $pagination .= "<li><a href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
             } else {
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Last') . "</a></li>";
             }
             $pagination .= "</ul>";
+            $pagination = '<nav>' . $pagination . '</nav>';
 
             $gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
             return $gen;

system/autoload/mail/Exception.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * PHPMailer Exception class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * PHPMailer exception handler.
+ *
+ * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ */
+class Exception extends \Exception
+{
+    /**
+     * Prettify error message output.
+     *
+     * @return string
+     */
+    public function errorMessage()
+    {
+        return '<strong>' . htmlspecialchars($this->getMessage(), ENT_COMPAT | ENT_HTML401) . "</strong><br />\n";
+    }
+}

system/controllers/bandwidth.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  *  by https://t.me/ibnux
@@ -12,30 +13,29 @@ $action = $routes['1'];
 $ui->assign('_admin', $admin);
 
 if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-	r2(U."dashboard",'e',Lang::T('You do not have permission to access this page'));
+    r2(U . "dashboard", 'e', Lang::T('You do not have permission to access this page'));
 }
 
 switch ($action) {
     case 'list':
-		$ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/bandwidth.js"></script>');
+        $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/bandwidth.js"></script>');
         run_hook('view_list_bandwidth'); #HOOK
-		$name = _post('name');
+        $name = _post('name');
-		if ($name != ''){
+        if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_bandwidth'), ['name_bw' => '%' . $name . '%'], $name);
+            $query = ORM::for_table('tbl_bandwidth')->where_like('name_bw', '%' . $name . '%')->order_by_desc('id');
-			$d = ORM::for_table('tbl_bandwidth')->where_like('name_bw','%'.$name.'%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
-		}else{
+        } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_bandwidth'));
+            $query = ORM::for_table('tbl_bandwidth')->order_by_desc('id');
-			$d = ORM::for_table('tbl_bandwidth')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query);
-		}
+        }
 
-        $ui->assign('d',$d);
+        $ui->assign('d', $d);
-		$ui->assign('paginator',$paginator);
         $ui->display('bandwidth.tpl');
         break;
 
     case 'add':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         run_hook('view_add_bandwidth'); #HOOK
         $ui->display('bandwidth-add.tpl');
@@ -43,28 +43,28 @@ switch ($action) {
 
     case 'edit':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         $id  = $routes['2'];
         run_hook('view_edit_bandwith'); #HOOK
         $d = ORM::for_table('tbl_bandwidth')->find_one($id);
-        if($d){
+        if ($d) {
-            $ui->assign('burst',explode(" ", $d['burst']));
+            $ui->assign('burst', explode(" ", $d['burst']));
-            $ui->assign('d',$d);
+            $ui->assign('d', $d);
             $ui->display('bandwidth-edit.tpl');
-        }else{
+        } else {
             r2(U . 'bandwidth/list', 'e', $_L['Account_Not_Found']);
         }
         break;
 
     case 'delete':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         $id  = $routes['2'];
         run_hook('delete_bandwidth'); #HOOK
         $d = ORM::for_table('tbl_bandwidth')->find_one($id);
-        if($d){
+        if ($d) {
             $d->delete();
             r2(U . 'bandwidth/list', 's', Lang::T('Data Deleted Successfully'));
         }
@@ -72,40 +72,48 @@ switch ($action) {
 
     case 'add-post':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         $name = _post('name');
         $rate_down = _post('rate_down');
         $rate_down_unit = _post('rate_down_unit');
-		$rate_up = _post('rate_up');
+        $rate_up = _post('rate_up');
-		$rate_up_unit = _post('rate_up_unit');
+        $rate_up_unit = _post('rate_up_unit');
         run_hook('add_bandwidth'); #HOOK
         $isBurst = true;
         $burst = "";
-        if(isset($_POST['burst'])){
+        if (isset($_POST['burst'])) {
-            foreach($_POST['burst'] as $b){
+            foreach ($_POST['burst'] as $b) {
-                if(empty($b)){
+                if (empty($b)) {
                     $isBurst = false;
                 }
             }
-            if($isBurst){
+            if ($isBurst) {
                 $burst = implode(' ', $_POST['burst']);
             };
         }
         $msg = '';
-        if(Validator::Length($name,16,4) == false){
+        if (Validator::Length($name, 16, 4) == false) {
-            $msg .= 'Name should be between 5 to 15 characters'. '<br>';
+            $msg .= 'Name should be between 5 to 15 characters' . '<br>';
         }
 
-        if($rate_down_unit == 'Kbps'){ $unit_rate_down = $rate_down * 1024; }else{ $unit_rate_down = $rate_down * 1048576; }
+        if ($rate_down_unit == 'Kbps') {
-		if($rate_up_unit == 'Kbps'){	$unit_rate_up = $min_up * 1024; }else{ $unit_rate_up = $min_up * 1048576; }
+            $unit_rate_down = $rate_down * 1024;
-
+        } else {
-        $d = ORM::for_table('tbl_bandwidth')->where('name_bw',$name)->find_one();
+            $unit_rate_down = $rate_down * 1048576;
-        if($d){
+        }
-            $msg .= Lang::T('Name Bandwidth Already Exist'). '<br>';
+        if ($rate_up_unit == 'Kbps') {
+            $unit_rate_up = $min_up * 1024;
+        } else {
+            $unit_rate_up = $min_up * 1048576;
         }
 
-        if($msg == ''){
+        $d = ORM::for_table('tbl_bandwidth')->where('name_bw', $name)->find_one();
+        if ($d) {
+            $msg .= Lang::T('Name Bandwidth Already Exist') . '<br>';
+        }
+
+        if ($msg == '') {
             $d = ORM::for_table('tbl_bandwidth')->create();
             $d->name_bw = $name;
             $d->rate_down = $rate_down;
@@ -116,53 +124,53 @@ switch ($action) {
             $d->save();
 
             r2(U . 'bandwidth/list', 's', Lang::T('Data Created Successfully'));
-        }else{
+        } else {
             r2(U . 'bandwidth/add', 'e', $msg);
         }
         break;
 
     case 'edit-post':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         $name = _post('name');
         $rate_down = _post('rate_down');
         $rate_down_unit = _post('rate_down_unit');
-		$rate_up = _post('rate_up');
+        $rate_up = _post('rate_up');
-		$rate_up_unit = _post('rate_up_unit');
+        $rate_up_unit = _post('rate_up_unit');
-		run_hook('edit_bandwidth'); #HOOK
+        run_hook('edit_bandwidth'); #HOOK
         $isBurst = true;
         $burst = "";
-        if(isset($_POST['burst'])){
+        if (isset($_POST['burst'])) {
-            foreach($_POST['burst'] as $b){
+            foreach ($_POST['burst'] as $b) {
-                if(empty($b)){
+                if (empty($b)) {
                     $isBurst = false;
                 }
             }
-            if($isBurst){
+            if ($isBurst) {
                 $burst = implode(' ', $_POST['burst']);
             };
         }
         $msg = '';
-        if(Validator::Length($name,16,4) == false){
+        if (Validator::Length($name, 16, 4) == false) {
-            $msg .= 'Name should be between 5 to 15 characters'. '<br>';
+            $msg .= 'Name should be between 5 to 15 characters' . '<br>';
         }
 
         $id = _post('id');
         $d = ORM::for_table('tbl_bandwidth')->find_one($id);
-        if($d){
+        if ($d) {
-        }else{
+        } else {
-            $msg .= Lang::T('Data Not Found'). '<br>';
+            $msg .= Lang::T('Data Not Found') . '<br>';
         }
 
-        if($d['name_bw'] != $name){
+        if ($d['name_bw'] != $name) {
-            $c = ORM::for_table('tbl_bandwidth')->where('name_bw',$name)->find_one();
+            $c = ORM::for_table('tbl_bandwidth')->where('name_bw', $name)->find_one();
-            if($c){
+            if ($c) {
-                $msg .= Lang::T('Name Bandwidth Already Exist'). '<br>';
+                $msg .= Lang::T('Name Bandwidth Already Exist') . '<br>';
             }
         }
 
-        if($msg == ''){
+        if ($msg == '') {
             $d->name_bw = $name;
             $d->rate_down = $rate_down;
             $d->rate_down_unit = $rate_down_unit;
@@ -172,8 +180,8 @@ switch ($action) {
             $d->save();
 
             r2(U . 'bandwidth/list', 's', Lang::T('Data Updated Successfully'));
-        }else{
+        } else {
-            r2(U . 'bandwidth/edit/'.$id, 'e', $msg);
+            r2(U . 'bandwidth/edit/' . $id, 'e', $msg);
         }
         break;
 

system/controllers/customers.php

@@ -12,40 +12,15 @@ $ui->assign('_system_menu', 'customers');
 $action = $routes['1'];
 $ui->assign('_admin', $admin);
 
-if (empty ($action)) {
+if (empty($action)) {
     $action = 'list';
 }
 
+$leafletpickerHeader = <<<EOT
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css">
+EOT;
+
 switch ($action) {
-    case 'list':
-        $search = _post('search');
-        run_hook('list_customers'); #HOOK
-        if ($search != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_customers'), [
-                'username' => '%' . $search . '%',
-                'fullname' => '%' . $search . '%',
-                'phonenumber' => '%' . $search . '%',
-                'email' => '%' . $search . '%',
-                'service_type' => '%' . $search . '%'
-            ], $search);
-            $d = ORM::for_table('tbl_customers')
-                ->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')")
-                ->offset($paginator['startpoint'])
-                ->limit($paginator['limit'])
-                ->order_by_asc('username')
-                ->find_many();
-        } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_customers'));
-            $d = ORM::for_table('tbl_customers')
-                ->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
-        }
-
-        $ui->assign('search', htmlspecialchars($search));
-        $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
-        $ui->display('customers.tpl');
-        break;
-
     case 'csv':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
@@ -89,6 +64,7 @@ switch ($action) {
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
+        $ui->assign('xheader', $leafletpickerHeader);
         run_hook('view_add_customer'); #HOOK
         $ui->display('customers-add.tpl');
         break;
@@ -210,37 +186,25 @@ switch ($action) {
             $customFields = ORM::for_table('tbl_customers_fields')
                 ->where('customer_id', $customer['id'])
                 ->find_many();
-          
             $v = $routes['3'];
-            if (empty ($v)) {
+            if (empty($v)) {
                 $v = 'activation';
             }
             if ($v == 'order') {
                 $v = 'order';
-                $paginator = Paginator::build(ORM::for_table('tbl_payment_gateway'), ['username' => $customer['username']]);
+                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
-                $order = ORM::for_table('tbl_payment_gateway')
+                $order = Paginator::findMany($query);
-                    ->where('username', $customer['username'])
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])
-                    ->order_by_desc('id')
-                    ->find_many();
-                $ui->assign('paginator', $paginator);
                 $ui->assign('order', $order);
             } else if ($v == 'activation') {
-                $paginator = Paginator::build(ORM::for_table('tbl_transactions'), ['username' => $customer['username']]);
+                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
-                $activation = ORM::for_table('tbl_transactions')
+                $activation = Paginator::findMany($query);
-                    ->where('username', $customer['username'])
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])
-                    ->order_by_desc('id')
-                    ->find_many();
-                $ui->assign('paginator', $paginator);
                 $ui->assign('activation', $activation);
             }
             $ui->assign('packages', User::_billing($customer['id']));
             $ui->assign('v', $v);
             $ui->assign('d', $customer);
             $ui->assign('customFields', $customFields);
+            $ui->assign('xheader', $leafletpickerHeader);
             $ui->display('customers-view.tpl');
         } else {
             r2(U . 'customers/list', 'e', $_L['Account_Not_Found']);
@@ -260,6 +224,7 @@ switch ($action) {
         if ($d) {
             $ui->assign('d', $d);
             $ui->assign('customFields', $customFields);
+            $ui->assign('xheader', $leafletpickerHeader);
             $ui->display('customers-edit.tpl');
         } else {
             r2(U . 'customers/list', 'e', $_L['Account_Not_Found']);
@@ -370,13 +335,13 @@ switch ($action) {
             // Retrieve the customer ID of the newly created customer
             $customerId = $d->id();
             // Save Customers Attributes details
-            if (!empty ($custom_field_names) && !empty ($custom_field_values)) {
+            if (!empty($custom_field_names) && !empty($custom_field_values)) {
                 $totalFields = min(count($custom_field_names), count($custom_field_values));
                 for ($i = 0; $i < $totalFields; $i++) {
                     $name = $custom_field_names[$i];
                     $value = $custom_field_values[$i];
 
-                    if (!empty ($name)) {
+                    if (!empty($name)) {
                         $customField = ORM::for_table('tbl_customers_fields')->create();
                         $customField->customer_id = $customerId;
                         $customField->field_name = $name;
@@ -469,7 +434,7 @@ switch ($action) {
             // Update Customers Attributes values in tbl_customers_fields table
             foreach ($customFields as $customField) {
                 $fieldName = $customField['field_name'];
-                if (isset ($_POST['custom_fields'][$fieldName])) {
+                if (isset($_POST['custom_fields'][$fieldName])) {
                     $customFieldValue = $_POST['custom_fields'][$fieldName];
                     $customField->set('field_value', $customFieldValue);
                     $customField->save();
@@ -477,7 +442,7 @@ switch ($action) {
             }
 
             // Add new Customers Attributess
-            if (isset ($_POST['custom_field_name']) && isset ($_POST['custom_field_value'])) {
+            if (isset($_POST['custom_field_name']) && isset($_POST['custom_field_value'])) {
                 $newCustomFieldNames = $_POST['custom_field_name'];
                 $newCustomFieldValues = $_POST['custom_field_value'];
 
@@ -500,7 +465,7 @@ switch ($action) {
             }
 
             // Delete Customers Attributess
-            if (isset ($_POST['delete_custom_fields'])) {
+            if (isset($_POST['delete_custom_fields'])) {
                 $fieldsToDelete = $_POST['delete_custom_fields'];
                 foreach ($fieldsToDelete as $fieldName) {
                     // Delete the Customers Attributes with the given field name
@@ -530,7 +495,7 @@ switch ($action) {
                             Mikrotik::removeHotspotActiveUser($client, $d['username']);
                         } else {
                             $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                            if (!empty ($d['pppoe_password'])) {
+                            if (!empty($d['pppoe_password'])) {
                                 Mikrotik::setPpoeUser($client, $c['username'], $d['pppoe_password']);
                             } else {
                                 Mikrotik::setPpoeUser($client, $c['username'], $password);
@@ -547,5 +512,20 @@ switch ($action) {
         break;
 
     default:
-        r2(U . 'customers/list', 'e', 'action not defined');
+        $search = _post('search');
+        run_hook('list_customers'); #HOOK
+        if ($search != '') {
+            $query = ORM::for_table('tbl_customers')
+            ->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')")
+            ->order_by_asc('username');
+            $d = Paginator::findMany($query, ['search' => $search]);
+        } else {
+            $query = ORM::for_table('tbl_customers')->order_by_asc('username');
+            $d = Paginator::findMany($query);
+        }
+
+        $ui->assign('search', htmlspecialchars($search));
+        $ui->assign('d', $d);
+        $ui->display('customers.tpl');
+        break;
 }

system/controllers/dashboard.php

@@ -54,13 +54,10 @@ $ui->assign('c_all', $c_all);
 
 if ($config['hide_uet'] != 'yes') {
     //user expire
-    $paginator = Paginator::build(ORM::for_table('tbl_user_recharges'));
+    $query = ORM::for_table('tbl_user_recharges')
-    $expire = ORM::for_table('tbl_user_recharges')
         ->where_lte('expiration', $mdate)
-        ->offset($paginator['startpoint'])
+        ->order_by_desc('expiration');
-        ->limit($paginator['limit'])
+    $expire = Paginator::findMany($query);
-        ->order_by_desc('expiration')
-        ->find_many();
 
     // Get the total count of expired records for pagination
     $totalCount = ORM::for_table('tbl_user_recharges')
@@ -71,7 +68,6 @@ if ($config['hide_uet'] != 'yes') {
     $paginator['total_count'] = $totalCount;
 
     // Assign the pagination HTML to the template variable
-    $ui->assign('paginator', $paginator);
     $ui->assign('expire', $expire);
 }
 

system/controllers/logs.php

@@ -26,16 +26,15 @@ switch ($action) {
             r2(U . "logs/list/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_logs'), ['description' => '%' . $q . '%'], $q);
+            $query = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%')->order_by_desc('id');
-            $d = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_logs'));
+            $query = ORM::for_table('tbl_logs')->order_by_desc('id');
-            $d = ORM::for_table('tbl_logs')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
         $ui->assign('q', $q);
-        $ui->assign('paginator', $paginator);
         $ui->display('logs.tpl');
         break;
     case 'radius':
@@ -46,16 +45,15 @@ switch ($action) {
             r2(U . "logs/radius/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {
-            $paginator = Paginator::build(ORM::for_table('radpostauth', 'radius'), ['username' => '%' . $q . '%'], $q);
+            $query = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%')->order_by_desc('id');
-            $d = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('radpostauth', 'radius'));
+            $query = ORM::for_table('radpostauth', 'radius')->order_by_desc('id');
-            $d = ORM::for_table('radpostauth', 'radius')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
         $ui->assign('q', $q);
-        $ui->assign('paginator', $paginator);
         $ui->display('logs-radius.tpl');
         break;
 

system/controllers/map.php

@@ -28,6 +28,7 @@ switch ($action) {
                     'name' => $customer->fullname,
                     'balance' => $customer->balance,
                     'address' => $customer->address,
+                    'direction' => $customer->coordinates,
                     'info' => Lang::T("Username") . ": " . $customer->username .  " - "  . Lang::T("Full Name") . ": " . $customer->fullname . " - "  . Lang::T("Email") . ": " . $customer->email . " - "  . Lang::T("Phone") . ": " . $customer->phonenumber . " - "  . Lang::T("Service Type") . ": " . $customer->service_type,
                     'coordinates' => '[' . $customer->coordinates . ']',
                 ];
@@ -38,7 +39,7 @@ switch ($action) {
         $ui->assign('xheader', '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css">');
         $ui->assign('_title', Lang::T('Customer Geo Location Information'));
         $ui->assign('xfooter', '<script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>');
-        $ui->display('map-customer.tpl');
+        $ui->display('customers-map.tpl');
         break;
 
     default:

system/controllers/message.php

@@ -95,124 +95,144 @@ EOT;
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
-        $ui->display('message-bulk.tpl');
-        break;
-    case 'send_bulk-post':
-        // Check user permissions
-        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
-            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
-        }
 
         // Get form data
         $group = $_POST['group'];
         $message = $_POST['message'];
         $via = $_POST['via'];
+        $test = isset($_POST['test']) && $_POST['test'] === 'on' ? 'yes' : 'no';
+        $batch = $_POST['batch'];
+        $delay = $_POST['delay'];
 
         // Initialize counters
-        $successCount = 0;
+        $totalSMSSent = 0;
-        $failCount = 0;
+        $totalSMSFailed = 0;
-        $successMessages = [];
+        $totalWhatsappSent = 0;
-        $failMessages = [];
+        $totalWhatsappFailed = 0;
+        $batchStatus = [];
 
-        // Check if fields are empty
+        if (_req('send') == 'now') {
-        if ($group == '' or $message == '' or $via == '') {
+            // Check if fields are empty
-            r2(U . 'message/send_bulk', 'e', Lang::T('All fields are required'));
+            if ($group == '' || $message == '' || $via == '') {
-        } else {
+                r2(U . 'message/send_bulk', 'e', Lang::T('All fields are required'));
-            // Get customer details from the database based on the selected group
-            if ($group == 'all') {
-                $customers = ORM::for_table('tbl_customers')->find_many();
-            } elseif ($group == 'new') {
-                // Get customers created just a month ago
-                $customers = ORM::for_table('tbl_customers')->where_raw("DATE(created_at) >= DATE_SUB(CURDATE(), INTERVAL 1 MONTH)")->find_many();
-            } elseif ($group == 'expired') {
-                // Get expired user recharges where status is 'off'
-                $expired = ORM::for_table('tbl_user_recharges')->where('status', 'off')->find_many();
-                $customer_ids = [];
-                foreach ($expired as $recharge) {
-                    $customer_ids[] = $recharge->customer_id;
-                }
-                $customers = ORM::for_table('tbl_customers')->where_in('id', $customer_ids)->find_many();
-            } elseif ($group == 'active') {
-                // Get active user recharges where status is 'on'
-                $active = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
-                $customer_ids = [];
-                foreach ($active as $recharge) {
-                    $customer_ids[] = $recharge->customer_id;
-                }
-                $customers = ORM::for_table('tbl_customers')->where_in('id', $customer_ids)->find_many();
-            }
-
-            // Loop through customers and send messages
-            foreach ($customers as $customer) {
-                // Create a copy of the original message for each customer and save it as currentMessage
-                $currentMessage = $message;
-
-                // Replace placeholders in the message with actual values for each customer
-                $currentMessage = str_replace('[[name]]', $customer['fullname'], $currentMessage);
-                $currentMessage = str_replace('[[user_name]]', $customer['username'], $currentMessage);
-                $currentMessage = str_replace('[[phone]]', $customer['phonenumber'], $currentMessage);
-                $currentMessage = str_replace('[[company_name]]', $config['CompanyName'], $currentMessage);
-
-                // Send the message based on the selected method
-                if ($via == 'sms' || $via == 'both') {
-                    $smsSent = Message::sendSMS($customer['phonenumber'], $currentMessage);
-                    if ($smsSent) {
-                        $successCount++;
-                        $successMessages[] = "SMS sent to {$customer['fullname']}: {$customer['phonenumber']}";
-                    } else {
-                        $failCount++;
-                        $failMessages[] = "Failed to send SMS to {$customer['fullname']}: {$customer['phonenumber']}";
-                    }
-                    // Introduce a delay of 5 seconds between each SMS
-                    sleep(5);
-                }
-
-                if ($via == 'wa' || $via == 'both') {
-                    $waSent = Message::sendWhatsapp($customer['phonenumber'], $currentMessage);
-                    if ($waSent) {
-                        $successCount++;
-                        $successMessages[] = "WhatsApp message sent to {$customer['fullname']}: {$customer['phonenumber']}";
-                    } else {
-                        $failCount++;
-                        $failMessages[] = "Failed to send WhatsApp message to {$customer['fullname']}: {$customer['phonenumber']}";
-                    }
-                    // Introduce a delay of 5 seconds between each WhatsApp message
-                    sleep(5);
-                }
-            }
-
-            $responseMessage = '';
-
-            if ($successCount > 0) {
-                $responseMessage .= "Messages Sent Successfully: {$successCount}<br>";
-                $responseMessage .= "<ul>";
-                foreach ($successMessages as $successMessage) {
-                    $responseMessage .= "<li>{$successMessage}</li>";
-                }
-                $responseMessage .= "</ul>";
-            }
-
-            if ($failCount > 0) {
-                $responseMessage .= "Failed to send messages: {$failCount}<br>";
-                $responseMessage .= "<ul>";
-                foreach ($failMessages as $failMessage) {
-                    $responseMessage .= "<li>{$failMessage}</li>";
-                }
-                $responseMessage .= "</ul>";
-            }
-
-            if ($responseMessage != '') {
-                r2(U . 'message/send_bulk', 's', $responseMessage);
             } else {
-                r2(U . 'message/send_bulk', 'e', Lang::T('No messages sent'));
+                // Get customer details from the database based on the selected group
+                if ($group == 'all') {
+                    $customers = ORM::for_table('tbl_customers')->find_many()->as_array();
+                } elseif ($group == 'new') {
+                    // Get customers created just a month ago
+                    $customers = ORM::for_table('tbl_customers')->where_raw("DATE(created_at) >= DATE_SUB(CURDATE(), INTERVAL 1 MONTH)")->find_many()->as_array();
+                } elseif ($group == 'expired') {
+                    // Get expired user recharges where status is 'off'
+                    $expired = ORM::for_table('tbl_user_recharges')->where('status', 'off')->find_many();
+                    $customer_ids = [];
+                    foreach ($expired as $recharge) {
+                        $customer_ids[] = $recharge->customer_id;
+                    }
+                    $customers = ORM::for_table('tbl_customers')->where_in('id', $customer_ids)->find_many()->as_array();
+                } elseif ($group == 'active') {
+                    // Get active user recharges where status is 'on'
+                    $active = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
+                    $customer_ids = [];
+                    foreach ($active as $recharge) {
+                        $customer_ids[] = $recharge->customer_id;
+                    }
+                    $customers = ORM::for_table('tbl_customers')->where_in('id', $customer_ids)->find_many()->as_array();
+                }
+
+                // Set the batch size
+                $batchSize = $batch;
+
+                // Calculate the number of batches
+                $totalCustomers = count($customers);
+                $totalBatches = ceil($totalCustomers / $batchSize);
+
+                // Loop through batches
+                for ($batchIndex = 0; $batchIndex < $totalBatches; $batchIndex++) {
+                    // Get the starting and ending index for the current batch
+                    $start = $batchIndex * $batchSize;
+                    $end = min(($batchIndex + 1) * $batchSize, $totalCustomers);
+                    $batchCustomers = array_slice($customers, $start, $end - $start);
+
+                    // Loop through customers in the current batch and send messages
+                    foreach ($batchCustomers as $customer) {
+                        // Create a copy of the original message for each customer and save it as currentMessage
+                        $currentMessage = $message;
+                        $currentMessage = str_replace('[[name]]', $customer['fullname'], $currentMessage);
+                        $currentMessage = str_replace('[[user_name]]', $customer['username'], $currentMessage);
+                        $currentMessage = str_replace('[[phone]]', $customer['phonenumber'], $currentMessage);
+                        $currentMessage = str_replace('[[company_name]]', $config['CompanyName'], $currentMessage);
+
+                        // Send the message based on the selected method
+                        if ($test === 'yes') {
+                            // Only for testing, do not send messages to customers
+                            $batchStatus[] = [
+                                'name' => $customer['fullname'],
+                                'phone' => $customer['phonenumber'],
+                                'message' => $currentMessage,
+                                'status' => 'Test Mode - Message not sent'
+                            ];
+                        } else {
+                            // Send the actual messages
+                            if ($via == 'sms' || $via == 'both') {
+                                $smsSent = Message::sendSMS($customer['phonenumber'], $currentMessage);
+                                if ($smsSent) {
+                                    $totalSMSSent++;
+                                    $batchStatus[] = [
+                                        'name' => $customer['fullname'],
+                                        'phone' => $customer['phonenumber'],
+                                        'message' => $currentMessage,
+                                        'status' => 'SMS Message Sent'
+                                    ];
+                                } else {
+                                    $totalSMSFailed++;
+                                    $batchStatus[] = [
+                                        'name' => $customer['fullname'],
+                                        'phone' => $customer['phonenumber'],
+                                        'message' => $currentMessage,
+                                        'status' => 'SMS Message Failed'
+                                    ];
+                                }
+                            }
+
+                            if ($via == 'wa' || $via == 'both') {
+                                $waSent = Message::sendWhatsapp($customer['phonenumber'], $currentMessage);
+                                if ($waSent) {
+                                    $totalWhatsappSent++;
+                                    $batchStatus[] = [
+                                        'name' => $customer['fullname'],
+                                        'phone' => $customer['phonenumber'],
+                                        'message' => $currentMessage,
+                                        'status' => 'WhatsApp Message Sent'
+                                    ];
+                                } else {
+                                    $totalWhatsappFailed++;
+                                    $batchStatus[] = [
+                                        'name' => $customer['fullname'],
+                                        'phone' => $customer['phonenumber'],
+                                        'message' => $currentMessage,
+                                        'status' => 'WhatsApp Message Failed'
+                                    ];
+                                }
+                            }
+                        }
+                    }
+
+                    // Introduce a delay between each batch
+                    if ($batchIndex < $totalBatches - 1) {
+                        sleep($delay);
+                    }
+                }
             }
         }
-
+        $ui->assign('batchStatus', $batchStatus);
+        $ui->assign('totalSMSSent', $totalSMSSent);
+        $ui->assign('totalSMSFailed', $totalSMSFailed);
+        $ui->assign('totalWhatsappSent', $totalWhatsappSent);
+        $ui->assign('totalWhatsappFailed', $totalWhatsappFailed);
+        $ui->display('message-bulk.tpl');
         break;
 
-
-
-
     default:
         r2(U . 'message/send_sms', 'e', 'action not defined');
 }

system/controllers/order.php

@@ -19,13 +19,8 @@ switch ($action) {
         break;
     case 'history':
         $ui->assign('_system_menu', 'history');
-        $paginator = Paginator::build(ORM::for_table('tbl_payment_gateway'), ['username' => $user['username']]);
+        $query = ORM::for_table('tbl_payment_gateway')->where('username', $user['username'])->order_by_desc('id');
-        $d = ORM::for_table('tbl_payment_gateway')
+        $d = Paginator::findMany($query);
-            ->where('username', $user['username'])
-            ->order_by_desc('id')
-            ->offset($paginator['startpoint'])->limit($paginator['limit'])
-            ->find_many();
-        $ui->assign('paginator', $paginator);
         $ui->assign('d', $d);
         $ui->assign('_title', Lang::T('Order History'));
         run_hook('customer_view_order_history'); #HOOK
@@ -107,8 +102,8 @@ switch ($action) {
         if (empty ($trx)) {
             r2(U . "order/package", 'w', Lang::T("Payment not found"));
         }
-        // jika url kosong, balikin ke buy
+        // jika url kosong, balikin ke buy, kecuali cancel
-        if (empty ($trx['pg_url_payment'])) {
+        if (empty ($trx['pg_url_payment']) && $routes['3'] != 'cancel') {
             r2(U . "order/buy/" . (($trx['routers_id'] == 0) ? $trx['routers'] : $trx['routers_id']) . '/' . $trx['plan_id'], 'w', Lang::T("Checking payment"));
         }
         if ($routes['3'] == 'check') {

system/controllers/plan.php

@@ -68,11 +68,11 @@ switch ($action) {
         $ui->assign('_title', Lang::T('Customer'));
         $search = _post('search');
         if ($search != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_user_recharges'), ['username' => '%' . $search . '%'], $search);
+            $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->order_by_desc('id');
-            $d = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['search' => $search]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_user_recharges'));
+            $query = ORM::for_table('tbl_user_recharges')->order_by_desc('id');
-            $d = ORM::for_table('tbl_user_recharges')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_array();
+            $d = Paginator::findMany($query);
         }
         run_hook('view_list_billing'); #HOOK
         if ($isApi) {
@@ -80,7 +80,6 @@ switch ($action) {
         }
         $ui->assign('d', $d);
         $ui->assign('search', $search);
-        $ui->assign('paginator', $paginator);
         $ui->display('plan.tpl');
         break;
 

system/controllers/pool.php

@@ -23,15 +23,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_pool'), ['pool_name' => '%' . $name . '%'], $name);
+            $query = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%')->order_by_desc('id');
-            $d = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_pool'));
+            $query = ORM::for_table('tbl_pool')->order_by_desc('id');
-            $d = ORM::for_table('tbl_pool')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_pool'); #HOOK
         $ui->display('pool.tpl');
         break;

system/controllers/radius.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  *  by https://t.me/ibnux
@@ -12,7 +13,7 @@ $ui->assign('_admin', $admin);
 
 
 if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-    _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+    _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
 }
 
 switch ($action) {
@@ -134,22 +135,15 @@ switch ($action) {
         $ui->assign('_title', "Network Access Server");
         $name = _post('name');
         if (empty($name)) {
-            $paginator = Paginator::build(ORM::for_table('nas', 'radius'));
+            $query = ORM::for_table('nas', 'radius');
-            $nas = ORM::for_table('nas', 'radius')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $nas = Paginator::findMany($query);
         } else {
-            $paginator = Paginator::build(ORM::for_table('nas', 'radius'), [
+            $query = ORM::for_table('nas', 'radius')
-                'nasname' => '%'.$search.'%',
+                ->where_like('nasname', $search)
-                'shortname' => '%'.$search.'%',
+                ->where_like('shortname', $search)
-                'description' => '%'.$search.'%'
+                ->where_like('description', $search);
-            ]);
+            $nas = Paginator::findMany($query, ['name' => $name]);
-            $nas = ORM::for_table('nas', 'radius')
-            ->where_like('nasname', $search)
-            ->where_like('shortname', $search)
-            ->where_like('description', $search)
-            ->offset($paginator['startpoint'])->limit($paginator['limit'])
-            ->find_many();
         }
-        $ui->assign('paginator', $paginator);
         $ui->assign('name', $name);
         $ui->assign('nas', $nas);
         $ui->display('radius-nas.tpl');

system/controllers/reports.php

@@ -30,28 +30,26 @@ switch ($action) {
             r2(U . "logs/list/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_transactions'), ['invoice' => '%' . $q . '%'], $q);
+            $query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->order_by_desc('id');
-            $d = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_transactions'));
+            $query = ORM::for_table('tbl_transactions')->order_by_desc('id');
-            $d = ORM::for_table('tbl_transactions')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('activation', $d);
         $ui->assign('q', $q);
-        $ui->assign('paginator', $paginator);
         $ui->display('reports-activation.tpl');
         break;
     case 'daily-report':
-        $paginator = Paginator::build(ORM::for_table('tbl_transactions'), ['recharged_on' => $mdate]);
+        $query = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->order_by_desc('id');
-        $d = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+        $d = Paginator::findMany($query);
-        $dr = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->sum('price');
+        $dr = $query->sum('price');
 
         $ui->assign('d', $d);
         $ui->assign('dr', $dr);
         $ui->assign('mdate', $mdate);
         $ui->assign('mtime', $mtime);
-        $ui->assign('paginator', $paginator);
         run_hook('view_daily_reports'); #HOOK
         $ui->display('reports-daily.tpl');
         break;

system/controllers/routers.php

@@ -17,7 +17,7 @@ use PEAR2\Net\RouterOS;
 require_once 'system/autoload/PEAR2/Autoload.php';
 
 if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-    _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+    _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
 }
 
 switch ($action) {
@@ -26,15 +26,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_routers'), ['name' => '%' . $name . '%'], $name);
+            $query = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%')->order_by_desc('id');
-            $d = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_routers'));
+            $query = ORM::for_table('tbl_routers')->order_by_desc('id');
-            $d = ORM::for_table('tbl_routers')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_routers'); #HOOK
         $ui->display('routers.tpl');
         break;

system/controllers/services.php

@@ -119,15 +119,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['name_plan' => '%' . $name . '%', 'type' => 'Hotspot'], $name);
+            $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $d = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query, ['name'=> $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['type' => 'Hotspot']);
+            $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot');
-            $d = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_plans'); #HOOK
         $ui->display('hotspot.tpl');
         break;
@@ -393,15 +392,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['name_plan' => '%' . $name . '%', 'type' => 'PPPOE'], $name);
+            $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $d = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where_like('tbl_plans.name_plan', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['type' => 'PPPOE'], $name);
+            $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE');
-            $d = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_ppoe'); #HOOK
         $ui->display('pppoe.tpl');
         break;
@@ -646,15 +644,14 @@ switch ($action) {
         $ui->assign('_title', Lang::T('Balance Plans'));
         $name = _post('name');
         if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['name_plan' => '%' . $name . '%', 'type' => 'Balance'], $name);
+            $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $d = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->where_like('tbl_plans.name_plan', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['type' => 'Balance'], $name);
+            $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance');
-            $d = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_balance'); #HOOK
         $ui->display('balance.tpl');
         break;

system/controllers/settings.php

@@ -25,12 +25,16 @@ switch ($action) {
             $result = Message::sendSMS(_get('testSms'), 'PHPNuxBill Test SMS');
             r2(U . "settings/app", 's', 'Test SMS has been send<br>Result: ' . $result);
         }
+        if (!empty(_get('testEmail'))) {
+            Message::sendEmail(_get('testEmail'), 'PHPNuxBill Test Email', 'PHPNuxBill Test Email Body');
+            r2(U . "settings/app", 's', 'Test Email has been send');
+        }
         if (!empty(_get('testTg'))) {
             $result = Message::sendTelegram('PHPNuxBill Test Telegram');
             r2(U . "settings/app", 's', 'Test Telegram has been send<br>Result: ' . $result);
         }
 
-        $UPLOAD_URL_PATH = str_replace($root_path,'',  $UPLOAD_PATH);
+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
         if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png')) {
             $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
         } else {
@@ -276,60 +280,47 @@ switch ($action) {
         $search = _req('search');
         if ($search != '') {
             if ($admin['user_type'] == 'SuperAdmin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'), ['username' => '%' . $search . '%'], $search);
+                $query = ORM::for_table('tbl_users')
-                $d = ORM::for_table('tbl_users')
                     ->where_like('username', '%' . $search . '%')
-                    ->offset($paginator['startpoint'])
+                    ->order_by_asc('id');
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                $d = Paginator::findMany($query, ['search' => $search]);
             } else if ($admin['user_type'] == 'Admin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'), [
+                $query = ORM::for_table('tbl_users')
-                    'username' => '%' . $search . '%',
+                    ->where_like('username', '%' . $search . '%')->where_any_is([
-                    ['user_type' => 'Report'],
-                    ['user_type' => 'Agent'],
-                    ['user_type' => 'Sales'],
-                    ['id' => $admin['id']]
-                ], $search);
-                $d = ORM::for_table('tbl_users')
-                    ->where_like('username', '%' . $search . '%')
-                    ->where_any_is([
                         ['user_type' => 'Report'],
                         ['user_type' => 'Agent'],
                         ['user_type' => 'Sales'],
                         ['id' => $admin['id']]
-                    ])
+                    ])->order_by_asc('id');
-                    ->offset($paginator['startpoint'])
+                $d = Paginator::findMany($query, ['search' => $search]);
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
             } else {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'), ['username' => '%' . $search . '%'], $search);
+                $query = ORM::for_table('tbl_users')
-                $d = ORM::for_table('tbl_users')
                     ->where_like('username', '%' . $search . '%')
                     ->where_any_is([
                         ['id' => $admin['id']],
                         ['root' => $admin['id']]
-                    ])
+                    ])->order_by_asc('id');
-                    ->offset($paginator['startpoint'])
+                $d = Paginator::findMany($query, ['search' => $search]);
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
             }
         } else {
             if ($admin['user_type'] == 'SuperAdmin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'));
+                $query = ORM::for_table('tbl_users')->order_by_asc('id');
-                $d = ORM::for_table('tbl_users')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                $d = Paginator::findMany($query);
             } else if ($admin['user_type'] == 'Admin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'));
+                $query = ORM::for_table('tbl_users')->where_any_is([
-                $d = ORM::for_table('tbl_users')->where_any_is([
                     ['user_type' => 'Report'],
                     ['user_type' => 'Agent'],
                     ['user_type' => 'Sales'],
                     ['id' => $admin['id']]
-                ])->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                ])->order_by_asc('id');
+                $d = Paginator::findMany($query);
             } else {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'));
+                $query = ORM::for_table('tbl_users')
-                $d = ORM::for_table('tbl_users')
                     ->where_any_is([
                         ['id' => $admin['id']],
                         ['root' => $admin['id']]
-                    ])
+                    ])->order_by_asc('id');
-                    ->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                $d = Paginator::findMany($query);
             }
         }
         $admins = [];
@@ -354,7 +345,6 @@ switch ($action) {
         $ui->assign('admins', $admins);
         $ui->assign('d', $d);
         $ui->assign('search', $search);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_admin'); #HOOK
         $ui->display('users.tpl');
         break;

system/controllers/voucher.php

@@ -40,11 +40,10 @@ switch ($action) {
 
     case 'list-activated':
         $ui->assign('_system_menu', 'list-activated');
-        $paginator = Paginator::build(ORM::for_table('tbl_transactions'), ['username' => $user['username']]);
+        $query = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_asc('id');
-        $d = ORM::for_table('tbl_transactions')->where('username', $user['username'])->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+        $d = Paginator::findMany($query);
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('customer_view_activation_list'); #HOOK
         $ui->display('user-activation-list.tpl');
 

system/lan/country.json

@@ -26,6 +26,7 @@
     "hebrew": "iw",
     "hindi": "hi",
     "hungarian": "hu",
+    "iran": "ir",
     "icelandic": "is",
     "italian": "it",
     "japanese": "ja",

system/lan/english.json

@@ -515,5 +515,26 @@
     "List": "List",
     "Lists": "Lists",
     "Single_Customer": "Single Customer",
-    "Bulk_Customers": "Bulk Customers"
+    "Bulk_Customers": "Bulk Customers",
+    "Message_per_time": "Message per time",
+    "5_Messages": "5 Messages",
+    "10_Messages": "10 Messages",
+    "15_Messages": "15 Messages",
+    "20_Messages": "20 Messages",
+    "30_Messages": "30 Messages",
+    "40_Messages": "40 Messages",
+    "50_Messages": "50 Messages",
+    "60_Messages": "60 Messages",
+    "Use_20_and_above_if_you_are_sending_to_all_customers_to_avoid_server_time_out": "Use 20 and above if you are sending to all customers to avoid server time out",
+    "Delay": "Delay",
+    "No_Delay": "No Delay",
+    "5_Seconds": "5 Seconds",
+    "10_Seconds": "10 Seconds",
+    "15_Seconds": "15 Seconds",
+    "20_Seconds": "20 Seconds",
+    "Use_at_least_5_secs_if_you_are_sending_to_all_customers_to_avoid_being_banned_by_your_message_provider": "Use at least 5 secs if you are sending to all customers to avoid being banned by your message provider",
+    "Testing__if_checked_no_real_message_is_sent_": "Testing [if checked no real message is sent]",
+    "All_fields_are_required": "All fields are required",
+    "Personal": "Personal",
+    "Email_Notification": "Email Notification"
 }

system/updates.json

@@ -6,13 +6,13 @@
         "ALTER TABLE `tbl_customers_meta` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;"
     ],
     "2023.8.14": [
-        "ALTER TABLE `tbl_customers` ADD `pppoe_password` varchar(45) NOT NULL DEFAULT '1' COMMENT 'For PPPOE Login' AFTER `password`;",
+        "ALTER TABLE `tbl_customers` ADD `pppoe_password` varchar(45) NOT NULL DEFAULT '' COMMENT 'For PPPOE Login' AFTER `password`;",
         "ALTER TABLE `tbl_plans` CHANGE `type` `type` ENUM('Hotspot','PPPOE','Balance') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;",
         "ALTER TABLE `tbl_transactions` CHANGE `type` `type` ENUM('Hotspot','PPPOE','Balance') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;",
         "ALTER TABLE `tbl_customers` ADD `auto_renewal` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Auto renewall using balance' AFTER `balance`;"
     ],
     "2023.8.23": [
-        "ALTER TABLE `tbl_customers` CHANGE `pppoe_password` `pppoe_password` VARCHAR(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT 'For PPPOE Login';"
+        "ALTER TABLE `tbl_customers` CHANGE `pppoe_password` `pppoe_password` VARCHAR(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'For PPPOE Login';"
     ],
     "2023.8.28": [
         "ALTER TABLE `tbl_user_recharges` ADD `recharged_time` time NOT NULL DEFAULT '00:00:00' AFTER `recharged_on`;",
@@ -87,5 +87,8 @@
     ],
     "2024.3.19.2" : [
         "ALTER TABLE `tbl_plans` ADD `plan_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type' ;"
+    ],
+    "2023.3.20": [
+        "ALTER TABLE `tbl_customers` CHANGE `pppoe_password` `pppoe_password` VARCHAR(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'For PPPOE Login';"
     ]
 }

ui/ui/app-settings.tpl

@@ -340,6 +340,68 @@
                     <small id="emailHelp" class="form-text text-muted">You can use WhatsApp in here too. <a
                             href="https://wa.nux.my.id/login" target="_blank">Free Server</a></small>
                 </div>
+                <div class="panel-heading">
+                    <div class="btn-group pull-right">
+                        <a class="btn btn-success btn-xs" style="color: black;" href="javascript:testEmail()">Test Email</a>
+                        <button class="btn btn-primary btn-xs" title="save" type="submit"><span
+                                class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
+                    </div>
+                    {Lang::T('Email Notification')}
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">SMTP Host : port</label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" id="smtp_host" name="smtp_host" value="{$_c['smtp_host']}"
+                                placeholder="smtp.host.tld">
+                        </div>
+                        <div class="col-md-2">
+                            <input type="number" class="form-control" id="smtp_port" name="smtp_port" value="{$_c['smtp_port']}"
+                                placeholder="465 587 port">
+                        </div>
+                        <p class="help-block col-md-4">Empty this to use internal mail() PHP</p>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">SMTP username</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="smtp_user" name="smtp_user" value="{$_c['smtp_user']}"
+                                placeholder="user@host.tld">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">SMTP Password</label>
+                        <div class="col-md-6">
+                            <input type="password" class="form-control" id="smtp_pass" name="smtp_pass" value="{$_c['smtp_pass']}"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">SMTP Security</label>
+                        <div class="col-md-6">
+                            <select name="smtp_ssltls" id="smtp_ssltls" class="form-control">
+                                <option value="" {if $_c['smtp_ssltls']=='' }selected="selected" {/if}>Not Secure</option>
+                                <option value="ssl" {if $_c['smtp_ssltls']=='ssl' }selected="selected" {/if}>SSL</option>
+                                <option value="tls" {if $_c['smtp_ssltls']=='tls' }selected="selected" {/if}>TLS</option>
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">UPPERCASE lowercase RaNdoM</p>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">Mail From</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="mail_from" name="mail_from" value="{$_c['mail_from']}"
+                                placeholder="noreply@host.tld">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">Mail Reply To</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="mail_reply_to" name="mail_reply_to" value="{$_c['mail_reply_to']}"
+                                placeholder="support@host.tld">
+                        </div>
+                        <p class="help-block col-md-4">Customer will reply email to this address, empty if you want to use From Address</p>
+                    </div>
+                </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
@@ -561,6 +623,14 @@ add dst-host=*.{$_domain}</pre>
         }
     }
 
+
+    function testEmail() {
+        var target = prompt("Email\nSave First before Test", "");
+        if (target != null) {
+            window.location.href = '{$_url}settings/app&testEmail=' + target;
+        }
+    }
+
     function testTg() {
         window.location.href = '{$_url}settings/app&testTg=test';
     }

ui/ui/balance.tpl

@@ -46,7 +46,7 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                    {$paginator['contents']}
+                                    {include file="pagination.tpl"}
 
 								</div>
 							</div>

ui/ui/bandwidth.tpl

@@ -48,7 +48,7 @@
                                             </tbody>
                                         </table>
                                     </div>
-						{$paginator['contents']}
+						{include file="pagination.tpl"}
 							</div>
 						</div>
 					</div>

ui/ui/customers-add.tpl

@@ -11,10 +11,10 @@
                         <div class="col-md-9">
                             <div class="input-group">
                                 {if $_c['country_code_phone']!= ''}
-                                <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
                                 {else}
-                                <span class="input-group-addon" id="basic-addon1"><i
+                                    <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-phone-alt"></i></span>
+                                            class="glyphicon glyphicon-phone-alt"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username" required
                                     placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
@@ -38,10 +38,10 @@
                         <div class="col-md-9">
                             <div class="input-group">
                                 {if $_c['country_code_phone']!= ''}
-                                <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
                                 {else}
-                                <span class="input-group-addon" id="basic-addon1"><i
+                                    <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-phone-alt"></i></span>
+                                            class="glyphicon glyphicon-phone-alt"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="phonenumber"
                                     placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
@@ -73,17 +73,6 @@
                             <textarea name="address" id="address" class="form-control"></textarea>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Coordinates')}</label>
-                        <div class="col-md-9">
-                            <input name="coordinates" id="coordinates" class="form-control" value=""
-                                placeholder="6.465422, 3.406448">
-                            <span class="help-block">
-                                <small>{Lang::T('Latitude and Longitude coordinates for map must be separate with comma
-                                    ","')}</small>
-                            </span>
-                        </div>
-                    </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
                         <div class="col-md-9">
@@ -102,7 +91,15 @@
                                 <option value="Personal">Personal
                                 </option>
                                 <option value="Business">Business</option>
-                             </select>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{Lang::T('Coordinates')}</label>
+                        <div class="col-md-9">
+                            <input name="coordinates" id="coordinates" class="form-control" value=""
+                                placeholder="6.465422, 3.406448">
+                                <div id="map" style="width: '100%'; height: 200px; min-height: 150px;"></div>
                         </div>
                     </div>
                 </div>
@@ -132,16 +129,16 @@
     </center>
 </form>
 {literal}
-<script type="text/javascript">
+    <script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function () {
+        document.addEventListener("DOMContentLoaded", function() {
-        var customFieldsContainer = document.getElementById('custom-fields-container');
+            var customFieldsContainer = document.getElementById('custom-fields-container');
-        var addCustomFieldButton = document.getElementById('add-custom-field');
+            var addCustomFieldButton = document.getElementById('add-custom-field');
 
-        addCustomFieldButton.addEventListener('click', function () {
+            addCustomFieldButton.addEventListener('click', function() {
-            var fieldIndex = customFieldsContainer.children.length;
+                var fieldIndex = customFieldsContainer.children.length;
-            var newField = document.createElement('div');
+                var newField = document.createElement('div');
-            newField.className = 'form-group';
+                newField.className = 'form-group';
-            newField.innerHTML = `
+                newField.innerHTML = `
                 <div class="col-md-4">
                     <input type="text" class="form-control" name="custom_field_name[]" placeholder="Name">
                 </div>
@@ -152,17 +149,53 @@
                     <button type="button" class="remove-custom-field btn btn-danger btn-sm">-</button>
                 </div>
             `;
-            customFieldsContainer.appendChild(newField);
+                customFieldsContainer.appendChild(newField);
-        });
+            });
 
-        customFieldsContainer.addEventListener('click', function (event) {
+            customFieldsContainer.addEventListener('click', function(event) {
-            if (event.target.classList.contains('remove-custom-field')) {
+                if (event.target.classList.contains('remove-custom-field')) {
-                var fieldContainer = event.target.parentNode.parentNode;
+                    var fieldContainer = event.target.parentNode.parentNode;
-                fieldContainer.parentNode.removeChild(fieldContainer);
+                    fieldContainer.parentNode.removeChild(fieldContainer);
-            }
+                }
+            });
         });
-    });
+    </script>
-</script>
+    <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
+    <script>
+        function getLocation() {
+            if (window.location.protocol == "https:" && navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition(showPosition);
+            } else {
+                setupMap(51.505, -0.09);
+            }
+        }
+
+        function showPosition(position) {
+            setupMap(position.coords.latitude, position.coords.longitude);
+        }
+
+        function setupMap(lat, lon) {
+            var map = L.map('map').setView([lat, lon], 13);
+            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+                attribution:
+                    '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+                    subdomains: 'abcd',
+                    maxZoom: 20
+            }).addTo(map);
+            var marker = L.marker([lat, lon]).addTo(map);
+            map.on('click', function(e){
+                var coord = e.latlng;
+                var lat = coord.lat;
+                var lng = coord.lng;
+                var newLatLng = new L.LatLng(lat, lng);
+                marker.setLatLng(newLatLng);
+                $('#coordinates').val(lat + ',' + lng);
+            });
+        }
+        window.onload = function() {
+            getLocation();
+        }
+    </script>
 {/literal}
 
 

ui/ui/customers-edit.tpl

@@ -12,10 +12,10 @@
                         <div class="col-md-9">
                             <div class="input-group">
                                 {if $_c['country_code_phone']!= ''}
-                                <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
                                 {else}
-                                <span class="input-group-addon" id="basic-addon1"><i
+                                    <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-phone-alt"></i></span>
+                                            class="glyphicon glyphicon-phone-alt"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username" value="{$d['username']}"
                                     required
@@ -41,10 +41,10 @@
                         <div class="col-md-9">
                             <div class="input-group">
                                 {if $_c['country_code_phone']!= ''}
-                                <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
                                 {else}
-                                <span class="input-group-addon" id="basic-addon1"><i
+                                    <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-phone-alt"></i></span>
+                                            class="glyphicon glyphicon-phone-alt"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="phonenumber" value="{$d['phonenumber']}"
                                     placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
@@ -77,16 +77,6 @@
                             <textarea name="address" id="address" class="form-control">{$d['address']}</textarea>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Coordinates')}</label>
-                        <div class="col-md-9">
-                            <input name="coordinates" id="coordinates" class="form-control" value="{$d['coordinates']}">
-                            <span class="help-block">
-                                <small>{Lang::T('Latitude and Longitude coordinates for map must be separate with comma
-                                    ","')}</small>
-                            </span>
-                        </div>
-                    </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
                         <div class="col-md-9">
@@ -98,15 +88,23 @@
                             </select>
                         </div>
                     </div>
-
                     <div class="form-group">
                         <label class="col-md-3 control-label">{Lang::T('Account Type')}</label>
                         <div class="col-md-9">
                             <select class="form-control" id="account_type" name="account_type">
                                 <option value="Personal" {if $d['account_type'] eq 'Personal' }selected{/if}>Personal
                                 </option>
-                                <option value="Business" {if $d['account_type'] eq 'Business' }selected{/if}>Business</option>
+                                <option value="Business" {if $d['account_type'] eq 'Business' }selected{/if}>Business
-                             </select>
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{Lang::T('Coordinates')}</label>
+                        <div class="col-md-9">
+                            <input name="coordinates" id="coordinates" class="form-control" value="{$d['coordinates']}"
+                                placeholder="6.465422, 3.406448">
+                            <div id="map" style="width: '100%'; height: 200px; min-height: 150px;"></div>
                         </div>
                     </div>
                 </div>
@@ -118,20 +116,20 @@
                 <div class="panel-body">
                     <!--Customers Attributes edit start -->
                     {if $customFields}
-                    {foreach $customFields as $customField}
+                        {foreach $customFields as $customField}
-                    <div class="form-group">
+                            <div class="form-group">
-                        <label class="col-md-4 control-label"
+                                <label class="col-md-4 control-label"
-                            for="{$customField.field_name}">{$customField.field_name}</label>
+                                    for="{$customField.field_name}">{$customField.field_name}</label>
-                        <div class="col-md-6">
+                                <div class="col-md-6">
-                            <input class="form-control" type="text" name="custom_fields[{$customField.field_name}]"
+                                    <input class="form-control" type="text" name="custom_fields[{$customField.field_name}]"
-                                id="{$customField.field_name}" value="{$customField.field_value}">
+                                        id="{$customField.field_name}" value="{$customField.field_value}">
-                        </div>
+                                </div>
-                        <label class="col-md-2">
+                                <label class="col-md-2">
-                            <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}">
+                                    <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}">
-                            Delete
+                                    Delete
-                        </label>
+                                </label>
-                    </div>
+                            </div>
-                    {/foreach}
+                        {/foreach}
                     {/if}
                     <!--Customers Attributes edit end -->
                     <!-- Customers Attributes add start -->
@@ -155,16 +153,16 @@
 </form>
 
 {literal}
-<script type="text/javascript">
+    <script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function () {
+        document.addEventListener("DOMContentLoaded", function() {
-        var customFieldsContainer = document.getElementById('custom-fields-container');
+            var customFieldsContainer = document.getElementById('custom-fields-container');
-        var addCustomFieldButton = document.getElementById('add-custom-field');
+            var addCustomFieldButton = document.getElementById('add-custom-field');
 
-        addCustomFieldButton.addEventListener('click', function () {
+            addCustomFieldButton.addEventListener('click', function() {
-            var fieldIndex = customFieldsContainer.children.length;
+                var fieldIndex = customFieldsContainer.children.length;
-            var newField = document.createElement('div');
+                var newField = document.createElement('div');
-            newField.className = 'form-group';
+                newField.className = 'form-group';
-            newField.innerHTML = `
+                newField.innerHTML = `
                 <div class="col-md-4">
                     <input type="text" class="form-control" name="custom_field_name[]" placeholder="Name">
                 </div>
@@ -175,17 +173,58 @@
                     <button type="button" class="remove-custom-field btn btn-danger btn-sm">-</button>
                 </div>
             `;
-            customFieldsContainer.appendChild(newField);
+                customFieldsContainer.appendChild(newField);
-        });
+            });
 
-        customFieldsContainer.addEventListener('click', function (event) {
+            customFieldsContainer.addEventListener('click', function(event) {
-            if (event.target.classList.contains('remove-custom-field')) {
+                if (event.target.classList.contains('remove-custom-field')) {
-                var fieldContainer = event.target.parentNode.parentNode;
+                    var fieldContainer = event.target.parentNode.parentNode;
-                fieldContainer.parentNode.removeChild(fieldContainer);
+                    fieldContainer.parentNode.removeChild(fieldContainer);
-            }
+                }
+            });
         });
-    });
+    </script>
-</script>
+
+    <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
+    <script>
+        function getLocation() {
+            if (window.location.protocol == "https:" && navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition(showPosition);
+            } else {
+                setupMap(51.505, -0.09);
+            }
+        }
+
+        function showPosition(position) {
+            setupMap(position.coords.latitude, position.coords.longitude);
+        }
+
+        function setupMap(lat, lon) {
+            var map = L.map('map').setView([lat, lon], 13);
+            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            attribution:
+                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+                subdomains: 'abcd',
+                maxZoom: 20
+        }).addTo(map);
+        var marker = L.marker([lat, lon]).addTo(map);
+        map.on('click', function(e) {
+            var coord = e.latlng;
+            var lat = coord.lat;
+            var lng = coord.lng;
+            var newLatLng = new L.LatLng(lat, lng);
+            marker.setLatLng(newLatLng);
+            $('#coordinates').val(lat + ',' + lng);
+        });
+        }
+        window.onload = function() {
+            {/literal}{if $d['coordinates']}
+                setupMap({$d['coordinates']});
+            {else}
+                getLocation();
+            {/if}{literal}
+        }
+    </script>
 {/literal}
 
 {include file="sections/footer.tpl"}

ui/ui/customers-map.tpl

@@ -0,0 +1,63 @@
+{include file="sections/header.tpl"}
+
+<!-- Map container div -->
+
+<div id="map" class="well" style="width: '100%'; height: 78vh; margin: 20px auto"></div>
+
+{literal}
+    <script>
+        function getLocation() {
+            if (window.location.protocol == "https:" && navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition(showPosition);
+            } else {
+                setupMap(51.505, -0.09);
+            }
+        }
+
+        function showPosition(position) {
+            setupMap(position.coords.latitude, position.coords.longitude);
+        }
+
+        function setupMap(lat, lon) {
+            var map = L.map('map').setView([lat, lon], 13);
+            var group = L.featureGroup().addTo(map);
+
+            var customers = {/literal}{$customers|json_encode}{literal};
+
+            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            attribution:
+                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+                subdomains: 'abcd',
+                maxZoom: 20
+        }).addTo(map);
+
+        customers.forEach(function(customer) {
+            var name = customer.id;
+            var name = customer.name;
+            var info = customer.info;
+            var direction = customer.direction;
+            var coordinates = customer.coordinates;
+            var balance = customer.balance;
+            var address = customer.address;
+
+            // Create a popup for the marker
+            var popupContent = "<strong>Name</strong>: " + name + "<br>" +
+                "<strong>Info</strong>: " + info + "<br>" +
+                "<strong>Balance</strong>: " + balance + "<br>" +
+                "<strong>Address</strong>: " + address + "<br>" +
+                "<a href='{/literal}{$_url}{literal}customers/view/"+ customer.id +"'>More Info</a> &bull; " +
+                "<a href='https://www.google.com/maps/dir//" + direction + "' target='maps'>Get Direction</a><br>";
+
+            // Add marker to map
+            var marker = L.marker(JSON.parse(coordinates)).addTo(group);
+            marker.bindTooltip(name, { permanent: true }).bindPopup(popupContent);
+        });
+
+        map.fitBounds(group.getBounds());
+        }
+        window.onload = function() {
+            getLocation();
+        }
+    </script>
+{/literal}
+{include file="sections/footer.tpl"}

ui/ui/customers-view.tpl

@@ -30,29 +30,26 @@
                             onclick="this.select()">
                     </li>
                     {if $d['pppoe_password'] != ''}
-                    <li class="list-group-item">
+                        <li class="list-group-item">
-                        <b>PPPOE {Lang::T('Password')}</b> <input type="password" value="{$d['pppoe_password']}"
+                            <b>PPPOE {Lang::T('Password')}</b> <input type="password" value="{$d['pppoe_password']}"
-                            style=" border: 0px; text-align: right;" class="pull-right"
+                                style=" border: 0px; text-align: right;" class="pull-right"
-                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                                onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
-                            onclick="this.select()">
+                                onclick="this.select()">
-                    </li>
+                        </li>
                     {/if}
-                    <li class="list-group-item">
-                        <b>{Lang::T('Coordinates')}</b> <span class="pull-right">{Lang::T($d['coordinates'])}</span>
-                    </li>
                     <!--Customers Attributes view start -->
                     {if $customFields}
-                    {foreach $customFields as $customField}
+                        {foreach $customFields as $customField}
-                    <li class="list-group-item">
+                            <li class="list-group-item">
-                        <b>{$customField.field_name}</b> <span class="pull-right">
+                                <b>{$customField.field_name}</b> <span class="pull-right">
-                            {if strpos($customField.field_value, ':0') === false}
+                                    {if strpos($customField.field_value, ':0') === false}
-                            {$customField.field_value}
+                                        {$customField.field_value}
-                            {else}
+                                    {else}
-                            <b>{Lang::T('Paid')}</b>
+                                        <b>{Lang::T('Paid')}</b>
-                            {/if}
+                                    {/if}
-                        </span>
+                                </span>
-                    </li>
+                            </li>
-                    {/foreach}
+                        {/foreach}
                     {/if}
                     <!--Customers Attributes view end -->
                     <li class="list-group-item">
@@ -77,6 +74,16 @@
                         <b>{Lang::T('Last Login')}</b> <span
                             class="pull-right">{Lang::dateTimeFormat($d['last_login'])}</span>
                     </li>
+                    {if $d['coordinates']}
+                        <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">Get
+                                    Directions</a>
+                            </span>
+                            <div id="map" style="width: '100%'; height: 100px;"></div>
+                        </li>
+                    {/if}
                 </ul>
                 <div class="row">
                     <div class="col-xs-4">
@@ -92,12 +99,12 @@
             </div>
         </div>
         {foreach $packages as $package}
-        <div class="box box-{if $package['status']=='on'}success{else}danger{/if}">
+            <div class="box box-{if $package['status']=='on'}success{else}danger{/if}">
-            <div class="box-body box-profile">
+                <div class="box-body box-profile">
-                <h4 class="text-center">{$package['type']} - {$package['namebp']}</h4>
+                    <h4 class="text-center">{$package['type']} - {$package['namebp']}</h4>
-                <ul class="list-group list-group-unbordered">
+                    <ul class="list-group list-group-unbordered">
-                    <li class="list-group-item">
+                        <li class="list-group-item">
-                        {Lang::T('Active')} <span class="pull-right">{if
+                            {Lang::T('Active')} <span class="pull-right">{if
                             $package['status']=='on'}yes{else}no
                             {/if}</span>
                     </li>
@@ -110,8 +117,7 @@
                             class="pull-right">{Lang::dateAndTimeFormat($package['recharged_on'],$package['recharged_time'])}</span>
                     </li>
                     <li class="list-group-item">
-                        {Lang::T('Expires On')} <span
+                        {Lang::T('Expires On')} <span class="pull-right">{Lang::dateAndTimeFormat($package['expiration'],
-                            class="pull-right">{Lang::dateAndTimeFormat($package['expiration'],
                             $package['time'])}</span>
                     </li>
                     <li class="list-group-item">
@@ -157,73 +163,93 @@
         <div class="table-responsive" style="background-color: white;">
             <table id="datatable" class="table table-bordered table-striped">
                 {if Lang::arrayCount($activation)}
-                <thead>
+                    <thead>
-                    <tr>
+                        <tr>
-                        <th>{Lang::T('Invoice')}</th>
+                            <th>{Lang::T('Invoice')}</th>
-                        <th>{Lang::T('Username')}</th>
+                            <th>{Lang::T('Username')}</th>
-                        <th>{Lang::T('Plan Name')}</th>
+                            <th>{Lang::T('Plan Name')}</th>
-                        <th>{Lang::T('Plan Price')}</th>
+                            <th>{Lang::T('Plan Price')}</th>
-                        <th>{Lang::T('Type')}</th>
+                            <th>{Lang::T('Type')}</th>
-                        <th>{Lang::T('Created On')}</th>
+                            <th>{Lang::T('Created On')}</th>
-                        <th>{Lang::T('Expires On')}</th>
+                            <th>{Lang::T('Expires On')}</th>
-                        <th>{Lang::T('Method')}</th>
+                            <th>{Lang::T('Method')}</th>
-                    </tr>
+                        </tr>
-                </thead>
+                    </thead>
-                <tbody>
+                    <tbody>
-                    {foreach $activation as $ds}
+                        {foreach $activation as $ds}
-                    <tr onclick="window.location.href = '{$_url}plan/view/{$ds['id']}'" style="cursor:pointer;">
+                            <tr onclick="window.location.href = '{$_url}plan/view/{$ds['id']}'" style="cursor:pointer;">
-                        <td>{$ds['invoice']}</td>
+                                <td>{$ds['invoice']}</td>
-                        <td>{$ds['username']}</td>
+                                <td>{$ds['username']}</td>
-                        <td>{$ds['plan_name']}</td>
+                                <td>{$ds['plan_name']}</td>
-                        <td>{Lang::moneyFormat($ds['price'])}</td>
+                                <td>{Lang::moneyFormat($ds['price'])}</td>
-                        <td>{$ds['type']}</td>
+                                <td>{$ds['type']}</td>
-                        <td class="text-success">{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}
+                                <td class="text-success">{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}
-                        </td>
+                                </td>
-                        <td class="text-danger">{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
+                                <td class="text-danger">{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
-                        <td>{$ds['method']}</td>
+                                <td>{$ds['method']}</td>
-                    </tr>
+                            </tr>
-                    {/foreach}
+                        {/foreach}
-                </tbody>
+                    </tbody>
                 {/if}
                 {if Lang::arrayCount($order)}
-                <thead>
+                    <thead>
-                    <tr>
+                        <tr>
-                        <th>{Lang::T('Plan Name')}</th>
+                            <th>{Lang::T('Plan Name')}</th>
-                        <th>{Lang::T('Gateway')}</th>
+                            <th>{Lang::T('Gateway')}</th>
-                        <th>{Lang::T('Routers')}</th>
+                            <th>{Lang::T('Routers')}</th>
-                        <th>{Lang::T('Type')}</th>
+                            <th>{Lang::T('Type')}</th>
-                        <th>{Lang::T('Plan Price')}</th>
+                            <th>{Lang::T('Plan Price')}</th>
-                        <th>{Lang::T('Created On')}</th>
+                            <th>{Lang::T('Created On')}</th>
-                        <th>{Lang::T('Expires On')}</th>
+                            <th>{Lang::T('Expires On')}</th>
-                        <th>{Lang::T('Date Done')}</th>
+                            <th>{Lang::T('Date Done')}</th>
-                        <th>{Lang::T('Method')}</th>
+                            <th>{Lang::T('Method')}</th>
-                    </tr>
+                        </tr>
-                </thead>
+                    </thead>
-                <tbody>
+                    <tbody>
-                    {foreach $order as $ds}
+                        {foreach $order as $ds}
-                    <tr>
+                            <tr>
-                        <td>{$ds['plan_name']}</td>
+                                <td>{$ds['plan_name']}</td>
-                        <td>{$ds['gateway']}</td>
+                                <td>{$ds['gateway']}</td>
-                        <td>{$ds['routers']}</td>
+                                <td>{$ds['routers']}</td>
-                        <td>{$ds['payment_channel']}</td>
+                                <td>{$ds['payment_channel']}</td>
-                        <td>{Lang::moneyFormat($ds['price'])}</td>
+                                <td>{Lang::moneyFormat($ds['price'])}</td>
-                        <td class="text-primary">{Lang::dateTimeFormat($ds['created_date'])}</td>
+                                <td class="text-primary">{Lang::dateTimeFormat($ds['created_date'])}</td>
-                        <td class="text-danger">{Lang::dateTimeFormat($ds['expired_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 class="text-success">{if $ds['status']!=1}{Lang::dateTimeFormat($ds['paid_date'])}{/if}</td>
-                        <td>{if $ds['status']==1}{Lang::T('UNPAID')}
+                                <td>{if $ds['status']==1}{Lang::T('UNPAID')}
-                            {elseif $ds['status']==2}{Lang::T('PAID')}
+                                    {elseif $ds['status']==2}{Lang::T('PAID')}
-                            {elseif $ds['status']==3}{$_L['FAILED']}
+                                    {elseif $ds['status']==3}{$_L['FAILED']}
-                            {elseif $ds['status']==4}{Lang::T('CANCELED')}
+                                    {elseif $ds['status']==4}{Lang::T('CANCELED')}
-                            {elseif $ds['status']==5}{Lang::T('UNKNOWN')}
+                                    {elseif $ds['status']==5}{Lang::T('UNKNOWN')}
-                            {/if}</td>
+                                    {/if}</td>
-                    </tr>
+                            </tr>
-                    {/foreach}
+                        {/foreach}
-                </tbody>
+                    </tbody>
                 {/if}
             </table>
         </div>
-        {$paginator['contents']}
+        {include file="pagination.tpl"}
     </div>
 </div>
 
+{if $d['coordinates']}
+{literal}
+<script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
+<script>
+    function setupMap(lat, lon) {
+        var map = L.map('map').setView([lat, lon], 17);
+        L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            attribution:
+                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+                subdomains: 'abcd',
+                maxZoom: 20
+        }).addTo(map);
+        var marker = L.marker([lat, lon]).addTo(map);
+    }
+    window.onload = function() {
+        {/literal}setupMap({$d['coordinates']});{literal}
+    }
+</script>
+{/literal}
+{/if}
 {include file="sections/footer.tpl"}

ui/ui/customers.tpl

@@ -16,10 +16,10 @@
             <div class="panel-body">
                 <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
                     <div class="col-md-8">
-                        <form id="site-search" method="post" action="{$_url}customers/list/">
+                        <form id="site-search" method="post" action="{$_url}customers/">
                             <div class="input-group">
-                                <input type="text" id="search-input" name="search" value="{$search}" class="form-control"
+                                <input type="text" id="search-input" name="search" value="{$search}"
-                                    placeholder="{Lang::T('Search')}...">
+                                    class="form-control" placeholder="{Lang::T('Search')}...">
                                 <div class="input-group-btn">
                                     <button class="btn btn-success" type="submit"><span
                                             class="fa fa-search"></span></button>
@@ -28,8 +28,8 @@
                         </form>
                     </div>
                     <div class="col-md-4">
-                        <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i
+                        <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
-                                class="ion ion-android-add"> </i> {Lang::T('Add New Contact')}</a>
+                            </i> {Lang::T('Add New Contact')}</a>
                     </div>&nbsp;
                 </div>
                 <div class="table-responsive table_mobile">
@@ -40,8 +40,7 @@
                                 <th>{Lang::T('Account Type')}</th>
                                 <th>{Lang::T('Full Name')}</th>
                                 <th>{Lang::T('Balance')}</th>
-                                <th>{Lang::T('Phone Number')}</th>
+                                <th width="120px"></th>
-                                <th>{Lang::T('Email')}</th>
                                 <th>{Lang::T('Package')}</th>
                                 <th>{Lang::T('Service Type')}</th>
                                 <th>{Lang::T('Created On')}</th>
@@ -53,20 +52,36 @@
                                 <tr>
                                     <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
                                         style="cursor:pointer;">{$ds['username']}</td>
-                                          <td>{$ds['account_type']}</td>
+                                    <td>{$ds['account_type']}</td>
                                     <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
                                         style="cursor: pointer;">{$ds['fullname']}</td>
                                     <td>{Lang::moneyFormat($ds['balance'])}</td>
-                                    <td>{$ds['phonenumber']}</td>
+                                    <td align="center">
-                                    <td>{$ds['email']}</td>
+                                        {if $ds['phonenumber']}
+                                            <a href="tel:{$ds['phonenumber']}" class="btn btn-default btn-xs"
+                                                title="{$ds['phonenumber']}"><i class="glyphicon glyphicon-earphone"></i></a>
+                                        {/if}
+                                        {if $ds['email']}
+                                            <a href="mailto:{$ds['email']}" class="btn btn-default btn-xs"
+                                                title="{$ds['email']}"><i class="glyphicon glyphicon-envelope"></i></a>
+                                        {/if}
+                                        {if $ds['coordinates']}
+                                            <a href="https://www.google.com/maps/dir//{$ds['coordinates']}/" target="_blank" class="btn btn-default btn-xs"
+                                                title="{$ds['coordinates']}"><i class="glyphicon glyphicon-map-marker"></i></a>
+                                        {/if}
+                                    </td>
                                     <td align="center" api-get-text="{$_url}autoload/customer_is_active/{$ds['id']}">
                                         <span class="label label-default">&bull;</span>
                                     </td>
                                     <td>{$ds['service_type']}</td>
                                     <td>{Lang::dateTimeFormat($ds['created_at'])}</td>
                                     <td align="center">
-                                        <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
+                                        <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}"
+                                            style="margin: 0px; color:black"
                                             class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
+                                        <a href="{$_url}customers/edit/{$ds['id']}" id="{$ds['id']}"
+                                            style="margin: 0px; color:black"
+                                            class="btn btn-info btn-xs">&nbsp;&nbsp;{Lang::T('Edit')}&nbsp;&nbsp;</a>
                                         <a href="{$_url}plan/recharge/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
                                             class="btn btn-primary btn-xs">{Lang::T('Recharge')}</a>
                                     </td>
@@ -75,7 +90,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>
@@ -83,23 +98,23 @@
 
 <script>
     // Functionality to filter table rows based on admin input
-    document.addEventListener('DOMContentLoaded', function () {
+    document.addEventListener('DOMContentLoaded', function() {
-            var searchInput = document.getElementById('search-input');
+        var searchInput = document.getElementById('search-input');
-            var tableRows = document.querySelectorAll('tbody tr');
+        var tableRows = document.querySelectorAll('tbody tr');
 
-            searchInput.addEventListener('input', function () {
+        searchInput.addEventListener('input', function() {
-                var searchText = this.value.toLowerCase();
+            var searchText = this.value.toLowerCase();
 
-                tableRows.forEach(function (row) {
+            tableRows.forEach(function(row) {
-                    var rowData = row.textContent.toLowerCase();
+                var rowData = row.textContent.toLowerCase();
 
-                    if (rowData.includes(searchText)) {
+                if (rowData.includes(searchText)) {
-                        row.style.display = '';
+                    row.style.display = '';
-                    } else {
+                } else {
-                        row.style.display = 'none';
+                    row.style.display = 'none';
-                    }
+                }
-                });
             });
         });
+    });
 </script>
 {include file="sections/footer.tpl"}

ui/ui/dashboard.tpl

@@ -163,7 +163,7 @@
                         {/foreach}
                     </table>
                 </div>
-                &nbsp; {$paginator['contents']}
+                &nbsp; {include file="pagination.tpl"}
             </div>
         {/if}
     </div>

ui/ui/hotspot.tpl

@@ -85,8 +85,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
-
             </div>
         </div>
     </div>

ui/ui/logs-radius.tpl

@@ -53,7 +53,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/logs.tpl

@@ -50,7 +50,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/map-customer.tpl

@@ -1,45 +0,0 @@
-{include file="sections/header.tpl"}
-
-<!-- Map container div -->
-<div id="map" style="width: '100%'; height: 600px; margin: 20px auto"></div>
-
-{literal}
-<script>
-    window.onload = function() {
-        var map = L.map('map').setView([51.505, -0.09], 13);
-        var group = L.featureGroup().addTo(map);
-        
-        var customers = {/literal}{$customers|json_encode}{literal};
-
-        L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
-            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-            subdomains: 'abcd',
-            maxZoom: 20
-        }).addTo(map);
-
-        customers.forEach(function(customer) {
-            var name = customer.id;
-            var name = customer.name;
-            var info = customer.info;
-            var coordinates = customer.coordinates;
-            var balance = customer.balance;
-            var address = customer.address;
-
-            // Create a popup for the marker
-            var popupContent = "<strong>Customer Name</strong>: " + name + "<br>" +
-                               "<strong>Customer Info</strong>: " + info + "<br>" +
-                               "<strong>Customer Balance</strong>: " + balance + "<br>" +
-                               "<strong>Address</strong>: " + address + "<br>" +
-                               "<strong>Coordinates</strong>: " + coordinates + "<br>" +
-                               "<a href='{/literal}{$_url}{literal}customers/view/"+ customer.id +"'>More Info</a><br>";
-
-            // Add marker to map
-            var marker = L.marker(JSON.parse(coordinates)).addTo(group);
-            marker.bindTooltip(name).bindPopup(popupContent);
-        });
-
-        map.fitBounds(group.getBounds());
-    }
-</script>
-{/literal}
-{include file="sections/footer.tpl"}

ui/ui/message-bulk.tpl

@@ -1,11 +1,13 @@
 {include file="sections/header.tpl"}
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.min.css">
+
 
 <div class="row">
 	<div class="col-sm-12 col-md-12">
 		<div class="panel panel-primary panel-hovered panel-stacked mb30">
 			<div class="panel-heading">{Lang::T('Send Bulk Message')}</div>
 			<div class="panel-body">
-				<form class="form-horizontal" method="post" role="form" action="{$_url}message/send_bulk-post">
+				<form class="form-horizontal" method="post" role="form" id="bulkMessageForm" action="">
 					<div class="form-group">
 						<label class="col-md-2 control-label">{Lang::T('Group')}</label>
 						<div class="col-md-6">
@@ -27,11 +29,39 @@
 							</select>
 						</div>
 					</div>
+					<div class="form-group">
+						<label class="col-md-2 control-label">{Lang::T('Message per time')}</label>
+						<div class="col-md-6">
+							<select class="form-control" name="batch" id="batch">
+								<option value="5">{Lang::T('5 Messages')}</option>
+								<option value="10" selected>{Lang::T('10 Messages')}</option>
+								<option value="15">{Lang::T('15 Messages')}</option>
+								<option value="20">{Lang::T('20 Messages')}</option>
+								<option value="20">{Lang::T('30 Messages')}</option>
+								<option value="20">{Lang::T('40 Messages')}</option>
+								<option value="20">{Lang::T('50 Messages')}</option>
+								<option value="20">{Lang::T('60 Messages')}</option>
+							</select>{Lang::T('Use 20 and above if you are sending to all customers to avoid server time out')}
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-md-2 control-label">{Lang::T('Delay')}</label>
+						<div class="col-md-6">
+							<select class="form-control" name="delay" id="delay">
+								<option value="0" selected>{Lang::T('No Delay')}</option>
+								<option value="5">{Lang::T('5 Seconds')}</option>
+								<option value="10">{Lang::T('10 Seconds')}</option>
+								<option value="15">{Lang::T('15 Seconds')}</option>
+								<option value="20">{Lang::T('20 Seconds')}</option>
+							</select>{Lang::T('Use at least 5 secs if you are sending to all customers to avoid being banned by your message provider')}
+						</div>
+					</div>
 					<div class="form-group">
 						<label class="col-md-2 control-label">{Lang::T('Message')}</label>
 						<div class="col-md-6">
 							<textarea class="form-control" id="message" name="message"
 								placeholder="{Lang::T('Compose your message...')}" rows="5"></textarea>
+							<input name="test" type="checkbox"> {Lang::T('Testing [if checked no real message is sent]')}
 						</div>
 						<p class="help-block col-md-4">
 							{Lang::T('Use placeholders:')}
@@ -45,10 +75,10 @@
 							<b>[[company_name]]</b> - {Lang::T('Your Company Name')}
 						</p>
 					</div>
-
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10">
-							<button class="btn btn-success" type="submit">{Lang::T('Send Message')}</button>
+							<button class="btn btn-success" type="submit" name=send value=now>
+								{Lang::T('Send Message')}</button>
 							<a href="{$_url}dashboard" class="btn btn-default">{Lang::T('Cancel')}</a>
 						</div>
 					</div>
@@ -59,5 +89,54 @@
 	</div>
 </div>
 
+{if $batchStatus}
+<p><span class="label label-success">Total SMS Sent: {$totalSMSSent}</span> <span class="label label-danger">Total SMS
+		Failed: {$totalSMSFailed}</span> <span class="label label-success">Total WhatsApp Sent:
+		{$totalWhatsappSent}</span> <span class="label label-danger">Total WhatsApp Failed:
+		{$totalWhatsappFailed}</span></p>
+{/if}
+<div class="box">
+	<div class="box-header">
+		<h3 class="box-title">Message Results</h3>
+	</div>
+	<!-- /.box-header -->
+	<div class="box-body">
+		<table id="messageResultsTable" class="table table-bordered table-striped table-condensed">
+			<thead>
+				<tr>
+					<th>Name</th>
+					<th>Phone</th>
+					<th>Message</th>
+					<th>Status</th>
+				</tr>
+			</thead>
+			<tbody>
+				{foreach $batchStatus as $customer}
+				<tr>
+					<td>{$customer.name}</td>
+					<td>{$customer.phone}</td>
+					<td>{$customer.message}</td>
+					<td>{$customer.status}</td>
+				</tr>
+				{/foreach}
+			</tbody>
+		</table>
+	</div>
+	<!-- /.box-body -->
+</div>
+<!-- /.box -->
+
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
+<script>
+	var $j = jQuery.noConflict();
+
+	$j(document).ready(function () {
+		$j('#messageResultsTable').DataTable();
+	});
+</script>
+
+
+
 
 {include file="sections/footer.tpl"}

ui/ui/pagination.tpl

@@ -0,0 +1,20 @@
+{if $paginator}
+    <nav aria-label="Page navigation pagination-sm">
+        <ul class="pagination">
+            <li {if empty($paginator['prev'])}class="disabled" {/if}>
+                <a href="{$paginator['url']}{$paginator['prev']}" aria-label="Previous">
+                    <span aria-hidden="true">{Lang::T('Prev')}</span>
+                </a>
+            </li>
+            {foreach $paginator['pages'] as $page}
+                <li class="{if $paginator['page'] == $page}active{elseif $page == '...'}disabled{/if}"><a
+                        href="{$paginator['url']}{$page}">{$page}</a></li>
+            {/foreach}
+            <li {if $paginator['page']>=$paginator['count']}class="disabled" {/if}>
+                <a href="{$paginator['url']}{$paginator['next']}" aria-label="Next">
+                    <span aria-hidden="true">{Lang::T('Next')}</span>
+                </a>
+            </li>
+        </ul>
+    </nav>
+{/if}

ui/ui/plan.tpl

@@ -60,7 +60,7 @@
                                     <td><a href="{$_url}customers/viewu/{$ds['username']}">{$ds['username']}</a></td>
                                     <td>{$ds['namebp']}</td>
                                     <td>{$ds['type']}</td>
-                                     <td>{$ds['plan_type']}</td>
+                                    <td>{$ds['plan_type']}</td>
                                     <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
                                     <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                                     <td>{$ds['method']}</td>
@@ -79,7 +79,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/pool.tpl

@@ -61,7 +61,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/pppoe.tpl

@@ -82,7 +82,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/radius-nas.tpl

@@ -64,7 +64,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/reports-activation.tpl

@@ -61,7 +61,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/reports-daily.tpl

@@ -51,7 +51,7 @@
                     </tbody>
                 </table>
             </div>
-            {$paginator['contents']}
+            {include file="pagination.tpl"}
 
             <div class="clearfix text-right total-sum mb10">
                 <h4 class="text-uppercase text-bold">{Lang::T('Total Income')}:</h4>

ui/ui/routers.tpl

@@ -61,7 +61,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/user-activation-list.tpl

@@ -34,7 +34,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/user-orderHistory.tpl

@@ -46,7 +46,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/users.tpl

@@ -71,7 +71,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.3.20"
+    "version": "2024.3.26"
 }