2024.2.7

Dashboard Updates

.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,29 @@
 
 # CHANGELOG
 
+## 2024.2.7
+
+- Hide Dashboard content
+
+## 2024.2.6
+
+- Cache graph for faster opening graph
+
+## 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

install/phpnuxbill.sql

@@ -188,6 +188,8 @@ CREATE TABLE `tb_languages` (
   `id` int(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
+ALTER TABLE `tbl_voucher` ADD `generated_by` INT NOT NULL DEFAULT '0' COMMENT 'id admin' AFTER `status`;
+ALTER TABLE `tbl_users` ADD `root` INT NOT NULL DEFAULT '0' COMMENT 'for sub account' AFTER `id`;
 
 ALTER TABLE `tbl_appconfig`
   ADD PRIMARY KEY (`id`);

system/autoload/Lang.php

@@ -56,6 +56,24 @@ class Lang
         return date($config['date_format'] . ' H:i', strtotime("$date $time"));
     }
 
+    public static function timeElapsed($time){
+            $s = $time%60;
+            $m = floor(($time%3600)/60);
+            $h = floor(($time%86400)/3600);
+            $d = floor(($time%2592000)/86400);
+            $M = floor($time/2592000);
+            $result = '';
+            if($M>0){
+                $result = $M.'m ';
+            }
+            if($d>0){
+                $result .= $d.'d ';
+            }else if($M>0){
+                $result .= '0d ';
+            }
+            return "$result$h:$m:$s";
+    }
+
     public static function nl2br($text)
     {
         return nl2br($text);

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,17 +27,17 @@ 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']);
+                    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);
                         }
+                    } catch (Exception $e) {
+                        // ignore, add to logs
+                        _log("Failed to send SMS using Mikrotik.\n" . $e->getMessage(), 'SMS', 0);
                     }
-                }else{
+                } else {
                     try {
                         $mikrotik = Mikrotik::info($config['sms_url']);
                         $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
@@ -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);
             }
         }
     }
@@ -111,8 +111,9 @@ class Message
         $textInvoice = str_replace('[[phone]]', $config['phone'], $textInvoice);
         $textInvoice = str_replace('[[invoice]]', $trx['invoice'], $textInvoice);
         $textInvoice = str_replace('[[date]]', Lang::dateAndTimeFormat($trx['recharged_on'], $trx['recharged_time']), $textInvoice);
-        $textInvoice = str_replace('[[payment_gateway]]', $config['gateway'], $textInvoice);
-        $textInvoice = str_replace('[[payment_channel]]', $config['channel'], $textInvoice);
+        $gc = explode("-", $trx['method']);
+        $textInvoice = str_replace('[[payment_gateway]]', trim($gc[0]), $textInvoice);
+        $textInvoice = str_replace('[[payment_channel]]', trim($gc[1]), $textInvoice);
         $textInvoice = str_replace('[[type]]', $trx['type'], $textInvoice);
         $textInvoice = str_replace('[[plan_name]]', $trx['plan_name'], $textInvoice);
         $textInvoice = str_replace('[[plan_price]]',  Lang::moneyFormat($trx['price']), $textInvoice);

system/autoload/Mikrotik.php

@@ -514,4 +514,37 @@ class Mikrotik
             ->setArgument('message', $message);
         $client->sendSync($smsRequest);
     }
+
+    public static function addIpToAddressList($client, $ip, $listName, $comment = '')
+    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
+        $addRequest = new RouterOS\Request('/ip/firewall/address-list/add');
+        $client->sendSync(
+            $addRequest
+                ->setArgument('address', $ip)
+                ->setArgument('comment', $comment)
+                ->setArgument('list', $listName)
+        );
+    }
+
+    public static function removeIpFromAddressList($client, $ip)
+    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
+        $printRequest = new RouterOS\Request(
+            '/ip firewall address-list print .proplist=.id',
+            RouterOS\Query::where('address', $ip)
+        );
+        $id = $client->sendSync($printRequest)->getProperty('.id');
+        $removeRequest = new RouterOS\Request('/ip/firewall/address-list/remove');
+        $client->sendSync(
+            $removeRequest
+                ->setArgument('numbers', $id)
+        );
+    }
 }

