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

fix wrong variable

Browse Source
This commit is contained in:
Ibnu Maksum 2024-06-21 09:44:49 +07:00
parent 628fcda360
commit d11b2a75ef
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
7 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
system/controllers/customers.php
View File

@ -213,11 +213,12 @@ switch ($action) {
$p = ORM::for_table('tbl_plans')->where('id', $b['plan_id'])->find_one(); $p = ORM::for_table('tbl_plans')->where('id', $b['plan_id'])->find_one();
if ($p) { if ($p) {
$p = ORM::for_table('tbl_plans')->where('id', $c['plan_id'])->find_one(); $p = ORM::for_table('tbl_plans')->where('id', $c['plan_id'])->find_one();
$c = User::_info($id_customer);
$dvc = Package::getDevice($p); $dvc = Package::getDevice($p);
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {
require_once $dvc; require_once $dvc;
(new $p['device'])->change_customer($c, $p); (new $p['device'])->remove_customer($c, $p);
} else { } else {
new Exception(Lang::T("Devices Not Found")); new Exception(Lang::T("Devices Not Found"));
} }
@ -240,7 +241,7 @@ switch ($action) {
$routers = []; $routers = [];
foreach ($bs as $b) { foreach ($bs as $b) {
$c = ORM::for_table('tbl_customers')->find_one($id_customer); $c = ORM::for_table('tbl_customers')->find_one($id_customer);
$p = ORM::for_table('tbl_plans')->where('id', $b['plan_id'])->where('enabled', '1')->find_one(); $p = ORM::for_table('tbl_plans')->where('id', $b['plan_id'])->find_one();
if ($p) { if ($p) {
$routers[] = $b['routers']; $routers[] = $b['routers'];
$dvc = Package::getDevice($p); $dvc = Package::getDevice($p);
@ -325,33 +326,33 @@ switch ($action) {
} }
$id = $routes['2']; $id = $routes['2'];
run_hook('delete_customer'); #HOOK run_hook('delete_customer'); #HOOK
$d = ORM::for_table('tbl_customers')->find_one($id); $c = ORM::for_table('tbl_customers')->find_one($id);
if ($d) { if ($c) {
// Delete the associated Customers Attributes records from tbl_customer_custom_fields table // Delete the associated Customers Attributes records from tbl_customer_custom_fields table
ORM::for_table('tbl_customers_fields')->where('customer_id', $id)->delete_many(); ORM::for_table('tbl_customers_fields')->where('customer_id', $id)->delete_many();
$c = ORM::for_table('tbl_user_recharges')->where('username', $d['username'])->find_one(); //Delete active package
if ($c) { $turs = ORM::for_table('tbl_user_recharges')->where('username', $c['username'])->find_one();
$p = ORM::for_table('tbl_plans')->find_one($c['plan_id']); foreach($turs as $tur){
$p = ORM::for_table('tbl_plans')->find_one($tur['plan_id']);
if ($p) { if ($p) {
$dvc = Package::getDevice($p); $dvc = Package::getDevice($p);
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {
require_once $dvc; require_once $dvc;
(new $p['device'])->remove_customer($d, $p); (new $p['device'])->remove_customer($c, $p);
} else { } else {
new Exception(Lang::T("Devices Not Found")); new Exception(Lang::T("Devices Not Found"));
} }
} }
} }
try { try {
$c->delete(); $tur->delete();
} catch (Exception $e) { } catch (Exception $e) {
} }
} }
try { try {
$d->delete(); $c->delete();
} catch (Exception $e) { } catch (Exception $e) {
} catch (Throwable $e) {
} }
r2(U . 'customers/list', 's', Lang::T('User deleted Successfully')); r2(U . 'customers/list', 's', Lang::T('User deleted Successfully'));
} }

1
system/controllers/plan.php
View File

@ -269,6 +269,7 @@ switch ($action) {
if ($d) { if ($d) {
run_hook('delete_customer_active_plan'); #HOOK run_hook('delete_customer_active_plan'); #HOOK
$p = ORM::for_table('tbl_plans')->find_one($d['plan_id']); $p = ORM::for_table('tbl_plans')->find_one($d['plan_id']);
$c = User::_info($d['customer_id']);
$dvc = Package::getDevice($p); $dvc = Package::getDevice($p);
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {

12
system/controllers/services.php
View File

@ -135,7 +135,7 @@ switch ($action) {
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {
require_once $dvc; require_once $dvc;
(new $p['device'])->remove_plan($d); (new $d['device'])->remove_plan($d);
} else { } else {
new Exception(Lang::T("Devices Not Found")); new Exception(Lang::T("Devices Not Found"));
} }
@ -222,7 +222,7 @@ switch ($action) {
} }
$d->expired_date = $expired_date; $d->expired_date = $expired_date;
} else { } else {
$d->expired_date = 0; $d->expired_date = 20;
} }
$d->save(); $d->save();
@ -230,7 +230,7 @@ switch ($action) {
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {
require_once $dvc; require_once $dvc;
(new $p['device'])->add_plan($d); (new $d['device'])->add_plan($d);
} else { } else {
new Exception(Lang::T("Devices Not Found")); new Exception(Lang::T("Devices Not Found"));
} }
@ -324,7 +324,7 @@ switch ($action) {
} }
$d->expired_date = $expired_date; $d->expired_date = $expired_date;
} else { } else {
$d->expired_date = 0; $d->expired_date = 20;
} }
$d->save(); $d->save();
@ -437,7 +437,7 @@ switch ($action) {
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {
require_once $dvc; require_once $dvc;
(new $p['device'])->remove_plan($d); (new $d['device'])->remove_plan($d);
} else { } else {
new Exception(Lang::T("Devices Not Found")); new Exception(Lang::T("Devices Not Found"));
} }
@ -537,7 +537,7 @@ switch ($action) {
if ($_app_stage != 'demo') { if ($_app_stage != 'demo') {
if (file_exists($dvc)) { if (file_exists($dvc)) {
require_once $dvc; require_once $dvc;
(new $p['device'])->add_plan($d); (new $d['device'])->add_plan($d);
} else { } else {
new Exception(Lang::T("Devices Not Found")); new Exception(Lang::T("Devices Not Found"));
} }

2
ui/ui/hotspot-add.tpl
View File

@ -45,7 +45,7 @@
<label class="col-md-2 control-label">Radius <label class="col-md-2 control-label">Radius
<a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover" <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
data-trigger="focus" data-container="body" data-trigger="focus" data-container="body"
data-content="If you enable Radius, choose device to radius, except if you have custome device">?</a> data-content="If you enable Radius, choose device to radius, except if you have custom device. *This option will be deleted and replaced by Device">?</a>
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<label class="radio-inline"> <label class="radio-inline">

9
ui/ui/hotspot-edit.tpl
View File

@ -51,7 +51,7 @@
<label class="col-md-2 control-label">Radius <label class="col-md-2 control-label">Radius
<a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover" <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
data-trigger="focus" data-container="body" data-trigger="focus" data-container="body"
data-content="If you enable Radius, choose device to radius, except if you have custome device">?</a> data-content="If you enable Radius, choose device to radius, except if you have custom device. *This option will be deleted and replaced by Device">?</a>
</label> </label>
<div class="col-md-10"> <div class="col-md-10">
<label class="label label-primary">RADIUS</label> <label class="label label-primary">RADIUS</label>
@ -102,7 +102,7 @@
</div> </div>
</div> </div>
</div> </div>
<div {if $d['typebp'] eq 'Unlimited'} style="display:none;" <div {if $d['typebp'] eq 'Unlimited'} style="display:none;"
{elseif ($d['time_limit']) eq '0'} {elseif ($d['time_limit']) eq '0'}
style="display:none;" {/if} id="TimeLimit"> style="display:none;" {/if} id="TimeLimit">
<div class="form-group"> <div class="form-group">
@ -121,7 +121,7 @@
</div> </div>
</div> </div>
</div> </div>
<div {if $d['typebp'] eq 'Unlimited'} style="display:none;" <div {if $d['typebp'] eq 'Unlimited'} style="display:none;"
{elseif ($d['data_limit']) eq '0'} {elseif ($d['data_limit']) eq '0'}
style="display:none;" {/if} id="DataLimit"> style="display:none;" {/if} id="DataLimit">
<div class="form-group"> <div class="form-group">
@ -214,7 +214,8 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input type="number" class="form-control" name="expired_date" maxlength="2" <input type="number" class="form-control" name="expired_date" maxlength="2"
value="{$d['expired_date']}" min="1" max="28" step="1"> value="{if $d['expired_date']}{$d['expired_date']}{else}20{/if}" min="1" max="28"
step="1">
</div> </div>
</div> </div>
<span id="routerChoose" class="{if $d['is_radius']}hidden{/if}"> <span id="routerChoose" class="{if $d['is_radius']}hidden{/if}">

2
ui/ui/pppoe-add.tpl
View File

@ -44,7 +44,7 @@
<label class="col-md-2 control-label">Radius <label class="col-md-2 control-label">Radius
<a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover" <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
data-trigger="focus" data-container="body" data-trigger="focus" data-container="body"
data-content="If you enable Radius, choose device to radius, except if you have custome device">?</a> data-content="If you enable Radius, choose device to radius, except if you have custom device. *This option will be deleted and replaced by Device">?</a>
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan <input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan

5
ui/ui/pppoe-edit.tpl
View File

@ -51,7 +51,7 @@
<label class="col-md-2 control-label">Radius <label class="col-md-2 control-label">Radius
<a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover" <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
data-trigger="focus" data-container="body" data-trigger="focus" data-container="body"
data-content="If you enable Radius, choose device to radius, except if you have custome device">?</a> data-content="If you enable Radius, choose device to radius, except if you have custom device. *This option will be deleted and replaced by Device">?</a>
</label> </label>
<div class="col-md-10"> <div class="col-md-10">
<label class="label label-primary">RADIUS</label> <label class="label label-primary">RADIUS</label>
@ -144,7 +144,8 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input type="number" class="form-control" name="expired_date" maxlength="2" <input type="number" class="form-control" name="expired_date" maxlength="2"
value="{$d['expired_date']}" min="1" max="28" step="1"> value="{if $d['expired_date']}{$d['expired_date']}{else}20{/if}" min="1" max="28"
step="1">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">