Change to Username if Country code empty

Update logs-radius.tpl

.gitignore

@@ -38,4 +38,5 @@ system/lan/**
 !system/lan/spanish.json
 !system/lan/turkish.json
 !system/lan/english.json
-!system/lan/country.json
+!system/lan/country.json
+*.zip

.htaccess_firewall

@@ -6,4 +6,9 @@
 <Files index.php>
     Order Allow,Deny
     Allow from all
+</Files>
+
+<Files update.php>
+    Order Allow,Deny
+    Allow from all
 </Files>

CHANGELOG.md

@@ -2,6 +2,48 @@
 
 # CHANGELOG
 
+## 2024.4.3
+
+- Export logs to CSV by @agstrxyz
+- Change to Username if Country code empty
+
+## 2024.4.2
+
+- Fix REST API
+- Fix Log IP Cloudflare by @Gerandonk
+- Show Personal or Business in customer dashboard
+
+## 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
+
+## 2024.3.19
+
+- Add Customer Type Personal or Bussiness by @pro-cms
+- Fix Broadcast Message by @Focuslinkstech
+- Add Customer Geolocation by @Focuslinkstech
+- Change Customer Menu
+
 ## 2024.3.18
 
 - Add Broadcasting SMS by @Focuslinkstech

init.php

@@ -11,7 +11,9 @@ if (realpath(__FILE__) == realpath($_SERVER['SCRIPT_FILENAME'])) {
     die();
 }
 $root_path = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR;
-$isApi = false;
+if(!isset($isApi)){
+    $isApi = false;
+}
 // on some server, it getting error because of slash is backwards
 function _autoloader($class)
 {
@@ -71,8 +73,11 @@ ORM::configure('return_result_sets', true);
 if ($_app_stage != 'Live') {
     ORM::configure('logging', true);
 }
-
-define('U', APP_URL . '/index.php?_route=');
+if($isApi){
+    define('U', APP_URL . '/system/api.php?r=');
+}else{
+    define('U', APP_URL . '/index.php?_route=');
+}
 
 // notification message
 if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . "notifications.json")) {
@@ -195,7 +200,18 @@ function _log($description, $type = '', $userid = '0')
     $d->type = $type;
     $d->description = $description;
     $d->userid = $userid;
-    $d->ip = $_SERVER["REMOTE_ADDR"];
+    if (!empty($_SERVER['HTTP_CF_CONNECTING_IP']))   //to check ip is pass from cloudflare tunnel
+    {
+        $d->ip = $_SERVER['HTTP_CF_CONNECTING_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))   //to check ip is pass from proxy
+    {
+        $d->ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    } elseif (!empty($_SERVER['HTTP_CLIENT_IP']))   //to check ip from share internet
+    {
+        $d->ip = $_SERVER['HTTP_CLIENT_IP'];
+    } else {
+        $d->ip = $_SERVER["REMOTE_ADDR"];
+    }
     $d->save();
 }
 
@@ -209,6 +225,13 @@ function alphanumeric($str, $tambahan = "")
     return preg_replace("/[^a-zA-Z0-9" . $tambahan . "]+/", "", $str);
 }
 
+function showResult($success, $message = '', $result = [], $meta = [])
+{
+    header("Content-Type: Application/json");
+    $json = json_encode(['success' => $success, 'message' => $message, 'result' => $result, 'meta' => $meta]);
+    echo $json;
+    die();
+}
 
 function sendTelegram($txt)
 {
@@ -227,6 +250,13 @@ function sendWhatsapp($phone, $txt)
 
 function r2($to, $ntype = 'e', $msg = '')
 {
+    global $isApi;
+    if ($isApi) {
+        showResult(
+            ($ntype=='s')? true : false,
+            $msg
+        );
+    }
     if ($msg == '') {
         header("location: $to");
         exit;
@@ -239,7 +269,13 @@ function r2($to, $ntype = 'e', $msg = '')
 
 function _alert($text, $type = 'success', $url = "home", $time = 3)
 {
-    global $ui;
+    global $ui, $isApi;
+    if ($isApi) {
+        showResult(
+            ($type == 'success') ? true : false,
+            $text
+        );
+    }
     if (!isset($ui)) return;
     if (strlen($url) > 4) {
         if (substr($url, 0, 4) != "http") {

install/phpnuxbill.sql

@@ -21,13 +21,15 @@ 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',
   `email` varchar(128) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1',
+  `coordinates` VARCHAR(50) NOT NULL DEFAULT '' COMMENT 'Latitude and Longitude coordinates',
   `balance` decimal(15,2) NOT NULL DEFAULT '0.00' COMMENT 'For Money Deposit',
   `service_type` ENUM('Hotspot','PPPoE','Others') DEFAULT 'Others' COMMENT 'For selecting user type',
+  `account_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type',
   `auto_renewal` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Auto renewall using balance',
   `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `last_login` datetime DEFAULT NULL
@@ -79,26 +81,27 @@ CREATE TABLE `tbl_payment_gateway` (
 
 DROP TABLE IF EXISTS `tbl_plans`;
 CREATE TABLE `tbl_plans` (
-  `id` int(10) NOT NULL,
-  `name_plan` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `id_bw` int(10) NOT NULL,
-  `price` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `type` enum('Hotspot','PPPOE','Balance') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `typebp` enum('Unlimited','Limited') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `limit_type` enum('Time_Limit','Data_Limit','Both_Limit') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `time_limit` int(10) UNSIGNED DEFAULT NULL,
-  `time_unit` enum('Mins','Hrs') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `data_limit` int(10) UNSIGNED DEFAULT NULL,
-  `data_unit` enum('MB','GB') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `validity` int(10) NOT NULL,
-  `validity_unit` enum('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `shared_users` int(10) DEFAULT NULL,
-  `routers` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `is_radius` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 is radius',
-  `pool` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `pool_expired` varchar(40) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
-  `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0 disabled\r\n',
-  `allow_purchase` enum('yes','no') DEFAULT 'yes' COMMENT 'allow to show package in buy package page'
+    `id` int(10) NOT NULL,
+    `name_plan` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `id_bw` int(10) NOT NULL,
+    `price` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `type` enum('Hotspot','PPPOE','Balance') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `typebp` enum('Unlimited','Limited') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `limit_type` enum('Time_Limit','Data_Limit','Both_Limit') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `time_limit` int(10) UNSIGNED DEFAULT NULL,
+    `time_unit` enum('Mins','Hrs') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `data_limit` int(10) UNSIGNED DEFAULT NULL,
+    `data_unit` enum('MB','GB') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `validity` int(10) NOT NULL,
+    `validity_unit` enum('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `shared_users` int(10) DEFAULT NULL,
+    `routers` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `is_radius` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 is radius',
+    `pool` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `pool_expired` varchar(40) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+    `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0 disabled',
+    `allow_purchase` enum('yes','no') DEFAULT 'yes' COMMENT 'allow to show package in buy package page',
+    `plan_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For switching plan according to user type'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 DROP TABLE IF EXISTS `tbl_pool`;
@@ -317,4 +320,4 @@ ALTER TABLE `tbl_bandwidth` ADD `burst` VARCHAR(128) NOT NULL DEFAULT '' AFTER `
 ALTER TABLE `tbl_transactions` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;
 ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;
 ALTER TABLE `tbl_plans` CHANGE `allow_purchase` `prepaid` ENUM('yes','no') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'yes' COMMENT 'is prepaid';
-ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;
+ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;

system/api.php

@@ -15,91 +15,111 @@ if ($_SERVER['REQUEST_METHOD'] === "OPTIONS" || $_SERVER['REQUEST_METHOD'] === "
     die();
 }
 
-include "../init.php";
-
 $isApi = true;
 
+include "../init.php";
+
 // Dummy Class
 $ui = new class($key)
 {
     var $assign = [];
     function display($key)
     {
+        global $req;
+        showResult(true, $req, $this->getAll());
     }
     function assign($key, $value)
     {
         $this->assign[$key] = $value;
     }
-
-    function get($key, )
+    function get($key)
     {
-        if(isset($this->assign[$key])){
+        if (isset($this->assign[$key])) {
             return $this->assign[$key];
         }
         return '';
     }
+    function getTemplateVars($key)
+    {
+        if (isset($this->assign[$key])) {
+            return $this->assign[$key];
+        }
+        return '';
+    }
+    function getAll()
+    {
+        return $this->assign;
+    }
 };
 
 $req = _get('r');
 # a/c.id.time.md5
 # md5(a/c.id.time.$api_secret)
-$token = _get('token');
+$token = _req('token');
 $routes = explode('/', $req);
 $handler = $routes[0];
 
-if(empty($token)){
-    showResult(false, Lang::T("Token is invalid"));
-}
+if (!empty($token)) {
+    if ($token == $config['api_key']) {
+        $admin = ORM::for_table('tbl_users')->where('user_type', 'SuperAdmin')->find_one($id);
+        if (empty($admin)) {
+            $admin = ORM::for_table('tbl_users')->where('user_type', 'Admin')->find_one($id);
+            if (empty($admin)) {
+                showResult(false, Lang::T("Token is invalid"));
+            }
+        }
+    } else {
+        # validate token
+        list($tipe, $uid, $time, $sha1) = explode('.', $token);
+        if (trim($sha1) != sha1($uid . '.' . $time . '.' . $api_secret)) {
+            showResult(false, Lang::T("Token is invalid"));
+        }
 
-if($token == $config['api_key']){
-    $admin = ORM::for_table('tbl_users')->where('user_type','SuperAdmin')->find_one($id);
-    if(empty($admin)){
-        $admin = ORM::for_table('tbl_users')->where('user_type','Admin')->find_one($id);
-        if(empty($admin)){
+        #cek token expiration
+        // 3 bulan
+        if ($time != 0 && time() - $time > 7776000) {
+            die("$time != " . (time() - $time));
+            showResult(false, Lang::T("Token Expired"), [], ['login' => true]);
+        }
+
+        if ($tipe == 'a') {
+            $_SESSION['aid'] = $uid;
+            $admin = Admin::_info();
+        } else if ($tipe == 'c') {
+            $_SESSION['uid'] = $uid;
+        } else {
+            showResult(false, Lang::T("Unknown Token"), [], ['login' => true]);
+        }
+    }
+
+    if (!isset($handler) || empty($handler)) {
+        showResult(true, Lang::T("Token is valid"));
+    }
+
+
+    if ($handler == 'isValid') {
+        showResult(true, Lang::T("Token is valid"));
+    }
+
+    if ($handler == 'me') {
+        $admin = Admin::_info();
+        if (!empty($admin['id'])) {
+            showResult(true, "", $admin);
+        } else {
             showResult(false, Lang::T("Token is invalid"));
         }
     }
 }else{
-    # validate token
-    list($tipe, $uid, $time, $md5) = explode('.', $token);
-    if ($md5 != md5($uid . '.' . $time . '.' . $api_secret)) {
-        showResult(false, Lang::T("Token is invalid"));
-    }
-
-    #cek token expiration
-    if ($time != 0 && time() > $time) {
-        showResult(false, Lang::T("Token Expired"), [], ['login' => true]);
-    }
-
-    if($tipe=='a'){
-        $_SESSION['aid'] = $uid;
-    }else if($tipe=='c'){
-        $_SESSION['uid'] = $uid;
-    }else{
-        showResult(false, Lang::T("Unknown Token"), [], ['login' => true]);
-    }
-}
-
-if(!isset($handler) || empty($handler)){
-    showResult(true, Lang::T("Token is valid"));
-}
-
-
-if($handler == 'isValid'){
-    showResult(true, Lang::T("Token is valid"));
-}
-
-function showResult($success, $message = '', $result = [], $meta = [])
-{
-    header("Content-Type: Application/json; charset=utf-8");
-    die(json_encode(array('success' => $success, 'message' => $message, 'result' => $result, 'meta' => $meta)));
+    unset($_COOKIE);
+    unset($_SESSION);
 }
 
 try {
-    $sys_render = File::pathFixer($root_path.'system/controllers/' . $handler . '.php');
+    $sys_render = File::pathFixer($root_path . 'system/controllers/' . $handler . '.php');
     if (file_exists($sys_render)) {
         include($sys_render);
-    }else{
+        showResult(true, $req, $ui->getAll());
+    } else {
         showResult(false, Lang::T('Command not found'));
     }
 } catch (Exception $e) {

system/autoload/Admin.php

@@ -32,10 +32,14 @@ class Admin
         global $db_password;
         if (isset($aid)) {
             $time = time();
-            setcookie('aid', $aid . '.' . $time . '.' . sha1($aid . '.' . $time . '.' . $db_password), time() + 86400 * 7);
+            $token = $aid . '.' . $time . '.' . sha1($aid . '.' . $time . '.' . $db_password);
+            setcookie('aid', $token, time() + 86400 * 7);
+            return $token;
         }
+        return '';
     }
 
+
     public static function removeCookie()
     {
         if (isset($_COOKIE['aid'])) {

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/PEAR2/Net/RouterOS/Client.php

@@ -19,21 +19,25 @@
 /**
  * The namespace declaration.
  */
+
 namespace PEAR2\Net\RouterOS;
 
 /**
  * Refers to transmitter direction constants.
  */
+
 use PEAR2\Net\Transmitter\Stream as S;
 
 /**
  * Refers to the cryptography constants.
  */
+
 use PEAR2\Net\Transmitter\NetworkStream as N;
 
 /**
  * Catches arbitrary exceptions at some points.
  */
+
 use Exception as E;
 
 /**
@@ -108,11 +112,12 @@ class Client
     protected $registry = null;
 
     /**
-     * Whether to stream future responses.
+     * Stream response words that are above this many bytes.
+     * NULL to disable streaming completely.
      *
-     * @var bool
+     * @var int|null
      */
-    private $_streamingResponses = false;
+    private $_streamingResponses = null;
 
     /**
      * Creates a new instance of a RouterOS API client.
@@ -167,7 +172,7 @@ class Client
             : (int) $timeout;
         //Login the user if necessary
         if ((!$persist
-            || !($old = $this->com->getTransmitter()->lock(S::DIRECTION_ALL)))
+                || !($old = $this->com->getTransmitter()->lock(S::DIRECTION_ALL)))
             && $this->com->getTransmitter()->isFresh()
         ) {
             if (!static::login($this->com, $username, $password, $timeout)) {
@@ -233,7 +238,8 @@ class Client
         $password = '',
         $timeout = null
     ) {
-        if (null !== ($remoteCharset = $com->getCharset($com::CHARSET_REMOTE))
+        if (
+            null !== ($remoteCharset = $com->getCharset($com::CHARSET_REMOTE))
             && null !== ($localCharset = $com->getCharset($com::CHARSET_LOCAL))
         ) {
             $password = iconv(
@@ -256,8 +262,8 @@ class Client
                 $com->getTransmitter()->lock($old, true);
             }
             throw ($e instanceof NotSupportedException
-            || $e instanceof UnexpectedValueException
-            || !$com->getTransmitter()->isDataAwaiting()) ? new SocketException(
+                || $e instanceof UnexpectedValueException
+                || !$com->getTransmitter()->isDataAwaiting()) ? new SocketException(
                 'This is not a compatible RouterOS service',
                 SocketException::CODE_SERVICE_INCOMPATIBLE,
                 $e
@@ -287,30 +293,47 @@ class Client
         $timeout = null
     ) {
         $request = new Request('/login');
-        $request->send($com);
-        $response = new Response($com, false, $timeout);
         $request->setArgument('name', $username);
         $request->setArgument('password', $password);
-        // $request->setArgument(
-        //     'response',
-        //     '00' . md5(
-        //         chr(0) . $password
-        //         . pack('H*', $response->getProperty('ret'))
-        //     )
-        // );
+        $oldCharset = $com->getCharset($com::CHARSET_ALL);
+        $com->setCharset(null, $com::CHARSET_ALL);
         $request->verify($com)->send($com);
-
+        $com->setCharset($oldCharset, $com::CHARSET_ALL);
         $response = new Response($com, false, $timeout);
-        if ($response->getType() === Response::TYPE_FINAL) {
-            return null === $response->getProperty('ret');
-        } else {
-            while ($response->getType() !== Response::TYPE_FINAL
-                && $response->getType() !== Response::TYPE_FATAL
-            ) {
-                $response = new Response($com, false, $timeout);
+        if (
+            $response->getType() === Response::TYPE_FINAL
+            && null === $response->getProperty('ret')
+        ) {
+            // version >= 6.43
+            return null === $response->getProperty('message');
+        } elseif ($response->getType() === Response::TYPE_FINAL) {
+            // version < 6.43
+            $request->setArgument('password', '');
+            $request->setArgument(
+                'response',
+                '00' . md5(
+                    chr(0) . $password
+                        . pack(
+                            'H*',
+                            is_string($response->getProperty('ret'))
+                                ? $response->getProperty('ret')
+                                : stream_get_contents($response->getProperty('ret'))
+                        )
+                )
+            );
+            $request->verify($com)->send($com);
+            $response = new Response($com, false, $timeout);
+            if ($response->getType() === Response::TYPE_FINAL) {
+                return null === $response->getProperty('ret');
             }
-            return false;
         }
+        while (
+            $response->getType() !== Response::TYPE_FINAL
+            && $response->getType() !== Response::TYPE_FATAL
+        ) {
+            $response = new Response($com, false, $timeout);
+        }
+        return false;
     }
 
     /**
@@ -322,7 +345,7 @@ class Client
      * {@link Communicator::CHARSET_REMOTE}, and when receiving,
      * {@link Communicator::CHARSET_REMOTE} is converted to
      * {@link Communicator::CHARSET_LOCAL}. Setting NULL to either charset will
-     * disable charset convertion, and data will be both sent and received "as
+     * disable charset conversion, and data will be both sent and received "as
      * is".
      *
      * @param mixed $charset     The charset to set. If $charsetType is
@@ -387,7 +410,7 @@ class Client
     {
         //Error checking
         $tag = $request->getTag();
-        if ('' == $tag) {
+        if ('' === (string)$tag) {
             throw new DataFlowException(
                 'Asynchonous commands must have a tag.',
                 DataFlowException::CODE_TAG_REQUIRED
@@ -487,7 +510,7 @@ class Client
         $result = $hasNoTag ? array()
             : $this->extractNewResponses($tag)->toArray();
         while ((!$hasNoTag && $this->isRequestActive($tag))
-        || ($hasNoTag && 0 !== $this->getPendingRequestsCount())
+            || ($hasNoTag && 0 !== $this->getPendingRequestsCount())
         ) {
             $newReply = $this->dispatchNextResponse(null);
             if ($newReply->getTag() === $tag) {
@@ -499,8 +522,8 @@ class Client
                         $result = array_merge(
                             $result,
                             $this->isRequestActive($tag)
-                            ? $this->extractNewResponses($tag)->toArray()
-                            : array()
+                                ? $this->extractNewResponses($tag)->toArray()
+                                : array()
                         );
                     }
                     break;
@@ -582,7 +605,8 @@ class Client
                 }
             } else {
                 list($usStart, $sStart) = explode(' ', microtime());
-                while ($this->getPendingRequestsCount() !== 0
+                while (
+                    $this->getPendingRequestsCount() !== 0
                     && ($sTimeout >= 0 || $usTimeout >= 0)
                 ) {
                     $this->dispatchNextResponse($sTimeout, $usTimeout);
@@ -647,7 +671,7 @@ class Client
     public function cancelRequest($tag = null)
     {
         $cancelRequest = new Request('/cancel');
-        $hasTag = !('' == $tag);
+        $hasTag = !('' === (string)$tag);
         $hasReg = null !== $this->registry;
         if ($hasReg && !$hasTag) {
             $tags = array_merge(
@@ -703,34 +727,39 @@ class Client
     /**
      * Sets response streaming setting.
      *
-     * Sets whether future responses are streamed. If responses are streamed,
-     * the argument values are returned as streams instead of strings. This is
-     * particularly useful if you expect a response that may contain one or more
-     * very large words.
+     * Sets when future response words are streamed. If a word is streamed,
+     * the property value is returned a stream instead of a string, and
+     * unrecognized words are returned entirely as streams instead of strings.
+     * This is particularly useful if you expect a response that may contain
+     * one or more very large words.
      *
-     * @param bool $streamingResponses Whether to stream future responses.
+     * @param int|null $threshold Threshold after which to stream
+     *     a word. That is, a word less than this length will not be streamed.
+     *     If set to 0, effectively all words are streamed.
+     *     NULL to disable streaming altogether.
      *
-     * @return bool The previous value of the setting.
+     * @return $this The client object.
      *
-     * @see isStreamingResponses()
+     * @see getStreamingResponses()
      */
