add log when extend expiraton

Update: Tax System

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 # CHANGELOG
 
+## 2024.4.15
+
+- Postpaid Customer can request extends expiration day if it enabled
+- Some Code Fixing by @ahmadhusein17 and @agstrxyz
+
+## 2024.4.4
+
+- Data Tables for Customers List by @Focuslinkstech
+- Add Bills to Reminder
+- Prevent double submit for recharge and renew
+
 ## 2024.4.3
 
 - Export logs to CSV by @agstrxyz

install/phpnuxbill.sql

@@ -321,3 +321,4 @@ ALTER TABLE `tbl_transactions` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `ty
 ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;
 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`;

system/autoload/App.php

@@ -10,4 +10,20 @@ class App{
         return true;
     }
 
+    public static function getToken(){
+        return md5(microtime());
+    }
+
+    public static function setToken($token, $value){
+        $_SESSION[$token] = $value;
+    }
+
+    public static function getTokenValue($key){
+        if(isset($_SESSION[$key])){
+            return $_SESSION[$key];
+        }else{
+            return "";
+        }
+    }
+
 }

system/autoload/Message.php

@@ -28,6 +28,9 @@ class Message
     public static function sendSMS($phone, $txt)
     {
         global $config;
+        if(empty($txt)){
+            return "";
+        }
         run_hook('send_sms'); #HOOK
         if (!empty($config['sms_url'])) {
             if (strlen($config['sms_url']) > 4 && substr($config['sms_url'], 0, 4) != "http") {
@@ -64,6 +67,9 @@ class Message
     public static function sendWhatsapp($phone, $txt)
     {
         global $config;
+        if(empty($txt)){
+            return "";
+        }
         run_hook('send_whatsapp'); #HOOK
         if (!empty($config['wa_url'])) {
             $waurl = str_replace('[number]', urlencode(Lang::phoneFormat($phone)), $config['wa_url']);
@@ -75,6 +81,9 @@ class Message
     public static function sendEmail($to, $subject, $body)
     {
         global $config;
+        if(empty($body)){
+            return "";
+        }
         run_hook('send_email'); #HOOK
         if (empty($config['smtp_host'])) {
             $attr = "";
@@ -113,10 +122,25 @@ class Message
     public static function sendPackageNotification($customer, $package, $price, $message, $via)
     {
         global $u;
+        if(empty($message)){
+            return "";
+        }
         $msg = str_replace('[[name]]', $customer['fullname'], $message);
         $msg = str_replace('[[username]]', $customer['username'], $msg);
+        $msg = str_replace('[[plan]]', $package, $msg);
         $msg = str_replace('[[package]]', $package, $msg);
-        $msg = str_replace('[[price]]', $price, $msg);
+        $msg = str_replace('[[price]]', Lang::moneyFormat($price), $msg);
+        list($bills, $add_cost) = User::getBills($customer['id']);
+        if($add_cost>0){
+            $note = "";
+            foreach ($bills as $k => $v) {
+                $note .= $k . " : " . Lang::moneyFormat($v) . "\n";
+            }
+            $note .= "Total : " . Lang::moneyFormat($add_cost+$price) . "\n";
+            $msg = str_replace('[[bills]]', $note, $msg);
+        }else{
+            $msg = str_replace('[[bills]]', '', $msg);
+        }
         if ($u) {
             $msg = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($u['expiration'], $u['time']), $msg);
         }
@@ -125,9 +149,9 @@ class Message
             && !empty($message) && in_array($via, ['sms', 'wa'])
         ) {
             if ($via == 'sms') {
-                Message::sendSMS($customer['phonenumber'], $msg);
+                echo Message::sendSMS($customer['phonenumber'], $msg);
             } else if ($via == 'wa') {
-                Message::sendWhatsapp($customer['phonenumber'], $msg);
+                echo Message::sendWhatsapp($customer['phonenumber'], $msg);
             }
         }
         return "$via: $msg";

system/autoload/Package.php

@@ -15,15 +15,17 @@ class Package
      * @param int   $plan_id plan id for this package
      * @param string $gateway payment gateway name
      * @param string $channel channel payment gateway
+     * @param array $pgids payment gateway ids
      * @return boolean
      */
     public static function rechargeUser($id_customer, $router_name, $plan_id, $gateway, $channel, $note = '')
     {
-        global $config, $admin, $c, $p, $b, $t, $d, $zero;
+        global $config, $admin, $c, $p, $b, $t, $d, $zero, $trx;
         $date_now = date("Y-m-d H:i:s");
         $date_only = date("Y-m-d");
         $time_only = date("H:i:s");
         $time = date("H:i:s");
+        $inv = "";
 
         if ($id_customer == '' or $router_name == '' or $plan_id == '') {
             return false;
@@ -76,9 +78,8 @@ class Package
 
         if ($router_name == 'balance') {
             // insert table transactions
-            $inv = "INV-" . Package::_raid();
             $t = ORM::for_table('tbl_transactions')->create();
-            $t->invoice = $inv;
+            $t->invoice = $inv = "INV-" . Package::_raid();
             $t->username = $c['username'];
             $t->plan_name = $p['name_plan'];
             $t->price = $p['price'];
@@ -239,7 +240,7 @@ class Package
 
                 // insert table transactions
                 $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid();
+                $t->invoice = $inv = "INV-" . Package::_raid();
                 $t->username = $c['username'];
                 $t->plan_name = $p['name_plan'];
                 if ($p['validity_unit'] == 'Period') {
@@ -323,7 +324,7 @@ class Package
 
                 // insert table transactions
                 $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid();
+                $t->invoice = $inv = "INV-" . Package::_raid();
                 $t->username = $c['username'];
                 $t->plan_name = $p['name_plan'];
                 if ($p['validity_unit'] == 'Period') {
@@ -435,7 +436,7 @@ class Package
 
                 // insert table transactions
                 $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid();
+                $t->invoice = $inv = "INV-" . Package::_raid();
                 $t->username = $c['username'];
                 $t->plan_name = $p['name_plan'];
                 if ($p['validity_unit'] == 'Period') {
@@ -518,7 +519,7 @@ class Package
 
                 // insert table transactions
                 $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid();
+                $t->invoice = $inv = "INV-" . Package::_raid();
                 $t->username = $c['username'];
                 $t->plan_name = $p['name_plan'];
                 if ($p['validity_unit'] == 'Period') {
@@ -583,7 +584,10 @@ class Package
         }
         run_hook("recharge_user_finish");
         Message::sendInvoice($c, $t);
-        return true;
+        if($trx){
+            $trx->trx_invoice = $inv;
+        }
+        return $inv;
     }
 
     public static function changeTo($username, $plan_id, $from_id)
@@ -690,6 +694,8 @@ class Package
         } else {
             $admin['fullname'] = 'Customer';
         }
+        $cust = ORM::for_table('tbl_customers')->where('username', $in['username'])->findOne();
+
         $note = '';
         //print
         $invoice = Lang::pad($config['CompanyName'], ' ', 2) . "\n";
@@ -724,6 +730,9 @@ class Package
             $invoice .= Lang::pad($note, ' ', 2) . "\n";
         }
         $invoice .= Lang::pad("", '=') . "\n";
+        if($cust){
+            $invoice .= Lang::pads(Lang::T('Full Name'), $cust['fullname'], ' ') . "\n";
+        }
         $invoice .= Lang::pads(Lang::T('Username'), $in['username'], ' ') . "\n";
         $invoice .= Lang::pads(Lang::T('Password'), '**********', ' ') . "\n";
         if ($in['type'] != 'Balance') {
@@ -765,6 +774,9 @@ class Package
             $invoice .= Lang::pad($note, ' ', 2) . "\n";
         }
         $invoice .= Lang::pad("", '=') . "\n";
+        if($cust){
+            $invoice .= Lang::pads(Lang::T('Full Name'), $cust['fullname'], ' ') . "\n";
+        }
         $invoice .= Lang::pads(Lang::T('Username'), $in['username'], ' ') . "\n";
         $invoice .= Lang::pads(Lang::T('Password'), '**********', ' ') . "\n";
         if ($in['type'] != 'Balance') {

system/controllers/customers.php

@@ -512,19 +512,11 @@ switch ($action) {
         break;
 
     default:
-        $search = _post('search');
         run_hook('list_customers'); #HOOK
-        if ($search != '') {
-            $query = ORM::for_table('tbl_customers')
-            ->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')")
-            ->order_by_asc('username');
-            $d = Paginator::findMany($query, ['search' => $search]);
-        } else {
-            $query = ORM::for_table('tbl_customers')->order_by_asc('username');
-            $d = Paginator::findMany($query);
-        }
 
-        $ui->assign('search', htmlspecialchars($search));
+        $query = ORM::for_table('tbl_customers')->order_by_asc('username');
+        $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->display('customers.tpl');
         break;

system/controllers/home.php

@@ -77,37 +77,103 @@ if (_post('send') == 'balance') {
         r2(U . 'home', 'd', Lang::T('Failed, balance is not available'));
     }
 } else if (_post('send') == 'plan') {
-    $active = ORM::for_table('tbl_user_recharges')
+    $actives = ORM::for_table('tbl_user_recharges')
         ->where('username', _post('username'))
-        ->find_one();
-    $router = ORM::for_table('tbl_routers')->where('name', $active['routers'])->find_one();
-    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 . 'home', 'w', Lang::T('Your friend do not have active package'));
+        ->find_many();
+    foreach ($actives as $active) {
+        $router = ORM::for_table('tbl_routers')->where('name', $active['routers'])->find_one();
+        if ($router) {
+            r2(U . "order/send/$router[id]/$active[plan_id]&u=" . trim(_post('username')), 's', Lang::T('Review package before recharge'));
+        }
     }
+    r2(U . 'home', 'w', Lang::T('Your friend do not have active package'));
 }
 
 $ui->assign('_bills', User::_billing());
 
 if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
+    if (!empty(App::getTokenValue(_get('stoken')))) {
+        r2(U . "voucher/invoice/");
+        die();
+    }
     $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 ($bill['routers'] == 'radius') {
+            $router = 'radius';
+        } else {
+            $routers = ORM::for_table('tbl_routers')->where('name', $bill['routers'])->find_one();
+            $router = $routers['id'];
+        }
         if ($config['enable_balance'] == 'yes') {
             $plan = ORM::for_table('tbl_plans')->find_one($bill['plan_id']);
-            if(!$plan['enabled']){
+            if (!$plan['enabled']) {
                 r2(U . "home", 'e', 'Plan is not exists');
             }
             if ($user['balance'] > $plan['price']) {
-                r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+                r2(U . "order/pay/$router/$bill[plan_id]&stoken=" . _get('stoken'), 'e', 'Order Plan');
             } else {
-                r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+                r2(U . "order/buy/$router/$bill[plan_id]", 'e', 'Order Plan');
             }
         } else {
-            r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+            r2(U . "order/buy/$router/$bill[plan_id]", 'e', 'Order Plan');
         }
     }
+} else if (!empty(_get('extend'))) {
+    if(!$config['extend_expired']){
+        r2(U . 'home', 'e', "cannot extend");
+    }
+    if (!empty(App::getTokenValue(_get('stoken')))) {
+        r2(U . 'home', 'e', "You already extend");
+    }
+    $id = _get('extend');
+    $tur = ORM::for_table('tbl_user_recharges')->where('customer_id', $user['id'])->where('id', $id)->find_one();
+    if ($tur) {
+        $m = date("m");
+        $path = $CACHE_PATH . DIRECTORY_SEPARATOR . "extends" . DIRECTORY_SEPARATOR;
+        if(!file_exists($path)){
+            mkdir($path);
+        }
+        $path .= $user['id'] . ".txt";
+        if (file_exists($path)) {
+            // is already extend
+            $last = file_get_contents($path);
+            if ($last == $m) {
+                r2(U . 'home', 'e', "You already extend for this month");
+            }
+        }
+        if ($tur['status'] != 'on') {
+            $days = $config['extend_days'];
+            $expiration = date('Y-m-d', strtotime(" +$days day"));
+            $tur->expiration = $expiration;
+            $tur->status = "on";
+            $tur->save();
+            App::setToken(_get('stoken'), $id);
+            if ($tur['routers'] != 'radius') {
+                $mikrotik = Mikrotik::info($tur['routers']);
+                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                $router = $tur['routers'];
+            }
+            $p = ORM::for_table('tbl_plans')->findOne($tur['plan_id']);
+            $c = ORM::for_table('tbl_customers')->findOne($tur['customer_id']);
+            if ($tur['routers'] == 'radius') {
+                Radius::customerAddPlan($c, $p, $tur['expiration'] . ' ' . $tur['time']);
+            } else {
+                if ($tur['type'] == 'Hotspot') {
+                    Mikrotik::addHotspotUser($client, $p, $c);
+                } else if ($tur['type'] == 'PPPOE') {
+                    Mikrotik::addPpoeUser($client, $p, $c);
+                }
+            }
+            // make customer cannot extend again
+            file_put_contents($path, $m);
+            _log("Customer $tur[customer_id] $tur[username] extend for $days days", "Customer", $user['id']);
+            r2(U . 'home', 's', "Extend until $expiration");
+        }else{
+            r2(U . 'home', 'e', "Plan is not expired");
+        }
+    } else {
+        r2(U . 'home', 'e', "Plan Not Found or Not Active");
+    }
 } 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) {
@@ -133,7 +199,7 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
         $bill->expiration = date('Y-m-d');
         $bill->time = date('H:i:s');
         $bill->save();
-        _log('User ' . $bill['username'] . ' Deactivate ' . $bill['namebp'], 'User', $bill['customer_id']);
+        _log('User ' . $bill['username'] . ' Deactivate ' . $bill['namebp'], 'Customer', $bill['customer_id']);
         Message::sendTelegram('User u' . $bill['username'] . ' Deactivate ' . $bill['namebp']);
         r2(U . 'home', 's', 'Success deactivate ' . $bill['namebp']);
     } else {

system/controllers/order.php

@@ -43,10 +43,10 @@ switch ($action) {
         $ui->assign('_title', 'Order Plan');
         $ui->assign('_system_menu', 'package');
         $account_type = $user['account_type'];
-        if(empty($account_type)){
+        if (empty($account_type)) {
             $account_type = 'Personal';
         }
-        if (!empty ($_SESSION['nux-router'])) {
+        if (!empty($_SESSION['nux-router'])) {
             if ($_SESSION['nux-router'] == 'radius') {
                 $radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
                 $radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
@@ -83,7 +83,7 @@ switch ($action) {
         run_hook('custome
         r_find_unpaid'); #HOOK
         if ($d) {
-            if (empty ($d['pg_url_payment'])) {
+            if (empty($d['pg_url_payment'])) {
                 r2(U . "order/buy/" . $trx['routers_id'] . '/' . $trx['plan_id'], 'w', Lang::T("Checking payment"));
             } else {
                 r2(U . "order/view/" . $d['id'] . '/check/', 's', Lang::T("You have unpaid transaction"));
@@ -99,11 +99,11 @@ switch ($action) {
             ->find_one($trxid);
         run_hook('customer_view_payment'); #HOOK
         // jika tidak ditemukan, berarti punya orang lain
-        if (empty ($trx)) {
+        if (empty($trx)) {
             r2(U . "order/package", 'w', Lang::T("Payment not found"));
         }
         // jika url kosong, balikin ke buy, kecuali cancel
-        if (empty ($trx['pg_url_payment']) && $routes['3'] != 'cancel') {
+        if (empty($trx['pg_url_payment']) && $routes['3'] != 'cancel') {
             r2(U . "order/buy/" . (($trx['routers_id'] == 0) ? $trx['routers'] : $trx['routers_id']) . '/' . $trx['plan_id'], 'w', Lang::T("Checking payment"));
         }
         if ($routes['3'] == 'check') {
@@ -124,15 +124,15 @@ switch ($action) {
                 ->where('username', $user['username'])
                 ->find_one($trxid);
         }
-        if (empty ($trx)) {
+        if (empty($trx)) {
             r2(U . "order/package", 'e', Lang::T("Transaction Not found"));
         }
+
         $router = Mikrotik::info($trx['routers']);
         $plan = ORM::for_table('tbl_plans')->find_one($trx['plan_id']);
         $bandw = ORM::for_table('tbl_bandwidth')->find_one($plan['id_bw']);
-        list($bills, $add_cost) = User::getBills($id_customer);
-        $ui->assign('bills', $bills);
-        $ui->assign('add_cost', $add_cost);
+        $invoice = ORM::for_table('tbl_transactions')->where("invoice",$trx['trx_invoice'])->find_one();
+        $ui->assign('invoice', $invoice);
         $ui->assign('trx', $trx);
         $ui->assign('router', $router);
         $ui->assign('plan', $plan);
@@ -144,8 +144,12 @@ switch ($action) {
         if ($config['enable_balance'] != 'yes') {
             r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
         }
+        if (!empty(App::getTokenValue($_GET['stoken']))) {
+            r2(U . "voucher/invoice/");
+            die();
+        }
         $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
-        if (empty ($plan)) {
+        if (empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
         if (!$plan['enabled']) {
@@ -161,6 +165,7 @@ switch ($action) {
             if (Package::rechargeUser($user['id'], $router_name, $plan['id'], 'Customer', 'Balance')) {
                 // if success, then get the balance
                 Balance::min($user['id'], $plan['price'] + $add_cost);
+                App::setToken($_GET['stoken'], "success");
                 r2(U . "voucher/invoice/", 's', Lang::T("Success to buy package"));
             } else {
                 r2(U . "order/package", 'e', Lang::T("Failed to buy package"));
@@ -179,7 +184,7 @@ switch ($action) {
         $ui->assign('_title', Lang::T('Buy for friend'));
         $ui->assign('_system_menu', 'package');
         $plan = ORM::for_table('tbl_plans')->find_one($routes['3']);
-        if (empty ($plan)) {
+        if (empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
         if (!$plan['enabled']) {
@@ -190,10 +195,10 @@ switch ($action) {
         } else {
             $router_name = $plan['routers'];
         }
-        if (isset ($_POST['send']) && $_POST['send'] == 'plan') {
+        if (isset($_POST['send']) && $_POST['send'] == 'plan') {
             $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one();
             list($bills, $add_cost) = User::getBills($target['id']);
-            if (!empty ($add_cost)) {
+            if (!empty($add_cost)) {
                 $ui->assign('bills', $bills);
                 $ui->assign('add_cost', $add_cost);
                 $plan['price'] += $add_cost;
@@ -215,7 +220,8 @@ switch ($action) {
             if ($active && $active['plan_id'] != $plan['id']) {
                 r2(U . "order/package", 'e', Lang::T("Target has active plan, different with current plant.") . " [ <b>$active[namebp]</b> ]");
             }
-            if (Package::rechargeUser($target['id'], $router_name, $plan['id'], $user['fullname'], 'Balance')) {
+            $result = Package::rechargeUser($target['id'], $router_name, $plan['id'], $user['username'], 'Balance');
+            if (!empty($result)) {
                 // if success, then get the balance
                 Balance::min($user['id'], $plan['price']);
                 //sender
@@ -233,6 +239,7 @@ switch ($action) {
                 $d->paid_date = date('Y-m-d H:i:s');
                 $d->expired_date = date('Y-m-d H:i:s');
                 $d->pg_url_payment = 'balance';
+                $d->trx_invoice = $result;
                 $d->status = 2;
                 $d->save();
                 $trx_id = $d->id();
@@ -251,6 +258,7 @@ switch ($action) {
                 $d->paid_date = date('Y-m-d H:i:s');
                 $d->expired_date = date('Y-m-d H:i:s');
                 $d->pg_url_payment = 'balance';
+                $d->trx_invoice = $result;
                 $d->status = 2;
                 $d->save();
                 r2(U . "order/view/$trx_id", 's', Lang::T("Success to send package"));
@@ -288,7 +296,7 @@ switch ($action) {
             $ui->display('user-selectGateway.tpl');
             break;
         } else {
-            if (empty ($pgs[0])) {
+            if (empty($pgs[0])) {
                 sendTelegram("Payment Gateway not set, please set it in Settings");
                 _log(Lang::T("Payment Gateway not set, please set it in Settings"));
                 r2(U . "home", 'e', Lang::T("Failed to create Transaction.."));
@@ -298,12 +306,12 @@ switch ($action) {
         }
     case 'buy':
         $gateway = _post('gateway');
-        if (empty ($gateway) && !empty ($_SESSION['gateway'])) {
+        if (empty($gateway) && !empty($_SESSION['gateway'])) {
             $gateway = $_SESSION['gateway'];
-        } else if (!empty ($gateway)) {
+        } else if (!empty($gateway)) {
             $_SESSION['gateway'] = $gateway;
         }
-        if (empty ($gateway)) {
+        if (empty($gateway)) {
             r2(U . 'order/gateway/' . $routes[2] . '/' . $routes[3], 'w', Lang::T("Please select Payment Gateway"));
         }
         run_hook('customer_buy_plan'); #HOOK
@@ -320,7 +328,7 @@ switch ($action) {
             $router['name'] = 'balance';
         }
         $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
-        if (empty ($router) || empty ($plan)) {
+        if (empty($router) || empty($plan)) {
             r2(U . "order/package", 'e', Lang::T("Plan Not found"));
         }
         $d = ORM::for_table('tbl_payment_gateway')
@@ -343,7 +351,7 @@ switch ($action) {
         if ($router['name'] != 'balance') {
             list($bills, $add_cost) = User::getBills($id_customer);
         }
-        if (empty ($id)) {
+        if (empty($id)) {
             $d = ORM::for_table('tbl_payment_gateway')->create();
             $d->username = $user['username'];
             $d->gateway = $gateway;
@@ -354,7 +362,7 @@ switch ($action) {
             if ($plan['validity_unit'] == 'Period') {
                 // Postpaid price from field
                 $add_inv = User::getAttribute("Invoice", $id_customer);
-                if (empty ($add_inv) or $add_inv == 0) {
+                if (empty($add_inv) or $add_inv == 0) {
                     $d->price = ($plan['price'] + $add_cost);
                 } else {
                     $d->price = ($add_inv + $add_cost);
@@ -377,7 +385,7 @@ switch ($action) {
             if ($plan['validity_unit'] == 'Period') {
                 // Postpaid price from field
                 $add_inv = User::getAttribute("Invoice", $id_customer);
-                if (empty ($add_inv) or $add_inv == 0) {
+                if (empty($add_inv) or $add_inv == 0) {
                     $d->price = ($plan['price'] + $add_cost);
                 } else {
                     $d->price = ($add_inv + $add_cost);

system/controllers/plan.php

@@ -60,23 +60,6 @@ switch ($action) {
             $log .= "DONE : $plan[username], $plan[namebp], $plan[type], $plan[routers]<br>";
         }
         r2(U . 'plan/list', 's', $log);
-    case 'list':
-        $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/plan.js"></script>');
-        $ui->assign('_title', Lang::T('Customer'));
-        $search = _post('search');
-        if ($search != '') {
-            $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->order_by_desc('id');
-            $d = Paginator::findMany($query, ['search' => $search]);
-        } else {
-            $query = ORM::for_table('tbl_user_recharges')->order_by_desc('id');
-            $d = Paginator::findMany($query);
-        }
-        run_hook('view_list_billing'); #HOOK
-        $ui->assign('d', $d);
-        $ui->assign('search', $search);
-        $ui->display('plan.tpl');
-        break;
-
     case 'recharge':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
@@ -147,6 +130,15 @@ switch ($action) {
         $server = _post('server');
         $planId = _post('plan');
         $using = _post('using');
+        $stoken = _post('stoken');
+
+        if(!empty(App::getTokenValue($stoken))){
+            $username = App::getTokenValue($stoken);
+            $in = ORM::for_table('tbl_transactions')->where('username', $username)->order_by_desc('id')->find_one();
+            Package::createInvoice($in);
+            $ui->display('invoice.tpl');
+            die();
+        }
 
         $msg = '';
         if ($id_customer == '' or $server == '' or $planId == '' or $using == '') {
@@ -182,6 +174,7 @@ switch ($action) {
                 }
                 $in = ORM::for_table('tbl_transactions')->where('username', $cust['username'])->order_by_desc('id')->find_one();
                 Package::createInvoice($in);
+                App::setToken($stoken, $cust['username']);
                 $ui->display('invoice.tpl');
                 _log('[' . $admin['username'] . ']: ' . 'Recharge ' . $cust['username'] . ' [' . $in['plan_name'] . '][' . Lang::moneyFormat($in['price']) . ']', $admin['user_type'], $admin['id']);
             } else {
@@ -746,6 +739,61 @@ switch ($action) {
             r2(U . 'plan/refill', 'e', "All field is required");
         }
         break;
+    case 'extend':
+        $id = $routes[2];
+        $days = $routes[3];
+        $stoken = $_GET['stoken'];
+        if(App::getTokenValue($stoken)){
+            r2(U . 'plan', 's', "Extend already done");
+        }
+        $tur = ORM::for_table('tbl_user_recharges')->find_one($id);
+        $status = $tur['status'];
+        if(strtotime($tur['expiration'].' '.$tur['time']) > time()){
+            // not expired
+            $expiration = date('Y-m-d', strtotime($tur['expiration']." +$days day"));
+        }else{
+            //expired
+            $expiration = date('Y-m-d', strtotime(" +$days day"));
+        }
+        $tur->expiration = $expiration;
+        $tur->status = "on";
+        $tur->save();
+        App::setToken($stoken, $id);
+        if($status=='off'){
+            if ($tur['routers'] != 'radius') {
+                $mikrotik = Mikrotik::info($tur['routers']);
+                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                $router = $tur['routers'];
+            }
+            $p = ORM::for_table('tbl_plans')->findOne($tur['plan_id']);
+            $c = ORM::for_table('tbl_customers')->findOne($tur['customer_id']);
+            if ($tur['routers'] == 'radius') {
+                Radius::customerAddPlan($c, $p, $tur['expiration'] . ' ' . $tur['time']);
+            } else {
+                if ($tur['type'] == 'Hotspot') {
+                    Mikrotik::addHotspotUser($client, $p, $c);
+                } else if ($tur['type'] == 'PPPOE') {
+                    Mikrotik::addPpoeUser($client, $p, $c);
+                }
+            }
+        }
+        _log("$admin[fullname] extend Customer $tur[customer_id] $tur[username] for $days days", $admin['user_type'], $admin['id']);
+        r2(U . 'plan', 's', "Extend until $expiration");
+        break;
     default:
-        $ui->display('a404.tpl');
+        $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/plan.js"></script>');
+        $ui->assign('_title', Lang::T('Customer'));
+        $search = _post('search');
+        if ($search != '') {
+            $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['search' => $search]);
+        } else {
+            $query = ORM::for_table('tbl_user_recharges')->order_by_desc('id');
+            $d = Paginator::findMany($query);
+        }
+        run_hook('view_list_billing'); #HOOK
+        $ui->assign('d', $d);
+        $ui->assign('search', $search);
+        $ui->display('plan.tpl');
+        break;
 }

system/controllers/services.php

@@ -60,7 +60,7 @@ switch ($action) {
                     $rate = $plan['rate_up'] . $unitup . "/" . $plan['rate_down'] . $unitdown;
                     Mikrotik::addHotspotPlan($client, $plan['name_plan'], $plan['shared_users'], $rate);
                     $log .= "DONE : $plan[name_plan], $plan[shared_users], $rate<br>";
-                    if (!empty ($plan['pool_expired'])) {
+                    if (!empty($plan['pool_expired'])) {
                         Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $plan['pool_expired'], $plan['pool_expired']);
                         $log .= "DONE Expired : EXPIRED NUXBILL $plan[pool_expired]<br>";
                     }
@@ -105,7 +105,7 @@ switch ($action) {
                     $rate = $plan['rate_up'] . $unitup . "/" . $plan['rate_down'] . $unitdown;
                     Mikrotik::addPpoePlan($client, $plan['name_plan'], $plan['pool'], $rate);
                     $log .= "DONE : $plan[name_plan], $plan[pool], $rate<br>";
-                    if (!empty ($plan['pool_expired'])) {
+                    if (!empty($plan['pool_expired'])) {
                         Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $plan['pool_expired'], $plan['pool_expired'], '512K/512K');
                         $log .= "DONE Expired : EXPIRED NUXBILL $plan[pool_expired]<br>";
                     }
@@ -120,7 +120,7 @@ switch ($action) {
         $name = _post('name');
         if ($name != '') {
             $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $d = Paginator::findMany($query, ['name'=> $name]);
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
             $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot');
             $d = Paginator::findMany($query);
@@ -213,7 +213,7 @@ switch ($action) {
         if ($name == '' or $id_bw == '' or $price == '' or $validity == '') {
             $msg .= Lang::T('All field is required') . '<br>';
         }
-        if (empty ($radius)) {
+        if (empty($radius)) {
             if ($routers == '') {
                 $msg .= Lang::T('All field is required') . '<br>';
             }
@@ -245,10 +245,41 @@ switch ($action) {
             $radiusRate = $b['rate_up'] . $radup . '/' . $b['rate_down'] . $raddown;
             $rate = trim($rate . " " . $b['burst']);
 
+            // Check if tax is enabled in config
+            $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
+
+            // Default tax rate
+            $default_tax_rate = 0.01; // Default tax rate 1%
+
+            // Check if tax rate is set to custom in config
+            $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate;
+
+            // Check if tax rate is custom
+            if ($tax_rate_setting === 'custom') {
+                // Check if custom tax rate is set in config
+                $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate;
+                // Convert custom tax rate to decimal
+                $custom_tax_rate_decimal = $custom_tax_rate / 100;
+                $tax_rate = $custom_tax_rate_decimal;
+            } else {
+                // Use tax rate
+                $tax_rate = $tax_rate_setting;
+            }
+
+
+            // Calculate the new price with tax if tax is enabled
+            if ($tax_enable === 'yes') {
+                $price_with_tax = $price + ($price * $tax_rate);
+            } else {
+                // If tax is not enabled, use the original price
+                $price_with_tax = $price;
+            }
+
+            // Create new plan
             $d = ORM::for_table('tbl_plans')->create();
             $d->name_plan = $name;
             $d->id_bw = $id_bw;
-            $d->price = $price;
+            $d->price = $price_with_tax; // Set price with or without tax based on configuration
             $d->type = 'Hotspot';
             $d->typebp = $typebp;
             $d->plan_type = $plan_type;
@@ -260,7 +291,7 @@ switch ($action) {
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
             $d->shared_users = $sharedusers;
-            if (!empty ($radius)) {
+            if (!empty($radius)) {
                 $d->is_radius = 1;
                 $d->routers = '';
             } else {
@@ -280,7 +311,7 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::addHotspotPlan($client, $name, $sharedusers, $rate);
-                if (!empty ($pool_expired)) {
+                if (!empty($pool_expired)) {
                     Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired);
                 }
             }
@@ -356,14 +387,44 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::setHotspotPlan($client, $name, $sharedusers, $rate);
-                if (!empty ($pool_expired)) {
+                if (!empty($pool_expired)) {
                     Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired);
                 }
             }
 
+            // Check if tax is enabled in config
+            $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
+
+            // Default tax rate
+            $default_tax_rate = 0.01; // Default tax rate 1%
+
+            // Check if tax rate is set to custom in config
+            $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate;
+
+            // Check if tax rate is custom
+            if ($tax_rate_setting === 'custom') {
+                // Check if custom tax rate is set in config
+                $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate;
+                // Convert custom tax rate to decimal
+                $custom_tax_rate_decimal = $custom_tax_rate / 100;
+                $tax_rate = $custom_tax_rate_decimal;
+            } else {
+                // Use tax rate
+                $tax_rate = $tax_rate_setting;
+            }
+
+
+            // Calculate the new price with tax if tax is enabled
+            if ($tax_enable === 'yes') {
+                $price_with_tax = $price + ($price * $tax_rate);
+            } else {
+                // If tax is not enabled, use the original price
+                $price_with_tax = $price;
+            }
+
             $d->name_plan = $name;
             $d->id_bw = $id_bw;
-            $d->price = $price;
+            $d->price = $price_with_tax; // Set price with or without tax based on configuration
             $d->typebp = $typebp;
             $d->limit_type = $limit_type;
             $d->time_limit = $time_limit;
@@ -487,7 +548,7 @@ switch ($action) {
         if ($name == '' or $id_bw == '' or $price == '' or $validity == '' or $pool == '') {
             $msg .= Lang::T('All field is required') . '<br>';
         }
-        if (empty ($radius)) {
+        if (empty($radius)) {
             if ($routers == '') {
                 $msg .= Lang::T('All field is required') . '<br>';
             }
@@ -518,16 +579,47 @@ switch ($action) {
             $radiusRate = $b['rate_up'] . $radup . '/' . $b['rate_down'] . $raddown;
             $rate = trim($rate . " " . $b['burst']);
 
+            // Check if tax is enabled in config
+            $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
+
+            // Default tax rate
+            $default_tax_rate = 0.01; // Default tax rate 1%
+
+            // Check if tax rate is set to custom in config
+            $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate;
+
+            // Check if tax rate is custom
+            if ($tax_rate_setting === 'custom') {
+                // Check if custom tax rate is set in config
+                $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate;
+                // Convert custom tax rate to decimal
+                $custom_tax_rate_decimal = $custom_tax_rate / 100;
+                $tax_rate = $custom_tax_rate_decimal;
+            } else {
+                // Use tax rate
+                $tax_rate = $tax_rate_setting;
+            }
+
+
+            // Calculate the new price with tax if tax is enabled
+            if ($tax_enable === 'yes') {
+                $price_with_tax = $price + ($price * $tax_rate);
+            } else {
+                // If tax is not enabled, use the original price
+                $price_with_tax = $price;
+            }
+
+
             $d = ORM::for_table('tbl_plans')->create();
             $d->type = 'PPPOE';
             $d->name_plan = $name;
             $d->id_bw = $id_bw;
-            $d->price = $price;
+            $d->price = $price_with_tax;
             $d->plan_type = $plan_type;
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
             $d->pool = $pool;
-            if (!empty ($radius)) {
+            if (!empty($radius)) {
                 $d->is_radius = 1;
                 $d->routers = '';
             } else {
@@ -547,7 +639,7 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::addPpoePlan($client, $name, $pool, $rate);
-                if (!empty ($pool_expired)) {
+                if (!empty($pool_expired)) {
                     Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K');
                 }
             }
@@ -616,14 +708,44 @@ switch ($action) {
                 $mikrotik = Mikrotik::info($routers);
                 $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                 Mikrotik::setPpoePlan($client, $name, $pool, $rate);
-                if (!empty ($pool_expired)) {
+                if (!empty($pool_expired)) {
                     Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K');
                 }
             }
 
+            // Check if tax is enabled in config
+            $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
+
+            // Default tax rate
+            $default_tax_rate = 0.01; // Default tax rate 1%
+
+            // Check if tax rate is set to custom in config
+            $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate;
+
+            // Check if tax rate is custom
+            if ($tax_rate_setting === 'custom') {
+                // Check if custom tax rate is set in config
+                $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate;
+                // Convert custom tax rate to decimal
+                $custom_tax_rate_decimal = $custom_tax_rate / 100;
+                $tax_rate = $custom_tax_rate_decimal;
+            } else {
+                // Use tax rate
+                $tax_rate = $tax_rate_setting;
+            }
+
+
+            // Calculate the new price with tax if tax is enabled
+            if ($tax_enable === 'yes') {
+                $price_with_tax = $price + ($price * $tax_rate);
+            } else {
+                // If tax is not enabled, use the original price
+                $price_with_tax = $price;
+            }
+
             $d->name_plan = $name;
             $d->id_bw = $id_bw;
-            $d->price = $price;
+            $d->price = $price_with_tax;
             $d->plan_type = $plan_type;
             $d->validity = $validity;
             $d->validity_unit = $validity_unit;
@@ -700,8 +822,37 @@ switch ($action) {
         }
         run_hook('edit_ppoe'); #HOOK
         if ($msg == '') {
+            // Check if tax is enabled in config
+            $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
+
+            // Default tax rate
+            $default_tax_rate = 0.01; // Default tax rate 1%
+
+            // Check if tax rate is set to custom in config
+            $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate;
+
+            // Check if tax rate is custom
+            if ($tax_rate_setting === 'custom') {
+                // Check if custom tax rate is set in config
+                $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate;
+                // Convert custom tax rate to decimal
+                $custom_tax_rate_decimal = $custom_tax_rate / 100;
+                $tax_rate = $custom_tax_rate_decimal;
+            } else {
+                // Use tax rate
+                $tax_rate = $tax_rate_setting;
+            }
+
+
+            // Calculate the new price with tax if tax is enabled
+            if ($tax_enable === 'yes') {
+                $price_with_tax = $price + ($price * $tax_rate);
+            } else {
+                // If tax is not enabled, use the original price
+                $price_with_tax = $price;
+            }
             $d->name_plan = $name;
-            $d->price = $price;
+            $d->price = $price_with_tax;
             $d->enabled = $enabled;
             $d->prepaid = 'yes';
             $d->save();
@@ -730,11 +881,43 @@ switch ($action) {
         }
         run_hook('add_ppoe'); #HOOK
         if ($msg == '') {
+
+            // Check if tax is enabled in config
+            $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
+
+            // Default tax rate
+            $default_tax_rate = 0.01; // Default tax rate 1%
+
+            // Check if tax rate is set to custom in config
+            $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate;
+
+            // Check if tax rate is custom
+            if ($tax_rate_setting === 'custom') {
+                // Check if custom tax rate is set in config
+                $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate;
+                // Convert custom tax rate to decimal
+                $custom_tax_rate_decimal = $custom_tax_rate / 100;
+                $tax_rate = $custom_tax_rate_decimal;
+            } else {
+                // Use tax rate
+                $tax_rate = $tax_rate_setting;
+            }
+
+
+            // Calculate the new price with tax if tax is enabled
+            if ($tax_enable === 'yes') {
+                $price_with_tax = $price + ($price * $tax_rate);
+            } else {
+                // If tax is not enabled, use the original price
+                $price_with_tax = $price;
+            }
+
+
             $d = ORM::for_table('tbl_plans')->create();
             $d->type = 'Balance';
             $d->name_plan = $name;
             $d->id_bw = 0;
-            $d->price = $price;
+            $d->price = $price_with_tax;
             $d->validity = 0;
             $d->validity_unit = 'Months';
             $d->routers = '';

system/controllers/settings.php

@@ -119,7 +119,7 @@ switch ($action) {
                     die();
                 }
             }
-            // save all settings
+            // Save all settings including tax system
             foreach ($_POST as $key => $value) {
                 $d = ORM::for_table('tbl_appconfig')->where('setting', $key)->find_one();
                 if ($d) {
@@ -133,6 +133,33 @@ switch ($action) {
                 }
             }
 
+            // Handle tax system separately
+            $enable_tax = isset($_POST['enable_tax']) ? $_POST['enable_tax'] : 'no';
+            $tax_rate = isset($_POST['tax_rate']) ? $_POST['tax_rate'] : '0.01'; // Default tax rate 1%
+
+            // Save or update tax system settings
+            $d_tax_enable = ORM::for_table('tbl_appconfig')->where('setting', 'enable_tax')->find_one();
+            if ($d_tax_enable) {
+                $d_tax_enable->value = $enable_tax;
+                $d_tax_enable->save();
+            } else {
+                $d_tax_enable = ORM::for_table('tbl_appconfig')->create();
+                $d_tax_enable->setting = 'enable_tax';
+                $d_tax_enable->value = $enable_tax;
+                $d_tax_enable->save();
+            }
+
+            $d_tax_rate = ORM::for_table('tbl_appconfig')->where('setting', 'tax_rate')->find_one();
+            if ($d_tax_rate) {
+                $d_tax_rate->value = $tax_rate;
+                $d_tax_rate->save();
+            } else {
+                $d_tax_rate = ORM::for_table('tbl_appconfig')->create();
+                $d_tax_rate->setting = 'tax_rate';
+                $d_tax_rate->value = $tax_rate;
+                $d_tax_rate->save();
+            }
+
             //checkbox
             $checks = ['hide_mrc', 'hide_tms', 'hide_aui', 'hide_al', 'hide_uet', 'hide_vs', 'hide_pg'];
             foreach ($checks as $check) {

system/cron.php

@@ -1,149 +1,99 @@
 <?php
 
 include "../init.php";
-$isCli = true;
-if (php_sapi_name() !== 'cli') {
-    $isCli = false;
+
+$isCli = (php_sapi_name() !== 'cli') ? false : true;
+if (!$isCli) {
     echo "<pre>";
 }
+
 echo "PHP Time\t" . date('Y-m-d H:i:s') . "\n";
 $res = ORM::raw_execute('SELECT NOW() AS WAKTU;');
 $statement = ORM::get_last_statement();
-$rows = array();
+$rows = [];
 while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
     echo "MYSQL Time\t" . $row['WAKTU'] . "\n";
 }
 
-$_c = $config;
-
-
 $textExpired = Lang::getNotifText('expired');
 
-$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->where_lte('expiration', date("Y-m-d"))->find_many();
-echo "Found " . count($d) . " user(s)\n";
-run_hook('cronjob'); #HOOK
+$recharges = ORM::for_table('tbl_user_recharges')
+    ->where('status', 'on')
+    ->where_lte('expiration', date("Y-m-d"))
+    ->find_many();
 
-foreach ($d as $ds) {
-    if ($ds['type'] == 'Hotspot') { # HOTSPOT
-        $date_now = strtotime(date("Y-m-d H:i:s"));
-        $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
-        echo $ds['expiration'] . " : " . (($isCli) ? $ds['username'] : Lang::maskText($ds['username']));
-        if ($date_now >= $expiration) {
-            echo " : EXPIRED \r\n";
-            $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
-            $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
-            $m = Mikrotik::info($ds['routers']);
-            $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-            $price = Lang::moneyFormat($p['price']);
-            if ($p['is_radius']) {
-                if (empty($p['pool_expired'])) {
-                    print_r(Radius::customerDeactivate($c['username']));
+echo "Found " . count($recharges) . " user(s)\n";
+run_hook('cronjob'); // HOOK
+
+foreach ($recharges as $recharge) {
+    $dateNow = strtotime(date("Y-m-d H:i:s"));
+    $expiration = strtotime($recharge['expiration'] . ' ' . $recharge['time']);
+
+    echo $recharge['expiration'] . " : " . (($isCli) ? $recharge['username'] : Lang::maskText($recharge['username']));
+
+    if ($dateNow >= $expiration) {
+        echo " : EXPIRED \r\n";
+        $userRecharge = ORM::for_table('tbl_user_recharges')->where('id', $recharge['id'])->find_one();
+        $customer = ORM::for_table('tbl_customers')->where('id', $recharge['customer_id'])->find_one();
+        $plan = ORM::for_table('tbl_plans')->where('id', $userRecharge['plan_id'])->find_one();
+        $router = ($recharge['type'] == 'Hotspot') ? Mikrotik::info($recharge['routers']) : ORM::for_table('tbl_routers')->where('name', $recharge['routers'])->find_one();
+
+        if ($plan['is_radius']) {
+            if (empty($plan['pool_expired'])) {
+                print_r(Radius::customerDeactivate($customer['username']));
+            } else {
+                Radius::upsertCustomerAttr($customer['username'], 'Framed-Pool', $plan['pool_expired'], ':=');
+                print_r(Radius::disconnectCustomer($customer['username']));
+            }
+        } else {
+            $client = Mikrotik::getClient($router['ip_address'], $router['username'], $router['password']);
+
+            if (!empty($plan['pool_expired'])) {
+                if ($recharge['type'] == 'Hotspot') {
+                    Mikrotik::setHotspotUserPackage($client, $customer['username'], 'EXPIRED NUXBILL ' . $plan['pool_expired']);
                 } else {
-                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
-                    print_r(Radius::disconnectCustomer($c['username']));
+                    Mikrotik::setPpoeUserPlan($client, $customer['username'], 'EXPIRED NUXBILL ' . $plan['pool_expired']);
                 }
             } else {
-                $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
-                if (!empty($p['pool_expired'])) {
-                    Mikrotik::setHotspotUserPackage($client, $c['username'], 'EXPIRED NUXBILL ' . $p['pool_expired']);
-                    // }if (!empty($p['list_expired'])) {
-                    //     $ip = Mikrotik::getIpHotspotUser($client, $ds['username']);
-                    //     Mikrotik::addIpToAddressList($client, $ip, $p['list_expired'], $c['username']);
+                if ($recharge['type'] == 'Hotspot') {
+                    Mikrotik::removeHotspotUser($client, $customer['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $customer['username']);
                 } else {
-                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $customer['username']);
+                    Mikrotik::removePpoeActive($client, $customer['username']);
                 }
-                Mikrotik::removeHotspotActiveUser($client, $c['username']);
             }
-            echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired']) . "\n";
-            //update database user dengan status off
-            $u->status = 'off';
-            $u->save();
+        }
 
-            // autorenewal from deposit
-            if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                list($bills, $add_cost) = User::getBills($ds['customer_id']);
-                if ($add_cost > 0) {
-                    if (!empty($add_cost)) {
-                        $p['price'] += $add_cost;
-                    }
-                }
-                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
-                    if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
-                        // if success, then get the balance
-                        Balance::min($ds['customer_id'], $p['price']);
-                        echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
-                        echo "auto renewall Success\n";
-                    } else {
-                        echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
-                        echo "auto renewall Failed\n";
-                        Message::sendTelegram("FAILED RENEWAL #cron\n\n#u$c[username] #buy #Hotspot \n" . $p['name_plan'] .
-                            "\nRouter: " . $p['routers'] .
-                            "\nPrice: " . $p['price']);
-                    }
+        echo Message::sendPackageNotification($customer, $userRecharge['namebp'], $plan['price'], $textExpired, $config['user_notification_expired']) . "\n";
+
+        $userRecharge->status = 'off';
+        $userRecharge->save();
+
+        if ($config['enable_balance'] == 'yes' && $customer['auto_renewal']) {
+            list($bills, $add_cost) = User::getBills($recharge['customer_id']);
+            if ($add_cost > 0) {
+                $plan['price'] += $add_cost;
+            }
+            if ($plan && $plan['enabled'] && $customer['balance'] >= $plan['price']) {
+                if (Package::rechargeUser($recharge['customer_id'], $plan['routers'], $plan['id'], 'Customer', 'Balance')) {
+                    Balance::min($recharge['customer_id'], $plan['price']);
+                    echo "Plan enabled: $plan[enabled] | User balance: $customer[balance] | Price: $plan[price]\n";
+                    echo "Autorenewal Success\n";
                 } else {
-                    echo "no renewall | plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
+                    echo "Plan enabled: $plan[enabled] | User balance: $customer[balance] | Price: $plan[price]\n";
+                    echo "Autorenewal Failed\n";
+                    Message::sendTelegram("FAILED RENEWAL #cron\n\n#u$customer[username] #buy #" . (($recharge['type'] == 'Hotspot') ? 'Hotspot' : 'PPPOE') . " \n" . $plan['name_plan'] .
+                        "\nRouter: " . $plan['routers'] .
+                        "\nPrice: " . $plan['price']);
                 }
             } else {
-                echo "no renewall | balance $config[enable_balance] auto_renewal $c[auto_renewal]\n";
+                echo "No renewal | Plan enabled: $plan[enabled] | User balance: $customer[balance] | Price: $plan[price]\n";
             }
-        } else
-            echo " : ACTIVE \r\n";
-    } else { # PPPOE
-        $date_now = strtotime(date("Y-m-d H:i:s"));
-        $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
-        echo $ds['expiration'] . " : " . (($isCli) ? $ds['username'] : Lang::maskText($ds['username']));
-        if ($date_now >= $expiration) {
-            echo " : EXPIRED \r\n";
-            $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
-            $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
-            $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one();
-            $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-            $price = Lang::moneyFormat($p['price']);
-            if ($p['is_radius']) {
-                if (empty($p['pool_expired'])) {
-                    print_r(Radius::customerDeactivate($c['username']));
-                } else {
-                    Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
-                    print_r(Radius::disconnectCustomer($c['username']));
-                }
-            } else {
-                $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
-                if (!empty($p['pool_expired'])) {
-                    Mikrotik::setPpoeUserPlan($client, $c['username'], 'EXPIRED NUXBILL ' . $p['pool_expired']);
-                } else {
-                    Mikrotik::removePpoeUser($client, $c['username']);
-                }
-                Mikrotik::removePpoeActive($client, $c['username']);
-            }
-            echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired']) . "\n";
-
-            $u->status = 'off';
-            $u->save();
-
-            // autorenewal from deposit
-            if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                list($bills, $add_cost) = User::getBills($ds['customer_id']);
-                if ($add_cost > 0) {
-                    if (!empty($add_cost)) {
-                        $p['price'] += $add_cost;
-                    }
-                }
-                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
-                    if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
-                        // if success, then get the balance
-                        Balance::min($ds['customer_id'], $p['price']);
-                        echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
-                        echo "auto renewall Success\n";
-                    } else {
-                        echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
-                        echo "auto renewall Failed\n";
-                        Message::sendTelegram("FAILED RENEWAL #cron\n\n#u$c[username] #buy #PPPOE \n" . $p['name_plan'] .
-                            "\nRouter: " . $p['routers'] .
-                            "\nPrice: " . $p['price']);
-                    }
-                }
-            }
-        } else
-            echo " : ACTIVE \r\n";
+        } else {
+            echo "No renewal | Balance: $config[enable_balance] Auto-renewal: $customer[auto_renewal]\n";
+        }
+    } else {
+        echo " : ACTIVE \r\n";
     }
 }

system/cron_reminder.php

@@ -2,8 +2,8 @@
 
 /**
  * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
- * This file for reminding user about expiration
- * Example to run every at 7:00 in the morning
+ * This file is for reminding users about expiration
+ * Example to run every day at 7:00 in the morning:
  * 0 7 * * * /usr/bin/php /var/www/system/cron_reminder.php
  **/
 
@@ -15,10 +15,9 @@ if (php_sapi_name() !== 'cli') {
     echo "<pre>";
 }
 
-$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
-
-run_hook('cronjob_reminder'); #HOOK
+$recharges = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
 
+run_hook('cronjob_reminder'); // HOOK
 
 echo "PHP Time\t" . date('Y-m-d H:i:s') . "\n";
 $res = ORM::raw_execute('SELECT NOW() AS WAKTU;');
@@ -28,39 +27,35 @@ while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
     echo "MYSQL Time\t" . $row['WAKTU'] . "\n";
 }
 
-
 $day7 = date('Y-m-d', strtotime("+7 day"));
 $day3 = date('Y-m-d', strtotime("+3 day"));
 $day1 = date('Y-m-d', strtotime("+1 day"));
 print_r([$day1, $day3, $day7]);
-foreach ($d as $ds) {
-    if (in_array($ds['expiration'], [$day1, $day3, $day7])) {
-        $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
-        $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
-        $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
-        list($bills, $add_cost) = User::getBills($ds['customer_id']);
-        if ($add_cost > 0) {
-            if (!empty($add_cost)) {
-                $p['price'] += $add_cost;
+
+foreach ($recharges as $recharge) {
+    if (in_array($recharge['expiration'], [$day1, $day3, $day7])) {
+        $user_recharge = ORM::for_table('tbl_user_recharges')->where('id', $recharge['id'])->find_one();
+        $plan = ORM::for_table('tbl_plans')->where('id', $user_recharge['plan_id'])->find_one();
+        $customer = ORM::for_table('tbl_customers')->where('id', $recharge['customer_id'])->find_one();
+
+        if ($plan['validity_unit'] == 'Period') {
+            // Postpaid price from field
+            $additional_invoice = User::getAttribute("Invoice", $recharge['customer_id']);
+            if (empty($additional_invoice) || $additional_invoice == 0) {
+                $price = $plan['price'];
+            } else {
+                $price = $additional_invoice;
             }
-        }
-		if ($p['validity_unit'] == 'Period') {
-			// Postpaid price from field
-			$add_inv = User::getAttribute("Invoice", $ds['customer_id']);
-			if (empty ($add_inv) or $add_inv == 0) {
-				$price = Lang::moneyFormat($p['price']);
-			} else {
-				$price = Lang::moneyFormat($add_inv);
-			}
         } else {
-                $price = Lang::moneyFormat($p['price']);
+            $price = $plan['price'];
         }
-        if ($ds['expiration'] == $day7) {
-            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
-        } else if ($ds['expiration'] == $day3) {
-            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
-        } else if ($ds['expiration'] == $day1) {
-            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
+
+        if ($recharge['expiration'] == $day7) {
+            echo Message::sendPackageNotification($customer, $plan['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
+        } elseif ($recharge['expiration'] == $day3) {
+            echo Message::sendPackageNotification($customer, $plan['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
+        } elseif ($recharge['expiration'] == $day1) {
+            echo Message::sendPackageNotification($customer, $plan['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
         }
     }
 }

system/lan/english.json

@@ -1,107 +1,546 @@
 {
-    "Settings_Saved_Successfully": "Settings Saved Successfully",
-    "Settings": "Settings",
-    "SuperAdmin": "Super Admin",
-    "Change_Password": "Change Password",
-    "My_Account": "My Account",
-    "Logout": "Logout",
+    "Log_in": "Login",
+    "Register": "Register",
+    "Announcement": "Announcement",
+    "Registration_Info": "Registration Info",
+    "Voucher_not_found__please_buy_voucher_befor_register": "Voucher not found, please buy voucher befor register",
+    "Register_Success__You_can_login_now": "Register Success! You can login now",
+    "Log_in_to_Member_Panel": "Log in to Member Panel",
+    "Register_as_Member": "Register as Member",
+    "Enter_Admin_Area": "Enter Admin Area",
+    "PHPNuxBill": "PHPNuxBill",
+    "Username": "Username",
+    "Password": "Password",
+    "Passwords_does_not_match": "Passwords does not match",
+    "Account_already_axist": "Account already axist",
+    "Manage": "Manage",
+    "Submit": "Submit",
+    "Save_Changes": "Save Changes",
+    "Cancel": "Cancel",
+    "Edit": "Edit",
+    "Delete": "Delete",
+    "Welcome": "Welcome",
+    "Data_Created_Successfully": "Data Created Successfully",
+    "Data_Updated_Successfully": "Data Updated Successfully",
+    "Data_Deleted_Successfully": "Data Deleted Successfully",
+    "Static_Pages": "Static Pages",
+    "Failed_to_save_page__make_sure_i_can_write_to_folder_pages___i_chmod_664_pages___html_i_": "Failed to save page, make sure i can write to folder pages, <i>chmod 664 pages\/*.html<i>",
+    "Saving_page_success": "Saving page success",
+    "Sometimes_you_need_to_refresh_3_times_until_content_change": "Sometimes you need to refresh 3 times until content change",
     "Dashboard": "Dashboard",
-    "Customer": "Customer",
-    "Lists": "Lists",
-    "Location": "Location",
+    "Search_Customers___": "Search Customers...",
+    "My_Account": "My Account",
+    "My_Profile": "My Profile",
+    "Settings": "Settings",
+    "Edit_Profile": "Edit Profile",
+    "Change_Password": "Change Password",
+    "Logout": "Logout",
     "Services": "Services",
-    "Active_Users": "Active Users",
-    "Vouchers": "Vouchers",
-    "Refill_Customer": "Refill Customer",
-    "Recharge_Customer": "Recharge Customer",
-    "Refill_Balance": "Refill Balance",
-    "Plans": "Plans",
-    "Hotspot": "Hotspot",
-    "PPPOE": "PPPOE",
-    "Bandwidth": "Bandwidth",
-    "Balance": "Balance",
-    "Reports": "Reports",
-    "Daily_Reports": "Daily Reports",
-    "Period_Reports": "Period Reports",
-    "Activation_History": "Activation History",
-    "Send_Message": "Send Message",
-    "Single_Customer": "Single Customer",
-    "Bulk_Customers": "Bulk Customers",
+    "Bandwidth_Plans": "Bandwidth Plans",
+    "Bandwidth_Name": "Bandwidth Name",
+    "New_Bandwidth": "New Bandwidth",
+    "Edit_Bandwidth": "Edit Bandwidth",
+    "Add_New_Bandwidth": "Add New Bandwidth",
+    "Rate_Download": "Rate Download",
+    "Rate_Upload": "Rate Upload",
+    "Name_Bandwidth_Already_Exist": "Name Bandwidth Already Exist",
+    "Hotspot_Plans": "Hotspot Plans",
+    "PPPOE_Plans": "PPPOE Plans",
+    "Plan_Name": "Plan Name",
+    "New_Service_Plan": "New Service Plan",
+    "Add_Service_Plan": "Add Service Plan",
+    "Edit_Service_Plan": "Edit Service Plan",
+    "Name_Plan_Already_Exist": "Name Plan Already Exist",
+    "Plan_Type": "Plan Type",
+    "Plan_Price": "Plan Price",
+    "Limit_Type": "Limit Type",
+    "Unlimited": "Unlimited",
+    "Limited": "Limited",
+    "Time_Limit": "Time Limit",
+    "Data_Limit": "Data Limit",
+    "Both_Limit": "Both Limit",
+    "Plan_Validity": "Plan Validity",
+    "Select_Bandwidth": "Select Bandwidth",
+    "Shared_Users": "Shared Users",
+    "Choose_User_Type_Sales_to_disable_access_to_Settings": "Choose User Type Sales to disable access to Settings",
+    "Current_Password": "Current Password",
+    "New_Password": "New Password",
+    "Administrator": "Administrator",
+    "Sales": "Sales",
+    "Member": "Member",
+    "Confirm_New_Password": "Confirm New Password",
+    "Confirm_Password": "Confirm Password",
+    "Full_Name": "Full Name",
+    "User_Type": "User Type",
+    "Address": "Address",
+    "Created_On": "Created On",
+    "Expires_On": "Expires On",
+    "Phone_Number": "Phone Number",
+    "User_deleted_Successfully": "User deleted Successfully",
+    "Full_Administrator": "Full Administrator",
+    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
+    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
+    "Theme_Style": "Theme Style",
+    "Theme_Color": "Theme Color",
+    "Default_Language": "Default Language",
     "Network": "Network",
     "Routers": "Routers",
     "IP_Pool": "IP Pool",
-    "Radius": "Radius",
-    "Radius_NAS": "Radius NAS",
-    "Static_Pages": "Static Pages",
-    "Order_Voucher": "Order Voucher",
-    "Voucher": "Voucher",
-    "Announcement": "Announcement",
-    "Customer_Announcement": "Customer Announcement",
-    "Registration_Info": "Registration Info",
-    "General_Settings": "General Settings",
-    "Localisation": "Localisation",
-    "User_Notification": "User Notification",
-    "Administrator_Users": "Administrator Users",
-    "Backup_Restore": "Backup\/Restore",
-    "Payment_Gateway": "Payment Gateway",
-    "Plugin_Manager": "Plugin Manager",
-    "Logs": "Logs",
-    "Community": "Community",
-    "Timezone": "Timezone",
+    "New_Router": "New Router",
+    "Add_Router": "Add Router",
+    "Edit_Router": "Edit Router",
+    "Router_Name": "Router Name",
+    "IP_Address": "IP Address",
+    "Router_Secret": "Router Secret",
+    "Description": "Description",
+    "IP_Router_Already_Exist": "IP Router Already Exist",
+    "Name_Pool": "Name Pool",
+    "Range_IP": "Range IP",
+    "New_Pool": "New Pool",
+    "Add_Pool": "Add Pool",
+    "Edit_Pool": "Edit Pool",
+    "Pool_Name_Already_Exist": "Pool Name Already Exist",
+    "Refill_Account": "Refill Account",
+    "Recharge_Account": "Recharge Account",
+    "Select_Account": "Select Account",
+    "Service_Plan": "Service Plan",
+    "Recharge": "Recharge",
+    "Method": "Method",
+    "Account_Created_Successfully": "Account Created Successfully",
+    "Database_Status": "Database Status",
+    "Total_Database_Size": "Total Database Size",
+    "Download_Database_Backup": "Download Database Backup",
+    "Table_Name": "Table Name",
+    "Rows": "Rows",
+    "Size": "Size",
+    "Customer": "Customer",
+    "Add_New_Contact": "Add New Contact",
+    "Edit_Contact": "Edit Contact",
+    "List_Contact": "List Contact",
+    "Manage_Contact": "Manage Contact",
+    "Reports": "Reports",
+    "Daily_Reports": "Daily Reports",
+    "Period_Reports": "Period Reports",
+    "All_Transactions": "All Transactions",
+    "Total_Income": "Total Income",
+    "All_Transactions_at_Date": "All Transactions at Date",
+    "Export_for_Print": "Export for Print",
+    "Print": "Print",
+    "Export_to_PDF": "Export to PDF",
+    "Click_Here_to_Print": "Click Here to Print",
+    "You_can_use_html_tag": "You can use html tag",
     "Date_Format": "Date Format",
-    "Default_Language": "Default Language",
-    "Language_Editor": "Language Editor",
+    "Income_Today": "Income Today",
+    "Income_This_Month": "Income This Month",
+    "Users_Active": "Users Active",
+    "Total_Users": "Total Users",
+    "Users": "Users",
+    "Edit_User": "Edit User",
+    "Last_Login": "Last Login",
+    "Administrator_Users": "Administrator Users",
+    "Manage_Administrator": "Manage Administrator",
+    "Add_New_Administrator": "Add New Administrator",
+    "Localisation": "Localisation",
+    "Backup_Restore": "Backup\/Restore",
+    "General_Settings": "General Settings",
+    "Date": "Date",
+    "Login_Successful": "Login Successful",
+    "Failed_Login": "Failed Login",
+    "Settings_Saved_Successfully": "Settings Saved Successfully",
+    "User_Updated_Successfully": "User Updated Successfully",
+    "User_Expired__Today": "User Expired, Today",
+    "Activity_Log": "Activity Log",
+    "View_Reports": "View Reports",
+    "View_All": "View All",
+    "Number_of_Vouchers": "Number of Vouchers",
+    "Length_Code": "Length Code",
+    "Code_Voucher": "Code Voucher",
+    "Voucher": "Voucher",
+    "Hotspot_Voucher": "Hotspot Voucher",
+    "Status_Voucher": "Status Voucher",
+    "Add_Vouchers": "Add Vouchers",
+    "Create_Vouchers_Successfully": "Create Vouchers Successfully",
+    "Generate": "Generate",
+    "Print_side_by_side__it_will_easy_to_cut": "Print side by side, it will easy to cut",
+    "From_Date": "From Date",
+    "To_Date": "To Date",
+    "New_Service": "New Service",
+    "Type": "Type",
+    "Finish": "Finish",
+    "Application_Name__Company_Name": "Application Name\/ Company Name",
+    "This_Name_will_be_shown_on_the_Title": "This Name will be shown on the Title",
+    "Next": "Next",
+    "Last": "Last",
+    "Timezone": "Timezone",
     "Decimal_Point": "Decimal Point",
     "Thousands_Separator": "Thousands Separator",
     "Currency_Code": "Currency Code",
-    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
-    "Country_Code_Phone": "Country Code Phone",
-    "Change_title_in_user_Plan_order": "Change title in user Plan order",
-    "Save_Changes": "Save Changes",
-    "Recharge_Account": "Recharge Account",
+    "Order_Voucher": "Order Voucher",
+    "Voucher_Activation": "Voucher Activation",
+    "List_Activated_Voucher": "List Activated Voucher",
+    "Enter_voucher_code_here": "Enter voucher code here",
+    "Private_Message": "Private Message",
+    "Inbox": "Inbox",
+    "Outbox": "Outbox",
+    "Compose": "Compose",
+    "Send_to": "Send to",
+    "Title": "Title",
+    "Message": "Message",
+    "Your_Account_Information": "Your Account Information",
+    "Welcome_to_the_Panel_Members_page__on_this_page_you_can_": "Welcome to the Panel Members page, on this page you can:",
+    "Invalid_Username_or_Password": "Invalid Username or Password",
+    "You_do_not_have_permission_to_access_this_page": "You do not have permission to access this page",
+    "Incorrect_Current_Password": "Incorrect Current Password",
+    "Password_changed_successfully__Please_login_again": "Password changed successfully, Please login again",
+    "All_field_is_required": "All field is required",
+    "Voucher_Not_Valid": "Voucher Not Valid",
+    "Activation_Vouchers_Successfully": "Activation Vouchers Successfully",
+    "Data_Not_Found": "Data Not Found",
     "Search_by_Username": "Search by Username",
+    "Search_by_Name": "Search by Name",
+    "Search_by_Code_Voucher": "Search by Code Voucher",
     "Search": "Search",
-    "Username": "Username",
-    "Plan_Name": "Plan Name",
-    "Plan_Type": "Plan Type",
-    "Type": "Type",
-    "Created_On": "Created On",
-    "Expires_On": "Expires On",
-    "Method": "Method",
-    "Manage": "Manage",
-    "Edit": "Edit",
-    "Delete": "Delete",
-    "Prev": "Prev",
-    "Next": "Next",
-    "Phone_Number": "Phone Number",
-    "Email": "Email",
-    "Password": "Password",
-    "Paid": "Paid",
-    "Service_Type": "Service Type",
-    "Account_Type": "Account Type",
-    "Personal": "Personal",
-    "Auto_Renewal": "Auto Renewal",
-    "Last_Login": "Last Login",
-    "Coordinates": "Coordinates",
-    "Active": "Active",
-    "Deactivate": "Deactivate",
-    "Recharge": "Recharge",
-    "Back": "Back",
-    "Sync": "Sync",
+    "Select_a_customer": "Select a customer",
+    "Select_Routers": "Select Routers",
+    "Select_Plans": "Select Plans",
+    "Select_Pool": "Select Pool",
+    "Hrs": "Hrs",
+    "Mins": "Mins",
+    "Days": "Days",
+    "Months": "Months",
+    "Add_Language": "Add Language",
+    "Language_Name": "Language Name",
+    "Folder_Name": "Folder Name",
+    "Translator": "Translator",
+    "Language_Name_Already_Exist": "Language Name Already Exist",
+    "Payment_Gateway": "Payment Gateway",
+    "Community": "Community",
+    "1_user_can_be_used_for_many_devices_": "1 user can be used for many devices?",
+    "Cannot_be_change_after_saved": "Cannot be change after saved",
+    "Explain_Coverage_of_router": "Explain Coverage of router",
+    "Name_of_Area_that_router_operated": "Name of Area that router operated",
+    "Payment_Notification_URL__Recurring_Notification_URL__Pay_Account_Notification_URL": "Payment Notification URL, Recurring Notification URL, Pay Account Notification URL",
+    "Finish_Redirect_URL__Unfinish_Redirect_URL__Error_Redirect_URL": "Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL",
+    "Status": "Status",
+    "Plan_Not_found": "Plan Not found",
+    "Failed_to_create_transaction_": "Failed to create transaction.",
+    "Seller_has_not_yet_setup_Xendit_payment_gateway": "Seller has not yet setup Xendit payment gateway",
+    "Admin_has_not_yet_setup_Xendit_payment_gateway__please_tell_admin": "Admin has not yet setup Xendit payment gateway, please tell admin",
+    "You_already_have_unpaid_transaction__cancel_it_or_pay_it_": "You already have unpaid transaction, cancel it or pay it.",
+    "Transaction_Not_found": "Transaction Not found",
+    "Cancel_it_": "Cancel it?",
+    "expired": "expired",
+    "Check_for_Payment": "Check for Payment",
+    "Transaction_still_unpaid_": "Transaction still unpaid.",
+    "Paid_Date": "Paid Date",
+    "Transaction_has_been_paid_": "Transaction has been paid.",
+    "PAID": "PAID",
+    "CANCELED": "CANCELED",
+    "UNPAID": "UNPAID",
+    "PAY_NOW": "PAY NOW",
+    "Buy_Hotspot_Plan": "Buy Hotspot Plan",
+    "Buy_PPOE_Plan": "Buy PPOE Plan",
+    "Package": "Package",
+    "Order_Internet_Package": "Order Internet Package",
+    "Unknown_Command_": "Unknown Command.",
+    "Checking_payment": "Checking payment",
+    "Create_Transaction_Success": "Create Transaction Success",
+    "You_have_unpaid_transaction": "You have unpaid transaction",
+    "TripayPayment_Channel": "TripayPayment Channel",
+    "Payment_Channel": "Payment Channel",
+    "Payment_check_failed_": "Payment check failed.",
+    "Order_Package": "Order Package",
+    "Transactions": "Transactions",
+    "Payments": "Payments",
+    "History": "History",
     "Order_History": "Order History",
+    "Gateway": "Gateway",
+    "Date_Done": "Date Done",
+    "Unpaid_Order": "Unpaid Order",
+    "Payment_Gateway_Not_Found": "Payment Gateway Not Found",
+    "Payment_Gateway_saved_successfully": "Payment Gateway saved successfully",
+    "ORDER": "ORDER",
+    "Package_History": "Package History",
+    "Buy_History": "Buy History",
+    "Activation_History": "Activation History",
+    "Buy_Package": "Buy Package",
+    "Email": "Email",
+    "Company_Footer": "Company Footer",
+    "Will_show_below_user_pages": "Will show below user pages",
+    "Request_OTP": "Request OTP",
+    "Verification_Code": "Verification Code",
+    "SMS_Verification_Code": "SMS Verification Code",
+    "Please_enter_your_email_address": "Please enter your email address",
+    "Failed_to_create_Paypal_transaction_": "Failed to create Paypal transaction.",
+    "Plugin": "Plugin",
+    "Plugin_Manager": "Plugin Manager",
+    "User_Notification": "User Notification",
+    "Expired_Notification": "Expired Notification",
+    "User_will_get_notification_when_package_expired": "User will get notification when package expired",
+    "Expired_Notification_Message": "Expired Notification Message",
+    "Payment_Notification": "Payment Notification",
+    "User_will_get_invoice_notification_when_buy_package_or_package_refilled": "User will get invoice notification when buy package or package refilled",
+    "Current_IP": "Current IP",
+    "Current_MAC": "Current MAC",
+    "Login_Status": "Login Status",
+    "Login_Request_successfully": "Login Request successfully",
+    "Logout_Request_successfully": "Logout Request successfully",
+    "Disconnect_Internet_": "Disconnect Internet?",
+    "Not_Online__Login_now_": "Not Online, Login now?",
+    "You_are_Online__Logout_": "You are Online, Logout?",
+    "Connect_to_Internet_": "Connect to Internet?",
+    "Your_account_not_connected_to_internet": "Your account not connected to internet",
+    "Failed_to_create_transaction__": "Failed to create transaction. ",
+    "Failed_to_check_status_transaction__": "Failed to check status transaction. ",
+    "Disable_Voucher": "Disable Voucher",
+    "Balance": "Balance",
+    "Balance_System": "Balance System",
+    "Enable_System": "Enable System",
+    "Allow_Transfer": "Allow Transfer",
+    "Telegram_Notification": "Telegram Notification",
+    "SMS_OTP_Registration": "SMS OTP Registration",
+    "Whatsapp_Notification": "Whatsapp Notification",
+    "Tawk_to_Chat_Widget": "Tawk.to Chat Widget",
     "Invoice": "Invoice",
-    "Plan_Price": "Plan Price",
-    "Edit_Contact": "Edit Contact",
-    "Full_Name": "Full Name",
-    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
+    "Country_Code_Phone": "Country Code Phone",
+    "Voucher_activation_menu_will_be_hidden": "Voucher activation menu will be hidden",
+    "Customer_can_deposit_money_to_buy_voucher": "Customer can deposit money to buy voucher",
+    "Allow_balance_transfer_between_customers": "Allow balance transfer between customers",
+    "Reminder_Notification": "Reminder Notification",
+    "Reminder_Notification_Message": "Reminder Notification Message",
+    "Reminder_7_days": "Reminder 7 days",
+    "Reminder_3_days": "Reminder 3 days",
+    "Reminder_1_day": "Reminder 1 day",
     "PPPOE_Password": "PPPOE Password",
     "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",
-    "Address": "Address",
+    "Invoice_Balance_Message": "Invoice Balance Message",
+    "Invoice_Notification_Payment": "Invoice Notification Payment",
+    "Balance_Notification_Payment": "Balance Notification Payment",
+    "Balance_Plans": "Balance Plans",
+    "Buy_Balance": "Buy Balance",
+    "Price": "Price",
+    "Validity": "Validity",
+    "Disable_auto_renewal_": "Disable auto renewal?",
+    "Auto_Renewal_On": "Auto Renewal On",
+    "Enable_auto_renewal_": "Enable auto renewal?",
+    "Auto_Renewal_Off": "Auto Renewal Off",
+    "Refill_Balance": "Refill Balance",
+    "Invoice_Footer": "Invoice Footer",
+    "Pay_With_Balance": "Pay With Balance",
+    "Pay_this_with_Balance__your_active_package_will_be_overwrite": "Pay this with Balance? your active package will be overwrite",
+    "Success_to_buy_package": "Success to buy package",
+    "Auto_Renewal": "Auto Renewal",
+    "View": "View",
+    "Back": "Back",
+    "Active": "Active",
+    "Transfer_Balance": "Transfer Balance",
+    "Send_your_balance_": "Send your balance?",
+    "Send": "Send",
+    "Cannot_send_to_yourself": "Cannot send to yourself",
+    "Sending_balance_success": "Sending balance success",
+    "From": "From",
+    "To": "To",
+    "insufficient_balance": "insufficient balance",
+    "Send_Balance": "Send Balance",
+    "Received_Balance": "Received Balance",
+    "Minimum_Balance_Transfer": "Minimum Balance Transfer",
+    "Minimum_Transfer": "Minimum Transfer",
+    "Company_Logo": "Company Logo",
+    "Expired_IP_Pool": "Expired IP Pool",
+    "Proxy": "Proxy",
+    "Proxy_Server": "Proxy Server",
+    "Proxy_Server_Login": "Proxy Server Login",
+    "Hotspot_Plan": "Hotspot Plan",
+    "PPPOE_Plan": "PPPOE Plan",
+    "UNKNOWN": "UNKNOWN",
+    "Are_You_Sure_": "Are You Sure?",
+    "Success_to_send_package": "Success to send package",
+    "Target_has_active_plan__different_with_current_plant_": "Target has active plan, different with current plant.",
+    "Recharge_a_friend": "Recharge a friend",
+    "Buy_for_friend": "Buy for friend",
+    "Buy_this_for_friend_account_": "Buy this for friend account?",
+    "Review_package_before_recharge": "Review package before recharge",
+    "Activate": "Activate",
+    "Deactivate": "Deactivate",
+    "Sync": "Sync",
+    "Failed_to_create_PaymeTrust_transaction_": "Failed to create PaymeTrust transaction.",
+    "Location": "Location",
+    "Radius_Plans": "Radius Plans",
+    "Change_title_in_user_Plan_order": "Change title in user Plan order",
+    "Logs": "Logs",
+    "Voucher_Format": "Voucher Format",
+    "Resend_To_Customer": "Resend To Customer",
+    "Your_friend_do_not_have_active_package": "Your friend do not have active package",
+    "Service_Type": "Service Type",
+    "Others": "Others",
+    "PPPoE": "PPPoE",
+    "Hotspot": "Hotspot",
+    "Disable_Registration": "Disable Registration",
+    "Customer_just_Login_with_Phone_number_and_Voucher_Code__Voucher_will_be_password": "Customer just Login with Phone number and Voucher Code, Voucher will be password",
+    "Login___Activate_Voucher": "Login \/ Activate Voucher",
+    "After_Customer_activate_voucher_or_login__customer_will_be_redirected_to_this_url": "After Customer activate voucher or login, customer will be redirected to this url",
+    "Voucher_Prefix": "Voucher Prefix",
+    "Voucher_activation_success__now_you_can_login": "Voucher activation success, now you can login",
+    "Buy_this__your_active_package_will_be_overwritten": "Buy this? your active package will be overwritten",
+    "Pay_this_with_Balance__your_active_package_will_be_overwritten": "Pay this with Balance? your active package will be overwritten",
+    "Buy_this__your_active_package_will_be_overwrite": "Buy this? your active package will be overwrite",
+    "Monthly_Registered_Customers": "Monthly Registered Customers",
+    "Total_Monthly_Sales": "Total Monthly Sales",
+    "Active_Users": "Active Users",
+    "All_Users_Insights": "All Users Insights",
+    "SuperAdmin": "Super Admin",
+    "Radius": "Radius",
+    "Radius_NAS": "Radius NAS",
+    "Translation": "Translation",
+    "Translation_saved_Successfully": "Translation saved Successfully",
+    "Language_Editor": "Language Editor",
+    "year": "year",
+    "month": "month",
+    "week": "week",
+    "day": "day",
+    "hour": "hour",
+    "minute": "minute",
+    "second": "second",
     "Attributes": "Attributes",
+    "Profile": "Profile",
+    "Phone": "Phone",
+    "City": "City",
+    "Sub_District": "Sub District",
+    "Ward": "Ward",
+    "Credentials": "Credentials",
+    "Agent": "Agent",
+    "This_Token_will_act_as_SuperAdmin_Admin": "This Token will act as SuperAdmin\/Admin",
+    "Login": "Login",
+    "Expired_Action": "Expired Action",
+    "Expired_Address_List_Name": "Expired Address List Name",
+    "Address_List": "Address List",
+    "Optional": "Optional",
+    "Generated_By": "Generated By",
+    "Admin": "Admin",
+    "Password_should_be_minimum_6_characters": "Password should be minimum 6 characters",
+    "Add_User": "Add User",
+    "Send_Notification": "Send Notification",
+    "Code": "Code",
+    "Send_To_Customer": "Send To Customer",
+    "Prev": "Prev",
+    "Voucher_Not_Found": "Voucher Not Found",
+    "Miscellaneous": "Miscellaneous",
+    "OTP_Required": "OTP Required",
+    "Change": "Change",
+    "Change_Phone_Number": "Change Phone Number",
+    "Current_Number": "Current Number",
+    "New_Number": "New Number",
+    "Input_your_phone_number": "Input your phone number",
+    "OTP": "OTP",
+    "Enter_OTP_that_was_sent_to_your_phone": "Enter OTP that was sent to your phone",
+    "Update": "Update",
+    "OTP_is_required_when_user_want_to_change_phone_number": "OTP is required when user want to change phone number",
+    "Rate": "Rate",
+    "Burst": "Burst",
+    "Editing_Bandwidth_will_not_automatically_update_the_plan__you_need_to_edit_the_plan_then_save_again": "Editing Bandwidth will not automatically update the plan, you need to edit the plan then save again",
+    "OTP_Method": "OTP Method",
+    "SMS": "SMS",
+    "WhatsApp": "WhatsApp",
+    "SMS_and_WhatsApp": "SMS and WhatsApp",
+    "The_method_which_OTP_will_be_sent_to_user": "The method which OTP will be sent to user",
+    "Report_Viewer": "Report Viewer",
+    "Super_Administrator": "Super Administrator",
+    "Send_To": "Send To",
+    "Resend": "Resend",
+    "Alert": "Alert",
+    "success": "success",
+    "Click_Here": "Click Here",
+    "danger": "danger",
+    "Logout_Successful": "Logout Successful",
+    "warning": "warning",
+    "Users_Announcement": "Users Announcement",
+    "Customer_Announcement": "Customer Announcement",
+    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
+    "Period": "Period",
     "Add": "Add",
-    "Cancel": "Cancel",
-    "Manage_Contact": "Manage Contact",
-    "Add_New_Contact": "Add New Contact",
-    "Package": "Package",
-    "View": "View"
+    "Select_Payment_Gateway": "Select Payment Gateway",
+    "Available_Payment_Gateway": "Available Payment Gateway",
+    "Pay_Now": "Pay Now",
+    "Please_select_Payment_Gateway": "Please select Payment Gateway",
+    "Payment_Gateway_Deleted": "Payment Gateway Deleted",
+    "Payment_Gateway_not_set__please_set_it_in_Settings": "Payment Gateway not set, please set it in Settings",
+    "Failed_to_create_Transaction__": "Failed to create Transaction..",
+    "Show_To_Customer": "Type",
+    "Using": "Using",
+    "Default": "Default",
+    "Customer_Balance": "Customer Balance",
+    "Vouchers": "Vouchers",
+    "Refill_Customer": "Refill Customer",
+    "Recharge_Customer": "Recharge Customer",
+    "Plans": "Plans",
+    "PPPOE": "PPPOE",
+    "Bandwidth": "Bandwidth",
+    "Customers": "Customers",
+    "Actives": "Actives",
+    "Name": "Name",
+    "Confirm": "Confirm",
+    "Plan": "Plan",
+    "Total": "Total",
+    "Current_Cycle": "Current Cycle",
+    "Additional_Cost": "Additional Cost",
+    "Remaining": "Remaining",
+    "Not_Found": "Not Found",
+    "Cash": "Cash",
+    "Payment_not_found": "Payment not found",
+    "If_your_friend_have_Additional_Cost__you_will_pay_for_that_too": "If your friend have Additional Cost, you will pay for that too",
+    "Cache_cleared_successfully_": "Cache cleared successfully!",
+    "Paid": "Paid",
+    "Send_Message": "Send Message",
+    "Send_Personal_Message": "Send Personal Message",
+    "Send_Via": "Send Via",
+    "Compose_your_message___": "Compose your message...",
+    "Use_placeholders_": "Use placeholders:",
+    "Customer_Name": "Customer Name",
+    "Customer_Username": "Customer Username",
+    "Customer_Phone": "Customer Phone",
+    "Your_Company_Name": "Your Company Name",
+    "Message_Sent_Successfully": "Message Sent Successfully",
+    "Send_Bulk_Message": "Send Bulk Message",
+    "Group": "Group",
+    "All_Customers": "All Customers",
+    "New_Customers": "New Customers",
+    "Expired_Customers": "Expired Customers",
+    "Active_Customers": "Active Customers",
+    "Map": "Map",
+    "Customer_Location": "Customer Location",
+    "Account_Type": "Account Type",
+    "Coordinates": "Coordinates",
+    "Latitude_and_Longitude_coordinates_for_map_must_be_separate_with_comma____": "Latitude and Longitude coordinates for map must be separate with comma &quot;,&quot;",
+    "Customer_Geo_Location_Information": "Customer Geo Location Information",
+    "List": "List",
+    "Lists": "Lists",
+    "Single_Customer": "Single Customer",
+    "Bulk_Customers": "Bulk Customers",
+    "Message_per_time": "Message per time",
+    "5_Messages": "5 Messages",
+    "10_Messages": "10 Messages",
+    "15_Messages": "15 Messages",
+    "20_Messages": "20 Messages",
+    "30_Messages": "30 Messages",
+    "40_Messages": "40 Messages",
+    "50_Messages": "50 Messages",
+    "60_Messages": "60 Messages",
+    "Use_20_and_above_if_you_are_sending_to_all_customers_to_avoid_server_time_out": "Use 20 and above if you are sending to all customers to avoid server time out",
+    "Delay": "Delay",
+    "No_Delay": "No Delay",
+    "5_Seconds": "5 Seconds",
+    "10_Seconds": "10 Seconds",
+    "15_Seconds": "15 Seconds",
+    "20_Seconds": "20 Seconds",
+    "Use_at_least_5_secs_if_you_are_sending_to_all_customers_to_avoid_being_banned_by_your_message_provider": "Use at least 5 secs if you are sending to all customers to avoid being banned by your message provider",
+    "Testing__if_checked_no_real_message_is_sent_": "Testing [if checked no real message is sent]",
+    "All_fields_are_required": "All fields are required",
+    "Personal": "Personal",
+    "Email_Notification": "Email Notification",
+    "Router_Name___Location": "Router Name \/ Location",
+    "Plan_Category": "Plan Category",
+    "ID": "ID",
+    "Internet_Plan": "Internet Plan",
+    "Privacy_Policy": "Privacy Policy",
+    "Terms_and_Conditions": "Terms and Conditions"
 }

system/lan/indonesia.json

@@ -1,381 +1,3 @@
 {
-    "Log_in": "Masuk",
-    "Register": "Daftar",
-    "Announcement": "Pemberitahuan",
-    "Registration_Info": "Info Pendaftaran",
-    "Voucher_not_found__please_buy_voucher_befor_register": "Voucher tidak ditemukan, silakan beli voucher sebelum mendaftar",
-    "Register_Success__You_can_login_now": "Daftar Sukses!  Anda dapat masuk sekarang",
-    "Log_in_to_Member_Panel": "Masuk ke Panel Anggota",
-    "Register_as_Member": "Daftar sebagai Anggota",
-    "Enter_Admin_Area": "Masuk ke Admin Panel",
-    "PHPNuxBill": "PHPNuxBill",
-    "Username": "Nama Pengguna",
-    "Password": "Kata Sandi",
-    "Passwords_does_not_match": "Kata Sandi tidak cocok",
-    "Account_already_axist": "Akun telah ada",
-    "Manage": "Mengelola",
-    "Submit": "Kirim",
-    "Save_Changes": "Simpan perubahan",
-    "Cancel": "Batal",
-    "Edit": "Sunting",
-    "Delete": "Hapus",
-    "Welcome": "Selamat Datang",
-    "Data_Created_Successfully": "Data Berhasil Dibuat",
-    "Data_Updated_Successfully": "Data Berhasil Diperbarui",
-    "Data_Deleted_Successfully": "Data Berhasil Dihapus",
-    "Static_Pages": "Halaman Statis",
-    "Failed_to_save_page__make_sure_i_can_write_to_folder_pages___i_chmod_664_pages___html_i_": "Gagal menyimpan halaman, pastikan diperbolehkan menulis file di folder pages, <i>chmod 664 pages\/*.html<i>",
-    "Saving_page_success": "Menyimpan halaman sukses",
-    "Sometimes_you_need_to_refresh_3_times_until_content_change": "Terkadang Anda perlu menyegarkan 3 kali hingga konten berubah",
-    "Dashboard": "Dasbor",
-    "Search_Customers___": "Cari Member...",
-    "My_Account": "Akun Saya",
-    "My_Profile": "Profil Saya",
-    "Settings": "Pengaturan",
-    "Edit_Profile": "Sunting profil",
-    "Change_Password": "Ganti kata sandi",
-    "Logout": "Keluar",
-    "Services": "Layanan",
-    "Bandwidth_Plans": "Paket Bandwidth",
-    "Bandwidth_Name": "Nama Bandwidth",
-    "New_Bandwidth": "Baru Bandwidth",
-    "Edit_Bandwidth": "Sunting Bandwidth",
-    "Add_New_Bandwidth": "Tambahkan Bandwidth Baru",
-    "Rate_Download": "Nilai Unduhan",
-    "Rate_Upload": "Nilai Unggahan",
-    "Name_Bandwidth_Already_Exist": "Nama Bandwidth Sudah Ada",
-    "Hotspot_Plans": "Paket Hotspot",
-    "PPPOE_Plans": "Paket PPPoE",
-    "Plan_Name": "Nama Paket",
-    "New_Service_Plan": "Paket Layanan Baru",
-    "Add_Service_Plan": "Tambah Paket Layanan",
-    "Edit_Service_Plan": "Sunting Paket Layanan",
-    "Name_Plan_Already_Exist": "Nama Paket Sudah Ada",
-    "Plan_Type": "Jenis Paket",
-    "Plan_Price": "Harga Paket",
-    "Limit_Type": "Tipe Batas",
-    "Unlimited": "Tak Terbatas",
-    "Limited": "Terbatas",
-    "Time_Limit": "Batas waktu",
-    "Data_Limit": "Batas Data",
-    "Both_Limit": "Keduanya Membatasi",
-    "Plan_Validity": "Waktu Paket",
-    "Select_Bandwidth": "Pilih Bandwidth",
-    "Shared_Users": "Berbagi Pelanggan",
-    "Choose_User_Type_Sales_to_disable_access_to_Settings": "Pilih Sales untuk menonaktifkan akses ke Pengaturan",
-    "Current_Password": "Kata sandi saat ini",
-    "New_Password": "Kata sandi baru",
-    "Administrator": "Administrator",
-    "Sales": "Sales",
-    "Member": "Anggota",
-    "Confirm_New_Password": "Konfirmasi sandi baru",
-    "Confirm_Password": "Konfirmasi sandi",
-    "Full_Name": "Nama Lengkap",
-    "User_Type": "Tipe Pelanggan",
-    "Address": "Alamat",
-    "Created_On": "Dibuat pada",
-    "Expires_On": "Kedaluwarsa pada",
-    "Phone_Number": "Nomor telepon",
-    "User_deleted_Successfully": "Pelanggan berhasil dihapus",
-    "Full_Administrator": "Administrator Penuh",
-    "Keep_Blank_to_do_not_change_Password": "Biarkan Kosong apabila tidak ingin mengubah Kata Sandi",
-    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Kosongkan jika Anda tidak ingin menampilkan kode mata uang",
-    "Theme_Style": "Gaya Tema",
-    "Theme_Color": "Warna Tema",
-    "Default_Language": "Bahasa Bawaan",
-    "Network": "Jaringan",
-    "Routers": "Router",
-    "IP_Pool": "IP Pool",
-    "New_Router": "Router baru",
-    "Add_Router": "Tambahkan Router",
-    "Edit_Router": "Sunting Router",
-    "Router_Name": "Nama Router",
-    "IP_Address": "Alamat IP",
-    "Router_Secret": "Password Router",
-    "Description": "Deskrispi",
-    "IP_Router_Already_Exist": "IP Router Sudah Ada",
-    "Name_Pool": "Nama Pool",
-    "Range_IP": "Rentang IP",
-    "New_Pool": "Pool baru",
-    "Add_Pool": "Tambahkan Pool",
-    "Edit_Pool": "Sunting Pool",
-    "Pool_Name_Already_Exist": "Nama Pool Sudah Ada",
-    "Refill_Account": "Isi Ulang Akun",
-    "Recharge_Account": "Isi Ulang Akun",
-    "Select_Account": "Pilih Akun",
-    "Service_Plan": "Paket Layanan",
-    "Recharge": "Isi Ulang",
-    "Method": "Metode",
-    "Account_Created_Successfully": "Akun Berhasil Dibuat",
-    "Database_Status": "Status Database",
-    "Total_Database_Size": "Ukuran Total Database",
-    "Download_Database_Backup": "Unduh Cadangan Database",
-    "Table_Name": "Nama Tabel",
-    "Rows": "Baris",
-    "Size": "Ukuran",
-    "Customer": "Pelanggan",
-    "Add_New_Contact": "Tambahkan Kontak Baru",
-    "Edit_Contact": "Sunting Kontak",
-    "List_Contact": "Daftar Kontak",
-    "Manage_Contact": "Kelola Kontak",
-    "Reports": "Laporan",
-    "Daily_Reports": "Laporan Harian",
-    "Period_Reports": "Laporan Periode",
-    "All_Transactions": "Semua Transaksi",
-    "Total_Income": "Jumlah Pemasukan",
-    "All_Transactions_at_Date": "Semua Transaksi pada Tanggal",
-    "Export_for_Print": "Ekspor untuk Cetak",
-    "Print": "Cetak",
-    "Export_to_PDF": "Ekspor ke PDF",
-    "Click_Here_to_Print": "Klik Disini untuk Mencetak",
-    "You_can_use_html_tag": "Anda dapat menggunakan tag html",
-    "Date_Format": "Format tanggal",
-    "Income_Today": "Pendapatan Hari Ini",
-    "Income_This_Month": "Penghasilan Bulan Ini",
-    "Users_Active": "Pelanggan Aktif",
-    "Total_Users": "Total Pelanggan",
-    "Users": "Pelanggan",
-    "Edit_User": "Sunting Pelanggan",
-    "Last_Login": "Terakhir Masuk",
-    "Administrator_Users": "Pengguna Administrator",
-    "Manage_Administrator": "Kelola Administrator",
-    "Add_New_Administrator": "Tambahkan Administrator Baru",
-    "Localisation": "Lokalisasi",
-    "Backup_Restore": "Cadangkan\/Pulihkan",
-    "General_Settings": "Pengaturan Umum",
-    "Date": "Tanggal",
-    "Login_Successful": "Berhasil Masuk",
-    "Failed_Login": "Gagal Masuk",
-    "Settings_Saved_Successfully": "Pengaturan Berhasil Disimpan",
-    "User_Updated_Successfully": "Pengguna Berhasil Diperbarui",
-    "User_Expired__Today": "Pengguna Kedaluwarsa, Hari Ini",
-    "Activity_Log": "Log Aktivitas",
-    "View_Reports": "Lihat Laporan",
-    "View_All": "Lihat semua",
-    "Number_of_Vouchers": "Jumlah Voucher",
-    "Length_Code": "Kode Panjang",
-    "Code_Voucher": "Kode Voucher",
-    "Voucher": "Voucher",
-    "Hotspot_Voucher": "Voucher Hotspot",
-    "Status_Voucher": "Voucher Status",
-    "Add_Vouchers": "Tambah Voucher",
-    "Create_Vouchers_Successfully": "Buat Voucher Berhasil",
-    "Generate": "Menghasilkan",
-    "Print_side_by_side__it_will_easy_to_cut": "Info Cetak",
-    "From_Date": "Dari tanggal",
-    "To_Date": "Hingga saat ini",
-    "New_Service": "Layanan Baru",
-    "Type": "Jenis",
-    "Finish": "Menyelesaikan",
-    "Application_Name__Company_Name": "Nama Aplikasi\/ Nama Perusahaan",
-    "This_Name_will_be_shown_on_the_Title": "Nama ini akan ditampilkan pada Judul",
-    "Next": "Berikutnya",
-    "Last": "Terakhir",
-    "Timezone": "Zona waktu",
-    "Decimal_Point": "Titik Desimal",
-    "Thousands_Separator": "Pemisah Ribuan",
-    "Currency_Code": "Kode Mata Uang",
-    "Order_Voucher": "Pesan Voucher",
-    "Voucher_Activation": "Aktivasi Voucher",
-    "List_Activated_Voucher": "Daftar Voucher yang Diaktifkan",
-    "Enter_voucher_code_here": "Masukkan kode voucher di sini",
-    "Private_Message": "Pesan Pribadi",
-    "Inbox": "Kotak Masuk",
-    "Outbox": "Kotak Keluar",
-    "Compose": "Menyusun",
-    "Send_to": "Kirim ke",
-    "Title": "Judul",
-    "Message": "Pesan",
-    "Your_Account_Information": "Informasi Akun Anda",
-    "Welcome_to_the_Panel_Members_page__on_this_page_you_can_": "Selamat datang di halaman Anggota Panel, di halaman ini Anda dapat:",
-    "Invalid_Username_or_Password": "Nama pengguna atau kata sandi salah",
-    "You_do_not_have_permission_to_access_this_page": "Anda tidak memiliki izin untuk mengakses halaman ini",
-    "Incorrect_Current_Password": "Kata sandi saat ini salah",
-    "Password_changed_successfully__Please_login_again": "Kata sandi berhasil diubah, silakan login kembali",
-    "All_field_is_required": "Semua bidang wajib diisi",
-    "Voucher_Not_Valid": "Voucher tidak berlaku",
-    "Activation_Vouchers_Successfully": "Aktivasi Voucher Berhasil",
-    "Data_Not_Found": "Data Tidak Ditemukan",
-    "Search_by_Username": "Cari berdasarkan Nama Pengguna",
-    "Search_by_Name": "Cari berdasarkan Nama",
-    "Search_by_Code_Voucher": "Cari berdasarkan Kode Voucher",
-    "Search": "Mencari",
-    "Select_a_customer": "Pilih pelanggan",
-    "Select_Routers": "Pilih Router",
-    "Select_Plans": "Pilih Paket",
-    "Select_Pool": "Pilih Pool",
-    "Hrs": "Jam",
-    "Mins": "Menit",
-    "Days": "Hari",
-    "Months": "Bulan",
-    "Add_Language": "Tambahkan Bahasa",
-    "Language_Name": "Nama Bahasa",
-    "Folder_Name": "Nama Folder",
-    "Translator": "Penerjemah",
-    "Language_Name_Already_Exist": "Nama Bahasa Sudah Ada",
-    "Payment_Gateway": "Gerbang Pembayaran",
-    "Community": "Komunitas",
-    "1_user_can_be_used_for_many_devices_": "1 pengguna bisa digunakan untuk banyak perangkat?",
-    "Cannot_be_change_after_saved": "Tidak dapat diubah setelah disimpan",
-    "Explain_Coverage_of_router": "Jelaskan Cakupan router",
-    "Name_of_Area_that_router_operated": "Nama area tempat router dioperasikan",
-    "Payment_Notification_URL__Recurring_Notification_URL__Pay_Account_Notification_URL": "URL Notifikasi Pembayaran, URL Notifikasi Berulang, URL Notifikasi Akun Bayar",
-    "Finish_Redirect_URL__Unfinish_Redirect_URL__Error_Redirect_URL": "Selesaikan URL Pengalihan, Selesaikan URL Pengalihan, URL Pengalihan Kesalahan",
-    "Status": "Status",
-    "Plan_Not_found": "Paket tidak ditemukan",
-    "Failed_to_create_transaction_": "Gagal membuat transaksi.",
-    "Seller_has_not_yet_setup_Xendit_payment_gateway": "Penjual belum menyiapkan gateway pembayaran Xendit",
-    "Admin_has_not_yet_setup_Xendit_payment_gateway__please_tell_admin": "Admin belum menyiapkan gerbang pembayaran Xendit, mohon beritahu admin",
-    "Buy_this__your_active_package_will_be_overwrite": "Beli ini? Paket aktif Anda akan ditimpa",
-    "You_already_have_unpaid_transaction__cancel_it_or_pay_it_": "Anda sudah memiliki transaksi yang belum dibayar, batalkan atau bayar.",
-    "Transaction_Not_found": "Transaksi Tidak ditemukan",
-    "Cancel_it_": "Batalkan itu?",
-    "expired": "kedaluwarsa",
-    "Check_for_Payment": "Periksa Pembayaran",
-    "Transaction_still_unpaid_": "Transaksi masih belum dibayar.",
-    "Paid_Date": "Tanggal Pembayaran",
-    "Transaction_has_been_paid_": "Transaksi telah dibayar.",
-    "PAID": "DIBAYAR",
-    "CANCELED": "DIBATALKAN",
-    "UNPAID": "BELUM DIBAYAR",
-    "PAY_NOW": "BAYAR SEKARANG",
-    "Buy_Hotspot_Plan": "Beli Paket Hotspot",
-    "Buy_PPOE_Plan": "Beli Paket PPPoE",
-    "Package": "Paket",
-    "Order_Internet_Package": "Pesan Paket Internet",
-    "Unknown_Command_": "Perintah Tidak Diketahui.",
-    "Checking_payment": "Memeriksa pembayaran",
-    "Create_Transaction_Success": "Transaksi Berhasil Dibuat",
-    "You_have_unpaid_transaction": "Anda memiliki transaksi yang belum dibayar",
-    "TripayPayment_Channel": "Saluran Pembayaran Tripay",
-    "Payment_Channel": "Saluran Pembayaran",
-    "Payment_check_failed_": "Pemeriksaan pembayaran gagal.",
-    "Order_Package": "Pesan Paket",
-    "Transactions": "Transaksi",
-    "Payments": "Pembayaran",
-    "History": "Riwayat",
-    "Order_History": "Riwayat Pesanan",
-    "Gateway": "Gerbang",
-    "Date_Done": "Tanggal Selesai",
-    "Unpaid_Order": "Pesanan Belum Dibayar",
-    "Payment_Gateway_Not_Found": "Gerbang Pembayaran Tidak Ditemukan",
-    "Payment_Gateway_saved_successfully": "Gerbang Pembayaran berhasil disimpan",
-    "ORDER": "MEMESAN",
-    "Package_History": "Riwayat Paket",
-    "Buy_History": "Riwayat Beli",
-    "Activation_History": "Riwayat Aktivasi",
-    "Buy_Package": "Beli Paket",
-    "Email": "Surel",
-    "Company_Footer": "Catatan Kaki Perusahaan",
-    "Will_show_below_user_pages": "Akan ditampilkan di bawah halaman pengguna",
-    "Request_OTP": "Minta OTP",
-    "Verification_Code": "Kode Verifikasi",
-    "SMS_Verification_Code": "Kode Verifikasi SMS",
-    "Please_enter_your_email_address": "Silakan masukkan alamat email Anda",
-    "Failed_to_create_Paypal_transaction_": "Gagal membuat transaksi Paypal.",
-    "Plugin": "Plugin",
-    "Plugin_Manager": "Manajer Plugin",
-    "User_Notification": "Pemberitahuan Pelanggan",
-    "Expired_Notification": "Pemberitahuan Kedaluwarsa",
-    "User_will_get_notification_when_package_expired": "Pengguna akan mendapat notifikasi ketika paket sudah habis masa berlakunya",
-    "Expired_Notification_Message": "Pesan Pemberitahuan Kedaluwarsa",
-    "Payment_Notification": "Notifikasi Pembayaran",
-    "User_will_get_invoice_notification_when_buy_package_or_package_refilled": "Pengguna akan mendapatkan notifikasi invoice saat membeli paket atau isi ulang paket",
-    "Current_IP": "IP saat ini",
-    "Current_MAC": "MAC saat ini",
-    "Login_Status": "Status Masuk",
-    "Login_Request_successfully": "Permintaan Masuk berhasil",
-    "Logout_Request_successfully": "Permintaan Keluar berhasil",
-    "Disconnect_Internet_": "Putuskan sambungan Internet?",
-    "Not_Online__Login_now_": "Tidak, Masuk sekarang?",
-    "You_are_Online__Logout_": "Kamu sedang aktif, ingin keluar?",
-    "Connect_to_Internet_": "Hubungkan ke Internet?",
-    "Your_account_not_connected_to_internet": "Akun Anda tidak terhubung ke internet",
-    "Failed_to_create_transaction__": "Gagal membuat transaksi. ",
-    "Failed_to_check_status_transaction__": "Gagal memeriksa status transaksi.",
-    "Disable_Voucher": "Nonaktifkan Voucher",
-    "Balance": "Saldo",
-    "Balance_System": "Saldo Sistem",
-    "Enable_System": "Aktifkan Sistem",
-    "Allow_Transfer": "Izinkan Transfer",
-    "Telegram_Notification": "Pemberitahuan Telegram",
-    "SMS_OTP_Registration": "Pendaftaran SMS OTP",
-    "Whatsapp_Notification": "Pemberitahuan WhatsApp",
-    "Tawk_to_Chat_Widget": "Widget Obrolan Tawk.to",
-    "Invoice": "Faktur",
-    "Country_Code_Phone": "Kode Negara Telepon",
-    "Voucher_activation_menu_will_be_hidden": "Menu aktivasi voucher akan disembunyikan",
-    "Customer_can_deposit_money_to_buy_voucher": "Pelanggan dapat menyetor uang untuk membeli voucher",
-    "Allow_balance_transfer_between_customers": "Izinkan transfer saldo antar pelanggan",
-    "Reminder_Notification": "Pemberitahuan Pengingat",
-    "Reminder_Notification_Message": "Pesan Pemberitahuan Pengingat",
-    "Reminder_7_days": "Pengingat 7 hari",
-    "Reminder_3_days": "Pengingat 3 hari",
-    "Reminder_1_day": "Pengingat 1 hari",
-    "PPPOE_Password": "Kata sandi PPPoE",
-    "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",
-    "Invoice_Balance_Message": "Faktur Pesan Saldo",
-    "Invoice_Notification_Payment": "Faktur Pemberitahuan Pembayaran",
-    "Balance_Notification_Payment": "Saldo Pemberitahuan Pembayaran",
-    "Balance_Plans": "Paket Saldo",
-    "Buy_Balance": "Beli Saldo",
-    "Price": "Harga",
-    "Validity": "Waktu",
-    "Disable_auto_renewal_": "Nonaktifkan perpanjangan otomatis?",
-    "Auto_Renewal_On": "Perpanjangan Otomatis Aktif",
-    "Enable_auto_renewal_": "Aktifkan perpanjangan otomatis?",
-    "Auto_Renewal_Off": "Perpanjangan Otomatis Mati",
-    "Refill_Balance": "Isi Ulang Saldo",
-    "Invoice_Footer": "Catatan Kaki Faktur",
-    "Pay_With_Balance": "Bayar dengan Saldo",
-    "Pay_this_with_Balance__your_active_package_will_be_overwrite": "Bayar ini dengan Saldo? Paket aktif Anda akan ditimpa",
-    "Success_to_buy_package": "Berhasil membeli paket",
-    "Auto_Renewal": "Perpanjangan otomatis",
-    "View": "Melihat",
-    "Back": "Kembali",
-    "Active": "Aktif",
-    "Transfer_Balance": "Kirim Saldo",
-    "Send_your_balance_": "Kirim saldo Anda?",
-    "Send": "Kirim",
-    "Cannot_send_to_yourself": "Tidak dapat mengirim ke diri Anda sendiri",
-    "Sending_balance_success": "Berhasil mengirim saldo",
-    "From": "Dari",
-    "To": "Ke",
-    "insufficient_balance": "Saldo tidak mencukupi",
-    "Send_Balance": "Kirim Saldo",
-    "Received_Balance": "Saldo yang Diterima",
-    "Minimum_Balance_Transfer": "Minimal Transfer Saldo",
-    "Minimum_Transfer": "Minimal Transfer",
-    "Company_Logo": "Logo Perusahaan",
-    "Expired_IP_Pool": "IP Pool Kedaluwarsa",
-    "Proxy": "Proksi",
-    "Proxy_Server": "Server Proksi",
-    "Proxy_Server_Login": "Masuk Server Proksi",
-    "Hotspot_Plan": "Paket Hotspot",
-    "PPPOE_Plan": "Paket PPPoE",
-    "UNKNOWN": "TIDAK DIKENAL",
-    "Are_You_Sure_": "Apa kamu yakin?",
-    "Success_to_send_package": "Berhasil mengirim paket",
-    "Target_has_active_plan__different_with_current_plant_": "Target mempunyai paket aktif, berbeda dengan paket saat ini.",
-    "Recharge_a_friend": "Isi ulang teman",
-    "Buy_for_friend": "Beli untuk teman",
-    "Buy_this_for_friend_account_": "Beli ini untuk akun teman?",
-    "Review_package_before_recharge": "Tinjau paket sebelum mengisi ulang",
-    "Activate": "Mengaktifkan Paket",
-    "Deactivate": "Menonaktifkan Paket",
-    "Sync": "Sinkronisasi",
-    "Failed_to_create_PaymeTrust_transaction_": "Gagal membuat transaksi PaymeTrust.",
-    "Location": "Lokasi",
-    "Radius_Plans": "Paket Radius",
-    "Change_title_in_user_Plan_order": "Ubah judul dalam urutan paket pelanggan",
-    "Logs": "Log",
-    "Voucher_Format": "Format Voucher",
-    "Resend_To_Customer": "Kirim Ulang Ke Pelanggan",
-    "Service_Type": "Jenis Layanan",
-    "Others": "Lainnya",
-    "PPPoE": "PPPoE",
-    "Hotspot": "Hotspot",
-    "Monthly_Registered_Customers": "Pendaftaran Pelanggan perbulan",
-    "Total_Monthly_Sales": "Total penjualan perbulan",
-    "Active_Users": "Pelanggan Aktif"
+    "Settings_Saved_Successfully": "Pengaturan Berhasil Disimpan"
 }

system/updates.json

@@ -90,5 +90,8 @@
     ],
     "2023.3.20": [
         "ALTER TABLE `tbl_customers` CHANGE `pppoe_password` `pppoe_password` VARCHAR(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'For PPPOE Login';"
+    ],
+    "2024.4.5" : [
+        "ALTER TABLE `tbl_payment_gateway` ADD `trx_invoice` VARCHAR(25) NOT NULL DEFAULT '' COMMENT 'from tbl_transactions' AFTER `paid_date`;"
     ]
 }

ui/ui/app-notifications.tpl

@@ -20,9 +20,11 @@
                                 rows="3">{if $_json['expired']!=''}{Lang::htmlspecialchars($_json['expired'])}{else}Hello [[name]], your internet package [[package]] has been expired.{/if}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name.
-                            <b>[[package]]</b> will be replaced with Package name.
-                            <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[name]]</b> - {Lang::T('will be replaced with Customer Name)}.<br>
+                            <b>[[username]]</b> - {Lang::T('will be replaced with Customer username)}.<br>
+                            <b>[[package]]</b> - {Lang::T('will be replaced with Package name)}.<br>
+                            <b>[[price]]</b> - {Lang::T('will be replaced with Package price)}.<br>
+                            <b>[[bills]]</b> - {Lang::T('additional bills for customers)}.
                         </p>
                     </div>
                 </div>
@@ -34,10 +36,12 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_7_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name.
-                            <b>[[package]]</b> will be replaced with Package name.
-                            <b>[[price]]</b> will be replaced with Package price.
-                            <b>[[expired_date]]</b> will be replaced with Expiration date.
+                            <b>[[name]]</b> - {Lang::T('will be replaced with Customer Name)}.<br>
+                            <b>[[username]]</b> - {Lang::T('will be replaced with Customer username)}.<br>
+                            <b>[[package]]</b> - {Lang::T('will be replaced with Package name)}.<br>
+                            <b>[[price]]</b> - {Lang::T('will be replaced with Package price)}.<br>
+                            <b>[[expired_date]]</b> - {Lang::T('will be replaced with Expiration date)}.<br>
+                            <b>[[bills]]</b> - {Lang::T('additional bills for customers)}.
                         </p>
                     </div>
                 </div>
@@ -49,10 +53,12 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_3_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name.
-                            <b>[[package]]</b> will be replaced with Package name.
-                            <b>[[price]]</b> will be replaced with Package price.
-                            <b>[[expired_date]]</b> will be replaced with Expiration date.
+                            <b>[[name]]</b> - {Lang::T('will be replaced with Customer Name)}.<br>
+                            <b>[[username]]</b> - {Lang::T('will be replaced with Customer username)}.<br>
+                            <b>[[package]]</b> - {Lang::T('will be replaced with Package name)}.<br>
+                            <b>[[price]]</b> - {Lang::T('will be replaced with Package price)}.<br>
+                            <b>[[expired_date]]</b> - {Lang::T('will be replaced with Expiration date)}.<br>
+                            <b>[[bills]]</b> - {Lang::T('additional bills for customers)}.
                         </p>
                     </div>
                 </div>
@@ -64,10 +70,12 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_1_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name.
-                            <b>[[package]]</b> will be replaced with Package name.
-                            <b>[[price]]</b> will be replaced with Package price.
-                            <b>[[expired_date]]</b> will be replaced with Expiration date.
+                            <b>[[name]]</b> - {Lang::T('will be replaced with Customer Name)}.<br>
+                            <b>[[username]]</b> - {Lang::T('will be replaced with Customer username)}.<br>
+                            <b>[[package]]</b> - {Lang::T('will be replaced with Package name)}.<br>
+                            <b>[[price]]</b> - {Lang::T('will be replaced with Package price)}.<br>
+                            <b>[[expired_date]]</b> - {Lang::T('will be replaced with Expiration date)}.<br>
+                            <b>[[bills]]</b> - {Lang::T('additional bills for customers)}.
                         </p>
                     </div>
                 </div>
@@ -80,21 +88,22 @@
                                 rows="20">{Lang::htmlspecialchars($_json['invoice_paid'])}</textarea>
                         </div>
                         <p class="col-md-4 help-block">
-                            <b>[[company_name]]</b> Your Company Name at Settings.<br>
-                            <b>[[address]]</b> Your Company Address at Settings.<br>
-                            <b>[[phone]]</b> Your Company Phone at Settings.<br>
-                            <b>[[invoice]]</b> invoice number.<br>
-                            <b>[[date]]</b> Date invoice created.<br>
-                            <b>[[payment_gateway]]</b> Payment gateway user paid from.<br>
-                            <b>[[payment_channel]]</b> Payment channel user paid from.<br>
-                            <b>[[type]]</b> is Hotspot/PPPOE.<br>
-                            <b>[[plan_name]]</b> Internet Package.<br>
-                            <b>[[plan_price]]</b> Internet Package Prices.<br>
-                            <b>[[name]]</b> Receiver name.<br>
-                            <b>[[user_name]]</b> Username internet.<br>
-                            <b>[[user_password]]</b> User password.<br>
-                            <b>[[expired_date]]</b> Expired datetime.<br>
-                            <b>[[footer]]</b> Invoice Footer.
+                            <b>[[company_name]]</b> {Lang::T('Your Company Name at Settings)}.<br>
+                            <b>[[address]]</b> {Lang::T('Your Company Address at Settings)}.<br>
+                            <b>[[phone]]</b> - {Lang::T('Your Company Phone at Settings)}.<br>
+                            <b>[[invoice]]</b> - {Lang::T('Invoice number)}.<br>
+                            <b>[[date]]</b> - {Lang::T('Date invoice created)}.<br>
+                            <b>[[payment_gateway]]</b> - {Lang::T('Payment gateway user paid from)}.<br>
+                            <b>[[payment_channel]]</b> - {Lang::T('Payment channel user paid from)}.<br>
+                            <b>[[type]]</b> - {Lang::T('is Hotspot or PPPOE)}.<br>
+                            <b>[[plan_name]]</b> - {Lang::T('Internet Package)}.<br>
+                            <b>[[plan_price]]</b> - {Lang::T('Internet Package Prices)}.<br>
+                            <b>[[name]]</b> - {Lang::T('Receiver name)}.<br>
+                            <b>[[user_name]]</b> - {Lang::T('Username internet)}.<br>
+                            <b>[[user_password]]</b> - {Lang::T('User password)}.<br>
+                            <b>[[expired_date]]</b> - {Lang::T('Expired datetime)}.<br>
+                            <b>[[footer]]</b> - {Lang::T('Invoice Footer)}.<br>
+                            <b>[[note]]</b> - {Lang::T('For Notes by admin)}.<br>
                         </p>
                     </div>
                 </div>
@@ -107,23 +116,23 @@
                                 rows="20">{Lang::htmlspecialchars($_json['invoice_balance'])}</textarea>
                         </div>
                         <p class="col-md-4 help-block">
-                            <b>[[company_name]]</b> Your Company Name at Settings.<br>
-                            <b>[[address]]</b> Your Company Address at Settings.<br>
-                            <b>[[phone]]</b> Your Company Phone at Settings.<br>
-                            <b>[[invoice]]</b> invoice number.<br>
-                            <b>[[date]]</b> Date invoice created.<br>
-                            <b>[[payment_gateway]]</b> Payment gateway user paid from.<br>
-                            <b>[[payment_channel]]</b> Payment channel user paid from.<br>
-                            <b>[[type]]</b> is Hotspot/PPPOE.<br>
-                            <b>[[plan_name]]</b> Internet Package.<br>
-                            <b>[[plan_price]]</b> Internet Package Prices.<br>
-                            <b>[[name]]</b> Receiver name.<br>
-                            <b>[[user_name]]</b> Username internet.<br>
-                            <b>[[user_password]]</b> User password.<br>
-                            <b>[[trx_date]]</b> Transaction datetime.<br>
-                            <b>[[balance_before]]</b> Balance Before.<br>
-                            <b>[[balance]]</b> Balance After.<br>
-                            <b>[[footer]]</b> Invoice Footer.
+                            <b>[[company_name]]</b> - {Lang::T('Your Company Name at Settings)}.<br>
+                            <b>[[address]]</b> - {Lang::T('Your Company Address at Settings)}.<br>
+                            <b>[[phone]]</b> - {Lang::T('Your Company Phone at Settings)}.<br>
+                            <b>[[invoice]]</b> - {Lang::T('Invoice number)}.<br>
+                            <b>[[date]]</b> - {Lang::T('Date invoice created)}.<br>
+                            <b>[[payment_gateway]]</b> - {Lang::T('Payment gateway user paid from)}.<br>
+                            <b>[[payment_channel]]</b> - {Lang::T('Payment channel user paid from)}.<br>
+                            <b>[[type]]</b> - {Lang::T('is Hotspot or PPPOE)}.<br>
+                            <b>[[plan_name]]</b> - {Lang::T('Internet Package)}.<br>
+                            <b>[[plan_price]]</b> - {Lang::T('Internet Package Prices)}.<br>
+                            <b>[[name]]</b> - {Lang::T('Receiver name)}.<br>
+                            <b>[[user_name]]</b> - {Lang::T('Username internet)}.<br>
+                            <b>[[user_password]]</b> - {Lang::T('User password)}.<br>
+                            <b>[[trx_date]]</b> - {Lang::T('Transaction datetime)}.<br>
+                            <b>[[balance_before]]</b> - {Lang::T('Balance Before)}.<br>
+                            <b>[[balance]]</b> - {Lang::T('Balance After)}.<br>
+                            <b>[[footer]]</b> - {Lang::T('Invoice Footer)}.
                         </p>
                     </div>
                 </div>
@@ -136,9 +145,9 @@
                                     rows="3">{if $_json['balance_send']}{Lang::htmlspecialchars($_json['balance_send'])}{else}{Lang::htmlspecialchars($_default['balance_send'])}{/if}</textarea>
                             </div>
                             <p class="col-md-4 help-block">
-                                <b>[[name]]</b> Receiver name.<br>
-                                <b>[[balance]]</b> how much balance have been send.<br>
-                                <b>[[current_balance]]</b> Current Balance.
+                                <b>[[name]]</b> - {Lang::T('Receiver name)}.<br>
+                                <b>[[balance]]</b> - {Lang::T('how much balance have been send)}.<br>
+                                <b>[[current_balance]]</b> - {Lang::T('Current Balance)}.
                             </p>
                         </div>
                     </div>
@@ -150,9 +159,9 @@
                                     rows="3">{if $_json['balance_received']}{Lang::htmlspecialchars($_json['balance_received'])}{else}{Lang::htmlspecialchars($_default['balance_received'])}{/if}</textarea>
                             </div>
                             <p class="col-md-4 help-block">
-                                <b>[[name]]</b> Sender name.<br>
-                                <b>[[balance]]</b> how much balance have been received.<br>
-                                <b>[[current_balance]]</b> Current Balance.
+                                <b>[[name]]</b> - {Lang::T('Sender name)}.<br>
+                                <b>[[balance]]</b> - {Lang::T('how much balance have been received)}.<br>
+                                <b>[[current_balance]]</b> - {Lang::T('Current Balance)}.
                             </p>
                         </div>
                     </div>

ui/ui/app-settings.tpl

@@ -77,8 +77,8 @@
                                 <option value="default" {if $_c['theme'] eq 'default' }selected="selected" {/if}>Default
                                 </option>
                                 {foreach $themes as $theme}
-                                <option value="{$theme}" {if $_c['theme'] eq $theme}selected="selected" {/if}>
-                                    {Lang::ucWords($theme)}</option>
+                                    <option value="{$theme}" {if $_c['theme'] eq $theme}selected="selected" {/if}>
+                                        {Lang::ucWords($theme)}</option>
                                 {/foreach}
                             </select>
                         </div>
@@ -157,33 +157,33 @@
                         <p class="help-block col-md-4">UPPERCASE lowercase RaNdoM</p>
                     </div>
                     {if $_c['disable_voucher'] != 'yes'}
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Disable Registration')}</label>
-                        <div class="col-md-6">
-                            <select name="disable_registration" id="disable_registration" class="form-control">
-                                <option value="no" {if $_c['disable_registration']=='no' }selected="selected" {/if}>No
-                                </option>
-                                <option value="yes" {if $_c['disable_registration']=='yes' }selected="selected" {/if}>
-                                    Yes
-                                </option>
-                            </select>
-                        </div>
-                        <p class="help-block col-md-4">
-                            {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be
+                        <div class="form-group">
+                            <label class="col-md-2 control-label">{Lang::T('Disable Registration')}</label>
+                            <div class="col-md-6">
+                                <select name="disable_registration" id="disable_registration" class="form-control">
+                                    <option value="no" {if $_c['disable_registration']=='no' }selected="selected" {/if}>No
+                                    </option>
+                                    <option value="yes" {if $_c['disable_registration']=='yes' }selected="selected" {/if}>
+                                        Yes
+                                    </option>
+                                </select>
+                            </div>
+                            <p class="help-block col-md-4">
+                                {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be
                             password')}
-                        </p>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Redirect after Activation</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="voucher_redirect" name="voucher_redirect"
-                                placeholder="https://192.168.88.1/status" value="{$voucher_redirect}">
+                            </p>
                         </div>
-                        <p class="help-block col-md-4">
-                            {Lang::T('After Customer activate voucher or login, customer will be redirected to this
+                        <div class="form-group">
+                            <label class="col-md-2 control-label">Redirect after Activation</label>
+                            <div class="col-md-6">
+                                <input type="text" class="form-control" id="voucher_redirect" name="voucher_redirect"
+                                    placeholder="https://192.168.88.1/status" value="{$voucher_redirect}">
+                            </div>
+                            <p class="help-block col-md-4">
+                                {Lang::T('After Customer activate voucher or login, customer will be redirected to this
                             url')}
-                        </p>
-                    </div>
+                            </p>
+                        </div>
                     {/if}
                 </div>
                 <div class="panel-heading">
@@ -213,6 +213,37 @@
                         </div>
                     </div>
                 </div>
+                <div class="panel-heading">
+                    <div class="btn-group pull-right">
+                        <button class="btn btn-primary btn-xs" title="save" type="submit"><span
+                                class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
+                    </div>
+                    {Lang::T('Extend Postpaid Expiration')}
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Allow Extend')}</label>
+                        <div class="col-md-6">
+                            <select name="extend_expired" id="extend_expired" class="form-control text-muted">
+                                <option value="0">No</option>
+                                <option value="1" {if $_c['extend_expired']}selected="selected" {/if}>Yes</option>
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">Customer can request to extend expirations</p>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Extend Days')}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" name="extend_days" placeholder="3" value="{$_c['extend_days']}">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Confirmation Message')}</label>
+                        <div class="col-md-6">
+                            <textarea type="text" rows="4" class="form-control" name="extend_confirmation" placeholder="i agree to extends and will paid full after this">{$_c['extend_confirmation']}</textarea>
+                        </div>
+                    </div>
+                </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
@@ -306,8 +337,8 @@
                                 onchange="document.getElementById('sms_url').value = this.value">
                                 <option value="">Select Router</option>
                                 {foreach $r as $rs}
-                                <option value="{$rs['name']}" {if $rs['name']==$_c['sms_url']}selected{/if}>
-                                    {$rs['name']}</option>
+                                    <option value="{$rs['name']}" {if $rs['name']==$_c['sms_url']}selected{/if}>
+                                        {$rs['name']}</option>
                                 {/foreach}
                             </select>
                         </div>
@@ -342,7 +373,8 @@
                 </div>
                 <div class="panel-heading">
                     <div class="btn-group pull-right">
-                        <a class="btn btn-success btn-xs" style="color: black;" href="javascript:testEmail()">Test Email</a>
+                        <a class="btn btn-success btn-xs" style="color: black;" href="javascript:testEmail()">Test
+                            Email</a>
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
                                 class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
                     </div>
@@ -352,36 +384,40 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">SMTP Host : port</label>
                         <div class="col-md-4">
-                            <input type="text" class="form-control" id="smtp_host" name="smtp_host" value="{$_c['smtp_host']}"
-                                placeholder="smtp.host.tld">
+                            <input type="text" class="form-control" id="smtp_host" name="smtp_host"
+                                value="{$_c['smtp_host']}" placeholder="smtp.host.tld">
                         </div>
                         <div class="col-md-2">
-                            <input type="number" class="form-control" id="smtp_port" name="smtp_port" value="{$_c['smtp_port']}"
-                                placeholder="465 587 port">
+                            <input type="number" class="form-control" id="smtp_port" name="smtp_port"
+                                value="{$_c['smtp_port']}" placeholder="465 587 port">
                         </div>
                         <p class="help-block col-md-4">Empty this to use internal mail() PHP</p>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">SMTP username</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="smtp_user" name="smtp_user" value="{$_c['smtp_user']}"
-                                placeholder="user@host.tld">
+                            <input type="text" class="form-control" id="smtp_user" name="smtp_user"
+                                value="{$_c['smtp_user']}" placeholder="user@host.tld">
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">SMTP Password</label>
                         <div class="col-md-6">
-                            <input type="password" class="form-control" id="smtp_pass" name="smtp_pass" value="{$_c['smtp_pass']}"
-                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
+                            <input type="password" class="form-control" id="smtp_pass" name="smtp_pass"
+                                value="{$_c['smtp_pass']}" onmouseleave="this.type = 'password'"
+                                onmouseenter="this.type = 'text'">
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">SMTP Security</label>
                         <div class="col-md-6">
                             <select name="smtp_ssltls" id="smtp_ssltls" class="form-control">
-                                <option value="" {if $_c['smtp_ssltls']=='' }selected="selected" {/if}>Not Secure</option>
-                                <option value="ssl" {if $_c['smtp_ssltls']=='ssl' }selected="selected" {/if}>SSL</option>
-                                <option value="tls" {if $_c['smtp_ssltls']=='tls' }selected="selected" {/if}>TLS</option>
+                                <option value="" {if $_c['smtp_ssltls']=='' }selected="selected" {/if}>Not Secure
+                                </option>
+                                <option value="ssl" {if $_c['smtp_ssltls']=='ssl' }selected="selected" {/if}>SSL
+                                </option>
+                                <option value="tls" {if $_c['smtp_ssltls']=='tls' }selected="selected" {/if}>TLS
+                                </option>
                             </select>
                         </div>
                         <p class="help-block col-md-4">UPPERCASE lowercase RaNdoM</p>
@@ -389,17 +425,18 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">Mail From</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="mail_from" name="mail_from" value="{$_c['mail_from']}"
-                                placeholder="noreply@host.tld">
+                            <input type="text" class="form-control" id="mail_from" name="mail_from"
+                                value="{$_c['mail_from']}" placeholder="noreply@host.tld">
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">Mail Reply To</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="mail_reply_to" name="mail_reply_to" value="{$_c['mail_reply_to']}"
-                                placeholder="support@host.tld">
+                            <input type="text" class="form-control" id="mail_reply_to" name="mail_reply_to"
+                                value="{$_c['mail_reply_to']}" placeholder="support@host.tld">
                         </div>
-                        <p class="help-block col-md-4">Customer will reply email to this address, empty if you want to use From Address</p>
+                        <p class="help-block col-md-4">Customer will reply email to this address, empty if you want to
+                            use From Address</p>
                     </div>
                 </div>
                 <div class="panel-heading">
@@ -553,6 +590,71 @@
                         <p class="help-block col-md-4">{Lang::T('The method which OTP will be sent to user')}</p>
                     </div>
                 </div>
+
+                {* <div class="panel-heading">
+                    <div class="btn-group pull-right">
+                        <button class="btn btn-primary btn-xs" title="save" type="submit">
+                            <span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>
+                        </button>
+                    </div>
+                    {Lang::T('Tax System')}
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Enable Tax System')}</label>
+                        <div class="col-md-6">
+                            <select name="enable_tax" id="enable_tax" class="form-control">
+                                <option value="no" {if $_c['enable_tax']=='no' }selected="selected" {/if}>
+                                    {Lang::T('No')}
+                                </option>
+                                <option value="yes" {if $_c['enable_tax']=='yes' }selected="selected" {/if}>
+                                    {Lang::T('Yes')}
+                                </option>
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">{Lang::T('Tax will be calculated in Internet Plan Price')}</p>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Tax Rate')}</label>
+                        <div class="col-md-6">
+                            <select name="tax_rate" id="tax_rate" class="form-control">
+                                <option value="0.005" {if $_c['tax_rate']=='0.005' }selected="selected" {/if}>
+                                    {Lang::T('0.5%')}
+                                </option>
+                                <option value="0.01" {if $_c['tax_rate']=='0.01' }selected="selected" {/if}>
+                                    {Lang::T('1%')}
+                                </option>
+                                <option value="0.015" {if $_c['tax_rate']=='0.015' }selected="selected" {/if}>
+                                    {Lang::T('1.5%')}
+                                </option>
+                                <option value="0.02" {if $_c['tax_rate']=='0.02' }selected="selected" {/if}>
+                                    {Lang::T('2%')}
+                                </option>
+                                <option value="0.05" {if $_c['tax_rate']=='0.05' }selected="selected" {/if}>
+                                    {Lang::T('5%')}
+                                </option>
+                                <option value="0.1" {if $_c['tax_rate']=='0.1' }selected="selected" {/if}>
+                                    {Lang::T('10%')}
+                                </option>
+                                <!-- Custom tax rate option -->
+                                <option value="custom" {if $_c['tax_rate']=='custom' }selected="selected" {/if}>
+                                    {Lang::T('Custom')}</option>
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">{Lang::T('Tax Rates in percentage')}</p>
+                    </div>
+                    <!-- Custom tax rate input field (initially hidden) -->
+                    <div class="form-group" id="customTaxRate" style="display: none;">
+                        <label class="col-md-2 control-label">{Lang::T('Custom Tax Rate')}</label>
+                        <div class="col-md-6">
+                            <input type="text" value="{$_c['custom_tax_rate']}" class="form-control"
+                                name="custom_tax_rate" id="custom_tax_rate"
+                                placeholder="{Lang::T('Enter Custom Tax Rate')}">
+                        </div>
+                        <p class="help-block col-md-4">{Lang::T('Enter the custom tax rate (e.g., 3.75 for 3.75%)')}</p>
+                    </div>
+                </div> *}
+
                 {* <div class="panel-heading" id="envato">
                     <div class="btn-group pull-right">
                         <button class="btn btn-primary btn-xs" title="save" type="submit"><span
@@ -635,4 +737,26 @@ add dst-host=*.{$_domain}</pre>
         window.location.href = '{$_url}settings/app&testTg=test';
     }
 </script>
+
+<script>
+    document.addEventListener("DOMContentLoaded", function() {
+        // Function to toggle visibility of custom tax rate input field
+        function toggleCustomTaxRate() {
+            var taxRateSelect = document.getElementById("tax_rate");
+            var customTaxRateInput = document.getElementById("customTaxRate");
+
+            if (taxRateSelect.value === "custom") {
+                customTaxRateInput.style.display = "block";
+            } else {
+                customTaxRateInput.style.display = "none";
+            }
+        }
+
+        // Call the function when the page loads
+        toggleCustomTaxRate();
+
+        // Call the function whenever the tax rate dropdown value changes
+        document.getElementById("tax_rate").addEventListener("change", toggleCustomTaxRate);
+    });
+</script>
 {include file="sections/footer.tpl"}

ui/ui/balance-add.tpl

@@ -32,6 +32,16 @@
                                 <input type="number" class="form-control" name="price" required>
                             </div>
                         </div>
+                        {if $_c['enable_tax'] == 'yes'}
+                        {if $_c['tax_rate'] == 'custom'}
+                        <p class="help-block col-md-4">{number_format($_c['custom_tax_rate'], 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {else}
+                        <p class="help-block col-md-4">{number_format($_c['tax_rate'] * 100, 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {/if}
+                        {/if}
+
                     </div>
 
                     <div class="form-group">

ui/ui/balance-edit.tpl

@@ -32,6 +32,16 @@
                                         <input type="number" class="form-control" name="price" value="{$d['price']}" required>
                                     </div>
                                 </div>
+                                {if $_c['enable_tax'] == 'yes'}
+                                {if $_c['tax_rate'] == 'custom'}
+                                <p class="help-block col-md-4">{number_format($_c['custom_tax_rate'], 2)} % {Lang::T('Tax Rates
+                                    will be added')}</p>
+                                {else}
+                                <p class="help-block col-md-4">{number_format($_c['tax_rate'] * 100, 2)} % {Lang::T('Tax Rates
+                                    will be added')}</p>
+                                {/if}
+                                {/if}
+        
                             </div>
 
                             <div class="form-group">

ui/ui/customers.tpl

@@ -1,31 +1,33 @@
 {include file="sections/header.tpl"}
+<style>
+    .dataTables_wrapper .dataTables_paginate .paginate_button {
+        display: inline-block;
+        padding: 5px 10px;
+        margin-right: 5px;
+        border: 1px solid #ccc;
+        background-color: #fff;
+        color: #333;
+        cursor: pointer;
+    }
+</style>
 
 <div class="row">
     <div class="col-sm-12">
         <div class="panel panel-hovered mb20 panel-primary">
             <div class="panel-heading">
                 {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <div class="btn-group pull-right">
-                        <a class="btn btn-primary btn-xs" title="save" href="{$_url}customers/csv"
-                            onclick="return confirm('This will export to CSV?')"><span class="glyphicon glyphicon-download"
-                                aria-hidden="true"></span> CSV</a>
-                    </div>
+                <div class="btn-group pull-right">
+                    <a class="btn btn-primary btn-xs" title="save" href="{$_url}customers/csv"
+                        onclick="return confirm('This will export to CSV?')"><span class="glyphicon glyphicon-download"
+                            aria-hidden="true"></span> CSV</a>
+                </div>
                 {/if}
                 {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="input-group">
-                                <input type="text" id="search-input" name="search" value="{$search}"
-                                    class="form-control" placeholder="{Lang::T('Search')}...">
-                                <div class="input-group-btn">
-                                    <button class="btn btn-success" type="submit"><span
-                                            class="fa fa-search"></span></button>
-                                </div>
-                            </div>
-                        </form>
+
                     </div>
                     <div class="col-md-4">
                         <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
@@ -33,14 +35,14 @@
                     </div>&nbsp;
                 </div>
                 <div class="table-responsive table_mobile">
-                    <table class="table table-bordered table-striped table-condensed">
+                    <table id="customerTable" class="table table-bordered table-striped table-condensed">
                         <thead>
                             <tr>
                                 <th>{Lang::T('Username')}</th>
                                 <th>{Lang::T('Account Type')}</th>
                                 <th>{Lang::T('Full Name')}</th>
                                 <th>{Lang::T('Balance')}</th>
-                                <th width="120px"></th>
+                                <th>{Lang::T('Contact')}</th>
                                 <th>{Lang::T('Package')}</th>
                                 <th>{Lang::T('Service Type')}</th>
                                 <th>{Lang::T('Created On')}</th>
@@ -49,71 +51,64 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr>
-                                    <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
-                                        style="cursor:pointer;">{$ds['username']}</td>
-                                    <td>{$ds['account_type']}</td>
-                                    <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
-                                        style="cursor: pointer;">{$ds['fullname']}</td>
-                                    <td>{Lang::moneyFormat($ds['balance'])}</td>
-                                    <td align="center">
-                                        {if $ds['phonenumber']}
-                                            <a href="tel:{$ds['phonenumber']}" class="btn btn-default btn-xs"
-                                                title="{$ds['phonenumber']}"><i class="glyphicon glyphicon-earphone"></i></a>
-                                        {/if}
-                                        {if $ds['email']}
-                                            <a href="mailto:{$ds['email']}" class="btn btn-default btn-xs"
-                                                title="{$ds['email']}"><i class="glyphicon glyphicon-envelope"></i></a>
-                                        {/if}
-                                        {if $ds['coordinates']}
-                                            <a href="https://www.google.com/maps/dir//{$ds['coordinates']}/" target="_blank" class="btn btn-default btn-xs"
-                                                title="{$ds['coordinates']}"><i class="glyphicon glyphicon-map-marker"></i></a>
-                                        {/if}
-                                    </td>
-                                    <td align="center" api-get-text="{$_url}autoload/customer_is_active/{$ds['id']}">
-                                        <span class="label label-default">&bull;</span>
-                                    </td>
-                                    <td>{$ds['service_type']}</td>
-                                    <td>{Lang::dateTimeFormat($ds['created_at'])}</td>
-                                    <td align="center">
-                                        <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}"
-                                            style="margin: 0px; color:black"
-                                            class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
-                                        <a href="{$_url}customers/edit/{$ds['id']}" id="{$ds['id']}"
-                                            style="margin: 0px; color:black"
-                                            class="btn btn-info btn-xs">&nbsp;&nbsp;{Lang::T('Edit')}&nbsp;&nbsp;</a>
-                                        <a href="{$_url}plan/recharge/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
-                                            class="btn btn-primary btn-xs">{Lang::T('Recharge')}</a>
-                                    </td>
-                                </tr>
+                            <tr>
+                                <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
+                                    style="cursor:pointer;">{$ds['username']}</td>
+                                <td>{$ds['account_type']}</td>
+                                <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
+                                    style="cursor: pointer;">{$ds['fullname']}</td>
+                                <td>{Lang::moneyFormat($ds['balance'])}</td>
+                                <td align="center">
+                                    {if $ds['phonenumber']}
+                                    <a href="tel:{$ds['phonenumber']}" class="btn btn-default btn-xs"
+                                        title="{$ds['phonenumber']}"><i class="glyphicon glyphicon-earphone"></i></a>
+                                    {/if}
+                                    {if $ds['email']}
+                                    <a href="mailto:{$ds['email']}" class="btn btn-default btn-xs"
+                                        title="{$ds['email']}"><i class="glyphicon glyphicon-envelope"></i></a>
+                                    {/if}
+                                    {if $ds['coordinates']}
+                                    <a href="https://www.google.com/maps/dir//{$ds['coordinates']}/" target="_blank"
+                                        class="btn btn-default btn-xs" title="{$ds['coordinates']}"><i
+                                            class="glyphicon glyphicon-map-marker"></i></a>
+                                    {/if}
+                                </td>
+                                <td align="center" api-get-text="{$_url}autoload/customer_is_active/{$ds['id']}">
+                                    <span class="label label-default">&bull;</span>
+                                </td>
+                                <td>{$ds['service_type']}</td>
+                                <td>{Lang::dateTimeFormat($ds['created_at'])}</td>
+                                <td align="center">
+                                    <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}"
+                                        style="margin: 0px; color:black"
+                                        class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
+                                    <a href="{$_url}customers/edit/{$ds['id']}" id="{$ds['id']}"
+                                        style="margin: 0px; color:black"
+                                        class="btn btn-info btn-xs">&nbsp;&nbsp;{Lang::T('Edit')}&nbsp;&nbsp;</a>
+                                    <a href="{$_url}plan/recharge/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
+                                        class="btn btn-primary btn-xs">{Lang::T('Recharge')}</a>
+                                </td>
+                            </tr>
                             {/foreach}
                         </tbody>
                     </table>
                 </div>
-                {include file="pagination.tpl"}
             </div>
         </div>
     </div>
 </div>
 
+
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
 <script>
-    // Functionality to filter table rows based on admin input
-    document.addEventListener('DOMContentLoaded', function() {
-        var searchInput = document.getElementById('search-input');
-        var tableRows = document.querySelectorAll('tbody tr');
+    var $j = jQuery.noConflict();
 
-        searchInput.addEventListener('input', function() {
-            var searchText = this.value.toLowerCase();
-
-            tableRows.forEach(function(row) {
-                var rowData = row.textContent.toLowerCase();
-
-                if (rowData.includes(searchText)) {
-                    row.style.display = '';
-                } else {
-                    row.style.display = 'none';
-                }
-            });
+    $j(document).ready(function () {
+        $j('#customerTable').DataTable({
+            "pagingType": "full_numbers",
+            "lengthMenu": [ [5, 10, 25, 50, 100, -1], [5, 10, 25, 50, 100, "All"] ],
+            "pageLength": 5
         });
     });
 </script>

ui/ui/hotspot-add.tpl

@@ -114,6 +114,16 @@
                                 <input type="number" class="form-control" name="price" required>
                             </div>
                         </div>
+                        {if $_c['enable_tax'] == 'yes'}
+                        {if $_c['tax_rate'] == 'custom'}
+                        <p class="help-block col-md-4">{number_format($_c['custom_tax_rate'], 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {else}
+                        <p class="help-block col-md-4">{number_format($_c['tax_rate'] * 100, 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {/if}
+                        {/if}
+
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Shared Users')}</label>

ui/ui/hotspot-edit.tpl

@@ -133,6 +133,16 @@
                                 <input type="number" class="form-control" name="price" value="{$d['price']}" required>
                             </div>
                         </div>
+                        {if $_c['enable_tax'] == 'yes'}
+                        {if $_c['tax_rate'] == 'custom'}
+                        <p class="help-block col-md-4">{number_format($_c['custom_tax_rate'], 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {else}
+                        <p class="help-block col-md-4">{number_format($_c['tax_rate'] * 100, 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {/if}
+                        {/if}
+
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Shared Users')}</label>

ui/ui/plan.tpl

@@ -67,12 +67,16 @@
                                     <td>{$ds['routers']}</td>
                                     <td>
                                         <a href="{$_url}plan/edit/{$ds['id']}"
-                                            class="btn btn-warning btn-xs">{Lang::T('Edit')}</a>
+                                            class="btn btn-warning btn-xs" style="color: black;">{Lang::T('Edit')}</a>
                                         {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                                             <a href="{$_url}plan/delete/{$ds['id']}" id="{$ds['id']}"
                                                 onclick="return confirm('{Lang::T('Delete')}?')"
                                                 class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                         {/if}
+                                        {if $ds['status']=='off' && $_c['extend_expired']}
+                                            <a href="javascript:extend('{$ds['id']}')"
+                                                class="btn btn-info btn-xs">{Lang::T('extend')}</a>
+                                        {/if}
                                     </td>
                                 </tr>
                             {/foreach}
@@ -85,5 +89,15 @@
     </div>
 </div>
 
+<script>
+function extend(idP){
+    var res = prompt("Extend for many days?", "3");
+    if(res){
+        if(confirm("Extend for "+res+" days?")){
+            window.location.href = "{$_url}plan/extend/"+idP+"/"+res+"&stoken={App::getToken()}";
+        }
+    }
+}
+</script>
 
 {include file="sections/footer.tpl"}

ui/ui/pppoe-add.tpl

@@ -64,6 +64,15 @@
                                 <input type="number" class="form-control" name="price" required>
                             </div>
                         </div>
+                        {if $_c['enable_tax'] == 'yes'}
+                        {if $_c['tax_rate'] == 'custom'}
+                        <p class="help-block col-md-4">{number_format($_c['custom_tax_rate'], 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {else}
+                        <p class="help-block col-md-4">{number_format($_c['tax_rate'] * 100, 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {/if}
+                        {/if}
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Plan Validity')}</label>

ui/ui/pppoe-edit.tpl

@@ -68,6 +68,16 @@
                                 <input type="number" class="form-control" name="price" required value="{$d['price']}">
                             </div>
                         </div>
+                        {if $_c['enable_tax'] == 'yes'}
+                        {if $_c['tax_rate'] == 'custom'}
+                        <p class="help-block col-md-4">{number_format($_c['custom_tax_rate'], 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {else}
+                        <p class="help-block col-md-4">{number_format($_c['tax_rate'] * 100, 2)} % {Lang::T('Tax Rates
+                            will be added')}</p>
+                        {/if}
+                        {/if}
+
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Plan Validity')}</label>

ui/ui/recharge-confirm.tpl

@@ -81,6 +81,7 @@
                     <input type="hidden" name="plan" value="{$plan['id']}">
                     <input type="hidden" name="server" value="{$server}">
                     <input type="hidden" name="using" value="{$using}">
+                    <input type="hidden" name="stoken" value="{App::getToken()}">
                     <center>
                         <button class="btn btn-success" type="submit">{Lang::T('Recharge')}</button><br>
                         <a class="btn btn-link" href="{$_url}plan/recharge">{Lang::T('Cancel')}</a>

ui/ui/register-otp.tpl

@@ -59,7 +59,7 @@
                         <div class="panel-body">
                             <div class="form-container">
                                 <div class="form-group">
-                                    <label>{Lang::T('Phone Number')}</label>
+                                    <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
                                     <div class="input-group">
                                         {if $_c['country_code_phone']!= ''}
                                             <span class="input-group-addon" id="basic-addon1"><i

ui/ui/register-rotp.tpl

@@ -59,7 +59,7 @@
                         <div class="panel-heading">1. {Lang::T('Register as Member')}</div>
                         <div class="panel-body">
                             <div class="form-group">
-                                <label>{Lang::T('Phone Number')}</label>
+                                <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
                                         <span class="input-group-addon" id="basic-addon1"><i

ui/ui/register.tpl

@@ -59,7 +59,7 @@
                         <div class="panel-body">
                             <div class="form-container">
                                 <div class="md-input-container">
-                                    <label>{Lang::T('Phone Number')}</label>
+                                    <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
                                     <div class="input-group">
                                         {if $_c['country_code_phone']!= ''}
                                             <span class="input-group-addon" id="basic-addon1"><i

ui/ui/sections/header.tpl

@@ -204,21 +204,21 @@
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                         <li class="{if $_system_menu eq 'services'}active{/if} treeview">
                             <a href="#">
-                                <i class="ion ion-cube"></i> <span>{Lang::T('Plans')}</span>
+                                <i class="ion ion-cube"></i> <span>{Lang::T('Internet Plan')}</span>
                                 <span class="pull-right-container">
                                     <i class="fa fa-angle-left pull-right"></i>
                                 </span>
                             </a>
                             <ul class="treeview-menu">
                                 <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
-                                        href="{$_url}services/hotspot">{Lang::T('Hotspot')}</a></li>
+                                        href="{$_url}services/hotspot">Hotspot</a></li>
                                 <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
-                                        href="{$_url}services/pppoe">{Lang::T('PPPOE')}</a></li>
+                                        href="{$_url}services/pppoe">PPPOE</a></li>
                                 <li {if $_routes[1] eq 'list' }class="active" {/if}><a
                                         href="{$_url}bandwidth/list">{Lang::T('Bandwidth')}</a></li>
                                 {if $_c['enable_balance'] == 'yes'}
                                     <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
-                                            href="{$_url}services/balance">{Lang::T('Balance')}</a></li>
+                                            href="{$_url}services/balance">{Lang::T('Customer Balance')}</a></li>
                                 {/if}
                                 {$_MENU_PLANS}
                             </ul>
@@ -312,9 +312,9 @@
                                 <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
                                         href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
                                 <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
-                                        href="{$_url}pages/Privacy_Policy">Privacy Policy</a></li>
+                                        href="{$_url}pages/Privacy_Policy">{Lang::T('Privacy Policy')}</a></li>
                                 <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
-                                        href="{$_url}pages/Terms_and_Conditions">Terms and Conditions</a></li>
+                                        href="{$_url}pages/Terms_and_Conditions">{Lang::T('Terms and Conditions')}</a></li>
                                 {$_MENU_PAGES}
                             </ul>
                         </li>

ui/ui/user-dashboard.tpl

@@ -178,12 +178,19 @@
                         <tr>
                             <td class="small text-primary text-uppercase text-normal">
                                 {if $_bill['status'] == 'on'}
-                                    <a href="{$_url}home&deactivate={$_bill['id']}" onclick="return confirm('{Lang::T('Deactivate')}?')"
-                                        class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
+                                    <a href="{$_url}home&deactivate={$_bill['id']}"
+                                        onclick="return confirm('{Lang::T('Deactivate')}?')" class="btn btn-danger btn-xs"><i
+                                            class="glyphicon glyphicon-trash"></i></a>
                                 {/if}
                             </td>
                             <td class="small row">
-                                <a class="btn btn-primary pull-right  btn-sm" href="{$_url}home&recharge={$_bill['id']}"
+                                {if $_bill['status'] != 'on' && $_bill['prepaid'] != 'yes' && $_c['extend_expired']}
+                                    <a class="btn btn-warning text-black btn-sm"
+                                        href="{$_url}home&extend={$_bill['id']}&stoken={App::getToken()}"
+                                        onclick="return confirm('{str_replace("\n","\\n",str_replace("\r","",$_c['extend_confirmation']))}?')">{Lang::T('Extend')}</a>
+                                {/if}
+                                <a class="btn btn-primary pull-right  btn-sm"
+                                    href="{$_url}home&recharge={$_bill['id']}&stoken={App::getToken()}"
                                     onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
                             </td>
                         </tr>

ui/ui/user-login-noreg.tpl

@@ -44,7 +44,7 @@
                     <div class="panel-body">
                         <form action="{$_url}login/activation" method="post">
                             <div class="form-group">
-                                <label>{Lang::T('Phone Number')}</label>
+                                <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
                                         <span class="input-group-addon" id="basic-addon1"><i

ui/ui/user-login.tpl

@@ -45,7 +45,7 @@
                     <div class="panel-body">
                         <form action="{$_url}login/post" method="post">
                             <div class="form-group">
-                                <label>{Lang::T('Phone Number')}</label>
+                                <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
                                         <span class="input-group-addon" id="basic-addon1"><i
@@ -60,10 +60,12 @@
 
                             </div>
                             <div class="form-group">
-                                <label>{Lang::T('Password')}</label>
-                                <input type="password" class="form-control" name="password"
-                                    placeholder="{Lang::T('Password')}">
-                            </div>
+    <label>{Lang::T('Password')}</label>
+    <div class="input-group">
+        <span class="input-group-addon" id="basic-addon2"><i class="glyphicon glyphicon-lock"></i></span>
+        <input type="password" class="form-control" name="password" placeholder="{Lang::T('Password')}">
+    </div>
+</div>
 
                             <div class="clearfix hidden">
                                 <div class="ui-checkbox ui-checkbox-primary right">

ui/ui/user-orderView.tpl

@@ -38,9 +38,17 @@
                                 <td>{$trx['gateway']}</td>
                             </tr>
                             <tr>
-                                <td>{Lang::T('Balance')}</td>
+                                <td>{Lang::T('Total')}</td>
                                 <td>{Lang::moneyFormat($trx['price'])}</td>
                             </tr>
+                            {if $invoice['note']}
+                                <tr>
+                                    <td>{Lang::T('Notes')}</td>
+                                    <td>
+                                        {nl2br($invoice['note'])}
+                                    </td>
+                                </tr>
+                            {/if}
                         </tbody>
                     </table>
                 {else}
@@ -80,8 +88,11 @@
                                 </tr>
                             {/if}
                             <tr>
-                                <td>{Lang::T('Plan Price')}{if $add_cost>0}<small> + {Lang::T('Additional Cost')}{/if}</small></td>
-                                <td style="font-size: large; font-weight:bolder; font-family: 'Courier New', Courier, monospace; ">{Lang::moneyFormat($trx['price'])}</td>
+                                <td>{Lang::T('Plan Price')}{if $add_cost>0}<small> +
+                                        {Lang::T('Additional Cost')}{/if}</small></td>
+                                <td
+                                    style="font-size: large; font-weight:bolder; font-family: 'Courier New', Courier, monospace; ">
+                                    {Lang::moneyFormat($trx['price'])}</td>
                             </tr>
                             <tr>
                                 <td>{Lang::T('Type')}</td>

ui/ui/voucher.tpl

@@ -16,31 +16,31 @@
             <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}plan/voucher/">
-                            <div class="input-group">
-                                <div class="input-group-addon">
-                                    <span class="fa fa-search"></span>
-                                </div>
-                                <input type="text" name="search" class="form-control"
-                                    placeholder="{Lang::T('Search by Code Voucher')}..." value="{$search}">
-                                <div class="input-group-btn">
-                                    <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="btn-group btn-group-justified" role="group">
-                            <div class="btn-group" role="group">
-                                <a href="{$_url}plan/add-voucher" class="btn btn-primary btn-block"><i
-                                        class="ion ion-android-add"> </i> {Lang::T('Add Vouchers')}</a>
-                            </div>
-                            <div class="btn-group" role="group">
-                                <a href="{$_url}plan/print-voucher" target="print_voucher" class="btn btn-info"><i
-                                        class="ion ion-android-print"> </i> Print</a>
-                            </div>
-                        </div>
-                    </div>&nbsp;
+    <form id="site-search" method="post" action="{$_url}plan/voucher/">
+        <div class="input-group">
+            <div class="input-group-addon">
+                <span class="fa fa-search"></span>
+            </div>
+            <input type="text" name="search" class="form-control" placeholder="{Lang::T('Search by Code Voucher')}..." value="{$search}">
+            <div class="input-group-btn">
+                <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div class="col-md-4">
+    <div class="btn-group btn-group-justified" role="group">
+        <div class="btn-group" role="group">
+            <a href="{$_url}plan/add-voucher" class="btn btn-primary btn-block"><i class="ion ion-android-add"></i> {Lang::T('Add Vouchers')}</a>
+        </div>
+    </div>
+    <div class="btn-group btn-group-justified" role="group">
+        <div class="btn-group" role="group">
+            <a href="{$_url}plan/print-voucher" target="print_voucher" class="btn btn-info btn-block"><i class="ion ion-android-print"></i> Print</a>
+        </div>
+    </div>
+</div>&nbsp;
                 </div>
                 <div class="table-responsive">
                     <table id="datatable" class="table table-bordered table-striped table-condensed">

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.4.3"
+    "version": "2024.4.15"
 }