hotspotbilling/phpnuxbill
1
1
Fork 0
mirror of https://github.com/hotspotbilling/phpnuxbill.git synced 2025-02-24 23:45:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #23 from hotspotbilling/Development

Browse source 
Fix Voucher search and Bring back Delete
This commit is contained in:
iBNu Maksum 2023-04-06 09:59:59 +07:00 committed by GitHub
commit 75f10ef50a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -2,7 +2,7 @@
"name": "hotspotbilling/phpnuxbill", "name": "hotspotbilling/phpnuxbill",
"type": "template", "type": "template",
"description": "PHPNuxBill a Hotspot Billing Software.", "description": "PHPNuxBill a Hotspot Billing Software.",
"keywords": ["template"], "keywords": ["template","PHPMixBill","PHPnuxBill","Mikrotik","Hotspot","Billing"],
"homepage": "https://github.com/hotspotbilling/phpnuxbill", "homepage": "https://github.com/hotspotbilling/phpnuxbill",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [

4
system/controllers/prepaid.php
View file

@ -36,6 +36,7 @@ switch ($action) {
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('cari', $username);
$ui->assign('paginator', $paginator); $ui->assign('paginator', $paginator);
run_hook('view_list_billing'); #HOOK run_hook('view_list_billing'); #HOOK
$ui->display('prepaid.tpl'); $ui->display('prepaid.tpl');
@ -367,7 +368,7 @@ switch ($action) {
$paginator = Paginator::bootstrap('tbl_voucher', 'code', '%' . $code . '%'); $paginator = Paginator::bootstrap('tbl_voucher', 'code', '%' . $code . '%');
$d = ORM::for_table('tbl_plans')->where('enabled', '1') $d = ORM::for_table('tbl_plans')->where('enabled', '1')
->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan')) ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
->where_like('tbl_plans.code', '%' . $code . '%') ->where_like('tbl_voucher.code', '%' . $code . '%')
->offset($paginator['startpoint']) ->offset($paginator['startpoint'])
->limit($paginator['limit']) ->limit($paginator['limit'])
->find_many(); ->find_many();
@ -380,6 +381,7 @@ switch ($action) {
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('_code', $code);
$ui->assign('paginator', $paginator); $ui->assign('paginator', $paginator);
run_hook('view_list_voucher'); #HOOK run_hook('view_list_voucher'); #HOOK
$ui->display('voucher.tpl'); $ui->display('voucher.tpl');

3
ui/ui/hotspot.tpl
View file

@ -50,7 +50,8 @@
<td>{$ds['validity']} {$ds['validity_unit']}</td> <td>{$ds['validity']} {$ds['validity_unit']}</td>
<td>{$ds['routers']}</td> <td>{$ds['routers']}</td>
<td> <td>
<a href="{$_url}services/edit/{$ds['id']}" class="btn btn-info btn-sm btn-block">{$_L['Edit']}</a> <a href="{$_url}services/edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
<a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}

2
ui/ui/pool.tpl
View file

@ -46,7 +46,7 @@
<td>{$ds['routers']}</td> <td>{$ds['routers']}</td>
<td align="center"> <td align="center">
<a href="{$_url}pool/edit/{$ds['id']}" <a href="{$_url}pool/edit/{$ds['id']}"
class="btn btn-warning btn-xs">{$_L['Edit']}</a> class="btn btn-info btn-xs">{$_L['Edit']}</a>
<a href="{$_url}pool/delete/{$ds['id']}" id="{$ds['id']}" <a href="{$_url}pool/delete/{$ds['id']}" id="{$ds['id']}"
class="btn btn-danger btn-xs">{$_L['Delete']}</a> class="btn btn-danger btn-xs">{$_L['Delete']}</a>
</td> </td>

3
ui/ui/pppoe.tpl
View file

@ -46,7 +46,8 @@
<td>{$ds['pool']}</td> <td>{$ds['pool']}</td>
<td>{$ds['routers']}</td> <td>{$ds['routers']}</td>
<td> <td>
<a href="{$_url}services/pppoe-edit/{$ds['id']}" class="btn btn-info btn-sm btn-block">{$_L['Edit']}</a> <a href="{$_url}services/pppoe-edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
<a href="{$_url}services/pppoe-delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}

4
ui/ui/prepaid.tpl
View file

@ -12,7 +12,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<span class="fa fa-search"></span> <span class="fa fa-search"></span>
</div> </div>
<input type="text" name="username" class="form-control" placeholder="{$_L['Search_by_Username']}..."> <input type="text" name="username" class="form-control" placeholder="{$_L['Search_by_Username']}..." value="{$cari}">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success">{$_L['Search']}</button> <button class="btn btn-success">{$_L['Search']}</button>
</div> </div>
@ -49,7 +49,7 @@
<td>{$ds['routers']}</td> <td>{$ds['routers']}</td>
<td> <td>
<a href="{$_url}prepaid/edit/{$ds['id']}" class="btn btn-warning btn-xs">{$_L['Edit']}</a> <a href="{$_url}prepaid/edit/{$ds['id']}" class="btn btn-warning btn-xs">{$_L['Edit']}</a>
{* <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a> *} <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}

3
ui/ui/routers.tpl
View file

@ -49,7 +49,8 @@
<td>{if $ds['enabled'] == 1}Enabled{else}Disabled{/if}</td> <td>{if $ds['enabled'] == 1}Enabled{else}Disabled{/if}</td>
<td> <td>
<a href="{$_url}routers/edit/{$ds['id']}" <a href="{$_url}routers/edit/{$ds['id']}"
class="btn btn-info btn-xs btn-block">{$_L['Edit']}</a> class="btn btn-info btn-xs">{$_L['Edit']}</a>
<a href="{$_url}routers/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}

2
ui/ui/voucher.tpl
View file

@ -13,7 +13,7 @@
<span class="fa fa-search"></span> <span class="fa fa-search"></span>
</div> </div>
<input type="text" name="code" class="form-control" <input type="text" name="code" class="form-control"
placeholder="{$_L['Search_by_Code']}..."> placeholder="{$_L['Search_by_Code']}..." value="{$_code}">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success">{$_L['Search']}</button> <button class="btn btn-success">{$_L['Search']}</button>
</div> </div>