X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=85fccac69768f178ad973720d98014beeaf7eaa3;hp=c61a7b3ee95eb23b480d8d4c6c1e2b3a059c05b1;hb=8d0e8149e7b19ad8543ac6c8c663be63dbc34762;hpb=c541cb0f1ab12a904252bd6b2658dba585860f28 diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index c61a7b3ee..85fccac69 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -3,7 +3,9 @@ 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 + $cp_accountcode $cp_accountcode_trim0s $cp_field + $tollfree_country ); use Exporter; use List::Util qw(first min); @@ -32,7 +34,7 @@ use IO::Socket::SSL; use Cpanel::JSON::XS qw(decode_json); @ISA = qw(FS::Record); -@EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker ); +@EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker _cdr_date_parse ); $DEBUG = 0; $me = '[FS::cdr]'; @@ -50,6 +52,15 @@ 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; + + $cp_accountcode = $conf->exists('cdr-charged_party-accountcode'); + $cp_accountcode_trim0s = $conf->exists('cdr-charged_party-accountcode-trim_leading_0s'); + + $cp_field = $conf->config('cdr-charged_party-field'); + + $tollfree_country = $conf->config('tollfree-country') || ''; + }); =head1 NAME @@ -170,7 +181,7 @@ following fields are currently supported: =item freesiderewritestatus - NULL, done, skipped -=item cdrbatch +=item cdrbatchnum =item detailnum - Link to invoice detail (L) @@ -240,7 +251,6 @@ sub table_info { 'svcnum' => 'Freeside service', 'freesidestatus' => 'Freeside status', 'freesiderewritestatus' => 'Freeside rewrite status', - 'cdrbatch' => 'Legacy batch', 'cdrbatchnum' => 'Batch', 'detailnum' => 'Freeside invoice detail line', }, @@ -387,10 +397,9 @@ to inspect other field. sub is_tollfree { my $self = shift; my $field = scalar(@_) ? shift : 'dst'; - my $country = $conf->config('tollfree-country') || ''; - if ( $country eq 'AU' ) { + if ( $tollfree_country eq 'AU' ) { ( $self->$field() =~ /^(\+?61)?(1800|1300)/ ) ? 1 : 0; - } elsif ( $country eq 'NZ' ) { + } elsif ( $tollfree_country eq 'NZ' ) { ( $self->$field() =~ /^(\+?64)?(800|508)/ ) ? 1 : 0; } else { #NANPA (US/Canaada) ( $self->$field() =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0; @@ -416,17 +425,16 @@ sub set_charged_party { unless ( $self->charged_party ) { - if ( $conf->exists('cdr-charged_party-accountcode') && $self->accountcode ){ + if ( $cp_accountcode && $self->accountcode ) { my $charged_party = $self->accountcode; $charged_party =~ s/^0+// - if $conf->exists('cdr-charged_party-accountcode-trim_leading_0s'); + if $cp_accountcode_trim0s; $self->charged_party( $charged_party ); - } elsif ( $conf->exists('cdr-charged_party-field') ) { + } elsif ( $cp_field ) { - my $field = $conf->config('cdr-charged_party-field'); - $self->charged_party( $self->$field() ); + $self->charged_party( $self->$cp_field() ); } else { @@ -517,6 +525,7 @@ sub set_status_and_rated_price { } else { $self->freesidestatus($status); + $self->freesidestatustext($opt{'statustext'}) if exists($opt{'statustext'}); $self->rated_price($rated_price); $self->$_($opt{$_}) foreach grep exists($opt{$_}), map "rated_$_", @@ -649,6 +658,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? @@ -664,6 +677,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, ); @@ -672,6 +689,7 @@ sub rate_prefix { return $self->set_status_and_rated_price( 'skipped', 0, $opt{'svcnum'}, + 'statustext' => $reason, ); } @@ -700,6 +718,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) @@ -872,9 +901,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 @@ -1659,7 +1685,12 @@ foreach my $INC ( @INC ) { tie my %import_formats, 'Tie::IxHash', map { $_ => $cdr_info{$_}->{'name'} } - sort { $cdr_info{$a}->{'weight'} <=> $cdr_info{$b}->{'weight'} } + + #this is not doing anything useful anymore + #sort { $cdr_info{$a}->{'weight'} <=> $cdr_info{$b}->{'weight'} } + #so just sort alpha + sort { lc($cdr_info{$a}->{'name'}) cmp lc($cdr_info{$b}->{'name'}) } + grep { exists($cdr_info{$_}->{'import_fields'}) } keys %cdr_info; @@ -1733,6 +1764,14 @@ sub _cdr_date_parse { # Telos 2014-10-10T05:30:33Z ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); $options{gmt} = 1; + } elsif ( $date =~ /^(\d+):(\d+):(\d+)\.\d+ \w+ (\w+) (\d+) (\d+)$/ ) { + ($hour, $min, $sec, $mon, $day, $year) = ( $1, $2, $3, $4, $5, $6 ); + $mon = { # Acme Packet: 15:54:56.868 PST DEC 18 2017 + # My best guess of month abbv they may use + JAN => '01', FEB => '02', MAR => '03', APR => '04', + MAY => '05', JUN => '06', JUL => '07', AUG => '08', + SEP => '09', OCT => '10', NOV => '11', DEC => '12' + }->{$mon}; } else { die "unparsable date: $date"; #maybe we shouldn't die... } @@ -1860,41 +1899,6 @@ sub process_batch_import { # @columns = map { s/^ +//; $_; } @columns; # } -# _ upgrade_data -# -# Used by FS::Upgrade to migrate to a new database. - -sub _upgrade_data { - my ($class, %opts) = @_; - - warn "$me upgrading $class\n" if $DEBUG; - - my $sth = dbh->prepare( - 'SELECT DISTINCT(cdrbatch) FROM cdr WHERE cdrbatch IS NOT NULL' - ) or die dbh->errstr; - - $sth->execute or die $sth->errstr; - - my %cdrbatchnum = (); - while (my $row = $sth->fetchrow_arrayref) { - - my $cdr_batch = qsearchs( 'cdr_batch', { 'cdrbatch' => $row->[0] } ); - unless ( $cdr_batch ) { - $cdr_batch = new FS::cdr_batch { 'cdrbatch' => $row->[0] }; - my $error = $cdr_batch->insert; - die $error if $error; - } - - $cdrbatchnum{$row->[0]} = $cdr_batch->cdrbatchnum; - } - - $sth = dbh->prepare('UPDATE cdr SET cdrbatch = NULL, cdrbatchnum = ? WHERE cdrbatch IS NOT NULL AND cdrbatch = ?') or die dbh->errstr; - - foreach my $cdrbatch (keys %cdrbatchnum) { - $sth->execute($cdrbatchnum{$cdrbatch}, $cdrbatch) or die $sth->errstr; - } - -} =item ip_addr_sql FIELD RANGE @@ -1932,4 +1936,3 @@ L, schema.html from the base documentation. =cut 1; -