2024.2.5

Dashboard update

.gitignore

@@ -4,6 +4,7 @@ config.php
 ui/compiled/*.php
 ui/cache/*.php
 test.php
+sms.php
 pages/
 system/cache/**
 system/plugin/*

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 # CHANGELOG
 
+## 2024.2.5
+
+- Admin Dashboard Update
+  - Add Monthly Registered Customers
+  - Total Monthly Sales
+  - Active Users
+
+## 2024.2.2
+
+- Fix edit plan for user
+
+## 2024.1.24
+
+- Add Send test for SMS, Whatsapp and Telegram
+
+## 2024.1.19
+
+- Paid Plugin, Theme, and payment gateway marketplace using codecanyon.net
+- Fix Plugin manager List
+
+## 2024.1.18
+
+- fix(mikrotik): set pool $poolId always empty
+
+## 2024.1.17
+
+- Add minor change, for plugin, menu can have notifications by @Focuslinkstech
+
 ## 2024.1.16
 
 - Add yellow color to table for plan not allowed to purchase

README.md

@@ -15,7 +15,7 @@
 - Hotspot & PPPOE
 - Easy Installation
 - Multi Language
-- Payment Gateway Midtrans, Xendit and Tripay
+- Payment Gateway
 - SMS validation for login
 - Whatsapp Notification to Consumer
 - Telegram Notification for Admin

system/autoload/Hookers.php

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

system/autoload/Lang.php

@@ -112,7 +112,17 @@ class Lang
         if($config['printer_cols']){
             $cols = $config['printer_cols'];
         }
-        return str_pad($text, $cols, $pad_string, $pad_type);
+        $text = trim($text);
+        $texts = explode("\n", $text);
+        if(count($texts)>1){
+            $text = '';
+            foreach($texts as $t){
+                $text.= self::pad(trim($t), $pad_string, $pad_type)."\n";
+            }
+            return $text;
+        }else{
+            return str_pad(trim($text), $cols, $pad_string, $pad_type);
+        }
     }
 
     public static function pads($textLeft, $textRight, $pad_string = ' '){

system/autoload/Message.php

@@ -14,7 +14,7 @@ class Message
         global $config;
         run_hook('send_telegram'); #HOOK
         if (!empty($config['telegram_bot']) && !empty($config['telegram_target_id'])) {
-            Http::getData('https://api.telegram.org/bot' . $config['telegram_bot'] . '/sendMessage?chat_id=' . $config['telegram_target_id'] . '&text=' . urlencode($txt));
+            return Http::getData('https://api.telegram.org/bot' . $config['telegram_bot'] . '/sendMessage?chat_id=' . $config['telegram_target_id'] . '&text=' . urlencode($txt));
         }
     }
 
@@ -27,16 +27,16 @@ class Message
             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']);
+                        foreach ($txts as $txt) {
                             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']);
@@ -50,7 +50,7 @@ class Message
             } else {
                 $smsurl = str_replace('[number]', urlencode($phone), $config['sms_url']);
                 $smsurl = str_replace('[text]', urlencode($txt), $smsurl);
-                Http::getData($smsurl);
+                return Http::getData($smsurl);
             }
         }
     }
@@ -62,15 +62,15 @@ class Message
         if (!empty($config['wa_url'])) {
             $waurl = str_replace('[number]', urlencode($phone), $config['wa_url']);
             $waurl = str_replace('[text]', urlencode($txt), $waurl);
-            Http::getData($waurl);
+            return Http::getData($waurl);
         }
     }
 
     public static function sendPackageNotification($phone, $name, $package, $price, $message, $via)
     {
-        $msg = str_replace('[[name]]', "$name", $message);
-        $msg = str_replace('[[package]]', "$package", $msg);
-        $msg = str_replace('[[price]]', "$price", $msg);
+        $msg = str_replace('[[name]]', $name, $message);
+        $msg = str_replace('[[package]]', $package, $msg);
+        $msg = str_replace('[[price]]', $price, $msg);
         if (
             !empty($phone) && strlen($phone) > 5
             && !empty($message) && in_array($via, ['sms', 'wa'])
@@ -86,7 +86,7 @@ class Message
 
     public static function sendBalanceNotification($phone, $name, $balance, $balance_now, $message, $via)
     {
-        $msg = str_replace('[[name]]', "$name", $message);
+        $msg = str_replace('[[name]]', $name, $message);
         $msg = str_replace('[[current_balance]]', Lang::moneyFormat($balance_now), $msg);
         $msg = str_replace('[[balance]]', Lang::moneyFormat($balance), $msg);
         if (

system/autoload/Mikrotik.php

@@ -130,7 +130,6 @@ class Mikrotik
                     ->setArgument('address-pool', $pool)
                     ->setArgument('rate-limit', '512K/512K')
             );
-            die("| $profileID | $name | $pool |");
         } else {
             $setRequest = new RouterOS\Request('/ip/hotspot/user/profile/set');
             $client->sendSync(
@@ -428,7 +427,7 @@ class Mikrotik
             '/ip pool print .proplist=.id',
             RouterOS\Query::where('name', $name)
         );
-        $poolID = $client->sendSync($printRequest)->getProperty('id');
+        $poolID = $client->sendSync($printRequest)->getProperty('.id');
 
         if (empty($poolID)) {
             self::addPool($client, $name, $ip_address);

system/autoload/Validator.php

@@ -20,7 +20,7 @@ class Validator
      * @param array $hits
      * @return void
      */
