# '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)',
'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',
'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() },
},
- 'separate_usage' => { 'name' => 'Separate usage charges from recurring charges',
+ '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',
},
},
'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
- separate_usage
+ use_amaflags use_disposition
+ use_disposition_taqua use_carrierid use_cdrtypenum
+ 411_rewrite
+ output_format summarize_usage usage_section
)
],
'weight' => 40,
$self->option('setup_fee');
}
-sub calc_recur {
- my $self = shift;
- my $charges = 0;
- $charges = $self->calc_usage(@_)
- unless $self->option('separate_usage', 'Hush!');
- $self->option('recur_fee') + $charges;
-}
-
#false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again
-sub calc_usage {
+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');
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 {
# (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';
$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{
$csv->combine(@call_details);
- $call_details = [ 'C', $csv->string ];
+ $call_details = [ 'C', $csv->string, $charge, $classnum ];
}
warn " adding details on charge to invoice: [ ".
join(', ', @{$call_details} ). " ]"
} #if ( $spool_cdr && length($downstream_cdr) )
- $charges;
+ $self->option('recur_fee') + $charges;
}
scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
}
-sub append_cust_bill_pkgs {
- my $self = shift;
- my($cust_pkg, $sdate, $details, $param ) = @_;
- return []
- unless $self->option('separate_usage', 'Hush!');
-
- my @details = ();
- my $charges = $self->calc_usage($cust_pkg, $sdate, \@details, $param);
-
- my $cust_bill_pkg = new FS::cust_bill_pkg {
- 'pkgnum' => $cust_pkg->pkgnum,
- 'setup' => 0,
- 'unitsetup' => 0,
- 'recur' => sprintf( "%.2f", $charges), # hmmm
- 'unitrecur' => 0,
- 'quantity' => $cust_pkg->quantity,
- 'sdate' => $$sdate,
- 'edate' => $cust_pkg->bill, # already fiddled
- 'itemdesc' => 'Usage charges', # configurable?
- 'details' => \@details,
- };
-
- return [ $cust_bill_pkg ];
-}
-
1;
projects / freeside.git / blobdiff