From e6988c8b9807933b570e33a058759f40c1110085 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 7 Dec 2011 14:18:46 +0000
Subject: [PATCH] add -r option to wipe bill_history table before we
 recalculate (hurray!)

git-svn-id: http://www.observium.org/svn/observer/trunk@2765 61d68cd4-352d-0410-923a-c4978735b2b8
---
 billing-calculate.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/billing-calculate.php b/billing-calculate.php
index 87ab33196e..0333d5c6ef 100755
--- a/billing-calculate.php
+++ b/billing-calculate.php
@@ -1,12 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-$debug=1;
+#$debug=1;
 
 include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
+$options = getopt("r");
+
+if (isset($options['r'])) { echo("Clearing history table.\n"); mysql_query("TRUNCATE TABLE `bill_history`"); }
+
+
+
 foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
 {
 
@@ -42,11 +48,16 @@ foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
          $type = "CDR";
          $allowed = $bill['bill_cdr'];
          $used    = $rate_data['rate_95th'];
-         $percent = round(($rate_data['rate_95th'] / $allowed) * 100,2);
+         $overuse = $used - $allowed;
+         $overuse = (($overuse <= 0) ? "0" : $overuse);
+         $percent = round(($rate_data['rate_95th'] / $bill['bill_cdr']) * 100,2);
+
       } elseif ($bill['bill_type'] == "quota") {
          $type = "Quota";
          $allowed = $bill['bill_quota'];
          $used    = $rate_data['total_data'];
+         $overuse = $used - $allowed;
+         $overuse = (($overuse <= 0) ? "0" : $overuse);
          $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."%");