nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 00:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #359 from laf/issue-laf-92

Browse Source 
Fixed bill display issues when calculating CDR
This commit is contained in:
Paul Gear
2014-12-06 18:38:09 +00:00
parent 9b609c5869 d9a5d11782
commit 6bf87f5958
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/bill/edit.inc.php
+9 -9
View File
@@ -13,18 +13,18 @@ if ($bill_data['bill_type'] == "quota") {
$tmp['mb'] = $data / $base / $base; $tmp['mb'] = $data / $base / $base;
$tmp['gb'] = $data / $base / $base / $base; $tmp['gb'] = $data / $base / $base / $base;
$tmp['tb'] = $data / $base / $base / $base / $base; $tmp['tb'] = $data / $base / $base / $base / $base;
if (($tmp['tb']>1) and ($tmp['tb']<$base)) { $quota = array("type" => "tb", "select_tb" => " selected", "data" => $tmp['tb']); } if ($tmp['tb']>=1) { $quota = array("type" => "tb", "select_tb" => " selected", "data" => $tmp['tb']); }
elseif (($tmp['gb']>1) and ($tmp['gb']<$base)) { $quota = array("type" => "gb", "select_gb" => " selected", "data" => $tmp['gb']); } elseif (($tmp['gb']>=1) and ($tmp['gb']<$base)) { $quota = array("type" => "gb", "select_gb" => " selected", "data" => $tmp['gb']); }
elseif (($tmp['mb']>1) and ($tmp['mb']<$base)) { $quota = array("type" => "mb", "select_mb" => " selected", "data" => $tmp['mb']); } elseif (($tmp['mb']>=1) and ($tmp['mb']<$base)) { $quota = array("type" => "mb", "select_mb" => " selected", "data" => $tmp['mb']); }
} }
if ($bill_data['bill_type'] == "cdr") { if ($bill_data['bill_type'] == "cdr") {
$data = $bill_data['bill_cdr']; $data = $bill_data['bill_cdr'];
$tmp['kbps'] = $data / $base / $base; $tmp['kbps'] = $data / $base;
$tmp['mbps'] = $data / $base / $base / $base; $tmp['mbps'] = $data / $base / $base;
$tmp['gbps'] = $data / $base / $base / $base / $base; $tmp['gbps'] = $data / $base / $base / $base;
if ($tmp['gbps']>1 and ($tmp['mbps']<$base)) { $cdr = array("type" => "gbps", "select_tbps" => " selected", "data" => $tmp['gbps']); } if ($tmp['gbps']>=1) { $cdr = array("type" => "gbps", "select_gbps" => " selected", "data" => $tmp['gbps']); }
elseif (($tmp['mbps']>1) and ($tmp['mbps']<$base)) { $cdr = array("type" => "mbps", "select_gbps" => " selected", "data" => $tmp['mbps']); } elseif (($tmp['mbps']>=1) and ($tmp['mbps']<$base)) { $cdr = array("type" => "mbps", "select_mbps" => " selected", "data" => $tmp['mbps']); }
elseif (($tmp['kbps']>1) and ($tmp['kbps']<$base)) { $cdr = array("type" => "kbps", "select_mbps" => " selected", "data" => $tmp['kbps']); } elseif (($tmp['kbps']>=1) and ($tmp['kbps']<$base)) { $cdr = array("type" => "kbps", "select_kbps" => " selected", "data" => $tmp['kbps']); }
} }
?> ?>