Fix header user

Update user-dashboard.tpl

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 # CHANGELOG
 
+## 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
+
+- Error details not show in Customer
+
+## 2023.11.15
+
+- Customer Multi Router package
+- Fix edit package, Admin can change Customer to another router
+
+## 2023.11.9
+
+- fix bug variable in cron
+- fix update plan
+
 ## 2023.10.27
 
 - Backup and restore database

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
@@ -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

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);
+            }
         }
     }
 
@@ -76,7 +101,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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  *  by https://t.me/ibnux
@@ -15,20 +16,20 @@ class Mikrotik
 
     public static function getClient($ip, $user, $pass)
     {
-        global $ui;
-        //try {
-            $iport = explode(":", $ip);
-            return new RouterOS\Client($iport[0], $user, $pass, ($iport[1]) ? $iport[1] : null);
-        // } catch (Exception $e) {
-        //     $ui->assign("error_title", "Mikrotik Connection Error");
-        //     $ui->assign("error_message", "Unable to connect to the router : $ip<br>" . $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
-        //     $ui->display('router-error.tpl');
-        //     die();
-        // }
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
+        $iport = explode(":", $ip);
+        return new RouterOS\Client($iport[0], $user, $pass, ($iport[1]) ? $iport[1] : null);
     }
 
     public static function isUserLogin($client, $username)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip hotspot active print',
             RouterOS\Query::where('user', $username)
@@ -38,6 +39,10 @@ class Mikrotik
 
     public static function logMeIn($client, $user, $pass, $ip, $mac)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $addRequest = new RouterOS\Request('/ip/hotspot/active/login');
         $client->sendSync(
             $addRequest
@@ -50,13 +55,17 @@ class Mikrotik
 
     public static function logMeOut($client, $user)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip hotspot active print',
             RouterOS\Query::where('user', $user)
         );
         $id = $client->sendSync($printRequest)->getProperty('.id');
         $removeRequest = new RouterOS\Request('/ip/hotspot/active/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $id)
         );
@@ -64,6 +73,10 @@ class Mikrotik
 
     public static function addHotspotPlan($client, $name, $sharedusers, $rate)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $addRequest = new RouterOS\Request('/ip/hotspot/user/profile/add');
         $client->sendSync(
             $addRequest
@@ -75,6 +88,10 @@ class Mikrotik
 
     public static function setHotspotPlan($client, $name, $sharedusers, $rate)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip hotspot user profile print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -84,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)
@@ -95,6 +112,10 @@ class Mikrotik
 
     public static function setHotspotExpiredPlan($client, $name, $pool)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip hotspot user profile print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -111,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)
@@ -123,6 +144,10 @@ class Mikrotik
 
     public static function removeHotspotPlan($client, $name)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip hotspot user profile print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -130,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)
         );
@@ -138,13 +163,17 @@ class Mikrotik
 
     public static function removeHotspotUser($client, $username)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip hotspot user print .proplist=.id',
             RouterOS\Query::where('name', $username)
         );
         $userID = $client->sendSync($printRequest)->getProperty('.id');
         $removeRequest = new RouterOS\Request('/ip/hotspot/user/remove');
