fix harmless cdr_svc_method noise, RT#9428

[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 f589580..984a650 100644 (file)
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -149,6 +149,9 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
     'use_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is not set to: ',
                          },
 
+    'skip_dst_prefix' => { 'name' => 'Do not charge for CDRs where the destination number starts with any of these values:',
+    },
+
     'skip_dcontext' => { 'name' => 'Do not charge for CDRs where the dcontext is set to any of these (comma-separated) values:',
                        },
 
@@ -248,8 +251,9 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
                        disable_tollfree
                        use_amaflags use_disposition
                        use_disposition_taqua use_carrierid use_cdrtypenum
-                       skip_dcontext skip_dstchannel_prefix
-                       skip_src_length_more noskip_src_length_accountcode_tollfree
+                       skip_dcontext skip_dst_prefix 
+                       skip_dstchannel_prefix skip_src_length_more 
+                       noskip_src_length_accountcode_tollfree
                        accountcode_tollfree_ratenum
                        skip_dst_length_less skip_lastapp
                        use_duration
@@ -310,7 +314,7 @@ sub calc_usage {
 
 #  my $downstream_cdr = '';
 
-  my $cdr_svc_method    = $self->option('cdr_svc_method')||'svc_phone.phonenum';
+  my $cdr_svc_method    = $self->option('cdr_svc_method',1)||'svc_phone.phonenum';
   my $rating_method     = $self->option('rating_method') || 'prefix';
   my $intl              = $self->option('international_prefix') || '011';
   my $domestic_prefix   = $self->option('domestic_prefix');
@@ -609,6 +613,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
@@ -647,12 +652,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 )
@@ -661,6 +666,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;
@@ -673,7 +680,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
@@ -688,6 +694,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);
 
@@ -695,6 +704,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,
@@ -810,6 +823,7 @@ sub check_chargable {
     use_disposition_taqua
     use_carrierid
     use_cdrtypenum
+    skip_dst_prefix
     skip_dcontext
     skip_dstchannel_prefix
     skip_src_length_more noskip_src_length_accountcode_tollfree
@@ -839,6 +853,11 @@ sub check_chargable {
     if length($opt{'use_cdrtypenum'})
     && $cdr->cdrtypenum ne $opt{'use_cdrtypenum'}; #ne otherwise 0 matches ''
 
+  foreach(split(',',$opt{'skip_dst_prefix'})) {
+    return "dst starts with '$_'"
+    if length($_) && substr($cdr->dst,0,length($_)) eq $_;
+  }
+
   return "dcontext IN ( $opt{'skip_dcontext'} )"
     if $opt{'skip_dcontext'} =~ /\S/
     && grep { $cdr->dcontext eq $_ } split(/\s*,\s*/, $opt{'skip_dcontext'});