include rate_detail->conn_sec in displayed duration #RT8605

[freeside.git] / FS / FS / part_pkg / voip_cdr.pm

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 0cb675f..003a3f3 100644 (file)
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -162,6 +162,16 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
                                                   'type' => 'checkbox',
                                                 },
 
+    'accountcode_tollfree_ratenum' => {
+      'name' => 'Optional alternate rate plan when accountcode is toll free',
+      'type' => 'select',
+      'select_table'  => 'rate',
+      'select_key'    => 'ratenum',
+      'select_label'  => 'ratename',
+      'disable_empty' => 0,
+      'empty_label'   => '',
+    },
+
     'skip_dst_length_less' => { 'name' => 'Do not charge for CDRs where the destination is less than this many digits:',
                               },
 
@@ -240,6 +250,7 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
                        use_disposition_taqua use_carrierid use_cdrtypenum
                        skip_dcontext skip_dstchannel_prefix
                        skip_src_length_more noskip_src_length_accountcode_tollfree
+                       accountcode_tollfree_ratenum
                        skip_dst_length_less skip_lastapp
                        use_duration
                        411_rewrite
@@ -436,8 +447,12 @@ sub calc_usage {
           #asterisks here causes inserting the detail to barf, so:
           $pretty_destnum =~ s/\*//g;
 
-          $rate = qsearchs('rate', { 'ratenum' => $ratenum })
-            or die "ratenum $ratenum not found!";
+          my $eff_ratenum = $cdr->is_tollfree('accountcode')
+            ? $cust_pkg->part_pkg->option('accountcode_tollfree_ratenum')
+            : '';
+          $eff_ratenum ||= $ratenum;
+          $rate = qsearchs('rate', { 'ratenum' => $eff_ratenum })
+            or die "ratenum $eff_ratenum not found!";
 
           my @ltime = localtime($cdr->startdate);
           $weektime = $ltime[0] + 
@@ -594,6 +609,7 @@ sub calc_usage {
           $charge = sprintf("%.02f", $rate_detail->conn_charge);
 
           my $total_minutes = 0;
+          my $whole_minutes = 1;
           my $etime;
           while($seconds_left) {
             my $ratetimenum = $rate_detail->ratetimenum; # may be empty
@@ -632,12 +648,12 @@ sub calc_usage {
             my $charge_sec = min($seconds_left, $etime - $weektime);
 
             $seconds_left -= $charge_sec;
-            $seconds += $charge_sec;
 
             $included_min{$regionnum}{$ratetimenum} = $rate_detail->min_included
               unless exists $included_min{$regionnum}{$ratetimenum};
 
             my $granularity = $rate_detail->sec_granularity;
+            $whole_minutes = 0 if $granularity;
 
             # should this be done in every rate interval?
             $charge_sec += $granularity - ( $charge_sec % $granularity )
@@ -646,6 +662,8 @@ sub calc_usage {
             my $minutes = sprintf("%.1f", $charge_sec / 60);
             $minutes =~ s/\.0$// if $granularity == 60;
 
+            $seconds += $charge_sec;
+
             # per call rather than per minute
             $minutes = 1 unless $granularity;
             $seconds_left = 0 unless $granularity;
@@ -658,7 +676,6 @@ sub calc_usage {
               $included_min{$regionnum}{$ratetimenum} = 0;
               $charge += sprintf('%.2f', ($rate_detail->min_charge * $charge_min)
                                          + 0.00000001 ); #so 1.005 rounds to 1.01
-              $total_minutes += $minutes;
             }
 
             # choose next rate_detail
@@ -673,6 +690,9 @@ sub calc_usage {
           # this is why we need regionnum/rate_region....
           warn "  (rate region $rate_region)\n" if $DEBUG;
 
+          $total_minutes = sprintf("%.1f", $seconds / 60);
+          $total_minutes =~ s/\.0$// if $whole_minutes;
+
           $classnum = $rate_detail->classnum;
           $charge = sprintf('%.2f', $charge);
 
@@ -680,6 +700,10 @@ sub calc_usage {
             $cdr->downstream_csv( 'format'         => $output_format,
                                   'granularity'    => $rate_detail->sec_granularity, 
                                   'minutes'        => $total_minutes,
+                                  # why do we go through this hocus-pocus?
+                                  # the cdr *will* show duration here
+                                  # if we forego the 'minutes' key
+                                  # duration vs billsec?
                                   'charge'         => $charge,
                                   'pretty_dst'     => $pretty_destnum,
                                   'dst_regionname' => $regionname,