fix delete logs

Nav menu label added

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,9 @@ assignees: ibnux
 
 ---
 
+Please Remember, this project is free and open source, and @ibnux don't get any money from this project, and if you post something not a bug, just you dont understand how to install it, you will get blocked from this Repository.
+Post it in Discussion if you don't understand. Except you pay for $50 for support
+
 **Describe the bug**
 A clear and concise description of what the bug is. Error connecting to router is not a bug, is your router port is not accessable, ask community for help, go to discussion or telegram group 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+Please Remember, this project is free and open source, and @ibnux don't get any money from this project, any Feature Request will cost you $50-$5000
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

CHANGELOG.md

@@ -2,6 +2,57 @@
 
 # CHANGELOG
 
+## 2024.1.17
+
+- Add minor change, for plugin, menu can have notifications by @Focuslinkstech
+
+## 2024.1.16
+
+- Add yellow color to table for plan not allowed to purchase
+- Fix Radius pool select
+- add price to reminder notification
+- Support thermal printer for invoice
+
+## 2024.1.15
+
+- Fix cron job for Plan only for admin by @Focuslinkstech
+
+## 2024.1.11
+
+- Add Plan only for admin by @Focuslinkstech
+- Fix Plugin Manager
+
+## 2024.1.9
+
+- Add Prefix when generate Voucher
+
+## 2024.1.8
+
+- User Expired Order by Expired Date
+
+## 2024.1.2
+
+- Pagination User Expired by @Focuslinkstech
+
+## 2023.12.21
+
+- Modern AdminLTE by @sabtech254
+- Update user-dashboard.tpl by @Focuslinkstech
+
+## 2023.12.19
+
+- Fix Search Customer
+- Disable Registration, Customer just activate voucher Code, and the voucher will be their password
+- Remove all used voucher codes
+
+## 2023.12.18
+
+- Split sms to 160 characters only for Mikrotik Modem
+
+## 2023.12.14
+
+- Can send SMS using Mikrotik with Modem Installed
+- Add Customer Type, so Customer can only show their PPPOE or Hotspot Package or both
 
 ## 2023.11.17
 

README.md

@@ -1,12 +1,13 @@
+[![ReadMeSupportPalestine](https://raw.githubusercontent.com/Safouene1/support-palestine-banner/master/banner-project.svg)](https://s.id/standwithpalestine)
+
 # PHPNuxBill - PHP Mikrotik Billing
 
 ![PHPNuxBill](install/img/logo.png)
 
-![StandWithPalestine](https://raw.githubusercontent.com/Safouene1/support-palestine-banner/master/StandWithPalestine.svg)
-
 ## Feature
 
 - Voucher Generator and Print
+- FreeRadius
 - Self registration
 - User Balance
 - Auto Renewal Package using Balance
@@ -14,7 +15,7 @@
 - Hotspot & PPPOE
 - Easy Installation
 - Multi Language
-- Payment Gateway Midtrans, Xendit and Tripay
+- Payment Gateway
 - SMS validation for login
 - Whatsapp Notification to Consumer
 - Telegram Notification for Admin
@@ -35,7 +36,7 @@ Most current web servers with PHP & MySQL installed will be capable of running P
 Minimum Requirements
 
 - Linux or Windows OS
-- PHP Version 7.4
+- Minimum PHP Version 7.4
 - Both PDO & MySQLi Support
 - PHP-GD2 Image Library
 - PHP-CURL

install/phpnuxbill.sql

@@ -27,6 +27,7 @@ CREATE TABLE `tbl_customers` (
   `phonenumber` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0',
   `email` varchar(128) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1',
   `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',
   `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
@@ -103,7 +104,8 @@ CREATE TABLE `tbl_plans` (
   `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'
+  `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'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 DROP TABLE IF EXISTS `tbl_pool`;
@@ -308,4 +310,4 @@ VALUES (
         'Active',
         '2022-09-06 16:09:50',
         '2014-06-23 01:43:07'
-    );
+    );

install/radius.sql

@@ -102,6 +102,13 @@ CREATE TABLE `radusergroup` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 
+DROP TABLE IF EXISTS `nasreload`;
+CREATE TABLE `nasreload` (
+  nasipaddress varchar(15) NOT NULL,
+  reloadtime datetime NOT NULL,
+  PRIMARY KEY (nasipaddress)
+) ENGINE = INNODB;
+
 ALTER TABLE `nas`
   ADD PRIMARY KEY (`id`),
   ADD KEY `nasname` (`nasname`);

system/autoload/Hookers.php

@@ -16,8 +16,10 @@ $menu_registered = array();
  * Admin/Sales menu: AFTER_DASHBOARD, CUSTOMERS, PREPAID, SERVICES, REPORTS, VOUCHER, AFTER_ORDER, NETWORK, SETTINGS, AFTER_PAYMENTGATEWAY
  * | Customer menu: AFTER_DASHBOARD, ORDER, HISTORY, ACCOUNTS
  * @param string icon from ion icon, ion-person, only for AFTER_
+ * @param string label for showing label or number of notification or update
+ * @param string color Label color
  */
-function register_menu($name, $admin, $function, $position, $icon = '')
+function register_menu($name, $admin, $function, $position, $icon = '', $label = '', $color = 'success')
 {
     global $menu_registered;
     $menu_registered[] = [
@@ -25,7 +27,9 @@ function register_menu($name, $admin, $function, $position, $icon = '')
         "admin" => $admin,
         "position" => $position,
         "icon" => $icon,
-        "function" => $function
+        "function" => $function,
+        "label" => $label,
+        "color" => $color
     ];
 }
 
@@ -48,4 +52,3 @@ function run_hook($action){
         }
     }
 }
-

system/autoload/Lang.php

@@ -99,4 +99,38 @@ class Lang
         }
         return $result;
     }
+
+    /**
+     * $pad_type
+     * 0 Left
+     * 1 right
+     * 2 center
+     * */
+    public static function pad($text, $pad_string = ' ', $pad_type = 0){
+        global $config;
+        $cols = 37;
+        if($config['printer_cols']){
+            $cols = $config['printer_cols'];
+        }
+        $text = trim($text);
+        $texts = explode("\n", $text);
+        if(count($texts)>1){
+            $text = '';
+            foreach($texts as $t){
+                $text.= self::pad(trim($t), $pad_string, $pad_type)."\n";
+            }
+            return $text;
+        }else{
+            return str_pad(trim($text), $cols, $pad_string, $pad_type);
+        }
+    }
+
+    public static function pads($textLeft, $textRight, $pad_string = ' '){
+        global $config;
+        $cols = 37;
+        if($config['printer_cols']){
+            $cols = $config['printer_cols'];
+        }
+        return $textLeft.str_pad($textRight, $cols-strlen($textLeft), $pad_string, 0);
+    }
 }

system/autoload/Log.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ *  by https://t.me/ibnux
+ **/
+
+
+class Log{
+    public static function put($type, $description, $userid = '', $username = '')
+    {
+        $d = ORM::for_table('tbl_logs')->create();
+        $d->date = date('Y-m-d H:i:s');
+        $d->type = $type;
+        $d->description = $description;
+        $d->userid = $userid;
+        $d->ip = (empty($username)) ? $_SERVER["REMOTE_ADDR"] : $username;
+        $d->save();
+    }
+
+    public static function arrayToText($array, $start = '', $result = '')
+    {
+        foreach ($array as $k => $v) {
+            if (is_array($v)) {
+                $result = Log::arrayToText($v, "$start$k.", $result);
+            } else {
+                $result .= $start.$k ." : ". strval($v) ."\n";
+            }
+        }
+        return $result;
+    }
+}

system/autoload/Message.php

@@ -24,9 +24,34 @@ class Message
         global $config;
         run_hook('send_sms'); #HOOK
         if (!empty($config['sms_url'])) {
-            $smsurl = str_replace('[number]', urlencode($phone), $config['sms_url']);
-            $smsurl = str_replace('[text]', urlencode($txt), $smsurl);
-            Http::getData($smsurl);
+            if (strlen($config['sms_url']) > 4 && substr($config['sms_url'], 0, 4) != "http") {
+                if (strlen($txt) > 160) {
+                    $txts = str_split($txt, 160);
+                    foreach ($txts as $txt) {
+                        try {
+                            $mikrotik = Mikrotik::info($config['sms_url']);
+                            $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                            Mikrotik::sendSMS($client, $phone, $txt);
+                        } catch (Exception $e) {
+                            // ignore, add to logs
+                            _log("Failed to send SMS using Mikrotik.\n" . $e->getMessage(), 'SMS', 0);
+                        }
+                    }
+                }else{
+                    try {
+                        $mikrotik = Mikrotik::info($config['sms_url']);
+                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                        Mikrotik::sendSMS($client, $phone, $txt);
+                    } catch (Exception $e) {
+                        // ignore, add to logs
+                        _log("Failed to send SMS using Mikrotik.\n" . $e->getMessage(), 'SMS', 0);
+                    }
+                }
+            } else {
+                $smsurl = str_replace('[number]', urlencode($phone), $config['sms_url']);
+                $smsurl = str_replace('[text]', urlencode($txt), $smsurl);
+                Http::getData($smsurl);
+            }
         }
     }
 
@@ -37,14 +62,15 @@ class Message
         if (!empty($config['wa_url'])) {
             $waurl = str_replace('[number]', urlencode($phone), $config['wa_url']);
             $waurl = str_replace('[text]', urlencode($txt), $waurl);
-            Http::getData($waurl);
+            return Http::getData($waurl);
         }
     }
 