-        $client(
+        $client->sendSync(
             $removeRequest
                 ->setArgument('numbers', $userID)
         );
@@ -152,6 +181,10 @@ class Mikrotik
 
     public static function addHotspotUser($client, $plan, $customer)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $addRequest = new RouterOS\Request('/ip/hotspot/user/add');
         if ($plan['typebp'] == "Limited") {
             if ($plan['limit_type'] == "Time_Limit") {
@@ -216,6 +249,10 @@ class Mikrotik
 
     public static function setHotspotUser($client, $user, $pass)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
         $printRequest->setArgument('.proplist', '.id');
         $printRequest->setQuery(RouterOS\Query::where('name', $user));
@@ -229,6 +266,10 @@ class Mikrotik
 
     public static function setHotspotUserPackage($client, $user, $plan)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
         $printRequest->setArgument('.proplist', '.id');
         $printRequest->setQuery(RouterOS\Query::where('name', $user));
@@ -242,6 +283,10 @@ class Mikrotik
 
     public static function removeHotspotActiveUser($client, $username)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $onlineRequest = new RouterOS\Request('/ip/hotspot/active/print');
         $onlineRequest->setArgument('.proplist', '.id');
         $onlineRequest->setQuery(RouterOS\Query::where('user', $username));
@@ -254,7 +299,10 @@ class Mikrotik
 
     public static function removePpoeUser($client, $username)
     {
-
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request('/ppp/secret/print');
         //$printRequest->setArgument('.proplist', '.id');
         $printRequest->setQuery(RouterOS\Query::where('name', $username));
@@ -266,6 +314,10 @@ class Mikrotik
 
     public static function addPpoeUser($client, $plan, $customer)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $addRequest = new RouterOS\Request('/ppp/secret/add');
         if (!empty($customer['pppoe_password'])) {
             $pass = $customer['pppoe_password'];
@@ -284,6 +336,10 @@ class Mikrotik
 
     public static function setPpoeUser($client, $user, $pass)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request('/ppp/secret/print');
         $printRequest->setArgument('.proplist', '.id');
         $printRequest->setQuery(RouterOS\Query::where('name', $user));
@@ -297,6 +353,10 @@ class Mikrotik
 
     public static function setPpoeUserPlan($client, $user, $plan)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request('/ppp/secret/print');
         $printRequest->setArgument('.proplist', '.id');
         $printRequest->setQuery(RouterOS\Query::where('name', $user));
@@ -310,6 +370,10 @@ class Mikrotik
 
     public static function removePpoeActive($client, $username)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $onlineRequest = new RouterOS\Request('/ppp/active/print');
         $onlineRequest->setArgument('.proplist', '.id');
         $onlineRequest->setQuery(RouterOS\Query::where('name', $username));
@@ -322,6 +386,10 @@ class Mikrotik
 
     public static function removePool($client, $name)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip pool print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -329,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)
         );
@@ -337,6 +405,10 @@ class Mikrotik
 
     public static function addPool($client, $name, $ip_address)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $addRequest = new RouterOS\Request('/ip/pool/add');
         $client->sendSync(
             $addRequest
@@ -347,6 +419,10 @@ class Mikrotik
 
     public static function setPool($client, $name, $ip_address)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ip pool print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -357,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)
@@ -368,6 +444,10 @@ class Mikrotik
 
     public static function addPpoePlan($client, $name, $pool, $rate)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $addRequest = new RouterOS\Request('/ppp/profile/add');
         $client->sendSync(
             $addRequest
@@ -380,6 +460,10 @@ class Mikrotik
 
     public static function setPpoePlan($client, $name, $pool, $rate)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ppp profile print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -389,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)
@@ -401,6 +485,10 @@ class Mikrotik
 
     public static function removePpoePlan($client, $name)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $printRequest = new RouterOS\Request(
             '/ppp profile print .proplist=.id',
             RouterOS\Query::where('name', $name)
@@ -408,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

@@ -81,7 +81,7 @@ class Package
         }
 
 
-        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
+        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('routers', $router_name)->find_one();
 
         $mikrotik = Mikrotik::info($router_name);
         if ($p['validity_unit'] == 'Months') {
@@ -321,23 +321,64 @@ class Package
         return true;
     }
 
-    public static function changeTo($username, $plan_id)
+    public static function changeTo($username, $plan_id, $from_id)
     {
-        global $_c;
         $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')->where('customer_id', $c['id'])->find_one();
-        $mikrotik = Mikrotik::info($p['routers']);
+        $b = ORM::for_table('tbl_user_recharges')->find_one($from_id);
+        if($p['routers'] == $b['routers'] && $b['routers'] != 'radius'){
+            $mikrotik = Mikrotik::info($p['routers']);
+        }else{
+            $mikrotik = Mikrotik::info($b['routers']);
+        }
+        // delete first
+        if ($p['type'] == 'Hotspot') {
+            if ($b) {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            } else {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            }
+        } else {
+            if ($b) {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            } else {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            }
+        }
+        // call the next mikrotik
+        if($p['routers'] != $b['routers'] && $p['routers'] != 'radius'){
+            $mikrotik = Mikrotik::info($p['routers']);
+        }
         if ($p['type'] == 'Hotspot') {
             if ($b) {
                 if ($p['is_radius']) {
                     Radius::customerAddPlan($c, $p, $b['expiration'].''.$b['time']);
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addHotspotUser($client, $p, $c);
                 }
             } else {
@@ -345,10 +386,6 @@ class Package
                     Radius::customerAddPlan($c, $p, $b['expiration'].''.$b['time']);
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addHotspotUser($client, $p, $c);
                 }
             }
@@ -358,10 +395,6 @@ class Package
                     Radius::customerAddPlan($c, $p);
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
             } else {
@@ -369,10 +402,6 @@ class Package
                     Radius::customerAddPlan($c, $p);
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
             }

system/autoload/Radius.php

@@ -297,6 +297,10 @@ class Radius
 
     public static function disconnectCustomer($username)
     {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
         $nas = Radius::getTableNas()->findMany();
         $count = count($nas) * 15;
         set_time_limit($count);

system/autoload/User.php

@@ -22,7 +22,7 @@ class User
     public static function _billing()
     {
         $id = $_SESSION['uid'];
-        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $id)->find_one();
+        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $id)->find_many();
         return $d;
     }
 }

system/boot.php

@@ -116,7 +116,11 @@ try {
     $ui->setConfigDir(File::pathFixer('ui/conf/'));
     $ui->setCacheDir(File::pathFixer('ui/cache/'));
     $ui->assign("error_title", "PHPNuxBill Crash");
-    $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
+    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();
 }
@@ -341,8 +345,11 @@ try {
         r2(U . 'dashboard', 'e', 'not found');
     }
 } catch (Exception $e) {
-    $ui->assign("error_title", "PHPNuxBill Crash");
+    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();
 }

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

