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

Misc fixes for ADSL excess traffic and strtotime() functions for last month

Browse Source
This commit is contained in:
Deon George
2013-12-31 17:18:49 +11:00
parent e19518c505
commit 82c51de550
11 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/adsl/classes/Controller/Admin/Adsl.php
View File

@@ -124,7 +124,7 @@ class Controller_Admin_Adsl extends Controller_Adsl {
$a = 0;
foreach (array_reverse($traffic) as $i) {
if ($i < $so->plugin()->traffic_month(strtotime('last month'),TRUE))
if ($i < $so->plugin()->traffic_month(strtotime('first day of last month'),TRUE))
break;
$a = $i;

2
modules/adsl/classes/Controller/Reseller/Service/Adsl.php
View File

@@ -72,7 +72,7 @@ class Controller_Reseller_Service_Adsl extends Controller_Service {
'product->plugin()->supplier_plan->speed'=>'Speed',
'product->plugin()->allowance(array(),TRUE,TRUE,TRUE)'=>'Allowance',
'plugin()->traffic_month(strtotime("yesterday"),TRUE,TRUE)'=>'This Month',
'plugin()->traffic_month(strtotime("last month"),TRUE,TRUE)'=>'Last Month',
'plugin()->traffic_month(strtotime("first day of last month"),TRUE,TRUE)'=>'Last Month',
'recur_schedule'=>'Billing',
'price(TRUE,TRUE)'=>'Price',
'account->accnum()'=>'Cust ID',

11
modules/adsl/classes/Model/Product/Plugin/Adsl.php
View File

@@ -135,8 +135,15 @@ class Model_Product_Plugin_Adsl extends Model_Product_Plugin {
if (! isset($data[$k]))
$data[$k] = 0;
if ($over)
$data[$k] = $invert ? $this->{$k} : $data[$k]-$this->{$k};
if ($over) {
// @todo This is an ugly hack - if our data has been passed it, it is assumed it has been reduced by $this->metric
$z = $this->metric ? round($this->{$k}/$this->metric,2) : $this->{$k};
$data[$k] = $invert ? $z : $data[$k]-$z;
// We need to return this back to base units as later, we'll return it back to metric
$data[$k] = $this->metric ? $data[$k]*$this->metric : $data[$k];
}
// Do we charge for extra, or merge it to another field
if (! is_null($this->{$v})) {

2
modules/adsl/classes/Task/Adsl/Trafficalert.php
View File

@@ -15,7 +15,7 @@ class Task_Adsl_Trafficalert extends Minion_Task {
);
protected function _execute(array $params) {
$date = strtotime('last month');
$date = strtotime('first day of last month');
$c = array();
// @todo Pick up services that are no longer active, but were inactive < 30 days ago.

2
modules/adsl/classes/Task/Adsl/Trafficcharge.php
View File

@@ -15,7 +15,7 @@ class Task_Adsl_Trafficcharge extends Minion_Task {
);
protected function _execute(array $params) {
$date = strtotime('last month');
$date = strtotime('first day of last month');
$c = array();
// @todo Pick up services that are no longer active, but were inactive < 30 days ago.

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

@@ -41,7 +41,7 @@
<div class="dl-horizontal">
<dt>Last Month</dt>
<dd>&nbsp;<?php echo $o->traffic_month(strtotime('last month'),TRUE,TRUE); ?></dd>
<dd>&nbsp;<?php echo $o->traffic_month(strtotime('first day of last month'),TRUE,TRUE); ?></dd>
<dt>This Month</dt>
<dd>&nbsp;<?php echo $o->traffic_month(strtotime('yesterday'),TRUE,TRUE); ?></dd>