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

Fix delete PPPOE

Browse Source
This commit is contained in:
Ibnu Maksum 2023-09-07 09:20:31 +07:00
parent 593ca31f18
commit 3833afb3be
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/autoload/Mikrotik.php
View File

@ -252,15 +252,12 @@ class Mikrotik
{ {
$printRequest = new RouterOS\Request('/ppp/secret/print'); $printRequest = new RouterOS\Request('/ppp/secret/print');
$printRequest->setArgument('.proplist', '.id'); //$printRequest->setArgument('.proplist', '.id');
$printRequest->setQuery(RouterOS\Query::where('name', $username)); $printRequest->setQuery(RouterOS\Query::where('name', $username));
$id = $client->sendSync($printRequest)->getProperty('.id'); $id = $client->sendSync($printRequest)->getProperty('.id');
$removeRequest = new RouterOS\Request('/ppp/secret/remove'); $removeRequest = new RouterOS\Request('/ppp/secret/remove');
$client( $removeRequest->setArgument('numbers', $id);
$removeRequest $client->sendSync($removeRequest);
->setArgument('numbers', $id)
);
} }
public static function addPpoeUser($client, $plan, $customer) public static function addPpoeUser($client, $plan, $customer)

8
system/controllers/customers.php
View File

@ -113,14 +113,14 @@ switch ($action) {
if ($c['type'] == 'Hotspot') { if ($c['type'] == 'Hotspot') {
if (!$config['radius_mode']) { if (!$config['radius_mode']) {
$client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
Mikrotik::removeHotspotUser($client, $c['username']); Mikrotik::removeHotspotActiveUser($client, $d['username']);
Mikrotik::removeHotspotActiveUser($client, $c['username']); Mikrotik::removeHotspotUser($client, $d['username']);
} }
} else { } else {
if (!$config['radius_mode']) { if (!$config['radius_mode']) {
$client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
Mikrotik::removePpoeUser($client, $c['username']); Mikrotik::removePpoeActive($client, $d['username']);
Mikrotik::removePpoeActive($client, $c['username']); Mikrotik::removePpoeUser($client, $d['username']);
} }
} }
try { try {

6
system/controllers/prepaid.php
View File

@ -146,14 +146,16 @@ switch ($action) {
if ($d['type'] == 'Hotspot') { if ($d['type'] == 'Hotspot') {
if (!$config['radius_mode']) { if (!$config['radius_mode']) {
$client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
Mikrotik::removeHotspotUser($client, $c['username']); Mikrotik::removeHotspotActiveUser($client, $d['username']);
Mikrotik::removeHotspotUser($client, $d['username']);
} }
$d->delete(); $d->delete();
} else { } else {
if (!$config['radius_mode']) { if (!$config['radius_mode']) {
$client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
Mikrotik::removePpoeUser($client, $c['username']); Mikrotik::removePpoeActive($client, $d['username']);
Mikrotik::removePpoeUser($client, $d['username']);
} }
$d->delete(); $d->delete();
} }

11
ui/ui/prepaid-edit.tpl
View File

@ -28,12 +28,15 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{$_L['Created_On']}</label> <label class="col-md-2 control-label">{$_L['Created_On']}</label>
<div class="col-md-6"> <div class="col-md-4">
<input type="date" class="form-control" id="recharged_on" name="recharged_on" readonly <input type="date" class="form-control" name="expiration" readonly
value="{$d['recharged_on']} {$d['recharged_time']}"> value="{$d['recharged_on']}">
</div>
<div class="col-md-2">
<input type="text" class="form-control" placeholder="00:00:00" readonly
value="{$d['recharged_time']}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

1
ui/ui/prepaid.tpl
View File

@ -53,6 +53,7 @@
<a href="{$_url}prepaid/edit/{$ds['id']}" <a href="{$_url}prepaid/edit/{$ds['id']}"
class="btn btn-warning btn-xs">{$_L['Edit']}</a> class="btn btn-warning btn-xs">{$_L['Edit']}</a>
<a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}" <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}"
onclick="return confirm('{$_L['Delete']}?')"
class="btn btn-danger btn-xs">{$_L['Delete']}</a> class="btn btn-danger btn-xs">{$_L['Delete']}</a>
</td> </td>
</tr> </tr>