deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Enabled SSL active services, exclude external_billing in active services

Browse Source
This commit is contained in:
Deon George 2014-08-26 16:22:31 +10:00
parent 8ff4e65db6
commit 13e0782568
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/service/classes/Model/Service.php
View File

@ -372,7 +372,7 @@ class Model_Service extends ORM_OSB {
$result = array(); $result = array();
foreach ($this->list_active() as $so) foreach ($this->list_active() as $so)
if ($so->expiring($days)) if ($so->expiring($days) AND ! $so->external_billing)
array_push($result,$so); array_push($result,$so);
return $result; return $result;

4
modules/ssl/classes/Controller/Reseller/Ssl.php
View File

@ -25,7 +25,7 @@ class Controller_Reseller_SSL extends Controller_SSL {
->title_icon('icon-th-list') ->title_icon('icon-th-list')
->body(Table::factory() ->body(Table::factory()
->jssort('ca') ->jssort('ca')
->data(ORM::factory('SSL_CA')->where_authorised($this->ao)->find_all()) ->data(ORM::factory('SSL_CA')->where_authorised($this->ao)->where_active()->find_all())
->columns(array( ->columns(array(
'id'=>'ID', 'id'=>'ID',
'sign_cert'=>'Cert', 'sign_cert'=>'Cert',
@ -53,7 +53,7 @@ class Controller_Reseller_SSL extends Controller_SSL {
->title_icon('icon-th-list') ->title_icon('icon-th-list')
->body(Table::factory() ->body(Table::factory()
->jssort('ca') ->jssort('ca')
->data($sco->where_authorised($this->ao)->list_childca()) ->data($sco->where_authorised($this->ao)->where_active()->list_childca())
->columns(array( ->columns(array(
'id'=>'ID', 'id'=>'ID',
'sign_cert'=>'Cert', 'sign_cert'=>'Cert',

2
modules/ssl/classes/Model/SSL/CA.php
View File

@ -148,7 +148,7 @@ class Model_SSL_CA extends ORM_OSB {
} }
public function list_childca() { public function list_childca() {
return $this->children->find_all(); return $this->children->where_active()->find_all();
} }
public function list_childcrt() { public function list_childcrt() {