-    private static function textHit($string, $exclude = "")
+    public static function textHit($string, $exclude = "")
     {
         if (empty($exclude)) return false;
         if (is_array($exclude)) {

system/boot.php

@@ -108,6 +108,21 @@ try {
         ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'), 'radius');
         ORM::configure('return_result_sets', true, 'radius');
     }
+} catch (Throwable $e) {
+    $ui = new Smarty();
+    $ui->setTemplateDir(['custom' => File::pathFixer('ui/ui_custom/'), 'default' => File::pathFixer('ui/ui/')]);
+    $ui->assign('_url', APP_URL . '/index.php?_route=');
+    $ui->setCompileDir(File::pathFixer('ui/compiled/'));
+    $ui->setConfigDir(File::pathFixer('ui/conf/'));
+    $ui->setCacheDir(File::pathFixer('ui/cache/'));
+    $ui->assign("error_title", "PHPNuxBill Crash");
+    if (isset($_SESSION['uid'])) {
+        $ui->assign("error_message", $e->getMessage() . '<br>');
+    } else {
+        $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
+    }
+    $ui->display('router-error.tpl');
+    die();
 } catch (Exception $e) {
     $ui = new Smarty();
     $ui->setTemplateDir(['custom' => File::pathFixer('ui/ui_custom/'), 'default' => File::pathFixer('ui/ui/')]);
@@ -227,7 +242,13 @@ function _admin($login = true)
 
 function _log($description, $type = '', $userid = '0')
 {
-    Log::put($type, $description, $userid);
+    $d = ORM::for_table('tbl_logs')->create();
+    $d->date = date('Y-m-d H:i:s');
+    $d->type = $type;
+    $d->description = $description;
+    $d->userid = $userid;
+    $d->ip = $_SERVER["REMOTE_ADDR"];
+    $d->save();
 }
 
 function Lang($key)
@@ -311,7 +332,6 @@ if ($handler == '') {
     $handler = 'default';
 }
 try {
-
     $sys_render = File::pathFixer('system/controllers/' . $handler . '.php');
     if (file_exists($sys_render)) {
         $menus = array();
@@ -326,12 +346,20 @@ try {
                 if (!empty($menu['icon'])) {
                     $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
                 }
+                if (!empty($menu['label'])) {
+                    $menus[$menu['position']] .= '<span class="pull-right-container">';
+                    $menus[$menu['position']] .= '<small class="label pull-right bg-' . $menu['color'] . '">' . $menu['label'] . '</small></span>';
+                }
                 $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
             } else if (!$menu['admin'] && _auth(false)) {
                 $menus[$menu['position']] .= '<li' . (($routes[1] == $menu['function']) ? ' class="active"' : '') . '><a href="' . U . 'plugin/' . $menu['function'] . '">';
                 if (!empty($menu['icon'])) {
                     $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
                 }
+                if (!empty($menu['label'])) {
+                    $menus[$menu['position']] .= '<span class="pull-right-container">';
+                    $menus[$menu['position']] .= '<small class="label pull-right bg-' . $menu['color'] . '">' . $menu['label'] . '</small></span>';
+                }
                 $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
             }
         }
@@ -343,6 +371,14 @@ try {
     } else {
         r2(U . 'dashboard', 'e', 'not found');
     }
+} catch (Throwable $e) {
+    if (!isset($_SESSION['aid']) || empty($_SESSION['aid'])) {
+        r2(U . 'home', 'e', $e->getMessage());
+    }
+    $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
+    $ui->assign("error_title", "PHPNuxBill Crash");
+    $ui->display('router-error.tpl');
+    die();
 } catch (Exception $e) {
     if (!isset($_SESSION['aid']) || empty($_SESSION['aid'])) {
         r2(U . 'home', 'e', $e->getMessage());

system/controllers/codecanyon.php

@@ -0,0 +1,126 @@
+<?php
+/**
+ *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ *  by https://t.me/ibnux
+ **/
+
+_admin();
+$ui->assign('_title', 'CodeCanyon.net');
+$ui->assign('_system_menu', 'settings');
+
+$plugin_repository = 'https://hotspotbilling.github.io/Plugin-Repository/repository.json';
+
+$action = $routes['1'];
+$admin = Admin::_info();
+$ui->assign('_admin', $admin);
+$cache = File::pathFixer('system/cache/codecanyon.json');
+
+if ($admin['user_type'] != 'Admin') {
+    r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
+}
+if (empty($config['envato_token'])) {
+    r2(U . 'settings/app', 'w', '<a href="' . U . 'settings/app#envato' . '">Envato Personal Access Token</a> is not set');
+}
+
+switch ($action) {
+
+    case 'install':
+        if (!is_writeable(File::pathFixer('system/cache/'))) {
+            r2(U . "codecanyon", 'e', 'Folder system/cache/ is not writable');
+        }
+        if (!is_writeable(File::pathFixer('system/plugin/'))) {
+            r2(U . "codecanyon", 'e', 'Folder system/plugin/ is not writable');
+        }
+        if (!is_writeable(File::pathFixer('system/paymentgateway/'))) {
+            r2(U . "codecanyon", 'e', 'Folder system/paymentgateway/ is not writable');
+        }
+        set_time_limit(-1);
+        $item_id = $routes['2'];
+        $tipe = $routes['3'];
+        $result = Http::getData('https://api.envato.com/v3/market/buyer/download?item_id=' . $item_id, ['Authorization: Bearer ' . $config['envato_token']]);
+        $json = json_decode($result, true);
+        if (!isset($json['download_url'])) {
+            r2(U . 'codecanyon', 'e', 'Failed to get download url. ' . $json['description']);
+        }
+        $file = File::pathFixer('system/cache/codecanyon/');
+        if (!file_exists($file)) {
+            mkdir($file);
+        }
+        $file .= $item_id . '.zip';
+        if (file_exists($file))
+            unlink($file);
+        //download
+        $fp = fopen($file, 'w+');
+        $ch = curl_init($json['download_url']);
+        curl_setopt($ch, CURLOPT_POST, 0);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 120);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 120);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_FILE, $fp);
+        curl_exec($ch);
+        curl_close($ch);
+        fclose($fp);
+        //extract
+        $target = File::pathFixer('system/cache/codecanyon/' . $item_id . '/');
+        $zip = new ZipArchive();
+        $zip->open($file);
+        $zip->extractTo($target);
+        $zip->close();
+        //moving
+        if (file_exists($target . 'plugin')) {
+            File::copyFolder($target . 'plugin', File::pathFixer('system/plugin/'));
+        } else if (file_exists($target . 'paymentgateway')) {
+            File::copyFolder($target . 'paymentgateway', File::pathFixer('system/paymentgateway/'));
+        } else if (file_exists($target . 'theme')) {
+            File::copyFolder($target . 'theme', File::pathFixer('ui/themes/'));
+        }
+        //Cleaning
+        File::deleteFolder($target);
+        unlink($file);
+        r2(U . "codecanyon", 's', 'Installation success');
+    case 'reload':
+        if (file_exists($cache))
+            unlink($cache);
+    default:
+        if (class_exists('ZipArchive')) {
+            $zipExt = true;
+        } else {
+            $zipExt = false;
+        }
+        $ui->assign('zipExt', $zipExt);
+
+        if (file_exists($cache) && time() - filemtime($cache) < (24 * 60 * 60)) {
+            $txt = file_get_contents($cache);
+            $plugins = json_decode($txt, true);
+            $ui->assign('chached_until', date($config['date_format'] . ' H:i', filemtime($cache) + (24 * 60 * 60)));
+            if (count($plugins) == 0) {
+                unlink($cache);
+                r2(U . 'codecanyon');
+            }
+        } else {
+            $plugins = [];
+            $page = _get('page', 1);
+            back:
+            $result = Http::getData('https://api.envato.com/v3/market/buyer/list-purchases?&page=' . $page, ['Authorization: Bearer ' . $config['envato_token']]);
+            $items = json_decode($result, true);
+            if ($items && count($items['results']) > 0) {
+                foreach ($items['results'] as $item) {
+                    $name = strtolower($item['item']['name']);
+                    if (strpos($name, 'phpnuxbill') !== false) {
+                        $plugins[] = $item;
+                    }
+                }
+                $page++;
+                goto back;
+            }
+            if (count($plugins) > 0) {
+                file_put_contents($cache, json_encode($plugins));
+                if (file_exists($cache)) {
+                    $ui->assign('chached_until', date($config['date_format'] . ' H:i', filemtime($cache) + (24 * 60 * 60)));
+                }
+            }
+        }
+        $ui->assign('plugins', $plugins);
+        $ui->display('codecanyon.tpl');
+}

system/controllers/dashboard.php

@@ -100,6 +100,68 @@ foreach ($tmp as $plan) {
     }
 }
 
