Merge branch 'Development' of https://github.com/Focuslinkstech/phpnuxbill into Development

install/phpnuxbill.sql

@@ -322,3 +322,4 @@ ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `
 ALTER TABLE `tbl_plans` CHANGE `allow_purchase` `prepaid` ENUM('yes','no') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'yes' COMMENT 'is prepaid';
 ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;
 ALTER TABLE `tbl_payment_gateway` ADD `trx_invoice` VARCHAR(25) NOT NULL DEFAULT '' COMMENT 'from tbl_transactions' AFTER `paid_date`;
+ALTER TABLE `tbl_customers` ADD `status` ENUM('Active','Banned','Disabled') NOT NULL DEFAULT 'Active' AFTER `auto_renewal`;

system/autoload/Package.php

@@ -34,6 +34,10 @@ class Package
         $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
         $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one();
 
+        if($c['status'] != 'Active'){
+            _alert(Lang::T('This account status').' : '.Lang::T($c['status']),'danger', "");
+        }
+
         $add_cost = 0;
         $bills = [];
         // Zero cost recharge

system/autoload/User.php

@@ -163,7 +163,9 @@ class User
             $id = User::getID();
         }
         $d = ORM::for_table('tbl_customers')->find_one($id);
-
+        if ($d['status'] != 'Banned') {
+            _alert(Lang::T('This account status') . ' : ' . Lang::T($d['status']), 'danger', "logout");
+        }
         if (empty($d['username'])) {
             r2(U . 'logout', 'd', '');
         }

system/controllers/customers.php

@@ -459,6 +459,7 @@ switch ($action) {
         $phonenumber = Lang::phoneFormat(_post('phonenumber'));
         $service_type = _post('service_type');
         $coordinates = _post('coordinates');
+        $status = _post('status');
         run_hook('edit_customer'); #HOOK
         $msg = '';
         if (Validator::Length($username, 35, 2) == false) {
@@ -517,6 +518,7 @@ switch ($action) {
             $d->email = $email;
             $d->account_type = $account_type;
             $d->address = $address;
+            $d->status = $status;
             $d->phonenumber = $phonenumber;
             $d->service_type = $service_type;
             $d->coordinates = $coordinates;
@@ -606,19 +608,33 @@ switch ($action) {
     default:
         run_hook('list_customers'); #HOOK
         $search = _post('search');
+        $order = _post('order', 'username');
+        $orderby = _post('orderby', 'asc');
+        $order_pos = [
+            'username' => 0,
+            'created_at' => 8,
+            'balance' => 3
+        ];
+
         if ($search != '') {
             $query = ORM::for_table('tbl_customers')
                 ->whereRaw("username LIKE '%$search%' OR fullname LIKE '%$search%' OR address LIKE '%$search%' ".
-                "OR phonenumber LIKE '%$search%' OR email LIKE '%$search%' ")
+                "OR phonenumber LIKE '%$search%' OR email LIKE '%$search%' ");
-                ->order_by_asc('username');
-            $d = $query->findMany();
         } else {
-            $query = ORM::for_table('tbl_customers')->order_by_asc('username');
+            $query = ORM::for_table('tbl_customers');
+        }
+        if($orderby=='asc'){
+            $query->order_by_asc($order);
+        }else{
+            $query->order_by_desc($order);
         }
         $d = $query->findMany();
         $ui->assign('xheader', '<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.min.css">');
         $ui->assign('d', $d);
         $ui->assign('search', $search);
+        $ui->assign('order', $order);
+        $ui->assign('order_pos', $order_pos[$order]);
+        $ui->assign('orderby', $orderby);
         $ui->display('customers.tpl');
         break;
 }

system/controllers/home.php

@@ -18,6 +18,9 @@ if (isset($_GET['renewal'])) {
 
 if (_post('send') == 'balance') {
     if ($config['enable_balance'] == 'yes' && $config['allow_balance_transfer'] == 'yes') {
+        if ($user['status'] != 'Active') {
+            _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
+        }
         $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one();
         if (!$target) {
             r2(U . 'home', 'd', Lang::T('Username not found'));
@@ -77,6 +80,9 @@ if (_post('send') == 'balance') {
         r2(U . 'home', 'd', Lang::T('Failed, balance is not available'));
     }
 } else if (_post('send') == 'plan') {
+    if ($user['status'] != 'Active') {
+        _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
+    }
     $actives = ORM::for_table('tbl_user_recharges')
         ->where('username', _post('username'))
         ->find_many();
@@ -92,6 +98,9 @@ if (_post('send') == 'balance') {
 $ui->assign('_bills', User::_billing());
 
 if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
+    if ($user['status'] != 'Active') {
+        _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
+    }
     if (!empty(App::getTokenValue(_get('stoken')))) {
         r2(U . "voucher/invoice/");
         die();
@@ -119,7 +128,10 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
         }
     }
 } else if (!empty(_get('extend'))) {
-    if(!$config['extend_expired']){
+    if ($user['status'] != 'Active') {
+        _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
+    }
+    if (!$config['extend_expired']) {
         r2(U . 'home', 'e', "cannot extend");
     }
     if (!empty(App::getTokenValue(_get('stoken')))) {
@@ -130,7 +142,7 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
     if ($tur) {
         $m = date("m");
         $path = $CACHE_PATH . DIRECTORY_SEPARATOR . "extends" . DIRECTORY_SEPARATOR;
-        if(!file_exists($path)){
+        if (!file_exists($path)) {
             mkdir($path);
         }
         $path .= $user['id'] . ".txt";
@@ -148,7 +160,7 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
                 $router = $tur['routers'];
             }
             $p = ORM::for_table('tbl_plans')->findOne($tur['plan_id']);
-            if(!$p){
+            if (!$p) {
                 r2(U . 'home', '3', "Plan Not Found");
             }
             if ($tur['routers'] == 'radius') {
@@ -171,12 +183,12 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
             App::setToken(_get('stoken'), $id);
             file_put_contents($path, $m);
             _log("Customer $tur[customer_id] $tur[username] extend for $days days", "Customer", $user['id']);
-            Message::sendTelegram("#u$user[username] #extend #".$p['type']." \n" . $p['name_plan'] .
+            Message::sendTelegram("#u$user[username] #extend #" . $p['type'] . " \n" . $p['name_plan'] .
                 "\nLocation: " . $p['routers'] .
                 "\nCustomer: " . $user['fullname'] .
                 "\nNew Expired: " . Lang::dateAndTimeFormat($expiration, $tur['time']));
             r2(U . 'home', 's', "Extend until $expiration");
-        }else{
+        } else {
             r2(U . 'home', 'e', "Plan is not expired");
         }
     } else {

system/controllers/login.php

@@ -5,8 +5,8 @@
  *  by https://t.me/ibnux
  **/
 
-if(User::getID()){
+if (User::getID()) {
-    r2(U.'home');
+    r2(U . 'home');
 }
 
 if (isset($routes['1'])) {
@@ -24,13 +24,16 @@ switch ($do) {
             $d = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
             if ($d) {
                 $d_pass = $d['password'];
+                if ($d['status'] != 'Banned') {
+                    _alert(Lang::T('This account status') . ' : ' . Lang::T($d['status']), 'danger', "");
+                }
                 if (Password::_uverify($password, $d_pass) == true) {
                     $_SESSION['uid'] = $d['id'];
                     User::setCookie($d['id']);
                     $d->last_login = date('Y-m-d H:i:s');
                     $d->save();
                     _log($username . ' ' . Lang::T('Login Successful'), 'User', $d['id']);
-                    _alert(Lang::T('Login Successful'),'success', "home");
+                    _alert(Lang::T('Login Successful'), 'success', "home");
                 } else {
                     _msglog('e', Lang::T('Invalid Username or Password'));
                     _log($username . ' ' . Lang::T('Failed Login'), 'User');
@@ -68,7 +71,7 @@ switch ($do) {
                         r2(U . 'login', 'e', Lang::T('Voucher activation failed'));
                     }
                 } else {
-                    _alert(Lang::T('Login Successful'),'success', "dashboard");
+                    _alert(Lang::T('Login Successful'), 'success', "dashboard");
                     r2(U . 'login', 'e', Lang::T('Voucher activation failed') . '.');
                 }
             }

system/controllers/order.php

@@ -148,6 +148,9 @@ switch ($action) {
             r2(U . "voucher/invoice/");
             die();
         }
+        if($user['status'] != 'Active'){
+            _alert(Lang::T('This account status').' : '.Lang::T($user['status']),'danger', "");
+        }
         $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
         if (empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
@@ -181,6 +184,9 @@ switch ($action) {
         if ($config['enable_balance'] != 'yes') {
             r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
         }
+        if($user['status'] != 'Active'){
+            _alert(Lang::T('This account status').' : '.Lang::T($user['status']),'danger', "");
+        }
         $ui->assign('_title', Lang::T('Buy for friend'));
         $ui->assign('_system_menu', 'package');
         $plan = ORM::for_table('tbl_plans')->find_one($routes['3']);
@@ -322,6 +328,9 @@ switch ($action) {
         } else if (!empty($gateway)) {
             $_SESSION['gateway'] = $gateway;
         }
+        if($user['status'] != 'Active'){
+            _alert(Lang::T('This account status').' : '.Lang::T($user['status']),'danger', "");
+        }
         if (empty($gateway)) {
             r2(U . 'order/gateway/' . $routes[2] . '/' . $routes[3], 'w', Lang::T("Please select Payment Gateway"));
         }

system/lan/english.json

@@ -581,5 +581,13 @@
     "Created___Expired": "Created \/ Expired",
     "Bank_Transfer": "Bank Transfer",
     "Recharge_Using": "Recharge Using",
-    "ago": "ago"
+    "ago": "ago",
+    "Disabled": "Disabled",
+    "Banned": "Banned",
+    "Customer_cannot_login_again": "Customer cannot login again",
+    "Customer_can_login_but_cannot_buy_internet_plan__Admin_cannot_recharge_customer": "Customer can login but cannot buy internet plan, Admin cannot recharge customer",
+    "Don_t_forget_to_deactivate_all_active_plan_too": "Don't forget to deactivate all active plan too",
+    "Ascending": "Ascending",
+    "Descending": "Descending",
+    "Created_Date": "Created Date"
 }

system/updates.json

@@ -93,5 +93,8 @@
     ],
     "2024.4.5" : [
         "ALTER TABLE `tbl_payment_gateway` ADD `trx_invoice` VARCHAR(25) NOT NULL DEFAULT '' COMMENT 'from tbl_transactions' AFTER `paid_date`;"
+    ],
+    "2024.5.17" : [
+        "ALTER TABLE `tbl_customers` ADD `status` ENUM('Active','Banned','Disabled') NOT NULL DEFAULT 'Active' AFTER `auto_renewal`;"
     ]
 }

ui/ui/customers-edit.tpl

@@ -3,7 +3,7 @@
 <form class="form-horizontal" method="post" role="form" action="{$_url}customers/edit-post">
     <div class="row">
         <div class="col-md-6">
-            <div class="panel panel-primary panel-hovered panel-stacked mb30">
+            <div class="panel panel-{if $d['status']=='Active'}primary{else}danger{/if} panel-hovered panel-stacked mb30">
                 <div class="panel-heading">{Lang::T('Edit Contact')}</div>
                 <div class="panel-body">
                     <input type="hidden" name="id" value="{$d['id']}">
@@ -108,6 +108,26 @@
                             <div id="map" style="width: '100%'; height: 200px; min-height: 150px;"></div>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{Lang::T('Status')}</label>
+                        <div class="col-md-9">
+                            <select class="form-control" id="status" name="status">
+                                <option value="Active" {if $d['status'] eq 'Active' }selected{/if}>{Lang::T('Active')}
+                                </option>
+                                <option value="Disabled" {if $d['status'] eq 'Disabled' }selected{/if}>
+                                    {Lang::T('Disabled')}
+                                </option>
+                                <option value="Banned" {if $d['status'] eq 'Banned' }selected{/if}>
+                                    {Lang::T('Banned')}
+                                </option>
+                            </select>
+                            <span class="help-block">
+                                {Lang::T('Banned')}: {Lang::T('Customer cannot login again')}.<br>
+                                {Lang::T('Disabled')}: {Lang::T('Customer can login but cannot buy internet plan, Admin cannot recharge customer')}.<br>
+                                {Lang::T('Don\'t forget to deactivate all active plan too')}.
+                            </span>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -219,13 +239,15 @@
         });
         }
         window.onload = function() {
-            {/literal}{if $d['coordinates']}
+            {/literal}
+                {if $d['coordinates']}
                     setupMap({$d['coordinates']});
                 {else}
                     getLocation();
-            {/if}{literal}
+                    {/if}
+                        {literal}
                         }
                     </script>
-{/literal}
+                {/literal}
 
-{include file="sections/footer.tpl"}
+                {include file="sections/footer.tpl"}

ui/ui/customers-view.tpl

@@ -2,15 +2,17 @@
 
 <div class="row">
     <div class="col-sm-4 col-md-4">
-        <div class="box box-primary">
+        <div class="box box-{if $d['status']=='Active'}primary{else}danger{/if}">
             <div class="box-body box-profile">
                 <img class="profile-user-img img-responsive img-circle"
                     src="https://robohash.org/{$d['id']}?set=set3&size=100x100&bgset=bg1"
                     onerror="this.src='{$UPLOAD_PATH}/user.default.jpg'" alt="avatar">
-
                 <h3 class="profile-username text-center">{$d['fullname']}</h3>
-
                 <ul class="list-group list-group-unbordered">
+                    <li class="list-group-item">
+                        <b>{Lang::T('Status')}</b> <span
+                            class="pull-right {if $d['status'] !='Active'}bg-red{/if}">&nbsp;{Lang::T($d['status'])}&nbsp;</span>
+                    </li>
                     <li class="list-group-item">
                         <b>{Lang::T('Username')}</b> <span class="pull-right">{$d['username']}</span>
                     </li>
@@ -233,9 +235,9 @@
 </div>
 
 {if $d['coordinates']}
-{literal}
+    {literal}
-<script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
+        <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
-<script>
+        <script>
             function setupMap(lat, lon) {
                 var map = L.map('map').setView([lat, lon], 17);
                 L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
@@ -249,7 +251,7 @@
             window.onload = function() {
                 {/literal}setupMap({$d['coordinates']});{literal}
             }
-</script>
+        </script>
-{/literal}
+    {/literal}
 {/if}
 {include file="sections/footer.tpl"}

ui/ui/customers.tpl

@@ -25,9 +25,29 @@
                 {Lang::T('Manage Contact')}
             </div>
             <div class="panel-body">
-                <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
-                    <div class="col-md-8">
                 <form id="site-search" method="post" action="{$_url}customers">
+                    <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
+                        <div class="col-lg-4">
+                            <div class="input-group">
+                                <span class="input-group-addon">Order &nbsp;&nbsp;</span>
+                                <div class="row row-no-gutters">
+                                    <div class="col-xs-8">
+                                        <select class="form-control" id="order" name="order">
+                                            <option value="username" {if $order eq 'username' }selected{/if}>{Lang::T('Username')}</option>
+                                            <option value="created_at" {if $order eq 'created_at' }selected{/if}>{Lang::T('Created Date')}</option>
+                                            <option value="balance" {if $order eq 'balance' }selected{/if}>{Lang::T('Balance')}</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-xs-4">
+                                        <select class="form-control" id="orderby" name="orderby">
+                                            <option value="asc" {if $orderby eq 'asc' }selected{/if}>{Lang::T('Ascending')}</option>
+                                            <option value="desc" {if $orderby eq 'desc' }selected{/if}>{Lang::T('Descending')}</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-4">
                             <div class="input-group">
                                 <div class="input-group-addon">
                                     <span class="fa fa-search"></span>
@@ -38,13 +58,15 @@
                                     <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
                                 </div>
                             </div>
-                        </form>
                         </div>
-                    <div class="col-md-4">
+                        <div class="col-lg-2">
-                        <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
+                            <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i
+                                    class="ion ion-android-add">
                                 </i> {Lang::T('Add New Contact')}</a>
-                    </div>&nbsp;
                         </div>
+                    </div>
+                </form>
+                <br>&nbsp;
                 <div class="table-responsive table_mobile">
                     <table id="customerTable" class="table table-bordered table-striped table-condensed">
                         <thead>
@@ -56,6 +78,7 @@
                                 <th>{Lang::T('Contact')}</th>
                                 <th>{Lang::T('Package')}</th>
                                 <th>{Lang::T('Service Type')}</th>
+                                <th>{Lang::T('Status')}</th>
                                 <th>{Lang::T('Created On')}</th>
                                 <th>{Lang::T('Manage')}</th>
                             </tr>
@@ -88,6 +111,7 @@
                                         <span class="label label-default">&bull;</span>
                                     </td>
                                     <td>{$ds['service_type']}</td>
+                                    <td>{Lang::T($ds['status'])}</td>
                                     <td>{Lang::dateTimeFormat($ds['created_at'])}</td>
                                     <td align="center">
                                         <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}"
@@ -115,11 +139,15 @@
 <script>
     var $j = jQuery.noConflict();
 
-    $j(document).ready(function () {
+    $j(document).ready(function() {
         $j('#customerTable').DataTable({
+            order: [[{$order_pos}, '{$orderby}']],
             "pagingType": "full_numbers",
-            "lengthMenu": [ [5, 10, 25, 50, 100, -1], [5, 10, 25, 50, 100, "All"] ],
+            "lengthMenu": [
-            "pageLength": 5
+                [5, 10, 25, 50, 100, -1],
+                [5, 10, 25, 50, 100, "All"]
+            ],
+            "pageLength": 25
         });
     });
 </script>