#check the foreign keys even?
#do we want to outright *reject* the CDR?
my $error =
- $self->ut_numbern('acctid')
+ $self->ut_numbern('acctid');
#add a config option to turn these back on if someone needs 'em
#
#
# # Telstra =1, Optus = 2, RSL COM = 3
# || $self->ut_foreign_keyn('carrierid', 'cdr_carrier', 'carrierid' )
- ;
+
return $error if $error;
$self->SUPER::check;
sub is_tollfree {
my $self = shift;
my $field = scalar(@_) ? shift : 'dst';
- ( $self->$field() =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0;
+ my $country = $conf->config('tollfree-country');
+ if ( $country eq 'AU' ) {
+ ( $self->$field() =~ /^(\+?64)?(800|508)/ ) ? 1 : 0;
+ } else { #NANPA (US/Canaada)
+ ( $self->$field() =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0;
+ }
}
=item set_charged_party
# The rate detail itself has included minutes. We MUST have a place
# to track them.
my $included_min = $opt{'detail_included_min_hashref'}
- or die "unable to rate CDR: rate detail has included minutes, but ".
- "no detail_included_min_hashref provided.\n";
+ or return "unable to rate CDR: rate detail has included minutes, but ".
+ "no detail_included_min_hashref provided.\n";
# by default, set the included minutes for this region/time to
# what's in the rate_detail
$charge_sec -= ($included_min->{$regionnum}{$ratetimenum} * 60);
$included_min->{$regionnum}{$ratetimenum} = 0;
}
- } elsif ( ${ $opt{'plan_included_min'} } > 0 ) {
+ } elsif ( $opt{plan_included_min} && ${ $opt{plan_included_min} } > 0 ) {
# The package definition has included minutes, but only for in-group
# rate details. Decrement them if this is an in-group call.
if ( $rate_detail->region_group ) {
}
+=item rate_cost
+
+Rates an already-rated CDR according to the cost fields from the rate plan.
+
+Returns the amount.
+
+=cut
+
+sub rate_cost {
+ my $self = shift;
+
+ return 0 unless $self->rated_ratedetailnum;
+
+ my $rate_detail =
+ qsearchs('rate_detail', { 'ratedetailnum' => $self->rated_ratedetailnum } );
+
+ return $rate_detail->min_cost if $self->rated_granularity == 0;
+
+ my $minutes = $self->rated_seconds / 60;
+ my $charge = $rate_detail->conn_cost + $minutes * $rate_detail->min_cost;
+
+ sprintf('%.2f', $charge + .00001 );
+
+}
+
=item cdr_termination [ TERMPART ]
=cut
'name' => 'Summary, one line per destination prefix',
'invoice_header' => 'Caller,Rate,Calls,Minutes,Price',
},
+ 'sum_count_class' => {
+ 'name' => 'Summary, one line per usage class',
+ 'invoice_header' => 'Caller,Class,Calls,Price',
+ },
);
my %export_formats = ();
my %cdr_info;
foreach my $INC ( @INC ) {
- warn "globbing $INC/FS/cdr/*.pm\n" if $DEBUG;
- foreach my $file ( glob("$INC/FS/cdr/*.pm") ) {
+ warn "globbing $INC/FS/cdr/[a-z]*.pm\n" if $DEBUG;
+ foreach my $file ( glob("$INC/FS/cdr/[a-z]*.pm") ) {
warn "attempting to load CDR format info from $file\n" if $DEBUG;
$file =~ /\/(\w+)\.pm$/ or do {
warn "unrecognized file in $INC/FS/cdr/: $file\n";