X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_inbound.pm;h=4714ccb28ca804f00192e041643474aaf4cf450d;hp=4937bb86b8e3df7d5f6f534e3b9f1f0ff01995f4;hb=bda8c33f9b346ba6cd7aa4174ce0d3e37db7bd49;hpb=dfe3bf05cc94635ae1f9ca233e060acc21d0e487 diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm index 4937bb86b..4714ccb28 100644 --- a/FS/FS/part_pkg/voip_inbound.pm +++ b/FS/FS/part_pkg/voip_inbound.pm @@ -1,16 +1,15 @@ package FS::part_pkg::voip_inbound; +use base qw( FS::part_pkg::recur_Common ); use strict; -use vars qw(@ISA $DEBUG %info); +use vars qw($DEBUG %info); use Date::Format; use Tie::IxHash; +use Text::CSV_XS; use FS::Conf; use FS::Record qw(qsearchs qsearch); -use FS::part_pkg::recur_Common; use FS::cdr; -use FS::part_pkg::recur_Common; - -@ISA = qw(FS::part_pkg::recur_Common); +use FS::rate_detail; $DEBUG = 0; @@ -24,25 +23,13 @@ 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' => [ 'prorate_Mixin', 'global_Mixin' ], 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Base recurring fee for this package', - 'default' => 0, - }, - #false laziness w/flat.pm 'recur_temporality' => { 'name' => 'Charge recurring fee for period', 'type' => 'select', 'select_options' => \%temporalities, }, - - 'unused_credit' => { 'name' => 'Credit the customer for the unused portion'. - ' of service at cancellation', - 'type' => 'checkbox', - }, - 'cutoff_day' => { 'name' => 'Billing Day (1 - 28) for prorating or '. 'subscription', 'default' => '1', @@ -55,6 +42,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', @@ -65,26 +55,23 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'default' => '+1', }, - 'disable_tollfree' => { 'name' => 'Disable automatic toll-free processing', - '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:', @@ -151,13 +138,15 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); }, 'fieldorder' => [qw( - setup_fee recur_fee recur_temporality unused_credit - recur_method cutoff_day - min_charge sec_granularity + recur_temporality + 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 @@ -165,12 +154,14 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); bill_every_call ) ], - 'weight' => 40, + 'weight' => 42, ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); +sub price_info { + my $self = shift; + my $str = $self->SUPER::price_info; + $str .= " plus usage" if $str; + $str; } sub calc_recur { @@ -203,28 +194,26 @@ sub calc_usage { my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup return 0 - if $self->option('recur_temporality', 1) eq 'preceding' + if $self->recur_temporality eq 'preceding' && ( $last_bill eq '' || $last_bill == 0 ); my $spool_cdr = $cust_pkg->cust_main->spool_cdr; - my %included_min = (); my $charges = 0; # my $downstream_cdr = ''; - my $disable_tollfree = $self->option('disable_tollfree'); - my $ignore_unrateable = $self->option('ignore_unrateable', 'Hush!'); - my $use_duration = $self->option('use_duration'); - - my $output_format = $self->option('output_format', 'Hush!') || 'default'; + my $included_min = $self->option('min_included', 1) || 0; + my $use_duration = $self->option('use_duration'); + my $output_format = $self->option('output_format', 1) || 'default'; + my $granularity = length($self->option('sec_granularity')) + ? $self->option('sec_granularity') + : 60; #for check_chargable, so we don't keep looking up options inside the loop my %opt_cache = (); - eval "use Text::CSV_XS;"; - die $@ if $@; my $csv = new Text::CSV_XS; foreach my $cust_svc ( @@ -233,19 +222,25 @@ sub calc_usage { my $svc_phone = $cust_svc->svc_x; foreach my $cdr ( $svc_phone->get_cdrs( - 'for_update' => 1, - 'status' => '', # unprocessed only - 'default_prefix' => $self->option('default_prefix'), 'inbound' => 1, + 'default_prefix' => $self->option('default_prefix'), + 'status' => '', # unprocessed only + 'for_update' => 1, ) ) { + + my $reason = $self->check_chargable( $cdr, + 'option_cache' => \%opt_cache, + ); + if ( $reason ) { + warn "not charging for CDR ($reason)\n" if $DEBUG; + next; + } + if ( $DEBUG > 1 ) { warn "rating inbound CDR $cdr\n". join('', map { " $_ => ". $cdr->{$_}. "\n" } keys %$cdr ); } - my $granularity = length($self->option('sec_granularity')) - ? $self->option('sec_granularity') - : 60; my $seconds = $use_duration ? $cdr->duration : $cdr->billsec; @@ -255,31 +250,52 @@ 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, + [ 'C', + $call_details[0], + $charge, + $cdr->calltypenum, #classnum + '', #phonenum, + $cdr->accountcode, + $cdr->startdate, + $seconds, + '', #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 @@ -305,10 +321,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 @@ -322,20 +339,25 @@ 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'}) - && $cdr->carrierid ne $opt{'use_carrierid'} #ne otherwise 0 matches '' - && ! $flags{'da_rewrote'}; + && $cdr->carrierid ne $opt{'use_carrierid'}; #ne otherwise 0 matches '' 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/