X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=b92cb47023716a28be7ce32481f483182c8b1ccb;hb=8291a2d7cc38b1fcbe081da2bd78d4250a993250;hp=7f4f7c98e218e49f241e2b7ea90d364f9e9cf65b;hpb=d8c2d2e79098ec7e0936b50f215eb41de00bc122;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 7f4f7c98e..b92cb4702 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -43,11 +43,11 @@ tie my %temporalities, 'Tie::IxHash',
 
 tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
 
-# previously "1" was "ignore 
+# previously "1" was "ignore"
 tie my %unrateable_opts, 'Tie::IxHash',
-  ''  => 'Exit with a fatal error',
-  1   => 'Flag for later review',
-  2   => 'Ignore and continue',
+  '' => 'Exit with a fatal error',
+  1  => 'Ignore and continue',
+  2  => 'Flag for later review',
 ;
 
 %info = (
@@ -403,6 +403,7 @@ sub calc_usage {
     my %options = (
         'disable_src'    => $self->option('disable_src'),
         'default_prefix' => $self->option('default_prefix'),
+        'cdrtypenum'     => $self->option('use_cdrtypenum'),
         'status'         => '',
         'for_update'     => 1,
       );  # $last_bill, $$sdate )
@@ -434,6 +435,8 @@ sub calc_usage {
       if ( $rating_method eq 'prefix' ) {
 
         my $da_rewrote = 0;
+        # this will result in those CDRs being marked as done... is that 
+        # what we want?
         if ( length($cdr->dst) && grep { $cdr->dst eq $_ } @dirass ){
           $cdr->dst('411');
           $da_rewrote = 1;
@@ -448,6 +451,8 @@ sub calc_usage {
 
           warn "not charging for CDR ($reason)\n" if $DEBUG;
           $charge = 0;
+          # this will result in those CDRs being marked as done... is that 
+          # what we want?
 
         } else {
           
@@ -646,11 +651,6 @@ sub calc_usage {
       if ( ! $rate_detail && $charge eq '' ) {
 
         if ( $ignore_unrateable == 2 ) {
-          # throw a warning--not recommended
-          warn "no rate_detail found for CDR.acctid: ". $cdr->acctid.
-               "; skipping\n"
-        }
-        else {
           # mark the CDR as unrateable
           my $error = $cdr->set_status_and_rated_price(
             'failed',
@@ -658,7 +658,12 @@ sub calc_usage {
             $cust_svc->svcnum
           );
           die $error if $error;
-        }#if $ignore_unrateable
+        }
+        elsif ( $ignore_unrateable == 1 ) {
+          # warn and continue
+          warn "no rate_detail found for CDR.acctid: ". $cdr->acctid.
+               "; skipping\n"
+        } #if $ignore_unrateable
 
       } else { # there *is* a rate_detail (or call_details), proceed...
         # About this section:
@@ -767,56 +772,57 @@ sub calc_usage {
           warn "Incrementing \$charges by $charge.  Now $charges\n" if $DEBUG;
           $charges += $charge;
 
-          @call_details = (
-            $cdr->downstream_csv( 'format'         => $output_format,
-                                  'granularity'    => $rate_detail->sec_granularity, 
-                                  'seconds'        => ($use_duration ?
-                                                       $cdr->duration :
-                                                       $cdr->billsec),
-                                  'charge'         => $charge,
-                                  'pretty_dst'     => $pretty_destnum,
-                                  'dst_regionname' => $regionname,
-                                )
-          );
+          if ( !$self->sum_usage ) {
+            @call_details = (
+              $cdr->downstream_csv( 'format'         => $output_format,
+                                    'granularity'    => $rate_detail->sec_granularity, 
+                                    'seconds'        => ($use_duration ?
+                                                         $cdr->duration :
+                                                         $cdr->billsec),
+                                    'charge'         => $charge,
+                                    'pretty_dst'     => $pretty_destnum,
+                                    'dst_regionname' => $regionname,
+                                  )
+            );
+          }
         } #if(there is a rate_detail)
  
 
-        if ( $charge > 0 ) {
-          #just use FS::cust_bill_pkg_detail objects?
-          my $call_details;
-          my $phonenum = $svc_x->phonenum;
-
-          if ( scalar(@call_details) == 1 ) {
-            $call_details =
-              { format      => 'C',
-                detail      => $call_details[0],
-                amount      => $charge,
-                classnum    => $classnum,
-                phonenum    => $phonenum,
-                accountcode => $cdr->accountcode,
-                startdate   => $cdr->startdate,
-                duration    => $seconds,
-                regionname  => $regionname,
-              };
-          } else { #only used for $rating_method eq 'upstream' now
-            $csv->combine(@call_details);
-            $call_details =
-              { format      => 'C',
-                detail      => $csv->string,
-                amount      => $charge,
-                classnum    => $classnum,
-                phonenum    => $phonenum,
-                accountcode => $cdr->accountcode,
-                startdate   => $cdr->startdate,
-                duration    => $seconds,
-                regionname  => $regionname,
-              };
-          }
-          #warn "  adding details on charge to invoice: [ ".
-          #    join(', ', @{$call_details} ). " ]"
-          #  if ( $DEBUG && ref($call_details) );
-          push @invoice_details_sort, [ $call_details, $cdr->calldate_unix ];
+        #if ( $charge > 0 ) {
+        # generate a detail record for every call; filter out $charge = 0 
+        # later.
+        my $call_details;
+        my $phonenum = $svc_x->phonenum;
+
+        if ( scalar(@call_details) == 1 ) {
+          $call_details =
+          { format      => 'C',
+            detail      => $call_details[0],
+            amount      => $charge,
+            classnum    => $classnum,
+            phonenum    => $phonenum,
+            accountcode => $cdr->accountcode,
+            startdate   => $cdr->startdate,
+            duration    => $seconds,
+            regionname  => $regionname,
+          };
+        } else { #only used for $rating_method eq 'upstream' now
+          # and for sum_ formats
+          $csv->combine(@call_details);
+          $call_details =
+          { format      => 'C',
+            detail      => $csv->string,
+            amount      => $charge,
+            classnum    => $classnum,
+            phonenum    => $phonenum,
+            accountcode => $cdr->accountcode,
+            startdate   => $cdr->startdate,
+            duration    => $seconds,
+            regionname  => $regionname,
+          };
         }
+        push @invoice_details_sort, [ $call_details, $cdr->calldate_unix ];
+        #} $charge > 0
 
         # if the customer flag is on, call "downstream_csv" or something
         # like it to export the call downstream!
@@ -833,12 +839,19 @@ sub calc_usage {
       }
 
     } # $cdr
- 
-    my @sorted_invoice_details = sort { @{$a}[1] <=> @{$b}[1] } @invoice_details_sort;
-    foreach my $sorted_call_detail ( @sorted_invoice_details ) {
-        push @$details, @{$sorted_call_detail}[0];
-    }
 
+    if ( !$self->sum_usage ) {
+      #sort them
+      my @sorted_invoice_details = 
+        sort { @{$a}[1] <=> @{$b}[1] } @invoice_details_sort;
+      foreach my $sorted_call_detail ( @sorted_invoice_details ) {
+        my $d = $sorted_call_detail->[0];
+        push @$details, $d if $d->{amount} > 0;
+      }
+    }
+    else { #$self->sum_usage
+        push @$details, $self->sum_detail($svc_x, \@invoice_details_sort);
+    }
   } # $cust_svc
 
   unshift @$details, { format => 'C',
@@ -846,33 +859,6 @@ sub calc_usage {
                      }
     if @$details && $rating_method ne 'upstream';
 
-#  if ( $spool_cdr && length($downstream_cdr) ) {
-#
-#    use FS::UID qw(datasrc);
-#    my $dir = '/usr/local/etc/freeside/export.'. datasrc. '/cdr';
-#    mkdir $dir, 0700 unless -d $dir;
-#    $dir .= '/'. $cust_pkg->custnum.
-#    mkdir $dir, 0700 unless -d $dir;
-#    my $filename = time2str("$dir/CDR%Y%m%d-spool.CSV", time); #XXX invoice date instead?  would require changing the order things are generated in cust_main::bill insert cust_bill first - with transactions it could be done though
-#
-#    push @{ $param->{'precommit_hooks'} },
-#         sub {
-#               #lock the downstream spool file and append the records 
-#               use Fcntl qw(:flock);
-#               use IO::File;
-#               my $spool = new IO::File ">>$filename"
-#                 or die "can't open $filename: $!\n";
-#               flock( $spool, LOCK_EX)
-#                 or die "can't lock $filename: $!\n";
-#               seek($spool, 0, 2)
-#                 or die "can't seek to end of $filename: $!\n";
-#               print $spool $downstream_cdr;
-#               flock( $spool, LOCK_UN );
-#               close $spool;
-#             };
-#
-#  } #if ( $spool_cdr && length($downstream_cdr) )
-
   $charges;
 }
 
@@ -924,6 +910,7 @@ sub check_chargable {
     && $cdr->carrierid ne $opt{'use_carrierid'} #ne otherwise 0 matches ''
     && ! $flags{'da_rewrote'};
 
+  # unlike everything else, use_cdrtypenum is applied in FS::svc_x::get_cdrs.
   return "cdrtypenum != $opt{'use_cdrtypenum'}"
     if length($opt{'use_cdrtypenum'})
     && $cdr->cdrtypenum ne $opt{'use_cdrtypenum'}; #ne otherwise 0 matches ''
@@ -1000,5 +987,55 @@ sub calc_units {
   $count;
 }
 
+# tells whether cust_bill_pkg_detail should return a single line for 
+# each phonenum
+sub sum_usage {
+  my $self = shift;
+  $self->option('output_format') =~ /^sum_/;
+}
+
+sub sum_detail {
+  my $self = shift;
+  my $svc_x = shift;
+  my $invoice_details = shift || [];
+  my $count = scalar(@$invoice_details);
+  return () if !$count;
+  my $sum_detail = {
+    amount    => 0,
+    format    => 'C',
+    classnum  => '', #XXX
+    duration  => 0,
+    phonenum  => $svc_x->phonenum,
+    accountcode => '', #XXX
+    startdate => '', #XXX
+    regionnam => '',
+  };
+  # combine the entire set of CDRs
+  foreach ( @$invoice_details ) {
+    $sum_detail->{amount} += $_->[0]{amount};
+    $sum_detail->{duration} += $_->[0]{duration};
+  }
+  my $total_cdr = FS::cdr->new({
+      'billsec' => $sum_detail->{duration},
+      'src'     => $sum_detail->{phonenum},
+    });
+  $sum_detail->{detail} = $total_cdr->downstream_csv(
+    format    => $self->option('output_format'),
+    seconds   => $sum_detail->{duration},
+    charge    => sprintf('%.2f',$sum_detail->{amount}),
+    phonenum  => $sum_detail->{phonenum},
+    count     => $count,
+  );
+  return $sum_detail;
+}
+
+# and whether cust_bill should show a detail line for the service label 
+# (separate from usage details)
+sub hide_svc_detail {
+  my $self = shift;
+  $self->option('output_format') =~ /^sum_/;
+}
+
+
 1;