+//Monthly Registered Customers
+$result = ORM::for_table('tbl_customers')
+    ->select_expr('MONTH(created_at)', 'month')
+    ->select_expr('COUNT(*)', 'count')
+    ->where_raw('YEAR(created_at) = YEAR(NOW())')
+    ->group_by_expr('MONTH(created_at)')
+    ->find_many();
+
+$counts = [];
+foreach ($result as $row) {
+    $counts[] = [
+        'date' => $row->month,
+        'count' => $row->count
+    ];
+}
+
+// Query to retrieve monthly data
+$query = ORM::for_table('tbl_transactions')
+    ->select_expr('MONTH(recharged_on)', 'month')
+    ->select_expr('SUM(price)', 'total')
+    ->where_raw("YEAR(recharged_on) = YEAR(CURRENT_DATE())") // Filter by the current year
+    ->group_by_expr('MONTH(recharged_on)')
+    ->find_many();
+
+// Execute the query and retrieve the monthly sales data
+$results = $query->find_many();
+
+// Create an array to hold the monthly sales data
+$monthlySales = array();
+
+// Iterate over the results and populate the array
+foreach ($results as $result) {
+    $month = $result->month;
+    $totalSales = $result->total;
+
+    $monthlySales[$month] = array(
+        'month' => $month,
+        'totalSales' => $totalSales
+    );
+}
+
+// Fill in missing months with zero sales
+for ($month = 1; $month <= 12; $month++) {
+    if (!isset($monthlySales[$month])) {
+        $monthlySales[$month] = array(
+            'month' => $month,
+            'totalSales' => 0
+        );
+    }
+}
+
+// Sort the array by month
+ksort($monthlySales);
+
+// Reindex the array
+$monthlySales = array_values($monthlySales);
+
+// Assign the monthly sales data to Smarty
+$ui->assign('monthlySales', $monthlySales);
+$ui->assign('xheader', '<script src="https://cdn.jsdelivr.net/npm/apexcharts@3.28.0/dist/apexcharts.min.js"></script>');
+$ui->assign('xfooter', '');
+$ui->assign('counts', $counts);
 $ui->assign('stocks', $stocks);
 $ui->assign('plans', $plans);
 

system/controllers/logs.php

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

system/controllers/pluginmanager.php

@@ -5,7 +5,7 @@
  **/
 
 _admin();
