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

Standardisation work, changed accnum() to refnum()

Browse Source
This commit is contained in:
Deon George
2016-07-29 23:04:34 +10:00
parent e0b45be758
commit 85f08bbb0a
52 changed files with 361 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
modules/service/classes/Controller/Reseller/Service.php
View File

@@ -25,23 +25,8 @@ class Controller_Reseller_Service extends Controller_Service {
Block::factory()
->title('Customer Services')
->title_icon('fa fa-list')
->body(Table::factory()
->jssort('services')
->data(ORM::factory('Service')->where_authorised($this->ao)->find_all())
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'status'=>'Active',
'account->accnum()'=>'Cust ID',
'account->name()'=>'Customer',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
->title_icon($this->icon)
->body(View::factory('service/reseller/list')->set('o',ORM::factory('Service')->where_authorised($this->ao)->find_all()));
}
/**
@@ -61,24 +46,8 @@ class Controller_Reseller_Service extends Controller_Service {
if ($svs)
Block::factory()
->title('Services that should be auto-billed')
->title_icon('icon-pencil')
->body(Table::factory()
->jssort('services')
->data($svs)
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'account->accnum()'=>'Cust ID',
'account->name()'=>'Customer',
'date_next_invoice'=>'Next Invoice',
'due(TRUE)'=>'Due Invoices',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
->title_icon($this->icon)
->body(View::factory('service/reseller/list')->set('o',$svs));
foreach (ORM::factory('Checkout')->find_all() as $co) {
$svs = array();
@@ -89,7 +58,7 @@ class Controller_Reseller_Service extends Controller_Service {
if ($svs)
Block::factory()
->title($co->name)
->title_icon('icon-repeat')
->title_icon('fa fa-bank')
->body(Table::factory()
->jssort($co->id)
->data($svs)
@@ -98,7 +67,7 @@ class Controller_Reseller_Service extends Controller_Service {
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'account->accnum()'=>'Cust ID',
'account->refnum()'=>'Cust ID',
'account->name()'=>'Customer',
'date_next_invoice'=>'Next Invoice',
'due(TRUE)'=>'Due Invoices',
@@ -117,23 +86,8 @@ class Controller_Reseller_Service extends Controller_Service {
public function action_listexpiring() {
Block::factory()
->title('Customer Services Expiring')
->title_icon('icon-th-list')
->body(Table::factory()
->jssort('services')
->data(ORM::factory('Service')->where_authorised($this->ao)->list_expiring())
->columns(array(
'id'=>'ID',
'expire(TRUE)'=>'Expiry',
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'account->accnum()'=>'Cust ID',
'account->name()'=>'Customer',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
->title_icon($this->icon)
->body(View::factory('service/reseller/list')->set('o',ORM::factory('Service')->where_authorised($this->ao)->list_expiring()));
}
/**
@@ -142,25 +96,8 @@ class Controller_Reseller_Service extends Controller_Service {
public function action_listinvoicesoon() {
Block::factory()
->title('Customer Services soon to be Invoiced')
->title_icon('icon-th-list')
->body(Table::factory()
->jssort('services')
->data(ORM::factory('Service')->where_authorised($this->ao)->list_invoicesoon(ORM::factory('Invoice')->config('GEN_SOON_DAYS')+30))
->columns(array(
'id'=>'ID',
'expire(TRUE)'=>'Expiry',
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'charges(TRUE,TRUE)'=>'Charges',
'account->accnum()'=>'Cust ID',
'account->name()'=>'Customer',
'date_next_invoice'=>'Next Invoice',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
->title_icon($this->icon)
->body(View::factory('service/reseller/list')->set('o',ORM::factory('Service')->where_authorised($this->ao)->list_invoicesoon(ORM::factory('Invoice')->config('GEN_SOON_DAYS')+30)));
}
}
?>

19
modules/service/classes/Controller/User/Service.php
View File

@@ -40,22 +40,9 @@ class Controller_User_Service extends Controller_Service {
$this->meta->title = 'Service List';
Block::factory()
->title(sprintf('Services for Account: %s',$this->ao->accnum()))
->title_icon('icon-th-list')
->body(Table::factory()
->jssort('services')
->data($this->ao->service->find_all())
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'status'=>'Active',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
->title(sprintf('Services for Account: %s',$this->ao->refnum()))
->title_icon($this->icon)
->body(View::factory('service/user/list')->set('o',$this->ao->service->find_all()));
}
public function action_view() {

2
modules/service/views/service/info.php
View File

@@ -4,7 +4,7 @@
<div class="dl-horizontal">
<dt>Account</dt>
<dd><?php printf('%s (%s)',$o->account->name(),$o->account->accnum()); ?></dd>
<dd><?php printf('%s (%s)',$o->account->name(),$o->account->refnum(TRUE)); ?></dd>
<?php if ($o->external_billing) : ?>
<dt>External Billed</dt>

20
modules/service/views/service/reseller/list.php Normal file
View File

@@ -0,0 +1,20 @@
<!-- o = Array of Model_Service -->
<?php echo Table::factory()
->jssort('services')
->data($o)
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'charges(TRUE,TRUE)'=>'Charges',
'status'=>'Active',
'account->refnum()'=>'Cust ID',
'account->name()'=>'Customer',
'date_next_invoice'=>'Next Invoice',
'due(TRUE)'=>'Due Invoices',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
));
?>

16
modules/service/views/service/user/list.php
View File

@@ -1,16 +0,0 @@
<!-- o = Model_Account -->
<?php echo Block::factory()
->title(sprintf('Active Service for Account: %s',$o->accnum()))
->title_icon('fa-server')
->span(6)
->body(Table::factory()
->data($o->service->list_active())
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
?>

11
modules/service/views/service/user/list/brief.php Normal file
View File

@@ -0,0 +1,11 @@
<!-- o = Array of Model_Service -->
<?php echo Table::factory()
->data($o)
->columns(array(
'id'=>'ID',
'service_name()'=>'Service',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
));
?>

27
modules/service/views/service/user/list/expiring.php
View File

@@ -1,17 +1,12 @@
<!-- o = Model Account -->
<?php echo Block::factory()
->title(sprintf('Services Expiring for Account: %s',$o->accnum()))
->title_icon('fa fa-level-down')
->span(6)
->body(Table::factory()
->data($o->service->list_expiring())
->columns(array(
'id'=>'ID',
'service_name(59)'=>'Service',
'expire(TRUE)'=>'Date',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
<!-- o = Array of Model_Service -->
<?php echo Table::factory()
->data($o)
->columns(array(
'id'=>'ID',
'service_name(59)'=>'Service',
'expire(TRUE)'=>'Date',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
));
?>

27
modules/service/views/service/user/list/inactive.php
View File

@@ -1,17 +1,12 @@
<!-- o = Model Account -->
<?php echo Block::factory()
->title(sprintf('InActive Services for Account: %s',$o->accnum()))
->title_icon('fa fa-stop')
->span(6)
->body(Table::factory()
->data($o->service->where('status','!=',1)->or_where('status','IS',null)->find_all())
->columns(array(
'id'=>'ID',
'service_name(60)'=>'Service',
'date_end'=>'Date',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
))
);
<!-- o = Array of MOdel_Service -->
<?php echo Table::factory()
->data($o)
->columns(array(
'id'=>'ID',
'service_name(60)'=>'Service',
'date_end'=>'Date',
))
->prepend(array(
'id'=>array('url'=>URL::link('user','service/view/')),
));
?>

2
modules/service/views/service/user/view.php
View File

@@ -12,7 +12,7 @@
?>
</div>
<div class="col-md-6">
<div class="col-md-7">
<?php echo $o->service_view(); ?>
</div>