X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_inbound.pm;h=425d86bc22afda30802fef2cf417cb1913e40a27;hb=cb6677a63d9f6d617e3cd5b766a5353013290331;hp=e3e6faaf7404224ae53953f6ae7f9d3c867af906;hpb=a3083358ecc9b9b7f9294847cbea30652b48d8e8;p=freeside.git diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm index e3e6faaf7..425d86bc2 100644 --- a/FS/FS/part_pkg/voip_inbound.pm +++ b/FS/FS/part_pkg/voip_inbound.pm @@ -24,7 +24,7 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); %info = ( 'name' => 'VoIP flat rate pricing of CDRs for inbound calls', 'shortname' => 'VoIP/telco CDR rating (inbound)', - 'inherit_fields' => [ 'global_Mixin' ], + 'inherit_fields' => [ 'prorate_Mixin', 'global_Mixin' ], 'fields' => { #false laziness w/flat.pm 'recur_temporality' => { 'name' => 'Charge recurring fee for period', @@ -35,10 +35,6 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'subscription', 'default' => '1', }, - 'add_full_period'=> { 'name' => 'When prorating first month, also bill '. - 'for one full period after that', - 'type' => 'checkbox', - }, 'recur_method' => { 'name' => 'Recurring fee method', 'type' => 'select', @@ -47,6 +43,9 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'min_charge' => { 'name' => 'Charge per minute', }, + + 'min_included' => { 'name' => 'Minutes included', + }, 'sec_granularity' => { 'name' => 'Granularity', 'type' => 'select', @@ -61,22 +60,23 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'type' => 'checkbox', }, - 'use_amaflags' => { 'name' => 'Do not charge for CDRs where the amaflags field is not set to "2" ("BILL"/"BILLING").', + 'use_amaflags' => { 'name' => 'Only charge for CDRs where the amaflags field is set to "2" ("BILL"/"BILLING").', 'type' => 'checkbox', }, - 'use_disposition' => { 'name' => 'Do not charge for CDRs where the disposition flag is not set to "ANSWERED".', - 'type' => 'checkbox', + 'use_carrierid' => { 'name' => 'Only charge for CDRs where the Carrier ID is set to: ', }, - 'use_disposition_taqua' => { 'name' => 'Do not charge for CDRs where the disposition is not set to "100" (Taqua).', - 'type' => 'checkbox', - }, - - 'use_carrierid' => { 'name' => 'Do not charge for CDRs where the Carrier ID is not set to: ', + 'use_cdrtypenum' => { 'name' => 'Only charge for CDRs where the CDR Type is set to: ', + }, + + 'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to: ', }, - 'use_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is not set to: ', + 'ignore_disposition' => { 'name' => 'Do not charge for CDRs where the Disposition is set to any of these (comma-separated) values: ', + }, + + 'disposition_in' => { 'name' => 'Only charge for CDRs where the Disposition is set to any of these (comma-separated) values: ', }, 'skip_dcontext' => { 'name' => 'Do not charge for CDRs where the dcontext is set to any of these (comma-separated) values:', @@ -144,12 +144,15 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); }, 'fieldorder' => [qw( recur_temporality - recur_method cutoff_day add_full_period - min_charge sec_granularity + recur_method cutoff_day ), + FS::part_pkg::prorate_Mixin::fieldorder, + qw( min_charge min_included sec_granularity default_prefix disable_tollfree - use_amaflags use_disposition - use_disposition_taqua use_carrierid use_cdrtypenum + use_amaflags + use_carrierid + use_cdrtypenum ignore_cdrtypenum + ignore_disposition disposition_in skip_dcontext skip_dstchannel_prefix skip_dst_length_less skip_lastapp use_duration @@ -167,11 +170,6 @@ sub price_info { $str; } -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my $self = shift; my($cust_pkg, $sdate, $details, $param ) = @_; @@ -207,7 +205,9 @@ sub calc_usage { my $spool_cdr = $cust_pkg->cust_main->spool_cdr; - my %included_min = (); + my $included_min = ($self->option('min_included') + && $self->option('min_included') > 0) + ? $self->option('min_included') : 0; my $charges = 0; @@ -254,42 +254,58 @@ sub calc_usage { my $minutes = sprintf("%.1f",$seconds / 60); $minutes =~ s/\.0$// if $granularity == 60; # count whole minutes, convert to integer $minutes = 1 unless $granularity; # per call - my $charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes ) + + my $charge_min = $minutes; + my $charge = 0; + + $included_min -= $minutes; + if ( $included_min > 0 ) { + $charge_min = 0; + } + else { + $charge_min = 0 - $included_min; + $included_min = 0; + } + + $charge = sprintf('%.4f', ( $self->option('min_charge') * $charge_min ) + 0.00000001 ); #so 1.00005 rounds to 1.0001 - next if !$charge; - $charges += $charge; - my @call_details = ($cdr->downstream_csv( 'format' => $output_format, - 'charge' => $charge, - 'minutes' => $minutes, - 'granularity' => $granularity, - ) - ); - push @$details, - [ 'C', - $call_details[0], - $charge, - $cdr->calltypenum, #classnum - $self->phonenum, - $seconds, - '', #regionname, not set for inbound calls - ]; - - my $error = $cdr->set_status_and_rated_price( 'done', + + if ( $charge > 0 ) { + $charges += $charge; + my @call_details = ( + $cdr->downstream_csv( 'format' => $output_format, + 'charge' => $charge, + 'seconds' => ($use_duration + ? $cdr->duration + : $cdr->billsec + ), + 'granularity' => $granularity, + ) + ); + push @$details, + { format => 'C', + detail => $call_details[0], + amount => $charge, + classnum => $cdr->calltypenum, #classnum + phonenum => $self->phonenum, + accountcode => $cdr->accountcode, + startdate => $cdr->startdate, + duration => $seconds, + # regionname?? => '', #regionname, not set for inbound calls + }; + } + + my $error = $cdr->set_status_and_rated_price( 'done', $charge, $cust_svc->svcnum, 'inbound' => 1 ); - die $error if $error; + die $error if $error; } #$cdr } # $cust_svc - unshift @$details, [ 'C', - FS::cdr::invoice_header($output_format), - '', - '', - '', - '', - '', - ] + unshift @$details, { format => 'C', + detail => FS::cdr::invoice_header($output_format), + } if @$details; $charges; @@ -304,10 +320,11 @@ sub check_chargable { my @opt = qw( use_amaflags - use_disposition - use_disposition_taqua use_carrierid use_cdrtypenum + ignore_cdrtypenum + disposition_in + ignore_disposition skip_dcontext skip_dstchannel_prefix skip_dst_length_less @@ -321,11 +338,13 @@ sub check_chargable { return 'amaflags != 2' if $opt{'use_amaflags'} && $cdr->amaflags != 2; - return 'disposition != ANSWERED' - if $opt{'use_disposition'} && $cdr->disposition ne 'ANSWERED'; - - return "disposition != 100" - if $opt{'use_disposition_taqua'} && $cdr->disposition != 100; + return "disposition NOT IN ( $opt{'disposition_in'} )" + if $opt{'disposition_in'} =~ /\S/ + && !grep { $cdr->disposition eq $_ } split(/\s*,\s*/, $opt{'disposition_in'}); + + return "disposition IN ( $opt{'ignore_disposition'} )" + if $opt{'ignore_disposition'} =~ /\S/ + && grep { $cdr->disposition eq $_ } split(/\s*,\s*/, $opt{'ignore_disposition'}); return "carrierid != $opt{'use_carrierid'}" if length($opt{'use_carrierid'}) @@ -335,6 +354,10 @@ sub check_chargable { return "cdrtypenum != $opt{'use_cdrtypenum'}" if length($opt{'use_cdrtypenum'}) && $cdr->cdrtypenum ne $opt{'use_cdrtypenum'}; #ne otherwise 0 matches '' + + return "cdrtypenum == $opt{'ignore_cdrtypenum'}" + if length($opt{'ignore_cdrtypenum'}) + && $cdr->cdrtypenum eq $opt{'ignore_cdrtypenum'}; #eq otherwise 0 matches '' return "dcontext IN ( $opt{'skip_dcontext'} )" if $opt{'skip_dcontext'} =~ /\S/