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

Fixes for live environment and updates to admin/service/update

Browse Source
This commit is contained in:
Deon George
2011-07-22 11:04:20 +10:00
parent 27cdab1fe4
commit c8c4c5176d
41 changed files with 2457 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/adsl/classes/model/adsl/supplier.php
View File

@@ -13,7 +13,7 @@
class Model_ADSL_Supplier extends ORMOSB {
// Relationships
protected $_has_many = array(
'adsl_supplier_plan'=>array('foreign_key'=>'supplier_id'),
'adsl_supplier_plan'=>array('foreign_key'=>'supplier_id','far_key'=>'id'),
);
protected $_updated_column = FALSE;
@@ -32,7 +32,8 @@ class Model_ADSL_Supplier extends ORMOSB {
foreach ($aspo->adsl_plan->find_all() as $apo)
// Find all the services who use this plan
foreach ($apo->service->find_all() as $so)
array_push($services,$so);
if (! $active OR $so->active)
array_push($services,$so);
return $services;
}

2
modules/adsl/classes/model/adsl/supplier/plan.php
View File

@@ -13,7 +13,7 @@
class Model_ADSL_Supplier_Plan extends ORMOSB {
// Relationships
protected $_has_many = array(
'adsl_plan'=>array(),
'adsl_plan'=>array('far_key'=>'id'),
);
protected $_belongs_to = array(
'adsl_supplier'=>array('foreign_key'=>'supplier_id'),