fix display of duration on inbound packages with use_duraiton, RT#14370

[freeside.git] / FS / FS / part_pkg / voip_inbound.pm

diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm
index 1b91575..ea3250b 100644 (file)
--- a/FS/FS/part_pkg/voip_inbound.pm
+++ b/FS/FS/part_pkg/voip_inbound.pm
@@ -47,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',
@@ -78,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:',
                        },
@@ -145,11 +154,13 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
   'fieldorder' => [qw(
                        recur_temporality
                        recur_method cutoff_day add_full_period
-                       min_charge sec_granularity
+                       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
@@ -160,6 +171,13 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
   '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');
@@ -200,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;
 
@@ -247,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,
@@ -301,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
@@ -319,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'})
@@ -328,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/