X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=b3cceb4aab5e4dc12471f59c2e598d3b75513dd8;hp=80b31bfb9995601959f62ae3e7314c5c76c1b383;hb=fa572d76cce0784de0bc15939e6eaf8e06f3f8f6;hpb=8d6ea7d8fddec3fd471a0e68f297d20e191c6f11 diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index 80b31bfb9..b3cceb4aa 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -161,6 +161,8 @@ following fields are currently supported: =item cdrbatch +=item detailnum - Link to invoice detail (L) + =back =head1 METHODS @@ -214,6 +216,7 @@ sub table_info { #'upstream_rateplanid' => '', #'ratedetailnum' => '', 'rated_price' => 'Rated price', + 'rated_cost' => 'Rated cost', #'distance' => '', #'islocal' => '', #'calltypenum' => '', @@ -226,6 +229,7 @@ sub table_info { 'freesiderewritestatus' => 'Freeside rewrite status', 'cdrbatch' => 'Legacy batch', 'cdrbatchnum' => 'Batch', + 'detailnum' => 'Freeside invoice detail line', }, }; @@ -337,8 +341,12 @@ sub check { #check the foreign keys even? #do we want to outright *reject* the CDR? - my $error = - $self->ut_numbern('acctid') + my $error = $self->ut_numbern('acctid'); + return $error if $error; + + if ( $self->freesidestatus ne 'done' ) { + $self->set('detailnum', ''); # can't have this on an unbilled call + } #add a config option to turn these back on if someone needs 'em # @@ -350,8 +358,6 @@ sub check { # # # Telstra =1, Optus = 2, RSL COM = 3 # || $self->ut_foreign_keyn('carrierid', 'cdr_carrier', 'carrierid' ) - ; - return $error if $error; $self->SUPER::check; } @@ -368,7 +374,14 @@ to inspect other field. 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() =~ /^(\+?61)?(1800|1300)/ ) ? 1 : 0; + } elsif ( $country eq 'NZ' ) { + ( $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 @@ -456,7 +469,9 @@ Sets the status and rated price. Available options are: inbound, rated_pretty_dst, rated_regionname, rated_seconds, rated_minutes, rated_granularity, rated_ratedetailnum, -rated_classnum, rated_ratename. +rated_classnum, rated_ratename. If rated_ratedetailnum is provided, +will also set a recalculated L in the rated_cost field +after the other fields are set (does not work with inbound.) If there is an error, returns the error, otherwise returns false. @@ -494,6 +509,8 @@ sub set_status_and_rated_price { qw( pretty_dst regionname seconds minutes granularity ratedetailnum classnum ratename ); $self->svcnum($svcnum) if $svcnum; + $self->rated_cost($self->rate_cost) if $opt{'rated_ratedetailnum'}; + return $self->replace(); } @@ -529,6 +546,9 @@ sub parse_number { my $field = $options{column} || 'dst'; my $intl = $options{international_prefix} || '011'; + # Still, don't break anyone's CDR rating if they have an empty string in + # there. Require an explicit statement that there's no prefix. + $intl = '' if lc($intl) eq 'none'; my $countrycode = ''; my $number = $self->$field(); @@ -577,25 +597,19 @@ sub parse_number { Rates this CDR according and sets the status to 'rated'. -Available options are: part_pkg, svcnum, single_price_included_minutes, region_group, region_group_included_minutes. +Available options are: part_pkg, svcnum, plan_included_min, +detail_included_min_hashref. part_pkg is required. If svcnum is specified, will also associate this CDR with the specified svcnum. -single_price_included_minutes is requried for single_price price plans -(otherwise unused/ignored). It should be set to a scalar reference of the -number of included minutes and will be decremented by the rated minutes of this +plan_included_min should be set to a scalar reference of the number of +included minutes and will be decremented by the rated minutes of this CDR. -region_group_included_minutes is required for prefix price plans which have -included minutes (otherwise unused/ignored). It should be set to a scalar -reference of the number of included minutes and will be decremented by the -rated minutes of this CDR. - -region_group_included_minutes_hashref is required for prefix price plans which -have included minues (otherwise unused/ignored). It should be set to an empty -hashref at the start of a month's rating and then preserved across CDRs. +detail_included_min_hashref should be set to an empty hashref at the +start of a month's rating and then preserved across CDRs. =cut @@ -798,8 +812,8 @@ sub rate_prefix { } + my $regionnum = $rate_detail->dest_regionnum; my $rate_region = $rate_detail->dest_region; - my $regionnum = $rate_region->regionnum; warn " found rate for regionnum $regionnum ". "and rate detail $rate_detail\n" if $DEBUG; @@ -826,9 +840,10 @@ sub rate_prefix { # We don't round _anything_ (except granularizing) # until the final $charge = sprintf("%.2f"...). - my $seconds_left = $part_pkg->option_cacheable('use_duration') - ? $self->duration - : $self->billsec; + 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 # # charge for the first (conn_sec) seconds @@ -836,10 +851,15 @@ sub rate_prefix { # $seconds_left -= $seconds; # $weektime += $seconds; # my $charge = $rate_detail->conn_charge; - my $seconds = 0; + #my $seconds = 0; my $charge = 0; my $connection_charged = 0; + # before doing anything else, if there's an upstream multiplier and + # an upstream price, add that to the charge. (usually the rate detail + # will then have a minute charge of zero, but not necessarily.) + $charge += ($self->upstream_price || 0) * $rate_detail->upstream_mult_charge; + my $etime; while($seconds_left) { my $ratetimenum = $rate_detail->ratetimenum; # may be empty @@ -894,23 +914,22 @@ sub rate_prefix { $seconds_left = 0; } - $seconds += $charge_sec; + #$seconds += $charge_sec; if ( $rate_detail->min_included ) { - # the old, kind of deprecated way to do this - my $included_min = $opt{'region_group_included_min_hashref'} || {}; + # the old, kind of deprecated way to do this: + # + # The rate detail itself has included minutes. We MUST have a place + # to track them. + my $included_min = $opt{'detail_included_min_hashref'} + 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 $included_min->{$regionnum}{$ratetimenum} = $rate_detail->min_included unless exists $included_min->{$regionnum}{$ratetimenum}; - # the way that doesn't work - #my $region_group = ($part_pkg->option_cacheable('min_included') || 0) > 0; - - #${$opt{region_group_included_min}} -= $minutes - # if $region_group && $rate_detail->region_group; - if ( $included_min->{$regionnum}{$ratetimenum} >= $minutes ) { $charge_sec = 0; $included_min->{$regionnum}{$ratetimenum} -= $minutes; @@ -918,6 +937,18 @@ sub rate_prefix { $charge_sec -= ($included_min->{$regionnum}{$ratetimenum} * 60); $included_min->{$regionnum}{$ratetimenum} = 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 ) { + if ( ${ $opt{'plan_included_min'} } >= $minutes ) { + $charge_sec = 0; + ${ $opt{'plan_included_min'} } -= $minutes; + } else { + $charge_sec -= (${ $opt{'plan_included_min'} } * 60); + ${ $opt{'plan_included_min'} } = 0; + } + } } else { # the new way! my $applied_min = $cust_pkg->apply_usage( @@ -976,8 +1007,8 @@ sub rate_prefix { $price, $opt{'svcnum'}, 'rated_pretty_dst' => $pretty_dst, - 'rated_regionname' => $rate_region->regionname, - 'rated_seconds' => $seconds, + 'rated_regionname' => ($rate_region ? $rate_region->regionname : ''), + 'rated_seconds' => $rated_seconds, #$seconds, 'rated_granularity' => $rate_detail->sec_granularity, #$granularity 'rated_ratedetailnum' => $rate_detail->ratedetailnum, 'rated_classnum' => $rate_detail->classnum, #rated_ratedetailnum? @@ -994,6 +1025,8 @@ sub rate_upstream_simple { sprintf('%.3f', $self->upstream_price), $opt{'svcnum'}, 'rated_classnum' => $self->calltypenum, + 'rated_seconds' => $self->billsec, + # others? upstream_*_regionname => rated_regionname is possible ); } @@ -1020,12 +1053,12 @@ sub rate_single_price { my $charge_min = $minutes; - ${$opt{single_price_included_min}} -= $minutes; - if ( ${$opt{single_price_included_min}} > 0 ) { + ${$opt{plan_included_min}} -= $minutes; + if ( ${$opt{plan_included_min}} > 0 ) { $charge_min = 0; } else { - $charge_min = 0 - ${$opt{single_price_included_min}}; - ${$opt{single_price_included_min}} = 0; + $charge_min = 0 - ${$opt{plan_included_min}}; + ${$opt{plan_included_min}} = 0; } my $charge = @@ -1042,6 +1075,36 @@ sub rate_single_price { } +=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 } ); + + my $charge = 0; + $charge += ($self->upstream_price || 0) * ($rate_detail->upstream_mult_cost); + + if ( $self->rated_granularity == 0 ) { + $charge += $rate_detail->min_cost; + } else { + my $minutes = $self->rated_seconds / 60; + $charge += $rate_detail->conn_cost + $minutes * $rate_detail->min_cost; + } + + sprintf('%.2f', $charge + .00001 ); + +} + =item cdr_termination [ TERMPART ] =cut @@ -1151,6 +1214,8 @@ sub calltypename { =cut +# in the future, load this dynamically from detail_format classes + my %export_names = ( 'simple' => { 'name' => 'Simple', @@ -1169,6 +1234,10 @@ my %export_names = ( 'name' => 'Basic', 'invoice_header' => "Date/Time,Called Number,Min/Sec,Price", }, + 'basic_upstream_dst_regionname' => { + 'name' => 'Basic with upstream destination name', + 'invoice_header' => "Date/Time,Called Number,Destination,Min/Sec,Price", + }, 'default' => { 'name' => 'Default', 'invoice_header' => 'Date,Time,Number,Destination,Duration,Price', @@ -1197,6 +1266,10 @@ my %export_names = ( '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 = (); @@ -1208,7 +1281,7 @@ sub export_formats { my $conf = new FS::Conf; my $date_format = $conf->config('date_format') || '%m/%d/%Y'; - # call duration in the largest units that accurately reflect the granularity + # call duration in the largest units that accurately reflect the granularity my $duration_sub = sub { my($cdr, %opt) = @_; my $sec = $opt{seconds} || $cdr->billsec; @@ -1398,7 +1471,7 @@ as keys (for use with part_pkg::voip_cdr) and "pretty" format names as values. sub invoice_formats { map { ($_ => $export_names{$_}->{'name'}) } grep { $export_names{$_}->{'invoice_header'} } - keys %export_names; + sort keys %export_names; } =item invoice_header FORMAT @@ -1477,8 +1550,8 @@ as keys (for use with batch_import) and "pretty" format names as values. 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"; @@ -1567,7 +1640,7 @@ sub _cdr_date_parse { # optionally without seconds ($mon, $day, $year, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); $sec = 0 if !defined($sec); - } elsif ( $date =~ /^\s*(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d+\.\d+)(\D|$)/ ) { + } elsif ( $date =~ /^\s*(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\.\d+)$/ ) { # broadsoft: 20081223201938.314 ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); } elsif ( $date =~ /^\s*(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\d+(\D|$)/ ) { @@ -1577,7 +1650,7 @@ sub _cdr_date_parse { # WIP: 20100329121420 ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); } elsif ( $date =~ /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z$/) { - # Telos + # Telos 2014-10-10T05:30:33Z ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); $options{gmt} = 1; } else {