system/autoload/Package.php

@@ -59,8 +59,8 @@ class Package
             $textInvoice = str_replace('[[phone]]', $_c['phone'], $textInvoice);
             $textInvoice = str_replace('[[invoice]]', $inv, $textInvoice);
             $textInvoice = str_replace('[[date]]', Lang::dateTimeFormat($date_now), $textInvoice);
-            $textInvoice = str_replace('[[payment_gateway]]', $_c['gateway'], $textInvoice);
-            $textInvoice = str_replace('[[payment_channel]]', $_c['channel'], $textInvoice);
+            $textInvoice = str_replace('[[payment_gateway]]', $gateway, $textInvoice);
+            $textInvoice = str_replace('[[payment_channel]]', $channel, $textInvoice);
             $textInvoice = str_replace('[[type]]', 'Balance', $textInvoice);
             $textInvoice = str_replace('[[plan_name]]', $p['name_plan'], $textInvoice);
             $textInvoice = str_replace('[[plan_price]]', Lang::moneyFormat($p['price']), $textInvoice);
@@ -316,8 +316,7 @@ class Package
                 "\nPrice: " . Lang::moneyFormat($p['price']));
         }
 
-        $in = ORM::for_table('tbl_transactions')->where('username', $c['username'])->order_by_desc('id')->find_one();
-        Message::sendInvoice($c, $in);
+        Message::sendInvoice($c, $t);
         return true;
     }
 

system/controllers/dashboard.php

@@ -51,26 +51,28 @@ if (empty($c_all)) {
 }
 $ui->assign('c_all', $c_all);
 
-//user expire
-$paginator = Paginator::build(ORM::for_table('tbl_user_recharges'));
-$expire = ORM::for_table('tbl_user_recharges')
-    ->where_lte('expiration', $mdate)
-    ->offset($paginator['startpoint'])
-    ->limit($paginator['limit'])
-    ->order_by_desc('expiration')
-    ->find_many();
+if($config['hide_uet'] != 'yes'){
+    //user expire
+    $paginator = Paginator::build(ORM::for_table('tbl_user_recharges'));
+    $expire = ORM::for_table('tbl_user_recharges')
+        ->where_lte('expiration', $mdate)
+        ->offset($paginator['startpoint'])
+        ->limit($paginator['limit'])
+        ->order_by_desc('expiration')
+        ->find_many();
 
-// Get the total count of expired records for pagination
-$totalCount = ORM::for_table('tbl_user_recharges')
-    ->where_lte('expiration', $mdate)
-    ->count();
+    // Get the total count of expired records for pagination
+    $totalCount = ORM::for_table('tbl_user_recharges')
+        ->where_lte('expiration', $mdate)
+        ->count();
 
-// Pass the total count and current page to the paginator
-$paginator['total_count'] = $totalCount;
+    // Pass the total count and current page to the paginator
+    $paginator['total_count'] = $totalCount;
 
-// Assign the pagination HTML to the template variable
-$ui->assign('paginator', $paginator);
-$ui->assign('expire', $expire);
+    // Assign the pagination HTML to the template variable
+    $ui->assign('paginator', $paginator);
+    $ui->assign('expire', $expire);
+}
 
 //activity log
 $dlog = ORM::for_table('tbl_logs')->limit(5)->order_by_desc('id')->find_many();
@@ -78,28 +80,113 @@ $ui->assign('dlog', $dlog);
 $log = ORM::for_table('tbl_logs')->count();
 $ui->assign('log', $log);
 
