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

Consistency updates for use of viewpath()

Browse Source
This commit is contained in:
Deon George
2011-12-21 12:39:21 +11:00
parent a40ce27a16
commit a893527d77
42 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,7 +360,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$i = $j = 0;
$total = 0;
$summary = '';
$output = View::factory('service/admin/list/adslbilling_head');
$output = View::factory($this->viewpath().'/head');
$output .= '<table class="box-left">';
foreach ($aso->services(TRUE) as $so) {
$po = $so->plugin()->product();
@@ -377,7 +377,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
// Record the the exception if the cost is not expected
if (round($po->adsl_supplier_plan->base_cost+$po->adsl_supplier_plan->tax(),2) != $uploaded['amount']) {
$summary .= View::factory('service/admin/list/adslbilling_summary')
$summary .= View::factory($this->viewpath().'/summary')
->set('service',$so)
->set('plan',$po)
->set('planoverride',$so->plugin()->provided_adsl_plan_id ? TRUE : FALSE)
@@ -398,7 +398,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$total += $uploaded['amount'];
$output .= View::factory('service/admin/list/adslbilling_body')
$output .= View::factory($this->viewpath().'/body')
->set('service',$so)
->set('plan',$po)
->set('planoverride',$so->plugin()->provided_adsl_plan_id ? TRUE : FALSE)
@@ -409,7 +409,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
->set('i',$i++%2);
}
$output .= View::factory('service/admin/list/adslbilling_foot')
$output .= View::factory($this->viewpath().'/foot')
->set('total',$total);
$output .= '</table>';
@@ -417,7 +417,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
// Summary Report of remaining CSV items.
if (! empty($csv))
foreach ($csv as $service => $item) {
$summary .= View::factory('service/admin/list/adslbilling_summary_exception')
$summary .= View::factory($this->viewpath().'/summary_exception')
->set('service',$service)
->set('item',$item)
->set('i',$j++%2);

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

@@ -41,18 +41,7 @@ class Controller_User_Service extends Controller_TemplateDefault_User {
}
public function action_view() {
$output = '';
// Check if we are a table view
if (! $id = $this->request->param('id')) {
if (isset($_POST['id']) AND is_array($_POST['id']))
Table::post('service_view','id');
list($id,$output) = Table::page('service_view');
} else {
$id = $this->request->param('id');
}
list($id,$output) = Table::page(__METHOD__);
$so = ORM::factory('service',$id);
@@ -61,7 +50,7 @@ class Controller_User_Service extends Controller_TemplateDefault_User {
return FALSE;
}
$output .= View::factory('service/user/view')
$output .= View::factory($this->viewpath())
->set('so',$so);
Block::add(array(