-    public function setStreamingResponses($streamingResponses)
+    public function setStreamingResponses($threshold)
     {
-        $oldValue = $this->_streamingResponses;
-        $this->_streamingResponses = (bool) $streamingResponses;
-        return $oldValue;
+        $this->_streamingResponses = $threshold === null
+            ? null
+            : (int) $threshold;
+        return $this;
     }
 
     /**
      * Gets response streaming setting.
      *
-     * Gets whether future responses are streamed.
+     * Gets when future response words are streamed.
      *
-     * @return bool The value of the setting.
+     * @return int|null The value of the setting.
      *
      * @see setStreamingResponses()
      */
-    public function isStreamingResponses()
+    public function getStreamingResponses()
     {
         return $this->_streamingResponses;
     }
@@ -822,8 +851,8 @@ class Client
      *     If NULL, wait indefinitely.
      * @param int      $usTimeout Microseconds to add to the waiting time.
      *
+     * @return Response  The dispatched response.
      * @throws SocketException When there's no response within the time limit.
-     * @return Response The dispatched response.
      */
     protected function dispatchNextResponse($sTimeout = 0, $usTimeout = 0)
     {
@@ -846,13 +875,14 @@ class Client
             $this->pendingRequestsCount--;
         }
 
-        if ('' != $tag) {
+        if ('' !== (string)$tag) {
             if ($this->isRequestActive($tag, self::FILTER_CALLBACK)) {
                 if ($this->callbacks[$tag]($response, $this)) {
                     try {
                         $this->cancelRequest($tag);
                     } catch (DataFlowException $e) {
-                        if ($e->getCode() !== DataFlowException::CODE_UNKNOWN_REQUEST
+                        if (
+                            $e->getCode() !== $e::CODE_UNKNOWN_REQUEST
                         ) {
                             throw $e;
                         }

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";
             }
         }
 
@@ -148,7 +149,9 @@ class Package
             ->where('customer_id', $id_customer)
             ->where('tbl_user_recharges.routers', $router_name)
             ->where('tbl_user_recharges.Type', $p['type'])
-            ->where('prepaid', $p['prepaid'])
+            # PPPOE or Hotspot only can have 1 per customer prepaid or postpaid
+            # because 1 customer can have 1 PPPOE and 1 Hotspot Plan in mikrotik
+            //->where('prepaid', $p['prepaid'])
             ->join('tbl_plans', array('tbl_plans.id', '=', 'tbl_user_recharges.plan_id'))
             ->find_one();
 
@@ -164,7 +167,7 @@ class Package
             $dt2 = new DateTime("$date_tmp");
             $diff = $dt2->diff($dt1);
             $sum =  $diff->format("%a"); // => 453
-            if ($sum >= 35) {
+            if ($sum >= 35 * $p['validity']) {
                 $date_exp = date("Y-m-$day_exp", strtotime('+0 month'));
             } else {
                 $date_exp = date("Y-m-$day_exp", strtotime('+' . $p['validity'] . ' month'));
@@ -286,7 +289,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']) {
@@ -356,7 +359,7 @@ class Package
                         $ed = new DateTime("$date_exp");
                         $td = $ed->diff($sd);
                         $fd = $td->format("%a");
-                        $gi = ($p['price'] / 30) * $fd;
+                        $gi = ($p['price'] / (30 * $p['validity'])) * $fd;
                         if ($gi > $p['price']) {
                             $fl->field_value = $p['price'];
                         } else {
@@ -374,7 +377,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 +484,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 +523,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;
                 }
@@ -551,7 +556,7 @@ class Package
                         $ed = new DateTime("$date_exp");
                         $td = $ed->diff($sd);
                         $fd = $td->format("%a");
-                        $gi = ($p['price'] / 30) * $fd;
+                        $gi = ($p['price'] / (30 * $p['validity'])) * $fd;
                         if ($gi > $p['price']) {
                             $fl->field_value = $p['price'];
                         } else {
@@ -569,7 +574,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) {
-            if(!is_array($v) && strpos($v,'%') === false) {
+        foreach ($colVal as $k => $v) {
+            if (!is_array($v) && strpos($v, '%') === false) {
                 $table = $table->where($k, $v);
-            }else{
-                if(is_array($v)){
+            } else {
+                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><a 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 disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</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><a href='{$url}&p=2&q=$query'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</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><a 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 disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</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><a 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='{$url}&p=1&q=$query'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</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><a href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</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='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</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><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</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><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</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><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</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><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</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><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</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='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</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><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</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><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</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><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</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><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</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><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</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='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Next') . "</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/User.php

@@ -187,6 +187,7 @@ class User
             ->select('time')
             ->select('status')
             ->select('method')
+            ->select('plan_type')
             ->select('tbl_user_recharges.routers', 'routers')
             ->select('tbl_user_recharges.type', 'type')
             ->select('admin_id')

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/admin.php

@@ -6,7 +6,7 @@
  **/
 
 if(Admin::getID()){
-    r2(U.'dashboard');
+    r2(U.'dashboard', "s", Lang::T("You are already logged in"));
 }
 
 if (isset($routes['1'])) {
@@ -26,20 +26,27 @@ switch ($do) {
                 $d_pass = $d['password'];
                 if (Password::_verify($password, $d_pass) == true) {
                     $_SESSION['aid'] = $d['id'];
-                    Admin::setCookie($d['id']);
+                    $token = Admin::setCookie($d['id']);
                     $d->last_login = date('Y-m-d H:i:s');
                     $d->save();
                     _log($username . ' ' . Lang::T('Login Successful'), $d['user_type'], $d['id']);
+                    if ($isApi) {
+                        if ($token) {
+                            showResult(true, Lang::T('Login Successful'), ['token' => "a.".$token]);
+                        } else {
+                            showResult(false, Lang::T('Invalid Username or Password'));
+                        }
+                    }
                     _alert(Lang::T('Login Successful'),'success', "dashboard");
                 } else {
                     _log($username . ' ' . Lang::T('Failed Login'), $d['user_type']);
-                    _alert(Lang::T('Invalid Username or Password'),'danger', "admin");
+                    _alert(Lang::T('Invalid Username or Password').".",'danger', "admin");
                 }
             } else {
-                _alert(Lang::T('Invalid Username or Password'),'danger', "admin");
+                _alert(Lang::T('Invalid Username or Password')."..",'danger', "admin");
             }
         } else {
-            _alert(Lang::T('Invalid Username or Password'),'danger', "admin");
+            _alert(Lang::T('Invalid Username or Password')."...",'danger', "admin");
         }
 
         break;

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');
-		if ($name != ''){
-            $paginator = Paginator::build(ORM::for_table('tbl_bandwidth'), ['name_bw' => '%' . $name . '%'], $name);
-			$d = ORM::for_table('tbl_bandwidth')->where_like('name_bw','%'.$name.'%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
-		}else{
-            $paginator = Paginator::build(ORM::for_table('tbl_bandwidth'));
-			$d = ORM::for_table('tbl_bandwidth')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
-		}
+        $name = _post('name');
+        if ($name != '') {
+            $query = ORM::for_table('tbl_bandwidth')->where_like('name_bw', '%' . $name . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['name' => $name]);
+        } else {
+            $query = ORM::for_table('tbl_bandwidth')->order_by_desc('id');
+            $d = Paginator::findMany($query);
+        }
 
-        $ui->assign('d',$d);
-		$ui->assign('paginator',$paginator);
+        $ui->assign('d', $d);
         $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){
-            $ui->assign('burst',explode(" ", $d['burst']));
-            $ui->assign('d',$d);
+        if ($d) {
+            $ui->assign('burst', explode(" ", $d['burst']));
+            $ui->assign('d', $d);
             $ui->display('bandwidth-edit.tpl');
-        }else{
-            r2(U . 'bandwidth/list', 'e', $_L['Account_Not_Found']);
+        } else {
+            r2(U . 'bandwidth/list', 'e', Lang::T('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_unit = _post('rate_up_unit');
+        $rate_up = _post('rate_up');
+        $rate_up_unit = _post('rate_up_unit');
         run_hook('add_bandwidth'); #HOOK
         $isBurst = true;
         $burst = "";
-        if(isset($_POST['burst'])){
-            foreach($_POST['burst'] as $b){
-                if(empty($b)){
+        if (isset($_POST['burst'])) {
+            foreach ($_POST['burst'] as $b) {
+                if (empty($b)) {
                     $isBurst = false;
                 }
             }
-            if($isBurst){
+            if ($isBurst) {
                 $burst = implode(' ', $_POST['burst']);
             };
         }
         $msg = '';
-        if(Validator::Length($name,16,4) == false){
-            $msg .= 'Name should be between 5 to 15 characters'. '<br>';
+        if (Validator::Length($name, 16, 4) == false) {
+            $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_up_unit == 'Kbps'){	$unit_rate_up = $min_up * 1024; }else{ $unit_rate_up = $min_up * 1048576; }
-
-        $d = ORM::for_table('tbl_bandwidth')->where('name_bw',$name)->find_one();
-        if($d){
-            $msg .= Lang::T('Name Bandwidth Already Exist'). '<br>';
+        if ($rate_down_unit == 'Kbps') {
+            $unit_rate_down = $rate_down * 1024;
+        } else {
+            $unit_rate_down = $rate_down * 1048576;
+        }
+        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_unit = _post('rate_up_unit');
-		run_hook('edit_bandwidth'); #HOOK
+        $rate_up = _post('rate_up');
+        $rate_up_unit = _post('rate_up_unit');
+        run_hook('edit_bandwidth'); #HOOK
         $isBurst = true;
         $burst = "";
-        if(isset($_POST['burst'])){
-            foreach($_POST['burst'] as $b){
-                if(empty($b)){
+        if (isset($_POST['burst'])) {
+            foreach ($_POST['burst'] as $b) {
+                if (empty($b)) {
                     $isBurst = false;
                 }
             }
-            if($isBurst){
+            if ($isBurst) {
                 $burst = implode(' ', $_POST['burst']);
             };
         }
         $msg = '';
-        if(Validator::Length($name,16,4) == false){
-            $msg .= 'Name should be between 5 to 15 characters'. '<br>';
+        if (Validator::Length($name, 16, 4) == false) {
+            $msg .= 'Name should be between 5 to 15 characters' . '<br>';
         }
 
         $id = _post('id');
         $d = ORM::for_table('tbl_bandwidth')->find_one($id);
-        if($d){
-        }else{
-            $msg .= Lang::T('Data Not Found'). '<br>';
+        if ($d) {
+        } else {
+            $msg .= Lang::T('Data Not Found') . '<br>';
         }
 
-        if($d['name_bw'] != $name){
-            $c = ORM::for_table('tbl_bandwidth')->where('name_bw',$name)->find_one();
-            if($c){
-                $msg .= Lang::T('Name Bandwidth Already Exist'). '<br>';
+        if ($d['name_bw'] != $name) {
+            $c = ORM::for_table('tbl_bandwidth')->where('name_bw', $name)->find_one();
+            if ($c) {
+                $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,11 +180,11 @@ switch ($action) {
             $d->save();
 
             r2(U . 'bandwidth/list', 's', Lang::T('Data Updated Successfully'));
-        }else{
-            r2(U . 'bandwidth/edit/'.$id, 'e', $msg);
+        } else {
+            r2(U . 'bandwidth/edit/' . $id, 'e', $msg);
         }
         break;
 
     default:
         $ui->display('a404.tpl');
-}
+}

system/controllers/customers.php

@@ -16,36 +16,11 @@ 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;
@@ -96,8 +72,8 @@ 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");
         }
-        $id_customer  = $routes['2'];
-        $plan_id  = $routes['3'];
+        $id_customer = $routes['2'];
+        $plan_id = $routes['3'];
         $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('plan_id', $plan_id)->find_one();
         if ($b) {
             $gateway = 'Recharge';
@@ -130,7 +106,7 @@ switch ($action) {
             $ui->assign('using', 'cash');
             $ui->assign('plan', $plan);
             $ui->display('recharge-confirm.tpl');
-        }else{
+        } else {
             r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
         }
         break;
@@ -138,8 +114,8 @@ switch ($action) {
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
-        $id_customer  = $routes['2'];
-        $plan_id  = $routes['3'];
+        $id_customer = $routes['2'];
+        $plan_id = $routes['3'];
         $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('plan_id', $plan_id)->find_one();
         if ($b) {
             $p = ORM::for_table('tbl_plans')->where('id', $b['plan_id'])->find_one();
@@ -169,7 +145,7 @@ switch ($action) {
         r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
         break;
     case 'sync':
-        $id_customer  = $routes['2'];
+        $id_customer = $routes['2'];
         $bs = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('status', 'on')->findMany();
         if ($bs) {
             $routers = [];
@@ -191,14 +167,14 @@ switch ($action) {
                     }
                 }
             }
-            r2(U . 'customers/view/' . $id_customer, 's', 'Sync success to '.implode(", ",$routers));
+            r2(U . 'customers/view/' . $id_customer, 's', 'Sync success to ' . implode(", ", $routers));
         }
         r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
         break;
     case 'viewu':
         $customer = ORM::for_table('tbl_customers')->where('username', $routes['2'])->find_one();
     case 'view':
-        $id  = $routes['2'];
+        $id = $routes['2'];
         run_hook('view_customer'); #HOOK
         if (!$customer) {
             $customer = ORM::for_table('tbl_customers')->find_one($id);
@@ -210,47 +186,35 @@ switch ($action) {
             $customFields = ORM::for_table('tbl_customers_fields')
                 ->where('customer_id', $customer['id'])
                 ->find_many();
-
-            $v  = $routes['3'];
-            if(empty($v)){
+            $v = $routes['3'];
+            if (empty($v)) {
                 $v = 'activation';
             }
             if ($v == 'order') {
                 $v = 'order';
-                $paginator = Paginator::build(ORM::for_table('tbl_payment_gateway'), ['username' => $customer['username']]);
-                $order = ORM::for_table('tbl_payment_gateway')
-                    ->where('username', $customer['username'])
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])
-                    ->order_by_desc('id')
-                    ->find_many();
-                $ui->assign('paginator', $paginator);
+                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
+                $order = Paginator::findMany($query);
                 $ui->assign('order', $order);
             } else if ($v == 'activation') {
-                $paginator = Paginator::build(ORM::for_table('tbl_transactions'), ['username' => $customer['username']]);
-                $activation = ORM::for_table('tbl_transactions')
-                    ->where('username', $customer['username'])
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])
-                    ->order_by_desc('id')
-                    ->find_many();
-                $ui->assign('paginator', $paginator);
+                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
+                $activation = Paginator::findMany($query);
                 $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']);
+            r2(U . 'customers/list', 'e', Lang::T('Account Not Found'));
         }
         break;
     case 'edit':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
-        $id  = $routes['2'];
+        $id = $routes['2'];
         run_hook('edit_customer'); #HOOK
         $d = ORM::for_table('tbl_customers')->find_one($id);
         // Fetch the Customers Attributes values from the tbl_customers_fields table
@@ -260,9 +224,10 @@ 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']);
+            r2(U . 'customers/list', 'e', Lang::T('Account Not Found'));
         }
         break;
 
@@ -270,7 +235,7 @@ switch ($action) {
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
-        $id  = $routes['2'];
+        $id = $routes['2'];
         run_hook('delete_customer'); #HOOK
         $d = ORM::for_table('tbl_customers')->find_one($id);
         if ($d) {
@@ -309,7 +274,8 @@ switch ($action) {
                 } catch (Throwable $e) {
                 }
                 try {
-                    if ($c) $c->delete();
+                    if ($c)
+                        $c->delete();
                 } catch (Exception $e) {
                 } catch (Throwable $e) {
                 }
@@ -328,6 +294,8 @@ switch ($action) {
         $address = _post('address');
         $phonenumber = _post('phonenumber');
         $service_type = _post('service_type');
+        $account_type = _post('account_type');
+        $coordinates = _post('coordinates');
         //post Customers Attributes
         $custom_field_names = (array) $_POST['custom_field_name'];
         $custom_field_values = (array) $_POST['custom_field_value'];
@@ -355,11 +323,13 @@ switch ($action) {
             $d->password = $password;
             $d->pppoe_password = $pppoe_password;
             $d->email = $email;
+            $d->account_type = $account_type;
             $d->fullname = $fullname;
             $d->address = $address;
             $d->created_by = $admin['id'];
             $d->phonenumber = Lang::phoneFormat($phonenumber);
             $d->service_type = $service_type;
+            $d->coordinates = $coordinates;
             $d->save();
 
             // Retrieve the customer ID of the newly created customer
@@ -389,12 +359,14 @@ switch ($action) {
     case 'edit-post':
         $username = Lang::phoneFormat(_post('username'));
         $fullname = _post('fullname');
+        $account_type = _post('account_type');
         $password = _post('password');
         $pppoe_password = _post('pppoe_password');
         $email = _post('email');
         $address = _post('address');
         $phonenumber = Lang::phoneFormat(_post('phonenumber'));
         $service_type = _post('service_type');
+        $coordinates = _post('coordinates');
         run_hook('edit_customer'); #HOOK
         $msg = '';
         if (Validator::Length($username, 35, 2) == false) {
@@ -422,8 +394,8 @@ switch ($action) {
         }
 
         $oldusername = $d['username'];
-        $oldPppoePassword =  $d['password'];
-        $oldPassPassword =  $d['pppoe_password'];
+        $oldPppoePassword = $d['password'];
+        $oldPassPassword = $d['pppoe_password'];
         $userDiff = false;
         $pppoeDiff = false;
         $passDiff = false;
@@ -451,9 +423,11 @@ switch ($action) {
             $d->pppoe_password = $pppoe_password;
             $d->fullname = $fullname;
             $d->email = $email;
+            $d->account_type = $account_type;
             $d->address = $address;
             $d->phonenumber = $phonenumber;
             $d->service_type = $service_type;
+            $d->coordinates = $coordinates;
             $d->save();
 
 
@@ -538,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

@@ -19,7 +19,7 @@ $month_n = date('n');
 $iday = ORM::for_table('tbl_transactions')
     ->where('recharged_on', $mdate)
     ->where_not_equal('method', 'Customer - Balance')
-    ->where_not_equal('method', 'Recharge Balance - Administrator') 
+    ->where_not_equal('method', 'Recharge Balance - Administrator')
     ->sum('price');
 
 if ($iday == '') {
@@ -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'));
-    $expire = ORM::for_table('tbl_user_recharges')
+    $query = ORM::for_table('tbl_user_recharges')
         ->where_lte('expiration', $mdate)
-        ->offset($paginator['startpoint'])
-        ->limit($paginator['limit'])
-        ->order_by_desc('expiration')
-        ->find_many();
+        ->order_by_desc('expiration');
+    $expire = Paginator::findMany($query);
 
     // 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);
 }
 
@@ -150,7 +146,7 @@ if (file_exists($cacheMSfile) && time() - filemtime($cacheMSfile) < 43200) {
         ->select_expr('SUM(price)', 'total')
         ->where_raw("YEAR(recharged_on) = YEAR(CURRENT_DATE())") // Filter by the current year
         ->where_not_equal('method', 'Customer - Balance')
-        ->where_not_equal('method', 'Recharge Balance - Administrator') 
+        ->where_not_equal('method', 'Recharge Balance - Administrator')
         ->group_by_expr('MONTH(recharged_on)')
         ->find_many();
 

system/controllers/logs.php

@@ -13,11 +13,73 @@ $action = $routes['1'];
 $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) {
+    case 'list-csv':
+        $logs = ORM::for_table('tbl_logs')
+            ->select('id')
+            ->select('date')
+            ->select('type')
+            ->select('description')
+            ->select('userid')
+            ->select('ip')
+            ->order_by_asc('id')->find_array();
+        $h = false;
+        set_time_limit(-1);
+        header('Pragma: public');
+        header('Expires: 0');
+        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+        header("Content-type: text/csv");
+        header('Content-Disposition: attachment;filename="activity-logs_' . date('Y-m-d_H_i') . '.csv"');
+        header('Content-Transfer-Encoding: binary');
+        foreach ($logs as $log) {
+            $ks = [];
+            $vs = [];
+            foreach ($log as $k => $v) {
+                $ks[] = $k;
+                $vs[] = $v;
+            }
+            if (!$h) {
+                echo '"' . implode('";"', $ks) . "\"\n";
+                $h = true;
+            }
+            echo '"' . implode('";"', $vs) . "\"\n";
+        }
+        break;
+    case 'radius-csv':
+        $logs = ORM::for_table('radpostauth')
+            ->select('id')
+            ->select('username')
+            ->select('pass')
+            ->select('reply')
+            ->select('authdate')
+            ->order_by_asc('id')->find_array();
+        $h = false;
+        set_time_limit(-1);
+        header('Pragma: public');
+        header('Expires: 0');
+        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+        header("Content-type: text/csv");
+        header('Content-Disposition: attachment;filename="radius-logs_' . date('Y-m-d_H_i') . '.csv"');
+        header('Content-Transfer-Encoding: binary');
+        foreach ($logs as $log) {
+            $ks = [];
+            $vs = [];
+            foreach ($log as $k => $v) {
+                $ks[] = $k;
+                $vs[] = $v;
+            }
+            if (!$h) {
+                echo '"' . implode('";"', $ks) . "\"\n";
+                $h = true;
+            }
+            echo '"' . implode('";"', $vs) . "\"\n";
+        }
+        break;
+
     case 'list':
         $q = (_post('q') ? _post('q') : _get('q'));
         $keep = _post('keep');
@@ -26,16 +88,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);
-            $d = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_logs'));
-            $d = ORM::for_table('tbl_logs')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_logs')->order_by_desc('id');
+            $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 +107,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);
-            $d = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('radpostauth', 'radius'));
-            $d = ORM::for_table('radpostauth', 'radius')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('radpostauth', 'radius')->order_by_desc('id');
+            $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

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ * by https://t.me/ibnux
+ **/
+
+_admin();
+$ui->assign('_system_menu', 'map');
+
+$action = $routes['1'];
+$ui->assign('_admin', $admin);
+
+if (empty($action)) {
+    $action = 'customer';
+}
+
+switch ($action) {
+    case 'customer':
+
+        $c = ORM::for_table('tbl_customers')->find_many();
+        $customerData = [];
+
+        foreach ($c as $customer) {
+            if (!empty($customer->coordinates)) {
+                $customerData[] = [
+                    'id' => $customer->id,
+                    '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 . ']',
+                ];
+            }
+        }
+
+        $ui->assign('customers', $customerData);
+        $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('customers-map.tpl');
+        break;
+
+    default:
+        r2(U . 'map/customer', 'e', 'action not defined');
+        break;
+}

system/controllers/message.php

@@ -40,8 +40,11 @@ document.addEventListener("DOMContentLoaded", function(event) {
 });
 </script>
 EOT;
-        $c = ORM::for_table('tbl_customers')->find_many();
-        $ui->assign('c', $c);
+        if (isset($routes['2']) && !empty($routes['2'])) {
+            $ui->assign('cust', ORM::for_table('tbl_customers')->find_one($routes['2']));
+        }
+        $id = $routes['2'];
+        $ui->assign('id', $id);
         $ui->assign('xfooter', $select2_customer);
         $ui->display('message.tpl');
         break;
@@ -92,121 +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;
-        $failCount = 0;
-        $successMessages = [];
-        $failMessages = [];
+        $totalSMSSent = 0;
+        $totalSMSFailed = 0;
+        $totalWhatsappSent = 0;
+        $totalWhatsappFailed = 0;
+        $batchStatus = [];
 
-        // Check if fields are empty
-        if ($group == '' or $message == '' or $via == '') {
-            r2(U . 'message/send_bulk', 'e', Lang::T('All fields are required'));
-        } else {
-            // 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) {
-                // Replace placeholders in the message with actual values for each customer
-                $message = str_replace('[[name]]', $customer['fullname'], $message);
-                $message = str_replace('[[user_name]]', $customer['username'], $message);
-                $message = str_replace('[[phone]]', $customer['phonenumber'], $message);
-                $message = str_replace('[[company_name]]', $config['CompanyName'], $message);
-
-                // Send the message based on the selected method
-                if ($via == 'sms' || $via == 'both') {
-                    $smsSent = Message::sendSMS($customer['phonenumber'], $message);
-                    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'], $message);
-                    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);
+        if (_req('send') == 'now') {
+            // Check if fields are empty
+            if ($group == '' || $message == '' || $via == '') {
+                r2(U . 'message/send_bulk', 'e', Lang::T('All fields are required'));
             } 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']]);
-        $d = ORM::for_table('tbl_payment_gateway')
-            ->where('username', $user['username'])
-            ->order_by_desc('id')
-            ->offset($paginator['startpoint'])->limit($paginator['limit'])
-            ->find_many();
-        $ui->assign('paginator', $paginator);
+        $query = ORM::for_table('tbl_payment_gateway')->where('username', $user['username'])->order_by_desc('id');
+        $d = Paginator::findMany($query);
         $ui->assign('d', $d);
         $ui->assign('_title', Lang::T('Order History'));
         run_hook('customer_view_order_history'); #HOOK
@@ -47,26 +42,30 @@ switch ($action) {
         }
         $ui->assign('_title', 'Order Plan');
         $ui->assign('_system_menu', 'package');
-        if (!empty($_SESSION['nux-router'])) {
+        $account_type = $user['account_type'];
+        if(empty($account_type)){
+            $account_type = 'Personal';
+        }
+        if (!empty ($_SESSION['nux-router'])) {
             if ($_SESSION['nux-router'] == 'radius') {
-                $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
-                $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
+                $radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+                $radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
             } else {
                 $routers = ORM::for_table('tbl_routers')->where('id', $_SESSION['nux-router'])->find_many();
                 $rs = [];
                 foreach ($routers as $r) {
                     $rs[] = $r['name'];
                 }
-                $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
-                $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
+                $plans_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+                $plans_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
             }
         } else {
-            $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
-            $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
+            $radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+            $radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
 
             $routers = ORM::for_table('tbl_routers')->find_many();
-            $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
-            $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
+            $plans_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+            $plans_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
         }
         $ui->assign('routers', $routers);
         $ui->assign('radius_pppoe', $radius_pppoe);
@@ -84,7 +83,7 @@ switch ($action) {
         run_hook('custome
         r_find_unpaid'); #HOOK
         if ($d) {
-            if (empty($d['pg_url_payment'])) {
+            if (empty ($d['pg_url_payment'])) {
                 r2(U . "order/buy/" . $trx['routers_id'] . '/' . $trx['plan_id'], 'w', Lang::T("Checking payment"));
             } else {
                 r2(U . "order/view/" . $d['id'] . '/check/', 's', Lang::T("You have unpaid transaction"));
@@ -100,11 +99,11 @@ switch ($action) {
             ->find_one($trxid);
         run_hook('customer_view_payment'); #HOOK
         // jika tidak ditemukan, berarti punya orang lain
-        if (empty($trx)) {
+        if (empty ($trx)) {
             r2(U . "order/package", 'w', Lang::T("Payment not found"));
         }
-        // jika url kosong, balikin ke buy
-        if (empty($trx['pg_url_payment'])) {
+        // jika url kosong, balikin ke buy, kecuali cancel
+        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') {
@@ -125,7 +124,7 @@ switch ($action) {
                 ->where('username', $user['username'])
                 ->find_one($trxid);
         }
-        if (empty($trx)) {
+        if (empty ($trx)) {
             r2(U . "order/package", 'e', Lang::T("Transaction Not found"));
         }
         $router = Mikrotik::info($trx['routers']);
@@ -146,7 +145,7 @@ switch ($action) {
             r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
         }
         $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
-        if (empty($plan)) {
+        if (empty ($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
         if (!$plan['enabled']) {
@@ -180,7 +179,7 @@ switch ($action) {
         $ui->assign('_title', Lang::T('Buy for friend'));
         $ui->assign('_system_menu', 'package');
         $plan = ORM::for_table('tbl_plans')->find_one($routes['3']);
-        if (empty($plan)) {
+        if (empty ($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
         if (!$plan['enabled']) {
@@ -191,10 +190,10 @@ switch ($action) {
         } else {
             $router_name = $plan['routers'];
         }
-        if (isset($_POST['send']) && $_POST['send'] == 'plan') {
+        if (isset ($_POST['send']) && $_POST['send'] == 'plan') {
             $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one();
             list($bills, $add_cost) = User::getBills($target['id']);
-            if (!empty($add_cost)) {
+            if (!empty ($add_cost)) {
                 $ui->assign('bills', $bills);
                 $ui->assign('add_cost', $add_cost);
                 $plan['price'] += $add_cost;
@@ -289,7 +288,7 @@ switch ($action) {
             $ui->display('user-selectGateway.tpl');
             break;
         } else {
-            if (empty($pgs[0])) {
+            if (empty ($pgs[0])) {
                 sendTelegram("Payment Gateway not set, please set it in Settings");
                 _log(Lang::T("Payment Gateway not set, please set it in Settings"));
                 r2(U . "home", 'e', Lang::T("Failed to create Transaction.."));
@@ -299,12 +298,12 @@ switch ($action) {
         }
     case 'buy':
         $gateway = _post('gateway');
-        if (empty($gateway) && !empty($_SESSION['gateway'])) {
+        if (empty ($gateway) && !empty ($_SESSION['gateway'])) {
             $gateway = $_SESSION['gateway'];
-        } else if (!empty($gateway)) {
+        } else if (!empty ($gateway)) {
             $_SESSION['gateway'] = $gateway;
         }
-        if (empty($gateway)) {
+        if (empty ($gateway)) {
             r2(U . 'order/gateway/' . $routes[2] . '/' . $routes[3], 'w', Lang::T("Please select Payment Gateway"));
         }
         run_hook('customer_buy_plan'); #HOOK
@@ -321,7 +320,7 @@ switch ($action) {
             $router['name'] = 'balance';
         }
         $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
-        if (empty($router) || empty($plan)) {
+        if (empty ($router) || empty ($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
         $d = ORM::for_table('tbl_payment_gateway')
@@ -344,7 +343,7 @@ switch ($action) {
         if ($router['name'] != 'balance') {
             list($bills, $add_cost) = User::getBills($id_customer);
         }
-        if (empty($id)) {
+        if (empty ($id)) {
             $d = ORM::for_table('tbl_payment_gateway')->create();
             $d->username = $user['username'];
             $d->gateway = $gateway;
@@ -352,16 +351,16 @@ switch ($action) {
             $d->plan_name = $plan['name_plan'];
             $d->routers_id = $router['id'];
             $d->routers = $router['name'];
-			if ($plan['validity_unit'] == 'Period') {
-				// Postpaid price from field
-				$add_inv = User::getAttribute("Invoice", $id_customer);
-				if (empty ($add_inv) or $add_inv == 0) {
-					$d->price = ($plan['price'] + $add_cost);
-				} else {
-					$d->price = ($add_inv + $add_cost);
-				}
-            } else {
+            if ($plan['validity_unit'] == 'Period') {
+                // Postpaid price from field
+                $add_inv = User::getAttribute("Invoice", $id_customer);
+                if (empty ($add_inv) or $add_inv == 0) {
                     $d->price = ($plan['price'] + $add_cost);
+                } else {
+                    $d->price = ($add_inv + $add_cost);
+                }
+            } else {
+                $d->price = ($plan['price'] + $add_cost);
             }
             //$d->price = ($plan['price'] + $add_cost);
             $d->created_date = date('Y-m-d H:i:s');
@@ -375,16 +374,16 @@ switch ($action) {
             $d->plan_name = $plan['name_plan'];
             $d->routers_id = $router['id'];
             $d->routers = $router['name'];
-			if ($plan['validity_unit'] == 'Period') {
-				// Postpaid price from field
-				$add_inv = User::getAttribute("Invoice", $id_customer);
-				if (empty ($add_inv) or $add_inv == 0) {
-					$d->price = ($plan['price'] + $add_cost);
-				} else {
-					$d->price = ($add_inv + $add_cost);
-				}
-            } else {
+            if ($plan['validity_unit'] == 'Period') {
+                // Postpaid price from field
+                $add_inv = User::getAttribute("Invoice", $id_customer);
+                if (empty ($add_inv) or $add_inv == 0) {
                     $d->price = ($plan['price'] + $add_cost);
+                } else {
+                    $d->price = ($add_inv + $add_cost);
+                }
+            } else {
+                $d->price = ($plan['price'] + $add_cost);
             }
             //$d->price = ($plan['price'] + $add_cost);
             $d->created_date = date('Y-m-d H:i:s');

system/controllers/plan.php

@@ -59,28 +59,21 @@ switch ($action) {
             }
             $log .= "DONE : $plan[username], $plan[namebp], $plan[type], $plan[routers]<br>";
         }
-        if ($isApi) {
-            showResult(true, $log);
-        }
         r2(U . 'plan/list', 's', $log);
     case 'list':
         $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/plan.js"></script>');
         $ui->assign('_title', Lang::T('Customer'));
         $search = _post('search');
         if ($search != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_user_recharges'), ['username' => '%' . $search . '%'], $search);
-            $d = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['search' => $search]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_user_recharges'));
-            $d = ORM::for_table('tbl_user_recharges')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_array();
+            $query = ORM::for_table('tbl_user_recharges')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
         run_hook('view_list_billing'); #HOOK
-        if ($isApi) {
-            showResult(true, $action, $d, ['search' => $search]);
-        }
         $ui->assign('d', $d);
         $ui->assign('search', $search);
-        $ui->assign('paginator', $paginator);
         $ui->display('plan.tpl');
         break;
 
@@ -254,7 +247,7 @@ switch ($action) {
             $ui->assign('_title', 'Edit Plan');
             $ui->display('plan-edit.tpl');
         } else {
-            r2(U . 'plan/list', 'e', $_L['Account_Not_Found']);
+            r2(U . 'plan/list', 'e', Lang::T('Account Not Found'));
         }
         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);
-            $d = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_pool'));
-            $d = ORM::for_table('tbl_pool')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_pool')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_pool'); #HOOK
         $ui->display('pool.tpl');
         break;
@@ -51,7 +50,7 @@ switch ($action) {
             run_hook('view_edit_pool'); #HOOK
             $ui->display('pool-edit.tpl');
         } else {
-            r2(U . 'pool/list', 'e', $_L['Account_Not_Found']);
+            r2(U . 'pool/list', 'e', Lang::T('Account Not Found'));
         }
         break;
 

system/controllers/radius.php

@@ -1,10 +1,11 @@
 <?php
+
 /**
  *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  *  by https://t.me/ibnux
  **/
 _admin();
-$ui->assign('_title', $_L['Plugin Manager']);
+$ui->assign('_title', Lang::T('Plugin Manager'));
 $ui->assign('_system_menu', 'settings');
 
 $action = $routes['1'];
@@ -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) {
@@ -79,7 +80,7 @@ switch ($action) {
             $ui->assign('d', $d);
             $ui->display('radius-nas-edit.tpl');
         } else {
-            r2(U . 'radius/list', 'e', $_L['Account_Not_Found']);
+            r2(U . 'radius/list', 'e', Lang::T('Account Not Found'));
         }
 
         break;
@@ -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'));
-            $nas = ORM::for_table('nas', 'radius')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $query = ORM::for_table('nas', 'radius');
+            $nas = Paginator::findMany($query);
         } else {
-            $paginator = Paginator::build(ORM::for_table('nas', 'radius'), [
-                'nasname' => '%'.$search.'%',
-                'shortname' => '%'.$search.'%',
-                'description' => '%'.$search.'%'
-            ]);
-            $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();
+            $query = ORM::for_table('nas', 'radius')
+                ->where_like('nasname', $search)
+                ->where_like('shortname', $search)
+                ->where_like('description', $search);
+            $nas = Paginator::findMany($query, ['name' => $name]);
         }
-        $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);
-            $d = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_transactions'));
-            $d = ORM::for_table('tbl_transactions')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_transactions')->order_by_desc('id');
+            $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]);
-        $d = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
-        $dr = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->sum('price');
+        $query = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->order_by_desc('id');
+        $d = Paginator::findMany($query);
+        $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);
-            $d = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_routers'));
-            $d = ORM::for_table('tbl_routers')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_routers')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_routers'); #HOOK
         $ui->display('routers.tpl');
         break;
@@ -55,7 +54,7 @@ switch ($action) {
             run_hook('view_router_edit'); #HOOK
             $ui->display('routers-edit.tpl');
         } else {
-            r2(U . 'routers/list', 'e', $_L['Account_Not_Found']);
+            r2(U . 'routers/list', 'e', Lang::T('Account Not Found'));
         }
         break;
 

system/controllers/services.php

@@ -12,7 +12,7 @@ $action = $routes['1'];
 $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");
 }
 
 use PEAR2\Net\RouterOS;
@@ -60,7 +60,7 @@ switch ($action) {
                     $rate = $plan['rate_up'] . $unitup . "/" . $plan['rate_down'] . $unitdown;
                     Mikrotik::addHotspotPlan($client, $plan['name_plan'], $plan['shared_users'], $rate);
                     $log .= "DONE : $plan[name_plan], $plan[shared_users], $rate<br>";
-                    if (!empty($plan['pool_expired'])) {
+                    if (!empty ($plan['pool_expired'])) {
                         Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $plan['pool_expired'], $plan['pool_expired']);
                         $log .= "DONE Expired : EXPIRED NUXBILL $plan[pool_expired]<br>";
                     }
@@ -105,7 +105,7 @@ switch ($action) {
                     $rate = $plan['rate_up'] . $unitup . "/" . $plan['rate_down'] . $unitdown;
                     Mikrotik::addPpoePlan($client, $plan['name_plan'], $plan['pool'], $rate);
                     $log .= "DONE : $plan[name_plan], $plan[pool], $rate<br>";
-                    if (!empty($plan['pool_expired'])) {
+                    if (!empty ($plan['pool_expired'])) {
                         Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $plan['pool_expired'], $plan['pool_expired'], '512K/512K');
                         $log .= "DONE Expired : EXPIRED NUXBILL $plan[pool_expired]<br>";
                     }
@@ -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);
-            $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();
+            $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 = Paginator::findMany($query, ['name'=> $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('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();
+            $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_plans'); #HOOK
         $ui->display('hotspot.tpl');
         break;
@@ -142,7 +141,7 @@ switch ($action) {
         break;
 
     case 'edit':
-        $id  = $routes['2'];
+        $id = $routes['2'];
         $d = ORM::for_table('tbl_plans')->find_one($id);
         if ($d) {
             $ui->assign('d', $d);
@@ -153,12 +152,12 @@ switch ($action) {
             run_hook('view_edit_plan'); #HOOK
             $ui->display('hotspot-edit.tpl');
         } else {
-            r2(U . 'services/hotspot', 'e', $_L['Account_Not_Found']);
+            r2(U . 'services/hotspot', 'e', Lang::T('Account Not Found'));
         }
         break;
 
     case 'delete':
-        $id  = $routes['2'];
+        $id = $routes['2'];
 
         $d = ORM::for_table('tbl_plans')->find_one($id);
         if ($d) {
@@ -185,6 +184,7 @@ switch ($action) {
 
     case 'add-post':
         $name = _post('name');
+        $plan_type = _post('plan_type'); //Personal / Business
         $radius = _post('radius');
         $typebp = _post('typebp');
         $limit_type = _post('limit_type');
@@ -213,7 +213,7 @@ switch ($action) {
         if ($name == '' or $id_bw == '' or $price == '' or $validity == '') {
             $msg .= Lang::T('All field is required') . '<br>';
         }
-        if (empty($radius)) {
+        if (empty ($radius)) {
             if ($routers == '') {
                 $msg .= Lang::T('All field is required') . '<br>';
             }
@@ -251,6 +251,7 @@ switch ($action) {
             $d->price = $price;
             $d->type = 'Hotspot';
             $d->typebp = $typebp;
+            $d->plan_type = $plan_type;
             $d->limit_type = $limit_type;
             $d->time_limit = $time_limit;
             $d->time_unit = $time_unit;
@@ -259,7 +260,7 @@ switch ($action) {
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
             $d->shared_users = $sharedusers;
-            if (!empty($radius)) {
+            if (!empty ($radius)) {
                 $d->is_radius = 1;
                 $d->routers = '';
             } else {
@@ -279,7 +280,7 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::addHotspotPlan($client, $name, $sharedusers, $rate);
-                if (!empty($pool_expired)) {
+                if (!empty ($pool_expired)) {
                     Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired);
                 }
             }
@@ -295,6 +296,7 @@ switch ($action) {
     case 'edit-post':
         $id = _post('id');
         $name = _post('name');
+        $plan_type = _post('plan_type');
         $id_bw = _post('id_bw');
         $typebp = _post('typebp');
         $price = _post('price');
@@ -354,7 +356,7 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::setHotspotPlan($client, $name, $sharedusers, $rate);
-                if (!empty($pool_expired)) {
+                if (!empty ($pool_expired)) {
                     Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired);
                 }
             }
@@ -367,6 +369,7 @@ switch ($action) {
             $d->time_limit = $time_limit;
             $d->time_unit = $time_unit;
             $d->data_limit = $data_limit;
+            $d->plan_type = $plan_type;
             $d->data_unit = $data_unit;
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
@@ -389,15 +392,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['name_plan' => '%' . $name . '%', 'type' => 'PPPOE'], $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();
+            $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 = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['type' => 'PPPOE'], $name);
-            $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();
+            $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_ppoe'); #HOOK
         $ui->display('pppoe.tpl');
         break;
@@ -414,7 +416,7 @@ switch ($action) {
 
     case 'pppoe-edit':
         $ui->assign('_title', Lang::T('PPPOE Plans'));
-        $id  = $routes['2'];
+        $id = $routes['2'];
         $d = ORM::for_table('tbl_plans')->find_one($id);
         if ($d) {
             $ui->assign('d', $d);
@@ -430,12 +432,12 @@ switch ($action) {
             run_hook('view_edit_ppoe'); #HOOK
             $ui->display('pppoe-edit.tpl');
         } else {
-            r2(U . 'services/pppoe', 'e', $_L['Account_Not_Found']);
+            r2(U . 'services/pppoe', 'e', Lang::T('Account Not Found'));
         }
         break;
 
     case 'pppoe-delete':
-        $id  = $routes['2'];
+        $id = $routes['2'];
 
         $d = ORM::for_table('tbl_plans')->find_one($id);
         if ($d) {
@@ -461,6 +463,7 @@ switch ($action) {
 
     case 'pppoe-add-post':
         $name = _post('name_plan');
+        $plan_type = _post('plan_type');
         $radius = _post('radius');
         $id_bw = _post('id_bw');
         $price = _post('price');
@@ -484,7 +487,7 @@ switch ($action) {
         if ($name == '' or $id_bw == '' or $price == '' or $validity == '' or $pool == '') {
             $msg .= Lang::T('All field is required') . '<br>';
         }
-        if (empty($radius)) {
+        if (empty ($radius)) {
             if ($routers == '') {
                 $msg .= Lang::T('All field is required') . '<br>';
             }
@@ -520,10 +523,11 @@ switch ($action) {
             $d->name_plan = $name;
             $d->id_bw = $id_bw;
             $d->price = $price;
+            $d->plan_type = $plan_type;
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
             $d->pool = $pool;
-            if (!empty($radius)) {
+            if (!empty ($radius)) {
                 $d->is_radius = 1;
                 $d->routers = '';
             } else {
@@ -543,7 +547,7 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::addPpoePlan($client, $name, $pool, $rate);
-                if (!empty($pool_expired)) {
+                if (!empty ($pool_expired)) {
                     Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K');
                 }
             }
@@ -556,6 +560,7 @@ switch ($action) {
 
     case 'edit-pppoe-post':
         $id = _post('id');
+        $plan_type = _post('plan_type');
         $name = _post('name_plan');
         $id_bw = _post('id_bw');
         $price = _post('price');
@@ -611,7 +616,7 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::setPpoePlan($client, $name, $pool, $rate);
-                if (!empty($pool_expired)) {
+                if (!empty ($pool_expired)) {
                     Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K');
                 }
             }
@@ -619,6 +624,7 @@ switch ($action) {
             $d->name_plan = $name;
             $d->id_bw = $id_bw;
             $d->price = $price;
+            $d->plan_type = $plan_type;
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
             $d->routers = $routers;
@@ -638,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);
-            $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();
+            $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->where_like('tbl_plans.name_plan', '%' . $name . '%');
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $paginator = Paginator::build(ORM::for_table('tbl_plans'), ['type' => 'Balance'], $name);
-            $d = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_balance'); #HOOK
         $ui->display('balance.tpl');
         break;
@@ -657,14 +662,14 @@ switch ($action) {
         break;
     case 'balance-edit':
         $ui->assign('_title', Lang::T('Balance Plans'));
-        $id  = $routes['2'];
+        $id = $routes['2'];
         $d = ORM::for_table('tbl_plans')->find_one($id);
         $ui->assign('d', $d);
         run_hook('view_edit_balance'); #HOOK
         $ui->display('balance-edit.tpl');
         break;
     case 'balance-delete':
-        $id  = $routes['2'];
+        $id = $routes['2'];
 
         $d = ORM::for_table('tbl_plans')->find_one($id);
         if ($d) {

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);
-                $d = ORM::for_table('tbl_users')
+                $query = ORM::for_table('tbl_users')
                     ->where_like('username', '%' . $search . '%')
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ->order_by_asc('id');
+                $d = Paginator::findMany($query, ['search' => $search]);
             } else if ($admin['user_type'] == 'Admin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'), [
-                    'username' => '%' . $search . '%',
-                    ['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([
+                $query = ORM::for_table('tbl_users')
+                    ->where_like('username', '%' . $search . '%')->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, ['search' => $search]);
             } else {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'), ['username' => '%' . $search . '%'], $search);
-                $d = ORM::for_table('tbl_users')
+                $query = ORM::for_table('tbl_users')
                     ->where_like('username', '%' . $search . '%')
                     ->where_any_is([
                         ['id' => $admin['id']],
                         ['root' => $admin['id']]
-                    ])
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ])->order_by_asc('id');
+                $d = Paginator::findMany($query, ['search' => $search]);
             }
         } else {
             if ($admin['user_type'] == 'SuperAdmin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'));
-                $d = ORM::for_table('tbl_users')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                $query = ORM::for_table('tbl_users')->order_by_asc('id');
+                $d = Paginator::findMany($query);
             } else if ($admin['user_type'] == 'Admin') {
-                $paginator = Paginator::build(ORM::for_table('tbl_users'));
-                $d = ORM::for_table('tbl_users')->where_any_is([
+                $query = 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'));
-                $d = ORM::for_table('tbl_users')
+                $query = ORM::for_table('tbl_users')
                     ->where_any_is([
                         ['id' => $admin['id']],
                         ['root' => $admin['id']]
-                    ])
-                    ->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ])->order_by_asc('id');
+                $d = Paginator::findMany($query);
             }
         }
         $admins = [];
@@ -345,16 +336,9 @@ switch ($action) {
                 $admins[$adm['id']] = $adm['fullname'];
             }
         }
-        if ($isApi) {
-            showResult(true, $action, [
-                'admins' => $d,
-                'roots' => $admins
-            ], ['search' => $search]);
-        }
         $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;
@@ -390,20 +374,11 @@ switch ($action) {
             if ($d['user_type'] == 'Sales') {
                 $ui->assign('agent', ORM::for_table('tbl_users')->where('id', $d['root'])->find_array()[0]);
             }
-            if ($isApi) {
-                unset($d['password']);
-                $agent = $ui->get('agent');
-                if ($agent) unset($agent['password']);
-                showResult(true, $action, [
-                    'admin' => $d,
-                    'agent' => $agent
-                ], ['search' => $search]);
-            }
             $ui->assign('d', $d);
             $ui->assign('_title', $d['username']);
             $ui->display('users-view.tpl');
         } else {
-            r2(U . 'settings/users', 'e', $_L['Account_Not_Found']);
+            r2(U . 'settings/users', 'e', Lang::T('Account Not Found'));
         }
         break;
     case 'users-edit':
@@ -440,7 +415,7 @@ switch ($action) {
             run_hook('view_edit_admin'); #HOOK
             $ui->display('users-edit.tpl');
         } else {
-            r2(U . 'settings/users', 'e', $_L['Account_Not_Found']);
+            r2(U . 'settings/users', 'e', Lang::T('Account Not Found'));
         }
         break;
 
@@ -459,7 +434,7 @@ switch ($action) {
             $d->delete();
             r2(U . 'settings/users', 's', Lang::T('User deleted Successfully'));
         } else {
-            r2(U . 'settings/users', 'e', $_L['Account_Not_Found']);
+            r2(U . 'settings/users', 'e', Lang::T('Account Not Found'));
         }
         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']]);
-        $d = ORM::for_table('tbl_transactions')->where('username', $user['username'])->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+        $query = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_asc('id');
+        $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');
 
@@ -62,6 +61,7 @@ switch ($action) {
         }else{
             r2(U . 'voucher/list-activated', 'e', Lang::T('Not Found'));
         }
+        break;
     default:
         $ui->display('a404.tpl');
 }

system/cron_reminder.php

@@ -55,7 +55,6 @@ foreach ($d as $ds) {
         } else {
                 $price = Lang::moneyFormat($p['price']);
         }
-        //$price = Lang::moneyFormat($p['price']);
         if ($ds['expiration'] == $day7) {
             echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
         } else if ($ds['expiration'] == $day3) {

system/lan/country.json

@@ -26,6 +26,7 @@
     "hebrew": "iw",
     "hindi": "hi",
     "hungarian": "hu",
+    "iran": "ir",
     "icelandic": "is",
     "italian": "it",
     "japanese": "ja",
@@ -55,4 +56,4 @@
     "ukrainian": "uk",
     "vietnamese": "vi",
     "welsh": "cy"
-}
+}

system/lan/english.json

@@ -1,516 +1,107 @@
 {
-    "Log_in": "Log-in",
-    "Register": "Register",
-    "Announcement": "Announcement",
-    "Registration_Info": "Registration Info",
-    "Voucher_not_found__please_buy_voucher_befor_register": "Voucher not found, please buy voucher befor register",
-    "Register_Success__You_can_login_now": "Register Success! You can login now",
-    "Log_in_to_Member_Panel": "Log in to Member Panel",
-    "Register_as_Member": "Register as Member",
-    "Enter_Admin_Area": "Enter Admin Area",
-    "PHPNuxBill": "PHPNuxBill",
-    "Username": "Username",
-    "Password": "Password",
-    "Passwords_does_not_match": "Passwords does not match",
-    "Account_already_axist": "Account already axist",
-    "Manage": "Manage",
-    "Submit": "Submit",
-    "Save_Changes": "Save Changes",
-    "Cancel": "Cancel",
-    "Edit": "Edit",
-    "Delete": "Delete",
-    "Welcome": "Welcome",
-    "Data_Created_Successfully": "Data Created Successfully",
-    "Data_Updated_Successfully": "Data Updated Successfully",
-    "Data_Deleted_Successfully": "Data Deleted Successfully",
-    "Static_Pages": "Static Pages",
-    "Failed_to_save_page__make_sure_i_can_write_to_folder_pages___i_chmod_664_pages___html_i_": "Failed to save page, make sure i can write to folder pages, <i>chmod 664 pages\/*.html<i>",
-    "Saving_page_success": "Saving page success",
-    "Sometimes_you_need_to_refresh_3_times_until_content_change": "Sometimes you need to refresh 3 times until content change",
-    "Dashboard": "Dashboard",
-    "Search_Customers___": "Search Customers...",
-    "My_Account": "My Account",
-    "My_Profile": "My Profile",
-    "Settings": "Settings",
-    "Edit_Profile": "Edit Profile",
-    "Change_Password": "Change Password",
-    "Logout": "Logout",
-    "Services": "Services",
-    "Bandwidth_Plans": "Bandwidth Plans",
-    "Bandwidth_Name": "Bandwidth Name",
-    "New_Bandwidth": "New Bandwidth",
-    "Edit_Bandwidth": "Edit Bandwidth",
-    "Add_New_Bandwidth": "Add New Bandwidth",
-    "Rate_Download": "Rate Download",
-    "Rate_Upload": "Rate Upload",
-    "Name_Bandwidth_Already_Exist": "Name Bandwidth Already Exist",
-    "Hotspot_Plans": "Hotspot Plans",
-    "PPPOE_Plans": "PPPOE Plans",
-    "Plan_Name": "Plan Name",
-    "New_Service_Plan": "New Service Plan",
-    "Add_Service_Plan": "Add Service Plan",
-    "Edit_Service_Plan": "Edit Service Plan",
-    "Name_Plan_Already_Exist": "Name Plan Already Exist",
-    "Plan_Type": "Plan Type",
-    "Plan_Price": "Plan Price",
-    "Limit_Type": "Limit Type",
-    "Unlimited": "Unlimited",
-    "Limited": "Limited",
-    "Time_Limit": "Time Limit",
-    "Data_Limit": "Data Limit",
-    "Both_Limit": "Both Limit",
-    "Plan_Validity": "Plan Validity",
-    "Select_Bandwidth": "Select Bandwidth",
-    "Shared_Users": "Shared Users",
-    "Choose_User_Type_Sales_to_disable_access_to_Settings": "Choose User Type Sales to disable access to Settings",
-    "Current_Password": "Current Password",
-    "New_Password": "New Password",
-    "Administrator": "Administrator",
-    "Sales": "Sales",
-    "Member": "Member",
-    "Confirm_New_Password": "Confirm New Password",
-    "Confirm_Password": "Confirm Password",
-    "Full_Name": "Full Name",
-    "User_Type": "User Type",
-    "Address": "Address",
-    "Created_On": "Created On",
-    "Expires_On": "Expires On",
-    "Phone_Number": "Phone Number",
-    "User_deleted_Successfully": "User deleted Successfully",
-    "Full_Administrator": "Full Administrator",
-    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
-    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
-    "Theme_Style": "Theme Style",
-    "Theme_Color": "Theme Color",
-    "Default_Language": "Default Language",
-    "Network": "Network",
-    "Routers": "Routers",
-    "IP_Pool": "IP Pool",
-    "New_Router": "New Router",
-    "Add_Router": "Add Router",
-    "Edit_Router": "Edit Router",
-    "Router_Name": "Router Name",
-    "IP_Address": "IP Address",
-    "Router_Secret": "Router Secret",
-    "Description": "Description",
-    "IP_Router_Already_Exist": "IP Router Already Exist",
-    "Name_Pool": "Name Pool",
-    "Range_IP": "Range IP",
-    "New_Pool": "New Pool",
-    "Add_Pool": "Add Pool",
-    "Edit_Pool": "Edit Pool",
-    "Pool_Name_Already_Exist": "Pool Name Already Exist",
-    "Refill_Account": "Refill Account",
-    "Recharge_Account": "Recharge Account",
-    "Select_Account": "Select Account",
-    "Service_Plan": "Service Plan",
-    "Recharge": "Recharge",
-    "Method": "Method",
-    "Account_Created_Successfully": "Account Created Successfully",
-    "Database_Status": "Database Status",
-    "Total_Database_Size": "Total Database Size",
-    "Download_Database_Backup": "Download Database Backup",
-    "Table_Name": "Table Name",
-    "Rows": "Rows",
-    "Size": "Size",
-    "Customer": "Customer",
-    "Add_New_Contact": "Add New Contact",
-    "Edit_Contact": "Edit Contact",
-    "List_Contact": "List Contact",
-    "Manage_Contact": "Manage Contact",
-    "Reports": "Reports",
-    "Daily_Reports": "Daily Reports",
-    "Period_Reports": "Period Reports",
-    "All_Transactions": "All Transactions",
-    "Total_Income": "Total Income",
-    "All_Transactions_at_Date": "All Transactions at Date",
-    "Export_for_Print": "Export for Print",
-    "Print": "Print",
-    "Export_to_PDF": "Export to PDF",
-    "Click_Here_to_Print": "Click Here to Print",
-    "You_can_use_html_tag": "You can use html tag",
-    "Date_Format": "Date Format",
-    "Income_Today": "Income Today",
-    "Income_This_Month": "Income This Month",
-    "Users_Active": "Users Active",
-    "Total_Users": "Total Users",
-    "Users": "Users",
-    "Edit_User": "Edit User",
-    "Last_Login": "Last Login",
-    "Administrator_Users": "Administrator Users",
-    "Manage_Administrator": "Manage Administrator",
-    "Add_New_Administrator": "Add New Administrator",
-    "Localisation": "Localisation",
-    "Backup_Restore": "Backup\/Restore",
-    "General_Settings": "General Settings",
-    "Date": "Date",
-    "Login_Successful": "Login Successful",
-    "Failed_Login": "Failed Login",
     "Settings_Saved_Successfully": "Settings Saved Successfully",
-    "User_Updated_Successfully": "User Updated Successfully",
-    "User_Expired__Today": "User Expired, Today",
-    "Activity_Log": "Activity Log",
-    "View_Reports": "View Reports",
-    "View_All": "View All",
-    "Number_of_Vouchers": "Number of Vouchers",
-    "Length_Code": "Length Code",
-    "Code_Voucher": "Code Voucher",
-    "Voucher": "Voucher",
-    "Hotspot_Voucher": "Hotspot Voucher",
-    "Status_Voucher": "Status Voucher",
-    "Add_Vouchers": "Add Vouchers",
-    "Create_Vouchers_Successfully": "Create Vouchers Successfully",
-    "Generate": "Generate",
-    "Print_side_by_side__it_will_easy_to_cut": "Print side by side, it will easy to cut",
-    "From_Date": "From Date",
-    "To_Date": "To Date",
-    "New_Service": "New Service",
-    "Type": "Type",
-    "Finish": "Finish",
-    "Application_Name__Company_Name": "Application Name\/ Company Name",
-    "This_Name_will_be_shown_on_the_Title": "This Name will be shown on the Title",
-    "Next": "Next",
-    "Last": "Last",
-    "Timezone": "Timezone",
-    "Decimal_Point": "Decimal Point",
-    "Thousands_Separator": "Thousands Separator",
-    "Currency_Code": "Currency Code",
-    "Order_Voucher": "Order Voucher",
-    "Voucher_Activation": "Voucher Activation",
-    "List_Activated_Voucher": "List Activated Voucher",
-    "Enter_voucher_code_here": "Enter voucher code here",
-    "Private_Message": "Private Message",
-    "Inbox": "Inbox",
-    "Outbox": "Outbox",
-    "Compose": "Compose",
-    "Send_to": "Send to",
-    "Title": "Title",
-    "Message": "Message",
-    "Your_Account_Information": "Your Account Information",
-    "Welcome_to_the_Panel_Members_page__on_this_page_you_can_": "Welcome to the Panel Members page, on this page you can:",
-    "Invalid_Username_or_Password": "Invalid Username or Password",
-    "You_do_not_have_permission_to_access_this_page": "You do not have permission to access this page",
-    "Incorrect_Current_Password": "Incorrect Current Password",
-    "Password_changed_successfully__Please_login_again": "Password changed successfully, Please login again",
-    "All_field_is_required": "All field is required",
-    "Voucher_Not_Valid": "Voucher Not Valid",
-    "Activation_Vouchers_Successfully": "Activation Vouchers Successfully",
-    "Data_Not_Found": "Data Not Found",
-    "Search_by_Username": "Search by Username",
-    "Search_by_Name": "Search by Name",
-    "Search_by_Code_Voucher": "Search by Code Voucher",
-    "Search": "Search",
-    "Select_a_customer": "Select a customer",
-    "Select_Routers": "Select Routers",
-    "Select_Plans": "Select Plans",
-    "Select_Pool": "Select Pool",
-    "Hrs": "Hrs",
-    "Mins": "Mins",
-    "Days": "Days",
-    "Months": "Months",
-    "Add_Language": "Add Language",
-    "Language_Name": "Language Name",
-    "Folder_Name": "Folder Name",
-    "Translator": "Translator",
-    "Language_Name_Already_Exist": "Language Name Already Exist",
-    "Payment_Gateway": "Payment Gateway",
-    "Community": "Community",
-    "1_user_can_be_used_for_many_devices_": "1 user can be used for many devices?",
-    "Cannot_be_change_after_saved": "Cannot be change after saved",
-    "Explain_Coverage_of_router": "Explain Coverage of router",
-    "Name_of_Area_that_router_operated": "Name of Area that router operated",
-    "Payment_Notification_URL__Recurring_Notification_URL__Pay_Account_Notification_URL": "Payment Notification URL, Recurring Notification URL, Pay Account Notification URL",
-    "Finish_Redirect_URL__Unfinish_Redirect_URL__Error_Redirect_URL": "Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL",
-    "Status": "Status",
-    "Plan_Not_found": "Plan Not found",
-    "Failed_to_create_transaction_": "Failed to create transaction.",
-    "Seller_has_not_yet_setup_Xendit_payment_gateway": "Seller has not yet setup Xendit payment gateway",
-    "Admin_has_not_yet_setup_Xendit_payment_gateway__please_tell_admin": "Admin has not yet setup Xendit payment gateway, please tell admin",
-    "You_already_have_unpaid_transaction__cancel_it_or_pay_it_": "You already have unpaid transaction, cancel it or pay it.",
-    "Transaction_Not_found": "Transaction Not found",
-    "Cancel_it_": "Cancel it?",
-    "expired": "expired",
-    "Check_for_Payment": "Check for Payment",
-    "Transaction_still_unpaid_": "Transaction still unpaid.",
-    "Paid_Date": "Paid Date",
-    "Transaction_has_been_paid_": "Transaction has been paid.",
-    "PAID": "PAID",
-    "CANCELED": "CANCELED",
-    "UNPAID": "UNPAID",
-    "PAY_NOW": "PAY NOW",
-    "Buy_Hotspot_Plan": "Buy Hotspot Plan",
-    "Buy_PPOE_Plan": "Buy PPOE Plan",
-    "Package": "Package",
-    "Order_Internet_Package": "Order Internet Package",
-    "Unknown_Command_": "Unknown Command.",
-    "Checking_payment": "Checking payment",
-    "Create_Transaction_Success": "Create Transaction Success",
-    "You_have_unpaid_transaction": "You have unpaid transaction",
-    "TripayPayment_Channel": "TripayPayment Channel",
-    "Payment_Channel": "Payment Channel",
-    "Payment_check_failed_": "Payment check failed.",
-    "Order_Package": "Order Package",
-    "Transactions": "Transactions",
-    "Payments": "Payments",
-    "History": "History",
-    "Order_History": "Order History",
-    "Gateway": "Gateway",
-    "Date_Done": "Date Done",
-    "Unpaid_Order": "Unpaid Order",
-    "Payment_Gateway_Not_Found": "Payment Gateway Not Found",
-    "Payment_Gateway_saved_successfully": "Payment Gateway saved successfully",
-    "ORDER": "ORDER",
-    "Package_History": "Package History",
-    "Buy_History": "Buy History",
-    "Activation_History": "Activation History",
-    "Buy_Package": "Buy Package",
-    "Email": "Email",
-    "Company_Footer": "Company Footer",
-    "Will_show_below_user_pages": "Will show below user pages",
-    "Request_OTP": "Request OTP",
-    "Verification_Code": "Verification Code",
-    "SMS_Verification_Code": "SMS Verification Code",
-    "Please_enter_your_email_address": "Please enter your email address",
-    "Failed_to_create_Paypal_transaction_": "Failed to create Paypal transaction.",
-    "Plugin": "Plugin",
-    "Plugin_Manager": "Plugin Manager",
-    "User_Notification": "User Notification",
-    "Expired_Notification": "Expired Notification",
-    "User_will_get_notification_when_package_expired": "User will get notification when package expired",
-    "Expired_Notification_Message": "Expired Notification Message",
-    "Payment_Notification": "Payment Notification",
-    "User_will_get_invoice_notification_when_buy_package_or_package_refilled": "User will get invoice notification when buy package or package refilled",
-    "Current_IP": "Current IP",
-    "Current_MAC": "Current MAC",
-    "Login_Status": "Login Status",
-    "Login_Request_successfully": "Login Request successfully",
-    "Logout_Request_successfully": "Logout Request successfully",
-    "Disconnect_Internet_": "Disconnect Internet?",
-    "Not_Online__Login_now_": "Not Online, Login now?",
-    "You_are_Online__Logout_": "You are Online, Logout?",
-    "Connect_to_Internet_": "Connect to Internet?",
-    "Your_account_not_connected_to_internet": "Your account not connected to internet",
-    "Failed_to_create_transaction__": "Failed to create transaction. ",
-    "Failed_to_check_status_transaction__": "Failed to check status transaction. ",
-    "Disable_Voucher": "Disable Voucher",
-    "Balance": "Balance",
-    "Balance_System": "Balance System",
-    "Enable_System": "Enable System",
-    "Allow_Transfer": "Allow Transfer",
-    "Telegram_Notification": "Telegram Notification",
-    "SMS_OTP_Registration": "SMS OTP Registration",
-    "Whatsapp_Notification": "Whatsapp Notification",
-    "Tawk_to_Chat_Widget": "Tawk.to Chat Widget",
-    "Invoice": "Invoice",
-    "Country_Code_Phone": "Country Code Phone",
-    "Voucher_activation_menu_will_be_hidden": "Voucher activation menu will be hidden",
-    "Customer_can_deposit_money_to_buy_voucher": "Customer can deposit money to buy voucher",
-    "Allow_balance_transfer_between_customers": "Allow balance transfer between customers",
-    "Reminder_Notification": "Reminder Notification",
-    "Reminder_Notification_Message": "Reminder Notification Message",
-    "Reminder_7_days": "Reminder 7 days",
-    "Reminder_3_days": "Reminder 3 days",
-    "Reminder_1_day": "Reminder 1 day",
-    "PPPOE_Password": "PPPOE Password",
-    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "User Cannot change this, only admin. if it Empty it will use user password",
-    "Invoice_Balance_Message": "Invoice Balance Message",
-    "Invoice_Notification_Payment": "Invoice Notification Payment",
-    "Balance_Notification_Payment": "Balance Notification Payment",
-    "Balance_Plans": "Balance Plans",
-    "Buy_Balance": "Buy Balance",
-    "Price": "Price",
-    "Validity": "Validity",
-    "Disable_auto_renewal_": "Disable auto renewal?",
-    "Auto_Renewal_On": "Auto Renewal On",
-    "Enable_auto_renewal_": "Enable auto renewal?",
-    "Auto_Renewal_Off": "Auto Renewal Off",
-    "Refill_Balance": "Refill Balance",
-    "Invoice_Footer": "Invoice Footer",
-    "Pay_With_Balance": "Pay With Balance",
-    "Pay_this_with_Balance__your_active_package_will_be_overwrite": "Pay this with Balance? your active package will be overwrite",
-    "Success_to_buy_package": "Success to buy package",
-    "Auto_Renewal": "Auto Renewal",
-    "View": "View",
-    "Back": "Back",
-    "Active": "Active",
-    "Transfer_Balance": "Transfer Balance",
-    "Send_your_balance_": "Send your balance?",
-    "Send": "Send",
-    "Cannot_send_to_yourself": "Cannot send to yourself",
-    "Sending_balance_success": "Sending balance success",
-    "From": "From",
-    "To": "To",
-    "insufficient_balance": "insufficient balance",
-    "Send_Balance": "Send Balance",
-    "Received_Balance": "Received Balance",
-    "Minimum_Balance_Transfer": "Minimum Balance Transfer",
-    "Minimum_Transfer": "Minimum Transfer",
-    "Company_Logo": "Company Logo",
-    "Expired_IP_Pool": "Expired IP Pool",
-    "Proxy": "Proxy",
-    "Proxy_Server": "Proxy Server",
-    "Proxy_Server_Login": "Proxy Server Login",
-    "Hotspot_Plan": "Hotspot Plan",
-    "PPPOE_Plan": "PPPOE Plan",
-    "UNKNOWN": "UNKNOWN",
-    "Are_You_Sure_": "Are You Sure?",
-    "Success_to_send_package": "Success to send package",
-    "Target_has_active_plan__different_with_current_plant_": "Target has active plan, different with current plant.",
-    "Recharge_a_friend": "Recharge a friend",
-    "Buy_for_friend": "Buy for friend",
-    "Buy_this_for_friend_account_": "Buy this for friend account?",
-    "Review_package_before_recharge": "Review package before recharge",
-    "Activate": "Activate",
-    "Deactivate": "Deactivate",
-    "Sync": "Sync",
-    "Failed_to_create_PaymeTrust_transaction_": "Failed to create PaymeTrust transaction.",
-    "Location": "Location",
-    "Radius_Plans": "Radius Plans",
-    "Change_title_in_user_Plan_order": "Change title in user Plan order",
-    "Logs": "Logs",
-    "Voucher_Format": "Voucher Format",
-    "Resend_To_Customer": "Resend To Customer",
-    "Your_friend_do_not_have_active_package": "Your friend do not have active package",
-    "Service_Type": "Service Type",
-    "Others": "Others",
-    "PPPoE": "PPPoE",
-    "Hotspot": "Hotspot",
-    "Disable_Registration": "Disable Registration",
-    "Customer_just_Login_with_Phone_number_and_Voucher_Code__Voucher_will_be_password": "Customer just Login with Phone number and Voucher Code, Voucher will be password",
-    "Login___Activate_Voucher": "Login \/ Activate Voucher",
-    "After_Customer_activate_voucher_or_login__customer_will_be_redirected_to_this_url": "After Customer activate voucher or login, customer will be redirected to this url",
-    "Voucher_Prefix": "Voucher Prefix",
-    "Voucher_activation_success__now_you_can_login": "Voucher activation success, now you can login",
-    "Buy_this__your_active_package_will_be_overwritten": "Buy this? your active package will be overwritten",
-    "Pay_this_with_Balance__your_active_package_will_be_overwritten": "Pay this with Balance? your active package will be overwritten",
-    "Buy_this__your_active_package_will_be_overwrite": "Buy this? your active package will be overwrite",
-    "Monthly_Registered_Customers": "Monthly Registered Customers",
-    "Total_Monthly_Sales": "Total Monthly Sales",
-    "Active_Users": "Active Users",
-    "All_Users_Insights": "All Users Insights",
+    "Settings": "Settings",
     "SuperAdmin": "Super Admin",
-    "Radius": "Radius",
-    "Radius_NAS": "Radius NAS",
-    "Translation": "Translation",
-    "Translation_saved_Successfully": "Translation saved Successfully",
-    "Language_Editor": "Language Editor",
-    "year": "year",
-    "month": "month",
-    "week": "week",
-    "day": "day",
-    "hour": "hour",
-    "minute": "minute",
-    "second": "second",
-    "Attributes": "Attributes",
-    "Profile": "Profile",
-    "Phone": "Phone",
-    "City": "City",
-    "Sub_District": "Sub District",
-    "Ward": "Ward",
-    "Credentials": "Credentials",
-    "Agent": "Agent",
-    "This_Token_will_act_as_SuperAdmin_Admin": "This Token will act as SuperAdmin\/Admin",
-    "Login": "Login",
-    "Expired_Action": "Expired Action",
-    "Expired_Address_List_Name": "Expired Address List Name",
-    "Address_List": "Address List",
-    "Optional": "Optional",
-    "Generated_By": "Generated By",
-    "Admin": "Admin",
-    "Password_should_be_minimum_6_characters": "Password should be minimum 6 characters",
-    "Add_User": "Add User",
-    "Send_Notification": "Send Notification",
-    "Code": "Code",
-    "Send_To_Customer": "Send To Customer",
-    "Prev": "Prev",
-    "Voucher_Not_Found": "Voucher Not Found",
-    "Miscellaneous": "Miscellaneous",
-    "OTP_Required": "OTP Required",
-    "Change": "Change",
-    "Change_Phone_Number": "Change Phone Number",
-    "Current_Number": "Current Number",
-    "New_Number": "New Number",
-    "Input_your_phone_number": "Input your phone number",
-    "OTP": "OTP",
-    "Enter_OTP_that_was_sent_to_your_phone": "Enter OTP that was sent to your phone",
-    "Update": "Update",
-    "OTP_is_required_when_user_want_to_change_phone_number": "OTP is required when user want to change phone number",
-    "Rate": "Rate",
-    "Burst": "Burst",
-    "Editing_Bandwidth_will_not_automatically_update_the_plan__you_need_to_edit_the_plan_then_save_again": "Editing Bandwidth will not automatically update the plan, you need to edit the plan then save again",
-    "OTP_Method": "OTP Method",
-    "SMS": "SMS",
-    "WhatsApp": "WhatsApp",
-    "SMS_and_WhatsApp": "SMS and WhatsApp",
-    "The_method_which_OTP_will_be_sent_to_user": "The method which OTP will be sent to user",
-    "Report_Viewer": "Report Viewer",
-    "Super_Administrator": "Super Administrator",
-    "Send_To": "Send To",
-    "Resend": "Resend",
-    "Alert": "Alert",
-    "success": "success",
-    "Click_Here": "Click Here",
-    "danger": "danger",
-    "Logout_Successful": "Logout Successful",
-    "warning": "warning",
-    "Users_Announcement": "Users Announcement",
-    "Customer_Announcement": "Customer Announcement",
-    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
-    "Period": "Period",
-    "Add": "Add",
-    "Select_Payment_Gateway": "Select Payment Gateway",
-    "Available_Payment_Gateway": "Available Payment Gateway",
-    "Pay_Now": "Pay Now",
-    "Please_select_Payment_Gateway": "Please select Payment Gateway",
-    "Payment_Gateway_Deleted": "Payment Gateway Deleted",
-    "Payment_Gateway_not_set__please_set_it_in_Settings": "Payment Gateway not set, please set it in Settings",
-    "Failed_to_create_Transaction__": "Failed to create Transaction..",
-    "Show_To_Customer": "Type",
-    "Using": "Using",
-    "Default": "Default",
-    "Customer_Balance": "Customer Balance",
+    "Change_Password": "Change Password",
+    "My_Account": "My Account",
+    "Logout": "Logout",
+    "Dashboard": "Dashboard",
+    "Customer": "Customer",
+    "Lists": "Lists",
+    "Location": "Location",
+    "Services": "Services",
+    "Active_Users": "Active Users",
     "Vouchers": "Vouchers",
     "Refill_Customer": "Refill Customer",
     "Recharge_Customer": "Recharge Customer",
+    "Refill_Balance": "Refill Balance",
     "Plans": "Plans",
+    "Hotspot": "Hotspot",
     "PPPOE": "PPPOE",
     "Bandwidth": "Bandwidth",
-    "Customers": "Customers",
-    "Actives": "Actives",
-    "Name": "Name",
-    "Confirm": "Confirm",
-    "Plan": "Plan",
-    "Total": "Total",
-    "Current_Cycle": "Current Cycle",
-    "Additional_Cost": "Additional Cost",
-    "Remaining": "Remaining",
-    "": "",
-    "Not_Found": "Not Found",
-    "Cash": "Cash",
-    "Payment_not_found": "Payment not found",
-    "If_your_friend_have_Additional_Cost__you_will_pay_for_that_too": "If your friend have Additional Cost, you will pay for that too",
-    "Cache_cleared_successfully_": "Cache cleared successfully!",
-    "Paid": "Paid",
+    "Balance": "Balance",
+    "Reports": "Reports",
+    "Daily_Reports": "Daily Reports",
+    "Period_Reports": "Period Reports",
+    "Activation_History": "Activation History",
     "Send_Message": "Send Message",
-    "Send_SMS_WA_Message": "Send SMS\/WA Message",
-    "Send_Bulk_SMS_WA_Message": "Send Bulk SMS\/WA Message",
-    "Send_Personal_Message": "Send Personal Message",
-    "Send_Via": "Send Via",
-    "Compose_your_message___": "Compose your message...",
-    "Use_placeholders_": "Use placeholders:",
-    "__name__": "[[name]]",
-    "Customer_Name": "Customer Name",
-    "__user_name__": "[[user_name]]",
-    "Customer_Username": "Customer Username",
-    "__phone__": "[[phone]]",
-    "Customer_Phone": "Customer Phone",
-    "__company_name__": "[[company_name]]",
-    "Your_Company_Name": "Your Company Name",
-    "Message_Sent_Successfully": "Message Sent Successfully",
-    "Send_Bulk_Message": "Send Bulk Message",
-    "Group": "Group",
-    "All_Customers": "All Customers",
-    "New_Customers": "New Customers",
-    "Expired_Customers": "Expired Customers",
-    "Active_Customers": "Active Customers"
+    "Single_Customer": "Single Customer",
+    "Bulk_Customers": "Bulk Customers",
+    "Network": "Network",
+    "Routers": "Routers",
+    "IP_Pool": "IP Pool",
+    "Radius": "Radius",
+    "Radius_NAS": "Radius NAS",
+    "Static_Pages": "Static Pages",
+    "Order_Voucher": "Order Voucher",
+    "Voucher": "Voucher",
+    "Announcement": "Announcement",
+    "Customer_Announcement": "Customer Announcement",
+    "Registration_Info": "Registration Info",
+    "General_Settings": "General Settings",
+    "Localisation": "Localisation",
+    "User_Notification": "User Notification",
+    "Administrator_Users": "Administrator Users",
+    "Backup_Restore": "Backup\/Restore",
+    "Payment_Gateway": "Payment Gateway",
+    "Plugin_Manager": "Plugin Manager",
+    "Logs": "Logs",
+    "Community": "Community",
+    "Timezone": "Timezone",
+    "Date_Format": "Date Format",
+    "Default_Language": "Default Language",
+    "Language_Editor": "Language Editor",
+    "Decimal_Point": "Decimal Point",
+    "Thousands_Separator": "Thousands Separator",
+    "Currency_Code": "Currency Code",
+    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
+    "Country_Code_Phone": "Country Code Phone",
+    "Change_title_in_user_Plan_order": "Change title in user Plan order",
+    "Save_Changes": "Save Changes",
+    "Recharge_Account": "Recharge Account",
+    "Search_by_Username": "Search by Username",
+    "Search": "Search",
+    "Username": "Username",
+    "Plan_Name": "Plan Name",
+    "Plan_Type": "Plan Type",
+    "Type": "Type",
+    "Created_On": "Created On",
+    "Expires_On": "Expires On",
+    "Method": "Method",
+    "Manage": "Manage",
+    "Edit": "Edit",
+    "Delete": "Delete",
+    "Prev": "Prev",
+    "Next": "Next",
+    "Phone_Number": "Phone Number",
+    "Email": "Email",
+    "Password": "Password",
+    "Paid": "Paid",
+    "Service_Type": "Service Type",
+    "Account_Type": "Account Type",
+    "Personal": "Personal",
+    "Auto_Renewal": "Auto Renewal",
+    "Last_Login": "Last Login",
+    "Coordinates": "Coordinates",
+    "Active": "Active",
+    "Deactivate": "Deactivate",
+    "Recharge": "Recharge",
+    "Back": "Back",
+    "Sync": "Sync",
+    "Order_History": "Order History",
+    "Invoice": "Invoice",
+    "Plan_Price": "Plan Price",
+    "Edit_Contact": "Edit Contact",
+    "Full_Name": "Full Name",
+    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
+    "PPPOE_Password": "PPPOE Password",
+    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "User Cannot change this, only admin. if it Empty it will use user password",
+    "Address": "Address",
+    "Attributes": "Attributes",
+    "Add": "Add",
+    "Cancel": "Cancel",
+    "Manage_Contact": "Manage Contact",
+    "Add_New_Contact": "Add New Contact",
+    "Package": "Package",
+    "View": "View"
 }

system/lan/indonesia.json

@@ -43,7 +43,7 @@
     "Add_New_Bandwidth": "Tambahkan Bandwidth Baru",
     "Rate_Download": "Nilai Unduhan",
     "Rate_Upload": "Nilai Unggahan",
-    "Name_Bandwidth_Already_Exist": "NamanBandwidth Sudah Ada",
+    "Name_Bandwidth_Already_Exist": "Nama Bandwidth Sudah Ada",
     "Hotspot_Plans": "Paket Hotspot",
     "PPPOE_Plans": "Paket PPPoE",
     "Plan_Name": "Nama Paket",
@@ -54,7 +54,7 @@
     "Plan_Type": "Jenis Paket",
     "Plan_Price": "Harga Paket",
     "Limit_Type": "Tipe Batas",
-    "Unlimited": "Tak terbatas",
+    "Unlimited": "Tak Terbatas",
     "Limited": "Terbatas",
     "Time_Limit": "Batas waktu",
     "Data_Limit": "Batas Data",
@@ -69,12 +69,12 @@
     "Sales": "Sales",
     "Member": "Anggota",
     "Confirm_New_Password": "Konfirmasi sandi baru",
-    "Confirm_Password": "konfirmasi sandi",
+    "Confirm_Password": "Konfirmasi sandi",
     "Full_Name": "Nama Lengkap",
     "User_Type": "Tipe Pelanggan",
     "Address": "Alamat",
     "Created_On": "Dibuat pada",
-    "Expires_On": "Kadaluarsa pada",
+    "Expires_On": "Kedaluwarsa pada",
     "Phone_Number": "Nomor telepon",
     "User_deleted_Successfully": "Pelanggan berhasil dihapus",
     "Full_Administrator": "Administrator Penuh",
@@ -91,7 +91,7 @@
     "Edit_Router": "Sunting Router",
     "Router_Name": "Nama Router",
     "IP_Address": "Alamat IP",
-    "Router_Secret": "Rahasia Router",
+    "Router_Secret": "Password Router",
     "Description": "Deskrispi",
     "IP_Router_Already_Exist": "IP Router Sudah Ada",
     "Name_Pool": "Nama Pool",
@@ -149,7 +149,7 @@
     "Settings_Saved_Successfully": "Pengaturan Berhasil Disimpan",
     "User_Updated_Successfully": "Pengguna Berhasil Diperbarui",
     "User_Expired__Today": "Pengguna Kedaluwarsa, Hari Ini",
-    "Activity_Log": "Log aktivitas",
+    "Activity_Log": "Log Aktivitas",
     "View_Reports": "Lihat Laporan",
     "View_All": "Lihat semua",
     "Number_of_Vouchers": "Jumlah Voucher",
@@ -174,7 +174,7 @@
     "Timezone": "Zona waktu",
     "Decimal_Point": "Titik Desimal",
     "Thousands_Separator": "Pemisah Ribuan",
-    "Currency_Code": "Kode mata uang",
+    "Currency_Code": "Kode Mata Uang",
     "Order_Voucher": "Pesan Voucher",
     "Voucher_Activation": "Aktivasi Voucher",
     "List_Activated_Voucher": "Daftar Voucher yang Diaktifkan",
@@ -188,12 +188,12 @@
     "Message": "Pesan",
     "Your_Account_Information": "Informasi Akun Anda",
     "Welcome_to_the_Panel_Members_page__on_this_page_you_can_": "Selamat datang di halaman Anggota Panel, di halaman ini Anda dapat:",
-    "Invalid_Username_or_Password": "Nama pengguna dan kata sandi salah",
+    "Invalid_Username_or_Password": "Nama pengguna atau kata sandi salah",
     "You_do_not_have_permission_to_access_this_page": "Anda tidak memiliki izin untuk mengakses halaman ini",
-    "Incorrect_Current_Password": "Kata Sandi Saat Ini Salah",
-    "Password_changed_successfully__Please_login_again": "Kata sandi berhasil diubah, Silakan login kembali",
+    "Incorrect_Current_Password": "Kata sandi saat ini salah",
+    "Password_changed_successfully__Please_login_again": "Kata sandi berhasil diubah, silakan login kembali",
     "All_field_is_required": "Semua bidang wajib diisi",
-    "Voucher_Not_Valid": "Voucher Tidak Berlaku",
+    "Voucher_Not_Valid": "Voucher tidak berlaku",
     "Activation_Vouchers_Successfully": "Aktivasi Voucher Berhasil",
     "Data_Not_Found": "Data Tidak Ditemukan",
     "Search_by_Username": "Cari berdasarkan Nama Pengguna",
@@ -222,7 +222,7 @@
     "Payment_Notification_URL__Recurring_Notification_URL__Pay_Account_Notification_URL": "URL Notifikasi Pembayaran, URL Notifikasi Berulang, URL Notifikasi Akun Bayar",
     "Finish_Redirect_URL__Unfinish_Redirect_URL__Error_Redirect_URL": "Selesaikan URL Pengalihan, Selesaikan URL Pengalihan, URL Pengalihan Kesalahan",
     "Status": "Status",
-    "Plan_Not_found": "Paket Tidak ditemukan",
+    "Plan_Not_found": "Paket tidak ditemukan",
     "Failed_to_create_transaction_": "Gagal membuat transaksi.",
     "Seller_has_not_yet_setup_Xendit_payment_gateway": "Penjual belum menyiapkan gateway pembayaran Xendit",
     "Admin_has_not_yet_setup_Xendit_payment_gateway__please_tell_admin": "Admin belum menyiapkan gerbang pembayaran Xendit, mohon beritahu admin",
@@ -276,7 +276,7 @@
     "Plugin": "Plugin",
     "Plugin_Manager": "Manajer Plugin",
     "User_Notification": "Pemberitahuan Pelanggan",
-    "Expired_Notification": "Pemberitahuan Kedaluarsa",
+    "Expired_Notification": "Pemberitahuan Kedaluwarsa",
     "User_will_get_notification_when_package_expired": "Pengguna akan mendapat notifikasi ketika paket sudah habis masa berlakunya",
     "Expired_Notification_Message": "Pesan Pemberitahuan Kedaluwarsa",
     "Payment_Notification": "Notifikasi Pembayaran",
@@ -287,12 +287,12 @@
     "Login_Request_successfully": "Permintaan Masuk berhasil",
     "Logout_Request_successfully": "Permintaan Keluar berhasil",
     "Disconnect_Internet_": "Putuskan sambungan Internet?",
-    "Not_Online__Login_now_": "Tidak , Masuk sekarang?",
+    "Not_Online__Login_now_": "Tidak, Masuk sekarang?",
     "You_are_Online__Logout_": "Kamu sedang aktif, ingin keluar?",
     "Connect_to_Internet_": "Hubungkan ke Internet?",
     "Your_account_not_connected_to_internet": "Akun Anda tidak terhubung ke internet",
     "Failed_to_create_transaction__": "Gagal membuat transaksi. ",
-    "Failed_to_check_status_transaction__": "Gagal memeriksa status transaksi. ",
+    "Failed_to_check_status_transaction__": "Gagal memeriksa status transaksi.",
     "Disable_Voucher": "Nonaktifkan Voucher",
     "Balance": "Saldo",
     "Balance_System": "Saldo Sistem",
@@ -313,7 +313,7 @@
     "Reminder_3_days": "Pengingat 3 hari",
     "Reminder_1_day": "Pengingat 1 hari",
     "PPPOE_Password": "Kata sandi PPPoE",
-    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "Pelanggan tidak dapat mengubah ini, hanya Admin.  Jika kosong maka akan menggunakan kata sandi pelanggan",
+    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "Pelanggan tidak dapat mengubah ini, hanya Admin. Jika kosong maka akan menggunakan kata sandi pelanggan",
     "Invoice_Balance_Message": "Faktur Pesan Saldo",
     "Invoice_Notification_Payment": "Faktur Pemberitahuan Pembayaran",
     "Balance_Notification_Payment": "Saldo Pemberitahuan Pembayaran",
@@ -371,11 +371,11 @@
     "Logs": "Log",
     "Voucher_Format": "Format Voucher",
     "Resend_To_Customer": "Kirim Ulang Ke Pelanggan",
-    "Service_Type": "Service Type",
+    "Service_Type": "Jenis Layanan",
     "Others": "Lainnya",
     "PPPoE": "PPPoE",
     "Hotspot": "Hotspot",
     "Monthly_Registered_Customers": "Pendaftaran Pelanggan perbulan",
-    "Total_Monthly_Sales": "Total penjualan Perbulan",
+    "Total_Monthly_Sales": "Total penjualan perbulan",
     "Active_Users": "Pelanggan Aktif"
-}
+}

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`;",
@@ -78,5 +78,17 @@
     ],
     "2024.3.14" : [
         "ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;"
+    ],
+    "2024.3.19" : [
+        "ALTER TABLE `tbl_customers` ADD `coordinates` VARCHAR(50) NOT NULL DEFAULT '' COMMENT 'Latitude and Longitude coordinates' AFTER `email`;"
+    ],
+    "2024.3.19.1" : [
+        "ALTER TABLE `tbl_customers` ADD `account_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type' AFTER `coordinates`;"
+    ],
+    "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

@@ -10,14 +10,15 @@
                         <label class="col-md-3 control-label">{Lang::T('Username')}</label>
                         <div class="col-md-9">
                             <div class="input-group">
-                                {if $_c['country_code_phone']!= ''}
-                                    <span class="input-group-addon" id="basic-addon1">+</span>
+                                {if $_c['country_code_phone'] != ''}
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                    class="glyphicon glyphicon-phone-alt"></i></span>
                                 {else}
                                     <span class="input-group-addon" id="basic-addon1"><i
-                                            class="glyphicon glyphicon-phone-alt"></i></span>
+                                            class="glyphicon glyphicon-user"></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')}">
+                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                             </div>
                         </div>
                     </div>
@@ -51,8 +52,9 @@
                     <div class="form-group">
                         <label class="col-md-3 control-label">{Lang::T('Password')}</label>
                         <div class="col-md-9">
-                            <input type="password" class="form-control" autocomplete="off" required id="password" value="{rand(000000,999999)}"
-                                name="password" onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
+                            <input type="password" class="form-control" autocomplete="off" required id="password"
+                                value="{rand(000000,999999)}" name="password" onmouseleave="this.type = 'password'"
+                                onmouseenter="this.type = 'text'">
                         </div>
                     </div>
                     <div class="form-group">
@@ -76,13 +78,31 @@
                         <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
                         <div class="col-md-9">
                             <select class="form-control" id="service_type" name="service_type">
-                                <option value="Hotspot" {if $d['service_type'] eq 'Hotspot' }selected{/if}>Hotspot
+                                <option value="Hotspot">Hotspot
                                 </option>
-                                <option value="PPPoE" {if $d['service_type'] eq 'PPPoE' }selected{/if}>PPPoE</option>
-                                <option value="Others" {if $d['service_type'] eq 'Others' }selected{/if}>Others</option>
+                                <option value="PPPoE">PPPoE</option>
+                                <option value="Others">Others</option>
                             </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">Personal
+                                </option>
+                                <option value="Business">Business</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=""
+                                placeholder="6.465422, 3.406448">
+                                <div id="map" style="width: '100%'; height: 200px; min-height: 150px;"></div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -141,6 +161,42 @@
             });
         });
     </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,14 +12,15 @@
                         <div class="col-md-9">
                             <div class="input-group">
                                 {if $_c['country_code_phone']!= ''}
-                                    <span class="input-group-addon" id="basic-addon1">+</span>
-                                {else}
                                     <span class="input-group-addon" id="basic-addon1"><i
                                             class="glyphicon glyphicon-phone-alt"></i></span>
+                                {else}
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-user"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username" value="{$d['username']}"
                                     required
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                             </div>
                         </div>
                     </div>
@@ -88,6 +89,25 @@
                             </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>
+                            </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>
             </div>
         </div>
@@ -106,7 +126,8 @@
                                         id="{$customField.field_name}" value="{$customField.field_value}">
                                 </div>
                                 <label class="col-md-2">
-                                <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}"> Delete
+                                    <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}">
+                                    Delete
                                 </label>
                             </div>
                         {/foreach}
@@ -164,6 +185,47 @@
             });
         });
     </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

@@ -55,6 +55,9 @@
                     <li class="list-group-item">
                         <b>{Lang::T('Service Type')}</b> <span class="pull-right">{Lang::T($d['service_type'])}</span>
                     </li>
+                    <li class="list-group-item">
+                        <b>{Lang::T('Account Type')}</b> <span class="pull-right">{Lang::T($d['account_type'])}</span>
+                    </li>
                     <li class="list-group-item">
                         <b>{Lang::T('Balance')}</b> <span class="pull-right">{Lang::moneyFormat($d['balance'])}</span>
                     </li>
@@ -71,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">
@@ -129,11 +142,15 @@
             <div class="col-xs-4">
                 <a href="{$_url}customers/list" class="btn btn-primary btn-sm btn-block">{Lang::T('Back')}</a>
             </div>
-            <div class="col-xs-8">
+            <div class="col-xs-4">
                 <a href="{$_url}customers/sync/{$d['id']}"
                     onclick="return confirm('This will sync Customer to Mikrotik?')"
                     class="btn btn-info btn-sm btn-block">{Lang::T('Sync')}</a>
             </div>
+            <div class="col-xs-4">
+                <a href="{$_url}message/send/{$d['id']}" class="btn btn-success btn-sm btn-block">{Lang::T('Send
+                    Message')}</a>
+            </div>
         </div>
     </div>
     <div class="col-sm-8 col-md-8">
@@ -211,8 +228,28 @@
                 {/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"
-                                    placeholder="{Lang::T('Search')}...">
+                                <input type="text" id="search-input" name="search" value="{$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
-                                class="ion ion-android-add"> </i> {Lang::T('Add New Contact')}</a>
+                        <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
+                            </i> {Lang::T('Add New Contact')}</a>
                     </div>&nbsp;
                 </div>
                 <div class="table-responsive table_mobile">
@@ -37,10 +37,10 @@
                         <thead>
                             <tr>
                                 <th>{Lang::T('Username')}</th>
+                                <th>{Lang::T('Account Type')}</th>
                                 <th>{Lang::T('Full Name')}</th>
                                 <th>{Lang::T('Balance')}</th>
-                                <th>{Lang::T('Phone Number')}</th>
-                                <th>{Lang::T('Email')}</th>
+                                <th width="120px"></th>
                                 <th>{Lang::T('Package')}</th>
                                 <th>{Lang::T('Service Type')}</th>
                                 <th>{Lang::T('Created On')}</th>
@@ -52,19 +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 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>{$ds['email']}</td>
+                                    <td align="center">
+                                        {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>
@@ -73,7 +90,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>
@@ -81,23 +98,23 @@
 
 <script>
     // Functionality to filter table rows based on admin input
-    document.addEventListener('DOMContentLoaded', function () {
-            var searchInput = document.getElementById('search-input');
-            var tableRows = document.querySelectorAll('tbody tr');
+    document.addEventListener('DOMContentLoaded', function() {
+        var searchInput = document.getElementById('search-input');
+        var tableRows = document.querySelectorAll('tbody tr');
 
-            searchInput.addEventListener('input', function () {
-                var searchText = this.value.toLowerCase();
+        searchInput.addEventListener('input', function() {
+            var searchText = this.value.toLowerCase();
 
-                tableRows.forEach(function (row) {
-                    var rowData = row.textContent.toLowerCase();
+            tableRows.forEach(function(row) {
+                var rowData = row.textContent.toLowerCase();
 
-                    if (rowData.includes(searchText)) {
-                        row.style.display = '';
-                    } else {
-                        row.style.display = 'none';
-                    }
-                });
+                if (rowData.includes(searchText)) {
+                    row.style.display = '';
+                } else {
+                    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-add.tpl

@@ -20,6 +20,14 @@
                             <input type="radio" name="prepaid" onclick="postPaid()" value="no"> Postpaid
                         </div>
                     </div>
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Plan Type')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="plan_type"  value="Personal" checked> Personal
+                            <input type="radio" name="plan_type"   value="Business"> Business
+                        </div>
+                    </div>
                     {if $_c['radius_enable']}
                         <div class="form-group">
                             <label class="col-md-2 control-label">Radius</label>

ui/ui/hotspot-edit.tpl

@@ -14,6 +14,8 @@
                             <input type="radio" name="enabled" value="0" {if $d['enabled'] == 0}checked{/if}> Disable
                         </div>
                     </div>
+ 
+
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Type')}</label>
                         <div class="col-md-10">
@@ -24,6 +26,19 @@
                                 {if $d['prepaid'] == no}checked{/if}> Postpaid
                         </div>
                     </div>
+
+                     <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Plan Type')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="plan_type"   value="Personal"
+                                {if $d['plan_type'] == 'Personal'}checked{/if}>
+                            Personal
+                            <input type="radio" name="plan_type"   value="Business"
+                                {if $d['plan_type'] == 'Business'}checked{/if}> Business
+                        </div>
+                    </div>
+
+
                     {if $_c['radius_enable'] and $d['is_radius']}
                         <div class="form-group">
                             <label class="col-md-2 control-label">Radius</label>

ui/ui/hotspot.tpl

@@ -27,8 +27,8 @@
                         </form>
                     </div>
                     <div class="col-md-4">
-                        <a href="{$_url}services/add" class="btn btn-primary btn-block"><i
-                                class="ion ion-android-add"> </i> {Lang::T('New Service Plan')}</a>
+                        <a href="{$_url}services/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
+                            </i> {Lang::T('New Service Plan')}</a>
                     </div>&nbsp;
                 </div>
                 <div class="table-responsive">
@@ -38,52 +38,54 @@
                                 <th>{Lang::T('Plan Name')}</th>
                                 <th>{Lang::T('Plan Type')}</th>
                                 <th>{Lang::T('Bandwidth Plans')}</th>
+                                <th>{Lang::T('Plan Category')}</th>
                                 <th>{Lang::T('Plan Price')}</th>
                                 <th>{Lang::T('Time Limit')}</th>
                                 <th>{Lang::T('Data Limit')}</th>
                                 <th>{Lang::T('Plan Validity')}</th>
                                 <th>{Lang::T('Routers')}</th>
                                 <th>{Lang::T('Expired IP Pool')}</th>
+                                <th>{Lang::T('ID')}</th>
                                 <th>{Lang::T('Manage')}</th>
-                                <th>ID</th>
                             </tr>
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"
-                                {elseif $ds['prepaid'] != 'yes'}class="warning" title="Postpaid" {/if}>
-                                    <td class="headcol">{$ds['name_plan']}</td>
-                                    <td>{$ds['typebp']}</td>
-                                    <td>{$ds['name_bw']}</td>
-                                    <td>{Lang::moneyFormat($ds['price'])}</td>
-                                    <td>{$ds['time_limit']} {$ds['time_unit']}</td>
-                                    <td>{$ds['data_limit']} {$ds['data_unit']}</td>
-                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
-                                    <td>
-                                        {if $ds['is_radius']}
-                                            <span class="label label-primary">RADIUS</span>
-                                        {else}
-                                            {if $ds['routers']!=''}
-                                                <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
-                                            {/if}
-                                        {/if}
-                                    </td>
-                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} | {/if}{$ds['list_expired']}{/if}</td>
-                                    <td>
-                                        <a href="{$_url}services/edit/{$ds['id']}"
-                                            class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
-                                        <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}"
-                                            onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
-                                    </td>
-                                    <td>{$ds['id']}</td>
-                                </tr>
+                            <tr {if $ds['enabled'] !=1}class="danger" title="disabled" {elseif $ds['prepaid'] !='yes'
+                                }class="warning" title="Postpaid" {/if}>
+                                <td class="headcol">{$ds['name_plan']}</td>
+                                <td>{$ds['plan_type']}</td>
+                                <td>{$ds['name_bw']}</td>
+                                <td>{$ds['typebp']}</td>
+                                <td>{Lang::moneyFormat($ds['price'])}</td>
+                                <td>{$ds['time_limit']} {$ds['time_unit']}</td>
+                                <td>{$ds['data_limit']} {$ds['data_unit']}</td>
+                                <td>{$ds['validity']} {$ds['validity_unit']}</td>
+                                <td>
+                                    {if $ds['is_radius']}
+                                    <span class="label label-primary">RADIUS</span>
+                                    {else}
+                                    {if $ds['routers']!=''}
+                                    <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
+                                    {/if}
+                                    {/if}
+                                </td>
+                                <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} |
+                                    {/if}{$ds['list_expired']}{/if}</td>
+                                <td>{$ds['id']}</td>
+                                <td>
+                                    <a href="{$_url}services/edit/{$ds['id']}"
+                                        class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
+                                    <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}"
+                                        onclick="return confirm('{Lang::T('Delete')}?')"
+                                        class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
+                                </td>
+                            </tr>
                             {/foreach}
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
-
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/logs-radius.tpl

@@ -4,6 +4,13 @@
     <div class="col-sm-12">
         <div class="panel panel-hovered mb20 panel-primary">
             <div class="panel-heading">
+                {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
+                    <div class="btn-group pull-right">
+                        <a class="btn btn-primary btn-xs" title="save" href="{$_url}logs/radius-csv"
+                            onclick="return confirm('This will export to CSV?')"><span class="glyphicon glyphicon-download"
+                                aria-hidden="true"></span> CSV</a>
+                    </div>
+                {/if}
                 Radius
             </div>
             <div class="panel-body">
@@ -53,7 +60,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

ui/ui/logs.tpl

@@ -4,6 +4,13 @@
     <div class="col-sm-12">
         <div class="panel panel-hovered mb20 panel-primary">
             <div class="panel-heading">
+                {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
+                    <div class="btn-group pull-right">
+                        <a class="btn btn-primary btn-xs" title="save" href="{$_url}logs/list-csv"
+                            onclick="return confirm('This will export to CSV?')"><span class="glyphicon glyphicon-download"
+                                aria-hidden="true"></span> CSV</a>
+                    </div>
+                {/if}
                 Activity Log
             </div>
             <div class="panel-body">
@@ -50,7 +57,7 @@
                         </tbody>
                     </table>
                 </div>
-                {$paginator['contents']}
+                {include file="pagination.tpl"}
             </div>
         </div>
     </div>

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,36 +29,114 @@
 							</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>
+							<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:')}
 							<br>
-							<b>{Lang::T('[[name]]')}</b> - {Lang::T('Customer Name')}
+							<b>[[name]]</b> - {Lang::T('Customer Name')}
 							<br>
-							<b>{Lang::T('[[user_name]]')}</b> - {Lang::T('Customer Username')}
+							<b>[[user_name]]</b> - {Lang::T('Customer Username')}
 							<br>
-							<b>{Lang::T('[[phone]]')}</b> - {Lang::T('Customer Phone')}
+							<b>[[phone]]</b> - {Lang::T('Customer Phone')}
 							<br>
-							<b>{Lang::T('[[company_name]]')}</b> - {Lang::T('Your Company Name')}
+							<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>
 				</form>
-				
+
 			</div>
 		</div>
 	</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/message.tpl

@@ -1,65 +1,64 @@
 {include file="sections/header.tpl"}
 
-		<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 Personal Message')}</div>
-					<div class="panel-body">
-						<form class="form-horizontal" method="post" role="form" action="{$_url}message/send-post" >
-							<div class="form-group">
-								<label class="col-md-2 control-label">{Lang::T('Customer')}</label>
-								<div class="col-md-6">
-									<select id="personSelect" class="form-control select2" name="id_customer" style="width: 100%" data-placeholder="Select a customer...">
-									<option></option>
-										{foreach $c as $cs}
-											{if $id eq $cs['id']}
-												<option value="{$cs['id']}" selected>{$cs['username']}</option>
-											{else}
-												<option value="{$cs['id']}">{$cs['username']}</option>
-											{/if}
-										{/foreach}
-									</select>
-								</div>
-							</div>
-							<div class="form-group">
-								<label class="col-md-2 control-label">{Lang::T('Send Via')}</label>
-								<div class="col-md-6">
-									<select class="form-control" name="via" id="via">
-									<option value="sms" selected> {Lang::T('SMS')}</option>
-									<option value="wa"> {Lang::T('WhatsApp')}</option>
-									<option value="both"> {Lang::T('SMS and WhatsApp')}</option>
-								</select>
-								</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>
-								</div>
-								<p class="help-block col-md-4">
-									{Lang::T('Use placeholders:')}
-									<br>
-									<b>{Lang::T('[[name]]')}</b> - {Lang::T('Customer Name')}
-									<br>
-									<b>{Lang::T('[[user_name]]')}</b> - {Lang::T('Customer Username')}
-									<br>
-									<b>{Lang::T('[[phone]]')}</b> - {Lang::T('Customer Phone')}
-									<br>
-									<b>{Lang::T('[[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>
-									<a href="{$_url}dashboard" class="btn btn-default">{Lang::T('Cancel')}</a>
-								</div>
-							</div>
-						</form>
+<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 Personal Message')}</div>
+			<div class="panel-body">
+				<form class="form-horizontal" method="post" role="form" action="{$_url}message/send-post">
+					<div class="form-group">
+						<label class="col-md-2 control-label">{Lang::T('Customer')}</label>
+						<div class="col-md-6">
+							<select {if $cust}{else}id="personSelect" {/if} class="form-control select2"
+								name="id_customer" style="width: 100%"
+								data-placeholder="{Lang::T('Select a customer')}...">
+								{if $cust}
+								<option value="{$cust['id']}">{$cust['username']} &bull; {$cust['fullname']} &bull;
+									{$cust['email']}</option>
+								{/if}
+							</select>
+						</div>
 					</div>
-				</div>
+					<div class="form-group">
+						<label class="col-md-2 control-label">{Lang::T('Send Via')}</label>
+						<div class="col-md-6">
+							<select class="form-control" name="via" id="via">
+								<option value="sms" selected> {Lang::T('SMS')}</option>
+								<option value="wa"> {Lang::T('WhatsApp')}</option>
+								<option value="both"> {Lang::T('SMS and WhatsApp')}</option>
+							</select>
+						</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>
+						</div>
+						<p class="help-block col-md-4">
+							{Lang::T('Use placeholders:')}
+							<br>
+							<b>[[name]]</b> - {Lang::T('Customer Name')}
+							<br>
+							<b>[[user_name]]</b> - {Lang::T('Customer Username')}
+							<br>
+							<b>[[phone]]</b> - {Lang::T('Customer Phone')}
+							<br>
+							<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>
+							<a href="{$_url}dashboard" class="btn btn-default">{Lang::T('Cancel')}</a>
+						</div>
+					</div>
+				</form>
 			</div>
 		</div>
+	</div>
+</div>
 
 
-{include file="sections/footer.tpl"}
+{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

@@ -45,6 +45,7 @@
                             <tr>
                                 <th>{Lang::T('Username')}</th>
                                 <th>{Lang::T('Plan Name')}</th>
+                                <th>{Lang::T('Plan Type')}</th>
                                 <th>{Lang::T('Type')}</th>
                                 <th>{Lang::T('Created On')}</th>
                                 <th>{Lang::T('Expires On')}</th>
@@ -59,6 +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>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
                                     <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                                     <td>{$ds['method']}</td>
@@ -77,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-add.tpl

@@ -20,6 +20,15 @@
                             <input type="radio" name="prepaid" onclick="postPaid()" value="no"> Postpaid
                         </div>
                     </div>
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Plan Type')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="plan_type"  value="Personal" checked> Personal
+                            <input type="radio" name="plan_type"   value="Business"> Business
+                        </div>
+                    </div>
+                    
                     {if $_c['radius_enable']}
                         <div class="form-group">
                             <label class="col-md-2 control-label">Radius</label>

ui/ui/pppoe-edit.tpl

@@ -22,6 +22,17 @@
                             <input type="radio" name="prepaid" onclick="postPaid()" value="no" {if $d['prepaid'] == no}checked{/if}> Postpaid
                         </div>
                     </div>
+                     <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Plan Type')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="plan_type"   value="Personal"
+                                {if $d['plan_type'] == 'Personal'}checked{/if}>
+                            Personal
+                            <input type="radio" name="plan_type"   value="Business"
+                                {if $d['plan_type'] == 'Business'}checked{/if}> Business
+                        </div>
+                    </div>
+                    
                     {if $_c['radius_enable'] and $d['is_radius']}
                         <div class="form-group">
                             <label class="col-md-2 control-label">Radius</label>

ui/ui/pppoe.tpl

@@ -36,6 +36,7 @@
                         <thead>
                             <tr>
                                 <th>{Lang::T('Plan Name')}</th>
+                                <th>{Lang::T('Plan Type')}</th>
                                 <th>{Lang::T('Bandwidth Plans')}</th>
                                 <th>{Lang::T('Plan Price')}</th>
                                 <th>{Lang::T('Plan Validity')}</th>
@@ -48,22 +49,26 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"
-                                    {elseif $ds['prepaid'] != 'yes'}class="warning" title="Postpaid" {/if}>
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"{/if}>
                                     <td>{$ds['name_plan']}</td>
+                                    <td>{$ds['plan_type']} {if $ds['prepaid'] != 'yes'}<b>Postpaid</b>{else}Prepaid{/if}</td>
                                     <td>{$ds['name_bw']}</td>
                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                     <td>{$ds['validity']} {$ds['validity_unit']}</td>
                                     <td>{$ds['pool']}</td>
-                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} | {/if}{$ds['list_expired']}{/if}</td>
+                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}
+                                        {if $ds['pool_expired']} |
+                                            {/if}{$ds['list_expired']}
+                                        {/if}</td>
                                     <td>
-                                    {if $ds['is_radius']}
-                                        <span class="label label-primary">RADIUS</span>
-                                    {else}
-                                        {if $ds['routers']!=''}
-                                            <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
+                                        {if $ds['is_radius']}
+                                            <span class="label label-primary">RADIUS</span>
+                                        {else}
+                                            {if $ds['routers']!=''}
+                                                <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
+                                            {/if}
                                         {/if}
-                                    {/if}</td>
+                                    </td>
                                     <td>
                                         <a href="{$_url}services/pppoe-edit/{$ds['id']}"
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
@@ -77,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/register-otp.tpl

@@ -26,22 +26,22 @@
             <hr>
         </div>
         {if isset($notify)}
-        <script>
-            // Display SweetAlert toast notification
-            Swal.fire({
-                icon: '{if $notify_t == "s"}success{else}warning{/if}',
-                title: '{$notify}',
-                toast: true,
-                position: 'top-end',
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true,
-                didOpen: (toast) => {
-                    toast.addEventListener('mouseenter', Swal.stopTimer)
-                    toast.addEventListener('mouseleave', Swal.resumeTimer)
-                }
-            });
-        </script>
+            <script>
+                // Display SweetAlert toast notification
+                Swal.fire({
+                    icon: '{if $notify_t == "s"}success{else}warning{/if}',
+                    title: '{$notify}',
+                    toast: true,
+                    position: 'top-end',
+                    showConfirmButton: false,
+                    timer: 5000,
+                    timerProgressBar: true,
+                    didOpen: (toast) => {
+                        toast.addEventListener('mouseenter', Swal.stopTimer)
+                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                    }
+                });
+            </script>
         {/if}
         <div class="row">
             <div class="col-md-4">
@@ -62,13 +62,14 @@
                                     <label>{Lang::T('Phone Number')}</label>
                                     <div class="input-group">
                                         {if $_c['country_code_phone']!= ''}
-                                            <span class="input-group-addon" id="basic-addon1">+</span>
-                                        {else}
                                             <span class="input-group-addon" id="basic-addon1"><i
                                                     class="glyphicon glyphicon-phone-alt"></i></span>
+                                        {else}
+                                            <span class="input-group-addon" id="basic-addon1"><i
+                                                    class="glyphicon glyphicon-user"></i></span>
                                         {/if}
                                         <input type="text" class="form-control" name="username" value="{$username}"
-                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -83,7 +84,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label>{Lang::T('Email')}</label>
-                                    <input type="text" required class="form-control" placeholder="xxxxxx@xxx.xx"
+                                    <input type="text" class="form-control" placeholder="xxxxxx@xxx.xx"
                                         id="email" value="{$email}" name="email">
                                 </div>
                                 <div class="form-group">
@@ -111,8 +112,7 @@
                                 </div>
                                 <div class="btn-group btn-group-justified mb15">
                                     <div class="btn-group">
-                                        <button class="btn btn-primary"
-                                            type="submit">{Lang::T('Register')}</button>
+                                        <button class="btn btn-primary" type="submit">{Lang::T('Register')}</button>
                                     </div>
                                     <div class="btn-group">
                                         <a href="{$_url}register" class="btn btn-success">{Lang::T('Cancel')}</a>

ui/ui/register-rotp.tpl

@@ -25,22 +25,22 @@
             <hr>
         </div>
         {if isset($notify)}
-        <script>
-            // Display SweetAlert toast notification
-            Swal.fire({
-                icon: '{if $notify_t == "s"}success{else}warning{/if}',
-                title: '{$notify}',
-                toast: true,
-                position: 'top-end',
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true,
-                didOpen: (toast) => {
-                    toast.addEventListener('mouseenter', Swal.stopTimer)
-                    toast.addEventListener('mouseleave', Swal.resumeTimer)
-                }
-            });
-        </script>
+            <script>
+                // Display SweetAlert toast notification
+                Swal.fire({
+                    icon: '{if $notify_t == "s"}success{else}warning{/if}',
+                    title: '{$notify}',
+                    toast: true,
+                    position: 'top-end',
+                    showConfirmButton: false,
+                    timer: 5000,
+                    timerProgressBar: true,
+                    didOpen: (toast) => {
+                        toast.addEventListener('mouseenter', Swal.stopTimer)
+                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                    }
+                });
+            </script>
         {/if}
         <div class="row">
             <div class="col-md-2">
@@ -62,13 +62,14 @@
                                 <label>{Lang::T('Phone Number')}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
-                                    {else}
                                         <span class="input-group-addon" id="basic-addon1"><i
                                                 class="glyphicon glyphicon-phone-alt"></i></span>
+                                    {else}
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                                class="glyphicon glyphicon-user"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username"
-                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                 </div>
                             </div>
                             <div class="btn-group btn-group-justified mb15">
@@ -76,8 +77,7 @@
                                     <a href="{$_url}login" class="btn btn-warning">{Lang::T('Cancel')}</a>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn btn-success"
-                                        type="submit">{Lang::T('Request OTP')}</button>
+                                    <button class="btn btn-success" type="submit">{Lang::T('Request OTP')}</button>
                                 </div>
                             </div>
                             <br>

ui/ui/register.tpl

@@ -26,22 +26,22 @@
             <hr>
         </div>
         {if isset($notify)}
-        <script>
-            // Display SweetAlert toast notification
-            Swal.fire({
-                icon: '{if $notify_t == "s"}success{else}warning{/if}',
-                title: '{$notify}',
-                toast: true,
-                position: 'top-end',
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true,
-                didOpen: (toast) => {
-                    toast.addEventListener('mouseenter', Swal.stopTimer)
-                    toast.addEventListener('mouseleave', Swal.resumeTimer)
-                }
-            });
-        </script>
+            <script>
+                // Display SweetAlert toast notification
+                Swal.fire({
+                    icon: '{if $notify_t == "s"}success{else}warning{/if}',
+                    title: '{$notify}',
+                    toast: true,
+                    position: 'top-end',
+                    showConfirmButton: false,
+                    timer: 5000,
+                    timerProgressBar: true,
+                    didOpen: (toast) => {
+                        toast.addEventListener('mouseenter', Swal.stopTimer)
+                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                    }
+                });
+            </script>
         {/if}
         <div class="row">
             <div class="col-md-4">
@@ -61,9 +61,15 @@
                                 <div class="md-input-container">
                                     <label>{Lang::T('Phone Number')}</label>
                                     <div class="input-group">
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
+                                        {if $_c['country_code_phone']!= ''}
+                                            <span class="input-group-addon" id="basic-addon1"><i
+                                                    class="glyphicon glyphicon-phone-alt"></i></span>
+                                        {else}
+                                            <span class="input-group-addon" id="basic-addon1"><i
+                                                    class="glyphicon glyphicon-user"></i></span>
+                                        {/if}
                                         <input type="text" class="form-control" name="username"
-                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                     </div>
                                 </div>
                                 <div class="md-input-container md-float-label">
@@ -73,8 +79,8 @@
                                 </div>
                                 <div class="md-input-container md-float-label">
                                     <label>{Lang::T('Email')}</label>
-                                    <input type="text" required class="form-control" id="email"
-                                        placeholder="xxxxxxx@xxxx.xx" value="{$email}" name="email">
+                                    <input type="text" class="form-control" id="email" placeholder="xxxxxxx@xxxx.xx"
+                                        value="{$email}" name="email">
                                 </div>
                                 <div class="md-input-container md-float-label">
                                     <label>{Lang::T('Address')}</label>
@@ -105,8 +111,7 @@
                                         <a href="{$_url}login" class="btn btn-warning">{Lang::T('Cancel')}</a>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn btn-success"
-                                            type="submit">{Lang::T('Register')}</button>
+                                        <button class="btn btn-success" type="submit">{Lang::T('Register')}</button>
                                     </div>
                                 </div>
                                 <br>

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-add.tpl

@@ -20,7 +20,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Router Name')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Router Name / Location')}</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" id="name" name="name" maxlength="32">
                             <p class="help-block">{Lang::T('Name of Area that router operated')}</p>

ui/ui/routers-edit.tpl

@@ -20,7 +20,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-md-2 control-label">{Lang::T('Router Name')}</label>
+                            <label class="col-md-2 control-label">{Lang::T('Router Name / Location')}</label>
                             <div class="col-md-6">
                                 <input type="text" class="form-control" id="name" name="name" maxlength="32" value="{$d['name']}">
                                 <p class="help-block">{Lang::T('Name of Area that router operated')}</p>

ui/ui/routers.tpl

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

ui/ui/sections/header.tpl

@@ -88,7 +88,7 @@
         }
     </style>
     {if isset($xheader)}
-    {$xheader}
+        {$xheader}
     {/if}
 
 </head>
@@ -158,62 +158,71 @@
                     </li>
                     {$_MENU_AFTER_DASHBOARD}
                     {if !in_array($_admin['user_type'],['Report'])}
-                    <li {if $_system_menu eq 'customers' }class="active" {/if}>
-                        <a href="{$_url}customers">
-                            <i class="fa fa-users"></i>
-                            <span>{Lang::T('Customer')}</span>
-                        </a>
-                    </li>
-                    {$_MENU_AFTER_CUSTOMERS}
-                    <li class="{if $_system_menu eq 'plan'}active{/if} treeview">
-                        <a href="#">
-                            <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}plan/list">{Lang::T('Active Users')}</a></li>
-                            {if $_c['disable_voucher'] != 'yes'}
-                            <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
-                                    href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
-                            <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
-                                    href="{$_url}plan/refill">{Lang::T('Refill Customer')}</a></li>
-                            {/if}
-                            <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
-                                    href="{$_url}plan/recharge">{Lang::T('Recharge Customer')}</a></li>
-                            {if $_c['enable_balance'] == 'yes'}
-                            <li {if $_routes[1] eq 'deposit' }class="active" {/if}><a
-                                    href="{$_url}plan/deposit">{Lang::T('Refill Balance')}</a></li>
-                            {/if}
-                            {$_MENU_SERVICES}
-                        </ul>
-                    </li>
+                        <li class="{if in_array($_system_menu, ['customers', 'map'])}active{/if} treeview">
+                            <a href="#">
+                                <i class="fa fa-users"></i> <span>{Lang::T('Customer')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_system_menu eq 'customers' }class="active" {/if}><a
+                                        href="{$_url}customers">{Lang::T('Lists')}</a></li>
+                                <li {if $_system_menu eq 'map' }class="active" {/if}><a
+                                        href="{$_url}map/customer">{Lang::T('Location')}</a></li>
+                                {$_MENU_CUSTOMERS}
+                            </ul>
+                        </li>
+                        {$_MENU_AFTER_CUSTOMERS}
+                        <li class="{if $_system_menu eq 'plan'}active{/if} treeview">
+                            <a href="#">
+                                <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}plan/list">{Lang::T('Active Users')}</a></li>
+                                {if $_c['disable_voucher'] != 'yes'}
+                                    <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
+                                            href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
+                                    <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
+                                            href="{$_url}plan/refill">{Lang::T('Refill Customer')}</a></li>
+                                {/if}
+                                <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
+                                        href="{$_url}plan/recharge">{Lang::T('Recharge Customer')}</a></li>
+                                {if $_c['enable_balance'] == 'yes'}
+                                    <li {if $_routes[1] eq 'deposit' }class="active" {/if}><a
+                                            href="{$_url}plan/deposit">{Lang::T('Refill Balance')}</a></li>
+                                {/if}
+                                {$_MENU_SERVICES}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_SERVICES}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li class="{if $_system_menu eq 'services'}active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-cube"></i> <span>{Lang::T('Plans')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
-                                    href="{$_url}services/hotspot">{Lang::T('Hotspot')}</a></li>
-                            <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
-                                    href="{$_url}services/pppoe">{Lang::T('PPPOE')}</a></li>
-                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}bandwidth/list">{Lang::T('Bandwidth')}</a></li>
-                            {if $_c['enable_balance'] == 'yes'}
-                            <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
-                                    href="{$_url}services/balance">{Lang::T('Balance')}</a></li>
-                            {/if}
-                            {$_MENU_PLANS}
-                        </ul>
-                    </li>
+                        <li class="{if $_system_menu eq 'services'}active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-cube"></i> <span>{Lang::T('Plans')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
+                                        href="{$_url}services/hotspot">{Lang::T('Hotspot')}</a></li>
+                                <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
+                                        href="{$_url}services/pppoe">{Lang::T('PPPOE')}</a></li>
+                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}bandwidth/list">{Lang::T('Bandwidth')}</a></li>
+                                {if $_c['enable_balance'] == 'yes'}
+                                    <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
+                                            href="{$_url}services/balance">{Lang::T('Balance')}</a></li>
+                                {/if}
+                                {$_MENU_PLANS}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_PLANS}
                     <li class="{if $_system_menu eq 'reports'}active{/if} treeview">
@@ -243,72 +252,72 @@
                         </a>
                         <ul class="treeview-menu">
                             <li {if $_routes[1] eq 'send' }class="active" {/if}><a
-                                    href="{$_url}message/send">{Lang::T('Send SMS/WA Message')}</a></li>
+                                    href="{$_url}message/send">{Lang::T('Single Customer')}</a></li>
                             <li {if $_routes[1] eq 'send_bulk' }class="active" {/if}><a
-                                    href="{$_url}message/send_bulk">{Lang::T('Send Bulk SMS/WA Message')}</a></li>
+                                    href="{$_url}message/send_bulk">{Lang::T('Bulk Customers')}</a></li>
                             {$_MENU_MESSAGE}
                         </ul>
                     </li>
                     {$_MENU_AFTER_MESSAGE}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li class="{if $_system_menu eq 'network'}active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-network"></i> <span>{Lang::T('Network')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[0] eq 'routers' and $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}routers/list">{Lang::T('Routers')}</a></li>
-                            <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}pool/list">{Lang::T('IP Pool')}</a></li>
-                            {$_MENU_NETWORK}
-                        </ul>
-                    </li>
-                    {$_MENU_AFTER_NETWORKS}
-                    {if $_c['radius_enable']}
-                    <li class="{if $_system_menu eq 'radius'}active{/if} treeview">
-                        <a href="#">
-                            <i class="fa fa-database"></i> <span>{Lang::T('Radius')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[0] eq 'radius' and $_routes[1] eq 'nas-list' }class="active" {/if}><a
-                                    href="{$_url}radius/nas-list">{Lang::T('Radius NAS')}</a></li>
-                            {$_MENU_RADIUS}
-                        </ul>
-                    </li>
-                    {/if}
-                    {$_MENU_AFTER_RADIUS}
-                    <li class="{if $_system_menu eq 'pages'}active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-document"></i> <span>{Lang::T("Static Pages")}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
-                                    href="{$_url}pages/Order_Voucher">{Lang::T('Order Voucher')}</a></li>
-                            <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
-                                    href="{$_url}pages/Voucher">{Lang::T('Voucher')} Template</a></li>
-                            <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
-                                    href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
-                            <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
-                                    href="{$_url}pages/Announcement_Customer">{Lang::T('Customer Announcement')}</a>
+                        <li class="{if $_system_menu eq 'network'}active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-network"></i> <span>{Lang::T('Network')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[0] eq 'routers' and $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}routers/list">{Lang::T('Routers')}</a></li>
+                                <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}pool/list">{Lang::T('IP Pool')}</a></li>
+                                {$_MENU_NETWORK}
+                            </ul>
+                        </li>
+                        {$_MENU_AFTER_NETWORKS}
+                        {if $_c['radius_enable']}
+                            <li class="{if $_system_menu eq 'radius'}active{/if} treeview">
+                                <a href="#">
+                                    <i class="fa fa-database"></i> <span>{Lang::T('Radius')}</span>
+                                    <span class="pull-right-container">
+                                        <i class="fa fa-angle-left pull-right"></i>
+                                    </span>
+                                </a>
+                                <ul class="treeview-menu">
+                                    <li {if $_routes[0] eq 'radius' and $_routes[1] eq 'nas-list' }class="active" {/if}><a
+                                            href="{$_url}radius/nas-list">{Lang::T('Radius NAS')}</a></li>
+                                    {$_MENU_RADIUS}
+                                </ul>
                             </li>
-                            <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
-                                    href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
-                            <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
-                                    href="{$_url}pages/Privacy_Policy">Privacy Policy</a></li>
-                            <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
-                                    href="{$_url}pages/Terms_and_Conditions">Terms and Conditions</a></li>
-                            {$_MENU_PAGES}
-                        </ul>
-                    </li>
+                        {/if}
+                        {$_MENU_AFTER_RADIUS}
+                        <li class="{if $_system_menu eq 'pages'}active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-document"></i> <span>{Lang::T("Static Pages")}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
+                                        href="{$_url}pages/Order_Voucher">{Lang::T('Order Voucher')}</a></li>
+                                <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
+                                        href="{$_url}pages/Voucher">{Lang::T('Voucher')} Template</a></li>
+                                <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
+                                        href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
+                                <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
+                                        href="{$_url}pages/Announcement_Customer">{Lang::T('Customer Announcement')}</a>
+                                </li>
+                                <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
+                                        href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
+                                <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
+                                        href="{$_url}pages/Privacy_Policy">Privacy Policy</a></li>
+                                <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
+                                        href="{$_url}pages/Terms_and_Conditions">Terms and Conditions</a></li>
+                                {$_MENU_PAGES}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_PAGES}
                     <li
@@ -321,31 +330,31 @@
                         </a>
                         <ul class="treeview-menu">
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                            <li {if $_routes[1] eq 'app' }class="active" {/if}><a
-                                    href="{$_url}settings/app">{Lang::T('General Settings')}</a></li>
-                            <li {if $_routes[1] eq 'localisation' }class="active" {/if}><a
-                                    href="{$_url}settings/localisation">{Lang::T('Localisation')}</a></li>
-                            <li {if $_routes[1] eq 'notifications' }class="active" {/if}><a
-                                    href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
+                                <li {if $_routes[1] eq 'app' }class="active" {/if}><a
+                                        href="{$_url}settings/app">{Lang::T('General Settings')}</a></li>
+                                <li {if $_routes[1] eq 'localisation' }class="active" {/if}><a
+                                        href="{$_url}settings/localisation">{Lang::T('Localisation')}</a></li>
+                                <li {if $_routes[1] eq 'notifications' }class="active" {/if}><a
+                                        href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
                             {/if}
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin','Agent'])}
-                            <li {if $_routes[1] eq 'users' }class="active" {/if}><a
-                                    href="{$_url}settings/users">{Lang::T('Administrator Users')}</a></li>
+                                <li {if $_routes[1] eq 'users' }class="active" {/if}><a
+                                        href="{$_url}settings/users">{Lang::T('Administrator Users')}</a></li>
                             {/if}
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                            <li {if $_routes[1] eq 'dbstatus' }class="active" {/if}><a
-                                    href="{$_url}settings/dbstatus">{Lang::T('Backup/Restore')}</a></li>
-                            <li {if $_system_menu eq 'paymentgateway' }class="active" {/if}>
-                                <a href="{$_url}paymentgateway">
-                                    <span class="text">{Lang::T('Payment Gateway')}</span>
-                                </a>
-                            </li>
-                            {$_MENU_SETTINGS}
-                            <li {if $_routes[0] eq 'pluginmanager' }class="active" {/if}>
-                                <a href="{$_url}pluginmanager"><i class="glyphicon glyphicon-tasks"></i>
-                                    {Lang::T('Plugin Manager')} <small class="label pull-right">Free</small></a>
-                            </li>
-                            {* <li {if $_routes[0] eq 'codecanyon' }class="active" {/if}>
+                                <li {if $_routes[1] eq 'dbstatus' }class="active" {/if}><a
+                                        href="{$_url}settings/dbstatus">{Lang::T('Backup/Restore')}</a></li>
+                                <li {if $_system_menu eq 'paymentgateway' }class="active" {/if}>
+                                    <a href="{$_url}paymentgateway">
+                                        <span class="text">{Lang::T('Payment Gateway')}</span>
+                                    </a>
+                                </li>
+                                {$_MENU_SETTINGS}
+                                <li {if $_routes[0] eq 'pluginmanager' }class="active" {/if}>
+                                    <a href="{$_url}pluginmanager"><i class="glyphicon glyphicon-tasks"></i>
+                                        {Lang::T('Plugin Manager')} <small class="label pull-right">Free</small></a>
+                                </li>
+                                {* <li {if $_routes[0] eq 'codecanyon' }class="active" {/if}>
                                 <a href="{$_url}codecanyon"><i class="glyphicon glyphicon-shopping-cart"></i>
                                     Codecanyon.net <small class="label pull-right">Paid</small></a>
                             </li> *}
@@ -354,24 +363,24 @@
                     </li>
                     {$_MENU_AFTER_SETTINGS}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-clock"></i> <span>{Lang::T('Logs')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}logs/phpnuxbill">PhpNuxBill</a></li>
-                            {if $_c['radius_enable']}
-                            <li {if $_routes[1] eq 'radius' }class="active" {/if}><a
-                                    href="{$_url}logs/radius">Radius</a>
-                            </li>
-                            {/if}
-                        </ul>
-                        {$_MENU_LOGS}
-                    </li>
+                        <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-clock"></i> <span>{Lang::T('Logs')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}logs/phpnuxbill">PhpNuxBill</a></li>
+                                {if $_c['radius_enable']}
+                                    <li {if $_routes[1] eq 'radius' }class="active" {/if}><a
+                                            href="{$_url}logs/radius">Radius</a>
+                                    </li>
+                                {/if}
+                            </ul>
+                            {$_MENU_LOGS}
+                        </li>
                     {/if}
                     {$_MENU_AFTER_LOGS}
                     <li {if $_system_menu eq 'community' }class="active" {/if}>
@@ -394,20 +403,20 @@
 
             <section class="content">
                 {if isset($notify)}
-                <script>
-                    // Display SweetAlert toast notification
-                    Swal.fire({
-                        icon: '{if $notify_t == "s"}success{else}error{/if}',
-                        title: '{$notify}',
-                        toast: true,
-                        position: 'top-end',
-                        showConfirmButton: false,
-                        timer: 5000,
-                        timerProgressBar: true,
-                        didOpen: (toast) => {
-                            toast.addEventListener('mouseenter', Swal.stopTimer)
-                            toast.addEventListener('mouseleave', Swal.resumeTimer)
-                        }
-                    });
-                </script>
-                {/if}
+                    <script>
+                        // Display SweetAlert toast notification
+                        Swal.fire({
+                            icon: '{if $notify_t == "s"}success{else}error{/if}',
+                            title: '{$notify}',
+                            toast: true,
+                            position: 'top-end',
+                            showConfirmButton: false,
+                            timer: 5000,
+                            timerProgressBar: true,
+                            didOpen: (toast) => {
+                                toast.addEventListener('mouseenter', Swal.stopTimer)
+                                toast.addEventListener('mouseleave', Swal.resumeTimer)
+                            }
+                        });
+                    </script>
+{/if}

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-dashboard.tpl

@@ -152,6 +152,7 @@
                             <td class="small text-success text-uppercase text-normal">{Lang::T('Type')}</td>
                             <td class="small mb15 text-success">
                                 <b>{if $_bill['prepaid'] eq yes}Prepaid{else}Postpaid{/if}</b>
+                                {Lang::T($_bill['plan_type'])}
                             </td>
                         </tr>
                         {if $nux_ip neq ''}

ui/ui/user-login-noreg.tpl

@@ -47,13 +47,14 @@
                                 <label>{Lang::T('Phone Number')}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
-                                    {else}
                                         <span class="input-group-addon" id="basic-addon1"><i
                                                 class="glyphicon glyphicon-phone-alt"></i></span>
+                                    {else}
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                                class="glyphicon glyphicon-user"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username" required
-                                        placeholder="08xxxxxxx">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                 </div>
                             </div>
                             <div class="form-group">

ui/ui/user-login.tpl

@@ -48,13 +48,14 @@
                                 <label>{Lang::T('Phone Number')}</label>
                                 <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"><i
+                                        class="glyphicon glyphicon-phone-alt"></i></span>
                                     {else}
                                         <span class="input-group-addon" id="basic-addon1"><i
-                                                class="glyphicon glyphicon-phone-alt"></i></span>
+                                                class="glyphicon glyphicon-user"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username"
-                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                 </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.18"
+    "version": "2024.4.3"
 }