X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=79e50b5ca1fbbcab6cc1db5a175ad553fe5ed6a5;hb=94babe5baffcfeac78d5bf770a839abc85803b6a;hp=794ae010f44dd3a066f492756c05c67c33410fd6;hpb=3b97735238d919ed548bfb17aea8162623c1d286;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 794ae010f..79e50b5ca 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -8,8 +8,9 @@ use FS::Conf;
 use FS::Record qw(qsearchs qsearch);
 use FS::part_pkg::flat;
 use FS::cdr;
-#use FS::rate;
-#use FS::rate_prefix;
+use FS::rate;
+use FS::rate_prefix;
+use FS::rate_detail;
 
 @ISA = qw(FS::part_pkg::flat);
 
@@ -80,10 +81,14 @@ tie my %temporalities, 'Tie::IxHash',
 #                                    'type' => 'checkbox',
 #                                  },
 
-    'international_prefix' => { 'name'    => 'Destination prefix(es) for international CDR records.  Separate multiple options with commas.',
+    'international_prefix' => { 'name'    => 'Destination prefix for international CDR records',
                                 'default' => '011',
                               },
 
+    'disable_tollfree' => { 'name' => 'Disable automatic toll-free processing',
+                            'type' => 'checkbox',
+                          },
+
     'use_amaflags' => { 'name' => 'Do not charge for CDRs where the amaflags field is not set to "2" ("BILL"/"BILLING").',
                         'type' => 'checkbox',
                       },
@@ -102,12 +107,17 @@ tie my %temporalities, 'Tie::IxHash',
     'use_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is not set to: ',
                          },
 
+    'use_duration'   => { 'name' => 'Calculate usage based on the duration field instead of the billsec field',
+                          'type' => 'checkbox',
+                        },
+
     '411_rewrite' => { 'name' => 'Rewrite these (comma-separated) destination numbers to 411 for rating purposes: ',
                       },
 
     'output_format' => { 'name' => 'Simple output format',
                          'type' => 'select',
                          'select_options' => { FS::cdr::invoice_formats() },
+                         'default'        => 'default', #XXX test
                        },
 
     'usage_section' => { 'name' => 'Section in which to place separate usage charges',
@@ -117,6 +127,10 @@ tie my %temporalities, 'Tie::IxHash',
                           'type' => 'checkbox',
                         },
 
+    'bill_every_call' => { 'name' => 'Generate an invoice immediately for every call.  Useful for prepaid.',
+                           'type' => 'checkbox',
+                         },
+
     #XXX also have option for an external db
 #    'cdr_location' => { 'name' => 'CDR database location'
 #                        'type' => 'select',
@@ -147,10 +161,13 @@ tie my %temporalities, 'Tie::IxHash',
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
+                       disable_tollfree
                        use_amaflags use_disposition
                        use_disposition_taqua use_carrierid use_cdrtypenum
+                       use_duration
                        411_rewrite
                        output_format summarize_usage usage_section
+                       bill_every_call
                      )
                   ],
   'weight' => 40,