-// Count stock
-$tmp = $v = ORM::for_table('tbl_plans')->select('id')->select('name_plan')->find_many();
-$plans = array();
-$stocks = array("used" => 0, "unused" => 0);
-$n = 0;
-foreach ($tmp as $plan) {
-    $unused = ORM::for_table('tbl_voucher')
-        ->where('id_plan', $plan['id'])
-        ->where('status', 0)->count();
-    $used = ORM::for_table('tbl_voucher')
-        ->where('id_plan', $plan['id'])
-        ->where('status', 1)->count();
-    if($unused>0 || $used>0){
-        $plans[$n]['name_plan'] = $plan['name_plan'];
-        $plans[$n]['unused'] = $unused;
-        $plans[$n]['used'] = $used;
-        $stocks["unused"] += $unused;
-        $stocks["used"] += $used;
-        $n++;
+
+if($config['hide_vs'] != 'yes'){
+    $cacheStocksfile = File::pathFixer('system/cache/VoucherStocks.temp');
+    $cachePlanfile = File::pathFixer('system/cache/VoucherPlans.temp');
+    //Cache for 5 minutes
+    if(file_exists($cacheStocksfile) && time()- filemtime($cacheStocksfile) < 600){
+        $stocks = json_decode(file_get_contents($cacheStocksfile), true);
+        $plans = json_decode(file_get_contents($cachePlanfile), true);
+    }else{
+        // Count stock
+        $tmp = $v = ORM::for_table('tbl_plans')->select('id')->select('name_plan')->find_many();
+        $plans = array();
+        $stocks = array("used" => 0, "unused" => 0);
+        $n = 0;
+        foreach ($tmp as $plan) {
+            $unused = ORM::for_table('tbl_voucher')
+                ->where('id_plan', $plan['id'])
+                ->where('status', 0)->count();
+            $used = ORM::for_table('tbl_voucher')
+                ->where('id_plan', $plan['id'])
+                ->where('status', 1)->count();
+            if ($unused > 0 || $used > 0) {
+                $plans[$n]['name_plan'] = $plan['name_plan'];
+                $plans[$n]['unused'] = $unused;
+                $plans[$n]['used'] = $used;
+                $stocks["unused"] += $unused;
+                $stocks["used"] += $used;
+                $n++;
+            }
+        }
+        file_put_contents($cacheStocksfile, json_encode($stocks));
+        file_put_contents($cachePlanfile, json_encode($plans));
     }
 }
 
+$cacheMRfile = File::pathFixer('system/cache/monthlyRegistered.temp');
+//Cache for 1 hour
+if(file_exists($cacheMRfile) && time()- filemtime($cacheMRfile) < 3600){
+    $monthlyRegistered = json_decode(file_get_contents($cacheMRfile), true);
+}else{
+    //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();
+
+    $monthlyRegistered = [];
+    foreach ($result as $row) {
+        $monthlyRegistered[] = [
+            'date' => $row->month,
+            'count' => $row->count
+        ];
+    }
+    file_put_contents($cacheMRfile, json_encode($monthlyRegistered));
+}
+
+$cacheMSfile = File::pathFixer('system/cache/monthlySales.temp');
+//Cache for 12 hours
+if(file_exists($cacheMSfile) && time()- filemtime($cacheMSfile) < 43200){
+    $monthlySales = json_decode(file_get_contents($cacheMSfile), true);
+}else{
+    // Query to retrieve monthly data
+    $results = 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();
+
+    // 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);
+    file_put_contents($cacheMSfile, json_encode($monthlySales));
+}
+
+// Assign the monthly sales data to Smarty
+$ui->assign('monthlySales', $monthlySales);
+$ui->assign('xfooter', '');
+$ui->assign('monthlyRegistered', $monthlyRegistered);
 $ui->assign('stocks', $stocks);
 $ui->assign('plans', $plans);
 

system/controllers/prepaid.php

@@ -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();
-            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']);
+            if($d['status'] == 'on'){
+                Package::changeTo($username, $id_plan, $id);
+            }
+            _log('[' . $admin['username'] . ']: ' . 'Edit Plan for Customer ' . $d['username'] . ' to [' . $d['namebp'] . '][' . Lang::moneyFormat($p['price']) . ']', 'Admin', $admin['id']);
             r2(U . 'prepaid/list', 's', $_L['Updated_Successfully']);
         } else {
             r2(U . 'prepaid/edit/' . $id, 'e', $msg);
@@ -443,6 +452,7 @@ switch ($action) {
                 $d->code = $prefix.$code;
                 $d->user = '0';
                 $d->status = '0';
+                $d->generated_by = $admin['id'];
                 $d->save();
             }
 

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 {
@@ -272,7 +286,7 @@ switch ($action) {
                 }
             }
             // save all settings
-            foreach($_POST as $key => $value) {
+            foreach ($_POST as $key => $value) {
                 $d = ORM::for_table('tbl_appconfig')->where('setting', $key)->find_one();
                 if ($d) {
                     $d->value = $value;
@@ -285,6 +299,23 @@ switch ($action) {
                 }
             }
 
+            //checkbox
+            $checks = ['hide_mrc','hide_tms','hide_aui','hide_al','hide_uet','hide_vs','hide_pg'];
+            foreach ($checks as $check) {
+                if(!isset($_POST[$check])){
+                    $d = ORM::for_table('tbl_appconfig')->where('setting', $check)->find_one();
+                    if ($d) {
+                        $d->value = 'no';
+                        $d->save();
+                    } else {
+                        $d = ORM::for_table('tbl_appconfig')->create();
+                        $d->setting = $check;
+                        $d->value = 'no';
+                        $d->save();
+                    }
+                }
+            }
+
             _log('[' . $admin['username'] . ']: ' . $_L['Settings_Saved_Successfully'], 'Admin', $admin['id']);
 
             r2(U . 'settings/app', 's', $_L['Settings_Saved_Successfully']);

system/cron.php

@@ -81,6 +81,7 @@ $result = ORM::for_table('tbl_appconfig')->find_many();
 foreach ($result as $value) {
     $config[$value['setting']] = $value['value'];
 }
+date_default_timezone_set($config['timezone']);
 
 if (!empty($radius_user) && $config['radius_enable']) {
     ORM::configure("mysql:host=$radius_host;dbname=$radius_name", null, 'radius');
@@ -100,7 +101,6 @@ while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
 
 $_c = $config;
 
-date_default_timezone_set($config['timezone']);
 
 $textExpired = Lang::getNotifText('expired');
 
@@ -153,7 +153,7 @@ foreach ($d as $ds) {
                         echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
                         echo "auto renewall Failed\n";
                         Message::sendTelegram("FAILED RENEWAL #cron\n\n#u$c[username] #buy #Hotspot \n" . $p['name_plan'] .
-                            "\nRouter: " . $router_name .
+                            "\nRouter: " . $p['routers'] .
                             "\nPrice: " . $p['price']);
                     }
                 } else {
@@ -208,7 +208,7 @@ foreach ($d as $ds) {
                         echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
                         echo "auto renewall Failed\n";
                         Message::sendTelegram("FAILED RENEWAL #cron\n\n#u$c[username] #buy #PPPOE \n" . $p['name_plan'] .
-                            "\nRouter: " . $router_name .
+                            "\nRouter: " . $p['routers'] .
                             "\nPrice: " . $p['price']);
                     }
                 }

system/lan/english/common.lan.php

@@ -424,3 +424,7 @@ $_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active p
 $_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';
+$_L['All_Users_Insights'] = 'All Users Insights';

system/lan/indonesia/common.lan.php

@@ -408,4 +408,7 @@ $_L['Resend_To_Customer'] = 'Kirim Ulang Ke Pelanggan';
 $_L['Service_Type'] = 'Service Type';
 $_L['Others'] = 'Lainnya';
 $_L['PPPoE'] = 'PPPoE';
-$_L['Hotspot'] = 'Hotspot';
+$_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

@@ -405,4 +405,7 @@ $_L['Voucher_Format'] = 'Voucher Format';
 $_L['Service_Type'] = 'Service Type';
 $_L['Others'] = 'Others';
 $_L['PPPoE'] = 'PPPoE';
-$_L['Hotspot'] = 'Hotspot';
+$_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

@@ -382,4 +382,7 @@ $_L['Voucher_Format'] = 'Voucher Format';
 $_L['Service_Type'] = 'Service Type';
 $_L['Others'] = 'Others';
 $_L['PPPoE'] = 'PPPoE';
-$_L['Hotspot'] = 'Hotspot';
+$_L['Hotspot'] = 'Hotspot';
+$_L['Monthly_Registered_Customers'] = 'Monthly Registered Customers';
+$_L['Total_Monthly_Sales'] = 'Total Monthly Sales';
+$_L['Active_Users'] = 'Active Users';

system/updates.json

@@ -41,5 +41,9 @@
     ],
 	"2024.1.11": [
         "ALTER TABLE `tbl_plans` ADD `allow_purchase` ENUM('yes','no') DEFAULT 'yes' COMMENT 'allow to show package in buy package page' AFTER `enabled`;"
+    ],
+    "2024.2.7": [
+        "ALTER TABLE `tbl_voucher` ADD `generated_by` INT NOT NULL DEFAULT '0' COMMENT 'id admin' AFTER `status`;",
+        "ALTER TABLE `tbl_users` ADD `root` INT NOT NULL DEFAULT '0' COMMENT 'for sub account' AFTER `id`;"
     ]
 }

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>
@@ -85,6 +86,24 @@
                         <p class="help-block col-md-4">edit at config.php</p>
                     </div>
                 </div>
+                <div class="panel-heading">
+                    <div class="btn-group pull-right">
+                        <button class="btn btn-primary btn-xs" title="save" type="submit"><span
+                                class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
+                    </div>
+                    Hide Dashboard Content
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-3 control-label"><input type="checkbox" name="hide_mrc" value="yes" {if $_c['hide_mrc'] eq 'yes'}checked{/if}> {Lang::T('Monthly Registered Customers')}</label>
+                        <label class="col-md-2 control-label"><input type="checkbox" name="hide_tms" value="yes" {if $_c['hide_tms'] eq 'yes'}checked{/if}> {Lang::T('Total Monthly Sales')}</label>
+                        <label class="col-md-2 control-label"><input type="checkbox" name="hide_aui" value="yes" {if $_c['hide_aui'] eq 'yes'}checked{/if}> {Lang::T('All Users Insights')}</label>
+                        <label class="col-md-2 control-label"><input type="checkbox" name="hide_al" value="yes" {if $_c['hide_al'] eq 'yes'}checked{/if}> {$_L['Activity_Log']}</label>
+                        <label class="col-md-2 control-label"><input type="checkbox" name="hide_uet" value="yes" {if $_c['hide_uet'] eq 'yes'}checked{/if}> {$_L['User_Expired_Today']}</label>
+                        <label class="col-md-2 control-label"><input type="checkbox" name="hide_vs" value="yes" {if $_c['hide_vs'] eq 'yes'}checked{/if}> Vouchers Stock</label>
+                        <label class="col-md-2 control-label"><input type="checkbox" name="hide_pg" value="yes" {if $_c['hide_pg'] eq 'yes'}checked{/if}> Payment Gateway</label>
+                    </div>
+                </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
@@ -218,6 +237,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 +264,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 +302,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,7 +435,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="panel-heading" id="envato">
+                {* <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>
@@ -427,17 +449,20 @@
                             <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>
+                        <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 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>
 
             <div class="panel-body">
@@ -465,4 +490,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/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,92 +60,314 @@
         </div>
     </div>
 </div>
+<!-- solid sales graph -->
+{if $_c['hide_mrc'] != 'yes'}
+    <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>
+{/if}
+
+<!-- solid sales graph -->
+{if $_c['hide_tms'] != 'yes'}
+    <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>
+{/if}
 <div class="row">
     <div class="col-md-7">
         {if $_c['disable_voucher'] != 'yes' && $stocks['unused']>0 || $stocks['used']>0}
-            <div class="panel panel-primary mb20 panel-hovered project-stats table-responsive">
-                <div class="panel-heading">Vouchers Stock</div>
+            {if $_c['hide_vs'] != 'yes'}
+                <div class="panel panel-primary mb20 panel-hovered project-stats table-responsive">
+                    <div class="panel-heading">Vouchers Stock</div>
+                    <div class="table-responsive">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <th>{$_L['Plan_Name']}</th>
+                                    <th>unused</th>
+                                    <th>used</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {foreach $plans as $stok}
+                                    <tr>
+                                        <td>{$stok['name_plan']}</td>
+                                        <td>{$stok['unused']}</td>
+                                        <td>{$stok['used']}</td>
+                                    </tr>
+                                </tbody>
+                            {/foreach}
+                            <tr>
+                                <td>Total</td>
+                                <td>{$stocks['unused']}</td>
+                                <td>{$stocks['used']}</td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            {/if}
+        {/if}
+        {if $_c['hide_uet'] != 'yes'}
+            <div class="panel panel-warning mb20 panel-hovered project-stats table-responsive">
+                <div class="panel-heading">{$_L['User_Expired_Today']}</div>
                 <div class="table-responsive">
                     <table class="table">
                         <thead>
                             <tr>
-                                <th>{$_L['Plan_Name']}</th>
-                                <th>unused</th>
-                                <th>used</th>
+                                <th>Id</th>
+                                <th>{$_L['Username']}</th>
+                                <th>{$_L['Created_On']}</th>
+                                <th>{$_L['Expires_On']}</th>
                             </tr>
                         </thead>
                         <tbody>
-                            {foreach $plans as $stok}
+                            {$no = 1}
+                            {foreach $expire as $expired}
                                 <tr>
-                                    <td>{$stok['name_plan']}</td>
-                                    <td>{$stok['unused']}</td>
-                                    <td>{$stok['used']}</td>
+                                    <td>{$no++}</td>
+                                    <td><a href="{$_url}customers/viewu/{$expired['username']}">{$expired['username']}</a></td>
+                                    <td>{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}
+                                    </td>
+                                    <td>{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}
+                                    </td>
                                 </tr>
                             </tbody>
                         {/foreach}
-                        <tr>
-                            <td>Total</td>
-                            <td>{$stocks['unused']}</td>
-                            <td>{$stocks['used']}</td>
-                        </tr>
                     </table>
                 </div>
+                &nbsp; {$paginator['contents']}
+            </div>
+        {/if}
+    </div>
+
+
+    <div class="col-md-5">
+        {if $_c['hide_pg'] != 'yes'}
+            <div class="panel panel-success panel-hovered mb20 activities">
+                <div class="panel-heading">{Lang::T('Payment Gateway')}: {$_c['payment_gateway']}</div>
+            </div>
+        {/if}
+        {if $_c['hide_aui'] != 'yes'}
+            <div class="panel panel-info panel-hovered mb20 activities">
+                <div class="panel-heading">{Lang::T('All Users Insights')}</div>
+                <div class="panel-body">
+                    <canvas id="userRechargesChart"></canvas>
+                </div>
             </div>
         {/if}
-        <div class="panel panel-warning mb20 panel-hovered project-stats table-responsive">
-            <div class="panel-heading">{$_L['User_Expired_Today']}</div>
-            <div class="table-responsive">
-                <table class="table">
-                    <thead>
-                        <tr>
-                            <th>Id</th>
-                            <th>{$_L['Username']}</th>
-                            <th>{$_L['Created_On']}</th>
-                            <th>{$_L['Expires_On']}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {$no = 1}
-                        {foreach $expire as $expired}
-                            <tr>
-                                <td>{$no++}</td>
-                                <td><a href="{$_url}customers/viewu/{$expired['username']}">{$expired['username']}</a></td>
-                                <td>{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}
-                                </td>
-                                <td>{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}
-                                </td>
-                            </tr>
-                        </tbody>
-                    {/foreach}
-                </table>
+        {if $_c['hide_al'] != 'yes'}
+            <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">
+                    <ul class="list-unstyled">
+                        {foreach $dlog as $dlogs}
+                            <li class="primary">
+                                <span class="point"></span>
+                                <span class="time small text-muted">{time_elapsed_string($dlogs['date'],true)}</span>
+                                <p>{$dlogs['description']}</p>
+                            </li>
+                        {/foreach}
+                    </ul>
+                </div>
             </div>
-            &nbsp; {$paginator['contents']}
-        </div>
+        {/if}
     </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"><a href="{$_url}logs">{$_L['Activity_Log']}</a></div>
-            <div class="panel-body">
-                <ul class="list-unstyled">
-                    {foreach $dlog as $dlogs}
-                        <li class="primary">
-                            <span class="point"></span>
-                            <span class="time small text-muted">{time_elapsed_string($dlogs['date'],true)}</span>
-                            <p>{$dlogs['description']}</p>
-                        </li>
-                    {/foreach}
-                </ul>
-            </div>
-        </div>
-    </div>
 
 </div>
 
+
+<script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
+
+<script type="text/javascript">
+    {if $_c['hide_mrc'] != 'yes'}
+        {literal}
+            document.addEventListener("DOMContentLoaded", function() {
+                var counts = JSON.parse('{/literal}{$monthlyRegistered|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)'
+                                }
+                            }
+                        }
+                    }
+                });
+            });
+        {/literal}
+    {/if}
+    {if $_c['hide_tmc'] != 'yes'}
+        {literal}
+            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;
+            }
+        {/literal}
+    {/if}
+    {if $_c['hide_aui'] != 'yes'}
+        {literal}
+            document.addEventListener("DOMContentLoaded", function() {
+                // Get the data from PHP and assign it to JavaScript variables
+                var u_act = '{/literal}{$u_act}{literal}';
+                var c_all = '{/literal}{$c_all}{literal}';
+                var u_all = '{/literal}{$u_all}{literal}';
+                //lets calculate the inactive users as reported
+                var expired = u_all - u_act;
+                var inactive = c_all - u_all;
+                // Create the chart data
+                var data = {
+                    labels: ['Active Users', 'Expired Users', 'Inactive Users'],
+                    datasets: [{
+                        label: 'User Recharges',
+                        data: [parseInt(u_act), parseInt(expired), parseInt(inactive)],
+                        backgroundColor: ['rgba(4, 191, 13)', 'rgba(191, 35, 4)', 'rgba(0, 0, 255, 0.5'],
+                        borderColor: ['rgba(0, 255, 0, 1)', 'rgba(255, 99, 132, 1)', 'rgba(0, 0, 255, 0.7'],
+                        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
+                });
+            });
+        {/literal}
+    {/if}
+</script>
 <script>
     window.addEventListener('DOMContentLoaded', function() {
         $.getJSON("./version.json?" + Math.random(), function(data) {

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/sections/header.tpl

@@ -279,10 +279,10 @@
                                     <a href="{$_url}pluginmanager"><i class="glyphicon glyphicon-tasks"></i>
                                         {Lang::T('Plugin Manager')} <small class="label pull-right">Free</small></a>
                                 </li>
-                                <li {if $_routes[0] eq 'codecanyon'}class="active" {/if}>
+                                {* <li {if $_routes[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>
+                                </li> *}
                             </ul>
                         </li>
                         {$_MENU_AFTER_SETTINGS}

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.1.19"
+    "version": "2024.2.7"
 }