hotspotbilling/phpnuxbill
1
1
Fork 0
mirror of https://github.com/hotspotbilling/phpnuxbill.git synced 2024-09-20 06:46:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

prepaid to plan file

Browse source
This commit is contained in:
Ibnu Maksum 2024-03-16 20:40:29 +07:00
parent 32943b40be
commit d31edde9d6
No known key found for this signature in database
GPG key ID: 7FC82848810579E5
28 changed files with 820 additions and 822 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,6 +2,11 @@
# CHANGELOG
## 2024.3.16
- Fix Zero Charging
- Fix Disconnect Customer from Radius without loop by @Gerandonk
## 2024.3.15
- Fix Customer View to list active Plan

6
system/controllers/customers.php
View file

@ -107,13 +107,13 @@ switch ($action) {
list($bills, $add_cost) = User::getBills($id_customer);
if ($using == 'balance' && $config['enable_balance'] == 'yes') {
if (!$cust) {
r2(U . 'prepaid/recharge', 'e', Lang::T('Customer not found'));
r2(U . 'plan/recharge', 'e', Lang::T('Customer not found'));
}
if (!$plan) {
r2(U . 'prepaid/recharge', 'e', Lang::T('Plan not found'));
r2(U . 'plan/recharge', 'e', Lang::T('Plan not found'));
}
if ($cust['balance'] < ($plan['price'] + $add_cost)) {
r2(U . 'prepaid/recharge', 'e', Lang::T('insufficient balance'));
r2(U . 'plan/recharge', 'e', Lang::T('insufficient balance'));
}
$gateway = 'Recharge Balance';
}

1516
system/controllers/prepaid.php → system/controllers/plan.php
View file

File diff suppressed because it is too large Load diff

3
system/lan/english.json
View file

@ -100,9 +100,6 @@
"Add_Pool": "Add Pool",
"Edit_Pool": "Edit Pool",
"Pool_Name_Already_Exist": "Pool Name Already Exist",
"Prepaid": "Prepaid",
"Prepaid_Users": "Prepaid Users",
"Prepaid_Vouchers": "Prepaid Vouchers",
"Refill_Account": "Refill Account",
"Recharge_Account": "Recharge Account",
"Select_Account": "Select Account",

3
system/lan/indonesia.json
View file

@ -100,9 +100,6 @@
"Add_Pool": "Tambahkan Pool",
"Edit_Pool": "Sunting Pool",
"Pool_Name_Already_Exist": "Nama Pool Sudah Ada",
"Prepaid": "Prabayar",
"Prepaid_Users": "Pengguna Prabayar",
"Prepaid_Vouchers": "Voucher Prabayar",
"Refill_Account": "Isi Ulang Akun",
"Recharge_Account": "Isi Ulang Akun",
"Select_Account": "Pilih Akun",

3
system/lan/spanish.json
View file

@ -100,9 +100,6 @@
"Add_Pool": "Agregar Pool",
"Edit_Pool": "Editar Pool",
"Pool_Name_Already_Exist": "Nombre del Pool ya existe",
"Prepaid": "Prepago",
"Prepaid_Users": "Usuarios prepago",
"Prepaid_Vouchers": "Fichas prepago",
"Refill_Account": "Recargar Ficha",
"Recharge_Account": "Recargar Cuenta",
"Select_Account": "Seleccionar cuenta",

3
system/lan/turkish.json
View file

@ -96,9 +96,6 @@
"Add_Pool": "Havuz ekle",
"Edit_Pool": "Havuzu D\u00fczenle",
"Pool_Name_Already_Exist": "Havuz Ad\u0131 \u200b\u200bZaten Var",
"Prepaid": "\u00d6n \u00d6demeli",
"Prepaid_Users": "\u00d6n \u00d6demeli Kullan\u0131c\u0131lar",
"Prepaid_Vouchers": "\u00d6n \u00d6demeli Kuponlar",
"Refill_Account": "Hesab\u0131 Yenile",
"Recharge_Account": "Hesab\u0131 Yeniden \u015earj Et",
"Select_Account": "Hesap Se\u00e7",

16
ui/lib/c/prepaid.js → ui/lib/c/plan.js
View file

@ -1,9 +1,9 @@
$(document).on("click", ".cdelete", function(e) {
e.preventDefault();
var id = this.id;
bootbox.confirm("Are you sure?", function(result) {
if(result){
window.location.href = "index.php?_route=prepaid/delete/" + id;
}
});
$(document).on("click", ".cdelete", function(e) {
e.preventDefault();
var id = this.id;
bootbox.confirm("Are you sure?", function(result) {
if(result){
window.location.href = "index.php?_route=plan/delete/" + id;
}
});
});

2
ui/lib/c/voucher.js
View file

@ -3,7 +3,7 @@
var id = this.id;
bootbox.confirm("Are you sure?", function(result) {
if(result){
window.location.href = "index.php?_route=prepaid/voucher-delete/" + id;
window.location.href = "index.php?_route=plan/voucher-delete/" + id;
}
});
});

7
ui/ui/autoload.tpl
View file

@ -1,4 +1,9 @@
<option value="">Select Plans</option>
{foreach $d as $ds}
<option value="{$ds['id']}">{if $ds['enabled'] neq 1}DISABLED PLAN &bull; {/if}{$ds['name_plan']} &bull; {Lang::moneyFormat($ds['price'])}{if $ds['prepaid'] neq 'yes'} &bull; POSTPAID {/if}</option>
<option value="{$ds['id']}">
{if $ds['enabled'] neq 1}DISABLED PLAN &bull; {/if}
{$ds['name_plan']} &bull;
{Lang::moneyFormat($ds['price'])}
{if $ds['prepaid'] neq 'yes'} &bull; POSTPAID {/if}
</option>
{/foreach}

2
ui/ui/customers-view.tpl
View file

@ -160,7 +160,7 @@
</thead>
<tbody>
{foreach $activation as $ds}
<tr onclick="window.location.href = '{$_url}prepaid/view/{$ds['id']}'" style="cursor:pointer;">
<tr onclick="window.location.href = '{$_url}plan/view/{$ds['id']}'" style="cursor:pointer;">
<td>{$ds['invoice']}</td>
<td>{$ds['username']}</td>
<td>{$ds['plan_name']}</td>

2
ui/ui/customers.tpl
View file

@ -65,7 +65,7 @@
<td align="center">
<a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
<a href="{$_url}prepaid/recharge/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
<a href="{$_url}plan/recharge/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
class="btn btn-primary btn-xs">{Lang::T('Recharge')}</a>
</td>
</tr>

2
ui/ui/dashboard.tpl
View file

@ -41,7 +41,7 @@
<div class="icon">
<i class="ion ion-person"></i>
</div>
<a href="{$_url}prepaid/list" class="small-box-footer">{Lang::T('View All')} <i
<a href="{$_url}plan/list" class="small-box-footer">{Lang::T('View All')} <i
class="fa fa-arrow-circle-right"></i></a>
</div>
</div>

2
ui/ui/deposit.tpl
View file

@ -5,7 +5,7 @@
<div class="panel panel-primary panel-hovered panel-stacked mb30">
<div class="panel-heading">{Lang::T('Refill Balance')}</div>
<div class="panel-body">
<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/deposit-post">
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/deposit-post">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Select Account')}</label>
<div class="col-md-6">

2
ui/ui/invoice-customer.tpl
View file

@ -5,7 +5,7 @@
<div class="panel panel-hovered panel-primary panel-stacked mb30">
<div class="panel-heading">{$in['invoice']}</div>
<div class="panel-body">
<form class="form-horizontal" method="post" action="{$_url}prepaid/print" target="_blank">
<form class="form-horizontal" method="post" action="{$_url}plan/print" target="_blank">
<pre id="content">{$invoice}</pre>
<input type="hidden" name="id" value="{$in['id']}">
<a href="{$_url}voucher/list-activated" class="btn btn-default btn-sm"><i

6
ui/ui/invoice.tpl
View file

@ -5,16 +5,16 @@
<div class="panel panel-hovered panel-primary panel-stacked mb30">
<div class="panel-heading">{$in['invoice']}</div>
<div class="panel-body">
<form class="form-horizontal" method="post" action="{$_url}prepaid/print" target="_blank">
<form class="form-horizontal" method="post" action="{$_url}plan/print" target="_blank">
<pre id="content"></pre>
<textarea class="hidden" id="formcontent" name="content">{$invoice}</textarea>
<input type="hidden" name="id" value="{$in['id']}">
<a href="{$_url}prepaid/list" class="btn btn-default btn-sm"><i
<a href="{$_url}plan/list" class="btn btn-default btn-sm"><i
class="ion-reply-all"></i>{Lang::T('Finish')}</a>
<a href="https://api.whatsapp.com/send/?text={$whatsapp}" target="_blank"
class="btn btn-primary btn-sm">
<i class="glyphicon glyphicon-share"></i> WhatsApp</a>
<a href="{$_url}prepaid/view/{$in['id']}/send" class="btn btn-info text-black btn-sm"><i
<a href="{$_url}plan/view/{$in['id']}/send" class="btn btn-info text-black btn-sm"><i
class="glyphicon glyphicon-envelope"></i> {Lang::T("Resend")}</a>
<button type="submit" class="btn btn-info text-black btn-sm"><i class="glyphicon glyphicon-print"></i>
Print</button>

4
ui/ui/prepaid-edit.tpl → ui/ui/plan-edit.tpl
View file

@ -7,7 +7,7 @@
<h3 class="panel-title">Edit Plan</h3>
</div>
<div class="panel-body">
<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/edit-post">
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/edit-post">
<input type="hidden" name="id" value="{$d['id']}">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Select Account')}</label>
@ -56,7 +56,7 @@
<div class="col-lg-offset-2 col-lg-10">
<button class="btn btn-success"
type="submit">{Lang::T('Edit')}</button>
Or <a href="{$_url}prepaid/list">{Lang::T('Cancel')}</a>
Or <a href="{$_url}plan/list">{Lang::T('Cancel')}</a>
</div>
</div>
</form>

10
ui/ui/prepaid.tpl → ui/ui/plan.tpl
View file

@ -6,7 +6,7 @@
<div class="panel-heading">
{if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
<div class="btn-group pull-right">
<a class="btn btn-primary btn-xs" title="save" href="{$_url}prepaid/sync"
<a class="btn btn-primary btn-xs" title="save" href="{$_url}plan/sync"
onclick="return confirm('This will sync/send Caustomer active plan to Mikrotik?')"><span
class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
</div>
@ -21,7 +21,7 @@
<div class="panel-body">
<div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
<div class="col-md-8">
<form id="site-search" method="post" action="{$_url}prepaid/list/">
<form id="site-search" method="post" action="{$_url}plan/list/">
<div class="input-group">
<div class="input-group-addon">
<span class="fa fa-search"></span>
@ -35,7 +35,7 @@
</form>
</div>
<div class="col-md-4">
<a href="{$_url}prepaid/recharge" class="btn btn-primary btn-block"><i
<a href="{$_url}plan/recharge" class="btn btn-primary btn-block"><i
class="ion ion-android-add"> </i> {Lang::T('Recharge Account')}</a>
</div>&nbsp;
</div>
@ -64,10 +64,10 @@
<td>{$ds['method']}</td>
<td>{$ds['routers']}</td>
<td>
<a href="{$_url}prepaid/edit/{$ds['id']}"
<a href="{$_url}plan/edit/{$ds['id']}"
class="btn btn-warning btn-xs">{Lang::T('Edit')}</a>
{if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
<a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}"
<a href="{$_url}plan/delete/{$ds['id']}" id="{$ds['id']}"
onclick="return confirm('{Lang::T('Delete')}?')"
class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
{/if}

2
ui/ui/print-voucher.tpl
View file

@ -60,7 +60,7 @@
<body>
<page size="A4">
<form method="post" action="{$_url}prepaid/print-voucher/" class="no-print">
<form method="post" action="{$_url}plan/print-voucher/" class="no-print">
<table width="100%" border="0" cellspacing="0" cellpadding="1" class="btn btn-default btn-sm">
<tr>
<td>From ID &gt; <input type="text" name="from_id" style="width:40px" value="{$from_id}"> limit

4
ui/ui/recharge-confirm.tpl
View file

@ -76,14 +76,14 @@
</li>
{/if}
</ul>
<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/recharge-post">
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/recharge-post">
<input type="hidden" name="id_customer" value="{$cust['id']}">
<input type="hidden" name="plan" value="{$plan['id']}">
<input type="hidden" name="server" value="{$server}">
<input type="hidden" name="using" value="{$using}">
<center>
<button class="btn btn-success" type="submit">{Lang::T('Recharge')}</button><br>
<a class="btn btn-link" href="{$_url}prepaid/recharge">{Lang::T('Cancel')}</a>
<a class="btn btn-link" href="{$_url}plan/recharge">{Lang::T('Cancel')}</a>
</center>
</form>
</div>

2
ui/ui/recharge.tpl
View file

@ -5,7 +5,7 @@
<div class="panel panel-primary panel-hovered panel-stacked mb30">
<div class="panel-heading">{Lang::T('Recharge Account')}</div>
<div class="panel-body">
<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/recharge-confirm">
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/recharge-confirm">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Select Account')}</label>
<div class="col-md-6">

2
ui/ui/refill.tpl
View file

@ -5,7 +5,7 @@
<div class="panel panel-primary panel-hovered panel-stacked mb30">
<div class="panel-heading">{Lang::T('Refill Account')}</div>
<div class="panel-body">
<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/refill-post">
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/refill-post">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Select Account')}</label>
<div class="col-md-6">

2
ui/ui/reports-activation.tpl
View file

@ -44,7 +44,7 @@
<tbody>
{foreach $activation as $ds}
<tr>
<td onclick="window.location.href = '{$_url}prepaid/view/{$ds['id']}'"
<td onclick="window.location.href = '{$_url}plan/view/{$ds['id']}'"
style="cursor:pointer;">{$ds['invoice']}</td>
<td onclick="window.location.href = '{$_url}customers/viewu/{$ds['username']}'"
style="cursor:pointer;">{$ds['username']}</td>

12
ui/ui/sections/header.tpl
View file

@ -165,7 +165,7 @@
</a>
</li>
{$_MENU_AFTER_CUSTOMERS}
<li class="{if $_system_menu eq 'prepaid'}active{/if} treeview">
<li class="{if $_system_menu eq 'plan'}active{/if} treeview">
<a href="#">
<i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
<span class="pull-right-container">
@ -174,18 +174,18 @@
</a>
<ul class="treeview-menu">
<li {if $_routes[1] eq 'list'}class="active" {/if}><a
href="{$_url}prepaid/list">{Lang::T('Active Users')}</a></li>
href="{$_url}plan/list">{Lang::T('Active Users')}</a></li>
{if $_c['disable_voucher'] != 'yes'}
<li {if $_routes[1] eq 'voucher'}class="active" {/if}><a
href="{$_url}prepaid/voucher">{Lang::T('Vouchers')}</a></li>
href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
<li {if $_routes[1] eq 'refill'}class="active" {/if}><a
href="{$_url}prepaid/refill">{Lang::T('Refill Customer')}</a></li>
href="{$_url}plan/refill">{Lang::T('Refill Customer')}</a></li>
{/if}
<li {if $_routes[1] eq 'recharge'}class="active" {/if}><a
href="{$_url}prepaid/recharge">{Lang::T('Recharge Customer')}</a></li>
href="{$_url}plan/recharge">{Lang::T('Recharge Customer')}</a></li>
{if $_c['enable_balance'] == 'yes'}
<li {if $_routes[1] eq 'deposit'}class="active" {/if}><a
href="{$_url}prepaid/deposit">{Lang::T('Refill Balance')}</a></li>
href="{$_url}plan/deposit">{Lang::T('Refill Balance')}</a></li>
{/if}
{$_MENU_SERVICES}
</ul>

2
ui/ui/voucher-add.tpl
View file

@ -7,7 +7,7 @@
<div class="panel-heading">{Lang::T('Add Vouchers')}</div>
<div class="panel-body">
<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/voucher-post">
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/voucher-post">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Type')}</label>
<div class="col-md-6">

4
ui/ui/voucher-view.tpl
View file

@ -4,11 +4,11 @@
<div class="col-md-6 col-sm-12 col-md-offset-3">
<div class="panel panel-hovered panel-primary panel-stacked mb30">
<div class="panel-body">
<form class="form-horizontal" method="post" action="{$_url}prepaid/print" target="_blank">
<form class="form-horizontal" method="post" action="{$_url}plan/print" target="_blank">
<pre id="content"></pre>
<textarea class="hidden" id="formcontent" name="content">{$print}</textarea>
<input type="hidden" name="id" value="{$in['id']}">
<a href="{$_url}prepaid/voucher" class="btn btn-default btn-sm"><i
<a href="{$_url}plan/voucher" class="btn btn-default btn-sm"><i
class="ion-reply-all"></i>{Lang::T('Finish')}</a>
<a href="https://api.whatsapp.com/send/?text={$whatsapp}" target="_blank"
class="btn btn-primary btn-sm">

16
ui/ui/voucher.tpl
View file

@ -6,7 +6,7 @@
<div class="panel-heading">
{if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
<div class="btn-group pull-right">
<a class="btn btn-danger btn-xs" title="Remove used Voucher" href="{$_url}prepaid/remove-voucher"
<a class="btn btn-danger btn-xs" title="Remove used Voucher" href="{$_url}plan/remove-voucher"
onclick="return confirm('Delete all used voucher code?')"><span
class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete All</a>
</div>
@ -16,7 +16,7 @@
<div class="panel-body">
<div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
<div class="col-md-8">
<form id="site-search" method="post" action="{$_url}prepaid/voucher/">
<form id="site-search" method="post" action="{$_url}plan/voucher/">
<div class="input-group">
<div class="input-group-addon">
<span class="fa fa-search"></span>
@ -32,11 +32,11 @@
<div class="col-md-4">
<div class="btn-group btn-group-justified" role="group">
<div class="btn-group" role="group">
<a href="{$_url}prepaid/add-voucher" class="btn btn-primary btn-block"><i
<a href="{$_url}plan/add-voucher" class="btn btn-primary btn-block"><i
class="ion ion-android-add"> </i> {Lang::T('Add Vouchers')}</a>
</div>
<div class="btn-group" role="group">
<a href="{$_url}prepaid/print-voucher" target="print_voucher" class="btn btn-info"><i
<a href="{$_url}plan/print-voucher" target="print_voucher" class="btn btn-info"><i
class="ion ion-android-print"> </i> Print</a>
</div>
</div>
@ -82,12 +82,12 @@
</td>
<td>
{if $ds['status'] neq '1'}
<a href="{$_url}prepaid/voucher-view/{$ds['id']}" id="{$ds['id']}"
<a href="{$_url}plan/voucher-view/{$ds['id']}" id="{$ds['id']}"
style="margin: 0px;"
class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
{/if}
{if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
<a href="{$_url}prepaid/voucher-delete/{$ds['id']}" id="{$ds['id']}"
<a href="{$_url}plan/voucher-delete/{$ds['id']}" id="{$ds['id']}"
class="btn btn-danger btn-xs"
onclick="return confirm('{Lang::T('Delete')}?')"><i
class="glyphicon glyphicon-trash"></i></a>
@ -101,10 +101,10 @@
<ul class="pagination pagination-sm">
{if $page>0}
<li><a href="{$_url}prepaid/voucher&p={$page-1}&code={$_code}">{Lang::T('Prev')}</a></li>
<li><a href="{$_url}plan/voucher&p={$page-1}&code={$_code}">{Lang::T('Prev')}</a></li>
{/if}
{if $d}
<li><a href="{$_url}prepaid/voucher&p={$page+1}&code={$_code}">{Lang::T('Next')}</a></li>
<li><a href="{$_url}plan/voucher&p={$page+1}&code={$_code}">{Lang::T('Next')}</a></li>
{/if}
</ul>
</div>

2
version.json
View file

@ -1,3 +1,3 @@
{
"version": "2024.3.15"
"version": "2024.3.16"
}