X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_inbound.pm;h=ea3250b7c70a351138c3051ee1c7b78b012bb2ff;hb=a3cd2b805c84be9cece3a74f1db9f1a9df09baf3;hp=15291e31b78d2c7a977ba30c955d125a129c3d13;hpb=b540a4a1b7e6ae2e48b2c3b63fc1a5ad79cfe63e;p=freeside.git diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm index 15291e31b..ea3250b7c 100644 --- a/FS/FS/part_pkg/voip_inbound.pm +++ b/FS/FS/part_pkg/voip_inbound.pm @@ -24,29 +24,21 @@ 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' ], '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', }, + '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', @@ -55,6 +47,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', @@ -86,6 +81,12 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'use_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is not set to: ', }, + + 'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to: ', + }, + + 'ignore_disposition' => { 'name' => 'Do not 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,24 +152,32 @@ 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 add_full_period + min_charge min_included sec_granularity default_prefix disable_tollfree use_amaflags use_disposition - use_disposition_taqua use_carrierid use_cdrtypenum + use_disposition_taqua use_carrierid + use_cdrtypenum ignore_cdrtypenum + ignore_disposition skip_dcontext skip_dstchannel_prefix skip_dst_length_less skip_lastapp use_duration output_format usage_mandate summarize_usage usage_section bill_every_call - count_available_phones ) ], 'weight' => 40, ); +sub price_info { + my $self = shift; + my $str = $self->SUPER::price_info; + $str .= " plus usage" if $str; + $str; +} + sub calc_setup { my($self, $cust_pkg ) = @_; $self->option('setup_fee'); @@ -209,7 +218,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; @@ -256,25 +267,44 @@ 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 ) - + 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 $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('%.2f', ( $self->option('min_charge') * $charge_min ) + + 0.00000001 ); #so 1.00005 rounds to 1.0001 + + 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 + $self->phonenum, + $seconds, + '', #regionname, not set for inbound calls + ]; + } my $error = $cdr->set_status_and_rated_price( 'done', $charge, @@ -310,6 +340,8 @@ sub check_chargable { use_disposition_taqua use_carrierid use_cdrtypenum + ignore_cdrtypenum + ignore_disposition skip_dcontext skip_dstchannel_prefix skip_dst_length_less @@ -328,6 +360,10 @@ sub check_chargable { return "disposition != 100" if $opt{'use_disposition_taqua'} && $cdr->disposition != 100; + + 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'}) @@ -337,6 +373,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/ @@ -366,15 +406,8 @@ sub is_free { # to indicate it represents a line sub calc_units { my($self, $cust_pkg ) = @_; - my $count = 0; - if ( $self->option('count_available_phones', 1)) { - map { $count += ( $_->quantity || 0 ) } - grep { $_->part_svc->svcdb eq 'svc_phone' } - $cust_pkg->part_pkg->pkg_svc; - } else { - $count = + my $count = scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc); - } $count; }