mirror.MikroTik/hotspotbilling.phpnuxbill
1
0
Fork 0
mirror of https://github.com/hotspotbilling/phpnuxbill.git synced 2025-08-28 22:08:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotspotbilling:Development' into Development

Browse source
This commit is contained in:
Focuslinkstech 2024-03-19 18:46:54 +01:00 • committed by GitHub
commit 4d8cec1a88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
system/controllers/order.php
View file

@ -47,8 +47,11 @@ switch ($action) {
} }
$ui->assign('_title', 'Order Plan'); $ui->assign('_title', 'Order Plan');
$ui->assign('_system_menu', 'package'); $ui->assign('_system_menu', 'package');
$account_type = $user['account_type'];
if(empty($account_type)){
$account_type = 'Personal';
}
if (!empty ($_SESSION['nux-router'])) { if (!empty ($_SESSION['nux-router'])) {
$account_type = $user['account_type'];
if ($_SESSION['nux-router'] == 'radius') { if ($_SESSION['nux-router'] == 'radius') {
$radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many(); $radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
$radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many(); $radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
@ -298,7 +301,6 @@ switch ($action) {
$_POST['gateway'] = $pgs[0]; $_POST['gateway'] = $pgs[0];
} }
} }
break;
case 'buy': case 'buy':
$gateway = _post('gateway'); $gateway = _post('gateway');
if (empty ($gateway) && !empty ($_SESSION['gateway'])) { if (empty ($gateway) && !empty ($_SESSION['gateway'])) {

3
system/updates.json
View file

@ -84,5 +84,8 @@
], ],
"2024.3.19.1" : [ "2024.3.19.1" : [
"ALTER TABLE `tbl_customers` ADD `account_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type' AFTER `coordinates`;" "ALTER TABLE `tbl_customers` ADD `account_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type' AFTER `coordinates`;"
],
"2024.3.19.2" : [
"ALTER TABLE `tbl_plans` ADD `plan_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type' ;"
] ]
} }