X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=5a398ceaa6bf0952f30cd7518f6d0cd0c8de068a;hb=368ed08e24400e9d1faf401a1e4e23ea54d2c969;hp=3de022466ceb6225e10b8a89e76a9fe32458cc91;hpb=d45dd4a826f314fb5459747590d3e11cd80c211f;p=freeside.git diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index 3de022466..5a398ceaa 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -3,7 +3,7 @@ package FS::cdr; use strict; use vars qw( @ISA @EXPORT_OK $DEBUG $me $conf $cdr_prerate %cdr_prerate_cdrtypenums - $use_lrn $support_key + $use_lrn $support_key $max_duration ); use Exporter; use List::Util qw(first min); @@ -50,6 +50,8 @@ FS::UID->install_callback( sub { $support_key = $conf->config('support-key'); $use_lrn = $conf->exists('cdr-lrn_lookup'); + $max_duration = $conf->config('cdr-max_duration') || 0; + }); =head1 NAME @@ -648,6 +650,10 @@ sub rate_prefix { my $part_pkg = $opt{'part_pkg'} or return "No part_pkg specified"; my $cust_pkg = $opt{'cust_pkg'}; + ### + # (Directory assistance) rewriting + ### + my $da_rewrote = 0; # this will result in those CDRs being marked as done... is that # what we want? @@ -663,6 +669,10 @@ sub rate_prefix { $da_rewrote = 1; } + ### + # Checks to see if the CDR is chargeable + ### + my $reason = $part_pkg->check_chargable( $self, 'da_rewrote' => $da_rewrote, ); @@ -699,6 +709,17 @@ sub rate_prefix { } } + my $rated_seconds = $part_pkg->option_cacheable('use_duration') + ? $self->duration + : $self->billsec; + if ( $max_duration > 0 && $rated_seconds > $max_duration ) { + return $self->set_status_and_rated_price( + 'failed', + '', + $opt{'svcnum'}, + ); + } + ### # look up rate details based on called station id # (or calling station id for toll free calls) @@ -871,9 +892,6 @@ sub rate_prefix { # We don't round _anything_ (except granularizing) # until the final $charge = sprintf("%.2f"...). - my $rated_seconds = $part_pkg->option_cacheable('use_duration') - ? $self->duration - : $self->billsec; my $seconds_left = $rated_seconds; #no, do this later so it respects (group) included minutes