@@ -181,8 +198,11 @@ sub calc_recur {
 
   my $downstream_cdr = '';
 
-  my $output_format = $self->option('output_format', 'Hush!')
-                      || 'simple';
+  my $rating_method = $self->option('rating_method') || 'prefix';
+
+  my $output_format =
+    $self->option('output_format', 'Hush!')
+    || ( $rating_method eq 'upstream_simple' ? 'simple' : 'default' );
 
   eval "use Text::CSV_XS;";
   die $@ if $@;
@@ -208,10 +228,7 @@ sub calc_recur {
       my $charge = '';
       my $classnum = '';
       my @call_details = ();
-      if ( $self->option('rating_method') eq 'prefix'
-           || ! $self->option('rating_method')
-         )
-      {
+      if ( $rating_method eq 'prefix' ) {
 
         #should have some better way of checking these options than a long
         #if-else tree...
@@ -261,7 +278,10 @@ sub calc_recur {
           }
 
           my( $to_or_from, $number );
-          if ( $cdr->dst =~ /^(\+?1)?8([02-8])\1/ ) { #tollfree call
+          if ( $cdr->dst =~ /^(\+?1)?8([02-8])\1/
+               && ! $self->option('disable_tollfree')
+              )
+          { #tollfree call
             $to_or_from = 'from';
             $number = $cdr->src;
           } else { #regular call
@@ -269,6 +289,8 @@ sub calc_recur {
             $number = $cdr->dst;
           }
 
+          warn "parsing call $to_or_from $number\n" if $DEBUG;
+
           #remove non-phone# stuff and whitespace
           $number =~ s/\s//g;
 #          my $proto = '';
@@ -277,23 +299,13 @@ sub calc_recur {
 #          $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
 
           my $intl = $self->option('international_prefix') || '011';
-          my @intl = ();
-          if ( $intl =~ /,/ ) {
-            @intl = split(/\s*,\s*/, $intl);
-          } else {
-            @intl = ($intl);
-          }
 
           #determine the country code
-          my $intl_match = 0;
-          foreach my $i (@intl) {
-            if ( $number =~ /^$i(((\d)(\d))(\d))(\d+)$/ ) {
-              $intl_match++;
-              last;
-            }
-          }
           my $countrycode;
-          if ( $intl_match || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ ) {
+          if (    $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/
+               || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
+             )
+          {
 
             my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
             #first look for 1 digit country code
@@ -316,32 +328,15 @@ sub calc_recur {
           warn "rating call $to_or_from +$countrycode $number\n" if $DEBUG;
           $pretty_destnum = "+$countrycode $number";
 
-          #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
-          # finally trying the country code only
-          my $rate_prefix = '';
-          for my $len ( reverse(1..6) ) {
-            $rate_prefix = qsearchs('rate_prefix', {
-              'countrycode' => $countrycode,
-              #'npa'         => { op=> 'LIKE', value=> substr($number, 0, $len) }
-              'npa'         => substr($number, 0, $len),
-            } ) and last;
-          }
-          $rate_prefix ||= qsearchs('rate_prefix', {
-            'countrycode' => $countrycode,
-            'npa'         => '',
-          });
-
-          #
-          die "Can't find rate for call $to_or_from +$countrycode $number\n"
-            unless $rate_prefix;
+          my $rate = qsearchs('rate', { 'ratenum' => $ratenum })
+            or die "ratenum $ratenum not found!";
 
-          $regionnum = $rate_prefix->regionnum;
-          $rate_detail = qsearchs('rate_detail', {
-            'ratenum'        => $ratenum,
-            'dest_regionnum' => $regionnum,
-          } );
+          $rate_detail = $rate->dest_detail({ 'countrycode' => $countrycode,
+                                              'phonenum'    => $number,
+                                            });
 
-          $rate_region = $rate_prefix->rate_region;
+          $rate_region = $rate_detail->dest_region;
+          $regionnum = $rate_region->regionnum;
 
           warn "  found rate for regionnum $regionnum ".
                "and rate detail $rate_detail\n"
@@ -349,7 +344,7 @@ sub calc_recur {
 
         }
 
-      } elsif ( $self->option('rating_method') eq 'upstream' ) {
+      } elsif ( $rating_method eq 'upstream' ) { #XXX this was convergent, not currently used.  very much becoming the odd one out. remove?
 
         if ( $cdr->cdrtypenum == 1 ) { #rate based on upstream rateid
 
@@ -380,7 +375,7 @@ sub calc_recur {
 
         }
 
-      } elsif ( $self->option('rating_method') eq 'upstream_simple' ) {
+      } elsif ( $rating_method eq 'upstream_simple' ) {
 
         #XXX $charge = sprintf('%.2f', $cdr->upstream_price);
         $charge = sprintf('%.3f', $cdr->upstream_price);
@@ -389,8 +384,7 @@ sub calc_recur {
         @call_details = ($cdr->downstream_csv( 'format' => $output_format ));
 
       } else {
-        die "don't know how to rate CDRs using method: ".
-            $self->option('rating_method'). "\n";
+        die "don't know how to rate CDRs using method: $rating_method\n";
       }
 
       ###
@@ -401,7 +395,7 @@ sub calc_recur {
       # don't add it to invoice, don't set its status to NULL,
       # don't call downstream_csv or something on it...
       # but DO emit a warning...
-      #if ( ! $rate_detail && ! scalar(@call_details) ) {
+      #if ( ! $rate_detail && ! scalar(@call_details) ) {}
       if ( ! $rate_detail && $charge eq '' ) {
 
         warn "no rate_detail found for CDR.acctid:  ". $cdr->acctid.
@@ -415,7 +409,12 @@ sub calc_recur {
             unless exists $included_min{$regionnum};
 
           my $granularity = $rate_detail->sec_granularity;
-          my $seconds = $cdr->billsec; # length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
+
+                      # length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
+          my $seconds = $self->option('use_duration')
+                          ? $cdr->duration
+                          : $cdr->billsec;
+
           $seconds += $granularity - ( $seconds % $granularity )
             if $seconds      # don't granular-ize 0 billsec calls (bills them)
             && $granularity; # 0 is per call
@@ -438,12 +437,13 @@ sub calc_recur {
           warn "  (rate region $rate_region)\n" if $DEBUG;
 
           @call_details = (
-            #time2str("%Y %b %d - %r", $cdr->calldate_unix ),
-            time2str("%c", $cdr->calldate_unix),  #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot
-            $granularity ? $minutes.'m' : $minutes.' call',
-            '$'.$charge,
-            $pretty_destnum,
-            $rate_region->regionname,
+           $cdr->downstream_csv( 'format'         => $output_format,
+                                 'granularity'    => $granularity,
+                                 'minutes'        => $minutes,
+                                 'charge'         => $charge,
+                                 'pretty_dst'     => $pretty_destnum,
+                                 'dst_regionname' => $rate_region->regionname,
+                               )
           );
 
           $classnum = $rate_detail->classnum;
@@ -453,9 +453,11 @@ sub calc_recur {
         if ( $charge > 0 ) {
           #just use FS::cust_bill_pkg_detail objects?
           my $call_details;
-          if ( $self->option('rating_method') eq 'upstream_simple' ) {
+
+          #if ( $self->option('rating_method') eq 'upstream_simple' ) {
+          if ( scalar(@call_details) == 1 ) {
             $call_details = [ 'C', $call_details[0], $charge, $classnum ];
-          }else{
+          } else { #only used for $rating_method eq 'upstream' now
             $csv->combine(@call_details);
             $call_details = [ 'C', $csv->string, $charge, $classnum ];
           }
@@ -478,11 +480,11 @@ sub calc_recur {
 
     } # $cdr
 
-    unshift @$details, [ 'C', FS::cdr::invoice_header( $output_format) ]
-      if (@$details && $self->option('rating_method') eq 'upstream_simple' );
-
   } # $cust_svc
 
+  unshift @$details, [ 'C', FS::cdr::invoice_header($output_format) ]
+    if @$details && $rating_method ne 'upstream';
+
   if ( $spool_cdr && length($downstream_cdr) ) {
 
     use FS::UID qw(datasrc);
@@ -510,8 +512,10 @@ sub calc_recur {
 
   } #if ( $spool_cdr && length($downstream_cdr) )
 
-  $self->option('recur_fee') + $charges;
+  $charges += $self->option('recur_fee')
+    if $param->{'increment_next_bill'};
 
+  $charges;
 }
 
 sub is_free {