X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=3829290ab6007180917a0efd6a3fbbe4ec53864a;hb=380c61c7b8af084554af34c58ca1b8e83d89e4f0;hp=1b565f2c446fc7a8adecb6025f98e2ba1d09d3bb;hpb=92adead1404db357a11b58f38c2b4403381a2809;p=freeside.git diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm index 1b565f2c4..3829290ab 100644 --- a/FS/FS/part_pkg/voip_cdr.pm +++ b/FS/FS/part_pkg/voip_cdr.pm @@ -54,16 +54,22 @@ tie my %temporalities, 'Tie::IxHash', ' of service at cancellation', 'type' => 'checkbox', }, + + 'rating_method' => { 'name' => 'Region 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, - }, + + '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', @@ -114,9 +120,10 @@ tie my %temporalities, 'Tie::IxHash', '411_rewrite' => { 'name' => 'Rewrite these (comma-separated) destination numbers to 411 for rating purposes: ', }, - 'output_format' => { 'name' => 'Simple output format', + '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', @@ -156,7 +163,7 @@ tie my %temporalities, 'Tie::IxHash', }, 'fieldorder' => [qw( setup_fee recur_fee recur_temporality unused_credit - rating_method ratenum + rating_method ratenum ignore_unrateable default_prefix disable_src domestic_prefix international_prefix @@ -197,8 +204,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 $@; @@ -224,10 +234,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... @@ -334,16 +341,31 @@ 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; + warn " found rate for regionnum $regionnum ". + "and rate detail $rate_detail\n" + if $DEBUG; + $rate_region = $rate_detail->dest_region; + $regionnum = $rate_region->regionnum; + + } elsif ( $self->option('ignore_unrateable', 1) ) { + + $rate_region = ''; + $regionnum = ''; + #code below will throw a warning & skip + + } else { + + die "FATAL: no rate_detail found in ". + $rate->ratenum. ":". $rate->rate. " rate plan for CDR ". + "acctid ". $cdr->acctid. " +$countrycode $number; ". + "add a rate or set ignore_unrateable flag on the package def\n"; + } } - } 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 @@ -374,17 +396,20 @@ 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); $charges += $charge; - @call_details = ($cdr->downstream_csv( 'format' => $output_format )); + @call_details = ($cdr->downstream_csv( 'format' => $output_format, + 'charge' => $charge, + ) + ); + $classnum = $cdr->calltypenum; } 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 +417,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 && ! 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... @@ -437,12 +462,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; @@ -452,9 +478,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 ]; } @@ -477,11 +505,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); @@ -509,8 +537,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 {