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

Merge branch 'hotspotbilling:master' into master

Browse Source
This commit is contained in:
Focuslinkstech 2024-01-14 15:32:43 +01:00 committed by GitHub
commit 7e0e09f9bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 57 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 # CHANGELOG
## 2024.1.11
- Add Plan only for admin by @Focuslinkstech
- Fix Plugin Manager
## 2024.1.9 ## 2024.1.9
- Add Prefix when generate Voucher - Add Prefix when generate Voucher

1
system/lan/english/common.lan.php
View File

@ -419,3 +419,4 @@ $_L['Login__Activate_Voucher'] = 'Login / Activate Voucher';
$_L['After_Customer_activate_voucher_or_login_customer_will_be_redirected_to_this_url'] = 'After Customer activate voucher or login, customer will be redirected to this url'; $_L['After_Customer_activate_voucher_or_login_customer_will_be_redirected_to_this_url'] = 'After Customer activate voucher or login, customer will be redirected to this url';
$_L['Voucher_Prefix'] = 'Voucher Prefix'; $_L['Voucher_Prefix'] = 'Voucher Prefix';
$_L['Voucher_activation_success_now_you_can_login'] = 'Voucher activation success, now you can login'; $_L['Voucher_activation_success_now_you_can_login'] = 'Voucher activation success, now you can login';
$_L['Client_Can_Purchase'] = 'Client Can Purchase';

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

@ -9,23 +9,15 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Status')}</label> <label class="col-md-2 control-label">{Lang::T('Status')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning"> <input type="radio" name="enabled" value="1" checked> Enable
<input type="radio" checked name="enabled" value="1"> Enable
</label>
<label class="radio-inline">
<input type="radio" name="enabled" value="0"> Disable <input type="radio" name="enabled" value="0"> Disable
</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label> <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning"> <input type="radio" name="allow_purchase" value="yes" checked> Yes
<input type="radio" checked name="allow_purchase" value="yes"> Yes
</label>
<label class="radio-inline">
<input type="radio" name="allow_purchase" value="no"> No <input type="radio" name="allow_purchase" value="no"> No
</label>
</div> </div>
</div> </div>
{if $_c['radius_enable']} {if $_c['radius_enable']}

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

@ -10,25 +10,15 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Status')}</label> <label class="col-md-2 control-label">{Lang::T('Status')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning"> <input type="radio" name="enabled" value="1" {if $d['enabled'] == 1}checked{/if}> Enable
<input type="radio" {if $d['enabled'] == 1}checked{/if} name="enabled" value="1"> Enable <input type="radio" name="enabled" value="0" {if $d['enabled'] == 0}checked{/if}> Disable
</label>
<label class="radio-inline">
<input type="radio" {if $d['enabled'] == 0}checked{/if} name="enabled" value="0">
Disable
</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label> <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning"> <input type="radio" name="allow_purchase" value="yes" {if $d['allow_purchase'] == yes}checked{/if}> Yes
<input type="radio" {if $d['allow_purchase'] == yes}checked{/if} name="allow_purchase" value="yes"> Yes <input type="radio" name="allow_purchase" value="no" {if $d['allow_purchase'] == no}checked{/if}> No
</label>
<label class="radio-inline">
<input type="radio" {if $d['allow_purchase'] == no}checked{/if} name="allow_purchase" value="no">
No
</label>
</div> </div>
</div> </div>
{if $_c['radius_enable'] and $d['is_radius']} {if $_c['radius_enable'] and $d['is_radius']}

2
ui/ui/plugin-manager.tpl
View File

@ -39,7 +39,7 @@
<div class="box-header"> <div class="box-header">
<h3 class="box-title">{$pg['name']}</h3> <h3 class="box-title">{$pg['name']}</h3>
</div> </div>
<div class="box-body">{$pg['description']}<br><small><i>@{$plugin['author']} Last update: {$plugin['last_update']}</i></small></div> <div class="box-body">{$pg['description']}<br><small><i>@{$pg['author']} Last update: {$pg['last_update']}</i></small></div>
<div class="box-footer "> <div class="box-footer ">
<div class="btn-group btn-group-justified" role="group" aria-label="..."> <div class="btn-group btn-group-justified" role="group" aria-label="...">
<a href="{$pg['url']}" target="_blank" <a href="{$pg['url']}" target="_blank"

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

@ -9,32 +9,22 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Status')}</label> <label class="col-md-2 control-label">{Lang::T('Status')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning">
<input type="radio" checked name="enabled" value="1"> Enable <input type="radio" checked name="enabled" value="1"> Enable
</label>
<label class="radio-inline">
<input type="radio" name="enabled" value="0"> Disable <input type="radio" name="enabled" value="0"> Disable
</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label> <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning">
<input type="radio" checked name="allow_purchase" value="yes"> Yes <input type="radio" checked name="allow_purchase" value="yes"> Yes
</label>
<label class="radio-inline">
<input type="radio" name="allow_purchase" value="no"> No <input type="radio" name="allow_purchase" value="no"> No
</label>
</div> </div>
</div> </div>
{if $_c['radius_enable']} {if $_c['radius_enable']}
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">Radius</label> <label class="col-md-2 control-label">Radius</label>
<div class="col-md-6"> <div class="col-md-6">
<label class="radio-inline">
<input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan <input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan
</label>
</div> </div>
<p class="help-block col-md-4">{Lang::T('Cannot be change after saved')}</p> <p class="help-block col-md-4">{Lang::T('Cannot be change after saved')}</p>
</div> </div>

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

@ -10,25 +10,15 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Status')}</label> <label class="col-md-2 control-label">{Lang::T('Status')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning"> <input type="radio" name="enabled" value="1" {if $d['enabled'] == 1}checked{/if}> Enable
<input type="radio" {if $d['enabled'] == 1}checked{/if} name="enabled" value="1"> Enable <input type="radio" name="enabled" value="0" {if $d['enabled'] == 0}checked{/if}> Disable
</label>
<label class="radio-inline">
<input type="radio" {if $d['enabled'] == 0}checked{/if} name="enabled" value="0">
Disable
</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label> <label class="col-md-2 control-label">{Lang::T('Client Can Purchase')}</label>
<div class="col-md-10"> <div class="col-md-10">
<label class="radio-inline warning"> <input type="radio" name="allow_purchase" value="yes" {if $d['allow_purchase'] == yes}checked{/if}> Yes
<input type="radio" {if $d['allow_purchase'] == yes}checked{/if} name="allow_purchase" value="yes"> Yes <input type="radio" name="allow_purchase" value="no" {if $d['allow_purchase'] == no}checked{/if}> No
</label>
<label class="radio-inline">
<input type="radio" {if $d['allow_purchase'] == no}checked{/if} name="allow_purchase" value="no">
No
</label>
</div> </div>
</div> </div>
{if $_c['radius_enable'] and $d['is_radius']} {if $_c['radius_enable'] and $d['is_radius']}

2
version.json
View File

@ -1,3 +1,3 @@
{ {
"version": "2024.1.9" "version": "2024.1.11"
} }