-$ui->assign('_title', $_L['Plugin Manager']);
+$ui->assign('_title', 'Plugin Manager');
 $ui->assign('_system_menu', 'settings');
 
 $plugin_repository = 'https://hotspotbilling.github.io/Plugin-Repository/repository.json';

system/controllers/prepaid.php

@@ -159,7 +159,7 @@ switch ($action) {
     case 'print':
         $id = _post('id');
         $d = ORM::for_table('tbl_transactions')->where('id', $id)->find_one();
-        $ui->assign('d', $d);
+        $ui->assign('in', $d);
 
         $ui->assign('date', Lang::dateAndTimeFormat($d['recharged_on'], $d['recharged_time']));
         run_hook('print_invoice'); #HOOK
@@ -174,6 +174,7 @@ switch ($action) {
             $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->assign('_title', 'Edit Plan');
             $ui->display('prepaid-edit.tpl');
         } else {
             r2(U . 'services/list', 'e', $_L['Account_Not_Found']);
@@ -228,17 +229,25 @@ switch ($action) {
             run_hook('edit_customer_plan'); #HOOK
             $d->username = $username;
             $d->plan_id = $id_plan;
+            $d->namebp = $p['name_plan'];
             //$d->recharged_on = $recharged_on;
             $d->expiration = $expiration;
             $d->time = $time;
+            if($d['status'] == 'off'){
+                if(strtotime($expiration.' '.$time) > time()){
+                    $d->status = 'on';
+                }
+            }
             if($p['is_radius']){
                 $d->routers = 'radius';
             }else{
                 $d->routers = $p['routers'];
             }
             $d->save();
+            if($d['status'] == 'on'){
                 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']);
+            }
+            _log('[' . $admin['username'] . ']: ' . 'Edit Plan for Customer ' . $d['username'] . ' to [' . $d['namebp'] . '][' . Lang::moneyFormat($d['price']) . ']', 'Admin', $admin['id']);
             r2(U . 'prepaid/list', 's', $_L['Updated_Successfully']);
         } else {
             r2(U . 'prepaid/edit/' . $id, 'e', $msg);

system/controllers/settings.php

@@ -17,6 +17,20 @@ switch ($action) {
         if ($admin['user_type'] != 'Admin') {
             r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
         }
+
+        if (!empty(_get('testWa'))) {
+            $result = Message::sendWhatsapp(_get('testWa'), 'PHPNuxBill Test Whatsapp');
+            r2(U . "settings/app", 's', 'Test Whatsapp has been send<br>Result: ' . $result);
+        }
+        if (!empty(_get('testSms'))) {
+            $result = Message::sendSMS(_get('testSms'), 'PHPNuxBill Test SMS');
+            r2(U . "settings/app", 's', 'Test SMS has been send<br>Result: ' . $result);
+        }
+        if (!empty(_get('testTg'))) {
+            $result = Message::sendTelegram('PHPNuxBill Test Telegram');
+            r2(U . "settings/app", 's', 'Test Telegram has been send<br>Result: ' . $result);
+        }
+
         if (file_exists('system/uploads/logo.png')) {
             $logo = 'system/uploads/logo.png?' . time();
         } else {

system/cron.php

@@ -119,7 +119,7 @@ foreach ($d as $ds) {
             $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
             $m = Mikrotik::info($ds['routers']);
             $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-
+            $price = Lang::moneyFormat($p['price']);
             if ($p['is_radius']) {
                 if (empty($p['pool_expired'])) {
                     print_r(Radius::customerDeactivate($c['username']));
@@ -136,7 +136,7 @@ foreach ($d as $ds) {
                 }
                 Mikrotik::removeHotspotActiveUser($client, $c['username']);
             }
-            Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $textExpired, $config['user_notification_expired']);
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
             //update database user dengan status off
             $u->status = 'off';
             $u->save();
@@ -174,7 +174,7 @@ foreach ($d as $ds) {
             $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
             $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one();
             $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-
+            $price = Lang::moneyFormat($p['price']);
             if ($p['is_radius']) {
                 if (empty($p['pool_expired'])) {
                     print_r(Radius::customerDeactivate($c['username']));
@@ -191,7 +191,7 @@ foreach ($d as $ds) {
                 }
                 Mikrotik::removePpoeActive($client, $c['username']);
             }
-            Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $textExpired, $config['user_notification_expired']);
+            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
 
             $u->status = 'off';
             $u->save();

system/lan/english/common.lan.php

@@ -418,3 +418,12 @@ $_L['Voucher_activation_success_now_you_can_login'] = 'Voucher activation succes
 $_L['Client_Can_Purchase'] = 'Client Can Purchase';
 $_L['Buy_this_your_active_package_will_be_overwritten'] = 'Buy this? your active package will be overwritten';
 $_L['Pay_this_with_Balance_your_active_package_will_be_overwritten'] = 'Pay this with Balance? your active package will be overwritten';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active package will be overwrite';
+$_L['Monthly_Registered_Customers'] = 'Monthly Registered Customers';
+$_L['Total_Monthly_Sales'] = 'Total Monthly Sales';
+$_L['Active_Users'] = 'Active Users';

system/lan/indonesia/common.lan.php

@@ -409,3 +409,6 @@ $_L['Service_Type'] = 'Service Type';
 $_L['Others'] = 'Lainnya';
 $_L['PPPoE'] = 'PPPoE';
 $_L['Hotspot'] = 'Hotspot';
+$_L['Monthly_Registered_Customers'] = 'Pendaftaran Pelanggan perbulan';
+$_L['Total_Monthly_Sales'] = 'Total penjualan Perbulan';
+$_L['Active_Users'] = 'Pelanggan Aktif';

system/lan/spanish/common.lan.php

@@ -406,3 +406,6 @@ $_L['Service_Type'] = 'Service Type';
 $_L['Others'] = 'Others';
 $_L['PPPoE'] = 'PPPoE';
 $_L['Hotspot'] = 'Hotspot';
+$_L['Monthly_Registered_Customers'] = 'Monthly Registered Customers';
+$_L['Total_Monthly_Sales'] = 'Total Monthly Sales';
+$_L['Active_Users'] = 'Active Users';

system/lan/turkish/common.lan.php

@@ -383,3 +383,6 @@ $_L['Service_Type'] = 'Service Type';
 $_L['Others'] = 'Others';
 $_L['PPPoE'] = 'PPPoE';
 $_L['Hotspot'] = 'Hotspot';
+$_L['Monthly_Registered_Customers'] = 'Monthly Registered Customers';
+$_L['Total_Monthly_Sales'] = 'Total Monthly Sales';
+$_L['Active_Users'] = 'Active Users';

ui/ui/app-settings.tpl

@@ -54,10 +54,11 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label"><i class="glyphicon glyphicon-print"></i> Print Max Char</label>
+                        <label class="col-md-2 control-label"><i class="glyphicon glyphicon-print"></i> Print Max
+                            Char</label>
                         <div class="col-md-6">
-                            <input type="number" required class="form-control" id="printer_cols" placeholder="37" name="printer_cols"
-                                value="{$_c['printer_cols']}">
+                            <input type="number" required class="form-control" id="printer_cols" placeholder="37"
+                                name="printer_cols" value="{$_c['printer_cols']}">
                         </div>
                         <span class="help-block col-md-4">For invoice print using Thermal Printer</span>
                     </div>
@@ -218,6 +219,7 @@
                 </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
+                        <a class="btn btn-success btn-xs" style="color: black;" href="javascript:testTg()">Test TG</a>
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
                                 class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
                     </div>
@@ -244,6 +246,7 @@
                 </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
+                        <a class="btn btn-success btn-xs" style="color: black;" href="javascript:testSms()">Test SMS</a>
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
                                 class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
                     </div>
@@ -281,6 +284,7 @@
                 </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
+                        <a class="btn btn-success btn-xs" style="color: black;" href="javascript:testWa()">Test WA</a>
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
                                 class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
                     </div>
@@ -413,6 +417,34 @@
                         </div>
                     </div>
                 </div>
+                <div class="panel-heading" id="envato">
+                    <div class="btn-group pull-right">
+                        <button class="btn btn-primary btn-xs" title="save" type="submit"><span
+                                class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
+                    </div>
+                    Envato / Codecanyon
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">Envato Personal Token</label>
+                        <div class="col-md-6">
+                            <input type="password" class="form-control" id="envato_token" name="envato_token"
+                                value="{$_c['envato_token']}" placeholder="BldWuBsxxxxxxxxxxxPDzPozHAPui">
+                        </div>
+                        <span class="help-block col-md-4"><a href="https://build.envato.com/create-token/"
+                                target="_blank">Create Token</a></span>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label col-md-offset-2 col-md-8" style="text-align: left;">Envato
+                            Permission<br>
+                            - View and search Envato sites<br>
+                            - Download the user's purchased items<br>
+                            - List purchases the user has made<br><br>
+                            <a href="https://codecanyon.net/category/php-scripts?term=phpnuxbill" target="_blank"
+                                class="btn btn-xs btn-primary">View MarketPlace</a>
+                        </label>
+                    </div>
+                </div>
             </div>
 
             <div class="panel-body">
@@ -440,4 +472,23 @@ add dst-host=*.{$_domain}</pre>
         </div>
     </div>
 </form>
+<script>
+    function testWa() {
+        var target = prompt("Phone number\nSave First before Test", "");
+        if (target != null) {
+            window.location.href = '{$_url}settings/app&testWa='+target;
+        }
+    }
+
+    function testSms() {
+        var target = prompt("Phone number\nSave First before Test", "");
+        if (target != null) {
+            window.location.href = '{$_url}settings/app&testSms='+target;
+        }
+    }
+
+    function testTg() {
+        window.location.href = '{$_url}settings/app&testTg=test';
+    }
+</script>
 {include file="sections/footer.tpl"}

ui/ui/codecanyon.tpl

@@ -0,0 +1,54 @@
+{include file="sections/header.tpl"}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="panel panel-primary panel-hovered">
+            <div class="panel-heading">
+                <div class="btn-group pull-right">
+                    <a class="btn btn-danger btn-xs" href="https://codecanyon.net/category/php-scripts?term=phpnuxbill"
+                        target="_blank">Buy Plugin</a>
+                </div>
+                Plugin Purcashed
+            </div>
+            <div class="panel-body row">
+                {if Lang::arrayCount($plugins) > 0}
+                    {foreach $plugins as $plugin}
+                        <div class="col-md-4">
+                            <div class="box box-hovered mb20 box-primary">
+                                <div class="box-header">
+                                    <h3 class="box-title text1line">{$plugin['item']['name']}</h3>
+                                </div>
+                                <div class="box-body"><small><i>@{$plugin['item']['author_username']} &bull; Last update:
+                                            {Lang::dateFormat($plugin['item']['updated_at'])}</i></small></div>
+                                <div class="box-footer ">
+                                    <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                        <a href="{$plugin['item']['author_url']}" target="_blank" class="btn btn-primary"><i
+                                                class="ion ion-chatboxes"></i> Author</a>
+                                        <a href="{$plugin['item']['url']}" target="_blank" class="btn btn-success"><i
+                                                class="ion ion-chatboxes"></i> Product</a>
+                                        <a {if $zipExt } href="{$_url}codecanyon/install/{$plugin['item']['id']}"
+                                                onclick="return confirm('Installing plugin will take some time to complete, do not close the page while it loading to install the plugin')"
+                                            {else} href="#" onclick="alert('PHP ZIP extension is not installed')" 
+                                            {/if}
+                                            class="btn btn-danger"><i class="ion ion-chatboxes"></i> Install</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    {/foreach}
+                {else}
+                    <div class="col-md-12">
+                        <div class="alert alert-info">
+                            <i class="fa fa-info-circle"></i> No plugins purcashed yet.
+                        </div>
+                    </div>
+                {/if}
+            </div>
+            <div class="panel-footer">
+                {if $chached_until}Cached Until {$chached_until} <a href="{$_url}codecanyon/reload">Force reload</a>
+                &bull; {/if}<a
+                    href="https://github.com/hotspotbilling/phpnuxbill/wiki/Selling-Paid-Plugin-or-Payment-Gateway"
+                    target="_blank"> Sell your own plugin/paymentgateway/theme?</a>
+            </div>
+        </div>
+    </div>
+{include file="sections/footer.tpl"}

ui/ui/community.tpl

@@ -104,7 +104,12 @@
                 </table>
             </div>
             <div class="box-footer">
-                <a href="https://paypal.me/ibnux" target="_blank" class="btn btn-primary btn-sm btn-block">Paypal</a>
+                <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                    <a href="https://paypal.me/ibnux" target="_blank"
+                        class="btn btn-primary btn-sm btn-block">Paypal</a>
+                    <a href="https://wise.com/pay/me/ibnum37" target="_blank"
+                        class="btn btn-primary btn-sm btn-block">Wise</a>
+                </div>
             </div>
         </div>
     </div>

ui/ui/dashboard.tpl

@@ -1,5 +1,6 @@
 {include file="sections/header.tpl"}
 
+
 <div class="row">
     <div class="col-lg-3 col-xs-6">
         <div class="small-box bg-aqua">
@@ -59,7 +60,42 @@
         </div>
     </div>
 </div>
+<!-- solid sales graph -->
+<div class="box box-solid ">
+    <div class="box-header">
+        <i class="fa fa-th"></i>
 
+        <h3 class="box-title">{Lang::T('Monthly Registered Customers')}</h3>
+
+        <div class="box-tools pull-right">
+            <button type="button" class="btn bg-teal btn-sm" data-widget="collapse"><i class="fa fa-minus"></i>
+            </button>
+            <button type="button" class="btn bg-teal btn-sm" data-widget="remove"><i class="fa fa-times"></i>
+            </button>
+        </div>
+    </div>
+    <div class="box-body border-radius-none">
+        <canvas class="chart" id="chart" style="height: 250px;"></canvas>
+    </div>
+</div>
+<!-- solid sales graph -->
+<div class="box box-solid ">
+    <div class="box-header">
+        <i class="fa fa-inbox"></i>
+
+        <h3 class="box-title">{Lang::T('Total Monthly Sales')}</h3>
+
+        <div class="box-tools pull-right">
+            <button type="button" class="btn bg-teal btn-sm" data-widget="collapse"><i class="fa fa-minus"></i>
+            </button>
+            <button type="button" class="btn bg-teal btn-sm" data-widget="remove"><i class="fa fa-times"></i>
+            </button>
+        </div>
+    </div>
+    <div class="box-body border-radius-none">
+        <canvas class="chart" id="salesChart" style="height: 250px;"></canvas>
+    </div>
+</div>
 <div class="row">
     <div class="col-md-7">
         {if $_c['disable_voucher'] != 'yes' && $stocks['unused']>0 || $stocks['used']>0}
@@ -123,10 +159,17 @@
         </div>
     </div>
 
+
     <div class="col-md-5">
         <div class="panel panel-success panel-hovered mb20 activities">
             <div class="panel-heading">{Lang::T('Payment Gateway')}: {$_c['payment_gateway']}</div>
         </div>
+        <div class="panel panel-info panel-hovered mb20 activities">
+            <div class="panel-heading">{Lang::T('Active Users')}</div>
+            <div class="panel-body">
+                <canvas id="userRechargesChart"></canvas>
+            </div>
+        </div>
         <div class="panel panel-info panel-hovered mb20 activities">
             <div class="panel-heading"><a href="{$_url}logs">{$_L['Activity_Log']}</a></div>
             <div class="panel-body">
@@ -143,8 +186,164 @@
         </div>
     </div>
 
+
 </div>
 
+
+<script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
+{literal}
+<script type="text/javascript">
+    document.addEventListener("DOMContentLoaded", function () {
+        var counts = JSON.parse('{/literal}{$counts|json_encode}{literal}');
+
+        var monthNames = [
+            'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+        ];
+
+        var labels = [];
+        var data = [];
+
+        for (var i = 1; i <= 12; i++) {
+            var month = counts.find(count => count.date === i);
+            labels.push(month ? monthNames[i - 1] : monthNames[i - 1].substring(0, 3));
+            data.push(month ? month.count : 0);
+        }
+
+        var ctx = document.getElementById('chart').getContext('2d');
+        var chart = new Chart(ctx, {
+            type: 'bar',
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: 'Registered Members',
+                    data: data,
+                    backgroundColor: 'rgba(0, 0, 255, 0.5)',
+                    borderColor: 'rgba(0, 0, 255, 0.7)',
+                    borderWidth: 1
+                }]
+            },
+            options: {
+                responsive: true,
+                scales: {
+                    x: {
+                        grid: {
+                            display: false
+                        }
+                    },
+                    y: {
+                        beginAtZero: true,
+                        grid: {
+                            color: 'rgba(0, 0, 0, 0.1)'
+                        }
+                    }
+                }
+            }
+        });
+    });
+</script>
+
+<script type="text/javascript">
+    document.addEventListener("DOMContentLoaded", function () {
+        var monthlySales = JSON.parse('{/literal}{$monthlySales|json_encode}{literal}');
+
+        var monthNames = [
+            'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+        ];
+
+        var labels = [];
+        var data = [];
+
+        for (var i = 1; i <= 12; i++) {
+            var month = findMonthData(monthlySales, i);
+            labels.push(month ? monthNames[i - 1] : monthNames[i - 1].substring(0, 3));
+            data.push(month ? month.totalSales : 0);
+        }
+
+        var ctx = document.getElementById('salesChart').getContext('2d');
+        var chart = new Chart(ctx, {
+            type: 'bar',
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: 'Monthly Sales',
+                    data: data,
+                    backgroundColor: 'rgba(2, 10, 242)', // Customize the background color
+                    borderColor: 'rgba(255, 99, 132, 1)', // Customize the border color
+                    borderWidth: 1
+                }]
+            },
+            options: {
+                responsive: true,
+                scales: {
+                    x: {
+                        grid: {
+                            display: false
+                        }
+                    },
+                    y: {
+                        beginAtZero: true,
+                        grid: {
+                            color: 'rgba(0, 0, 0, 0.1)'
+                        }
+                    }
+                }
+            }
+        });
+    });
+
+    function findMonthData(monthlySales, month) {
+        for (var i = 0; i < monthlySales.length; i++) {
+            if (monthlySales[i].month === month) {
+                return monthlySales[i];
+            }
+        }
+        return null;
+    }
+
+
+    document.addEventListener("DOMContentLoaded", function () {
+        // Get the data from PHP and assign it to JavaScript variables
+        var u_act = '{/literal}{$u_act}{literal}';
+        var u_all = '{/literal}{$u_all}{literal}';
+
+        // Create the chart data
+        var data = {
+            labels: ['Active Users', 'Inactive Users'],
+            datasets: [{
+                label: 'User Recharges',
+                data: [parseInt(u_act), parseInt(u_all)],
+                backgroundColor: ['rgba(4, 191, 13)', 'rgba(191, 35, 4)'],
+                borderColor: ['rgba(0, 255, 0, 1)', 'rgba(255, 99, 132, 1)'],
+                borderWidth: 1
+            }]
+        };
+
+        // Create chart options
+        var options = {
+            responsive: true,
+            aspectRatio: 1,
+            plugins: {
+                legend: {
+                    position: 'bottom',
+                    labels: {
+                        boxWidth: 15
+                    }
+                }
+            }
+        };
+
+        // Get the canvas element and create the chart
+        var ctx = document.getElementById('userRechargesChart').getContext('2d');
+        var chart = new Chart(ctx, {
+            type: 'pie',
+            data: data,
+            options: options
+        });
+    });
+</script>
+{/literal}
 <script>
     window.addEventListener('DOMContentLoaded', function () {
         $.getJSON("./version.json?" + Math.random(), function (data) {

ui/ui/plugin-manager.tpl

@@ -8,19 +8,21 @@
                     <div class="col-md-4">
                         <div class="box box-hovered mb20 box-primary">
                             <div class="box-header">
-                                <h3 class="box-title">{$plugin['name']}</h3>
+                                <h3 class="box-title text1line">{$plugin['name']}</h3>
+                            </div>
+                            <div class="box-body" style="overflow-y: scroll;">
+                                <div style="max-height: 50px; min-height: 50px;">{$plugin['description']}</div>
                             </div>
-                            <div class="box-body">{$plugin['description']}<br><small><i>@{$plugin['author']} Last update: {$plugin['last_update']}</i></small></div>
                             <div class="box-footer ">
+                                <center><small><i>@{$plugin['author']} Last update: {$plugin['last_update']}</i></small></center>
                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                    <a href="{$plugin['url']}" target="_blank"
-                                        class="btn btn-primary"><i class="ion ion-chatboxes"></i> Website</a>
-                                    <a href="{$plugin['github']}" target="_blank"
-                                        class="btn btn-success"><i class="ion ion-chatboxes"></i> Github</a>
-                                    <a {if $zipExt }
-                                            href="{$_url}pluginmanager/install/plugin/{$plugin['id']}" onclick="return confirm('Installing plugin will take some time to complete, do not close the page while it loading to install the plugin')"
-                                        {else}
-                                            href="#" onclick="alert('PHP ZIP extension is not available')"
+                                    <a href="{$plugin['url']}" target="_blank" class="btn btn-primary"><i
+                                            class="ion ion-chatboxes"></i> Website</a>
+                                    <a href="{$plugin['github']}" target="_blank" class="btn btn-success"><i
+                                            class="ion ion-chatboxes"></i> Github</a>
+                                    <a {if $zipExt } href="{$_url}pluginmanager/install/plugin/{$plugin['id']}"
+                                            onclick="return confirm('Installing plugin will take some time to complete, do not close the page while it loading to install the plugin')"
+                                        {else} href="#" onclick="alert('PHP ZIP extension is not installed')" 
                                         {/if}
                                         class="btn btn-warning"><i class="ion ion-chatboxes"></i> Install</a>
                                 </div>
@@ -37,19 +39,21 @@
                     <div class="col-md-4">
                         <div class="box box-hovered mb20 box-primary">
                             <div class="box-header">
-                                <h3 class="box-title">{$pg['name']}</h3>
+                                <h3 class="box-title text1line">{$pg['name']}</h3>
+                            </div>
+                            <div class="box-body" style="overflow-y: scroll;">
+                                <div style="max-height: 50px; min-height: 50px;">{$pg['description']}</div>
                             </div>
-                            <div class="box-body">{$pg['description']}<br><small><i>@{$pg['author']} Last update: {$pg['last_update']}</i></small></div>
                             <div class="box-footer ">
+                                <center><small><i>@{$pg['author']} Last update: {$pg['last_update']}</i></small></center>
                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                    <a href="{$pg['url']}" target="_blank"
-                                        class="btn btn-primary"><i class="ion ion-chatboxes"></i> Website</a>
-                                    <a href="{$pg['github']}" target="_blank"
-                                        class="btn btn-success"><i class="ion ion-chatboxes"></i> Github</a>
-                                        <a {if $zipExt }
-                                            href="{$_url}pluginmanager/install/payment/{$pg['id']}" onclick="return confirm('Installing plugin will take some time to complete, do not close the page while it loading to install the plugin')"
-                                        {else}
-                                            href="#" onclick="alert('PHP ZIP extension is not available')"
+                                    <a href="{$pg['url']}" target="_blank" class="btn btn-primary"><i
+                                            class="ion ion-chatboxes"></i> Website</a>
+                                    <a href="{$pg['github']}" target="_blank" class="btn btn-success"><i
+                                            class="ion ion-chatboxes"></i> Github</a>
+                                    <a {if $zipExt } href="{$_url}pluginmanager/install/payment/{$pg['id']}"
+                                            onclick="return confirm('Installing plugin will take some time to complete, do not close the page while it loading to install the plugin')"
+                                        {else} href="#" onclick="alert('PHP ZIP extension is not available')" 
                                         {/if}
                                         class="btn btn-warning"><i class="ion ion-chatboxes"></i> Install</a>
                                 </div>

ui/ui/prepaid-edit.tpl

@@ -4,7 +4,7 @@
     <div class="col-sm-12">
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h3 class="panel-title">{$_L['Recharge_Account']}</h3>
+                <h3 class="panel-title">Edit Plan</h3>
             </div>
             <div class="panel-body">
                 <form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/edit-post">

ui/ui/router-error.tpl

@@ -57,9 +57,16 @@
                         <div class="box-footer">
                             <div class="btn-group btn-group-justified" role="group" aria-label="...">
                                 <a href="./update.php?step=4" class="btn btn-info btn-sm btn-block">Update Database</a>
-                                <a href="{$_url}community#update" class="btn btn-primary btn-sm btn-block">Update
+                                <a href="{$_url}community#update" class="btn btn-success btn-sm btn-block">Update
                                     PHPNuxBill</a>
                             </div>
+                            <br>
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                            <a href="https://github.com/hotspotbilling/phpnuxbill/discussions" target="_blank"
+                            class="btn btn-success btn-sm btn-block">Ask Github Community</a>
+                                <a href="https://t.me/phpnuxbill" target="_blank"
+                                    class="btn btn-primary btn-sm btn-block">Ask Telegram Community</a>
+                            </div>
                             <br><br>
                             <a href="javascript::history.back()" onclick="history.back()"
                                 class="btn btn-warning btn-block">back</a>

ui/ui/sections/header.tpl

@@ -30,6 +30,23 @@
         .select2-container .select2-selection--single .select2-selection__rendered {
             margin-top: 0px !important;
         }
+
+        @media (min-width: 768px) {
+            .outer {
+                height: 200px
+                    /* Or whatever */
+            }
+        }
+
+        .text1line {
+            display: block;
+            /* or inline-block */
+            text-overflow: ellipsis;
+            word-wrap: break-word;
+            overflow: hidden;
+            max-height: 1em;
+            line-height: 1em;
+        }
     </style>
 
     {if isset($xheader)}
@@ -252,15 +269,20 @@
                                         href="{$_url}settings/users">{$_L['Administrator_Users']}</a></li>
                                 <li {if $_routes[1] eq 'dbstatus'}class="active" {/if}><a
                                         href="{$_url}settings/dbstatus">{$_L['Backup_Restore']}</a></li>
-                                <li {if $_routes[0] eq 'pluginmanager'}class="active" {/if}>
-                                    <a href="{$_url}pluginmanager">{Lang::T('Plugin Manager')}</a>
-                                </li>
                                 <li {if $_system_menu eq 'paymentgateway'}class="active" {/if}>
                                     <a href="{$_url}paymentgateway">
                                         <span class="text">{Lang::T('Payment Gateway')}</span>
                                     </a>
                                 </li>
                                 {$_MENU_SETTINGS}
+                                <li {if $_routes[0] eq 'pluginmanager'}class="active" {/if}>
+                                    <a href="{$_url}pluginmanager"><i class="glyphicon glyphicon-tasks"></i>
+                                        {Lang::T('Plugin Manager')} <small class="label pull-right">Free</small></a>
+                                </li>
+                                <li {if $_routes[0] eq 'codecanyon'}class="active" {/if}>
+                                    <a href="{$_url}codecanyon"><i class="glyphicon glyphicon-shopping-cart"></i>
+                                        Codecanyon.net <small class="label pull-right">Paid</small></a>
+                                </li>
                             </ul>
                         </li>
                         {$_MENU_AFTER_SETTINGS}

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.1.16"
+    "version": "2024.2.5"
 }