X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=614ea82666290062b284618ba8edf8e51851e7bc;hb=e6820a61a43c840ef08a11bdda41507dac2a9ff7;hp=600971fddc489f6022630711609061fb4225db14;hpb=651978522cbf3f9ec72828e85d9184d2d61b2656;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 600971fdd..614ea8266 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -6,20 +6,27 @@ use Date::Format;
 use Tie::IxHash;
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch);
-use FS::part_pkg::flat;
+use FS::part_pkg::recur_Common;
 use FS::cdr;
 use FS::rate;
 use FS::rate_prefix;
 use FS::rate_detail;
+use FS::part_pkg::recur_Common;
 
-@ISA = qw(FS::part_pkg::flat);
+@ISA = qw(FS::part_pkg::recur_Common);
 
 $DEBUG = 1;
 
+tie my %cdr_svc_method, 'Tie::IxHash',
+  'svc_phone.phonenum' => 'Phone numbers (svc_phone.phonenum)',
+  'svc_pbx.title'      => 'PBX name (svc_pbx.title)',
+;
+
 tie my %rating_method, 'Tie::IxHash',
   'prefix' => 'Rate calls by using destination prefix to look up a region and rate according to the internal prefix and rate tables',
-  'upstream' => 'Rate calls based on upstream data: If the call type is "1", map the upstream rate ID directly to an internal rate (rate_detail), otherwise, pass the upstream price through directly.',
+#  'upstream' => 'Rate calls based on upstream data: If the call type is "1", map the upstream rate ID directly to an internal rate (rate_detail), otherwise, pass the upstream price through directly.',
   'upstream_simple' => 'Simply pass through and charge the "upstream_price" amount.',
+  'single_price' => 'A single price per minute for all calls.',
 ;
 
 #tie my %cdr_location, 'Tie::IxHash',
@@ -33,6 +40,8 @@ tie my %temporalities, 'Tie::IxHash',
   'preceding' => "Preceding (past)",
 ;
 
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
+
 %info = (
   'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
   'shortname' => 'VoIP/telco CDR rating (standard)',
@@ -54,16 +63,47 @@ tie my %temporalities, 'Tie::IxHash',
                                    ' of service at cancellation',
                          'type' => 'checkbox',
                        },
+
+    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating or '.
+                                   'subscription',
+                         'default' => '1',
+                       },
+
+    'recur_method'  => { 'name' => 'Recurring fee method',
+                         #'type' => 'radio',
+                         #'options' => \%recur_method,
+                         'type' => 'select',
+                         'select_options' => \%FS::part_pkg::recur_Common::recur_method,
+                       },
+
+    'cdr_svc_method' => { 'name' => 'CDR service matching method',
+                          'type' => 'radio',
+                          'options' => \%cdr_svc_method,
+                        },
+
+    'rating_method' => { 'name' => 'Rating method',
+                         'type' => 'radio',
+                         'options' => \%rating_method,
+                       },
+
     'ratenum'   => { 'name' => 'Rate plan',
                      'type' => 'select',
                      'select_table' => 'rate',
                      'select_key'   => 'ratenum',
                      'select_label' => 'ratename',
                    },
-    'rating_method' => { 'name' => 'Region rating method',
-                         'type' => 'radio',
-                         'options' => \%rating_method,
-                       },
+
+    'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
+                    },
+
+    'sec_granularity' => { 'name' => 'Granularity when using "single price per minute" rating method',
+                           'type' => 'select',
+                           'select_options' => \%granularity,
+                         },
+
+    'ignore_unrateable' => { 'name' => 'Ignore calls without a rate in the rate tables.  By default, the system will throw a fatal error upon encountering unrateable calls.',
+                             'type' => 'checkbox',
+                           },
 
     'default_prefix' => { 'name'    => 'Default prefix optionally prepended to customer DID numbers when searching for CDR records',
                           'default' => '+1',
@@ -107,29 +147,59 @@ tie my %temporalities, 'Tie::IxHash',
     'use_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is not set to: ',
                          },
 
+    'skip_dcontext' => { 'name' => 'Do not charge for CDRs where the dcontext is set to any of these (comma-separated) values:',
+                       },
+
+    'skip_dstchannel_prefix' => { 'name' => 'Do not charge for CDRs where the dstchannel starts with:',
+                                },
+
+    'skip_src_length_more' => { 'name' => 'Do not charge for CDRs where the source is more than this many digits:',
+                              },
+
+    'noskip_src_length_accountcode_tollfree' => { 'name' => 'Do charge for CDRs where source is equal or greater than the specified digits and accountcode is toll free',
+                                                  'type' => 'checkbox',
+                                                },
+
+    'skip_dst_length_less' => { 'name' => 'Do not charge for CDRs where the destination is less than this many digits:',
+                              },
+
+    'skip_lastapp' => { 'name' => 'Do not charge for CDRs where the lastapp matches this value',
+                      },
+
     '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: ',
