From acded8eb29ba59153674669181fbb2e859f472d6 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:21:44 +0700
Subject: [PATCH 01/18] Update cron.php
---
system/cron.php | 194 ++++++++++++++++++++++++++++++------------------
1 file changed, 122 insertions(+), 72 deletions(-)
diff --git a/system/cron.php b/system/cron.php
index f55a79ef..398c3146 100644
--- a/system/cron.php
+++ b/system/cron.php
@@ -1,99 +1,149 @@
";
}
-
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 = [];
+$rows = array();
while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
echo "MYSQL Time\t" . $row['WAKTU'] . "\n";
}
+$_c = $config;
+
+
$textExpired = Lang::getNotifText('expired');
-$recharges = ORM::for_table('tbl_user_recharges')
- ->where('status', 'on')
- ->where_lte('expiration', date("Y-m-d"))
- ->find_many();
+$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
-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";
- $user_recharge = 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', $user_recharge['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']);
+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']));
} else {
- Mikrotik::setPpoeUserPlan($client, $customer['username'], 'EXPIRED NUXBILL ' . $plan['pool_expired']);
+ Radius::upsertCustomerAttr($c['username'], 'Framed-Pool', $p['pool_expired'], ':=');
+ print_r(Radius::disconnectCustomer($c['username']));
}
} else {
- if ($recharge['type'] == 'Hotspot') {
- Mikrotik::removeHotspotUser($client, $customer['username']);
- Mikrotik::removeHotspotActiveUser($client, $customer['username']);
+ $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']);
} else {
- Mikrotik::removePpoeUser($client, $customer['username']);
- Mikrotik::removePpoeActive($client, $customer['username']);
+ Mikrotik::removeHotspotUser($client, $c['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();
- echo Message::sendPackageNotification($customer, $user_recharge['namebp'], $plan['price'], $textExpired, $config['user_notification_expired']) . "\n";
-
- $user_recharge->status = 'off';
- $user_recharge->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";
+ // 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']);
+ }
} else {
- 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']);
+ echo "no renewall | plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
}
} else {
- echo "No renewal | Plan enabled: $plan[enabled] | User balance: $customer[balance] | Price: $plan[price]\n";
+ echo "no renewall | balance $config[enable_balance] auto_renewal $c[auto_renewal]\n";
}
- } else {
- echo "No renewal | Balance: $config[enable_balance] Auto-renewal: $customer[auto_renewal]\n";
- }
- } else {
- echo " : ACTIVE \r\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";
}
-}
\ No newline at end of file
+}
From 3c8b2c906d3d753a220c0a89313d412e80f23729 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 02/18] Update cron_reminder.php
From 2956cc2315383921332dd72c1039082ae71f9341 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:23:50 +0700
Subject: [PATCH 03/18] Update cron_reminder.php
---
system/cron_reminder.php | 59 ++++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/system/cron_reminder.php b/system/cron_reminder.php
index 51acbbee..44d101ef 100644
--- a/system/cron_reminder.php
+++ b/system/cron_reminder.php
@@ -2,8 +2,8 @@
/**
* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
- * This file is for reminding users about expiration
- * Example to run every day at 7:00 in the morning:
+ * This file for reminding user about expiration
+ * Example to run every at 7:00 in the morning
* 0 7 * * * /usr/bin/php /var/www/system/cron_reminder.php
**/
@@ -15,9 +15,10 @@ if (php_sapi_name() !== 'cli') {
echo "";
}
-$recharges = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
+$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
+
+run_hook('cronjob_reminder'); #HOOK
-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;');
@@ -27,35 +28,39 @@ 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 ($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;
+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;
}
- } else {
- $price = $plan['price'];
}
-
- 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";
+ 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']);
+ }
+ 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";
}
}
}
From ea3f5caf59667a290eee463a95fb3b1f800728a6 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:10:40 +0700
Subject: [PATCH 04/18] Update voucher.tpl
---
ui/ui/voucher.tpl | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index 7d9ebd6e..b106630f 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -98,15 +98,7 @@
-
-
+ {include file="pagination.tpl"}
From 0ce112dc7012ed7f02b47d288e839edd07eeda14 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Fri, 19 Apr 2024 14:43:06 +0700
Subject: [PATCH 05/18] order activated by desc
---
system/controllers/voucher.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php
index 96972f71..8abcd235 100644
--- a/system/controllers/voucher.php
+++ b/system/controllers/voucher.php
@@ -40,7 +40,7 @@ switch ($action) {
case 'list-activated':
$ui->assign('_system_menu', 'list-activated');
- $query = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_asc('id');
+ $query = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_desc('id');
$d = Paginator::findMany($query);
$ui->assign('d', $d);
From 2f757f1006c0a64fe3b4dded1b9b0d3f5d20317f Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 06/18] Update cron_reminder.php
From 20c4be9121864427136745a2b8d0269af7a9fb6f Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Sun, 21 Apr 2024 10:52:18 +0700
Subject: [PATCH 07/18] As exp dev says, if it works, dont touch it
---
system/cron.php | 8 +++-----
system/cron_reminder.php | 16 +++++-----------
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/system/cron.php b/system/cron.php
index 398c3146..4d03201b 100644
--- a/system/cron.php
+++ b/system/cron.php
@@ -34,7 +34,6 @@ foreach ($d as $ds) {
$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']));
@@ -54,7 +53,7 @@ foreach ($d as $ds) {
}
Mikrotik::removeHotspotActiveUser($client, $c['username']);
}
- echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired']) . "\n";
+ echo Message::sendPackageNotification($c, $u['namebp'], $p['price'], $textExpired, $config['user_notification_expired']) . "\n";
//update database user dengan status off
$u->status = 'off';
$u->save();
@@ -98,7 +97,6 @@ foreach ($d as $ds) {
$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']));
@@ -115,7 +113,7 @@ foreach ($d as $ds) {
}
Mikrotik::removePpoeActive($client, $c['username']);
}
- echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired']) . "\n";
+ echo Message::sendPackageNotification($c, $u['namebp'], $p['price'], $textExpired, $config['user_notification_expired']) . "\n";
$u->status = 'off';
$u->save();
@@ -146,4 +144,4 @@ foreach ($d as $ds) {
} else
echo " : ACTIVE \r\n";
}
-}
+}
\ No newline at end of file
diff --git a/system/cron_reminder.php b/system/cron_reminder.php
index 44d101ef..85b1a076 100644
--- a/system/cron_reminder.php
+++ b/system/cron_reminder.php
@@ -38,22 +38,16 @@ foreach ($d as $ds) {
$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;
- }
- }
- if ($p['validity_unit'] == 'Period') {
+ 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']);
+ $price = $p['price'];
} else {
- $price = Lang::moneyFormat($add_inv);
+ $price = $add_inv;
}
} else {
- $price = Lang::moneyFormat($p['price']);
+ $price = $p['price'];
}
if ($ds['expiration'] == $day7) {
echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
@@ -63,4 +57,4 @@ foreach ($d as $ds) {
echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
}
}
-}
+}
\ No newline at end of file
From 6dafd549d91132dde75fa705be84898b4c187c36 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Sun, 21 Apr 2024 10:53:32 +0700
Subject: [PATCH 08/18] Restore old cron
---
CHANGELOG.md | 4 ++++
version.json | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62baafee..da5b8e45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
# CHANGELOG
+## 2024.4.21
+
+- Restore old cron
+
## 2024.4.15
- Postpaid Customer can request extends expiration day if it enabled
diff --git a/version.json b/version.json
index d9eb8903..8d38957f 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
{
- "version": "2024.4.15"
+ "version": "2024.4.21"
}
\ No newline at end of file
From 8d17cd3f901723cdaad2a8f3f22e600cb0d7371e Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Sun, 21 Apr 2024 10:59:20 +0700
Subject: [PATCH 09/18] fix [[expired_date]]
---
system/autoload/Message.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/system/autoload/Message.php b/system/autoload/Message.php
index 94b5e06f..4acaabc8 100644
--- a/system/autoload/Message.php
+++ b/system/autoload/Message.php
@@ -143,6 +143,8 @@ class Message
}
if ($user_recharge) {
$msg = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($user_recharge['expiration'], $user_recharge['time']), $msg);
+ }else{
+ $msg = str_replace('[[expired_date]]', "", $msg);
}
if (
!empty($customer['phonenumber']) && strlen($customer['phonenumber']) > 5
From c32542afda3a74ef7802e5d9a0e27b777897b9d5 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 10/18] Update cron_reminder.php
From c0382c569a4b9b1b4651ced8e9fe625b033dbb01 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 11/18] Update cron_reminder.php
From 0e81db5adaabe53082044e562a2c9b442e7d7082 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Sun, 21 Apr 2024 20:20:15 +0700
Subject: [PATCH 12/18] indonesia lang
---
system/lan/indonesia.json | 475 +++++++++++++++++++++++++++++++++++++-
1 file changed, 474 insertions(+), 1 deletion(-)
diff --git a/system/lan/indonesia.json b/system/lan/indonesia.json
index fcc6b192..e37e21aa 100644
--- a/system/lan/indonesia.json
+++ b/system/lan/indonesia.json
@@ -1,3 +1,476 @@
{
- "Settings_Saved_Successfully": "Pengaturan Berhasil Disimpan"
+ "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, chmod 664 pages\/*.html",
+ "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",
+ "SuperAdmin": "Admin Super",
+ "Lists": "Daftar",
+ "Vouchers": "Voucher",
+ "Refill_Customer": "Isi Ulang Pelanggan",
+ "Recharge_Customer": "Isi Ulang Pelanggan",
+ "Plans": "Rencana",
+ "PPPOE": "PPPOE",
+ "Bandwidth": "Bandwidth",
+ "Send_Message": "Mengirim pesan",
+ "Single_Customer": "Pelanggan Tunggal",
+ "Bulk_Customers": "Pelanggan Massal",
+ "Radius": "Radius",
+ "Radius_NAS": "Radius NAS",
+ "Customer_Announcement": "Pengumuman Pelanggan",
+ "Language_Editor": "Editor Bahasa",
+ "Plan_Category": "Kategori Rencana",
+ "ID": "PENGENAL",
+ "Prev": "Sebelumnya",
+ "Internet_Plan": "Paket Internet",
+ "Generated_By": "Dihasilkan oleh",
+ "All_Users_Insights": "Semua Wawasan Pengguna",
+ "year": "tahun",
+ "month": "bulan",
+ "week": "pekan",
+ "day": "hari",
+ "hour": "jam",
+ "minute": "menit",
+ "second": "Kedua",
+ "Account_Type": "Jenis akun",
+ "Contact": "Kontak",
+ "Paid": "Dibayar",
+ "Personal": "Pribadi",
+ "Coordinates": "Koordinat",
+ "Confirm": "Mengonfirmasi",
+ "Name": "Nama",
+ "Plan": "Paket",
+ "Using": "Menggunakan",
+ "Total": "Total",
+ "Additional_Cost": "Biaya tambahan",
+ "Resend": "Kirim ulang",
+ "Login": "Masuk",
+ "success": "Sukses",
+ "Click_Here": "Klik disini",
+ "Your_friend_do_not_have_active_package": "Teman Anda tidak memiliki paket aktif",
+ "If_your_friend_have_Additional_Cost__you_will_pay_for_that_too": "Jika teman Anda memiliki Biaya Tambahan, Anda juga akan membayarnya",
+ "Select_Payment_Gateway": "Pilih Gerbang Pembayaran",
+ "Available_Payment_Gateway": "Gerbang Pembayaran yang Tersedia",
+ "Pay_Now": "Bayar sekarang",
+ "Notes": "Catatan",
+ "will_be_replaced_with_Customer_Name": "akan diganti dengan Nama Pelanggan",
+ "will_be_replaced_with_Customer_username": "akan diganti dengan nama pengguna Pelanggan",
+ "will_be_replaced_with_Package_name": "akan diganti dengan nama Paket",
+ "will_be_replaced_with_Package_price": "akan diganti dengan harga Paket",
+ "will_be_replaced_with_Expiration_date": "akan diganti dengan tanggal kedaluwarsa",
+ "additional_bills_for_customers": "tagihan tambahan untuk pelanggan",
+ "Your_Company_Name_at_Settings": "Nama Perusahaan Anda di Pengaturan",
+ "Your_Company_Address_at_Settings": "Alamat Perusahaan Anda di Pengaturan",
+ "Your_Company_Phone_at_Settings": "Telepon Perusahaan Anda di Pengaturan",
+ "Invoice_number": "Nomor faktur",
+ "Date_invoice_created": "Tanggal faktur dibuat",
+ "Payment_gateway_user_paid_from": "Pengguna gateway pembayaran membayar dari",
+ "Payment_channel_user_paid_from": "Pengguna saluran pembayaran membayar dari",
+ "is_Hotspot_or_PPPOE": "adalah Hotspot atau PPPOE",
+ "Internet_Package": "Paket Internet",
+ "Internet_Package_Prices": "Harga Paket Internet",
+ "Receiver_name": "Nama Penerima",
+ "Username_internet": "Nama pengguna internet",
+ "User_password": "Kata sandi pengguna",
+ "Transaction_datetime": "Tanggal waktu transaksi",
+ "Balance_Before": "Saldo Sebelumnya",
+ "Balance_After": "Saldo Setelahnya",
+ "For_Notes_by_admin": "Untuk Catatan oleh admin",
+ "how_much_balance_have_been_send": "berapa banyak saldo yang telah dikirim",
+ "Current_Balance": "Saldo saat ini",
+ "Sender_name": "Nama pengirim",
+ "Customer_Balance": "Saldo Pelanggan",
+ "Privacy_Policy": "Kebijakan pribadi",
+ "Terms_and_Conditions": "syarat dan Ketentuan",
+ "Disable_Registration": "Nonaktifkan Pendaftaran",
+ "Customer_just_Login_with_Phone_number_and_Voucher_Code__Voucher_will_be_password": "Pelanggan cukup Login dengan Nomor Telepon dan Kode Voucher, Voucher akan menjadi kata sandi",
+ "After_Customer_activate_voucher_or_login__customer_will_be_redirected_to_this_url": "Setelah Pelanggan mengaktifkan voucher atau login, Pelanggan akan diarahkan ke url ini",
+ "Extend_Postpaid_Expiration": "Perpanjang Masa Kedaluwarsa Pascabayar",
+ "Allow_Extend": "Izinkan Perpanjang",
+ "Extend_Days": "Perpanjang Hari",
+ "Confirmation_Message": "Pesan konfirmasi",
+ "Email_Notification": "pemberitahuan email",
+ "This_Token_will_act_as_SuperAdmin_Admin": "Token ini akan bertindak sebagai SuperAdmin\/Admin",
+ "Miscellaneous": "Aneka ragam",
+ "OTP_Required": "Diperlukan OTP",
+ "OTP_is_required_when_user_want_to_change_phone_number": "OTP diperlukan ketika pengguna ingin mengganti nomor telepon",
+ "OTP_Method": "Metode OTP",
+ "SMS": "SMS",
+ "WhatsApp": "Ada apa",
+ "SMS_and_WhatsApp": "SMS dan WhatsApp",
+ "The_method_which_OTP_will_be_sent_to_user": "Metode OTP yang akan dikirimkan ke pengguna"
}
\ No newline at end of file
From bf00b21786c0d5614523aabd398c4a5ad78336a7 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Sun, 21 Apr 2024 20:25:59 +0700
Subject: [PATCH 13/18] fix Lang
---
system/autoload/Lang.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/system/autoload/Lang.php b/system/autoload/Lang.php
index 385bb06a..46f101a8 100644
--- a/system/autoload/Lang.php
+++ b/system/autoload/Lang.php
@@ -11,7 +11,9 @@ class Lang
public static function T($key)
{
global $_L, $lan_file, $config;
- $_L = $_SESSION['Lang'];
+ if(is_array($_SESSION['Lang'])){
+ $_L = array_merge($_L, $_SESSION['Lang']);
+ }
$key = preg_replace('/\s+/', ' ', $key);
if (!empty($_L[$key])) {
return $_L[$key];
From 88bbf3ed35bc20dfd26b21ee87de554a1e5704b0 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum
Date: Sun, 21 Apr 2024 20:51:44 +0700
Subject: [PATCH 14/18] fix lang.php
---
system/controllers/home.php | 14 ++++++++------
system/lan/english.json | 4 +++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/system/controllers/home.php b/system/controllers/home.php
index f0fd4ee9..ecb6aaaa 100644
--- a/system/controllers/home.php
+++ b/system/controllers/home.php
@@ -142,12 +142,6 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
}
}
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']);
@@ -159,12 +153,20 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
Radius::customerAddPlan($c, $p, $tur['expiration'] . ' ' . $tur['time']);
} else {
if ($tur['type'] == 'Hotspot') {
+ Mikrotik::removeHotspotUser($client, $c['username']);
Mikrotik::addHotspotUser($client, $p, $c);
} else if ($tur['type'] == 'PPPOE') {
+ Mikrotik::removePpoeUser($client, $c['username']);
Mikrotik::addPpoeUser($client, $p, $c);
}
}
// make customer cannot extend again
+ $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);
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");
diff --git a/system/lan/english.json b/system/lan/english.json
index 7303ac9a..a545f759 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -575,5 +575,7 @@
"Extend_Postpaid_Expiration": "Extend Postpaid Expiration",
"Allow_Extend": "Allow Extend",
"Extend_Days": "Extend Days",
- "Confirmation_Message": "Confirmation Message"
+ "Confirmation_Message": "Confirmation Message",
+ "You_are_already_logged_in": "You are already logged in",
+ "Extend": "Extend"
}
\ No newline at end of file
From 964c141668ce8575050d455108c32ad4fdef6061 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 15/18] Update cron_reminder.php
From bebc20e39fbc12a4cc27cb01479d17056e0b4f55 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 16/18] Update cron_reminder.php
From 2d6fe9526c2fd7b78c87af9defa25f58b90bdc53 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 17/18] Update cron_reminder.php
From 961f4770c01c040e97477f0f946b3aa2fcb2475a Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:22:34 +0700
Subject: [PATCH 18/18] Update cron_reminder.php