@@ -12,18 +12,18 @@ _auth();
 
 $action = $routes['1'];
 $user = User::_info();
-$bill = User::_billing();
 
 switch ($action) {
     case 'isLogin':
+        $bill = ORM::for_table('tbl_user_recharges')->where('id', $routes['2'])->where('username', $user['username'])->findOne();
         if ($bill['type'] == 'Hotspot' && $bill['status'] == 'on') {
             $m = Mikrotik::info($bill['routers']);
             $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
             if (Mikrotik::isUserLogin($client, $user['username'])) {
-                die('<a href="' . U . 'home&mikrotik=logout" onclick="return confirm(\''.Lang::T('Disconnect Internet?').'\')" class="btn btn-success btn-xs btn-block">'.Lang::T('You are Online, Logout?').'</a>');
+                die('<a href="' . U . 'home&mikrotik=logout&id='.$bill['id'].'" onclick="return confirm(\''.Lang::T('Disconnect Internet?').'\')" class="btn btn-success btn-xs btn-block">'.Lang::T('You are Online, Logout?').'</a>');
             } else {
                 if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
-                    die('<a href="' . U . 'home&mikrotik=login" onclick="return confirm(\''.Lang::T('Connect to Internet?').'\')" class="btn btn-danger btn-xs btn-block">'.Lang::T('Not Online, Login now?').'</a>');
+                    die('<a href="' . U . 'home&mikrotik=login&id='.$bill['id'].'" onclick="return confirm(\''.Lang::T('Connect to Internet?').'\')" class="btn btn-danger btn-xs btn-block">'.Lang::T('Not Online, Login now?').'</a>');
                 }else{
                     die(Lang::T('Your account not connected to internet'));
                 }

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

@@ -84,27 +84,29 @@ if (_post('send') == 'balance') {
     if ($router) {
         r2(U . "order/send/$router[id]/$active[plan_id]&u=" . trim(_post('username')), 's', Lang::T('Review package before recharge'));
     } else {
-        r2(U . 'package/order', 'w', Lang::T('Your friend do not have active package'));
+        r2(U . 'home', 'w', Lang::T('Your friend do not have active package'));
     }
 }
 
-//Client Page
-$bill = User::_billing();
-$ui->assign('_bill', $bill);
+$ui->assign('_bills', User::_billing());
 
-if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
-    $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']){
-            r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+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']){
+                r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+            }else{
+                r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+            }
         }else{
             r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
         }
