[freeside-commits] branch FREESIDE_3_BRANCH updated. 9dc85ed9f36fbc48364305f9590ba7b3c230f20f

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  9dc85ed9f36fbc48364305f9590ba7b3c230f20f (commit)
      from  38c49e73b24608ef28ef8086410d5e594d56f0c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9dc85ed9f36fbc48364305f9590ba7b3c230f20f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 28 23:03:22 2014 -0700

    show duration before connection charge period, RT#29497

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 8113412..cced0eb 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -825,9 +825,10 @@ sub rate_prefix {
   # We don't round _anything_ (except granularizing) 
   # until the final $charge = sprintf("%.2f"...).
 
-  my $seconds_left = $part_pkg->option_cacheable('use_duration')
-                       ? $self->duration
-                       : $self->billsec;
+  my $rated_seconds = $part_pkg->option_cacheable('use_duration')
+                        ? $self->duration
+                        : $self->billsec;
+  my $seconds_left = $rated_seconds;
 
   #no, do this later so it respects (group) included minutes
   #  # charge for the first (conn_sec) seconds
@@ -835,7 +836,7 @@ sub rate_prefix {
   #  $seconds_left -= $seconds; 
   #  $weektime     += $seconds;
   #  my $charge = $rate_detail->conn_charge; 
-  my $seconds = 0;
+  #my $seconds = 0;
   my $charge = 0;
   my $connection_charged = 0;
 
@@ -893,7 +894,7 @@ sub rate_prefix {
       $seconds_left = 0;
     }
 
-    $seconds += $charge_sec;
+    #$seconds += $charge_sec;
 
     if ( $rate_detail->min_included ) {
       # the old, kind of deprecated way to do this:
@@ -987,7 +988,7 @@ sub rate_prefix {
     $opt{'svcnum'},
     'rated_pretty_dst'    => $pretty_dst,
     'rated_regionname'    => $rate_region->regionname,
-    'rated_seconds'       => $seconds,
+    'rated_seconds'       => $rated_seconds, #$seconds,
     'rated_granularity'   => $rate_detail->sec_granularity, #$granularity
     'rated_ratedetailnum' => $rate_detail->ratedetailnum,
     'rated_classnum'      => $rate_detail->classnum, #rated_ratedetailnum?
@@ -1255,7 +1256,7 @@ sub export_formats {
   my $conf = new FS::Conf;
   my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
-  # call duration in the largest units that accurately reflect the  granularity
+  # call duration in the largest units that accurately reflect the granularity
   my $duration_sub = sub {
     my($cdr, %opt) = @_;
     my $sec = $opt{seconds} || $cdr->billsec;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr.pm |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)