Changed checkout_plugin_id to checkout_id and ADSL speed to SUPPLIER speed

This commit is contained in:
Deon George
2013-06-17 22:47:44 +10:00
parent 3a826b9be2
commit 87b3267422
11 changed files with 18 additions and 18 deletions

View File

@@ -597,10 +597,10 @@ class Controller_Admin_Service extends Controller_Service {
foreach ($svs as $a=>$so) {
// Number of services
if (! isset($stats[$so->product->plugin()->speed]['c']))
$stats[$so->product->plugin()->speed]['c'] = 0;
if (! isset($stats[$so->product->plugin()->adsl_supplier_plan->speed]['c']))
$stats[$so->product->plugin()->adsl_supplier_plan->speed]['c'] = 0;
$stats[$so->product->plugin()->speed]['c']++;
$stats[$so->product->plugin()->adsl_supplier_plan->speed]['c']++;
$ts++;
// Amount of traffic
@@ -612,10 +612,10 @@ class Controller_Admin_Service extends Controller_Service {
$a = $i;
}
if (! isset($stats[$so->product->plugin()->speed]['d'][$a]))
$stats[$so->product->plugin()->speed]['d'][$a] = 0;
if (! isset($stats[$so->product->plugin()->adsl_supplier_plan->speed]['d'][$a]))
$stats[$so->product->plugin()->adsl_supplier_plan->speed]['d'][$a] = 0;
$stats[$so->product->plugin()->speed]['d'][$a]++;
$stats[$so->product->plugin()->adsl_supplier_plan->speed]['d'][$a]++;
}
if (count($stats)) {

View File

@@ -52,7 +52,7 @@ class Controller_Reseller_Service extends Controller_Service {
foreach (ORM::factory('Account')->where_active()->where('id','IN',$this->ao->RTM->customers($this->ao->RTM))->find_all() as $ao)
if ($ao->has_any('group',array($go)))
foreach ($ao->service->list_active() as $so)
if (! $so->service_billing->checkout_plugin_id)
if (! $so->service_billing->checkout_id)
array_push($svs,$so);
if ($svs)
@@ -82,7 +82,7 @@ class Controller_Reseller_Service extends Controller_Service {
foreach ($co->account->where('account.id','IN',$this->ao->RTM->customers($this->ao->RTM))->find_all() as $ao)
foreach ($ao->service->list_active() as $so)
if ($so->service_billing->checkout_plugin_id == $co->id)
if ($so->service_billing->checkout_id == $co->id)
array_push($svs,$so);
if ($svs)