-    public static function sendPackageNotification($phone, $name, $package, $message, $via)
+    public static function sendPackageNotification($phone, $name, $package, $price, $message, $via)
     {
-        $msg = str_replace('[[name]]', "*$name*", $message);
-        $msg = str_replace('[[package]]', "*$package*", $msg);
+        $msg = str_replace('[[name]]', $name, $message);
+        $msg = str_replace('[[package]]', $package, $msg);
+        $msg = str_replace('[[price]]', $price, $msg);
         if (
             !empty($phone) && strlen($phone) > 5
             && !empty($message) && in_array($via, ['sms', 'wa'])
@@ -60,9 +86,9 @@ class Message
 
     public static function sendBalanceNotification($phone, $name, $balance, $balance_now, $message, $via)
     {
-        $msg = str_replace('[[name]]', "*$name*", $message);
+        $msg = str_replace('[[name]]', $name, $message);
         $msg = str_replace('[[current_balance]]', Lang::moneyFormat($balance_now), $msg);
-        $msg = str_replace('[[balance]]', "*" . Lang::moneyFormat($balance) . "*", $msg);
+        $msg = str_replace('[[balance]]', Lang::moneyFormat($balance), $msg);
         if (
             !empty($phone) && strlen($phone) > 5
             && !empty($message) && in_array($via, ['sms', 'wa'])
@@ -76,7 +102,8 @@ class Message
         return "$via: $msg";
     }
 
-    public static function sendInvoice($cust, $trx){
+    public static function sendInvoice($cust, $trx)
+    {
         global $config;
         $textInvoice = Lang::getNotifText('invoice_paid');
         $textInvoice = str_replace('[[company_name]]', $config['CompanyName'], $textInvoice);

system/autoload/Mikrotik.php

@@ -65,7 +65,7 @@ class Mikrotik
         );
         $id = $client->sendSync($printRequest)->getProperty('.id');
         $removeRequest = new RouterOS\Request('/ip/hotspot/active/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $id)
         );
@@ -101,7 +101,7 @@ class Mikrotik
             Mikrotik::addHotspotPlan($client, $name, $sharedusers, $rate);
         } else {
             $setRequest = new RouterOS\Request('/ip/hotspot/user/profile/set');
-            $client(
+            $client->sendSync(
                 $setRequest
                     ->setArgument('numbers', $profileID)
                     ->setArgument('shared-users', $sharedusers)
@@ -132,7 +132,7 @@ class Mikrotik
             );
         } else {
             $setRequest = new RouterOS\Request('/ip/hotspot/user/profile/set');
-            $client(
+            $client->sendSync(
                 $setRequest
                     ->setArgument('numbers', $profileID)
                     ->setArgument('shared-users', 3)
@@ -155,7 +155,7 @@ class Mikrotik
         $profileID = $client->sendSync($printRequest)->getProperty('.id');
 
         $removeRequest = new RouterOS\Request('/ip/hotspot/user/profile/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $profileID)
         );
@@ -173,7 +173,7 @@ class Mikrotik
         );
         $userID = $client->sendSync($printRequest)->getProperty('.id');
         $removeRequest = new RouterOS\Request('/ip/hotspot/user/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $userID)
         );
@@ -397,7 +397,7 @@ class Mikrotik
         $poolID = $client->sendSync($printRequest)->getProperty('.id');
 
         $removeRequest = new RouterOS\Request('/ip/pool/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $poolID)
         );
@@ -433,7 +433,7 @@ class Mikrotik
             self::addPool($client, $name, $ip_address);
         } else {
             $setRequest = new RouterOS\Request('/ip/pool/set');
-            $client(
+            $client->sendSync(
                 $setRequest
                     ->setArgument('numbers', $poolID)
                     ->setArgument('ranges', $ip_address)
@@ -473,7 +473,7 @@ class Mikrotik
             self::addPpoePlan($client, $name, $pool, $rate);
         } else {
             $setRequest = new RouterOS\Request('/ppp/profile/set');
-            $client(
+            $client->sendSync(
                 $setRequest
                     ->setArgument('numbers', $profileID)
                     ->setArgument('local-address', $pool)
@@ -496,9 +496,22 @@ class Mikrotik
         $profileID = $client->sendSync($printRequest)->getProperty('.id');
 
         $removeRequest = new RouterOS\Request('/ppp/profile/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $profileID)
         );
     }
+
+    public static function sendSMS($client, $to, $message)
+    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
+        $smsRequest = new RouterOS\Request('/tool sms send');
+        $smsRequest
+            ->setArgument('phone-number', $to)
+            ->setArgument('message', $message);
+        $client->sendSync($smsRequest);
+    }
 }

system/autoload/Package.php

@@ -326,7 +326,7 @@ class Package
         $c = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
         $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
         $b = ORM::for_table('tbl_user_recharges')->find_one($from_id);
-        if($p['routers'] == $b['routers']){
+        if($p['routers'] == $b['routers'] && $b['routers'] != 'radius'){
             $mikrotik = Mikrotik::info($p['routers']);
         }else{
             $mikrotik = Mikrotik::info($b['routers']);
@@ -370,7 +370,7 @@ class Package
             }
         }
         // call the next mikrotik
-        if($p['routers'] != $b['routers']){
+        if($p['routers'] != $b['routers'] && $p['routers'] != 'radius'){
             $mikrotik = Mikrotik::info($p['routers']);
         }
         if ($p['type'] == 'Hotspot') {

system/boot.php

@@ -108,6 +108,21 @@ try {
         ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'), 'radius');
         ORM::configure('return_result_sets', true, 'radius');
     }
+} catch (Throwable $e) {
+    $ui = new Smarty();
+    $ui->setTemplateDir(['custom' => File::pathFixer('ui/ui_custom/'), 'default' => File::pathFixer('ui/ui/')]);
+    $ui->assign('_url', APP_URL . '/index.php?_route=');
+    $ui->setCompileDir(File::pathFixer('ui/compiled/'));
+    $ui->setConfigDir(File::pathFixer('ui/conf/'));
+    $ui->setCacheDir(File::pathFixer('ui/cache/'));
+    $ui->assign("error_title", "PHPNuxBill Crash");
+    if (isset($_SESSION['uid'])) {
+        $ui->assign("error_message", $e->getMessage() . '<br>');
+    } else {
+        $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
+    }
+    $ui->display('router-error.tpl');
+    die();
 } catch (Exception $e) {
     $ui = new Smarty();
     $ui->setTemplateDir(['custom' => File::pathFixer('ui/ui_custom/'), 'default' => File::pathFixer('ui/ui/')]);
@@ -118,7 +133,7 @@ try {
     $ui->assign("error_title", "PHPNuxBill Crash");
     if (isset($_SESSION['uid'])) {
         $ui->assign("error_message", $e->getMessage() . '<br>');
-    }else{
+    } else {
         $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
     }
     $ui->display('router-error.tpl');
@@ -130,13 +145,13 @@ function _notify($msg, $type = 'e')
     $_SESSION['ntype'] = $type;
     $_SESSION['notify'] = $msg;
 }
-if(empty($config['language'])){
+if (empty($config['language'])) {
     $config['language'] = 'english';
 }
 $lan_file = File::pathFixer('system/lan/' . $config['language'] . '/common.lan.php');
-if(file_exists($lan_file)){
+if (file_exists($lan_file)) {
     require $lan_file;
-}else{
+} else {
     die("$lan_file not found");
 }
 
@@ -190,7 +205,11 @@ $_notifmsg_default = json_decode(file_get_contents(File::pathFixer('system/uploa
 
 //register all plugin
 foreach (glob(File::pathFixer("system/plugin/*.php")) as $filename) {
-    include $filename;
+    try {
+        include $filename;
+    } catch (Throwable $e) {
+    } catch (Exception $e) {
+    }
 }
 
 
@@ -299,7 +318,8 @@ function time_elapsed_string($datetime, $full = false)
         }
     }
 
-    if (!$full) $string = array_slice($string, 0, 1);
+    if (!$full)
+        $string = array_slice($string, 0, 1);
     return $string ? implode(', ', $string) . ' ago' : 'just now';
 }
 
@@ -312,7 +332,6 @@ if ($handler == '') {
     $handler = 'default';
 }
 try {
-
     $sys_render = File::pathFixer('system/controllers/' . $handler . '.php');
     if (file_exists($sys_render)) {
         $menus = array();
@@ -327,12 +346,20 @@ try {
                 if (!empty($menu['icon'])) {
                     $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
                 }
+                if (!empty($menu['label'])) {
+                    $menus[$menu['position']] .= '<span class="pull-right-container">';
+                    $menus[$menu['position']] .= '<small class="label pull-right bg-' . $menu['color'] . '">' . $menu['label'] . '</small></span>';
+                }
                 $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
             } else if (!$menu['admin'] && _auth(false)) {
                 $menus[$menu['position']] .= '<li' . (($routes[1] == $menu['function']) ? ' class="active"' : '') . '><a href="' . U . 'plugin/' . $menu['function'] . '">';
                 if (!empty($menu['icon'])) {
                     $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
                 }
+                if (!empty($menu['label'])) {
+                    $menus[$menu['position']] .= '<span class="pull-right-container">';
+                    $menus[$menu['position']] .= '<small class="label pull-right bg-' . $menu['color'] . '">' . $menu['label'] . '</small></span>';
+                }
                 $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
             }
         }
@@ -344,9 +371,17 @@ try {
     } else {
         r2(U . 'dashboard', 'e', 'not found');
     }
+} catch (Throwable $e) {
+    if (!isset($_SESSION['aid']) || empty($_SESSION['aid'])) {
+        r2(U . 'home', 'e', $e->getMessage());
+    }
+    $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
+    $ui->assign("error_title", "PHPNuxBill Crash");
+    $ui->display('router-error.tpl');
+    die();
 } catch (Exception $e) {
-    if (isset($_SESSION['uid'])) {
-        r2(U . 'home' , 'e', $e->getMessage());
+    if (!isset($_SESSION['aid']) || empty($_SESSION['aid'])) {
+        r2(U . 'home', 'e', $e->getMessage());
     }
     $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
     $ui->assign("error_title", "PHPNuxBill Crash");

system/controllers/autoload.php

@@ -66,7 +66,7 @@ switch ($action) {
         if (empty($s)) {
             $c = ORM::for_table('tbl_customers')->limit(30)->find_many();
         } else {
-            $c = ORM::for_table('tbl_customers')->where_raw("(`username` LIKE '%$s%' OR `fullname` LIKE '%$s%' OR `phonenumber` LIKE '%$s%' OR `email` LIKE '%$s%')", [$s, $s, $s, $s])->limit(30)->find_many();
+            $c = ORM::for_table('tbl_customers')->where_raw("(`username` LIKE '%$s%' OR `fullname` LIKE '%$s%' OR `phonenumber` LIKE '%$s%' OR `email` LIKE '%$s%')")->limit(30)->find_many();
         }
         header('Content-Type: application/json');
         foreach ($c as $cust) {

system/controllers/customers.php

@@ -28,13 +28,15 @@ switch ($action) {
                 'username' => '%' . $search . '%',
                 'fullname' => '%' . $search . '%',
                 'phonenumber' => '%' . $search . '%',
-                'email' => '%' . $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%')", [$search, $search, $search, $search])
+                ->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_desc('id')->find_many();
+                ->order_by_asc('username')
+                ->find_many();
         } else {
             $paginator = Paginator::build(ORM::for_table('tbl_customers'));
             $d = ORM::for_table('tbl_customers')
@@ -227,6 +229,7 @@ switch ($action) {
         $email = _post('email');
         $address = _post('address');
         $phonenumber = _post('phonenumber');
+        $service_type = _post('service_type');
         run_hook('add_customer'); #HOOK
         $msg = '';
         if (Validator::Length($username, 35, 2) == false) {
@@ -253,6 +256,7 @@ switch ($action) {
             $d->fullname = $fullname;
             $d->address = $address;
             $d->phonenumber = Lang::phoneFormat($phonenumber);
+            $d->service_type = $service_type;
             $d->save();
             r2(U . 'customers/list', 's', $_L['account_created_successfully']);
         } else {
@@ -268,6 +272,7 @@ switch ($action) {
         $email = _post('email');
         $address = _post('address');
         $phonenumber = Lang::phoneFormat(_post('phonenumber'));
+        $service_type = _post('service_type');
         run_hook('edit_customer'); #HOOK
         $msg = '';
         if (Validator::Length($username, 16, 2) == false) {
@@ -320,6 +325,7 @@ switch ($action) {
             $d->email = $email;
             $d->address = $address;
             $d->phonenumber = $phonenumber;
+            $d->service_type = $service_type;
             $d->save();
             if ($userDiff || $pppoeDiff || $passDiff) {
                 $c = ORM::for_table('tbl_user_recharges')->where('username', ($userDiff) ? $oldusername : $username)->find_one();

system/controllers/dashboard.php

@@ -52,7 +52,24 @@ if (empty($c_all)) {
 $ui->assign('c_all', $c_all);
 
 //user expire
-$expire = ORM::for_table('tbl_user_recharges')->whereLte('expiration', $mdate)->order_by_desc('id')->limit(30)->find_many();
+$paginator = Paginator::build(ORM::for_table('tbl_user_recharges'));
+$expire = ORM::for_table('tbl_user_recharges')
+    ->where_lte('expiration', $mdate)
+    ->offset($paginator['startpoint'])
+    ->limit($paginator['limit'])
+    ->order_by_desc('expiration')
+    ->find_many();
+
+// Get the total count of expired records for pagination
+$totalCount = ORM::for_table('tbl_user_recharges')
+    ->where_lte('expiration', $mdate)
+    ->count();
+
+// Pass the total count and current page to the paginator
+$paginator['total_count'] = $totalCount;
+
+// Assign the pagination HTML to the template variable
+$ui->assign('paginator', $paginator);
 $ui->assign('expire', $expire);
 
 //activity log

system/controllers/home.php

@@ -90,29 +90,35 @@ if (_post('send') == 'balance') {
 
 $ui->assign('_bills', User::_billing());
 
-if(isset($_GET['recharge']) && !empty($_GET['recharge'])){
+if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
     $bill = ORM::for_table('tbl_user_recharges')->where('id', $_GET['recharge'])->where('username', $user['username'])->findOne();
     if ($bill) {
         $router = ORM::for_table('tbl_routers')->where('name', $bill['routers'])->find_one();
         if ($config['enable_balance'] == 'yes') {
             $plan = ORM::for_table('tbl_plans')->find_one($bill['plan_id']);
-            if($user['balance']>$plan['price']){
+            if(!$plan['enabled']){
+                r2(U . "home", 'e', 'Plan is not exists');
+            }
+            if($plan['allow_purchase'] != 'yes'){
+                r2(U . "home", 'e', 'Cannot recharge this plan');
+            }
+            if ($user['balance'] > $plan['price']) {
                 r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
-            }else{
+            } else {
                 r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
             }
-        }else{
+        } else {
             r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
         }
     }
-}else if(isset($_GET['deactivate']) && !empty($_GET['deactivate'])){
+} else if (isset($_GET['deactivate']) && !empty($_GET['deactivate'])) {
     $bill = ORM::for_table('tbl_user_recharges')->where('id', $_GET['deactivate'])->where('username', $user['username'])->findOne();
     if ($bill) {
         $p = ORM::for_table('tbl_plans')->where('id', $bill['plan_id'])->find_one();
-        if($p['is_radius']){
+        if ($p['is_radius']) {
             Radius::customerDeactivate($user['username']);
-        }else{
-            try{
+        } else {
+            try {
                 $mikrotik = Mikrotik::info($bill['routers']);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 if ($bill['type'] == 'Hotspot') {
@@ -122,7 +128,7 @@ if(isset($_GET['recharge']) && !empty($_GET['recharge'])){
                     Mikrotik::removePpoeUser($client, $bill['username']);
                     Mikrotik::removePpoeActive($client, $bill['username']);
                 }
-            }catch(Exception $e){
+            } catch (Exception $e) {
                 //ignore it maybe mikrotik has been deleted
             }
         }
@@ -130,10 +136,10 @@ if(isset($_GET['recharge']) && !empty($_GET['recharge'])){
         $bill->expiration = date('Y-m-d');
         $bill->time = date('H:i:s');
         $bill->save();
-        _log('User ' . $bill['username'] . ' Deactivate '.$bill['namebp'], 'User', $bill['customer_id']);
-        Message::sendTelegram('User u' . $bill['username'] . ' Deactivate '.$bill['namebp']);
-        r2(U . 'home', 's', 'Success deactivate '.$bill['namebp']);
-    }else{
+        _log('User ' . $bill['username'] . ' Deactivate ' . $bill['namebp'], 'User', $bill['customer_id']);
+        Message::sendTelegram('User u' . $bill['username'] . ' Deactivate ' . $bill['namebp']);
+        r2(U . 'home', 's', 'Success deactivate ' . $bill['namebp']);
+    } else {
         r2(U . 'home', 'e', 'No Active Plan');
     }
 }

system/controllers/login.php

@@ -42,8 +42,117 @@ switch ($do) {
 
         break;
 
+    case 'activation':
+        $voucher = _post('voucher');
+        $username = _post('username');
+        $v1 = ORM::for_table('tbl_voucher')->where('code', $voucher)->find_one();
+        if ($v1) {
+            // voucher exists, check customer exists or not
+            $user = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
+            if (!$user) {
+                $d = ORM::for_table('tbl_customers')->create();
+                $d->username = alphanumeric($username, "+_.");
+                $d->password = $voucher;
+                $d->fullname = '';
+                $d->address = '';
+                $d->email = '';
+                $d->phonenumber = (strlen($username) < 21) ? $username : '';
+                if ($d->save()) {
+                    $user = ORM::for_table('tbl_customers')->where('username', $username)->find_one($d->id());
+                    if (!$user) {
+                        r2(U . 'login', 'e', Lang::T('Voucher activation failed'));
+                    }
+                } else {
+                    r2(U . 'login', 'e', Lang::T('Voucher activation failed') . '.');
+                }
+            }
+            if ($v1['status'] == 0) {
+                $oldPass = $user['password'];
+                // change customer password to voucher code
+                $user->password = $voucher;
+                $user->save();
+                // voucher activation
+                if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Voucher", $voucher)) {
+                    $v1->status = "1";
+                    $v1->user = $user['username'];
+                    $v1->save();
+                    $user->last_login = date('Y-m-d H:i:s');
+                    $user->save();
+                    // add customer to mikrotik
+                    if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
+                        try {
+                            $m = Mikrotik::info($v1['routers']);
+                            $c = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
+                            Mikrotik::logMeIn($c, $user['username'], $user['password'], $_SESSION['nux-ip'], $_SESSION['nux-mac']);
+                            if (!empty($config['voucher_redirect'])) {
+                                r2($config['voucher_redirect'], 's', Lang::T("Voucher activation success, you are connected to internet"));
+                            } else {
+                                r2(U . "login", 's', Lang::T("Voucher activation success, you are connected to internet"));
+                            }
+                        } catch (Exception $e) {
+                            if (!empty($config['voucher_redirect'])) {
+                                r2($config['voucher_redirect'], 's', Lang::T("Voucher activation success, now you can login"));
+                            } else {
+                                r2(U . "login", 's', Lang::T("Voucher activation success, now you can login"));
+                            }
+                        }
+                    }
+                    if (!empty($config['voucher_redirect'])) {
+                        r2($config['voucher_redirect'], 's', Lang::T("Voucher activation success, now you can login"));
+                    } else {
+                        r2(U . "login", 's', Lang::T("Voucher activation success, now you can login"));
+                    }
+                } else {
+                    // if failed to recharge, restore old password
+                    $user->password = $oldPass;
+                    $user->save();
+                    r2(U . 'login', 'e', Lang::T("Failed to activate voucher"));
+                }
+            } else {
+                // used voucher
+                // check if voucher used by this username
+                if ($v1['user'] == $user['username']) {
+                    $user->last_login = date('Y-m-d H:i:s');
+                    $user->save();
+                    if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
+                        try {
+                            $m = Mikrotik::info($v1['routers']);
+                            $c = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
+                            Mikrotik::logMeIn($c, $user['username'], $user['password'], $_SESSION['nux-ip'], $_SESSION['nux-mac']);
+                            if (!empty($config['voucher_redirect'])) {
+                                r2($config['voucher_redirect'], 's', Lang::T("Voucher activation success, you are connected to internet"));
+                            } else {
+                                r2(U . "login", 's', Lang::T("Voucher activation success, now you can login"));
+                            }
+                        } catch (Exception $e) {
+                            if (!empty($config['voucher_redirect'])) {
+                                r2($config['voucher_redirect'], 's', Lang::T("Voucher activation success, now you can login"));
+                            } else {
+                                r2(U . "login", 's', Lang::T("Voucher activation success, now you can login"));
+                            }
+                        }
+                    } else {
+                        if (!empty($config['voucher_redirect'])) {
+                            r2($config['voucher_redirect'], 's', Lang::T("Voucher activation success, you are connected to internet"));
+                        } else {
+                            r2(U . "login", 's', Lang::T("Voucher activation success, now you can login"));
+                        }
+                    }
+                } else {
+                    // voucher used by other customer
+                    r2(U . 'login', 'e', $_L['Voucher_Not_Valid']);
+                }
+            }
+        } else {
+            _msglog('e', $_L['Invalid_Username_or_Password']);
+            r2(U . 'login');
+        }
     default:
         run_hook('customer_view_login'); #HOOK
-        $ui->display('user-login.tpl');
+        if ($config['disable_registration'] == 'yes') {
+            $ui->display('user-login-noreg.tpl');
+        } else {
+            $ui->display('user-login.tpl');
+        }
         break;
 }

system/controllers/logs.php

@@ -23,7 +23,7 @@ switch ($action) {
         $q = (_post('q') ? _post('q') : _get('q'));
         $keep = _post('keep');
         if (!empty($keep)) {
-            ORM::raw_execute("DELETE FROM tbl_logs WHERE date < UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL $keep DAY))");
+            ORM::raw_execute("DELETE FROM tbl_logs WHERE UNIX_TIMESTAMP(date) < UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL $keep DAY))");
             r2(U . "logs/list/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {

system/controllers/order.php

@@ -37,7 +37,7 @@ switch ($action) {
             }
             $ui->assign('_title', 'Top Up');
             $ui->assign('_system_menu', 'balance');
-            $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->find_many();
+            $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->where('allow_purchase', 'yes')->find_many();
             $ui->assign('plans_balance', $plans_balance);
             $ui->display('user-orderBalance.tpl');
             break;
@@ -49,24 +49,24 @@ switch ($action) {
             $ui->assign('_system_menu', 'package');
             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')->find_many();
-                    $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->find_many();
+                    $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
+                    $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('allow_purchase', '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')->find_many();
-                    $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'Hotspot')->find_many();
+                    $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'PPPOE')->where('allow_purchase', '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('allow_purchase', 'yes')->find_many();
                 }
             } else {
-                $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->find_many();
-                $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->find_many();
+                $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
+                $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('allow_purchase', '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')->find_many();
-                $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->find_many();
+                $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
+                $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->where('allow_purchase', 'yes')->find_many();
             }
             $ui->assign('routers', $routers);
             $ui->assign('radius_pppoe', $radius_pppoe);
@@ -149,6 +149,12 @@ switch ($action) {
         if (empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
+        if(!$plan['enabled']){
+            r2(U . "home", 'e', 'Plan is not exists');
+        }
+        if($plan['allow_purchase'] != 'yes'){
+            r2(U . "home", 'e', 'Cannot recharge this plan');
+        }
         if ($routes['2'] == 'radius') {
             $router_name = 'radius';
         } else {
@@ -166,7 +172,7 @@ switch ($action) {
                     "\nPrice: " . $p['price']);
             }
         } else {
-            echo "no renewall | plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
+            r2(U . "home", 'e', 'Plan is not exists');
         }
         break;
     case 'send':
@@ -179,6 +185,12 @@ switch ($action) {
         if (empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
+        if(!$plan['enabled']){
+            r2(U . "home", 'e', 'Plan is not exists');
+        }
+        if($plan['allow_purchase'] != 'yes'){
+            r2(U . "home", 'e', 'Cannot recharge this plan');
+        }
         if ($routes['2'] == 'radius') {
             $router_name = 'radius';
         } else {
@@ -277,7 +289,7 @@ switch ($action) {
             $router['id'] = 0;
             $router['name'] = 'balance';
         }
-        $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
+        $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->where('allow_purchase', 'yes')->find_one($routes['3']);
         if (empty($router) || empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }

system/controllers/pool.php

@@ -68,6 +68,8 @@ switch ($action) {
                     Mikrotik::removePool($client, $d['pool_name']);
                 } catch (Exception $e) {
                     //ignore exception, it means router has already deleted
+                } catch(Throwable $e){
+                    //ignore exception, it means router has already deleted
                 }
             }
             $d->delete();

system/controllers/prepaid.php

@@ -159,7 +159,7 @@ switch ($action) {
     case 'print':
         $id = _post('id');
         $d = ORM::for_table('tbl_transactions')->where('id', $id)->find_one();
-        $ui->assign('d', $d);
+        $ui->assign('in', $d);
 
         $ui->assign('date', Lang::dateAndTimeFormat($d['recharged_on'], $d['recharged_time']));
         run_hook('print_invoice'); #HOOK
@@ -219,7 +219,7 @@ switch ($action) {
         } else {
             $msg .= $_L['Data_Not_Found'] . '<br>';
         }
-        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+        $p = ORM::for_table('tbl_plans')->where('id', $id_plan)->where('enabled', '1')->find_one();
         if ($d) {
         } else {
             $msg .= ' Plan Not Found<br>';
@@ -231,7 +231,11 @@ switch ($action) {
             //$d->recharged_on = $recharged_on;
             $d->expiration = $expiration;
             $d->time = $time;
-            $d->routers = $p['routers'];
+            if($p['is_radius']){
+                $d->routers = 'radius';
+            }else{
+                $d->routers = $p['routers'];
+            }
             $d->save();
             Package::changeTo($username, $id_plan, $id);
             _log('[' . $admin['username'] . ']: ' . 'Edit Plan for Customer ' . $d['username'] . ' to [' . $d['plan_name'] . '][' . Lang::moneyFormat($d['price']) . ']', 'Admin', $admin['id']);
@@ -243,7 +247,7 @@ switch ($action) {
 
     case 'voucher':
         $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/voucher.js"></script>');
-
+        $ui->assign('_title', $_L['Prepaid_Vouchers']);
         $code = _post('code');
         if ($code != '') {
             $ui->assign('code', $code);
@@ -270,7 +274,7 @@ switch ($action) {
         break;
 
     case 'add-voucher':
-
+        $ui->assign('_title', $_L['Add_Voucher']);
         $c = ORM::for_table('tbl_customers')->find_many();
         $ui->assign('c', $c);
         $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many();
@@ -281,6 +285,18 @@ switch ($action) {
         $ui->display('voucher-add.tpl');
         break;
 
+    case 'remove-voucher':
+        $d = ORM::for_table('tbl_voucher')->where_equal('status', '1')->findMany();
+        if ($d) {
+            $jml = 0;
+            foreach ($d as $v) {
+                if(!ORM::for_table('tbl_user_recharges')->where_equal("method",'Voucher - '.$v['code'])->findOne()){
+                    $v->delete();
+                    $jml++;
+                }
+            }
+            r2(U . 'prepaid/voucher', 's', "$jml ".$_L['Delete_Successfully']);
+        }
     case 'print-voucher':
         $from_id = _post('from_id');
         $planid = _post('planid');
@@ -383,6 +399,8 @@ switch ($action) {
     case 'voucher-post':
         $type = _post('type');
         $plan = _post('plan');
+        $voucher_format = _post('voucher_format');
+        $prefix = _post('prefix');
         $server = _post('server');
         $numbervoucher = _post('numbervoucher');
         $lengthcode = _post('lengthcode');
@@ -398,19 +416,31 @@ switch ($action) {
             $msg .= 'The Length Code must be a number' . '<br>';
         }
         if ($msg == '') {
+            if(!empty($prefix)){
+                $d = ORM::for_table('tbl_appconfig')->where('setting', 'voucher_prefix')->find_one();
+                if ($d) {
+                    $d->value = $prefix;
+                    $d->save();
+                } else {
+                    $d = ORM::for_table('tbl_appconfig')->create();
+                    $d->setting = 'voucher_prefix';
+                    $d->value = $prefix;
+                    $d->save();
+                }
+            }
             run_hook('create_voucher'); #HOOK
             for ($i = 0; $i < $numbervoucher; $i++) {
                 $code = strtoupper(substr(md5(time() . rand(10000, 99999)), 0, $lengthcode));
-                if ($config['voucher_format'] == 'low') {
+                if ($voucher_format == 'low') {
                     $code = strtolower($code);
-                } else if ($config['voucher_format'] == 'rand') {
+                } else if ($voucher_format == 'rand') {
                     $code = Lang::randomUpLowCase($code);
                 }
                 $d = ORM::for_table('tbl_voucher')->create();
                 $d->type = $type;
                 $d->routers = $server;
                 $d->id_plan = $plan;
-                $d->code = $code;
+                $d->code = $prefix.$code;
                 $d->user = '0';
                 $d->status = '0';
                 $d->save();
@@ -447,7 +477,7 @@ switch ($action) {
 
         run_hook('refill_customer'); #HOOK
         if ($v1) {
-            if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Refill", "Voucher")) {
+            if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Voucher", $code)) {
                 $v1->status = "1";
                 $v1->user = $user['username'];
                 $v1->save();

system/controllers/services.php

@@ -173,6 +173,8 @@ switch ($action) {
                     Mikrotik::removeHotspotPlan($client, $d['name_plan']);
                 } catch (Exception $e) {
                     //ignore exception, it means router has already deleted
+                } catch(Throwable $e){
+                    //ignore exception, it means router has already deleted
                 }
             }
 
@@ -199,6 +201,7 @@ switch ($action) {
         $routers = _post('routers');
         $pool_expired = _post('pool_expired');
         $enabled = _post('enabled');
+        $allow_purchase = _post('allow_purchase');
 
         $msg = '';
         if (Validator::UnsignedNumber($validity) == false) {
@@ -264,6 +267,7 @@ switch ($action) {
                 $d->pool_expired = $pool_expired;
             }
             $d->enabled = $enabled;
+            $d->allow_purchase = $allow_purchase;
             $d->save();
             $plan_id = $d->id();
 
@@ -302,6 +306,7 @@ switch ($action) {
         $validity_unit = _post('validity_unit');
         $pool_expired = _post('pool_expired');
         $enabled = _post('enabled');
+        $allow_purchase = _post('allow_purchase');
         $routers = _post('routers');
         $msg = '';
         if (Validator::UnsignedNumber($validity) == false) {
@@ -363,6 +368,7 @@ switch ($action) {
             $d->shared_users = $sharedusers;
             $d->pool_expired = $pool_expired;
             $d->enabled = $enabled;
+            $d->allow_purchase = $allow_purchase;
             $d->save();
 
             r2(U . 'services/hotspot', 's', $_L['Updated_Successfully']);
@@ -437,6 +443,8 @@ switch ($action) {
                     Mikrotik::removePpoePlan($client, $d['name_plan']);
                 } catch (Exception $e) {
                     //ignore exception, it means router has already deleted
+                } catch(Throwable $e){
+                    //ignore exception, it means router has already deleted
                 }
             }
             $d->delete();
@@ -456,6 +464,8 @@ switch ($action) {
         $pool = _post('pool_name');
         $pool_expired = _post('pool_expired');
         $enabled = _post('enabled');
+        $allow_purchase = _post('allow_purchase');
+
 
         $msg = '';
         if (Validator::UnsignedNumber($validity) == false) {
@@ -514,6 +524,7 @@ switch ($action) {
                 $d->pool_expired = $pool_expired;
             }
             $d->enabled = $enabled;
+            $d->allow_purchase = $allow_purchase;
             $d->save();
             $plan_id = $d->id();
 
@@ -545,6 +556,7 @@ switch ($action) {
         $pool = _post('pool_name');
         $pool_expired = _post('pool_expired');
         $enabled = _post('enabled');
+        $allow_purchase = _post('allow_purchase');
 
         $msg = '';
         if (Validator::UnsignedNumber($validity) == false) {
@@ -602,6 +614,7 @@ switch ($action) {
             $d->pool = $pool;
             $d->pool_expired = $pool_expired;
             $d->enabled = $enabled;
+            $d->allow_purchase = $allow_purchase;
             $d->save();
 
             r2(U . 'services/pppoe', 's', $_L['Updated_Successfully']);
@@ -653,6 +666,7 @@ switch ($action) {
         $name = _post('name');
         $price = _post('price');
         $enabled = _post('enabled');
+        $allow_purchase = _post('allow_purchase');
 
         $msg = '';
         if (Validator::UnsignedNumber($price) == false) {
@@ -672,6 +686,7 @@ switch ($action) {
             $d->name_plan = $name;
             $d->price = $price;
             $d->enabled = $enabled;
+            $d->allow_purchase = $allow_purchase;
             $d->save();
 
             r2(U . 'services/balance', 's', $_L['Updated_Successfully']);
@@ -683,6 +698,7 @@ switch ($action) {
         $name = _post('name');
         $price = _post('price');
         $enabled = _post('enabled');
+        $allow_purchase = _post('allow_purchase');
 
         $msg = '';
         if (Validator::UnsignedNumber($price) == false) {
@@ -708,6 +724,7 @@ switch ($action) {
             $d->routers = '';
             $d->pool = '';
             $d->enabled = $enabled;
+            $d->allow_purchase = $allow_purchase;
             $d->save();
 
             r2(U . 'services/balance', 's', $_L['Created_Successfully']);

system/controllers/settings.php

@@ -38,8 +38,14 @@ switch ($action) {
                 $themes[] = $file;
             }
         }
-        $php = trim(shell_exec('which php'));
-        if (empty($php)) {
+        $r = ORM::for_table('tbl_routers')->find_many();
+        $ui->assign('r', $r);
+        if (function_exists("shell_exec")) {
+            $php = trim(shell_exec('which php'));
+            if (empty($php)) {
+                $php = 'php';
+            }
+        } else {
             $php = 'php';
         }
         $ui->assign('php', $php);
@@ -237,27 +243,7 @@ switch ($action) {
         break;
 
     case 'app-post':
-        $company = _post('company');
-        $footer = _post('footer');
-        $enable_balance = _post('enable_balance');
-        $allow_balance_transfer = _post('allow_balance_transfer');
-        $disable_voucher = _post('disable_voucher');
-        $telegram_bot = _post('telegram_bot');
-        $telegram_target_id = _post('telegram_target_id');
-        $sms_url = _post('sms_url');
-        $wa_url = _post('wa_url');
-        $minimum_transfer = _post('minimum_transfer');
-        $user_notification_expired = _post('user_notification_expired');
-        $user_notification_reminder = _post('user_notification_reminder');
-        $user_notification_payment = _post('user_notification_payment');
-        $address = _post('address');
-        $tawkto = _post('tawkto');
-        $http_proxy = _post('http_proxy');
-        $http_proxyauth = _post('http_proxyauth');
-        $radius_enable = _post('radius_enable');
-        $radius_client = _post('radius_client');
-        $theme = _post('theme');
-        $voucher_format = _post('voucher_format');
+        $company = _post('CompanyName');
         run_hook('save_settings'); #HOOK
 
 
@@ -273,210 +259,9 @@ switch ($action) {
         if ($company == '') {
             r2(U . 'settings/app', 'e', $_L['All_field_is_required']);
         } else {
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'CompanyName')->find_one();
-            $d->value = $company;
-            $d->save();
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'address')->find_one();
-            $d->value = $address;
-            $d->save();
-
-            $phone = _post('phone');
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'phone')->find_one();
-            $d->value = $phone;
-            $d->save();
-
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'http_proxy')->find_one();
-            if ($d) {
-                $d->value = $http_proxy;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'http_proxy';
-                $d->value = $http_proxy;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'http_proxyauth')->find_one();
-            if ($d) {
-                $d->value = $http_proxyauth;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'http_proxyauth';
-                $d->value = $http_proxyauth;
-                $d->save();
-            }
-
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'theme')->find_one();
-            if ($d) {
-                $d->value = $theme;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'theme';
-                $d->value = $theme;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'CompanyFooter')->find_one();
-            if ($d) {
-                $d->value = $footer;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'CompanyFooter';
-                $d->value = $footer;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'voucher_format')->find_one();
-            if ($d) {
-                $d->value = $voucher_format;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'voucher_format';
-                $d->value = $voucher_format;
-                $d->save();
-            }
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'disable_voucher')->find_one();
-            if ($d) {
-                $d->value = $disable_voucher;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'disable_voucher';
-                $d->value = $disable_voucher;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'enable_balance')->find_one();
-            if ($d) {
-                $d->value = $enable_balance;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'enable_balance';
-                $d->value = $enable_balance;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'allow_balance_transfer')->find_one();
-            if ($d) {
-                $d->value = $allow_balance_transfer;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'allow_balance_transfer';
-                $d->value = $allow_balance_transfer;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'minimum_transfer')->find_one();
-            if ($d) {
-                $d->value = $minimum_transfer;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'minimum_transfer';
-                $d->value = $minimum_transfer;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'telegram_bot')->find_one();
-            if ($d) {
-                $d->value = $telegram_bot;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'telegram_bot';
-                $d->value = $telegram_bot;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'telegram_target_id')->find_one();
-            if ($d) {
-                $d->value = $telegram_target_id;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'telegram_target_id';
-                $d->value = $telegram_target_id;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'sms_url')->find_one();
-            if ($d) {
-                $d->value = $sms_url;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'sms_url';
-                $d->value = $sms_url;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'wa_url')->find_one();
-            if ($d) {
-                $d->value = $wa_url;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'wa_url';
-                $d->value = $wa_url;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'user_notification_expired')->find_one();
-            if ($d) {
-                $d->value = $user_notification_expired;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'user_notification_expired';
-                $d->value = $user_notification_expired;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'user_notification_reminder')->find_one();
-            if ($d) {
-                $d->value = $user_notification_reminder;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'user_notification_reminder';
-                $d->value = $user_notification_reminder;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'user_notification_payment')->find_one();
-            if ($d) {
-                $d->value = $user_notification_payment;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'user_notification_payment';
-                $d->value = $user_notification_payment;
-                $d->save();
-            }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'tawkto')->find_one();
-            if ($d) {
-                $d->value = $tawkto;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'tawkto';
-                $d->value = $tawkto;
-                $d->save();
-            }
-
             if ($radius_enable) {
                 try {
-                    Radius::getTableNas()->find_one(1);
+                    Radius::getTableNas()->find_many();
                 } catch (Exception $e) {
                     $ui->assign("error_title", "RADIUS Error");
                     $ui->assign("error_message", "Radius table not found.<br><br>" .
@@ -486,34 +271,20 @@ switch ($action) {
                     die();
                 }
             }
-
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'radius_enable')->find_one();
-            if ($d) {
-                $d->value = $radius_enable;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'radius_enable';
-                $d->value = $radius_enable;
-                $d->save();
+            // save all settings
+            foreach($_POST as $key => $value) {
+                $d = ORM::for_table('tbl_appconfig')->where('setting', $key)->find_one();
+                if ($d) {
+                    $d->value = $value;
+                    $d->save();
+                } else {
+                    $d = ORM::for_table('tbl_appconfig')->create();
+                    $d->setting = $key;
+                    $d->value = $value;
+                    $d->save();
+                }
             }
 
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'radius_client')->find_one();
-            if ($d) {
-                $d->value = $radius_client;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'radius_client';
-                $d->value = $radius_client;
-                $d->save();
-            }
-
-            $note = _post('note');
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'note')->find_one();
-            $d->value = $note;
-            $d->save();
-
             _log('[' . $admin['username'] . ']: ' . $_L['Settings_Saved_Successfully'], 'Admin', $admin['id']);
 
             r2(U . 'settings/app', 's', $_L['Settings_Saved_Successfully']);

system/controllers/voucher.php

@@ -11,8 +11,6 @@ $action = $routes['1'];
 $user = User::_info();
 $ui->assign('_user', $user);
 
-use PEAR2\Net\RouterOS;
-
 require_once 'system/autoload/PEAR2/Autoload.php';
 
 switch ($action) {
@@ -27,7 +25,7 @@ switch ($action) {
         $v1 = ORM::for_table('tbl_voucher')->where('code', $code)->where('status', 0)->find_one();
         run_hook('customer_activate_voucher'); #HOOK
         if ($v1) {
-            if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Activation", "Voucher")) {
+            if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Voucher", $code)) {
                 $v1->status = "1";
                 $v1->user = $user['username'];
                 $v1->save();

system/cron.php

@@ -35,16 +35,16 @@ if (php_sapi_name() !== 'cli') {
     echo "<pre>";
 }
 
-if(!file_exists('../config.php')){
+if (!file_exists('../config.php')) {
     die("config.php file not found");
 }
 
 
-if(!file_exists('orm.php')){
+if (!file_exists('orm.php')) {
     die("orm.php file not found");
 }
 
-if(!file_exists('uploads/notifications.default.json')){
+if (!file_exists('uploads/notifications.default.json')) {
     die("uploads/notifications.default.json file not found");
 }
 
@@ -68,7 +68,13 @@ $_notifmsg_default = json_decode(file_get_contents('uploads/notifications.defaul
 
 //register all plugin
 foreach (glob(File::pathFixer("plugin/*.php")) as $filename) {
-    include $filename;
+    try{
+        include $filename;
+    } catch(Throwable $e){
+        //ignore plugin error
+    }catch(Exception $e){
+        //ignore plugin error
+    }
 }
 
 $result = ORM::for_table('tbl_appconfig')->find_many();
@@ -111,9 +117,9 @@ foreach ($d as $ds) {
             echo " : EXPIRED \r\n";
             $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
             $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
-            $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one();
+            $m = Mikrotik::info($ds['routers']);
             $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-
+            $price = Lang::moneyFormat($p['price']);
             if ($p['is_radius']) {
                 if (empty($p['pool_expired'])) {
                     print_r(Radius::customerDeactivate($c['username']));
@@ -130,14 +136,14 @@ foreach ($d as $ds) {
                 }
                 Mikrotik::removeHotspotActiveUser($client, $c['username']);
             }
-            Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $textExpired, $config['user_notification_expired']);
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
             //update database user dengan status off
             $u->status = 'off';
             $u->save();
 
             // autorenewal from deposit
             if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
+                if ($p && $p['enabled'] && $c['balance'] >= $p['price'] && $p['allow_purchase'] == 'yes') {
                     if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
                         // if success, then get the balance
                         Balance::min($ds['customer_id'], $p['price']);
@@ -156,7 +162,8 @@ foreach ($d as $ds) {
             } else {
                 echo "no renewall | balance $config[enable_balance] auto_renewal $c[auto_renewal]\n";
             }
-        } else echo " : ACTIVE \r\n";
+        } else
+            echo " : ACTIVE \r\n";
     } else {
         $date_now = strtotime(date("Y-m-d H:i:s"));
         $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
@@ -167,7 +174,7 @@ foreach ($d as $ds) {
             $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
             $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one();
             $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-
+            $price = Lang::moneyFormat($p['price']);
             if ($p['is_radius']) {
                 if (empty($p['pool_expired'])) {
                     print_r(Radius::customerDeactivate($c['username']));
@@ -184,14 +191,14 @@ foreach ($d as $ds) {
                 }
                 Mikrotik::removePpoeActive($client, $c['username']);
             }
-            Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $textExpired, $config['user_notification_expired']);
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
 
             $u->status = 'off';
             $u->save();
 
             // autorenewal from deposit
             if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
+                if ($p && $p['enabled'] && $c['balance'] >= $p['price'] && $p['allow_purchase'] == 'yes') {
                     if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
                         // if success, then get the balance
                         Balance::min($ds['customer_id'], $p['price']);
@@ -206,6 +213,7 @@ foreach ($d as $ds) {
                     }
                 }
             }
-        } else echo " : ACTIVE \r\n";
+        } else
+            echo " : ACTIVE \r\n";
     }
 }

system/cron_reminder.php

@@ -67,7 +67,13 @@ $_notifmsg_default = json_decode(file_get_contents('uploads/notifications.defaul
 
 //register all plugin
 foreach (glob(File::pathFixer("plugin/*.php")) as $filename) {
-    include $filename;
+    try{
+        include $filename;
+    } catch(Throwable $e){
+        //ignore plugin error
+    }catch(Exception $e){
+        //ignore plugin error
+    }
 }
 
 $result = ORM::for_table('tbl_appconfig')->find_many();
@@ -98,13 +104,15 @@ print_r([$day1, $day3, $day7]);
 foreach ($d as $ds) {
     if (in_array($ds['expiration'], [$day1, $day3, $day7])) {
         $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
+        $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
         $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
+        $price = Lang::moneyFormat($p['price']);
         if ($ds['expiration'] == $day7) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
         } else if ($ds['expiration'] == $day3) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
         } else if ($ds['expiration'] == $day1) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
         }
     }
 }

system/lan/english/common.lan.php

@@ -3,8 +3,6 @@
 -----------------------------------
 Language Name: English
 Contributor: Ismail Marzuqi
-Web: www.phpnuxbill.com
-Email: iesien22@yahoo.com
 
 2017
 Contributor: Ibnu Maksum (@ibnux)
@@ -261,7 +259,6 @@ $_L['Plan_Not_found'] = 'Plan Not found';
 $_L['Failed_to_create_transaction'] = 'Failed to create transaction.';
 $_L['Seller_has_not_yet_setup_Xendit_payment_gateway'] = 'Seller has not yet setup Xendit payment gateway';
 $_L['Admin_has_not_yet_setup_Xendit_payment_gateway_please_tell_admin'] = 'Admin has not yet setup Xendit payment gateway, please tell admin';
-$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
 $_L['You_already_have_unpaid_transaction_cancel_it_or_pay_it'] = 'You already have unpaid transaction, cancel it or pay it.';
 $_L['Transaction_Not_found'] = 'Transaction Not found';
 $_L['Cancel_it'] = 'Cancel it?';
@@ -314,7 +311,6 @@ $_L['User_Notification'] = 'User Notification';
 $_L['Expired_Notification'] = 'Expired Notification';
 $_L['User_will_get_notification_when_package_expired'] = 'User will get notification when package expired';
 $_L['Expired_Notification_Message'] = 'Expired Notification Message';
-$_L['bnameb_will_be_replaced_with_Customer_Name_bpackageb_will_be_replaced_with_Package_name'] = '<b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name.';
 $_L['Payment_Notification'] = 'Payment Notification';
 $_L['User_will_get_invoice_notification_when_buy_package_or_package_refilled'] = 'User will get invoice notification when buy package or package refilled';
 $_L['Current_IP'] = 'Current IP';
@@ -408,4 +404,17 @@ $_L['Change_title_in_user_Plan_order'] = 'Change title in user Plan order';
 $_L['Logs'] = 'Logs';
 $_L['Voucher_Format'] = 'Voucher Format';
 $_L['Resend_To_Customer'] = 'Resend To Customer';
-$_L['Your_friend_do_not_have_active_package'] = 'Your friend do not have active package';
+$_L['Your_friend_do_not_have_active_package'] = 'Your friend do not have active package';
+$_L['Service_Type'] = 'Service Type';
+$_L['Others'] = 'Others';
+$_L['PPPoE'] = 'PPPoE';
+$_L['Hotspot'] = 'Hotspot';
+$_L['Disable_Registration'] = 'Disable Registration';
+$_L['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';
+$_L['Login__Activate_Voucher'] = 'Login / Activate Voucher';
+$_L['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';
+$_L['Voucher_Prefix'] = 'Voucher Prefix';
+$_L['Voucher_activation_success_now_you_can_login'] = 'Voucher activation success, now you can login';
+$_L['Client_Can_Purchase'] = 'Client Can Purchase';
+$_L['Buy_this_your_active_package_will_be_overwritten'] = 'Buy this? your active package will be overwritten';
+$_L['Pay_this_with_Balance_your_active_package_will_be_overwritten'] = 'Pay this with Balance? your active package will be overwritten';

system/lan/indonesia/common.lan.php

@@ -3,9 +3,6 @@
 -----------------------------------
 Language Name: Indonesia
 Contributor: Ismail Marzuqi
-Web: www.phpnuxbill.com
-Email: iesien22@yahoo.com
-
 2017
 Contributor: Ibnu Maksum (@ibnux)
 
@@ -408,3 +405,7 @@ $_L['Change_title_in_user_Plan_order'] = 'Ubah judul dalam urutan paket pelangga
 $_L['Logs'] = 'Log';
 $_L['Voucher_Format'] = 'Format Voucher';
 $_L['Resend_To_Customer'] = 'Kirim Ulang Ke Pelanggan';
+$_L['Service_Type'] = 'Service Type';
+$_L['Others'] = 'Lainnya';
+$_L['PPPoE'] = 'PPPoE';
+$_L['Hotspot'] = 'Hotspot';

system/lan/spanish/common.lan.php

@@ -401,4 +401,8 @@ $_L['Deactivate'] = 'Deactivate';
 $_L['Sync'] = 'Sync';
 $_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
 $_L['Location'] = 'Location';
-$_L['Voucher_Format'] = 'Voucher Format';
+$_L['Voucher_Format'] = 'Voucher Format';
+$_L['Service_Type'] = 'Service Type';
+$_L['Others'] = 'Others';
+$_L['PPPoE'] = 'PPPoE';
+$_L['Hotspot'] = 'Hotspot';

system/lan/turkish/common.lan.php

@@ -378,4 +378,8 @@ $_L['Deactivate'] = 'Deactivate';
 $_L['Sync'] = 'Sync';
 $_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
 $_L['Location'] = 'Location';
-$_L['Voucher_Format'] = 'Voucher Format';
+$_L['Voucher_Format'] = 'Voucher Format';
+$_L['Service_Type'] = 'Service Type';
+$_L['Others'] = 'Others';
+$_L['PPPoE'] = 'PPPoE';
+$_L['Hotspot'] = 'Hotspot';

system/updates.json

@@ -35,5 +35,11 @@
     ],
     "2023.10.24" : [
         "ALTER TABLE `nas` ADD `routers` VARCHAR(32) NOT NULL DEFAULT '' AFTER `description`;"
+    ],
+    "2023.12.15": [
+        "ALTER TABLE `tbl_customers` ADD `service_type` ENUM('Hotspot','PPPoE','Others') DEFAULT 'Others' COMMENT 'For selecting user type' AFTER `balance`;"
+    ],
+	"2024.1.11": [
+        "ALTER TABLE `tbl_plans` ADD `allow_purchase` ENUM('yes','no') DEFAULT 'yes' COMMENT 'allow to show package in buy package page' AFTER `enabled`;"
     ]
 }

ui/ui/admin-login.tpl

@@ -7,10 +7,9 @@
     <title>{$_title} - {$_L['Login']}</title>
     <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
-    <!-- Css/Less Stylesheets -->
     <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
-
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
 
 </head>
 
@@ -37,9 +36,6 @@
             </form>
         </div>
     </div>
-    <script src="ui/ui/scripts/jquery.min.js"></script>
-    <script src="ui/ui/scripts/bootstrap.min.js"></script>
-    <script src="ui/ui/scripts/adminlte.min.js"></script>
 </body>
 
 </html>

ui/ui/app-notifications.tpl

@@ -21,7 +21,7 @@
                                 rows="3">{if $_json['expired']!=''}{Lang::htmlspecialchars($_json['expired'])}{else}Hello [[name]], your internet package [[package]] has been expired.{/if}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            {Lang::T('<b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name.')}
+                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
                         </p>
                     </div>
                 </div>
@@ -33,7 +33,7 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_7_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            {Lang::T('<b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name.')}
+                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
                         </p>
                     </div>
                 </div>
@@ -45,7 +45,7 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_3_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            {Lang::T('<b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name.')}
+                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
                         </p>
                     </div>
                 </div>
@@ -57,7 +57,7 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_1_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            {Lang::T('<b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name.')}
+                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
                         </p>
                     </div>
                 </div>

ui/ui/app-settings.tpl

@@ -15,7 +15,7 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['App_Name']}</label>
                         <div class="col-md-6">
-                            <input type="text" required class="form-control" id="company" name="company"
+                            <input type="text" required class="form-control" id="CompanyName" name="CompanyName"
                                 value="{$_c['CompanyName']}">
                         </div>
                         <span class="help-block col-md-4">{$_L['App_Name_Help_Text']}</span>
@@ -34,7 +34,7 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Company Footer')}</label>
                         <div class="col-md-6">
-                            <input type="text" required class="form-control" id="footer" name="footer"
+                            <input type="text" required class="form-control" id="CompanyFooter" name="CompanyFooter"
                                 value="{$_c['CompanyFooter']}">
                         </div>
                         <span class="help-block col-md-4">{Lang::T('Will show below user pages')}</span>
@@ -53,6 +53,14 @@
                             <input type="text" class="form-control" id="phone" name="phone" value="{$_c['phone']}">
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label"><i class="glyphicon glyphicon-print"></i> Print Max Char</label>
+                        <div class="col-md-6">
+                            <input type="number" required class="form-control" id="printer_cols" placeholder="37" name="printer_cols"
+                                value="{$_c['printer_cols']}">
+                        </div>
+                        <span class="help-block col-md-4">For invoice print using Thermal Printer</span>
+                    </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">Theme</label>
                         <div class="col-md-6">
@@ -113,6 +121,33 @@
                         </div>
                         <p class="help-block col-md-4">UPPERCASE lowercase RaNdoM</p>
                     </div>
+                    {if $_c['disable_voucher'] != 'yes'}
+                        <div class="form-group">
+                            <label class="col-md-2 control-label">{Lang::T('Disable Registration')}</label>
+                            <div class="col-md-6">
+                                <select name="disable_registration" id="disable_registration" class="form-control">
+                                    <option value="no" {if $_c['disable_registration'] == 'no'}selected="selected" {/if}>No
+                                    </option>
+                                    <option value="yes" {if $_c['disable_registration'] == 'yes'}selected="selected" {/if}>
+                                        Yes
+                                    </option>
+                                </select>
+                            </div>
+                            <p class="help-block col-md-4">
+                                {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be password')}
+                            </p>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-md-2 control-label">Redirect after Activation</label>
+                            <div class="col-md-6">
+                                <input type="text" class="form-control" id="voucher_redirect" name="voucher_redirect"
+                                    placeholder="https://192.168.88.1/status" value="{$voucher_redirect}">
+                            </div>
+                            <p class="help-block col-md-4">
+                                {Lang::T('After Customer activate voucher or login, customer will be redirected to this url')}
+                            </p>
+                        </div>
+                    {/if}
                 </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
@@ -198,7 +233,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">Telegram Target ID</label>
+                        <label class="col-md-2 control-label">Telegram User/Channel/Group ID</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" id="telegram_target_id" name="telegram_target_id"
                                 value="{$_c['telegram_target_id']}" placeholder="12345678">
@@ -225,6 +260,22 @@
                             replaced.
                         </p>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">Or use Mikrotik SMS</label>
+                        <div class="col-md-6">
+                            <select class="form-control"
+                                onchange="document.getElementById('sms_url').value = this.value">
+                                <option value="">Select Router</option>
+                                {foreach $r as $rs}
+                                    <option value="{$rs['name']}" {if $rs['name']==$_c['sms_url']}selected{/if}>
+                                        {$rs['name']}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">Must include <b>[text]</b> &amp; <b>[number]</b>, it will be
+                            replaced.
+                        </p>
+                    </div>
                     <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>

ui/ui/balance-add.tpl

@@ -17,6 +17,17 @@
                                     </label>
                                 </div>
                             </div>
+														<div class="form-group">
+																<label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
+																<div class="col-md-10">
+																		<label class="radio-inline warning">
+																				<input type="radio" checked name="allow_purchase" value="yes"> Yes
+																		</label>
+																		<label class="radio-inline">
+																				<input type="radio" name="allow_purchase" value="no"> No
+																		</label>
+																</div>
+														</div>
                             <div class="form-group">
                                 <label class="col-md-2 control-label">{$_L['Plan_Name']}</label>
                                 <div class="col-md-6">

ui/ui/balance-edit.tpl

@@ -18,6 +18,18 @@
                                     </label>
                                 </div>
                             </div>
+														<div class="form-group">
+				                        <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
+				                        <div class="col-md-10">
+				                            <label class="radio-inline warning">
+				                                <input type="radio" {if $d['allow_purchase'] == yes}checked{/if} name="allow_purchase" value="yes"> Yes
+				                            </label>
+				                            <label class="radio-inline">
+				                                <input type="radio" {if $d['allow_purchase'] == no}checked{/if} name="allow_purchase" value="no">
+				                                No
+				                            </label>
+				                        </div>
+				                    </div>
                             <div class="form-group">
                                 <label class="col-md-2 control-label">{$_L['Plan_Name']}</label>
                                 <div class="col-md-6">

ui/ui/community.tpl

@@ -1,5 +1,8 @@
 {include file="sections/header.tpl"}
 
+<center><a href="https://s.id/standwithpalestine" target="_blank"><img src="https://raw.githubusercontent.com/Safouene1/support-palestine-banner/master/banner-support.svg" class="img-responsive"></a></center>
+<br><br>
+
 <div class="row">
     <div class="col-sm-6">
         <div class="box box-hovered mb20 box-primary">

ui/ui/customers-add.tpl

@@ -72,6 +72,16 @@
                             <textarea name="address" id="address" class="form-control"></textarea>
                         </div>
                     </div>
+					<div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Service Type')}</label>
+                        <div class="col-md-6">
+						<select class="form-control" id="service_type" name="service_type">
+						<option value="Hotspot" {if $d['service_type'] eq 'Hotspot'}selected{/if}>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>
+						</select>
+						</div>
+                    </div>
 
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-10">

ui/ui/customers-edit.tpl

@@ -77,6 +77,16 @@
                             <textarea name="address" id="address" class="form-control">{$d['address']}</textarea>
                         </div>
                     </div>
+					<div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Service Type')}</label>
+                        <div class="col-md-6">
+						<select class="form-control" id="service_type" name="service_type">
+						<option value="Hotspot" {if $d['service_type'] eq 'Hotspot'}selected{/if}>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>
+						</select>
+						</div>
+                    </div>
 
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-10">

ui/ui/customers-view.tpl

@@ -37,6 +37,9 @@
                             onclick="this.select()">
                         </li>
                     {/if}
+					<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('Balance')}</b> <span class="pull-right">{Lang::moneyFormat($d['balance'])}</span>
                     </li>

ui/ui/customers.tpl

@@ -33,6 +33,7 @@
                                 <th>{$_L['Phone_Number']}</th>
                                 <th>{$_L['Email']}</th>
                                 <th>{$_L['Package']}</th>
+                                <th>{Lang::T('Service Type')}</th>
                                 <th>{$_L['Created_On']}</th>
                                 <th>{$_L['Manage']}</th>
                             </tr>
@@ -48,6 +49,7 @@
                                     <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;"

ui/ui/dashboard.tpl

@@ -119,6 +119,7 @@
                     {/foreach}
                 </table>
             </div>
+            &nbsp; {$paginator['contents']}
         </div>
     </div>
 
@@ -149,7 +150,9 @@
         $.getJSON("./version.json?" + Math.random(), function(data) {
             var localVersion = data.version;
             $('#version').html('Version: ' + localVersion);
-            $.getJSON("https://raw.githubusercontent.com/hotspotbilling/phpnuxbill/master/version.json?" + Math
+            $.getJSON(
+                "https://raw.githubusercontent.com/hotspotbilling/phpnuxbill/master/version.json?" +
+                Math
                 .random(),
                 function(data) {
                     var latestVersion = data.version;

ui/ui/hotspot-add.tpl

@@ -9,12 +9,15 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Status')}</label>
                         <div class="col-md-10">
-                            <label class="radio-inline warning">
-                                <input type="radio" checked name="enabled" value="1"> Enable
-                            </label>
-                            <label class="radio-inline">
-                                <input type="radio" name="enabled" value="0"> Disable
-                            </label>
+                            <input type="radio" name="enabled" value="1" checked> Enable
+                            <input type="radio" name="enabled" value="0"> Disable
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="allow_purchase" value="yes" checked> Yes
+                            <input type="radio" name="allow_purchase" value="no"> No
                         </div>
                     </div>
                     {if $_c['radius_enable']}
@@ -172,23 +175,22 @@
                 if (cek.checked) {
                     $("#routerChoose").addClass('hidden');
                     document.getElementById("routers").required = false;
+                    $("#pool_expired").html('');
+                    $.ajax({
+                        url: "index.php?_route=autoload/pool",
+                        data: "routers=radius",
+                        cache: false,
+                        success: function(msg) {
+                            $("#pool_expired").html(msg);
+                        }
+                    });
                 } else {
                     document.getElementById("routers").required = true;
                     $("#routerChoose").removeClass('hidden');
                 }
             }
-            setTimeout(() => {
-                $.ajax({
-                    url: "index.php?_route=autoload/pool",
-                    data: "routers=radius",
-                    cache: false,
-                    success: function(msg) {
-                        $("#pool_expired").html(msg);
-                    }
-                });
-            }, 2000);
         </script>
     {/literal}
 {/if}
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}

ui/ui/hotspot-edit.tpl

@@ -3,20 +3,22 @@
 <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">{$_L['Edit_Plan']}</div>
+            <div class="panel-heading">{$_L['Edit_Plan']} || {$d['name_plan']}</div>
             <div class="panel-body">
                 <form class="form-horizontal" method="post" role="form" action="{$_url}services/edit-post">
                     <input type="hidden" name="id" value="{$d['id']}">
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Status')}</label>
                         <div class="col-md-10">
-                            <label class="radio-inline warning">
-                                <input type="radio" {if $d['enabled'] == 1}checked{/if} name="enabled" value="1"> Enable
-                            </label>
-                            <label class="radio-inline">
-                                <input type="radio" {if $d['enabled'] == 0}checked{/if} name="enabled" value="0">
-                                Disable
-                            </label>
+                                <input type="radio" name="enabled" value="1" {if $d['enabled'] == 1}checked{/if}> Enable
+                                <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('Client Can Purchase')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="allow_purchase" value="yes" {if $d['allow_purchase'] == yes}checked{/if}> Yes
+                            <input type="radio" name="allow_purchase" value="no" {if $d['allow_purchase'] == no}checked{/if}> No
                         </div>
                     </div>
                     {if $_c['radius_enable'] and $d['is_radius']}
@@ -177,7 +179,7 @@
     </div>
 </div>
 
-{if $_c['radius_enable']}
+{if $_c['radius_enable'] && $d['is_radius']}
     {literal}
         <script>
             function isRadius(cek) {
@@ -204,4 +206,4 @@
         </script>
     {/literal}
 {/if}
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}

ui/ui/hotspot.tpl

@@ -49,7 +49,8 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled" {/if}>
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"
+                                {elseif $ds['allow_purchase'] != 'yes'}class="warning" title="Customer can't purchase" {/if}>
                                     <td>{$ds['name_plan']}</td>
                                     <td>{$ds['typebp']}</td>
                                     <td>{$ds['name_bw']}</td>

ui/ui/invoice-print.tpl

@@ -21,30 +21,27 @@
             <table width="200">
                 <tr>
                     <td>
-                        <fieldset>
-                            <center>
-                                <b>{$_c['CompanyName']}</b><br>
-                                {$_c['address']}<br>
-                                {$_c['phone']}<br>
-                            </center>
-                            ============================================<br>
-                            INVOICE: <b>{$d['invoice']}</b> - {$_L['Date']} : {$date}<br>
-                            {$_L['Sales']} : {$_admin['fullname']}<br>
-                            ============================================<br>
-                            {$_L['Type']} : <b>{$d['type']}</b><br>
-                            {$_L['Plan_Name']} : <b>{$d['plan_name']}</b><br>
-                            {$_L['Plan_Price']} : <b>{Lang::moneyFormat($d['price'])}</b><br>
-                            <br>
-                            {$_L['Username']} : <b>{$d['username']}</b><br>
-                            {$_L['Password']} : **********<br>
-                            {if $in['type'] != 'Balance'}
-                                <br>
-                                {$_L['Created_On']} : <b>{Lang::dateAndTimeFormat($d['recharged_on'],$d['recharged_time'])}</b><br>
-                                {$_L['Expires_On']} : <b>{Lang::dateAndTimeFormat($d['expiration'],$d['time'])}</b><br>
-                            {/if}
-                            ============================================<br>
-                            <center>{$_c['note']}</center>
-                        </fieldset>
+<pre style="border-style: none; background-color: white;"><b>{Lang::pad($_c['CompanyName'],' ', 2)}</b>
+{Lang::pad($_c['address'],' ', 2)}
+{Lang::pad($_c['phone'],' ', 2)}
+{Lang::pad("", '=')}
+{Lang::pads("Invoice", $in['invoice'], ' ')}
+{Lang::pads($_L['Date'], $date, ' ')}
+{Lang::pads($_L['Sales'], $_admin['fullname'], ' ')}
+{Lang::pad("", '=')}
+{Lang::pads($_L['Type'], $in['type'], ' ')}
+{Lang::pads($_L['Plan_Name'], $in['plan_name'], ' ')}
+{Lang::pads($_L['Plan_Price'], Lang::moneyFormat($in['price']), ' ')}
+{Lang::pad($in['method'], ' ', 2)}
+
+{Lang::pads($_L['Username'], $in['username'], ' ')}
+{Lang::pads($_L['Password'], '**********', ' ')}
+{if $in['type'] != 'Balance'}
+{Lang::pads($_L['Created_On'], Lang::dateAndTimeFormat($in['recharged_on'],$in['recharged_time']), ' ')}
+{Lang::pads($_L['Expires_On'], Lang::dateAndTimeFormat($in['expiration'],$in['time']), ' ')}
+{/if}
+{Lang::pad("", '=')}
+{Lang::pad($_c['note'],' ', 2)}</pre>
                     </td>
                 </tr>
             </table>

ui/ui/invoice.tpl

@@ -5,42 +5,36 @@
         <div class="panel panel-hovered panel-primary panel-stacked mb30">
             <div class="panel-heading">{$in['invoice']}</div>
             <div class="panel-body">
-                <div class="well">
-                    <fieldset>
-                        <center>
-                            <b>{$_c['CompanyName']}</b><br>
-                            {$_c['address']}<br>
-                            {$_c['phone']}<br>
-                        </center>
-                        ====================================================<br>
-                        INVOICE: <b>{$in['invoice']}</b> - {$_L['Date']} : {$date}<br>
-                        {$_L['Sales']} : {$_admin['fullname']}<br>
-                        ====================================================<br>
-                        {$_L['Type']} : <b>{$in['type']}</b><br>
-                        {$_L['Plan_Name']} : <b>{$in['plan_name']}</b><br>
-                        {$_L['Plan_Price']} : <b>{Lang::moneyFormat($in['price'])}</b><br>
-                        {$in['method']}<br>
-                        <br>
-                        {$_L['Username']} : <b>{$in['username']}</b><br>
-                        {$_L['Password']} : **********<br>
-                        {if $in['type'] != 'Balance'}
-                            <br>
-                            {$_L['Created_On']} : <b>{Lang::dateAndTimeFormat($in['recharged_on'],$in['recharged_time'])}</b><br>
-                            {$_L['Expires_On']} : <b>{Lang::dateAndTimeFormat($in['expiration'],$in['time'])}</b><br>
-                        {/if}
-                        =====================================================<br>
-                        <center>{$_c['note']}</center>
-                    </fieldset>
-                </div>
-                <form class="form-horizontal" method="post" action="{$_url}prepaid/print" target="_blank">
-                    <input type="hidden" name="id" value="{$in['id']}">
-                    <a href="{$_url}prepaid/list" class="btn btn-primary btn-sm"><i
-                            class="ion-reply-all"></i>{$_L['Finish']}</a>
-                    <a href="{$_url}prepaid/view/{$in['id']}/send" class="btn btn-info text-black btn-sm"><i
-                        class="glyphicon glyphicon-envelope"></i> {Lang::T("Resend To Customer")}</a>
-                    <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-print"></i>
-                        {$_L['Click_Here_to_Print']}</button>
-                </form>
+<pre><b>{Lang::pad($_c['CompanyName'],' ', 2)}</b>
+{Lang::pad($_c['address'],' ', 2)}
+{Lang::pad($_c['phone'],' ', 2)}
+{Lang::pad("", '=')}
+{Lang::pads("Invoice", $in['invoice'], ' ')}
+{Lang::pads($_L['Date'], $date, ' ')}
+{Lang::pads($_L['Sales'], $_admin['fullname'], ' ')}
+{Lang::pad("", '=')}
+{Lang::pads($_L['Type'], $in['type'], ' ')}
+{Lang::pads($_L['Plan_Name'], $in['plan_name'], ' ')}
+{Lang::pads($_L['Plan_Price'], Lang::moneyFormat($in['price']), ' ')}
+{Lang::pad($in['method'], ' ', 2)}
+
+{Lang::pads($_L['Username'], $in['username'], ' ')}
+{Lang::pads($_L['Password'], '**********', ' ')}
+{if $in['type'] != 'Balance'}
+{Lang::pads($_L['Created_On'], Lang::dateAndTimeFormat($in['recharged_on'],$in['recharged_time']), ' ')}
+{Lang::pads($_L['Expires_On'], Lang::dateAndTimeFormat($in['expiration'],$in['time']), ' ')}
+{/if}
+{Lang::pad("", '=')}
+{Lang::pad($_c['note'],' ', 2)}</pre>
+<form class="form-horizontal" method="post" action="{$_url}prepaid/print" target="_blank">
+    <input type="hidden" name="id" value="{$in['id']}">
+    <a href="{$_url}prepaid/list" class="btn btn-primary btn-sm"><i
+            class="ion-reply-all"></i>{$_L['Finish']}</a>
+    <a href="{$_url}prepaid/view/{$in['id']}/send" class="btn btn-info text-black btn-sm"><i
+        class="glyphicon glyphicon-envelope"></i> {Lang::T("Resend To Customer")}</a>
+    <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-print"></i>
+        {$_L['Click_Here_to_Print']}</button>
+</form>
 
             </div>
         </div>

ui/ui/logs.tpl

@@ -44,7 +44,7 @@
                                     <td>{Lang::dateTimeFormat($ds['date'])}</td>
                                     <td>{$ds['type']}</td>
                                     <td>{$ds['ip']}</td>
-                                    <td style="overflow-x: scroll;">{$ds['description']}</td>
+                                    <td style="overflow-x: scroll;">{nl2br($ds['description'])}</td>
                                 </tr>
                             {/foreach}
                         </tbody>

ui/ui/plugin-manager.tpl

@@ -39,7 +39,7 @@
                             <div class="box-header">
                                 <h3 class="box-title">{$pg['name']}</h3>
                             </div>
-                            <div class="box-body">{$pg['description']}<br><small><i>@{$plugin['author']} Last update: {$plugin['last_update']}</i></small></div>
+                            <div class="box-body">{$pg['description']}<br><small><i>@{$pg['author']} Last update: {$pg['last_update']}</i></small></div>
                             <div class="box-footer ">
                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
                                     <a href="{$pg['url']}" target="_blank"

ui/ui/pppoe-add.tpl

@@ -9,21 +9,22 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Status')}</label>
                         <div class="col-md-10">
-                            <label class="radio-inline warning">
-                                <input type="radio" checked name="enabled" value="1"> Enable
-                            </label>
-                            <label class="radio-inline">
-                                <input type="radio" name="enabled" value="0"> Disable
-                            </label>
+                            <input type="radio" checked name="enabled" value="1"> Enable
+                            <input type="radio" name="enabled" value="0"> Disable
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" checked name="allow_purchase" value="yes"> Yes
+                            <input type="radio" name="allow_purchase" value="no"> No
                         </div>
                     </div>
                     {if $_c['radius_enable']}
                         <div class="form-group">
                             <label class="col-md-2 control-label">Radius</label>
                             <div class="col-md-6">
-                                <label class="radio-inline">
-                                    <input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan
-                                </label>
+                                <input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan
                             </div>
                             <p class="help-block col-md-4">{Lang::T('Cannot be change after saved')}</p>
                         </div>
@@ -142,4 +143,4 @@
         </script>
     {/literal}
 {/if}
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}

ui/ui/pppoe-edit.tpl

@@ -3,20 +3,22 @@
 <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">{$_L['Edit_Plan']}</div>
+            <div class="panel-heading">{$_L['Edit_Plan']} || {$d['name_plan']}</div>
             <div class="panel-body">
                 <form class="form-horizontal" method="post" role="form" action="{$_url}services/edit-pppoe-post">
                     <input type="hidden" name="id" value="{$d['id']}">
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Status')}</label>
                         <div class="col-md-10">
-                            <label class="radio-inline warning">
-                                <input type="radio" {if $d['enabled'] == 1}checked{/if} name="enabled" value="1"> Enable
-                            </label>
-                            <label class="radio-inline">
-                                <input type="radio" {if $d['enabled'] == 0}checked{/if} name="enabled" value="0">
-                                Disable
-                            </label>
+                            <input type="radio" name="enabled" value="1" {if $d['enabled'] == 1}checked{/if}> Enable
+                            <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('Client Can Purchase')}</label>
+                        <div class="col-md-10">
+                            <input type="radio" name="allow_purchase" value="yes" {if $d['allow_purchase'] == yes}checked{/if}> Yes
+                            <input type="radio" name="allow_purchase" value="no" {if $d['allow_purchase'] == no}checked{/if}> No
                         </div>
                     </div>
                     {if $_c['radius_enable'] and $d['is_radius']}
@@ -119,7 +121,7 @@
     </div>
 </div>
 
-{if $_c['radius_enable'] and $d['is_radius']}
+{if $_c['radius_enable'] && $d['is_radius']}
     {literal}
         <script>
             document.getElementById("routers").required = false;
@@ -137,4 +139,4 @@
         </script>
     {/literal}
 {/if}
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}

ui/ui/pppoe.tpl

@@ -47,7 +47,8 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled" {/if}>
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"
+                                    {elseif $ds['allow_purchase'] != 'yes'}class="warning" title="Customer can't purchase" {/if}>
                                     <td>{$ds['name_plan']}</td>
                                     <td>{$ds['name_bw']}</td>
                                     <td>{Lang::moneyFormat($ds['price'])}</td>

ui/ui/register-otp.tpl

@@ -8,7 +8,8 @@
     <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
     <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
 
 </head>
 

ui/ui/register-rotp.tpl

@@ -7,25 +7,13 @@
     <title>{$_title} - {$_L['Register']}</title>
     <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
-    <!-- Icons -->
-    <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
-    <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
-
-    <!-- Plugins -->
-    <link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
-    <link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
-
-    <!-- Css/Less Stylesheets -->
     <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/main.min.css">
-
-    <!-- Match Media polyfill for IE9 -->
-    <!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
 
 </head>
 
 <body id="app" class="app off-canvas body-full">
-
     <div class="container">
         <div class="hidden-xs" style="height:150px"></div>
         <div class="form-head mb20">

ui/ui/register.tpl

@@ -8,7 +8,8 @@
     <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
     <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
 
 </head>
 

ui/ui/router-error.tpl

@@ -13,8 +13,8 @@
     <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="ui/ui/fonts/MaterialDesign/css/materialdesignicons.min.css">
 
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/skin-blue.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+
     <style>
         ::-moz-selection {
             /* Code for Firefox */
@@ -57,9 +57,16 @@
                         <div class="box-footer">
                             <div class="btn-group btn-group-justified" role="group" aria-label="...">
                                 <a href="./update.php?step=4" class="btn btn-info btn-sm btn-block">Update Database</a>
-                                <a href="{$_url}community#update" class="btn btn-primary btn-sm btn-block">Update
+                                <a href="{$_url}community#update" class="btn btn-success btn-sm btn-block">Update
                                     PHPNuxBill</a>
                             </div>
+                            <br>
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                            <a href="https://github.com/hotspotbilling/phpnuxbill/discussions" target="_blank"
+                            class="btn btn-success btn-sm btn-block">Ask Github Community</a>
+                                <a href="https://t.me/phpnuxbill" target="_blank"
+                                    class="btn btn-primary btn-sm btn-block">Ask Telegram Community</a>
+                            </div>
                             <br><br>
                             <a href="javascript::history.back()" onclick="history.back()"
                                 class="btn btn-warning btn-block">back</a>

ui/ui/sections/header.tpl

@@ -12,9 +12,7 @@
     <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
     <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="ui/ui/fonts/MaterialDesign/css/materialdesignicons.min.css">
-
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/skin-blue.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
     <link rel="stylesheet" href="ui/ui/styles/select2.min.css" />
     <link rel="stylesheet" href="ui/ui/styles/select2-bootstrap.min.css" />
     <style>
@@ -40,7 +38,7 @@
 
 </head>
 
-<body class="hold-transition skin-blue sidebar-mini">
+<body class="hold-transition modern-skin-dark sidebar-mini">
     <div class="wrapper">
 
         <header class="main-header">

ui/ui/sections/user-header.tpl

@@ -12,9 +12,8 @@
     <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
     <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="ui/ui/fonts/MaterialDesign/css/materialdesignicons.min.css">
-
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/skin-blue.min.css">
+<link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css"> 
+    
 
     <style>
         ::-moz-selection {
@@ -45,7 +44,7 @@
 
 </head>
 
-<body class="hold-transition skin-blue sidebar-mini">
+<body class="hold-transition modern-skin-dark sidebar-mini">
     <div class="wrapper">
         <header class="main-header" style="position:fixed; width: 100%">
             <a href="{$_url}home" class="logo">
@@ -77,8 +76,8 @@
 
                                     <p>
                                         {$_user['fullname']}
-                                        <small>{$_user['phonenumber']}</small><br>
-                                        <small>{$_user['email']}</small>
+                                        <small>{$_user['phonenumber']}<br>
+                                        {$_user['email']}</small>
                                     </p>
                                 </li>
                                 <li class="user-body">

ui/ui/user-dashboard.tpl

@@ -74,6 +74,19 @@
                             style="width:100%; border: 0px;" onmouseleave="this.type = 'password'"
                             onmouseenter="this.type = 'text'" onclick="this.select()"></td>
                 </tr>
+                <tr>
+                    <td class="small text-success text-uppercase text-normal">{Lang::T('Service Type')}</td>
+                      <td class="small mb15">
+                       {if $_user.service_type == 'Hotspot'}
+                          Hotspot
+                         {elseif $_user.service_type == 'PPPoE'}
+                        PPPoE
+                       {elseif $_user.service_type == 'Others' || $_user.service_type == null}
+                       Others
+                    {/if}
+                   </td>
+                 </tr>
+
                 {if $_c['enable_balance'] == 'yes'}
                     <tr>
                         <td class="small text-warning text-uppercase text-normal">{Lang::T('Balance')}</td>
@@ -272,4 +285,4 @@
         {/if}
     </div>
 </div>
-{include file="sections/user-footer.tpl"}
+{include file="sections/user-footer.tpl"}

ui/ui/user-login-noreg.tpl

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>{$_title} - {$_L['Login']}</title>
+    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+
+    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
+
+</head>
+
+<body>
+    <div class="container">
+        <div class="hidden-xs" style="height:150px"></div>
+        <div class="form-head mb20">
+            <h1 class="site-logo h2 mb5 mt5 text-center text-uppercase text-bold"
+                style="text-shadow: 2px 2px 4px #757575;">{$_c['CompanyName']}</h1>
+            <hr>
+        </div>
+        {if isset($notify)}
+            <div class="alert alert-{if $notify_t == 's'}success{else}danger{/if}">
+                <button type="button" class="close" data-dismiss="alert">
+                    <span aria-hidden="true">×</span>
+                </button>
+                <div>{$notify}</div>
+            </div>
+        {/if}
+        <div class="row">
+            <div class="col-sm-8">
+                <div class="panel panel-info">
+                    <div class="panel-heading">{$_L['Announcement']}</div>
+                    <div class="panel-body">
+                        {include file="$_path/../pages/Announcement.html"}
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="panel panel-primary">
+                    <div class="panel-heading">{Lang::T('Login / Activate Voucher')}</div>
+                    <div class="panel-body">
+                        <form action="{$_url}login/activation" method="post">
+                            <div class="form-group">
+                                <label>{$_L['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>
+                                    {/if}
+                                    <input type="text" class="form-control" name="username" required
+                                        placeholder="08xxxxxxx">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label>{$_L['Enter_Voucher_Code']}</label>
+                                <input type="text" class="form-control" name="voucher" required autocomplete="off"
+                                    placeholder="{$_L['Code_Voucher']}">
+                            </div>
+                            <div class="btn-group btn-group-justified mb15">
+                                <div class="btn-group">
+                                    <button type="submit"
+                                        class="btn btn-primary">{Lang::T('Login / Activate Voucher')}</button>
+                                </div>
+                            </div>
+                            <br>
+                            <center>
+                                <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                &bull;
+                                <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                            </center>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="ui/ui/scripts/vendors.js"></script>
+</body>
+
+</html>

ui/ui/user-login.tpl

@@ -8,7 +8,8 @@
     <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
     <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
 
 </head>
 

ui/ui/user-orderPlan.tpl

@@ -6,218 +6,368 @@
             <div class="box-header">{Lang::T('Order Internet Package')}</div>
         </div>
         {if $_c['radius_enable']}
-            {if Lang::arrayCount($radius_hotspot)>0}
-                <ol class="breadcrumb">
-                    <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
-                    <li>{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</li>
-                </ol>
-                <div class="row">
-                {foreach $radius_hotspot as $plan}
-                    <div class="col col-md-4">
-                        <div class="box box-primary">
-                            <div class="box-header text-bold">{$plan['name_plan']}</div>
-                            <div class="table-responsive">
-                                <table class="table table-bordered table-striped">
-                                    <tbody>
-                                        <tr>
-                                            <td>{Lang::T('Type')}</td>
-                                            <td>{$plan['type']}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>{Lang::T('Price')}</td>
-                                            <td>{Lang::moneyFormat($plan['price'])}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>{Lang::T('Validity')}</td>
-                                            <td>{$plan['validity']} {$plan['validity_unit']}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <div class="box-body">
-                                <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                    <a href="{$_url}order/buy/radius/{$plan['id']}"
-                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
-                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
-                                    {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                        <a href="{$_url}order/pay/radius/{$plan['id']}"
-                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
-                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
-                                    {/if}
-                                </div>
-                                {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                                    <a href="{$_url}order/send/radius/{$plan['id']}"
-                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
-                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
-                                {/if}
-                            </div>
-                        </div>
+        {if $_user['service_type'] == 'PPPoE'}
+        {if Lang::arrayCount($radius_pppoe)>0}
+        <ol class="breadcrumb">
+            <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
+            <li>{if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}</li>
+        </ol>
+        <div class="row">
+            {foreach $radius_pppoe as $plan}
+            <div class="col col-md-4">
+                <div class="box box-primary">
+                    <div class="box-header text-bold">{$plan['name_plan']}</div>
+                    <div class="table-responsive">
+                        <table class="table table-bordered table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>{Lang::T('Type')}</td>
+                                    <td>{$plan['type']}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Price')}</td>
+                                    <td>{Lang::moneyFormat($plan['price'])}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Validity')}</td>
+                                    <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                </tr>
+                            </tbody>
+                        </table>
                     </div>
-                {/foreach}
-                </div>
-            {/if}
-            {if Lang::arrayCount($radius_pppoe)>0}
-                <ol class="breadcrumb">
-                    <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
-                    <li>{if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}</li>
-                </ol>
-                <div class="row">
-                    {foreach $radius_pppoe as $plan}
-                        <div class="col col-md-4">
-                            <div class="box box- box-primary">
-                                <div class="box-header text-bold">{$plan['name_plan']}</div>
-                                <div class="table-responsive">
-                                    <table class="table table-bordered table-striped">
-                                        <tbody>
-                                            <tr>
-                                                <td>{Lang::T('Type')}</td>
-                                                <td>{$plan['type']}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>{Lang::T('Price')}</td>
-                                                <td>{Lang::moneyFormat($plan['price'])}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>{Lang::T('Validity')}</td>
-                                                <td>{$plan['validity']} {$plan['validity_unit']}</td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <div class="box-body">
-                                    <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                        <a href="{$_url}order/buy/radius/{$plan['id']}"
-                                            onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
-                                            class="btn btn-sm btn-block btn-warning text-black">Buy</a>
-                                        {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                            <a href="{$_url}order/pay/radius/{$plan['id']}"
-                                                onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
-                                                class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
-                                        {/if}
-                                    </div>
-                                    {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                                        <a href="{$_url}order/send/radius/{$plan['id']}"
-                                            onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
-                                            class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
-                                    {/if}
-                                </div>
-                            </div>
+                    <div class="box-body">
+                        <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                            <a href="{$_url}order/buy/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                            {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/pay/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                            {/if}
                         </div>
-                    {/foreach}
+                        {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                        <a href="{$_url}order/send/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                        {/if}
+                    </div>
                 </div>
+            </div>
+            {/foreach}
+        </div>
+        {/if}
+        {elseif $_user['service_type'] == 'Hotspot'}
+        {if Lang::arrayCount($radius_hotspot)>0}
+        <ol class="breadcrumb">
+            <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
+            <li>{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</li>
+        </ol>
+        <div class="row">
+            {foreach $radius_hotspot as $plan}
+            <div class="col col-md-4">
+                <div class="box box-primary">
+                    <div class="box-header text-bold">{$plan['name_plan']}</div>
+                    <div class="table-responsive">
+                        <table class="table table-bordered table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>{Lang::T('Type')}</td>
+                                    <td>{$plan['type']}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Price')}</td>
+                                    <td>{Lang::moneyFormat($plan['price'])}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Validity')}</td>
+                                    <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="box-body">
+                        <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                            <a href="{$_url}order/buy/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                            {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/pay/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                            {/if}
+                        </div>
+                        {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                        <a href="{$_url}order/send/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                        {/if}
+                    </div>
+                </div>
+            </div>
+            {/foreach}
+        </div>
+        {/if}
+        {elseif $_user['service_type'] == 'Others' || $_user['service_type'] == '' && (Lang::arrayCount($radius_pppoe)>0 || Lang::arrayCount($radius_hotspot)>0)}
+        <ol class="breadcrumb">
+            <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
+            <li>{if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}</li>
+        </ol>
+        <div class="row">
+            {if Lang::arrayCount($radius_pppoe)>0}
+            {foreach $radius_pppoe as $plan}
+            <div class="col col-md-4">
+                <div class="box box-primary">
+                    <div class="box-header text-bold">{$plan['name_plan']}</div>
+                    <div class="table-responsive">
+                        <table class="table table-bordered table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>{Lang::T('Type')}</td>
+                                    <td>{$plan['type']}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Price')}</td>
+                                    <td>{Lang::moneyFormat($plan['price'])}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Validity')}</td>
+                                    <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="box-body">
+                        <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                            <a href="{$_url}order/buy/pppoe/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                            {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/pay/pppoe/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                            {/if}
+                        </div>
+                        {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                        <a href="{$_url}order/send/pppoe/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                        {/if}
+                    </div>
+                </div>
+            </div>
+            {/foreach}
             {/if}
+
+            {if Lang::arrayCount($radius_hotspot)>0}
+            <ol class="breadcrumb">
+                <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
+                <li>{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</li>
+            </ol>
+            {foreach $radius_hotspot as $plan}
+            <div class="col col-md-4">
+                <div class="box box-primary">
+                    <div class="box-header text-bold">{$plan['name_plan']}</div>
+                    <div class="table-responsive">
+                        <table class="table table-bordered table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>{Lang::T('Type')}</td>
+                                    <td>{$plan['type']}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Price')}</td>
+                                    <td>{Lang::moneyFormat($plan['price'])}</td>
+                                </tr>
+                                <tr>
+                                    <td>{Lang::T('Validity')}</td>
+                                    <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="box-body">
+                        <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                            <a href="{$_url}order/buy/hotspot/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                            {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/pay/hotspot/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                            {/if}
+                        </div>
+                        {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                        <a href="{$_url}order/send/hotspot/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                        {/if}
+                    </div>
+                </div>
+            </div>
+            {/foreach}
+            {/if}
+        </div>
+        {/if}
         {/if}
         {foreach $routers as $router}
-            {if Validator::isRouterHasPlan($plans_hotspot, $router['name']) || Validator::isRouterHasPlan($plans_pppoe, $router['name'])}
-                <div class="box box-solid box-primary bg-gray">
-                    <div class="box-header text-white text-bold">{$router['name']}</div>
-                    {if $router['description'] != ''}
-                        <div class="box-body">
-                            {$router['description']}
-                        </div>
-                    {/if}
-                    {if Validator::countRouterPlan($plans_hotspot, $router['name'])>0}
-                        <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</div>
-                        <div class="box-body row">
-                            {foreach $plans_hotspot as $plan}
-                                {if $router['name'] eq $plan['routers']}
-                                    <div class="col col-md-4">
-                                        <div class="box box-primary">
-                                            <div class="box-header text-center text-bold">{$plan['name_plan']}</div>
-                                            <div class="table-responsive">
-                                                <table class="table table-bordered table-striped">
-                                                    <tbody>
-                                                        <tr>
-                                                            <td>{Lang::T('Type')}</td>
-                                                            <td>{$plan['type']}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td>{Lang::T('Price')}</td>
-                                                            <td>{Lang::moneyFormat($plan['price'])}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td>{Lang::T('Validity')}</td>
-                                                            <td>{$plan['validity']} {$plan['validity_unit']}</td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                            <div class="box-body">
-                                                <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
-                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
-                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
-                                                    {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
-                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
-                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
-                                                    {/if}
-                                                </div>
-                                                {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
-                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
-                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
-                                                {/if}
-                                            </div>
-                                        </div>
-                                    </div>
-                                {/if}
-                            {/foreach}
-                        </div>
-                    {/if}
-                    {if Validator::countRouterPlan($plans_pppoe,$router['name'])>0}
-                        <div class="box-header text-white">{if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}</div>
-                        <div class="box-body row">
-                            {foreach $plans_pppoe as $plan}
-                                {if $router['name'] eq $plan['routers']}
-                                    <div class="col col-md-4">
-                                        <div class="box box- box-primary">
-                                            <div class="box-header text-bold text-center">{$plan['name_plan']}</div>
-                                            <div class="table-responsive">
-                                                <table class="table table-bordered table-striped">
-                                                    <tbody>
-                                                        <tr>
-                                                            <td>{Lang::T('Type')}</td>
-                                                            <td>{$plan['type']}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td>{Lang::T('Price')}</td>
-                                                            <td>{Lang::moneyFormat($plan['price'])}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td>{Lang::T('Validity')}</td>
-                                                            <td>{$plan['validity']} {$plan['validity_unit']}</td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                            <div class="box-body">
-                                                <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
-                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
-                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
-                                                    {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
-                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
-                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
-                                                    {/if}
-                                                </div>
-                                                {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
-                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
-                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
-                                                {/if}
-                                            </div>
-                                        </div>
-                                    </div>
-                                {/if}
-                            {/foreach}
-                        </div>
-                    {/if}
-                </div>
+        {if Validator::isRouterHasPlan($plans_hotspot, $router['name']) || Validator::isRouterHasPlan($plans_pppoe, $router['name'])}
+        <div class="box box-solid box-primary bg-gray">
+            <div class="box-header text-white text-bold">{$router['name']}</div>
+            {if $router['description'] != ''}
+            <div class="box-body">
+                {$router['description']}
+            </div>
             {/if}
+            {if $_user['service_type'] == 'Hotspot' && Validator::countRouterPlan($plans_hotspot, $router['name'])>0}
+            <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</div>
+            <div class="box-body row">
+                {foreach $plans_hotspot as $plan}
+                {if $router['name'] eq $plan['routers']}
+                <div class="col col-md-4">
+                    <div class="box box-primary">
+                        <div class="box-header text-center text-bold">{$plan['name_plan']}</div>
+                        <div class="table-responsive">
+                            <table class="table table-bordered table-striped">
+                                <tbody>
+                                    <tr>
+                                        <td>{Lang::T('Type')}</td>
+                                        <td>{$plan['type']}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Price')}</td>
+                                        <td>{Lang::moneyFormat($plan['price'])}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Validity')}</td>
+                                        <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="box-body">
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                {/if}
+                            </div>
+                            {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                            {/if}
+                        </div>
+                    </div>
+                </div>
+                {/if}
+                {/foreach}
+            </div>
+            {/if}
+            {if $_user['service_type'] == 'PPPoE' && Validator::countRouterPlan($plans_pppoe,$router['name'])>0}
+            <div class="box-header text-white">{if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}</div>
+            <div class="box-body row">
+                {foreach $plans_pppoe as $plan}
+                {if $router['name'] eq $plan['routers']}
+                <div class="col col-md-4">
+                    <div class="box box- box-primary">
+                        <div class="box-header text-bold text-center">{$plan['name_plan']}</div>
+                        <div class="table-responsive">
+                            <table class="table table-bordered table-striped">
+                                <tbody>
+                                    <tr>
+                                        <td>{Lang::T('Type')}</td>
+                                        <td>{$plan['type']}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Price')}</td>
+                                        <td>{Lang::moneyFormat($plan['price'])}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Validity')}</td>
+                                        <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="box-body">
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                {/if}
+                            </div>
+                            {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                            {/if}
+                        </div>
+                    </div>
+                </div>
+                {/if}
+                {/foreach}
+            </div>
+            {/if}
+            {if $_user['service_type'] == 'Others' || $_user['service_type'] == '' && (Validator::countRouterPlan($plans_hotspot, $router['name'])>0 || Validator::countRouterPlan($plans_pppoe, $router['name'])>0)}
+            <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</div>
+            <div class="box-body row">
+                {foreach $plans_hotspot as $plan}
+                {if $router['name'] eq $plan['routers']}
+                <div class="col col-md-4">
+                    <div class="box box-primary">
+                        <div class="box-header text-center text-bold">{$plan['name_plan']}</div>
+                        <div class="table-responsive">
+                            <table class="table table-bordered table-striped">
+                                <tbody>
+                                    <tr>
+                                        <td>{Lang::T('Type')}</td>
+                                        <td>{$plan['type']}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Price')}</td>
+                                        <td>{Lang::moneyFormat($plan['price'])}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Validity')}</td>
+                                        <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="box-body">
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                {/if}
+                            </div>
+                            {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                            {/if}
+                        </div>
+                    </div>
+                </div>
+                {/if}
+                {/foreach}
+            </div>
+            <div class="box-header text-white">{if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}</div>
+            <div class="box-body row">
+                {foreach $plans_pppoe as $plan}
+                {if $router['name'] eq $plan['routers']}
+                <div class="col col-md-4">
+                    <div class="box box- box-primary">
+                        <div class="box-header text-bold text-center">{$plan['name_plan']}</div>
+                        <div class="table-responsive">
+                            <table class="table table-bordered table-striped">
+                                <tbody>
+                                    <tr>
+                                        <td>{Lang::T('Type')}</td>
+                                        <td>{$plan['type']}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Price')}</td>
+                                        <td>{Lang::moneyFormat($plan['price'])}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>{Lang::T('Validity')}</td>
+                                        <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="box-body">
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                {/if}
+                            </div>
+                            {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                            {/if}
+                        </div>
+                    </div>
+                </div>
+                {/if}
+                {/foreach}
+            </div>
+            {/if}
+        </div>
+        {/if}
         {/foreach}
     </div>
 </div>
-</div>
 {include file="sections/user-footer.tpl"}

ui/ui/voucher-add.tpl

@@ -31,21 +31,41 @@
                             </select>
                         </div>
                     </div>
-
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Number_of_Vouchers']}</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" name="numbervoucher" value="1">
                         </div>
                     </div>
-
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Voucher Format')}</label>
+                        <div class="col-md-6">
+                            <select name="voucher_format" id="voucher_format" class="form-control">
+                                <option value="up" {if $_c['voucher_format'] == 'up'}selected="selected" {/if}>UPPERCASE
+                                </option>
+                                <option value="low" {if $_c['voucher_format'] == 'low'}selected="selected" {/if}>
+                                    lowercase
+                                </option>
+                                <option value="rand" {if $_c['voucher_format'] == 'rand'}selected="selected" {/if}>
+                                    RaNdoM
+                                </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">{Lang::T('Voucher Prefix')}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" name="prefix" placeholder="NUX-" value="{$_c['voucher_prefix']}">
+                        </div>
+                        <p class="help-block col-md-4">NUX-VoUCHeRCOdE</p>
+                    </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Length_Code']}</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" name="lengthcode" value="12">
                         </div>
                     </div>
-
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-10">
                             <button class="btn btn-success waves-effect waves-light"

ui/ui/voucher.tpl

@@ -3,7 +3,13 @@
 <div class="row">
     <div class="col-sm-12">
         <div class="panel panel-hovered mb20 panel-primary">
-            <div class="panel-heading">{$_L['Prepaid_Vouchers']}</div>
+            <div class="panel-heading">
+            <div class="btn-group pull-right">
+                <a class="btn btn-danger btn-xs" title="Remove used Voucher" href="{$_url}prepaid/remove-voucher" onclick="return confirm('Delete all used voucher code?')"><span
+                        class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete All</a>
+            </div>
+            {$_L['Prepaid_Vouchers']}
+            </div>
             <div class="panel-body">
                 <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
                     <div class="col-md-8">

update.php

@@ -184,8 +184,8 @@ function deleteFolder($path)
     <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="ui/ui/fonts/MaterialDesign/css/materialdesignicons.min.css">
 
-    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/skin-blue.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    
     <?php if ($continue) { ?>
         <meta http-equiv="refresh" content="3; ./update.php?step=<?= $step ?>">
     <?php } ?>

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2023.11.17"
+    "version": "2024.1.17"
 }