kevinowino869/mitrobill
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Development'

Browse Source
This commit is contained in:
Ibnu Maksum 2024-06-23 12:05:41 +07:00
commit 788dffbdf6
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
7 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/autoload/Package.php
View File

@ -546,6 +546,12 @@ class Package
public static function getDevice($plan)
{
global $DEVICE_PATH;
if($plan === false){
return "none";
}
if(!isset($plan['device'])){
return "none";
}
if (!empty($plan['device'])) {
return $DEVICE_PATH . DIRECTORY_SEPARATOR . $plan['device'] . '.php';
}

8
system/controllers/bandwidth.php
View File

@ -93,8 +93,8 @@ switch ($action) {
};
}
$msg = '';
if (Validator::Length($name, 16, 4) == false) {
$msg .= 'Name should be between 5 to 15 characters' . '<br>';
if (Validator::Length($name, 256, 0) == false) {
$msg .= 'Name should be between 1 to 255 characters' . '<br>';
}
if ($rate_down_unit == 'Kbps') {
@ -152,8 +152,8 @@ switch ($action) {
};
}
$msg = '';
if (Validator::Length($name, 16, 4) == false) {
$msg .= 'Name should be between 5 to 15 characters' . '<br>';
if (Validator::Length($name, 256, 0) == false) {
$msg .= 'Name should be between 1 to 255 characters' . '<br>';
}
$id = _post('id');

8
system/devices/MikrotikHotspot.php
View File

@ -27,8 +27,8 @@ class MikrotikHotspot
$mikrotik = $this->info($plan['routers']);
$client = $this->getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
if (!empty($plan['plan_expired'])) {
$p = ORM::for_table("tbl_plans")->select("name_plan")->find_one($plan['plan_expired']);
$this->setHotspotUserPackage($client, $customer['username'], $p['name_plan']);
$p = ORM::for_table("tbl_plans")->find_one($plan['plan_expired']);
$this->add_customer($customer, $p);
} else {
$this->removeHotspotUser($client, $customer['username']);
}
@ -280,7 +280,7 @@ class MikrotikHotspot
$client->sendSync($setRequest);
}
function setHotspotUserPackage($client, $user, $plan_name)
function setHotspotUserPackage($client, $username, $plan_name)
{
global $_app_stage;
if ($_app_stage == 'demo') {
@ -288,7 +288,7 @@ class MikrotikHotspot
}
$printRequest = new RouterOS\Request('/ip/hotspot/user/print');
$printRequest->setArgument('.proplist', '.id');
$printRequest->setQuery(RouterOS\Query::where('name', $user));
$printRequest->setQuery(RouterOS\Query::where('name', $username));
$id = $client->sendSync($printRequest)->getProperty('.id');
$setRequest = new RouterOS\Request('/ip/hotspot/user/set');

4
system/devices/MikrotikPppoe.php
View File

@ -27,8 +27,8 @@ class MikrotikPppoe
$mikrotik = $this->info($plan['routers']);
$client = $this->getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
if (!empty($plan['plan_expired'])) {
$p = ORM::for_table("tbl_plans")->select("name_plan")->find_one($plan['plan_expired']);
$this->setPpoeUserPlan($client, $customer['username'], $p['plan_expired']);
$p = ORM::for_table("tbl_plans")->find_one($plan['plan_expired']);
$this->add_customer($customer, $p);
} else {
$this->removePpoeUser($client, $customer['username']);
}

4
system/devices/Radius.php
View File

@ -18,9 +18,9 @@ class Radius {
function remove_customer($customer, $plan)
{
if (empty($plan['plan_expired'])) {
if (!empty($plan['plan_expired'])) {
$p = ORM::for_table("tbl_plans")->find_one($plan['plan_expired']);
$this->customerAddPlan($customer, $plan);
$this->customerAddPlan($customer, $p);
} else {
$this->customerDeactivate($customer['username'], true);
}

7
system/lan/indonesia.json
View File

@ -522,5 +522,10 @@
"Ascending": "Naik",
"Descending": "Menurun",
"Query": "Query",
"Add": "Menambahkan"
"Add": "Menambahkan",
"Logout_Successful": "Logout Berhasil",
"warning": "peringatan",
"Created___Expired": "Dibuat \/ Kedaluwarsa",
"Login___Activate_Voucher": "Masuk \/ Aktifkan Voucher",
"Voucher_activation_success__now_you_can_login": "Aktivasi voucher berhasil, sekarang Anda dapat login"
}

6
ui/ui/plan.tpl
View File

@ -86,7 +86,11 @@
{foreach $d as $ds}
<tr {if $ds['status']=='off'}class="danger" {/if}>
<td><a href="{$_url}customers/viewu/{$ds['username']}">{$ds['username']}</a></td>
<td>{$ds['namebp']}</td>
{if $ds['type'] == 'Hotspot'}
<td><a href="{$_url}services/edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
{else}
<td><a href="{$_url}services/pppoe-edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
{/if}
<td>{$ds['type']}</td>
<td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
<td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>