From 13712b1aedfa7d2a633fbbb09ceb8b9fedc2450e Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Tue, 2 Dec 2014 21:16:08 +0000
Subject: [PATCH 1/2] Fixed bill display issues when calculating CDR

---
 html/pages/bill/edit.inc.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/pages/bill/edit.inc.php b/html/pages/bill/edit.inc.php
index 5135879c90..51a893f2a7 100644
--- a/html/pages/bill/edit.inc.php
+++ b/html/pages/bill/edit.inc.php
@@ -19,12 +19,12 @@ if ($bill_data['bill_type'] == "quota") {
 }
 if ($bill_data['bill_type'] == "cdr") {
   $data = $bill_data['bill_cdr'];
-  $tmp['kbps'] = $data / $base / $base;
-  $tmp['mbps'] = $data / $base / $base / $base;
-  $tmp['gbps'] = $data / $base / $base / $base / $base;
-  if ($tmp['gbps']>1 and ($tmp['mbps']<$base)) { $cdr =  array("type" => "gbps", "select_tbps" => " selected", "data" => $tmp['gbps']); }
-  elseif (($tmp['mbps']>1) and ($tmp['mbps']<$base)) { $cdr = array("type" => "mbps", "select_gbps" => " selected", "data" => $tmp['mbps']); }
-  elseif (($tmp['kbps']>1) and ($tmp['kbps']<$base)) { $cdr = array("type" => "kbps", "select_mbps" => " selected", "data" => $tmp['kbps']); }
+  $tmp['kbps'] = $data / $base;
+  $tmp['mbps'] = $data / $base / $base;
+  $tmp['gbps'] = $data / $base / $base / $base;
+  if ($tmp['gbps']>=1 and ($tmp['gbps']<$base)) { $cdr =  array("type" => "gbps", "select_gbps" => " selected", "data" => $tmp['gbps']); }
+  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_kbps" => " selected", "data" => $tmp['kbps']); }
 }
 
 ?>

From d9a5d11782b3efebd6a5e99c08b741058c588bdf Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Tue, 2 Dec 2014 21:38:32 +0000
Subject: [PATCH 2/2] More fixes to CDR and Quota values

---
 html/pages/bill/edit.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/pages/bill/edit.inc.php b/html/pages/bill/edit.inc.php
index 51a893f2a7..6434c93e77 100644
--- a/html/pages/bill/edit.inc.php
+++ b/html/pages/bill/edit.inc.php
@@ -13,16 +13,16 @@ if ($bill_data['bill_type'] == "quota") {
   $tmp['mb'] = $data / $base / $base;
   $tmp['gb'] = $data / $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']); }
-  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']); }
+  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['mb']>=1) and ($tmp['mb']<$base)) { $quota = array("type" => "mb", "select_mb" => " selected", "data" => $tmp['mb']); }
 }
 if ($bill_data['bill_type'] == "cdr") {
   $data = $bill_data['bill_cdr'];
   $tmp['kbps'] = $data / $base;
   $tmp['mbps'] = $data / $base / $base;
   $tmp['gbps'] = $data / $base / $base / $base;
-  if ($tmp['gbps']>=1 and ($tmp['gbps']<$base)) { $cdr =  array("type" => "gbps", "select_gbps" => " 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_mbps" => " selected", "data" => $tmp['mbps']); }
   elseif (($tmp['kbps']>=1) and ($tmp['kbps']<$base)) { $cdr = array("type" => "kbps", "select_kbps" => " selected", "data" => $tmp['kbps']); }
 }