Merge branch 'hotspotbilling:Development' into Development

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 # CHANGELOG
 
+## 2024.5.17
+
+- Status Customer: Active/Banned/Disabled
+- Add search with order in Customer list
+
 ## 2024.5.16
 
 - Confirm can change Using

system/autoload/User.php

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

system/controllers/customers.php

@@ -613,7 +613,8 @@ switch ($action) {
         $order_pos = [
             'username' => 0,
             'created_at' => 8,
-            'balance' => 3
+            'balance' => 3,
+            'status' => 7
         ];
 
         if ($search != '') {

system/controllers/home.php

@@ -18,7 +18,7 @@ if (isset($_GET['renewal'])) {
 
 if (_post('send') == 'balance') {
     if ($config['enable_balance'] == 'yes' && $config['allow_balance_transfer'] == 'yes') {
-        if ($user['status'] != 'Active') {
+        if ($user['status'] == 'Disabled') {
             _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
         }
         $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one();
@@ -80,7 +80,7 @@ if (_post('send') == 'balance') {
         r2(U . 'home', 'd', Lang::T('Failed, balance is not available'));
     }
 } else if (_post('send') == 'plan') {
-    if ($user['status'] != 'Active') {
+    if ($user['status'] == 'Disabled') {
         _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
     }
     $actives = ORM::for_table('tbl_user_recharges')
@@ -98,7 +98,7 @@ if (_post('send') == 'balance') {
 $ui->assign('_bills', User::_billing());
 
 if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
-    if ($user['status'] != 'Active') {
+    if ($user['status'] == 'Disabled') {
         _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
     }
     if (!empty(App::getTokenValue(_get('stoken')))) {
@@ -128,7 +128,7 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
         }
     }
 } else if (!empty(_get('extend'))) {
-    if ($user['status'] != 'Active') {
+    if ($user['status'] == 'Disabled') {
         _alert(Lang::T('This account status') . ' : ' . Lang::T($user['status']), 'danger', "");
     }
     if (!$config['extend_expired']) {

system/controllers/login.php

@@ -24,7 +24,7 @@ switch ($do) {
             $d = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
             if ($d) {
                 $d_pass = $d['password'];
-                if ($d['status'] != 'Banned') {
+                if ($d['status'] == 'Banned') {
                     _alert(Lang::T('This account status') . ' : ' . Lang::T($d['status']), 'danger', "");
                 }
                 if (Password::_uverify($password, $d_pass) == true) {

system/lan/indonesia.json

@@ -472,5 +472,7 @@
     "SMS": "SMS",
     "WhatsApp": "WhatsApp",
     "SMS_and_WhatsApp": "SMS dan WhatsApp",
-    "The_method_which_OTP_will_be_sent_to_user": "Metode OTP yang akan dikirimkan ke pengguna"
+    "The_method_which_OTP_will_be_sent_to_user": "Metode OTP yang akan dikirimkan ke pengguna",
+    "Disabled": "Dinonaktifkan",
+    "Banned": "Banned"
 }

ui/ui/customers.tpl

@@ -36,6 +36,7 @@
                                             <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>
+                                            <option value="status" {if $order eq 'status' }selected{/if}>{Lang::T('Status')}</option>
                                         </select>
                                     </div>
                                     <div class="col-xs-4">

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.5.16"
+    "version": "2024.5.17.1"
 }