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

Updated OSB to work with KH 3.1

Browse Source
This commit is contained in:
Deon George
2011-05-14 17:35:33 +10:00
parent 6d256839fc
commit 9dda9f43f4
42 changed files with 397 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/service/classes/controller/admin/service.php
View File

@@ -89,8 +89,6 @@ ORDER BY c.id,s.recur_schedule,c.name,a.company,a.last_name,a.first_name
'type'=>'file',
'data'=>'css/list.css',
));
$this->template->content = Block::factory();
}
//@todo this should really be in a different class, since adsl wont be part of the main app
@@ -186,8 +184,6 @@ GROUP BY DATE_FORMAT(DATE,"%%Y-%%m"),SID
'type'=>'file',
'data'=>'css/list.css',
));
$this->template->content = Block::factory();
}
public function action_listhspaservices() {
@@ -268,8 +264,6 @@ GROUP BY DATE_FORMAT(DATE,"%%Y-%%m"),SID
'type'=>'file',
'data'=>'css/list.css',
));
$this->template->content = Block::factory();
}
/**
@@ -375,8 +369,6 @@ GROUP BY DATE_FORMAT(DATE,"%%Y-%%m"),SID
'type'=>'file',
'data'=>'css/list.css',
));
$this->template->content = Block::factory();
}
private function process(array $file) {

4
modules/service/classes/controller/user/service.php
View File

@@ -35,8 +35,6 @@ class Controller_User_Service extends Controller_TemplateDefault {
'body'=>View::factory('service/list')
->set('services',$this->ao->service->find_all()),
));
$this->template->content = Block::factory();
}
public function action_view($id) {
@@ -103,8 +101,6 @@ class Controller_User_Service extends Controller_TemplateDefault {
->set('product_info',$product_info)
->set('product_detail',$product_detail),
));
$this->template->content = Block::factory();
}
}
?>

21
modules/service/classes/model/service.php
View File

@@ -24,13 +24,22 @@ class Model_Service extends ORMOSB {
'account'=>array(),
);
protected $_formats = array(
'active'=>array('StaticList_YesNo::display'=>array()),
'date_next_invoice'=>array('Config::date'=>array()),
'recur_schedule'=>array('StaticList_RecurSchedule::display'=>array()),
/**
* Filters used to format the display of values into friendlier values
*/
protected $_display_filters = array(
'active'=>array(
array('StaticList_YesNo::display',array(':value')),
),
'date_next_invoice'=>array(
array('Config::date',array(':value')),
),
'recur_schedule'=>array(
array('StaticList_RecurSchedule::display',array(':value')),
),
'price'=>array(
'Tax::add'=>array(),
'Currency::display'=>array(),
array('Tax::add',array(':value')),
array('Currency::display',array(':value')),
),
);