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

Optimised Company() Setup() Config() and changed method_directory into URL

Browse Source
This commit is contained in:
Deon George
2013-02-12 22:14:59 +11:00
parent 97d894d472
commit 288d974cfa
63 changed files with 422 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
modules/service/classes/Controller/Admin/Service.php
View File

@@ -74,7 +74,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
ORM::factory('Service')->find_all(),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -85,7 +85,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -111,7 +111,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -124,7 +124,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
@@ -143,7 +143,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -156,7 +156,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -198,7 +198,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs = ORM::factory('Service')->list_bylistgroup('ADSL');
$google = GoogleChart::factory('ComboChart')
->dataurl(URL::site('admin/service/ajaxjson_traffic'))
->dataurl(URL::link('admin','service/ajaxjson_traffic',TRUE))
->title(sprintf('ADSL traffic as at %s',date('Y-m-d',strtotime('yesterday'))));
Block::add(array('body'=>(string)$google));
@@ -209,7 +209,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
NULL,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'name()'=>array('label'=>'Service'),
'plugin()->ipaddress()'=>array('label'=>'IP Address'),
'product->plugin()->speed'=>array('label'=>'Speed'),
@@ -225,7 +225,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
),
array(
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -244,14 +244,14 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
NULL,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Service'),
'expire(TRUE)'=>array('label'=>'Expires'),
'due(TRUE)'=>array('label'=>'Due'),
),
array(
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -277,7 +277,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
NULL,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'name()'=>array('label'=>'Service'),
'plugin()->ipaddress()'=>array('label'=>'IP Address'),
'product->plugin()->speed'=>array('label'=>'Speed'),
@@ -292,7 +292,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
),
array(
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -307,7 +307,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->display("domain_expire")'=>array('label'=>'Expire'),
'recur_schedule'=>array('label'=>'Billing'),
@@ -319,7 +319,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -340,7 +340,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$list[$sid],
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->display("domain_expire")'=>array('label'=>'Expire'),
'recur_schedule'=>array('label'=>'Billing'),
@@ -352,7 +352,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -373,7 +373,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$list[$sid],
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->domain_registrar->id'=>array('label'=>'SID'),
'plugin()->domain_registrar->name'=>array('label'=>'Supplier'),
@@ -382,7 +382,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -397,7 +397,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->display("host_expire")'=>array('label'=>'Expire'),
'recur_schedule'=>array('label'=>'Billing'),
@@ -409,7 +409,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -430,7 +430,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$list[$sid],
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->display("host_expire")'=>array('label'=>'Expire'),
'recur_schedule'=>array('label'=>'Billing'),
@@ -442,7 +442,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -457,7 +457,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -468,7 +468,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -647,7 +647,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
ORM::factory('Service')->list_invoicesoon(ORM::factory('Invoice')->config('GEN_SOON_DAYS')),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'date_next_invoice'=>array('label'=>'Next Invoice'),
@@ -660,7 +660,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -779,7 +779,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
}
if (isset($_REQUEST['go']))
HTTP::redirect('admin/service/view/'.$so->id);
HTTP::redirect(URL::link('admin','service/view/'.$so->id));
Block::add(array(
'title'=>sprintf('Transaction History for %s: %s',$so->id(),$so->name()),

28
modules/service/classes/Controller/Affiliate/Service.php
View File

@@ -30,7 +30,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$this->filter(ORM::factory('Service')->list_active(),$this->ao->affiliate->id),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -41,7 +41,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -67,7 +67,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -80,7 +80,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
else
@@ -104,7 +104,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$svs,
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -117,7 +117,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -176,7 +176,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$svs,
NULL,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'name()'=>array('label'=>'Service'),
'plugin()->ipaddress()'=>array('label'=>'IP Address'),
'product->plugin()->speed'=>array('label'=>'Speed'),
@@ -191,7 +191,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
),
array(
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -217,7 +217,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$svs,
NULL,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'name()'=>array('label'=>'Service'),
'plugin()->ipaddress()'=>array('label'=>'IP Address'),
'product->plugin()->speed'=>array('label'=>'Speed'),
@@ -232,7 +232,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
),
array(
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -244,7 +244,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$this->filter(ORM::factory('Service')->list_bylistgroup('DOMAIN'),$this->ao->affiliate->id,'name()'),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->display("domain_expire")'=>array('label'=>'Expire'),
'recur_schedule'=>array('label'=>'Billing'),
@@ -256,7 +256,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}
@@ -268,7 +268,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
$this->filter(ORM::factory('Service')->list_bylistgroup('HOST'),$this->ao->affiliate->id,'name()'),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'plugin()->display("host_expire")'=>array('label'=>'Expire'),
'recur_schedule'=>array('label'=>'Billing'),
@@ -280,7 +280,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}

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

@@ -43,7 +43,7 @@ class Controller_User_Service extends Controller_TemplateDefault_User {
$this->ao->service->find_all(),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'service_name()'=>array('label'=>'Details'),
'recur_schedule'=>array('label'=>'Billing'),
'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
@@ -52,7 +52,7 @@ class Controller_User_Service extends Controller_TemplateDefault_User {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}

2
modules/service/classes/Model/Service/Plugin.php
View File

@@ -66,7 +66,7 @@ abstract class Model_Service_Plugin extends ORM_OSB {
$("button[name=submit]").click(function() {
var t=$(this).val().split(":");
if (x++) { alert("Session expired, please refresh the page!"); return false; }
$.getJSON("'.URL::site('user/service/ajaxmanage/'.$this->service_id).'", { k: "'.$k.'",t: t[1] }, function(data) {
$.getJSON("'.URL::link('user','service/ajaxmanage/'.$this->service_id,TRUE).'", { k: "'.$k.'",t: t[1] }, function(data) {
$.each(data, function(key, val) { $("#"+key+"_"+t[0]+"_"+t[1]).val(val); });
}).error(function() { alert("There was a problem with the request"); return false; }).success(
function() { $("form[id=id_"+t[0]+"_"+t[1]+"]").submit(); });