Update Readme

ability to display packages according to the user type. Hotspot users Can now only see hotspot packages
PPPoE users can now see only PPPoE Packages
Others Can see both Hotspot and PPPoE packages

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 # CHANGELOG
 
+## 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,11 +24,42 @@ class Message
         global $config;
         run_hook('send_sms'); #HOOK
         if (!empty($config['sms_url'])) {
+            if (strlen($txt) > 160) {
+                $txts = str_split($txt, 160);
+                foreach ($txts as $txt) {
+                    if (strlen($config['sms_url']) > 4 && substr($config['sms_url'], 0, 4) != "http") {
+                        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);
                     }
                 }
+            } else {
+                if (strlen($config['sms_url']) > 4 && substr($config['sms_url'], 0, 4) != "http") {
+                    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);
+                }
+            }
+        }
+    }
 
     public static function sendWhatsapp($phone, $txt)
     {
@@ -76,7 +107,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 {
+        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);
-        // } 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();
-        // }
     }
 
     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();
+        $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");
+    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_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,7 +28,8 @@ 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])
@@ -227,6 +228,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 +255,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 +271,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 +324,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,15 +84,15 @@ 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){
+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']);
@@ -104,7 +104,9 @@ if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
         }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/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 {

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,10 +38,16 @@ switch ($action) {
                 $themes[] = $file;
             }
         }
+        $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);
         $ui->assign('dir', str_replace('controllers', '', __DIR__));
         $ui->assign('themes', $themes);
@@ -473,10 +479,9 @@ switch ($action) {
                 $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>" .

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,8 @@ $_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';

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

@@ -402,3 +402,7 @@ $_L['Sync'] = 'Sync';
 $_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
 $_L['Location'] = 'Location';
 $_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

@@ -379,3 +379,7 @@ $_L['Sync'] = 'Sync';
 $_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
 $_L['Location'] = 'Location';
 $_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/app-settings.tpl

@@ -225,6 +225,20 @@
                             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

@@ -38,6 +38,9 @@
                         </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>
                     <li class="list-group-item">

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/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,11 @@
                             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">{$_user['service_type']}</td>
+                </tr>
+
                 {if $_c['enable_balance'] == 'yes'}
                     <tr>
                         <td class="small text-warning text-uppercase text-normal">{Lang::T('Balance')}</td>
@@ -88,19 +94,25 @@
                         </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}
+                    <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">{$_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"
+                                    <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>
@@ -117,7 +129,7 @@
                             <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"
+                                <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>
@@ -136,13 +148,15 @@
                         {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">
+                                <td class="small mb15" id="login_status_{$_bill['id']}">
                                     <img src="ui/ui/images/loading.gif">
                                 </td>
                             </tr>
                         {/if}
-                {/if}
                     </table>
+                {/foreach}
+            {/if}
+        </div>
         {if $_c['disable_voucher'] == 'yes'}
             <div class="box-footer">
                 {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }
@@ -153,20 +167,23 @@
                 {/if}
             </div>
         {/if}
-        </div>
+        {if $_bills}
+            {foreach $_bills as $_bill}
                 {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
                     <script>
                         setTimeout(() => {
                             $.ajax({
-                        url: "index.php?_route=autoload_user/isLogin",
+                                url: "index.php?_route=autoload_user/isLogin/{$_bill['id']}",
                                 cache: false,
                                 success: function(msg) {
-                            $("#login_status").html(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">
                 <div class="box-header">

ui/ui/user-orderPlan.tpl

@@ -6,6 +6,52 @@
             <div class="box-header">{Lang::T('Order Internet Package')}</div>
         </div>
         {if $_c['radius_enable']}
+        {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>
+                    <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'] == 'Hotspot'}
         {if Lang::arrayCount($radius_hotspot)>0}
         <ol class="breadcrumb">
             <li>{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</li>
@@ -36,19 +82,13 @@
                     </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>
+                            <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>
+                            <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>
+                        <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>
@@ -56,15 +96,16 @@
             {/foreach}
         </div>
         {/if}
-            {if Lang::arrayCount($radius_pppoe)>0}
+        {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- box-primary">
+                <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">
@@ -86,24 +127,62 @@
                     </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>
+                            <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/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>
+                            <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/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>
+                        <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}
@@ -116,7 +195,7 @@
                 {$router['description']}
             </div>
             {/if}
-                    {if Validator::countRouterPlan($plans_hotspot, $router['name'])>0}
+            {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}
@@ -144,19 +223,13 @@
                         </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>
+                                <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>
+                                <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>
+                            <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>
@@ -165,7 +238,7 @@
                 {/foreach}
             </div>
             {/if}
-                    {if Validator::countRouterPlan($plans_pppoe,$router['name'])>0}
+            {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}
@@ -193,19 +266,97 @@
                         </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>
+                                <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>
+                                <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>
+                            <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>
@@ -219,5 +370,4 @@
         {/foreach}
     </div>
 </div>
-</div>
 {include file="sections/user-footer.tpl"}

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2023.10.27"
+    "version": "2023.12.14"
 }