X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=aae51e96cf554cb4cefe577cf3cb93a5ba3253d2;hb=ef644359f646efb69ecb4c74d55fee05107dad11;hp=31a92187b7af70aa3bf6724866ab34d43c8a8dae;hpb=011b7eb2fc5194c5e385954b47416fb138d334f3;p=freeside.git diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm index 31a92187b..aae51e96c 100644 --- a/FS/FS/part_pkg/voip_cdr.pm +++ b/FS/FS/part_pkg/voip_cdr.pm @@ -20,6 +20,8 @@ tie my %cdr_svc_method, 'Tie::IxHash', 'svc_phone.phonenum' => 'Phone numbers (svc_phone.phonenum)', 'svc_pbx.title' => 'PBX name (svc_pbx.title)', 'svc_pbx.svcnum' => 'Freeside service # (svc_pbx.svcnum)', + 'svc_pbx.ip.src' => 'PBX name to source IP address', + 'svc_pbx.ip.dst' => 'PBX name to destination IP address', ; tie my %rating_method, 'Tie::IxHash', @@ -75,8 +77,9 @@ tie my %unrateable_opts, 'Tie::IxHash', }, 'cdr_svc_method' => { 'name' => 'CDR service matching method', - 'type' => 'radio', - 'options' => \%cdr_svc_method, +# 'type' => 'radio', + 'type' => 'select', + 'select_options' => \%cdr_svc_method, }, 'rating_method' => { 'name' => 'Rating method', @@ -100,7 +103,9 @@ tie my %unrateable_opts, 'Tie::IxHash', 'empty_label' => '', }, - 'min_included' => { 'name' => 'Minutes included when using the "single price per minute" rating method or when using the "prefix" rating method ("region group" billing)', + 'calls_included' => { 'name' => 'Number of calls included at no usage charge', }, + + 'min_included' => { 'name' => 'Minutes included when using the "single price per minute" or "prefix" rating method', }, 'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method', @@ -144,7 +149,7 @@ tie my %unrateable_opts, 'Tie::IxHash', 'type' => 'checkbox', }, - 'use_carrierid' => { 'name' => 'Only charge for CDRs where the Carrier ID is set to: ', + 'use_carrierid' => { 'name' => 'Only charge for CDRs where the Carrier ID is set to any of these (comma-separated) values: ', }, 'use_cdrtypenum' => { 'name' => 'Only charge for CDRs where the CDR Type is set to: ', @@ -224,6 +229,10 @@ tie my %unrateable_opts, 'Tie::IxHash', }, #eofalse + 'usage_nozero' => { 'name' => 'Omit details for included / no-charge calls.', + 'type' => 'checkbox', + }, + 'bill_every_call' => { 'name' => 'Generate an invoice immediately for every call (as well any setup fee, upon first payment). Useful for prepaid.', 'type' => 'checkbox', }, @@ -267,6 +276,7 @@ tie my %unrateable_opts, 'Tie::IxHash', qw( cdr_svc_method rating_method ratenum intrastate_ratenum + calls_included min_charge min_included sec_granularity ignore_unrateable default_prefix @@ -315,12 +325,13 @@ sub calc_recur { } -sub calc_cancel { - my $self = shift; - my($cust_pkg, $sdate, $details, $param ) = @_; - - $self->calc_usage(@_); -} +# use the default +#sub calc_cancel { +# my $self = shift; +# my($cust_pkg, $sdate, $details, $param ) = @_; +# +# $self->calc_usage(@_); +#} #false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again @@ -338,6 +349,7 @@ sub calc_usage { my $charges = 0; my $included_min = $self->option('min_included', 1) || 0; #single price rating + my $included_calls = $self->option('calls_included', 1) || 0; my $cdr_svc_method = $self->option('cdr_svc_method',1)||'svc_phone.phonenum'; my $rating_method = $self->option('rating_method') || 'prefix'; @@ -350,11 +362,13 @@ sub calc_usage { : 'default' ); + my $usage_nozero = $self->option('usage_nozero', 1); + my $formatter = FS::detail_format->new($output_format, buffer => $details); my $use_duration = $self->option('use_duration'); - my($svc_table, $svc_field) = split('\.', $cdr_svc_method); + my($svc_table, $svc_field, $by_ip_addr) = split('\.', $cdr_svc_method); my @cust_svc; if( $self->option('bill_inactive_svcs',1) ) { @@ -383,14 +397,20 @@ sub calc_usage { 'status' => '', 'for_update' => 1, ); # $last_bill, $$sdate ) - $options{'by_svcnum'} = 1 if $svc_field eq 'svcnum'; + if ( $svc_field eq 'svcnum' ) { + $options{'by_svcnum'} = 1; + } + elsif ($svc_table eq 'svc_pbx' and $svc_field eq 'ip') { + $options{'by_ip_addr'} = $by_ip_addr; + } #my @invoice_details_sort; #first rate any outstanding CDRs not yet rated - foreach my $cdr ( - $svc_x->get_cdrs( %options ) - ) { + my $cdr_search = $svc_x->psearch_cdrs(%options); + $cdr_search->limit(1000); + $cdr_search->increment(0); # because we're changing their status as we go + while ( my $cdr = $cdr_search->fetch ) { my $error = $cdr->rate( 'part_pkg' => $self, @@ -401,19 +421,36 @@ sub calc_usage { ); die $error if $error; #?? + $cdr_search->adjust(1) if $cdr->freesidestatus eq ''; + # it was skipped without changing status, so increment the + # offset so that we don't re-fetch it on refill + } # $cdr #then add details to invoices & get a total $options{'status'} = 'rated'; - foreach my $cdr ( - $svc_x->get_cdrs( %options ) - ) { + $cdr_search = $svc_x->psearch_cdrs(%options); + $cdr_search->limit(1000); + $cdr_search->increment(0); + while ( my $cdr = $cdr_search->fetch ) { + my $error; # at this point we officially Do Not Care about the rating method - $charges += $cdr->rated_price; - $formatter->append($cdr); - $cdr->set_status('done'); - } + if ( $included_calls > 0 ) { + $included_calls--; + #$charges += 0, obviously + #but don't set the rated price to zero--there should be a record + $error = $cdr->set_status('no-charge'); + } + else { + $charges += $cdr->rated_price; + $error = $cdr->set_status('done'); + } + die $error if $error; + $formatter->append($cdr) unless $usage_nozero && $cdr->rated_price == 0; + + $cdr_search->adjust(1) if $cdr->freesidestatus eq 'rated'; + } #$cdr } $formatter->finish; #writes into $details @@ -429,11 +466,11 @@ sub check_chargable { return 'amaflags != 2' if $self->option_cacheable('use_amaflags') && $cdr->amaflags != 2; - return "disposition NOT IN ( $self->option_cacheable('disposition_in') )" + return "disposition NOT IN ( ". $self->option_cacheable('disposition_in')." )" if $self->option_cacheable('disposition_in') =~ /\S/ && !grep { $cdr->disposition eq $_ } split(/\s*,\s*/, $self->option_cacheable('disposition_in')); - return "disposition IN ( $self->option_cacheable('ignore_disposition') )" + return "disposition IN ( ". $self->option_cacheable('ignore_disposition')." )" if $self->option_cacheable('ignore_disposition') =~ /\S/ && grep { $cdr->disposition eq $_ } split(/\s*,\s*/, $self->option_cacheable('ignore_disposition')); @@ -442,26 +479,26 @@ sub check_chargable { if length($_) && substr($cdr->dst,0,length($_)) eq $_; } - return "carrierid != $self->option_cacheable('use_carrierid')" - if length($self->option_cacheable('use_carrierid')) - && $cdr->carrierid ne $self->option_cacheable('use_carrierid') #ne otherwise 0 matches '' - && ! $flags{'da_rewrote'}; + return "carrierid NOT IN ( ". $self->option_cacheable('use_carrierid'). " )" + if $self->option_cacheable('use_carrierid') =~ /\S/ + && ! $flags{'da_rewrote'} #why? + && !grep { $cdr->carrierid eq $_ } split(/\s*,\s*/, $self->option_cacheable('use_carrierid')); #eq otherwise 0 matches '' # unlike everything else, use_cdrtypenum is applied in FS::svc_x::get_cdrs. - return "cdrtypenum != $self->option_cacheable('use_cdrtypenum')" + return "cdrtypenum != ". $self->option_cacheable('use_cdrtypenum') if length($self->option_cacheable('use_cdrtypenum')) && $cdr->cdrtypenum ne $self->option_cacheable('use_cdrtypenum'); #ne otherwise 0 matches '' - return "cdrtypenum == $self->option_cacheable('ignore_cdrtypenum')" + return "cdrtypenum == ". $self->option_cacheable('ignore_cdrtypenum') if length($self->option_cacheable('ignore_cdrtypenum')) && $cdr->cdrtypenum eq $self->option_cacheable('ignore_cdrtypenum'); #eq otherwise 0 matches '' - return "dcontext IN ( $self->option_cacheable('skip_dcontext') )" + return "dcontext IN ( ". $self->option_cacheable('skip_dcontext'). " )" if $self->option_cacheable('skip_dcontext') =~ /\S/ && grep { $cdr->dcontext eq $_ } split(/\s*,\s*/, $self->option_cacheable('skip_dcontext')); my $len_prefix = length($self->option_cacheable('skip_dstchannel_prefix')); - return "dstchannel starts with $self->option_cacheable('skip_dstchannel_prefix')" + return "dstchannel starts with ". $self->option_cacheable('skip_dstchannel_prefix') if $len_prefix && substr($cdr->dstchannel,0,$len_prefix) eq $self->option_cacheable('skip_dstchannel_prefix'); @@ -472,7 +509,7 @@ sub check_chargable { && $cdr->is_tollfree('accountcode') ); - return "lastapp is $self->option_cacheable('skip_lastapp')" + return "lastapp is ". $self->option_cacheable('skip_lastapp') if length($self->option_cacheable('skip_lastapp')) && $cdr->lastapp eq $self->option_cacheable('skip_lastapp'); my $src_length = $self->option_cacheable('skip_src_length_more');