'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)',
'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' => '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.',
'fieldorder' => [qw(
setup_fee recur_fee recur_temporality unused_credit
recur_method cutoff_day
- rating_method ratenum min_charge ignore_unrateable
+ rating_method ratenum min_charge sec_granularity
+ ignore_unrateable
default_prefix
disable_src
domestic_prefix international_prefix
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
)
my( $rate_region, $regionnum );
my $pretty_destnum;
my $charge = '';
+ my $seconds = '';
+ my $regionname = '';
my $classnum = '';
my @call_details = ();
if ( $rating_method eq 'prefix' ) {
$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;
# a little false laziness w/below
- my $granularity = 60;
+ my $granularity = length($self->option('sec_granularity'))
+ ? $self->option('sec_granularity')
+ : 60;
# length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
- my $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
+ $seconds = $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
- my $minutes = sprintf("%.1f", $seconds / 60);
- $minutes =~ s/\.0$// ;# if $granularity == 60;
+ && $granularity; # 0 is per call
+ my $minutes = $seconds / 60; # sprintf("%.1f",
+ #$minutes =~ s/\.0$// if $granularity == 60;
- $charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes )
- + 0.00000001 ); #so 1.005 rounds to 1.01
+ # 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
- $charge =
$charges += $charge;
@call_details = ($cdr->downstream_csv( 'format' => $output_format,
my $granularity = $rate_detail->sec_granularity;
# length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
- my $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
+ $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
$seconds += $granularity - ( $seconds % $granularity )
if $seconds # don't granular-ize 0 billsec calls (bills them)
'minutes' => $minutes,
'charge' => $charge,
'pretty_dst' => $pretty_destnum,
- 'dst_regionname' => $rate_region->regionname,
+ 'dst_regionname' => $regionname,
)
);
if ( $charge > 0 ) {
#just use FS::cust_bill_pkg_detail objects?
my $call_details;
+ 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 ];
+ $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} ). " ]"
#$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;
}
} # $cust_svc
- unshift @$details, [ 'C', FS::cdr::invoice_header($output_format) ]
+ unshift @$details, [ 'C',
+ FS::cdr::invoice_header($output_format),
+ '',
+ '',
+ '',
+ '',
+ '',
+ ]
if @$details && $rating_method ne 'upstream';
# if ( $spool_cdr && length($downstream_cdr) ) {