diff --git a/install/phpnuxbill.sql b/install/phpnuxbill.sql index 77d2bbfc..ee0a4b20 100644 --- a/install/phpnuxbill.sql +++ b/install/phpnuxbill.sql @@ -104,7 +104,8 @@ CREATE TABLE `tbl_plans` ( `is_radius` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 is radius', `pool` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `pool_expired` varchar(40) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0 disabled\r\n' + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0 disabled\r\n', + `allow_purchase` enum('yes','no') DEFAULT 'yes' COMMENT 'allow to show package in buy package page' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; DROP TABLE IF EXISTS `tbl_pool`; @@ -309,4 +310,4 @@ VALUES ( 'Active', '2022-09-06 16:09:50', '2014-06-23 01:43:07' - ); \ No newline at end of file + ); diff --git a/system/cron.php b/system/cron.php index 98a2d833..cac928ab 100644 --- a/system/cron.php +++ b/system/cron.php @@ -137,7 +137,7 @@ foreach ($d as $ds) { // autorenewal from deposit if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) { - if ($p && $p['enabled'] && $c['balance'] >= $p['price']) { + if ($p && $p['enabled'] && $c['balance'] >= $p['price'] && $p['allow_purchase'] =='yes') { if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) { // if success, then get the balance Balance::min($ds['customer_id'], $p['price']); @@ -191,7 +191,7 @@ foreach ($d as $ds) { // autorenewal from deposit if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) { - if ($p && $p['enabled'] && $c['balance'] >= $p['price']) { + if ($p && $p['enabled'] && $c['balance'] >= $p['price']&& $p['allow_purchase'] =='yes') { if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) { // if success, then get the balance Balance::min($ds['customer_id'], $p['price']); diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/hotspot-edit.tpl index d51efc19..ffe6af7a 100644 --- a/ui/ui/hotspot-edit.tpl +++ b/ui/ui/hotspot-edit.tpl @@ -3,7 +3,7 @@
-
{$_L['Edit_Plan']}
+
{$_L['Edit_Plan']} || {$d['name_plan']}
diff --git a/ui/ui/pppoe-edit.tpl b/ui/ui/pppoe-edit.tpl index 7c6dc775..74d34ba2 100644 --- a/ui/ui/pppoe-edit.tpl +++ b/ui/ui/pppoe-edit.tpl @@ -3,7 +3,7 @@
-
{$_L['Edit_Plan']}
+
{$_L['Edit_Plan']} || {$d['name_plan']}