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

Improvements to invoice display and other misc items

Browse Source
This commit is contained in:
Deon George
2013-12-20 10:00:32 +11:00
parent 778eada7f0
commit e19518c505
43 changed files with 1122 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/export/classes/Controller/Admin/Export.php
View File

@@ -38,7 +38,7 @@ class Controller_Admin_Export extends Controller_Export {
->body(View::factory('export/admin/add')
->set('o',$edo)
->set('emo',ORM::factory('Export_Module',$_POST['export_module_id']))
->set('module',ORM::factory('Module',$_POST['module_id'])->module()));
->set('module',ORM::factory('Module',$_POST['module_id'])->instance()));
}
/**

3
modules/export/classes/Controller/Reseller/Export.php
View File

@@ -66,7 +66,7 @@ class Controller_Reseller_Export extends Controller_Export {
$output .= '<ul class="nav nav-tabs">';
// @todo To limit to Reseller accounts only
foreach ($eo->export_module->find_all() as $emo)
$output .= sprintf('<li class="%s"><a href="#tab%s" data-toggle="tab">%s</a></li>',$c++ ? '' : 'active',$emo->id,ucfirst($emo->module->module()->object_name()));
$output .= sprintf('<li class="%s"><a href="#tab%s" data-toggle="tab">%s</a></li>',$c++ ? '' : 'active',$emo->id,ucfirst($emo->module->instance()->object_name()));
$output .= '</ul>';
$c = 0;
@@ -81,7 +81,6 @@ class Controller_Reseller_Export extends Controller_Export {
'id'=>'ID',
'account->name(TRUE)'=>'Account',
'date_orig'=>'Date',
'status'=>'Active',
'total(TRUE)'=>'Total',
'exported'=>'Exported',
),$emo->display ? $emo->display : array()))

2
modules/export/classes/Model/Export/Module.php
View File

@@ -30,7 +30,7 @@ class Model_Export_Module extends ORM_OSB {
if (! is_numeric($days))
$days = 90;
$o = $this->module->module();
$o = $this->module->instance();
return $o
->select(array($this->export_item->table_name().'.date_orig','exported'))