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

Moved GB/MB configuration for ADSL into database

Browse Source
This commit is contained in:
Deon George
2013-11-18 15:18:50 +11:00
parent a711e70b60
commit 89deb9c97b
7 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,7 +118,7 @@ class Model_Product_Plugin_Adsl extends Model_Product_Plugin {
* @param bool Display the over allowance numbers
* @param int Divide the numbers
*/
public function allowance(array $data=array(),$format=FALSE,$over=FALSE,$divide=0) {
public function allowance(array $data=array(),$format=FALSE,$over=FALSE,$ceil=FALSE) {
$result = $x = array();
// Do we invert the result - showing allowance
@@ -172,8 +172,12 @@ class Model_Product_Plugin_Adsl extends Model_Product_Plugin {
foreach (array_keys(Model_Service_Plugin_Adsl_Traffic::$metrics) as $k) {
$k = 'base_'.$k;
if (isset($x[$k]))
$result[$k] = $divide ? ceil($x[$k]/$divide) : $x[$k];
if (isset($x[$k])) {
$result[$k] = $this->metric ? round($x[$k]/$this->metric,2) : $x[$k];
if ($ceil)
$result[$k] = ceil($result[$k]);
}
}
return $format ? join('/',array_values($result)) : $result;