X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=794ae010f44dd3a066f492756c05c67c33410fd6;hb=3b97735238d919ed548bfb17aea8162623c1d286;hp=bd41cc64e47809cd582cfe8c7d1706bf25be90d9;hpb=6161489c74f82e0765812a14615a7bc2ae3350cf;p=freeside.git diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm index bd41cc64e..794ae010f 100644 --- a/FS/FS/part_pkg/voip_cdr.pm +++ b/FS/FS/part_pkg/voip_cdr.pm @@ -27,6 +27,11 @@ tie my %rating_method, 'Tie::IxHash', # 'Asterisk (or other?) CDR table', #; +tie my %temporalities, 'Tie::IxHash', + 'upcoming' => "Upcoming (future)", + 'preceding' => "Preceding (past)", +; + %info = ( 'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table', 'shortname' => 'VoIP/telco CDR rating (standard)', @@ -37,6 +42,13 @@ tie my %rating_method, 'Tie::IxHash', 'recur_fee' => { 'name' => 'Base recurring fee for this package', 'default' => 0, }, + + #false laziness w/flat.pm + 'recur_temporality' => { 'name' => 'Charge recurring fee for period', + 'type' => 'select', + 'select_options' => \%temporalities, + }, + 'unused_credit' => { 'name' => 'Credit the customer for the unused portion'. ' of service at cancellation', 'type' => 'checkbox', @@ -68,7 +80,7 @@ tie my %rating_method, 'Tie::IxHash', # 'type' => 'checkbox', # }, - 'international_prefix' => { 'name' => 'Destination prefix for international CDR records', + 'international_prefix' => { 'name' => 'Destination prefix(es) for international CDR records. Separate multiple options with commas.', 'default' => '011', }, @@ -80,11 +92,31 @@ tie my %rating_method, 'Tie::IxHash', 'type' => 'checkbox', }, + 'use_disposition_taqua' => { 'name' => 'Do not charge for CDRs where the disposition is not set to "100" (Taqua).', + 'type' => 'checkbox', + }, + + 'use_carrierid' => { 'name' => 'Do not charge for CDRs where the Carrier ID is not set to: ', + }, + + 'use_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is not set to: ', + }, + + '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() }, }, + 'usage_section' => { 'name' => 'Section in which to place separate usage charges', + }, + + 'summarize_usage' => { 'name' => 'Include usage summary with recurring charges when usage is in separate section', + 'type' => 'checkbox', + }, + #XXX also have option for an external db # 'cdr_location' => { 'name' => 'CDR database location' # 'type' => 'select', @@ -110,12 +142,15 @@ tie my %rating_method, 'Tie::IxHash', }, 'fieldorder' => [qw( - setup_fee recur_fee unused_credit + setup_fee recur_fee recur_temporality unused_credit rating_method ratenum default_prefix disable_src domestic_prefix international_prefix - use_amaflags use_disposition output_format + use_amaflags use_disposition + use_disposition_taqua use_carrierid use_cdrtypenum + 411_rewrite + output_format summarize_usage usage_section ) ], 'weight' => 40, @@ -126,11 +161,15 @@ sub calc_setup { $self->option('setup_fee'); } -#false laziness w/voip_sqlradacct... resolve it if that one ever gets used again +#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 $last_bill = $cust_pkg->last_bill; + #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; my $ratenum = $cust_pkg->part_pkg->option('ratenum'); @@ -143,7 +182,11 @@ sub calc_recur { my $downstream_cdr = ''; my $output_format = $self->option('output_format', 'Hush!') - || 'voxlinesystems'; + || 'simple'; + + eval "use Text::CSV_XS;"; + die $@ if $@; + my $csv = new Text::CSV_XS; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc @@ -163,21 +206,46 @@ sub calc_recur { my( $rate_region, $regionnum ); my $pretty_destnum; my $charge = ''; + 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 "not charging for CDR (amaflags != 2)\n" if $DEBUG; + warn "$notchg (amaflags != 2)\n" if $DEBUG; $charge = 0; } elsif ( $self->option('use_disposition') && $cdr->disposition ne 'ANSWERED' ) { - warn "not charging for CDR (disposition != ANSWERED)\n" if $DEBUG; + warn "$notchg (disposition != ANSWERED)\n" if $DEBUG; + $charge = 0; + + } 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') ) { + + warn "$notchg (carrierid != ". $self->option('use_carrierid'). ")\n" + if $DEBUG; + $charge = 0; + + } elsif ( $self->option('use_cdrtypenum') + && $cdr->cdrtypenum != $self->option('use_cdrtypenum') ) { + + warn "$notchg (cdrtypenum != ". $self->option('use_cdrtypenum'). ")\n" + if $DEBUG; $charge = 0; } else { @@ -187,6 +255,11 @@ sub calc_recur { # (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/ ) { #tollfree call $to_or_from = 'from'; @@ -204,13 +277,23 @@ 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 ( $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/ - || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ - ) - { + if ( $intl_match || $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 @@ -285,7 +368,7 @@ sub calc_recur { $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 @@ -363,17 +446,19 @@ sub calc_recur { $rate_region->regionname, ); + $classnum = $rate_detail->classnum; + } 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] ]; + $call_details = [ 'C', $call_details[0], $charge, $classnum ]; }else{ - $call_details = join(' - ', @call_details ); + $csv->combine(@call_details); + $call_details = [ 'C', $csv->string, $charge, $classnum ]; } - warn " adding details on charge to invoice: $call_details" - if ( $DEBUG && !ref($call_details) ); warn " adding details on charge to invoice: [ ". join(', ', @{$call_details} ). " ]" if ( $DEBUG && ref($call_details) );