mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix billing-calculate strings

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2773 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-12-12 12:16:57 +00:00
parent ff9d09911b
commit 349290a037
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
billing-calculate.php
View File

@@ -48,6 +48,8 @@ foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
$type = "CDR"; $type = "CDR";
$allowed = $bill['bill_cdr']; $allowed = $bill['bill_cdr'];
$used = $rate_data['rate_95th']; $used = $rate_data['rate_95th'];
$allowed_text = format_si($allowed)."bps";
$used_text = format_si($used)."bps";
$overuse = $used - $allowed; $overuse = $used - $allowed;
$overuse = (($overuse <= 0) ? "0" : $overuse); $overuse = (($overuse <= 0) ? "0" : $overuse);
$percent = round(($rate_data['rate_95th'] / $bill['bill_cdr']) * 100,2); $percent = round(($rate_data['rate_95th'] / $bill['bill_cdr']) * 100,2);
@@ -56,11 +58,13 @@ foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
$type = "Quota"; $type = "Quota";
$allowed = $bill['bill_quota']; $allowed = $bill['bill_quota'];
$used = $rate_data['total_data']; $used = $rate_data['total_data'];
$allowed_text = format_bytes_billing($allowed);
$used_text = format_bytes_billing($used);
$overuse = $used - $allowed; $overuse = $used - $allowed;
$overuse = (($overuse <= 0) ? "0" : $overuse); $overuse = (($overuse <= 0) ? "0" : $overuse);
$percent = round(($rate_data['total_data'] / $bill['bill_quota']) * 100,2); $percent = round(($rate_data['total_data'] / $bill['bill_quota']) * 100,2);
} }
echo(strftime("%x @ %X", strtotime($datefrom))." to ".strftime("%x @ %X", strtotime($dateto))." ".str_pad($type,8)." ".str_pad($allowed,10)." ".str_pad($used,10)." ".$percent."%"); echo(strftime("%x @ %X", strtotime($datefrom))." to ".strftime("%x @ %X", strtotime($dateto))." ".str_pad($type,8)." ".str_pad($allowed_text,10)." ".str_pad($used_text,10)." ".$percent."%");
if($i == '0') if($i == '0')
{ {