-    }else{
-        r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
     }
-}else if(isset($_GET['deactivate']) && $_GET['deactivate'] == 1){
+}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']){
@@ -139,6 +141,7 @@ if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
 if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
     $ui->assign('nux_mac', $_SESSION['nux-mac']);
     $ui->assign('nux_ip', $_SESSION['nux-ip']);
+    $bill = ORM::for_table('tbl_user_recharges')->where('id', $_GET['id'])->where('username', $user['username'])->findOne();
     if ($_GET['mikrotik'] == 'login') {
         $m = Mikrotik::info($bill['routers']);
         $c = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);

system/controllers/login.php

@@ -42,8 +42,113 @@ switch ($do) {
 
         break;
 
+    case 'activation':
+        $voucher = _post('voucher');
+        $username = _post('username');
+        $v1 = ORM::for_table('tbl_voucher')->where('code', $voucher)->find_one();
+        if ($v1) {
+            // coucher 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'], "Activation", "Voucher")) {
+                    $v1->status = "1";
+                    $v1->user = $user['username'];
+                    $v1->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']) {
+                    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 {
+            // voucher not found
+            r2(U . 'login', 'e', $_L['Voucher_Not_Valid']);
+        }
     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/prepaid.php

@@ -171,7 +171,7 @@ switch ($action) {
         $d = ORM::for_table('tbl_user_recharges')->find_one($id);
         if ($d) {
             $ui->assign('d', $d);
-            $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many();
+            $p = ORM::for_table('tbl_plans')->where('enabled', '1')->where_not_equal('type', 'Balance')->find_many();
             $ui->assign('p', $p);
             run_hook('view_edit_customer_plan'); #HOOK
             $ui->display('prepaid-edit.tpl');
@@ -219,7 +219,11 @@ switch ($action) {
         } else {
             $msg .= $_L['Data_Not_Found'] . '<br>';
         }
-
+        $p = ORM::for_table('tbl_plans')->where('id', $id_plan)->where('enabled', '1')->find_one();
+        if ($d) {
+        } else {
+            $msg .= ' Plan Not Found<br>';
+        }
         if ($msg == '') {
             run_hook('edit_customer_plan'); #HOOK
             $d->username = $username;
@@ -227,8 +231,13 @@ switch ($action) {
             //$d->recharged_on = $recharged_on;
             $d->expiration = $expiration;
             $d->time = $time;
+            if($p['is_radius']){
+                $d->routers = 'radius';
+            }else{
+                $d->routers = $p['routers'];
+            }
             $d->save();
-            Package::changeTo($username, $id_plan);
+            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']);
             r2(U . 'prepaid/list', 's', $_L['Updated_Successfully']);
         } else {
@@ -238,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);
@@ -265,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();
@@ -276,6 +285,12 @@ switch ($action) {
         $ui->display('voucher-add.tpl');
         break;
 
+    case 'remove-voucher':
+        $d = ORM::for_table('tbl_voucher')->where_equal('status', '1')->findMany();
+        if ($d) {
+            $d->delete();
+            r2(U . 'prepaid/voucher', 's', $_L['Delete_Successfully']);
+        }
     case 'print-voucher':
         $from_id = _post('from_id');
         $planid = _post('planid');

system/controllers/services.php

@@ -302,7 +302,7 @@ switch ($action) {
         $validity_unit = _post('validity_unit');
         $pool_expired = _post('pool_expired');
         $enabled = _post('enabled');
-
+        $routers = _post('routers');
         $msg = '';
         if (Validator::UnsignedNumber($validity) == false) {
             $msg .= 'The validity must be a number' . '<br>';

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

@@ -118,7 +118,7 @@ foreach ($d as $ds) {
                 if (empty($p['pool_expired'])) {
                     print_r(Radius::customerDeactivate($c['username']));
                 } else {
-                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $plan['pool_expired'], ':=');
+                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
                     print_r(Radius::disconnectCustomer($c['username']));
                 }
             } else {
@@ -172,7 +172,7 @@ foreach ($d as $ds) {
                 if (empty($p['pool_expired'])) {
                     print_r(Radius::customerDeactivate($c['username']));
                 } else {
-                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $plan['pool_expired'], ':=');
+                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
                     print_r(Radius::disconnectCustomer($c['username']));
                 }
             } else {

system/lan/english/common.lan.php

@@ -408,3 +408,12 @@ $_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['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';

system/lan/indonesia/common.lan.php

@@ -408,3 +408,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,8 @@
     ],
     "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`;"
     ]
 }

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-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>
@@ -113,6 +113,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 +225,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 +252,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/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/prepaid-edit.tpl

@@ -23,7 +23,7 @@
                             <select id="id_plan" name="id_plan" class="form-control select2">
                                 {foreach $p as $ps}
                                     <option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>
-                                        {$ps['name_plan']}</option>
+                                    {if $ps['is_radius']=='1'}Radius{else}{$ps['routers']}{/if} - {$ps['name_plan']}</option>
                                 {/foreach}
                             </select>
                         </div>

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 */

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

@@ -8,7 +8,7 @@
                 <div class="box-header">
                     <h3 class="box-title">{Lang::T('Unpaid Order')}</h3>
                 </div>
-                <table class="table table-condensed table-bordered table-striped table-hover">
+                <table class="table table-condensed table-bordered table-striped table-hover" style="margin-bottom: 0px;">
                     <tbody>
                         <tr>
                             <td>{Lang::T('expired')}</td>
@@ -62,7 +62,8 @@
             <div class="box-header">
                 <h3 class="box-title">{$_L['Account_Information']}</h3>
             </div>
-            <table class="table table-bordered table-striped table-bordered table-hover">
+            <table class="table table-bordered table-striped table-bordered table-hover mb-0"
+                style="margin-bottom: 0px;">
                 <tr>
                     <td class="small text-success text-uppercase text-normal">{$_L['Username']}</td>
                     <td class="small mb15">{$_user['username']}</td>
@@ -73,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 == 'Other' || $_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>
@@ -88,84 +102,95 @@
                         </td>
                     </tr>
                 {/if}
-                {if $_bill}
+            </table>
+            {if $_bills}
+                {foreach $_bills as $_bill}
                     {if $_bill['routers'] != 'radius'}
-                        <tr>
-                            <td class="small text-primary text-uppercase text-normal">{strtoupper(Lang::T('Location'))}</td>
-                            <td class="small mb15">{$_bill['routers']}</td>
-                        </tr>
+                        <div class="box-header">
+                            <h3 class="box-title">{$_bill['routers']}</h3>
+                        </div>
+                    {else}
+                        <div class="box-header">
+                            <h3 class="box-title">{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</h3>
+                        </div>
                     {/if}
-                    <tr>
-                        <td class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</td>
-                        <td class="small mb15">
-                            {$_bill['namebp']}
-                            {if $_bill['status'] == 'on'}
-                                <a class="label label-danger pull-right" href="{$_url}home&deactivate=1"
-                                    onclick="return confirm('{Lang::T('Deactivate')}?')">{Lang::T('Deactivate')}</a>
-                            {else}
-                                <a class="label label-warning pull-right" href="{$_url}order/package">{Lang::T('expired')}</a>
-                            {/if}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="small text-info text-uppercase text-normal">{$_L['Created_On']}</td>
-                        <td class="small mb15">
-                            {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['recharged_on'],$_bill['recharged_time'])}
-                            {/if}&nbsp;</td>
-                    </tr>
-                    <tr>
-                        <td class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</td>
-                        <td class="small mb15 text-danger">
-                            {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
-                            <a class="label label-primary pull-right" href="{$_url}home&recharge=1"
-                                onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
-                        </td>
-                    </tr>
-                    {if $nux_ip}
+                    <table class="table table-bordered table-striped table-bordered table-hover" style="margin-bottom: 0px;">
                         <tr>
-                            <td class="small text-primary text-uppercase text-normal">{Lang::T('Current IP')}</td>
-                            <td class="small mb15">{$nux_ip}</td>
-                        </tr>
-                    {/if}
-                    {if $nux_mac}
-                        <tr>
-                            <td class="small text-primary text-uppercase text-normal">{Lang::T('Current MAC')}</td>
-                            <td class="small mb15">{$nux_mac}</td>
-                        </tr>
-                    {/if}
-                    {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_bill['routers'] != 'radius'}
-                        <tr>
-                            <td class="small text-primary text-uppercase text-normal">{Lang::T('Login Status')}</td>
-                            <td class="small mb15" id="login_status">
-                                <img src="ui/ui/images/loading.gif">
+                            <td class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</td>
+                            <td class="small mb15">
+                                {$_bill['namebp']}
+                                {if $_bill['status'] == 'on'}
+                                    <a class="label label-danger pull-right" href="{$_url}home&deactivate={$_bill['id']}"
+                                        onclick="return confirm('{Lang::T('Deactivate')}?')">{Lang::T('Deactivate')}</a>
+                                {else}
+                                    <a class="label label-warning pull-right" href="{$_url}order/package">{Lang::T('expired')}</a>
+                                {/if}
                             </td>
                         </tr>
-                    {/if}
-                {/if}
-            </table>
-            {if $_c['disable_voucher'] == 'yes'}
-                <div class="box-footer">
-                    {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }
-                        <a href="{$_url}order/package" class="btn btn-primary btn-block">
-                            <i class="ion ion-ios-cart"></i>
-                            {Lang::T('Order Package')}
-                        </a>
-                    {/if}
-                </div>
+                        <tr>
+                            <td class="small text-info text-uppercase text-normal">{$_L['Created_On']}</td>
+                            <td class="small mb15">
+                                {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['recharged_on'],$_bill['recharged_time'])}
+                                {/if}&nbsp;</td>
+                        </tr>
+                        <tr>
+                            <td class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</td>
+                            <td class="small mb15 text-danger">
+                                {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
+                                <a class="label label-primary pull-right" href="{$_url}home&recharge={$_bill['id']}"
+                                    onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
+                            </td>
+                        </tr>
+                        {if $nux_ip}
+                            <tr>
+                                <td class="small text-primary text-uppercase text-normal">{Lang::T('Current IP')}</td>
+                                <td class="small mb15">{$nux_ip}</td>
+                            </tr>
+                        {/if}
+                        {if $nux_mac}
+                            <tr>
+                                <td class="small text-primary text-uppercase text-normal">{Lang::T('Current MAC')}</td>
+                                <td class="small mb15">{$nux_mac}</td>
+                            </tr>
+                        {/if}
+                        {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_bill['routers'] != 'radius'}
+                            <tr>
+                                <td class="small text-primary text-uppercase text-normal">{Lang::T('Login Status')}</td>
+                                <td class="small mb15" id="login_status_{$_bill['id']}">
+                                    <img src="ui/ui/images/loading.gif">
+                                </td>
+                            </tr>
+                        {/if}
+                    </table>
+                {/foreach}
             {/if}
         </div>
-        {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
-            <script>
-                setTimeout(() => {
-                    $.ajax({
-                        url: "index.php?_route=autoload_user/isLogin",
-                        cache: false,
-                        success: function(msg) {
-                            $("#login_status").html(msg);
-                        }
-                    });
-                }, 2000);
-            </script>
+        {if $_c['disable_voucher'] == 'yes'}
+            <div class="box-footer">
+                {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }
+                    <a href="{$_url}order/package" class="btn btn-primary btn-block">
+                        <i class="ion ion-ios-cart"></i>
+                        {Lang::T('Order Package')}
+                    </a>
+                {/if}
+            </div>
+        {/if}
+        {if $_bills}
+            {foreach $_bills as $_bill}
+                {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
+                    <script>
+                        setTimeout(() => {
+                            $.ajax({
+                                url: "index.php?_route=autoload_user/isLogin/{$_bill['id']}",
+                                cache: false,
+                                success: function(msg) {
+                                    $("#login_status_{$_bill['id']}").html(msg);
+                                }
+                            });
+                        }, 2000);
+                    </script>
+                {/if}
+            {/foreach}
         {/if}
         {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes'}
             <div class="box box-primary box-solid mb30">
@@ -260,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.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.10.27"
+    "version": "2023.12.21"
 }