Fixed some more bootstrap rendering

This commit is contained in:
Deon George
2016-07-25 00:44:17 +10:00
parent c29819b6bd
commit 21d204f605
16 changed files with 239 additions and 270 deletions

View File

@@ -22,7 +22,7 @@ class Controller_Reseller_Account extends Controller_Account {
public function action_list() {
Block::factory()
->title(_('Customer List'))
->title_icon('icon-th-list')
->title_icon('fa fa-list')
->body(Table::factory()
->data(ORM::factory('Account')->where_authorised($this->ao,'id')->find_all())
->jssort('customer')
@@ -33,7 +33,7 @@ class Controller_Reseller_Account extends Controller_Account {
'name(TRUE)'=>'Account',
'email'=>'Email',
'invoices_due_total(NULL,TRUE)'=>'Invoices',
'service->list_count()'=>'Services',
'service->find_all()->count()'=>'Services',
))
->prepend(array(
'id'=>array('url'=>URL::link('reseller','account/view/')),
@@ -45,20 +45,7 @@ class Controller_Reseller_Account extends Controller_Account {
* Show a list of account logins
*/
public function action_listlog() {
Block::factory()
->title(_('Customer Login Activity'))
->title_icon('icon-eye-open')
->body(Table::factory()
->data(ORM::factory('Account_Log')->where_authorised($this->ao)->find_all())
->page_items(25)
->columns(array(
'id'=>'ID',
'date_orig'=>'Date',
'account->name()'=>'Account',
'ip'=>'IP Address',
'details'=>'Details',
))
);
$this->template->content = View::factory('account/reseller/listlog');
}
public function action_view() {
@@ -67,80 +54,7 @@ class Controller_Reseller_Account extends Controller_Account {
if (! $ao->loaded() OR ! $ao->status OR ! Auth::instance()->authorised($ao))
throw HTTP_Exception::factory(403,'Account either doesnt exist, or you are not authorised to see it');
Block::factory()
->title(sprintf('Active Service for Account: %s',$ao->accnum()))
->title_icon('icon-info-sign')
->span(6)
->body(Table::factory()
->data($ao->service->list_active())
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
Block::factory()
->title(sprintf('Invoices Due Account: %s (%s)',$ao->accnum(),$ao->invoice->list_due_total(TRUE)))
->title_icon('icon-info-sign')
->span(6)
->body(Table::factory()
->data($ao->invoice->list_due())
->columns(array(
'id'=>'ID',
'due_date'=>'Date Due',
'total(TRUE)'=>'Invoice Total',
'due(TRUE)'=>'Amount Due',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','invoice/view/')),
))
);
Block::factory()
->title(sprintf('Services Expiring for Account: %s',$ao->accnum()))
->title_icon('icon-info-sign')
->span(6)
->body(Table::factory()
->data($ao->service->list_expiring())
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
'expire(TRUE)'=>'Date',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
$i = Invoice::instance();
foreach ($ao->service->list_active() as $io)
if (! $io->suspend_billing AND ! $io->external_billing)
$i->add_service($io);
Block::factory()
->title(sprintf('Next Invoice Items for Account: %s',$ao->accnum()))
->title_icon('icon-info-sign')
->span(6)
->body($i->render('html','body',array('noid'=>TRUE)));
Block::factory()
->title(sprintf('InActive Services for Account: %s',$ao->accnum()))
->title_icon('icon-info-sign')
->span(6)
->body(Table::factory()
->data($ao->service->where('status','!=',1)->or_where('status','IS',null)->find_all())
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
'date_end'=>'Date',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
$this->template->content = View::factory('account/reseller/view')->set('o',$ao);
}
}
?>