+    '411_rewrite' => { 'name' => 'Rewrite these (comma-separated) destination numbers to 411 for rating purposes (also ignore any carrierid check): ',
                       },
 
-    'output_format' => { 'name' => 'Simple output format',
+    #false laziness w/cdr_termination.pm
+    'output_format' => { 'name' => 'CDR invoice display format',
                          'type' => 'select',
                          'select_options' => { FS::cdr::invoice_formats() },
+                         'default'        => 'default', #XXX test
                        },
 
-    'usage_section' => { 'name' => 'Section in which to place separate usage charges',
+    'usage_section' => { 'name' => 'Section in which to place usage charges (whether separated or not)',
                        },
 
     'summarize_usage' => { 'name' => 'Include usage summary with recurring charges when usage is in separate section',
                           'type' => 'checkbox',
                         },
 
+    'usage_mandate' => { 'name' => 'Always put usage details in separate section',
+                          'type' => 'checkbox',
+                       },
+    #eofalse
+
     'bill_every_call' => { 'name' => 'Generate an invoice immediately for every call.  Useful for prepaid.',
                            'type' => 'checkbox',
                          },
 
+    'count_available_phones' => { 'name' => 'Consider for tax purposes the number of lines to be svc_phones that may be provisioned rather than those that actually are.',
+                           'type' => 'checkbox',
+                         },
+
     #XXX also have option for an external db
 #    'cdr_location' => { 'name' => 'CDR database location'
 #                        'type' => 'select',
@@ -156,17 +226,24 @@ tie my %temporalities, 'Tie::IxHash',
   },
   'fieldorder' => [qw(
                        setup_fee recur_fee recur_temporality unused_credit
-                       rating_method ratenum 
+                       recur_method cutoff_day
+                       cdr_svc_method
+                       rating_method ratenum min_charge sec_granularity
+                       ignore_unrateable
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
                        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_dst_length_less skip_lastapp
                        use_duration
                        411_rewrite
-                       output_format summarize_usage usage_section
+                       output_format usage_mandate summarize_usage usage_section
                        bill_every_call
+                       count_available_phones
                      )
                   ],
   'weight' => 40,
@@ -177,15 +254,38 @@ sub calc_setup {
   $self->option('setup_fee');
 }
 
-#false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again
 sub calc_recur {
-  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
+
+  my $charges = 0;
+
+  $charges += $self->calc_usage(@_);
+  $charges += $self->calc_recur_Common(@_);
+
+  $charges;
+
+}
+
+sub calc_cancel {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
+
+  $self->calc_usage(@_);
+}
+
+#false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again
+
+sub calc_usage {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
 
   #my $last_bill = $cust_pkg->last_bill;
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
+    if $self->option('recur_temporality', 1) eq 'preceding'
+    && ( $last_bill eq '' || $last_bill == 0 );
 
   my $ratenum = $cust_pkg->part_pkg->option('ratenum');
 
@@ -195,23 +295,50 @@ sub calc_recur {
 
   my $charges = 0;
 
-  my $downstream_cdr = '';
+#  my $downstream_cdr = '';
+
+  my $cdr_svc_method    = $self->option('cdr_svc_method')||'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');
+  my $disable_tollfree  = $self->option('disable_tollfree');
+  my $ignore_unrateable = $self->option('ignore_unrateable', 'Hush!');
+  my $use_duration      = $self->option('use_duration');
+
+  my $output_format     = $self->option('output_format', 'Hush!')
+                          || ( $rating_method eq 'upstream_simple'
+                                 ? 'simple'
+                                 : 'default'
+                             );
 
-  my $output_format = $self->option('output_format', 'Hush!')
-                      || 'simple';
+  my @dirass = ();
+  if ( $self->option('411_rewrite') ) {
+    my $dirass = $self->option('411_rewrite');
+    $dirass =~ s/\s//g;
+    @dirass = split(',', $dirass);
+  }
+
+  #for check_chargable, so we don't keep looking up options inside the loop
+  my %opt_cache = ();
 
   eval "use Text::CSV_XS;";
   die $@ if $@;
   my $csv = new Text::CSV_XS;
 
+  my($svc_table, $svc_field) = split('.', $cdr_svc_method);
+
   foreach my $cust_svc (
-    grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc
+    grep { $_->part_svc->svcdb eq $svc_table } $cust_pkg->cust_svc
   ) {
 
+    my $svc_x = $cust_svc->svc_x;
     foreach my $cdr (
-      $cust_svc->get_cdrs_for_update( 'disable_src'    => $self->option('disable_src'),
-                                      'default_prefix' => $self->option('default_prefix'),
-                                    )  # $last_bill, $$sdate )
+      $svc_x->get_cdrs(
+        'disable_src'    => $self->option('disable_src'),
+        'default_prefix' => $self->option('default_prefix'),
+        'status'         => '',
+        'for_update'     => 1,
+      )  # $last_bill, $$sdate )
     ) {
       if ( $DEBUG > 1 ) {
         warn "rating CDR $cdr\n".
@@ -222,64 +349,37 @@ sub calc_recur {
       my( $rate_region, $regionnum );
       my $pretty_destnum;
       my $charge = '';
+      my $seconds = '';
+      my $regionname = '';
       my $classnum = '';
       my @call_details = ();
-      if ( $self->option('rating_method') eq 'prefix'
-           || ! $self->option('rating_method')
-         )
-      {
-
-        #should have some better way of checking these options than a long
-        #if-else tree...
-        my $notchg = "not charging for CDR";
-
-        if ( $self->option('use_amaflags') && $cdr->amaflags != 2 ) {
-
-          warn "$notchg (amaflags != 2)\n" if $DEBUG;
-          $charge = 0;
-
-        } elsif ( $self->option('use_disposition')
-                  && $cdr->disposition ne 'ANSWERED' ) {
-
-          warn "$notchg (disposition != ANSWERED)\n" if $DEBUG;
-          $charge = 0;
+      if ( $rating_method eq 'prefix' ) {
 
-        } elsif ( $self->option('use_disposition_taqua')
-                  && $cdr->disposition != 100 ) {
-
-          warn "$notchg (disposition != 100)\n" if $DEBUG;
-          $charge = 0;
-
-        } elsif ( $self->option('use_carrierid')
-                  && $cdr->carrierid != $self->option('use_carrierid') ) {
+        my $da_rewrote = 0;
+        if ( length($cdr->dst) && grep { $cdr->dst eq $_ } @dirass ){
+          $cdr->dst('411');
+          $da_rewrote = 1;
+        }
 
-          warn "$notchg (carrierid != ". $self->option('use_carrierid'). ")\n"
-            if $DEBUG;
-          $charge = 0;
+        my $reason = $self->check_chargable( $cdr,
+                                             'da_rewrote'   => $da_rewrote,
+                                             'option_cache' => \%opt_cache,
+                                           );
 
-        } elsif ( $self->option('use_cdrtypenum')
-                  && $cdr->cdrtypenum != $self->option('use_cdrtypenum') ) {
+        if ( $reason ) {
 
-          warn "$notchg (cdrtypenum != ". $self->option('use_cdrtypenum'). ")\n"
-            if $DEBUG;
+          warn "not charging for CDR ($reason)\n" if $DEBUG;
           $charge = 0;
 
         } else {
-
+          
           ###
           # look up rate details based on called station id
           # (or calling station id for toll free calls)
           ###
 
-          if ( $self->option('411_rewrite') ) {
-            my @dirass = split(/\s*,\s*/, $self->option('411_rewrite'));
-            $cdr->dst('411') if grep $cdr->dst eq $_, @dirass;
-          }
-
           my( $to_or_from, $number );
-          if ( $cdr->dst =~ /^(\+?1)?8([02-8])\1/
-               && ! $self->option('disable_tollfree')
-              )
+          if ( $cdr->is_tollfree && ! $disable_tollfree )
           { #tollfree call
             $to_or_from = 'from';
             $number = $cdr->src;
@@ -297,8 +397,6 @@ sub calc_recur {
 #          my $siphost = '';
 #          $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
 
-          my $intl = $self->option('international_prefix') || '011';
-
           #determine the country code
           my $countrycode;
           if (    $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/
@@ -320,12 +418,14 @@ sub calc_recur {
             }
 
           } else {
-            $countrycode = $self->option('domestic_prefix') || '1';
+            $countrycode = $domestic_prefix || '1';
             $number =~ s/^$countrycode//;# if length($number) > 10;
           }
 
           warn "rating call $to_or_from +$countrycode $number\n" if $DEBUG;
           $pretty_destnum = "+$countrycode $number";
+          #asterisks here causes inserting the detail to barf, so:
+          $pretty_destnum =~ s/\*//g;
 
           my $rate = qsearchs('rate', { 'ratenum' => $ratenum })
             or die "ratenum $ratenum not found!";
@@ -334,57 +434,109 @@ sub calc_recur {
                                               'phonenum'    => $number,
                                             });
 
-          $rate_region = $rate_detail->dest_region;
-          $regionnum = $rate_region->regionnum;
+          if ( $rate_detail ) {
 
-          warn "  found rate for regionnum $regionnum ".
-               "and rate detail $rate_detail\n"
-            if $DEBUG;
+            $rate_region = $rate_detail->dest_region;
+            $regionnum = $rate_region->regionnum;
+            $regionname = $rate_region->regionname;
+            warn "  found rate for regionnum $regionnum ".
+                 "and rate detail $rate_detail\n"
+              if $DEBUG;
 
-        }
+          } elsif ( $ignore_unrateable ) {
+
+            $rate_region = '';
+            $regionnum = '';
+            #code below will throw a warning & skip
+
+          } else {
 
-      } elsif ( $self->option('rating_method') eq 'upstream' ) {
+            die "FATAL: no rate_detail found in ".
+                $rate->ratenum. ":". $rate->ratename. " rate plan ".
+                "for +$countrycode $number (CDR acctid ". $cdr->acctid. "); ".
+                "add a rate or set ignore_unrateable flag on the package def\n";
+          }
 
-        if ( $cdr->cdrtypenum == 1 ) { #rate based on upstream rateid
+        }
 
-          $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
+#      } 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
+#
+#          $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
+#
+#          $regionnum = $rate_detail->dest_regionnum;
+#          $rate_region = $rate_detail->dest_region;
+#
+#          $pretty_destnum = $cdr->dst;
+#
+#          warn "  found rate for regionnum $regionnum and ".
+#               "rate detail $rate_detail\n"
+#            if $DEBUG;
+#
+#        } else { #pass upstream price through
+#
+#          $charge = sprintf('%.2f', $cdr->upstream_price);
+#          warn "Incrementing \$charges by $charge.  Now $charges\n" if $DEBUG;
+#          $charges += $charge;
+# 
+#          @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
+#            'N/A', #minutes...
+#            '$'.$charge,
+#            #$pretty_destnum,
+#            $cdr->description, #$rate_region->regionname,
+#          );
+#
+#        }
+
+      } elsif ( $rating_method eq 'upstream_simple' ) {
 
-          $regionnum = $rate_detail->dest_regionnum;
-          $rate_region = $rate_detail->dest_region;
+        #XXX $charge = sprintf('%.2f', $cdr->upstream_price);
+        $charge = sprintf('%.3f', $cdr->upstream_price);
+        $charges += $charge;
+        warn "Incrementing \$charges by $charge.  Now $charges\n" if $DEBUG;
 
-          $pretty_destnum = $cdr->dst;
+        @call_details = ($cdr->downstream_csv( 'format' => $output_format,
+                                               'charge' => $charge,
+                                             )
+                        );
+        $classnum = $cdr->calltypenum;
 
-          warn "  found rate for regionnum $regionnum and ".
-               "rate detail $rate_detail\n"
-            if $DEBUG;
+      } elsif ( $rating_method eq 'single_price' ) {
 
-        } else { #pass upstream price through
+        # a little false laziness w/below
 
-          $charge = sprintf('%.2f', $cdr->upstream_price);
-          $charges += $charge;
- 
-          @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
-            'N/A', #minutes...
-            '$'.$charge,
-            #$pretty_destnum,
-            $cdr->description, #$rate_region->regionname,
-          );
+        my $granularity = length($self->option('sec_granularity'))
+                            ? $self->option('sec_granularity')
+                            : 60;
 
-        }
+                    # length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
+        $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
 
-      } elsif ( $self->option('rating_method') eq 'upstream_simple' ) {
+        $seconds += $granularity - ( $seconds % $granularity )
+          if $seconds      # don't granular-ize 0 billsec calls (bills them)
+          && $granularity; # 0 is per call
+        my $minutes = $seconds / 60; # sprintf("%.1f", 
+        #$minutes =~ s/\.0$// if $granularity == 60;
 
-        #XXX $charge = sprintf('%.2f', $cdr->upstream_price);
-        $charge = sprintf('%.3f', $cdr->upstream_price);
+        # XXX config?
+        #$charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes )
+                                  #+ 0.00000001 ); #so 1.005 rounds to 1.01
+        $charge = sprintf('%.4f', ( $self->option('min_charge') * $minutes )
+                                  + 0.0000000001 ); #so 1.00005 rounds to 1.0001
+
+        warn "Incrementing \$charges by $charge.  Now $charges\n" if $DEBUG;
         $charges += $charge;
 
-        @call_details = ($cdr->downstream_csv( 'format' => $output_format ));
+        @call_details = ($cdr->downstream_csv( 'format' => $output_format,
+                                               'charge' => $charge,
+                                             )
+                        );
 
       } 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";
       }
 
       ###
@@ -392,13 +544,13 @@ sub calc_recur {
       ###
 
       # if $rate_detail is not found, skip this CDR... i.e. 
-      # don't add it to invoice, don't set its status to NULL,
+      # don't add it to invoice, don't set its status to done,
       # don't call downstream_csv or something on it...
       # but DO emit a warning...
       #if ( ! $rate_detail && ! scalar(@call_details) ) {}
       if ( ! $rate_detail && $charge eq '' ) {
 
-        warn "no rate_detail found for CDR.acctid:  ". $cdr->acctid.
+        warn "no rate_detail found for CDR.acctid: ". $cdr->acctid.
              "; skipping\n"
 
       } else { # there *is* a rate_detail (or call_details), proceed...
@@ -411,9 +563,10 @@ sub calc_recur {
           my $granularity = $rate_detail->sec_granularity;
 
                       # length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
-          my $seconds = $self->option('use_duration')
-                          ? $cdr->duration
-                          : $cdr->billsec;
+          $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
+
+          $seconds -= $rate_detail->conn_sec;
+          $seconds = 0 if $seconds < 0;
 
           $seconds += $granularity - ( $seconds % $granularity )
             if $seconds      # don't granular-ize 0 billsec calls (bills them)
@@ -426,23 +579,30 @@ sub calc_recur {
 
           $included_min{$regionnum} -= $minutes;
 
+          $charge = sprintf('%.2f', $rate_detail->conn_charge);
+
           if ( $included_min{$regionnum} < 0 ) {
-            my $charge_min = 0 - $included_min{$regionnum};
+            my $charge_min = 0 - $included_min{$regionnum}; #XXX should preserve
+                                                            #(display?) this
             $included_min{$regionnum} = 0;
-            $charge = sprintf('%.2f', $rate_detail->min_charge * $charge_min );
-            $charges += $charge;
+            $charge += sprintf('%.2f', ($rate_detail->min_charge * $charge_min)
+                                       + 0.00000001 ); #so 1.005 rounds to 1.01
+            $charge = sprintf('%.2f', $charge);
           }
+          warn "Incrementing \$charges by $charge.  Now $charges\n" if $DEBUG;
+          $charges += $charge;
 
           # this is why we need regionnum/rate_region....
           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' => $regionname,
+                               )
           );
 
           $classnum = $rate_detail->classnum;
@@ -452,11 +612,30 @@ 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' ) {
-            $call_details = [ 'C', $call_details[0], $charge, $classnum ];
-          }else{
+          my $phonenum = $cust_svc->svc_x->phonenum;
+
+          #if ( $self->option('rating_method') eq 'upstream_simple' ) {
+          if ( scalar(@call_details) == 1 ) {
+            $call_details =
+              [ 'C',
+                $call_details[0],
+                $charge,
+                $classnum,
+                $phonenum,
+                $seconds,
+                $regionname,
+              ];
+          } else { #only used for $rating_method eq 'upstream' now
             $csv->combine(@call_details);
-            $call_details = [ 'C', $csv->string, $charge, $classnum ];
+            $call_details =
+              [ 'C',
+                $csv->string,
+                $charge,
+                $classnum,
+                $phonenum,
+                $seconds,
+                $regionname,
+              ];
           }
           warn "  adding details on charge to invoice: [ ".
               join(', ', @{$call_details} ). " ]"
@@ -467,10 +646,13 @@ sub calc_recur {
         # if the customer flag is on, call "downstream_csv" or something
         # like it to export the call downstream!
         # XXX price plan option to pick format, or something...
-        $downstream_cdr .= $cdr->downstream_csv( 'format' => 'convergent' )
-          if $spool_cdr;
+        #$downstream_cdr .= $cdr->downstream_csv( 'format' => 'XXX format' )
+        #  if $spool_cdr;
 
-        my $error = $cdr->set_status_and_rated_price('done', $charge);
+        my $error = $cdr->set_status_and_rated_price( 'done',
+                                                      $charge,
+                                                      $cust_svc->svcnum,
+                                                    );
         die $error if $error;
 
       }
@@ -479,56 +661,146 @@ sub calc_recur {
 
   } # $cust_svc
 
-  unshift @$details, [ 'C', FS::cdr::invoice_header( $output_format) ]
-    if (@$details && $self->option('rating_method') eq 'upstream_simple' );
-
-  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 += $self->option('recur_fee')
-    if $param->{'increment_next_bill'};
+  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);
+#    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;
 }
 
-sub is_free {
-  0;
+#returns a reason why not to rate this CDR, or false if the CDR is chargeable
+sub check_chargable {
+  my( $self, $cdr, %flags ) = @_;
+
+  #should have some better way of checking these options from a hash
+  #or something
+
+  my @opt = qw(
+    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_dst_length_less
+    skip_lastapp
+  );
+  foreach my $opt (grep !exists($flags{option_cache}->{$_}), @opt ) {
+    $flags{option_cache}->{$opt} = $self->option($opt, 1);
+  }
+  my %opt = %{ $flags{option_cache} };
+
+  return 'amaflags != 2'
+    if $opt{'use_amaflags'} && $cdr->amaflags != 2;
+
+  return 'disposition != ANSWERED'
+    if $opt{'use_disposition'} && $cdr->disposition ne 'ANSWERED';
+
+  return "disposition != 100"
+    if $opt{'use_disposition_taqua'} && $cdr->disposition != 100;
+
+  return "carrierid != $opt{'use_carrierid'}"
+    if length($opt{'use_carrierid'})
+    && $cdr->carrierid ne $opt{'use_carrierid'} #ne otherwise 0 matches ''
+    && ! $flags{'da_rewrote'};
+
+  return "cdrtypenum != $opt{'use_cdrtypenum'}"
+    if length($opt{'use_cdrtypenum'})
+    && $cdr->cdrtypenum ne $opt{'use_cdrtypenum'}; #ne otherwise 0 matches ''
+
+  return "dcontext IN ( $opt{'skip_dcontext'} )"
+    if $opt{'skip_dcontext'} =~ /\S/
+    && grep { $cdr->dcontext eq $_ } split(/\s*,\s*/, $opt{'skip_dcontext'});
+
+  my $len_prefix = length($opt{'skip_dstchannel_prefix'});
+  return "dstchannel starts with $opt{'skip_dstchannel_prefix'}"
+    if $len_prefix
+    && substr($cdr->dstchannel,0,$len_prefix) eq $opt{'skip_dstchannel_prefix'};
+
+  my $dst_length = $opt{'skip_dst_length_less'};
+  return "destination less than $dst_length digits"
+    if $dst_length && length($cdr->dst) < $dst_length;
+
+  return "lastapp is $opt{'skip_lastapp'}"
+    if length($opt{'skip_lastapp'}) && $cdr->lastapp eq $opt{'skip_lastapp'};
+
+  my $src_length = $opt{'skip_src_length_more'};
+  if ( $src_length ) {
+
+    if ( $opt{'noskip_src_length_accountcode_tollfree'} ) {
+
+      if ( $cdr->is_tollfree('accountcode') ) {
+        return "source less than or equal to $src_length digits"
+          if length($cdr->src) <= $src_length;
+      } else {
+        return "source more than $src_length digits"
+          if length($cdr->src) > $src_length;
+      }
+
+    } else {
+      return "source more than $src_length digits"
+        if length($cdr->src) > $src_length;
+    }
+
+  }
+
+  #all right then, rate it
+  '';
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_fee');
+sub is_free {
+  0;
 }
 
 #  This equates svc_phone records; perhaps svc_phone should have a field
 #  to indicate it represents a line
 sub calc_units {    
   my($self, $cust_pkg ) = @_;
-  scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
+  my $count = 0;
+  if ( $self->option('count_available_phones', 1)) {
+    map { $count += ( $_->quantity || 0 ) }
+      grep { $_->part_svc->svcdb eq 'svc_phone' }
+      $cust_pkg->part_pkg->pkg_svc;
+  } else {
+    $count = 
+      scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
+  }
+  $count;
 }
 
 1;