' 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',
'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' => 'CDR invoice display format',
},
'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
my @call_details = ();
if ( $rating_method eq 'prefix' ) {
- #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;
-
- } elsif ( $self->option('use_disposition_taqua')
- && $cdr->disposition != 100 ) {
+ my $da_rewrite = 0;
+ if ( $self->option('411_rewrite') ) {
+ my $dirass = $self->option('411_rewrite');
+ $dirass =~ s/\s//g;
+ my @dirass = split(',', $dirass);
+ if ( grep $cdr->dst eq $_, @dirass ) {
+ $cdr->dst('411');
+ $da_rewrite = 1;
+ }
+ }
- warn "$notchg (disposition != 100)\n" if $DEBUG;
- $charge = 0;
+ my $reason = $self->check_chargable( $cdr,
+ '411_rewrite' => $da_rewrite,
+ );
- } elsif ( $self->option('use_carrierid')
- && $cdr->carrierid != $self->option('use_carrierid') ) {
+ if ( $reason ) {
- 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;
+ 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')
'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->ratename. " rate plan ".
+ "for +$countrycode $number (CDR acctid ". $cdr->acctid. "); ".
+ "add a rate or set ignore_unrateable flag on the package def\n";
+ }
}
###
# 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...
$charges;
}
+#returns a reason why not to rate this CDR, or false if the CDR is chargeable
+sub check_chargable {
+ my( $self, $cdr, %opt ) = @_;
+
+ #should have some better way of checking these options from a hash
+ #or something
+
+ return 'amaflags != 2'
+ if $self->option('use_amaflags') && $cdr->amaflags != 2;
+
+ return 'disposition != ANSWERED'
+ if $self->option('use_disposition') && $cdr->disposition ne 'ANSWERED';
+
+ return "disposition != 100"
+ if $self->option('use_disposition_taqua') && $cdr->disposition != 100;
+
+ return 'carrierid != '. $self->option('use_carrierid')
+ if $self->option('use_carrierid')
+ && $cdr->carrierid != $self->option('use_carrierid')
+ && ! $opt{'411_rewrite'};
+
+ return 'cdrtypenum != '. $self->option('use_cdrtypenum')
+ if $self->option('use_cdrtypenum')
+ && $cdr->cdrtypenum != $self->option('use_cdrtypenum');
+
+ #all right then, rate it
+ '';
+}
+
sub is_free {
0;
}
projects / freeside.git / blobdiff