diff --git a/application/classes/Controller/Reseller/Account.php b/application/classes/Controller/Reseller/Account.php
index bf5270d8..1aacdc7e 100644
--- a/application/classes/Controller/Reseller/Account.php
+++ b/application/classes/Controller/Reseller/Account.php
@@ -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);
}
}
?>
diff --git a/application/views/account/reseller/listlog.php b/application/views/account/reseller/listlog.php
new file mode 100644
index 00000000..3e4b0147
--- /dev/null
+++ b/application/views/account/reseller/listlog.php
@@ -0,0 +1,15 @@
+get_user();
+echo Block::factory()
+ ->title(_('Customer Login Activity'))
+ ->title_icon('fa fa-eye')
+ ->body(Table::factory()
+ ->data(ORM::factory('Account_Log')->where_authorised($o)->find_all())
+ ->page_items(25)
+ ->columns(array(
+ 'id'=>'ID',
+ 'date_orig'=>'Date',
+ 'account->name()'=>'Account',
+ 'ip'=>'IP Address',
+ 'details'=>'Details',
+ ))
+ );
diff --git a/application/views/account/reseller/view.php b/application/views/account/reseller/view.php
index 987fe7e1..7b8bfdac 100644
--- a/application/views/account/reseller/view.php
+++ b/application/views/account/reseller/view.php
@@ -1,3 +1,6 @@
+
set('o',$o); ?>
set('o',$o); ?>
set('o',$o); ?>
+set('o',$o); ?>
+set('o',$o); ?>
diff --git a/modules/email/classes/Controller/User/Email.php b/modules/email/classes/Controller/User/Email.php
index 29384712..ae74eae2 100644
--- a/modules/email/classes/Controller/User/Email.php
+++ b/modules/email/classes/Controller/User/Email.php
@@ -19,24 +19,7 @@ class Controller_User_Email extends Controller_Email {
* Show a list of emails
*/
public function action_list() {
- Block::factory()
- ->title(sprintf(_('System Emails Sent for %s: %s'),$this->ao->accnum(),$this->ao->name(TRUE)))
- ->title_icon('icon-th')
- ->body(Table::factory()
- ->page_items(25)
- ->data($this->ao->email_log->find_all())
- ->columns(array(
- 'id'=>'ID',
- 'date_orig'=>'Date',
- 'resolve("subject")'=>'Subject',
- ))
- ->prepend(array(
- 'id'=>array('url'=>URL::link('user','email/view/')),
- ))
- ->postproc(array(
- 'resolve("subject")'=>array('trim'=>60),
- ))
- );
+ $this->template->content = View::factory('email/user/list');
}
public function action_view() {
diff --git a/modules/email/views/email/user/list.php b/modules/email/views/email/user/list.php
new file mode 100644
index 00000000..9221996a
--- /dev/null
+++ b/modules/email/views/email/user/list.php
@@ -0,0 +1,19 @@
+get_user();
+echo Block::factory()
+ ->title(sprintf(_('System Emails Sent for %s: %s'),$o->accnum(),$o->name(TRUE)))
+ ->title_icon('fa fa-list')
+ ->body(Table::factory()
+ ->page_items(25)
+ ->data($o->email_log->find_all())
+ ->columns(array(
+ 'id'=>'ID',
+ 'date_orig'=>'Date',
+ 'resolve("subject")'=>'Subject',
+ ))
+ ->prepend(array(
+ 'id'=>array('url'=>URL::link('user','email/view/')),
+ ))
+ ->postproc(array(
+ 'resolve("subject")'=>array('trim'=>60),
+ ))
+ );
diff --git a/modules/invoice/classes/Controller/User/Invoice.php b/modules/invoice/classes/Controller/User/Invoice.php
index 535c4477..fe7ab3fa 100644
--- a/modules/invoice/classes/Controller/User/Invoice.php
+++ b/modules/invoice/classes/Controller/User/Invoice.php
@@ -75,7 +75,7 @@ class Controller_User_Invoice extends Controller_Invoice {
public function action_list() {
Block::factory()
->title(sprintf('Invoices for Account: %s',$this->ao->accnum()))
- ->title_icon('icon-th-list')
+ ->title_icon('fa fa-list')
->body(Table::factory()
->jssort('invoices')
->data($this->ao->invoice->find_all())
@@ -107,64 +107,8 @@ class Controller_User_Invoice extends Controller_Invoice {
$output .= Invoice::instance($io)->render('html','all');
- $output .= '
';
- $output .= HTML::anchor(URL::link('user','invoice/email/'.$io->id),'Email',array('class'=>'btn pull-right'));
- $output .= HTML::anchor(URL::link('user','invoice/download/'.$io->id),'Download',array('class'=>'btn pull-right'));
-
- if ($io->due() AND ! $io->cart_exists())
- $output .= View::factory('invoice/user/view/pay')
- ->set('mid',$io->mid())
- ->set('o',$io);
-
- if (! $io->status) {
- Style::factory()
- ->type('file')
- ->data('media/css/pages/invoice.css');
-
- $output .= '
+ |
+ name(); ?> + taxid(); ?> + + address(); ?> + + contacts(); ?> + |
+
- |
- name(); ?> - taxid(); ?> - - address(); ?> - - contacts(); ?> - |
-