2023.11.17

redirect to home
Fix Error for Customer
2023-11-17 14:44:22 +07:00 · 2023-11-17 14:40:02 +07:00 · 2023-11-17 14:38:20 +07:00 · 2023-11-15 11:51:13 +07:00 · 2023-11-15 11:49:03 +07:00 · 2023-11-15 11:45:29 +07:00
24 changed files with 725 additions and 563 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,26 @@

 # CHANGELOG

+
+## 2023.11.17
+
+- Error details not show in Customer
+
+## 2023.11.15
+
+- Customer Multi Router package
+- Fix edit package, Admin can change Customer to another router
+
+## 2023.11.9
+
+- fix bug variable in cron
+- fix update plan
+
+## 2023.10.27
+
+- Backup and restore database
+- Fix checking radius client
+
 ## 2023.10.25

 - fix wrong file check in cron, error only for newly installed
--- a/README.md
+++ b/README.md
@ -58,9 +58,9 @@ The problem with windows is hard to set cronjob, better Linux

 [Docker Repository](https://github.com/animegasan/phpnuxbill)

-## RADIUS system
+## Freeradius

-Still on development
+Support [Freeradius with Database](https://github.com/hotspotbilling/phpnuxbill/wiki/FreeRadius)

 ## Community Support

--- a/install/phpnuxbill.sql
+++ b/install/phpnuxbill.sql
@ -280,7 +280,7 @@ ALTER TABLE `tbl_voucher`

 INSERT INTO
    `tbl_appconfig` (`id`, `setting`, `value`)
-VALUES (1, 'CompanyName', 'PHPNuxBill'), (2, 'currency_code', 'Rp.'), (3, 'language', 'indonesia'), (4, 'show-logo', '1'), (5, 'nstyle', 'blue'), (6, 'timezone', 'Asia/Jakarta'), (7, 'dec_point', ','), (8, 'thousands_sep', '.'), (9, 'rtl', '0'), (10, 'address', ''), (11, 'phone', ''), (12, 'date_format', 'd M Y'), (13, 'note', 'Thank you...');
+VALUES (1, 'CompanyName', 'PHPNuxBill'), (2, 'currency_code', 'Rp.'), (3, 'language', 'english'), (4, 'show-logo', '1'), (5, 'nstyle', 'blue'), (6, 'timezone', 'Asia/Jakarta'), (7, 'dec_point', ','), (8, 'thousands_sep', '.'), (9, 'rtl', '0'), (10, 'address', ''), (11, 'phone', ''), (12, 'date_format', 'd M Y'), (13, 'note', 'Thank you...');

 --

--- a/install/step4.php
+++ b/install/step4.php
@ -25,7 +25,7 @@ try {
 }

 if ($cn == '1') {
-    if ($_POST['radius'] == 'yes') {
+    if (isset($_POST['radius']) && $_POST['radius'] == 'yes') {
        $input = '<?php

 define(\'APP_URL\', \'' . $appurl . '\');
@ -83,7 +83,7 @@ if($_app_stage!=\'Live\'){
    fclose($fh);
    $sql = file_get_contents('phpnuxbill.sql');
    $qr = $dbh->exec($sql);
-    if ($_POST['radius'] == 'yes') {
+    if (isset($_POST['radius']) && $_POST['radius'] == 'yes') {
        $sql = file_get_contents('radius.sql');
        $qrs = $dbh->exec($sql);
    }
--- a/system/autoload/Mikrotik.php
+++ b/system/autoload/Mikrotik.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 *  by https://t.me/ibnux
@ -15,20 +16,20 @@ class Mikrotik

    public static function getClient($ip, $user, $pass)
    {
-        global $ui;
-        //try {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $iport = explode(":", $ip);
        return new RouterOS\Client($iport[0], $user, $pass, ($iport[1]) ? $iport[1] : null);
-        // } catch (Exception $e) {
-        //     $ui->assign("error_title", "Mikrotik Connection Error");
-        //     $ui->assign("error_message", "Unable to connect to the router : $ip<br>" . $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
-        //     $ui->display('router-error.tpl');
-        //     die();
-        // }
    }

    public static function isUserLogin($client, $username)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip hotspot active print',
            RouterOS\Query::where('user', $username)
@ -38,6 +39,10 @@ class Mikrotik

    public static function logMeIn($client, $user, $pass, $ip, $mac)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $addRequest = new RouterOS\Request('/ip/hotspot/active/login');
        $client->sendSync(
            $addRequest
@ -50,6 +55,10 @@ class Mikrotik

    public static function logMeOut($client, $user)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip hotspot active print',
            RouterOS\Query::where('user', $user)
@ -64,6 +73,10 @@ class Mikrotik

    public static function addHotspotPlan($client, $name, $sharedusers, $rate)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $addRequest = new RouterOS\Request('/ip/hotspot/user/profile/add');
        $client->sendSync(
            $addRequest
@ -75,6 +88,10 @@ class Mikrotik

    public static function setHotspotPlan($client, $name, $sharedusers, $rate)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip hotspot user profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
@ -95,6 +112,10 @@ class Mikrotik

    public static function setHotspotExpiredPlan($client, $name, $pool)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip hotspot user profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
@ -123,6 +144,10 @@ class Mikrotik

    public static function removeHotspotPlan($client, $name)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip hotspot user profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
@ -138,6 +163,10 @@ class Mikrotik

    public static function removeHotspotUser($client, $username)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip hotspot user print .proplist=.id',
            RouterOS\Query::where('name', $username)
@ -152,6 +181,10 @@ class Mikrotik

    public static function addHotspotUser($client, $plan, $customer)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $addRequest = new RouterOS\Request('/ip/hotspot/user/add');
        if ($plan['typebp'] == "Limited") {
            if ($plan['limit_type'] == "Time_Limit") {
@ -216,6 +249,10 @@ class Mikrotik

    public static function setHotspotUser($client, $user, $pass)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
        $printRequest->setArgument('.proplist', '.id');
        $printRequest->setQuery(RouterOS\Query::where('name', $user));
@ -229,6 +266,10 @@ class Mikrotik

    public static function setHotspotUserPackage($client, $user, $plan)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
        $printRequest->setArgument('.proplist', '.id');
        $printRequest->setQuery(RouterOS\Query::where('name', $user));
@ -242,6 +283,10 @@ class Mikrotik

    public static function removeHotspotActiveUser($client, $username)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $onlineRequest = new RouterOS\Request('/ip/hotspot/active/print');
        $onlineRequest->setArgument('.proplist', '.id');
        $onlineRequest->setQuery(RouterOS\Query::where('user', $username));
@ -254,7 +299,10 @@ class Mikrotik

    public static function removePpoeUser($client, $username)
    {
-
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request('/ppp/secret/print');
        //$printRequest->setArgument('.proplist', '.id');
        $printRequest->setQuery(RouterOS\Query::where('name', $username));
@ -266,6 +314,10 @@ class Mikrotik

    public static function addPpoeUser($client, $plan, $customer)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $addRequest = new RouterOS\Request('/ppp/secret/add');
        if (!empty($customer['pppoe_password'])) {
            $pass = $customer['pppoe_password'];
@ -284,6 +336,10 @@ class Mikrotik

    public static function setPpoeUser($client, $user, $pass)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request('/ppp/secret/print');
        $printRequest->setArgument('.proplist', '.id');
        $printRequest->setQuery(RouterOS\Query::where('name', $user));
@ -297,6 +353,10 @@ class Mikrotik

    public static function setPpoeUserPlan($client, $user, $plan)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request('/ppp/secret/print');
        $printRequest->setArgument('.proplist', '.id');
        $printRequest->setQuery(RouterOS\Query::where('name', $user));
@ -310,6 +370,10 @@ class Mikrotik

    public static function removePpoeActive($client, $username)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $onlineRequest = new RouterOS\Request('/ppp/active/print');
        $onlineRequest->setArgument('.proplist', '.id');
        $onlineRequest->setQuery(RouterOS\Query::where('name', $username));
@ -322,6 +386,10 @@ class Mikrotik

    public static function removePool($client, $name)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip pool print .proplist=.id',
            RouterOS\Query::where('name', $name)
@ -337,6 +405,10 @@ class Mikrotik

    public static function addPool($client, $name, $ip_address)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $addRequest = new RouterOS\Request('/ip/pool/add');
        $client->sendSync(
            $addRequest
@ -347,6 +419,10 @@ class Mikrotik

    public static function setPool($client, $name, $ip_address)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ip pool print .proplist=.id',
            RouterOS\Query::where('name', $name)
@ -368,6 +444,10 @@ class Mikrotik

    public static function addPpoePlan($client, $name, $pool, $rate)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $addRequest = new RouterOS\Request('/ppp/profile/add');
        $client->sendSync(
            $addRequest
@ -380,6 +460,10 @@ class Mikrotik

    public static function setPpoePlan($client, $name, $pool, $rate)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ppp profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
@ -401,6 +485,10 @@ class Mikrotik

    public static function removePpoePlan($client, $name)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $printRequest = new RouterOS\Request(
            '/ppp profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@ -81,7 +81,7 @@ class Package
        }


-        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
+        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('routers', $router_name)->find_one();

        $mikrotik = Mikrotik::info($router_name);
        if ($p['validity_unit'] == 'Months') {
@ -321,23 +321,64 @@ class Package
        return true;
    }

-    public static function changeTo($username, $plan_id)
+    public static function changeTo($username, $plan_id, $from_id)
    {
-        global $_c;
        $c = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
-        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $c['id'])->find_one();
+        $b = ORM::for_table('tbl_user_recharges')->find_one($from_id);
+        if($p['routers'] == $b['routers']){
            $mikrotik = Mikrotik::info($p['routers']);
+        }else{
+            $mikrotik = Mikrotik::info($b['routers']);
+        }
+        // delete first
+        if ($p['type'] == 'Hotspot') {
+            if ($b) {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            } else {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            }
+        } else {
+            if ($b) {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            } else {
+                if (!$p['is_radius']) {
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
+                }
+            }
+        }
+        // call the next mikrotik
+        if($p['routers'] != $b['routers']){
+            $mikrotik = Mikrotik::info($p['routers']);
+        }
        if ($p['type'] == 'Hotspot') {
            if ($b) {
                if ($p['is_radius']) {
                    Radius::customerAddPlan($c, $p, $b['expiration'].''.$b['time']);
                }else{
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addHotspotUser($client, $p, $c);
                }
            } else {
@ -345,10 +386,6 @@ class Package
                    Radius::customerAddPlan($c, $p, $b['expiration'].''.$b['time']);
                }else{
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addHotspotUser($client, $p, $c);
                }
            }
@ -358,10 +395,6 @@ class Package
                    Radius::customerAddPlan($c, $p);
                }else{
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addPpoeUser($client, $p, $c);
                }
            } else {
@ -369,10 +402,6 @@ class Package
                    Radius::customerAddPlan($c, $p);
                }else{
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addPpoeUser($client, $p, $c);
                }
            }
--- a/system/autoload/Radius.php
+++ b/system/autoload/Radius.php
@ -15,7 +15,15 @@ class Radius
    public static function getClient()
    {
        global $config;
-        return (empty($config['radius_client'])) ? shell_exec('which radclient') : $config['radius_client'];
+        if(empty($config['radius_client'])){
+            if(function_exists("shell_exec")){
+                shell_exec('which radclient');
+            }else{
+                return "";
+            }
+        }else{
+            $config['radius_client'];
+        }
    }

    public static function getTableNas()
@ -289,6 +297,10 @@ class Radius

    public static function disconnectCustomer($username)
    {
+        global $_app_stage;
+        if ($_app_stage == 'demo') {
+            return null;
+        }
        $nas = Radius::getTableNas()->findMany();
        $count = count($nas) * 15;
        set_time_limit($count);
--- a/system/autoload/User.php
+++ b/system/autoload/User.php
@ -22,7 +22,7 @@ class User
    public static function _billing()
    {
        $id = $_SESSION['uid'];
-        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $id)->find_one();
+        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $id)->find_many();
        return $d;
    }
 }
--- a/system/boot.php
+++ b/system/boot.php
@ -116,7 +116,11 @@ try {
    $ui->setConfigDir(File::pathFixer('ui/conf/'));
    $ui->setCacheDir(File::pathFixer('ui/cache/'));
    $ui->assign("error_title", "PHPNuxBill Crash");
+    if (isset($_SESSION['uid'])) {
+        $ui->assign("error_message", $e->getMessage() . '<br>');
+    }else{
        $ui->assign("error_message", $e->getMessage() . '<br><pre>' . $e->getTraceAsString() . '</pre>');
+    }
    $ui->display('router-error.tpl');
    die();
 }
@ -126,9 +130,15 @@ function _notify($msg, $type = 'e')
    $_SESSION['ntype'] = $type;
    $_SESSION['notify'] = $msg;
 }
-
+if(empty($config['language'])){
+    $config['language'] = 'english';
+}
 $lan_file = File::pathFixer('system/lan/' . $config['language'] . '/common.lan.php');
+if(file_exists($lan_file)){
    require $lan_file;
+}else{
+    die("$lan_file not found");
+}

 $ui = new Smarty();

@ -335,8 +345,11 @@ try {
        r2(U . 'dashboard', 'e', 'not found');
    }
 } catch (Exception $e) {
-    $ui->assign("error_title", "PHPNuxBill Crash");
+    if (isset($_SESSION['uid'])) {
+        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();
 }
--- a/system/controllers/autoload_user.php
+++ b/system/controllers/autoload_user.php
@ -12,18 +12,18 @@ _auth();

 $action = $routes['1'];
 $user = User::_info();
-$bill = User::_billing();

 switch ($action) {
    case 'isLogin':
+        $bill = ORM::for_table('tbl_user_recharges')->where('id', $routes['2'])->where('username', $user['username'])->findOne();
        if ($bill['type'] == 'Hotspot' && $bill['status'] == 'on') {
            $m = Mikrotik::info($bill['routers']);
            $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
            if (Mikrotik::isUserLogin($client, $user['username'])) {
-                die('<a href="' . U . 'home&mikrotik=logout" onclick="return confirm(\''.Lang::T('Disconnect Internet?').'\')" class="btn btn-success btn-xs btn-block">'.Lang::T('You are Online, Logout?').'</a>');
+                die('<a href="' . U . 'home&mikrotik=logout&id='.$bill['id'].'" onclick="return confirm(\''.Lang::T('Disconnect Internet?').'\')" class="btn btn-success btn-xs btn-block">'.Lang::T('You are Online, Logout?').'</a>');
            } else {
                if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
-                    die('<a href="' . U . 'home&mikrotik=login" onclick="return confirm(\''.Lang::T('Connect to Internet?').'\')" class="btn btn-danger btn-xs btn-block">'.Lang::T('Not Online, Login now?').'</a>');
+                    die('<a href="' . U . 'home&mikrotik=login&id='.$bill['id'].'" onclick="return confirm(\''.Lang::T('Connect to Internet?').'\')" class="btn btn-danger btn-xs btn-block">'.Lang::T('Not Online, Login now?').'</a>');
                }else{
                    die(Lang::T('Your account not connected to internet'));
                }
--- a/system/controllers/home.php
+++ b/system/controllers/home.php
@ -84,15 +84,15 @@ if (_post('send') == 'balance') {
    if ($router) {
        r2(U . "order/send/$router[id]/$active[plan_id]&u=" . trim(_post('username')), 's', Lang::T('Review package before recharge'));
    } else {
-        r2(U . 'package/order', 'w', Lang::T('Your friend do not have active package'));
+        r2(U . 'home', 'w', Lang::T('Your friend do not have active package'));
    }
 }

-//Client Page
-$bill = User::_billing();
-$ui->assign('_bill', $bill);
+$ui->assign('_bills', User::_billing());

-if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
+if(isset($_GET['recharge']) && !empty($_GET['recharge'])){
+    $bill = ORM::for_table('tbl_user_recharges')->where('id', $_GET['recharge'])->where('username', $user['username'])->findOne();
+    if ($bill) {
        $router = ORM::for_table('tbl_routers')->where('name', $bill['routers'])->find_one();
        if ($config['enable_balance'] == 'yes') {
            $plan = ORM::for_table('tbl_plans')->find_one($bill['plan_id']);
@ -104,7 +104,9 @@ if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
        }else{
            r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
        }
-}else if(isset($_GET['deactivate']) && $_GET['deactivate'] == 1){
+    }
+}else if(isset($_GET['deactivate']) && !empty($_GET['deactivate'])){
+    $bill = ORM::for_table('tbl_user_recharges')->where('id', $_GET['deactivate'])->where('username', $user['username'])->findOne();
    if ($bill) {
        $p = ORM::for_table('tbl_plans')->where('id', $bill['plan_id'])->find_one();
        if($p['is_radius']){
@ -139,6 +141,7 @@ if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
 if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
    $ui->assign('nux_mac', $_SESSION['nux-mac']);
    $ui->assign('nux_ip', $_SESSION['nux-ip']);
+    $bill = ORM::for_table('tbl_user_recharges')->where('id', $_GET['id'])->where('username', $user['username'])->findOne();
    if ($_GET['mikrotik'] == 'login') {
        $m = Mikrotik::info($bill['routers']);
        $c = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@ -171,7 +171,7 @@ switch ($action) {
        $d = ORM::for_table('tbl_user_recharges')->find_one($id);
        if ($d) {
            $ui->assign('d', $d);
-            $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many();
+            $p = ORM::for_table('tbl_plans')->where('enabled', '1')->where_not_equal('type', 'Balance')->find_many();
            $ui->assign('p', $p);
            run_hook('view_edit_customer_plan'); #HOOK
            $ui->display('prepaid-edit.tpl');
@ -219,7 +219,11 @@ switch ($action) {
        } else {
            $msg .= $_L['Data_Not_Found'] . '<br>';
        }
-
+        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+        if ($d) {
+        } else {
+            $msg .= ' Plan Not Found<br>';
+        }
        if ($msg == '') {
            run_hook('edit_customer_plan'); #HOOK
            $d->username = $username;
@ -227,8 +231,9 @@ switch ($action) {
            //$d->recharged_on = $recharged_on;
            $d->expiration = $expiration;
            $d->time = $time;
+            $d->routers = $p['routers'];
            $d->save();
-            Package::changeTo($username, $id_plan);
+            Package::changeTo($username, $id_plan, $id);
            _log('[' . $admin['username'] . ']: ' . 'Edit Plan for Customer ' . $d['username'] . ' to [' . $d['plan_name'] . '][' . Lang::moneyFormat($d['price']) . ']', 'Admin', $admin['id']);
            r2(U . 'prepaid/list', 's', $_L['Updated_Successfully']);
        } else {
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@ -302,7 +302,7 @@ switch ($action) {
        $validity_unit = _post('validity_unit');
        $pool_expired = _post('pool_expired');
        $enabled = _post('enabled');
-
+        $routers = _post('routers');
        $msg = '';
        if (Validator::UnsignedNumber($validity) == false) {
            $msg .= 'The validity must be a number' . '<br>';
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@ -23,7 +23,7 @@ switch ($action) {
            $logo = 'system/uploads/logo.default.png';
        }
        $ui->assign('logo', $logo);
-        if (empty($_c['radius_client'])) {
+        if ($_c['radius_enable'] && empty($_c['radius_client'])) {
            try {
                $_c['radius_client'] = Radius::getClient();
                $ui->assign('_c', $_c);
@ -675,20 +675,12 @@ switch ($action) {

        $dbc = new mysqli($db_host, $db_user, $db_password, $db_name);
        if ($result = $dbc->query('SHOW TABLE STATUS')) {
-            $size = 0;
-            $decimals = 2;
            $tables = array();
            while ($row = $result->fetch_array()) {
-                $size += $row["Data_length"] + $row["Index_length"];
-                $total_size = ($row["Data_length"] + $row["Index_length"]) / 1024;
-                $tables[$row['Name']]['size'] = number_format($total_size, '0');
-                $tables[$row['Name']]['rows'] = $row["Rows"];
+                $tables[$row['Name']]['rows'] = ORM::for_table($row["Name"])->count();
                $tables[$row['Name']]['name'] = $row["Name"];
            }
-            $mbytes = number_format($size / (1024 * 1024), $decimals, $config['dec_point'], $config['thousands_sep']);
-
            $ui->assign('tables', $tables);
-            $ui->assign('dbsize', $mbytes);
            run_hook('view_database'); #HOOK
            $ui->display('dbstatus.tpl');
        }
@ -698,92 +690,52 @@ switch ($action) {
        if ($admin['user_type'] != 'Admin') {
            r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
        }
-
-        try {
-            run_hook('backup_database'); #HOOK
-            $mysqli = new mysqli($db_host, $db_user, $db_password, $db_name);
-            if ($mysqli->connect_errno) {
-                throw new Exception("Failed to connect to MySQL: " . $mysqli->connect_error);
-            }
-
+        $tables = $_POST['tables'];
+        set_time_limit(-1);
        header('Pragma: public');
        header('Expires: 0');
        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
        header('Content-Type: application/force-download');
        header('Content-Type: application/octet-stream');
        header('Content-Type: application/download');
-            header('Content-Disposition: attachment;filename="backup_' . date('Y-m-d_h_i_s') . '.sql"');
+        header('Content-Disposition: attachment;filename="phpnuxbill_' . count($tables) . '_tables_' . date('Y-m-d_H_i') . '.json"');
        header('Content-Transfer-Encoding: binary');
-
-            ob_start();
-            $f_output = fopen("php://output", 'w');
-
-            print("-- pjl SQL Dump\n");
-            print("-- Server version:" . $mysqli->server_info . "\n");
-            print("-- Generated: " . date('Y-m-d h:i:s') . "\n");
-            print('-- Current PHP version: ' . phpversion() . "\n");
-            print('-- Host: ' . $db_host . "\n");
-            print('-- Database:' . $db_name . "\n");
-
-            $aTables = array();
-            $strSQL = 'SHOW TABLES';
-            if (!$res_tables = $mysqli->query($strSQL))
-                throw new Exception("MySQL Error: " . $mysqli->error . 'SQL: ' . $strSQL);
-
-            while ($row = $res_tables->fetch_array()) {
-                $aTables[] = $row[0];
+        $array = [];
+        foreach ($tables as $table) {
+            $array[$table] = ORM::for_table($table)->find_array();
+        }
+        echo json_encode($array);
+        break;
+    case 'dbrestore':
+        if ($admin['user_type'] != 'Admin') {
+            r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
+        }
+        if (file_exists($_FILES['json']['tmp_name'])) {
+            $suc = 0;
+            $fal = 0;
+            $json = json_decode(file_get_contents($_FILES['json']['tmp_name']), true);
+            foreach ($json as $table => $records) {
+                ORM::raw_execute("TRUNCATE $table;");
+                foreach ($records as $rec) {
+                    $t = ORM::for_table($table)->create();
+                    foreach ($rec as $k => $v) {
+                        if ($k != 'id') {
+                            $t->set($k, $v);
+                        }
+                    }
+                    if ($t->save()) {
+                        $suc++;
+                    } else {
+                        $fal++;
+                    }
+                }
+            }
+            if (file_exists($_FILES['json']['tmp_name'])) unlink($_FILES['json']['tmp_name']);
+            r2(U . "settings/dbstatus", 's', "Restored $suc success $fal failed");
+        } else {
+            r2(U . "settings/dbstatus", 'e', 'Upload failed');
        }
-
-            $res_tables->free();
-
-            foreach ($aTables as $table) {
-                print("-- --------------------------------------------------------\n");
-                print("-- Structure for '" . $table . "'\n");
-                print("--\n\n");
-
-                $strSQL = 'SHOW CREATE TABLE ' . $table;
-                if (!$res_create = $mysqli->query($strSQL))
-                    throw new Exception("MySQL Error: " . $mysqli->error . 'SQL: ' . $strSQL);
-                $row_create = $res_create->fetch_assoc();
-
-                print("\n" . $row_create['Create Table'] . ";\n");
-                print("-- --------------------------------------------------------\n");
-                print('-- Dump Data for `' . $table . "`\n");
-                print("--\n\n");
-                $res_create->free();
-
-                $strSQL = 'SELECT * FROM ' . $table;
-                if (!$res_select = $mysqli->query($strSQL))
-                    throw new Exception("MySQL Error: " . $mysqli->error . 'SQL: ' . $strSQL);
-
-                $fields_info = $res_select->fetch_fields();
-
-                while ($values = $res_select->fetch_assoc()) {
-                    $strFields = '';
-                    $strValues = '';
-                    foreach ($fields_info as $field) {
-                        if ($strFields != '') $strFields .= ',';
-                        $strFields .= "`" . $field->name . "`";
-
-                        if ($strValues != '') $strValues .= ',';
-                        $strValues .= '"' . preg_replace('/[^(\x20-\x7F)\x0A]*/', '', $values[$field->name] . '"');
-                    }
-                    print("INSERT INTO " . $table . " (" . $strFields . ") VALUES (" . $strValues . ");\n");
-                }
-                print("\n\n\n");
-                $res_select->free();
-            }
-            _log('[' . $admin['username'] . ']: ' . $_L['Download_Database_Backup'], 'Admin', $admin['id']);
-        } catch (Exception $e) {
-            print($e->getMessage());
-        }
-
-        fclose($f_output);
-        print(ob_get_clean());
-        $mysqli->close();
-
        break;
-
    case 'language':
        if ($admin['user_type'] != 'Admin') {
            r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
--- a/system/cron.php
+++ b/system/cron.php
@ -118,7 +118,7 @@ foreach ($d as $ds) {
                if (empty($p['pool_expired'])) {
                    print_r(Radius::customerDeactivate($c['username']));
                } else {
-                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $plan['pool_expired'], ':=');
+                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
                    print_r(Radius::disconnectCustomer($c['username']));
                }
            } else {
@ -172,7 +172,7 @@ foreach ($d as $ds) {
                if (empty($p['pool_expired'])) {
                    print_r(Radius::customerDeactivate($c['username']));
                } else {
-                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $plan['pool_expired'], ':=');
+                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
                    print_r(Radius::disconnectCustomer($c['username']));
                }
            } else {
--- a/system/lan/english/common.lan.php
+++ b/system/lan/english/common.lan.php
@ -20,7 +20,7 @@ $_L['Register_Voucher_Failed'] = 'Voucher not found, please buy voucher befor re
 $_L['Register_Success'] = 'Register Success! You can login now';
 $_L['Sign_In_Member'] = 'Log in to Member Panel';
 $_L['Register_Member'] = 'Register as Member';
-$_L['Sign_In_Admin'] = 'Masuk ke Admin Panel';
+$_L['Sign_In_Admin'] = 'Enter Admin Area';
 $_L['Logo'] = 'PHPNuxBill';
 $_L['Username'] = 'Username';
 $_L['Password'] = 'Password';
@ -408,3 +408,4 @@ $_L['Change_title_in_user_Plan_order'] = 'Change title in user Plan order';
 $_L['Logs'] = 'Logs';
 $_L['Voucher_Format'] = 'Voucher Format';
 $_L['Resend_To_Customer'] = 'Resend To Customer';
+$_L['Your_friend_do_not_have_active_package'] = 'Your friend do not have active package';
--- a/system/lan/indonesia/common.lan.php
+++ b/system/lan/indonesia/common.lan.php
@ -14,388 +14,397 @@ Contributor: Ibnu Maksum (@ibnux)

 $_L['Login'] = 'Masuk';
 $_L['Register'] = 'Daftar';
-$_L['Announcement'] = 'Pengumuman';
+$_L['Announcement'] = 'Pemberitahuan';
 $_L['Registration_Info'] = 'Info Pendaftaran';
-$_L['Register_Voucher_Failed'] = 'Voucher tidak ditemukan, mohon beli dulu Voucher sebelum mendaftar';
-$_L['Register_Success'] = 'Pendaftaran sukses!<br>silahkan masuk';
-$_L['Sign_In_Member'] = 'Masuk ke Member Panel';
-$_L['Register_Member'] = 'Mendaftar sebagai pelanggan<br>pastikan anda sudah membeli voucher';
+$_L['Register_Voucher_Failed'] = 'Voucher tidak ditemukan, silakan beli voucher sebelum mendaftar';
+$_L['Register_Success'] = 'Daftar Sukses!  Anda dapat masuk sekarang';
+$_L['Sign_In_Member'] = 'Masuk ke Panel Anggota';
+$_L['Register_Member'] = 'Daftar sebagai Anggota';
 $_L['Sign_In_Admin'] = 'Masuk ke Admin Panel';
 $_L['Logo'] = 'PHPNuxBill';
-$_L['Username'] = 'Username';
-$_L['Password'] = 'Password';
-$_L['PasswordsNotMatch'] = 'Sandi tidak sama';
-$_L['account_already_exist'] = 'Username sudah ada yang menggunakan';
-$_L['Manage'] = 'Proses';
+$_L['Username'] = 'Nama Pengguna';
+$_L['Password'] = 'Kata Sandi';
+$_L['PasswordsNotMatch'] = 'Kata Sandi tidak cocok';
+$_L['account_already_exist'] = 'Akun telah ada';
+$_L['Manage'] = 'Mengelola';
 $_L['Submit'] = 'Kirim';
-$_L['Save'] = 'Simpan Perubahan';
+$_L['Save'] = 'Simpan perubahan';
 $_L['Cancel'] = 'Batal';
-$_L['Edit'] = 'Edit';
+$_L['Edit'] = 'Sunting';
 $_L['Delete'] = 'Hapus';
 $_L['Welcome'] = 'Selamat Datang';
-$_L['Created_Successfully'] = 'Data berhasil di buat';
-$_L['Updated_Successfully'] = 'Data berhasil di ubah';
-$_L['Delete_Successfully'] = 'Berhasil menghapus data';
+$_L['Created_Successfully'] = 'Data Berhasil Dibuat';
+$_L['Updated_Successfully'] = 'Data Berhasil Diperbarui';
+$_L['Delete_Successfully'] = 'Data Berhasil Dihapus';

-$_L['Static_Pages'] = "Halaman statis";
+$_L['Static_Pages'] = "Halaman Statis";
 $_L['Failed_Save_Page'] = "Gagal menyimpan halaman, pastikan diperbolehkan menulis file di folder pages, <i>chmod 664 pages/*.html<i>";
-$_L['Success_Save_Page'] = "Sukses menyimpan halaman";
-$_L['Info_Page'] = "Kadang harus  di-refresh 3 kali baru konten berubah";
+$_L['Success_Save_Page'] = "Menyimpan halaman sukses";
+$_L['Info_Page'] = "Terkadang Anda perlu menyegarkan 3 kali hingga konten berubah";

-$_L['Dashboard'] = 'Beranda';
-$_L['Search_Contact'] = 'Cari username member...';
+$_L['Dashboard'] = 'Dasbor';
+$_L['Search_Contact'] = 'Cari Member...';
 $_L['My_Account'] = 'Akun Saya';
 $_L['My_Profile'] = 'Profil Saya';
 $_L['Settings'] = 'Pengaturan';
-$_L['Edit_Profile'] = 'Ubah Profil';
-$_L['Change_Password'] = 'Ganti Password';
+$_L['Edit_Profile'] = 'Sunting profil';
+$_L['Change_Password'] = 'Ganti kata sandi';
 $_L['Logout'] = 'Keluar';

 $_L['Services'] = 'Layanan';
-$_L['Bandwidth_Plans'] = 'Daftar Bandwidth';
+$_L['Bandwidth_Plans'] = 'Paket Bandwidth';
 $_L['BW_Name'] = 'Nama Bandwidth';
-$_L['New_Bandwidth'] = 'Tambah Data Bandwidth';
-$_L['Edit_Bandwidth'] = 'Ubah Data Bandwidth';
-$_L['Add_Bandwidth'] = 'Tambah Bandwidth Baru';
-$_L['Rate_Download'] = 'Rate Download';
-$_L['Rate_Upload'] = 'Rate Upload';
-$_L['BW_already_exist'] = 'Nama Bandwidth Sudah Ada';
+$_L['New_Bandwidth'] = 'Baru Bandwidth';
+$_L['Edit_Bandwidth'] = 'Sunting Bandwidth';
+$_L['Add_Bandwidth'] = 'Tambahkan Bandwidth Baru';
+$_L['Rate_Download'] = 'Nilai Unduhan';
+$_L['Rate_Upload'] = 'Nilai Unggahan';
+$_L['BW_already_exist'] = 'NamanBandwidth Sudah Ada';
 $_L['Hotspot_Plans'] = 'Paket Hotspot';
-$_L['PPPOE_Plans'] = 'Paket PPPOE';
+$_L['PPPOE_Plans'] = 'Paket PPPoE';
 $_L['Plan_Name'] = 'Nama Paket';
-$_L['New_Plan'] = 'Tambah Paket Baru';
-$_L['Add_Plan'] = 'Tambah Paket Baru';
-$_L['Edit_Plan'] = 'Ubah Paket';
+$_L['New_Plan'] = 'Paket Layanan Baru';
+$_L['Add_Plan'] = 'Tambah Paket Layanan';
+$_L['Edit_Plan'] = 'Sunting Paket Layanan';
 $_L['Plan_already_exist'] = 'Nama Paket Sudah Ada';
 $_L['Plan_Type'] = 'Jenis Paket';
-$_L['Plan_Price'] = 'Harga';
-$_L['Limit_Type'] = 'Jenis Limit';
-$_L['Unlimited'] = 'Unlimited';
-$_L['Limited'] = 'Limited';
-$_L['Time_Limit'] = 'TimeBase';
-$_L['Data_Limit'] = 'QuotaBase';
-$_L['Both_Limit'] = 'Keduanya';
-$_L['Plan_Validity'] = 'Masa Aktif';
-$_L['Select_BW'] = 'Pilih Nama Bandwidth';
-$_L['Shared_Users'] = 'Shared Users';
+$_L['Plan_Price'] = 'Harga Paket';
+$_L['Limit_Type'] = 'Tipe Batas';
+$_L['Unlimited'] = 'Tak terbatas';
+$_L['Limited'] = 'Terbatas';
+$_L['Time_Limit'] = 'Batas waktu';
+$_L['Data_Limit'] = 'Batas Data';
+$_L['Both_Limit'] = 'Keduanya Membatasi';
+$_L['Plan_Validity'] = 'Waktu Paket';
+$_L['Select_BW'] = 'Pilih Bandwidth';
+$_L['Shared_Users'] = 'Berbagi Pelanggan';

-$_L['user_type_help'] = 'Pilih Sales jika ingin fasilitas Pengaturan dinonaktifkan';
-$_L['Current_Password'] = 'Password Sekarang';
-$_L['New_Password'] = 'Password Baru';
+$_L['user_type_help'] = 'Pilih Sales untuk menonaktifkan akses ke Pengaturan';
+$_L['Current_Password'] = 'Kata sandi saat ini';
+$_L['New_Password'] = 'Kata sandi baru';
 $_L['Administrator'] = 'Administrator';
 $_L['Sales'] = 'Sales';
-$_L['Member'] = 'Member';
-$_L['Confirm_New_Password'] = 'Konfirmasi Password';
-$_L['Confirm_Password'] = 'Konfirmasi Password';
+$_L['Member'] = 'Anggota';
+$_L['Confirm_New_Password'] = 'Konfirmasi sandi baru';
+$_L['Confirm_Password'] = 'konfirmasi sandi';
 $_L['Full_Name'] = 'Nama Lengkap';
-$_L['User_Type'] = 'Posisi User';
-$_L['Address'] = 'Alamat Lengkap';
-$_L['Created_On'] = 'Tanggal Aktif';
-$_L['Expires_On'] = 'Tanggal Expire';
-$_L['Phone_Number'] = 'Nomor HP';
-$_L['User_Delete_Ok'] = 'User berhasil di hapus';
-$_L['Full_Administrator'] = 'Full Administrator';
-$_L['password_change_help'] = 'Kosongkan jika tidak ingin mengganti password';
-$_L['currency_help'] = 'Kosongkan jika tidak ingin mengatur kode Mata Uang';
-$_L['Theme_Style'] = 'Theme Style';
-$_L['Theme_Color'] = 'Theme Color';
-$_L['Default_Language'] = 'Bahasa';
+$_L['User_Type'] = 'Tipe Pelanggan';
+$_L['Address'] = 'Alamat';
+$_L['Created_On'] = 'Dibuat pada';
+$_L['Expires_On'] = 'Kadaluarsa pada';
+$_L['Phone_Number'] = 'Nomor telepon';
+$_L['User_Delete_Ok'] = 'Pelanggan berhasil dihapus';
+$_L['Full_Administrator'] = 'Administrator Penuh';
+$_L['password_change_help'] = 'Biarkan Kosong apabila tidak ingin mengubah Kata Sandi';
+$_L['currency_help'] = 'Kosongkan jika Anda tidak ingin menampilkan kode mata uang';
+$_L['Theme_Style'] = 'Gaya Tema';
+$_L['Theme_Color'] = 'Warna Tema';
+$_L['Default_Language'] = 'Bahasa Bawaan';

-$_L['Network'] = 'Network';
-$_L['Routers'] = 'Routers';
+$_L['Network'] = 'Jaringan';
+$_L['Routers'] = 'Router';
 $_L['Pool'] = 'IP Pool';
-$_L['New_Router'] = 'Router Baru';
-$_L['Add_Router'] = 'Tambah Router';
-$_L['Edit_Router'] = 'Ubah Router';
+$_L['New_Router'] = 'Router baru';
+$_L['Add_Router'] = 'Tambahkan Router';
+$_L['Edit_Router'] = 'Sunting Router';
 $_L['Router_Name'] = 'Nama Router';
-$_L['IP_Address'] = 'IP Address';
-$_L['Router_Secret'] = 'Password Router';
-$_L['Description'] = 'Deskripsi';
-$_L['Router_already_exist'] = 'IP Router sudah digunakan';
+$_L['IP_Address'] = 'Alamat IP';
+$_L['Router_Secret'] = 'Rahasia Router';
+$_L['Description'] = 'Deskrispi';
+$_L['Router_already_exist'] = 'IP Router Sudah Ada';
 $_L['Pool_Name'] = 'Nama Pool';
 $_L['Range_IP'] = 'Rentang IP';
-$_L['New_Pool'] = 'Pool Baru';
-$_L['Add_Pool'] = 'Tambah Pool';
-$_L['Edit_Pool'] = 'Ubah Pool';
+$_L['New_Pool'] = 'Pool baru';
+$_L['Add_Pool'] = 'Tambahkan Pool';
+$_L['Edit_Pool'] = 'Sunting Pool';
 $_L['Pool_already_exist'] = 'Nama Pool Sudah Ada';

-$_L['Prepaid'] = 'Billing';
-$_L['Prepaid_User'] = 'Billing';
-$_L['Prepaid_Vouchers'] = 'Kelola Voucher';
-$_L['Refill_Account'] = 'Refill Akun';
-$_L['Recharge_Account'] = 'Perpanjang Akun';
+$_L['Prepaid'] = 'Prabayar';
+$_L['Prepaid_User'] = 'Pengguna Prabayar';
+$_L['Prepaid_Vouchers'] = 'Voucher Prabayar';
+$_L['Refill_Account'] = 'Isi Ulang Akun';
+$_L['Recharge_Account'] = 'Isi Ulang Akun';
 $_L['Select_Account'] = 'Pilih Akun';
-$_L['Service_Plan'] = 'Paket';
-$_L['Recharge'] = 'Isi Ulang Akun';
+$_L['Service_Plan'] = 'Paket Layanan';
+$_L['Recharge'] = 'Isi Ulang';
 $_L['Method'] = 'Metode';
-$_L['account_created_successfully'] = 'Account Created Successfully';
+$_L['account_created_successfully'] = 'Akun Berhasil Dibuat';

 $_L['Database_Status'] = 'Status Database';
-$_L['Total_Database_Size'] = 'Ukuran Database';
-$_L['Download_Database_Backup'] = 'Download Database Backup';
+$_L['Total_Database_Size'] = 'Ukuran Total Database';
+$_L['Download_Database_Backup'] = 'Unduh Cadangan Database';
 $_L['Table_Name'] = 'Nama Tabel';
-$_L['Rows'] = 'Rows';
-$_L['Size'] = 'Size';
+$_L['Rows'] = 'Baris';
+$_L['Size'] = 'Ukuran';

-$_L['Customers'] = 'Kontak Member';
-$_L['Add_Contact'] = 'Tambah Kontak Baru';
-$_L['Edit_Contact'] = 'Edit Kontak';
-$_L['List_Contact'] = 'List Kontak';
+$_L['Customers'] = 'Pelanggan';
+$_L['Add_Contact'] = 'Tambahkan Kontak Baru';
+$_L['Edit_Contact'] = 'Sunting Kontak';
+$_L['List_Contact'] = 'Daftar Kontak';
 $_L['Manage_Accounts'] = 'Kelola Kontak';

 $_L['Reports'] = 'Laporan';
 $_L['Daily_Report'] = 'Laporan Harian';
 $_L['Period_Reports'] = 'Laporan Periode';
 $_L['All_Transactions'] = 'Semua Transaksi';
-$_L['Total_Income'] = 'Total Pendapatan';
+$_L['Total_Income'] = 'Jumlah Pemasukan';
 $_L['All_Transactions_at_Date'] = 'Semua Transaksi pada Tanggal';
-$_L['Export_for_Print'] = 'Cetak Laporan';
-$_L['Print'] = 'Print';
-$_L['Export_to_PDF'] = 'Export ke PDF';
-$_L['Click_Here_to_Print'] = 'Klik Disini untuk Cetak Laporan';
-$_L['You_can_use_html_tag'] = 'Boleh menggunakan tag html';
-$_L['Date_Format'] = 'Format Tanggal';
+$_L['Total_Income'] = 'Jumlah Pemasukan';
+$_L['Export_for_Print'] = 'Ekspor untuk Cetak';
+$_L['Print'] = 'Cetak';
+$_L['Export_to_PDF'] = 'Ekspor ke PDF';
+$_L['Click_Here_to_Print'] = 'Klik Disini untuk Mencetak';
+$_L['You_can_use_html_tag'] = 'Anda dapat menggunakan tag html';
+$_L['Date_Format'] = 'Format tanggal';
 $_L['Income_Today'] = 'Pendapatan Hari Ini';
-$_L['Income_This_Month'] = 'Pendapatan Bulan Ini';
-$_L['Users_Active'] = 'Member Aktif';
-$_L['Total_Users'] = 'Total Member';
-$_L['Users'] = 'User';
-$_L['Edit_User'] = 'Ubah Pengguna';
-$_L['Last_Login'] = 'Terakhir Login';
-$_L['Administrator_Users'] = 'Pengguna Admin';
+$_L['Income_This_Month'] = 'Penghasilan Bulan Ini';
+$_L['Users_Active'] = 'Pelanggan Aktif';
+$_L['Total_Users'] = 'Total Pelanggan';
+$_L['Users'] = 'Pelanggan';
+$_L['Edit_User'] = 'Sunting Pelanggan';
+$_L['Last_Login'] = 'Terakhir Masuk';
+$_L['Administrator_Users'] = 'Pengguna Administrator';
 $_L['Manage_Administrator'] = 'Kelola Administrator';
-$_L['Add_New_Administrator'] = 'Tambah Administrator';
+$_L['Add_New_Administrator'] = 'Tambahkan Administrator Baru';
 $_L['Localisation'] = 'Lokalisasi';
-$_L['Backup_Restore'] = 'Backup/Restore';
+$_L['Backup_Restore'] = 'Cadangkan/Pulihkan';

 $_L['General_Settings'] = 'Pengaturan Umum';
 $_L['Date'] = 'Tanggal';
-$_L['Login_Successful'] = 'Login Berhasil';
-$_L['Failed_Login'] = 'Gagal Login';
+$_L['Login_Successful'] = 'Berhasil Masuk';
+$_L['Failed_Login'] = 'Gagal Masuk';
 $_L['Settings_Saved_Successfully'] = 'Pengaturan Berhasil Disimpan';
-$_L['User_Updated_Successfully'] = 'Berhasil mengubah pengguna';
-$_L['User_Expired_Today'] = 'Member Expire Hari Ini';
-$_L['Activity_Log'] = 'Aktifitas Log';
+$_L['User_Updated_Successfully'] = 'Pengguna Berhasil Diperbarui';
+$_L['User_Expired_Today'] = 'Pengguna Kedaluwarsa, Hari Ini';
+$_L['Activity_Log'] = 'Log aktivitas';
 $_L['View_Reports'] = 'Lihat Laporan';
-$_L['View_All'] = 'Lihat Semua';
+$_L['View_All'] = 'Lihat semua';
 $_L['Number_of_Vouchers'] = 'Jumlah Voucher';
-$_L['Length_Code'] = 'Panjang Kode';
+$_L['Length_Code'] = 'Kode Panjang';
 $_L['Code_Voucher'] = 'Kode Voucher';
 $_L['Voucher'] = 'Voucher';
 $_L['Voucher_Hotspot'] = 'Voucher Hotspot';
-$_L['Status_Voucher'] = 'Status Voucher';
-$_L['Add_Voucher'] = 'Tambah';
-$_L['Voucher_Successfully'] = 'Berhasil membuat Voucher baru';
-$_L['Generate'] = 'Generate';
-$_L['Print_Info'] = 'Print bolak balik, biar mudah dipotong dan hemat kertas';
+$_L['Status_Voucher'] = 'Voucher Status';
+$_L['Add_Voucher'] = 'Tambah Voucher';
+$_L['Voucher_Successfully'] = 'Buat Voucher Berhasil';
+$_L['Generate'] = 'Menghasilkan';
+$_L['Print_Info'] = 'Info Cetak';

-$_L['From_Date'] = 'Dari Tanggal';
-$_L['To_Date'] = 'Hingga Tanggal';
+$_L['From_Date'] = 'Dari tanggal';
+$_L['To_Date'] = 'Hingga saat ini';
 $_L['New_Service'] = 'Layanan Baru';
 $_L['Type'] = 'Jenis';
-$_L['Finish'] = 'Selesai';
-$_L['App_Name'] = 'Nama Perusahaan';
-$_L['App_Name_Help_Text'] = 'Nama ini akan tampil pada judul';
-$_L['Next'] = 'Next';
-$_L['Last'] = 'Last';
-$_L['Timezone'] = 'Timezone';
-$_L['Decimal_Point'] = 'Pemisah Desimal';
+$_L['Finish'] = 'Menyelesaikan';
+$_L['App_Name'] = 'Nama Aplikasi/ Nama Perusahaan';
+$_L['App_Name_Help_Text'] = 'Nama ini akan ditampilkan pada Judul';
+$_L['Next'] = 'Berikutnya';
+$_L['Last'] = 'Terakhir';
+$_L['Timezone'] = 'Zona waktu';
+$_L['Decimal_Point'] = 'Titik Desimal';
 $_L['Thousands_Separator'] = 'Pemisah Ribuan';
-$_L['Currency_Code'] = 'Mata Uang';
+$_L['Currency_Code'] = 'Kode mata uang';

-$_L['Order_Voucher'] = 'Beli Voucher';
-$_L['Voucher_Activation'] = 'Aktifasi Voucher';
-$_L['List_Activated_Voucher'] = 'List Aktifasi Voucher';
+$_L['Order_Voucher'] = 'Pesan Voucher';
+$_L['Voucher_Activation'] = 'Aktivasi Voucher';
+$_L['List_Activated_Voucher'] = 'Daftar Voucher yang Diaktifkan';
 $_L['Enter_Voucher_Code'] = 'Masukkan kode voucher di sini';
-$_L['Private_Message'] = 'Pesan Singkat';
-$_L['Inbox'] = 'Inbox';
-$_L['Outbox'] = 'Outbox';
-$_L['Compose'] = 'Compose';
-$_L['Send_to'] = 'Send to';
-$_L['Title'] = 'Title';
-$_L['Message'] = 'Message';
+$_L['Private_Message'] = 'Pesan Pribadi';
+$_L['Inbox'] = 'Kotak Masuk';
+$_L['Outbox'] = 'Kotak Keluar';
+$_L['Compose'] = 'Menyusun';
+$_L['Send_to'] = 'Kirim ke';
+$_L['Title'] = 'Judul';
+$_L['Message'] = 'Pesan';
 $_L['Account_Information'] = 'Informasi Akun Anda';
-$_L['Welcome_Text_User'] = 'Selamat datang di Member Panel, disini Anda dapat mengetahui:';
-$_L['Welcome_Text_Admin'] = '<b>PHPNuxBill</b> adalah sebuah aplikasi billing Hotspot dan PPPOE untuk Mikrotik dengan menggunakan bahasa pemograman PHP dan menggunakan API Mikrotik sebagai komunikasi dengan router. Jika aplikasi ini sangat berguna bagi bisnis Anda silahkan Anda donasi berapapun.<br>Pantau proyek <a href="https://github.com/hotspotbilling/phpnuxbill" target="_blank">disini</a>';
+$_L['Welcome_Text_User'] = 'Selamat datang di halaman Anggota Panel, di halaman ini Anda dapat:';
+$_L['Welcome_Text_Admin'] = '<b>PHPNuxBill</b> adalah penagihan Hotspot dan PPPoE untuk Mikrotik menggunakan PHP dan Mikrotik API untuk berkomunikasi dengan router.  Jika Anda mendapat lebih banyak keuntungan dengan aplikasi ini, silakan berdonasi kepada kami.<br>Tonton proyek <a href="https://github.com/hotspotbilling/phpnuxbill" target="_blank">Disini</a>';

 //update
-$_L['Invalid_Username_or_Password'] = 'Username atau Password Salah';
-$_L['Do_Not_Access'] = 'Anda tidak diijinkan untuk mengakses halaman ini';
-$_L['Incorrect_Current_Password'] = 'Password Saat ini Salah';
-$_L['Password_Changed_Successfully'] = 'Berhasil mengganti password, Silahkan login kembali';
+$_L['Invalid_Username_or_Password'] = 'Nama pengguna dan kata sandi salah';
+$_L['Do_Not_Access'] = 'Anda tidak memiliki izin untuk mengakses halaman ini';
+$_L['Incorrect_Current_Password'] = 'Kata Sandi Saat Ini Salah';
+$_L['Password_Changed_Successfully'] = 'Kata sandi berhasil diubah, Silakan login kembali';
 $_L['All_field_is_required'] = 'Semua bidang wajib diisi';
-$_L['Voucher_Not_Valid'] = 'Voucher Tidak Benar';
-$_L['Activation_Vouchers_Successfully'] = 'Berhasil melakukan aktivasi Voucher.';
-$_L['Data_Not_Found'] = 'Data tidak ditemukan';
-$_L['Search_by_Username'] = 'Cari berdasarkan Username';
+$_L['Voucher_Not_Valid'] = 'Voucher Tidak Berlaku';
+$_L['Activation_Vouchers_Successfully'] = 'Aktivasi Voucher Berhasil';
+$_L['Data_Not_Found'] = 'Data Tidak Ditemukan';
+$_L['Search_by_Username'] = 'Cari berdasarkan Nama Pengguna';
 $_L['Search_by_Name'] = 'Cari berdasarkan Nama';
-$_L['Search_by_Code'] = 'Cari Kode Voucher';
-$_L['Search'] = 'Pencarian';
-$_L['Select_Customer'] = 'Pilih Member';
-$_L['Select_Routers'] = 'Pilih Routers';
+$_L['Search_by_Code'] = 'Cari berdasarkan Kode Voucher';
+$_L['Search'] = 'Mencari';
+$_L['Select_Customer'] = 'Pilih pelanggan';
+$_L['Select_Routers'] = 'Pilih Router';
 $_L['Select_Plans'] = 'Pilih Paket';
 $_L['Select_Pool'] = 'Pilih Pool';
 $_L['Hrs'] = 'Jam';
 $_L['Mins'] = 'Menit';
 $_L['Days'] = 'Hari';
 $_L['Months'] = 'Bulan';
-$_L['Add_Language'] = 'Tambah Bahasa';
+
+$_L['Add_Language'] = 'Tambahkan Bahasa';
 $_L['Name_Lang'] = 'Nama Bahasa';
 $_L['Folder_Lang'] = 'Nama Folder';
-$_L['Translator'] = 'Translator';
-$_L['Lang_already_exist'] = 'Nama bahasa sudah ada';
+$_L['Translator'] = 'Penerjemah';
+$_L['Lang_already_exist'] = 'Nama Bahasa Sudah Ada';

-$_L['Payment_Gateway'] = 'Payment Gateway';
-$_L['Community'] = 'Community';
-$_L['1_user_can_be_used_for_many_devices'] = '1 user can be used for many devices?';
-$_L['Cannot_be_change_after_saved'] = 'Cannot be change after saved';
+$_L['Payment_Gateway'] = 'Gerbang Pembayaran';
+$_L['Community'] = 'Komunitas';
+$_L['1_user_can_be_used_for_many_devices'] = '1 pengguna bisa digunakan untuk banyak perangkat?';
+$_L['Cannot_be_change_after_saved'] = 'Tidak dapat diubah setelah disimpan';

-$_L['Explain_Coverage_of_router'] = 'Jelaskan Cakupan wilayah hotspot';
-$_L['Name_of_Area_that_router_operated'] = 'Nama Lokasi/Wilayah Router beroperasi';
-$_L['Payment_Notification_URL_Recurring_Notification_URL_Pay_Account_Notification_URL'] = 'Payment Notification URL, Recurring Notification URL, Pay Account Notification URL';
-$_L['Finish_Redirect_URL_Unfinish_Redirect_URL_Error_Redirect_URL'] = 'Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL';
+$_L['Explain_Coverage_of_router'] = 'Jelaskan Cakupan router';
+$_L['Name_of_Area_that_router_operated'] = 'Nama area tempat router dioperasikan';
+$_L['Payment_Notification_URL_Recurring_Notification_URL_Pay_Account_Notification_URL'] = 'URL Notifikasi Pembayaran, URL Notifikasi Berulang, URL Notifikasi Akun Bayar';
+$_L['Finish_Redirect_URL_Unfinish_Redirect_URL_Error_Redirect_URL'] = 'Selesaikan URL Pengalihan, Selesaikan URL Pengalihan, URL Pengalihan Kesalahan';
 $_L['Status'] = 'Status';
-$_L['Plan_Not_found'] = 'Paket tidak ditemukan';
-$_L['Failed_to_create_transaction'] = 'Gagal Membuat Transaksi.';
-$_L['Seller_has_not_yet_setup_Xendit_payment_gateway'] = 'Admin belum mengaktifkan pembayarana melalui Xendit';
-$_L['Admin_has_not_yet_setup_Xendit_payment_gateway_please_tell_admin'] = 'Admin belum mengaktifkan pembayaran Xendit, Mohon beritahu dmin';
-$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Beli? Paket yang aktif akan dinonaktifkan';
-$_L['You_already_have_unpaid_transaction_cancel_it_or_pay_it'] = 'Anda masih memiliki transaksi yang belum dibayar, Bayar atau Batalkan.';
-$_L['Transaction_Not_found'] = 'Transaksi tidak ditemukan';
-$_L['Cancel_it'] = 'Batalkan?';
-$_L['expired'] = 'Kadaluarsa';
-$_L['Check_for_Payment'] = 'Cek Pembayaran';
-$_L['Transaction_still_unpaid'] = 'Transaksi Belum dibayar.';
-$_L['Paid_Date'] = 'Tanggal Bayar';
+$_L['Plan_Not_found'] = 'Paket Tidak ditemukan';
+$_L['Failed_to_create_transaction'] = 'Gagal membuat transaksi.';
+$_L['Seller_has_not_yet_setup_Xendit_payment_gateway'] = 'Penjual belum menyiapkan gateway pembayaran Xendit';
+$_L['Admin_has_not_yet_setup_Xendit_payment_gateway_please_tell_admin'] = 'Admin belum menyiapkan gerbang pembayaran Xendit, mohon beritahu admin';
+$_L['Buy_this_your_active_package_will_be_overwrite'] = 'Beli ini? Paket aktif Anda akan ditimpa';
+$_L['You_already_have_unpaid_transaction_cancel_it_or_pay_it'] = 'Anda sudah memiliki transaksi yang belum dibayar, batalkan atau bayar.';
+$_L['Transaction_Not_found'] = 'Transaksi Tidak ditemukan';
+$_L['Cancel_it'] = 'Batalkan itu?';
+$_L['expired'] = 'kedaluwarsa';
+$_L['Check_for_Payment'] = 'Periksa Pembayaran';
+$_L['Transaction_still_unpaid'] = 'Transaksi masih belum dibayar.';
+$_L['Paid_Date'] = 'Tanggal Pembayaran';
 $_L['Transaction_has_been_paid'] = 'Transaksi telah dibayar.';
-$_L['PAID'] = 'LUNAS';
-$_L['CANCELED'] = 'BATAL';
+$_L['PAID'] = 'DIBAYAR';
+$_L['CANCELED'] = 'DIBATALKAN';
 $_L['UNPAID'] = 'BELUM DIBAYAR';
 $_L['PAY_NOW'] = 'BAYAR SEKARANG';
 $_L['Buy_Hotspot_Plan'] = 'Beli Paket Hotspot';
-$_L['Buy_PPOE_Plan'] = 'Beli Paket PPOE';
+$_L['Buy_PPOE_Plan'] = 'Beli Paket PPPoE';
 $_L['Package'] = 'Paket';
-$_L['Order_Internet_Package'] = 'Beli Paket Internet';
-$_L['Unknown_Command'] = 'Perintah tidak dikenal.';
-$_L['Checking_payment'] = 'Cek pembayaran';
-$_L['Create_Transaction_Success'] = 'Transaksi sukses dibuat';
+$_L['Order_Internet_Package'] = 'Pesan Paket Internet';
+$_L['Unknown_Command'] = 'Perintah Tidak Diketahui.';
+$_L['Checking_payment'] = 'Memeriksa pembayaran';
+$_L['Create_Transaction_Success'] = 'Transaksi Berhasil Dibuat';
 $_L['You_have_unpaid_transaction'] = 'Anda memiliki transaksi yang belum dibayar';
-$_L['TripayPayment_Channel'] = 'TripayPayment Channel';
-$_L['Payment_Channel'] = 'Payment Channel';
-$_L['Payment_check_failed'] = 'Gagal cek pembayaran.';
-$_L['Order_Package'] = 'Beli Paket';
-$_L['Transactions'] = 'Daftar Transaksi';
+$_L['TripayPayment_Channel'] = 'Saluran Pembayaran Tripay';
+$_L['Payment_Channel'] = 'Saluran Pembayaran';
+$_L['Payment_check_failed'] = 'Pemeriksaan pembayaran gagal.';
+$_L['Order_Package'] = 'Pesan Paket';
+$_L['Transactions'] = 'Transaksi';
 $_L['Payments'] = 'Pembayaran';
 $_L['History'] = 'Riwayat';
-$_L['Order_History'] = 'Riwayat Pembelian';
-$_L['Gateway'] = 'Gateway';
+$_L['Order_History'] = 'Riwayat Pesanan';
+$_L['Gateway'] = 'Gerbang';
 $_L['Date_Done'] = 'Tanggal Selesai';
-$_L['Unpaid_Order'] = 'Pembelian belum dibayar';
-$_L['Payment_Gateway_Not_Found'] = 'Payment Gateway Tidak ditemukan';
-$_L['Payment_Gateway_saved_successfully'] = 'Payment Gateway telah disimpan';
-$_L['ORDER'] = 'BELI';
+$_L['Unpaid_Order'] = 'Pesanan Belum Dibayar';
+$_L['Payment_Gateway_Not_Found'] = 'Gerbang Pembayaran Tidak Ditemukan';
+$_L['Payment_Gateway_saved_successfully'] = 'Gerbang Pembayaran berhasil disimpan';
+$_L['ORDER'] = 'MEMESAN';
 $_L['Package_History'] = 'Riwayat Paket';
-$_L['Buy_History'] = 'Riwayat Pembelian';
+$_L['Buy_History'] = 'Riwayat Beli';
 $_L['Activation_History'] = 'Riwayat Aktivasi';
 $_L['Buy_Package'] = 'Beli Paket';
-$_L['Email'] = 'Email';
-$_L['Company_Footer'] = 'Company Footer';
-$_L['Will_show_below_user_pages'] = 'Akan muncul di bawah halaman pelanggan';
-$_L['Request_OTP'] = 'Meminta kode OTP';
+$_L['Email'] = 'Surel';
+$_L['Company_Footer'] = 'Catatan Kaki Perusahaan';
+$_L['Will_show_below_user_pages'] = 'Akan ditampilkan di bawah halaman pengguna';
+$_L['Request_OTP'] = 'Minta OTP';
 $_L['Verification_Code'] = 'Kode Verifikasi';
 $_L['SMS_Verification_Code'] = 'Kode Verifikasi SMS';
-$_L['Please_enter_your_email_address'] = 'Masukkan alamat email';
-$_L['Failed_to_create_Paypal_transaction'] = 'gagal membuat transaksi Paypal';
+$_L['Please_enter_your_email_address'] = 'Silakan masukkan alamat email Anda';
+$_L['Failed_to_create_Paypal_transaction'] = 'Gagal membuat transaksi Paypal.';
 $_L['Plugin'] = 'Plugin';
-$_L['Plugin_Manager'] = 'Plugin Manager';
-$_L['User_Notification'] = 'Notifikasi Pelanggan';
-$_L['Expired_Notification'] = 'Notifikasi Kadaluarsa';
-$_L['User_will_get_notification_when_package_expired'] = 'Pelanggan akan mendapatkan Notifikasi jika paket kadaluarsa';
-$_L['Expired_Notification_Message'] = 'Pesan jika paket kadaluarsa';
-$_L['bnameb_will_be_replaced_with_Customer_Name_bpackageb_will_be_replaced_with_Package_name'] = '<b>[[name]]</b> akan diganti dengan nama konsumen. <b>[[package]]</b> akan diganti dengan nama paket internet.';
+$_L['Plugin_Manager'] = 'Manajer Plugin';
+$_L['User_Notification'] = 'Pemberitahuan Pelanggan';
+$_L['Expired_Notification'] = 'Pemberitahuan Kedaluarsa';
+$_L['User_will_get_notification_when_package_expired'] = 'Pengguna akan mendapat notifikasi ketika paket sudah habis masa berlakunya';
+$_L['Expired_Notification_Message'] = 'Pesan Pemberitahuan Kedaluwarsa';
+$_L['bnameb_will_be_replaced_with_Customer_Name_bpackageb_will_be_replaced_with_Package_name'] = '<b>[[name]]</b> akan diganti dengan Nama pelanggan. <b>[[package]]</b> akan diganti dengan nama paket.';
 $_L['Payment_Notification'] = 'Notifikasi Pembayaran';
-$_L['User_will_get_invoice_notification_when_buy_package_or_package_refilled'] = 'Pelanggan akan mendapatkan Notifikasi pembayaran setelah melakukan pembelian paket';
-$_L['Current_IP'] = 'IP anda';
-$_L['Current_MAC'] = 'MAC anda';
-$_L['Login_Status'] = 'Status Internet';
-$_L['Login_Request_successfully'] = 'Sukses melakukan menyalakan koneksi internet';
-$_L['Logout_Request_successfully'] = 'Sukses melakukan pemutusan koneksi internet';
-$_L['Disconnect_Internet'] = 'Putuskan Internet?';
-$_L['Not_Online_Login_now'] = 'Internet mati, Nyalakan?';
-$_L['You_are_Online_Logout'] = 'Internet hidup, Putuskan?';
-$_L['Connect_to_Internet'] = 'Koneksikan internet?';
-$_L['Your_account_not_connected_to_internet'] = 'Akun tidak terkoneksi dengan internet';
-$_L['Balance'] = 'Saldo';
-$_L['Balance_System'] = 'Sistem Saldo';
-$_L['Enable_System'] = 'Aktifkan Saldo';
-$_L['Allow_Transfer'] = 'Bolehkan Transfer';
-$_L['Telegram_Notification'] = 'Telegram Notification';
-$_L['SMS_OTP_Registration'] = 'SMS OTP Registration';
-$_L['Whatsapp_Notification'] = 'Whatsapp Notification';
-$_L['Tawkto_Chat_Widget'] = 'Tawk.to Chat Widget';
-$_L['Invoice'] = 'Invoice';
-$_L['Country_Code_Phone'] = 'Kode Negara Telepon';
-$_L['Voucher_activation_menu_will_be_hidden'] = 'Info Pembelian Voucher dan Redeem akan disembunyikan';
-$_L['Customer_can_deposit_money_to_buy_voucher'] = 'Pelanggan dapat topup saldo untuk langganan Internet';
-$_L['Allow_balance_transfer_between_customers'] = 'Bolehkan transfer saldo antar pelanggan';
-$_L['Refill_Balance'] = 'Refill Balance';
-$_L['Balance_Plans'] = 'Balance Plans';
-$_L['Expired_IP_Pool'] = 'Expired IP Pool';
-$_L['Company_Logo'] = 'Company Logo';
-$_L['Disable_Voucher'] = 'Disable Voucher';
-$_L['Minimum_Balance_Transfer'] = 'Minimum Balance Transfer';
-$_L['Reminder_Notification'] = 'Reminder Notification';
-$_L['Invoice_Footer'] = 'Invoice Footer';
+$_L['User_will_get_invoice_notification_when_buy_package_or_package_refilled'] = 'Pengguna akan mendapatkan notifikasi invoice saat membeli paket atau isi ulang paket';
+$_L['Current_IP'] = 'IP saat ini';
+$_L['Current_MAC'] = 'MAC saat ini';
+$_L['Login_Status'] = 'Status Masuk';
+$_L['Login_Request_successfully'] = 'Permintaan Masuk berhasil';
+$_L['Logout_Request_successfully'] = 'Permintaan Keluar berhasil';
+$_L['Disconnect_Internet'] = 'Putuskan sambungan Internet?';
+$_L['Not_Online_Login_now'] = 'Tidak , Masuk sekarang?';
+$_L['You_are_Online_Logout'] = 'Kamu sedang aktif, ingin keluar?';
+$_L['Connect_to_Internet'] = 'Hubungkan ke Internet?';
+$_L['Your_account_not_connected_to_internet'] = 'Akun Anda tidak terhubung ke internet';

-$_L['Reminder_7_days'] = 'Reminder 7 days';
-$_L['Reminder_3_days'] = 'Reminder 3 days';
-$_L['Reminder_1_day'] = 'Reminder 1 day';
-$_L['PPPOE_Password'] = 'PPPOE Password';
-$_L['User_Cannot_change_this_only_admin_if_it_Empty_it_will_use_user_password'] = 'User Cannot change this, only admin. if it Empty it will use user password';
-$_L['Invoice_Balance_Message'] = 'Invoice Balance Message';
-$_L['Invoice_Notification_Payment'] = 'Invoice Notification Payment';
-$_L['Balance_Notification_Payment'] = 'Balance Notification Payment';
-$_L['Buy_Balance'] = 'Buy Balance';
-$_L['Price'] = 'Price';
-$_L['Validity'] = 'Validity';
-$_L['Disable_auto_renewal'] = 'Disable auto renewal?';
-$_L['Auto_Renewal_On'] = 'Auto Renewal On';
-$_L['Enable_auto_renewal'] = 'Enable auto renewal?';
-$_L['Auto_Renewal_Off'] = 'Auto Renewal Off';
-$_L['Pay_With_Balance'] = 'Pay With Balance';
-$_L['Pay_this_with_Balance_your_active_package_will_be_overwrite'] = 'Pay this with Balance? your active package will be overwrite';
-$_L['Success_to_buy_package'] = 'Success to buy package';
-$_L['Auto_Renewal'] = 'Auto Renewal';
-$_L['View'] = 'View';
-$_L['Back'] = 'Back';
-$_L['Active'] = 'Active';
-$_L['Transfer_Balance'] = 'Transfer Balance';
-$_L['Send_your_balance'] = 'Send your balance?';
-$_L['Send'] = 'Send';
-$_L['Cannot_send_to_yourself'] = 'Cannot send to yourself';
-$_L['Sending_balance_success'] = 'Sending balance success';
-$_L['From'] = 'From';
-$_L['To'] = 'To';
-$_L['insufficient_balance'] = 'insufficient balance';
-$_L['Send_Balance'] = 'Send Balance';
-$_L['Received_Balance'] = 'Received Balance';
-$_L['Minimum_Transfer'] = 'Minimum Transfer';
-$_L['Proxy'] = 'Proxy';
-$_L['Proxy_Server'] = 'Proxy Server';
-$_L['Proxy_Server_Login'] = 'Proxy Server Login';
-$_L['Hotspot_Plan'] = 'Hotspot Plan';
-$_L['PPPOE_Plan'] = 'PPPOE Plan';
-$_L['UNKNOWN'] = 'UNKNOWN';
-$_L['Are_You_Sure'] = 'Are You Sure?';
-$_L['Success_to_send_package'] = 'Success to send package';
-$_L['Target_has_active_plan_different_with_current_plant'] = 'Target has active plan, different with current plant.';
-$_L['Recharge_a_friend'] = 'Recharge a friend';
-$_L['Buy_for_friend'] = 'Buy for friend';
-$_L['Buy_this_for_friend_account'] = 'Buy this for friend account?';
-$_L['Review_package_before_recharge'] = 'Review package before recharge';
-$_L['Activate'] = 'Activate';
-$_L['Deactivate'] = 'Deactivate';
-$_L['Sync'] = 'Sync';
-$_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
-$_L['Location'] = 'Location';
-$_L['Voucher_Format'] = 'Voucher Format';
+$_L['Failed_to_create_transaction_'] = 'Gagal membuat transaksi. ';
+$_L['Failed_to_check_status_transaction_'] = 'Gagal memeriksa status transaksi. ';
+$_L['Disable_Voucher'] = 'Nonaktifkan Voucher';
+$_L['Balance'] = 'Saldo';
+$_L['Balance_System'] = 'Saldo Sistem';
+$_L['Enable_System'] = 'Aktifkan Sistem';
+$_L['Allow_Transfer'] = 'Izinkan Transfer';
+$_L['Telegram_Notification'] = 'Pemberitahuan Telegram';
+$_L['SMS_OTP_Registration'] = 'Pendaftaran SMS OTP';
+$_L['Whatsapp_Notification'] = 'Pemberitahuan WhatsApp';
+$_L['Tawkto_Chat_Widget'] = 'Widget Obrolan Tawk.to';
+$_L['Invoice'] = 'Faktur';
+$_L['Country_Code_Phone'] = 'Kode Negara Telepon';
+$_L['Voucher_activation_menu_will_be_hidden'] = 'Menu aktivasi voucher akan disembunyikan';
+$_L['Customer_can_deposit_money_to_buy_voucher'] = 'Pelanggan dapat menyetor uang untuk membeli voucher';
+$_L['Allow_balance_transfer_between_customers'] = 'Izinkan transfer saldo antar pelanggan';
+$_L['Reminder_Notification'] = 'Pemberitahuan Pengingat';
+$_L['Reminder_Notification_Message'] = 'Pesan Pemberitahuan Pengingat';
+$_L['Reminder_7_days'] = 'Pengingat 7 hari';
+$_L['Reminder_3_days'] = 'Pengingat 3 hari';
+$_L['Reminder_1_day'] = 'Pengingat 1 hari';
+$_L['PPPOE_Password'] = 'Kata sandi PPPoE';
+$_L['User_Cannot_change_this_only_admin_if_it_Empty_it_will_use_user_password'] = 'Pelanggan tidak dapat mengubah ini, hanya Admin.  Jika kosong maka akan menggunakan kata sandi pelanggan';
+$_L['Invoice_Balance_Message'] = 'Faktur Pesan Saldo';
+$_L['Invoice_Notification_Payment'] = 'Faktur Pemberitahuan Pembayaran';
+$_L['Balance_Notification_Payment'] = 'Saldo Pemberitahuan Pembayaran';
+$_L['Balance_Plans'] = 'Paket Saldo';
+$_L['Buy_Balance'] = 'Beli Saldo';
+$_L['Price'] = 'Harga';
+$_L['Validity'] = 'Waktu';
+$_L['Disable_auto_renewal'] = 'Nonaktifkan perpanjangan otomatis?';
+$_L['Auto_Renewal_On'] = 'Perpanjangan Otomatis Aktif';
+$_L['Enable_auto_renewal'] = 'Aktifkan perpanjangan otomatis?';
+$_L['Auto_Renewal_Off'] = 'Perpanjangan Otomatis Mati';
+$_L['Refill_Balance'] = 'Isi Ulang Saldo';
+$_L['Invoice_Footer'] = 'Catatan Kaki Faktur';
+$_L['Pay_With_Balance'] = 'Bayar dengan Saldo';
+$_L['Pay_this_with_Balance_your_active_package_will_be_overwrite'] = 'Bayar ini dengan Saldo? Paket aktif Anda akan ditimpa';
+$_L['Success_to_buy_package'] = 'Berhasil membeli paket';
+$_L['Auto_Renewal'] = 'Perpanjangan otomatis';
+$_L['View'] = 'Melihat';
+$_L['Back'] = 'Kembali';
+$_L['Active'] = 'Aktif';
+$_L['Transfer_Balance'] = 'Kirim Saldo';
+$_L['Send_your_balance'] = 'Kirim saldo Anda?';
+$_L['Send'] = 'Kirim';
+$_L['Cannot_send_to_yourself'] = 'Tidak dapat mengirim ke diri Anda sendiri';
+$_L['Sending_balance_success'] = 'Berhasil mengirim saldo';
+$_L['From'] = 'Dari';
+$_L['To'] = 'Ke';
+$_L['insufficient_balance'] = 'Saldo tidak mencukupi';
+$_L['Send_Balance'] = 'Kirim Saldo';
+$_L['Received_Balance'] = 'Saldo yang Diterima';
+$_L['Minimum_Balance_Transfer'] = 'Minimal Transfer Saldo';
+$_L['Minimum_Transfer'] = 'Minimal Transfer';
+$_L['Company_Logo'] = 'Logo Perusahaan';
+$_L['Expired_IP_Pool'] = 'IP Pool Kedaluwarsa';
+$_L['Proxy'] = 'Proksi';
+$_L['Proxy_Server'] = 'Server Proksi';
+$_L['Proxy_Server_Login'] = 'Masuk Server Proksi';
+$_L['Hotspot_Plan'] = 'Paket Hotspot';
+$_L['PPPOE_Plan'] = 'Paket PPPoE';
+$_L['UNKNOWN'] = 'TIDAK DIKENAL';
+$_L['Are_You_Sure'] = 'Apa kamu yakin?';
+$_L['Success_to_send_package'] = 'Berhasil mengirim paket';
+$_L['Target_has_active_plan_different_with_current_plant'] = 'Target mempunyai paket aktif, berbeda dengan paket saat ini.';
+$_L['Recharge_a_friend'] = 'Isi ulang teman';
+$_L['Buy_for_friend'] = 'Beli untuk teman';
+$_L['Buy_this_for_friend_account'] = 'Beli ini untuk akun teman?';
+$_L['Review_package_before_recharge'] = 'Tinjau paket sebelum mengisi ulang';
+$_L['Activate'] = 'Mengaktifkan Paket';
+$_L['Deactivate'] = 'Menonaktifkan Paket';
+$_L['Sync'] = 'Sinkronisasi';
+$_L['Failed_to_create_PaymeTrust_transaction'] = 'Gagal membuat transaksi PaymeTrust.';
+$_L['Location'] = 'Lokasi';
+$_L['Radius_Plans'] = 'Paket Radius';
+$_L['Change_title_in_user_Plan_order'] = 'Ubah judul dalam urutan paket pelanggan';
+$_L['Logs'] = 'Log';
+$_L['Voucher_Format'] = 'Format Voucher';
+$_L['Resend_To_Customer'] = 'Kirim Ulang Ke Pelanggan';
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@ -384,7 +384,7 @@ add dst-host=*.{$_domain}</pre>
 </pre>
            <pre>
 # Reminder Cronjob Every 7 AM
-0 7 * * * cd {$dir} && {$php} reminder.php
+0 7 * * * cd {$dir} && {$php} cron_reminder.php
 </pre>
        </div>
    </div>
--- a/ui/ui/dbstatus.tpl
+++ b/ui/ui/dbstatus.tpl
@ -1,24 +1,17 @@
 {include file="sections/header.tpl"}

 <div class="row">
-	<div class="col-sm-12">
-		<div class="panel mb20 panel-primary">
-			<div class="panel-heading">{$_L['Database_Status']}</div>
-			<div class="panel-body">
-
-                <div class="row">
-                    <div class="col-md-12 col-sm-12 col-xs-12">
-						<div class="col-md-9">{$_L['Total_Database_Size']}: {$dbsize}  MB </div>
-						<div class="col-md-3 text-right">
-							<a href="{$_url}settings/dbbackup/" class="btn btn-primary btn-xs"><i class="fa fa-download"></i> {$_L['Download_Database_Backup']}</a>
-						</div>&nbsp;
+    <div class="col-sm-7">
+        <div class="panel panel-primary">
+            <div class="panel-heading">Backup Database</div>
+            <form method="post" action="{$_url}settings/dbbackup">
                <div class="table-responsive">
                    <table class="table table-bordered">
                        <thead>
                            <tr>
                                <th width="50%">{$_L['Table_Name']}</th>
                                <th>{$_L['Rows']}</th>
-										<th>{$_L['Size']}</th>
+                                <th>Select</th>
                            </tr>
                        </thead>
                        <tbody>
@ -26,17 +19,42 @@
                                <tr>
                                    <td>{$tbl['name']}</td>
                                    <td>{$tbl['rows']}</td>
-										<td>{$tbl['size']} Kb</td>
+                                    <td><input type="checkbox" checked name="tables[]" value="{$tbl['name']}"></td>
                                </tr>
                            {/foreach}
                        </tbody>
                    </table>
                </div>
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-md-6">Dont select logs if it failed</div>
+                        <div class="col-md-4 text-right">
+                            <button type="submit" class="btn btn-primary btn-xs btn-block"><i
+                                    class="fa fa-download"></i>
+                                {$_L['Download_Database_Backup']}</button>
                        </div>
                    </div>
+                </div>
+            </form>

        </div>
    </div>
+    <div class="col-sm-5">
+        <div class="panel panel-primary">
+            <div class="panel-heading">Restore Database</div>
+            <form method="post" action="{$_url}settings/dbrestore" enctype="multipart/form-data">
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-md-7"><input type="file" name="json" accept="application/json"></div>
+                        <div class="col-md-5 text-right">
+                            <button type="submit" class="btn btn-primary btn-block btn-xs"><i class="fa fa-upload"></i>
+                                Restore Dabase</button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <div class="panel-footer">Restoring database will clean up data and then restore all the data</div>
+        </div>
    </div>
 </div>

--- a/ui/ui/prepaid-edit.tpl
+++ b/ui/ui/prepaid-edit.tpl
@ -23,7 +23,7 @@
                            <select id="id_plan" name="id_plan" class="form-control select2">
                                {foreach $p as $ps}
                                    <option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>
-                                        {$ps['name_plan']}</option>
+                                    {if $ps['is_radius']=='1'}Radius{else}{$ps['routers']}{/if} - {$ps['name_plan']}</option>
                                {/foreach}
                            </select>
                        </div>
--- a/ui/ui/router-error.tpl
+++ b/ui/ui/router-error.tpl
@ -38,8 +38,8 @@
                <div class="col-md-3">
                    <img src="./ui/ui/images/error.png" class="img-responsive hidden-sm hidden-xs">
                </div>
-                <div class="col-md-6">
-                    <div class="box box-danger box-solid text-center">
+                <div class="col-md-9">
+                    <div class="box box-danger box-solid">

                        <section class="content-header">
                            <h1 class="text-center">
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@ -252,8 +252,8 @@
                                        href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
                                <li {if $_routes[1] eq 'users'}class="active" {/if}><a
                                        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[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>
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@ -8,7 +8,7 @@
                <div class="box-header">
                    <h3 class="box-title">{Lang::T('Unpaid Order')}</h3>
                </div>
-                <table class="table table-condensed table-bordered table-striped table-hover">
+                <table class="table table-condensed table-bordered table-striped table-hover" style="margin-bottom: 0px;">
                    <tbody>
                        <tr>
                            <td>{Lang::T('expired')}</td>
@ -62,7 +62,8 @@
            <div class="box-header">
                <h3 class="box-title">{$_L['Account_Information']}</h3>
            </div>
-            <table class="table table-bordered table-striped table-bordered table-hover">
+            <table class="table table-bordered table-striped table-bordered table-hover mb-0"
+                style="margin-bottom: 0px;">
                <tr>
                    <td class="small text-success text-uppercase text-normal">{$_L['Username']}</td>
                    <td class="small mb15">{$_user['username']}</td>
@ -88,19 +89,25 @@
                        </td>
                    </tr>
                {/if}
-                {if $_bill}
+            </table>
+            {if $_bills}
+                {foreach $_bills as $_bill}
                    {if $_bill['routers'] != 'radius'}
-                        <tr>
-                            <td class="small text-primary text-uppercase text-normal">{strtoupper(Lang::T('Location'))}</td>
-                            <td class="small mb15">{$_bill['routers']}</td>
-                        </tr>
+                        <div class="box-header">
+                            <h3 class="box-title">{$_bill['routers']}</h3>
+                        </div>
+                    {else}
+                        <div class="box-header">
+                            <h3 class="box-title">{if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}</h3>
+                        </div>
                    {/if}
+                    <table class="table table-bordered table-striped table-bordered table-hover" style="margin-bottom: 0px;">
                        <tr>
                            <td class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</td>
                            <td class="small mb15">
                                {$_bill['namebp']}
                                {if $_bill['status'] == 'on'}
-                                <a class="label label-danger pull-right" href="{$_url}home&deactivate=1"
+                                    <a class="label label-danger pull-right" href="{$_url}home&deactivate={$_bill['id']}"
                                        onclick="return confirm('{Lang::T('Deactivate')}?')">{Lang::T('Deactivate')}</a>
                                {else}
                                    <a class="label label-warning pull-right" href="{$_url}order/package">{Lang::T('expired')}</a>
@ -117,7 +124,7 @@
                            <td class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</td>
                            <td class="small mb15 text-danger">
                                {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
-                            <a class="label label-primary pull-right" href="{$_url}home&recharge=1"
+                                <a class="label label-primary pull-right" href="{$_url}home&recharge={$_bill['id']}"
                                    onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
                            </td>
                        </tr>
@ -136,13 +143,15 @@
                        {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_bill['routers'] != 'radius'}
                            <tr>
                                <td class="small text-primary text-uppercase text-normal">{Lang::T('Login Status')}</td>
-                            <td class="small mb15" id="login_status">
+                                <td class="small mb15" id="login_status_{$_bill['id']}">
                                    <img src="ui/ui/images/loading.gif">
                                </td>
                            </tr>
                        {/if}
-                {/if}
                    </table>
+                {/foreach}
+            {/if}
+        </div>
        {if $_c['disable_voucher'] == 'yes'}
            <div class="box-footer">
                {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }
@ -153,20 +162,23 @@
                {/if}
            </div>
        {/if}
-        </div>
+        {if $_bills}
+            {foreach $_bills as $_bill}
                {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
                    <script>
                        setTimeout(() => {
                            $.ajax({
-                        url: "index.php?_route=autoload_user/isLogin",
+                                url: "index.php?_route=autoload_user/isLogin/{$_bill['id']}",
                                cache: false,
                                success: function(msg) {
-                            $("#login_status").html(msg);
+                                    $("#login_status_{$_bill['id']}").html(msg);
                                }
                            });
                        }, 2000);
                    </script>
                {/if}
+            {/foreach}
+        {/if}
        {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes'}
            <div class="box box-primary box-solid mb30">
                <div class="box-header">
--- a/version.json
+++ b/version.json
@ -1,3 +1,3 @@
 {
-    "version": "2023.10.25"
+    "version": "2023.11.17"
 }
Author	SHA1	Message	Date
Ibnu Maksum	21d83268f7	2023.11.17	2023-11-17 14:44:22 +07:00
Ibnu Maksum	e886249091	redirect to home	2023-11-17 14:40:02 +07:00
Ibnu Maksum	d5ab0e1b44	Fix Error for Customer	2023-11-17 14:38:20 +07:00
Ibnu Maksum	05aca0356f	edit changelog	2023-11-15 11:51:13 +07:00
Ibnu Maksum	cced38527b	deactivate login logout fix	2023-11-15 11:49:03 +07:00
Ibnu Maksum	452642831c	fix isLogin	2023-11-15 11:45:29 +07:00
Ibnu Maksum	69ea0d0b7f	Customer Dashboard change	2023-11-15 11:39:05 +07:00
Ibnu Maksum	4b596d91bd	Radius demo mode	2023-11-15 11:11:25 +07:00
Ibnu Maksum	9c5e3007a2	Fix Change package to another Mikrotik	2023-11-15 11:08:18 +07:00
Ibnu Maksum	d3893d88a4	dont show balance when edit active user	2023-11-15 10:53:39 +07:00
Ibnu Maksum	1ed55103a3	demo mode, not connecting to real router	2023-11-15 10:36:53 +07:00
Ibnu Maksum	bd8dd87384	fix bug cron and update plan	2023-11-09 14:52:41 +07:00
iBNu Maksum	9190660c1c	Fixed Error connecting to RouterOS during hotspot plan update Fixed Error connecting to RouterOS during hotspot plan update	2023-10-30 17:15:40 +07:00
Novath Thomas	d241b2cec6	Update services.php Fixed Error connecting to RouterOS when updating hotspot plan from admin panel> services> Hotspot plan, edit plan	2023-10-30 12:18:36 +03:00
Ibnu Maksum	80c76cd6dc	2023.10.27	2023-10-27 10:40:39 +07:00
Ibnu Maksum	a1648a4178	alert about restoring data	2023-10-27 10:39:10 +07:00
Ibnu Maksum	c8d19a859f	New Backup Restore System	2023-10-27 10:36:10 +07:00
Ibnu Maksum	90cfc3e6d9	check radius client if radius_enable	2023-10-27 08:57:57 +07:00
Ibnu Maksum	88a3e2d205	update Language	2023-10-26 11:24:47 +07:00
Ibnu Maksum	0039f47947	fix reminder.php -> cron_reminder.php	2023-10-25 15:27:26 +07:00
Ibnu Maksum	c2f1f07cfc	Update Readme for Radiuss	2023-10-25 15:14:52 +07:00