X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=4b5158ef3d77e6a829d5e99a401106baf6671da9;hp=24c4cf041864b7c1402380791cf84241c29b286e;hb=6dfa4e6c301d65fdecfb6891fe0bb545aabc8d43;hpb=f072dc42c97981167acae2e987a4e4e6a6a4d403

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 24c4cf041..4b5158ef3 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -120,6 +120,10 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
     'min_included' => { 'name' => 'Minutes included when using the "single price per minute" or "prefix" rating method',
                     },
 
+    'show_min_included' => { 'name' => 'Show included minutes as an invoice detail',
+                             'type' => 'checkbox',
+                    },
+
     'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
                     },
 
@@ -185,7 +189,10 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
     'skip_dst_prefix' => { 'name' => 'Do not charge for CDRs where the destination number starts with any of these values: ',
     },
 
-    'skip_dcontext' => { 'name' => 'Do not charge for CDRs where the dcontext is set to any of these (comma-separated) values: ',
+    'skip_dcontext' => { 'name' => 'Do not charge for CDRs where dcontext is set to any of these (comma-separated) values: ',
+                       },
+
+    'skip_dcontext_suffix' => { 'name' => 'Do not charge for CDRs where dcontext ends with: ',
                        },
 
     'skip_dstchannel_prefix' => { 'name' => 'Do not charge for CDRs where the dstchannel starts with:',
@@ -322,7 +329,8 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                        cdr_svc_method
                        rating_method rounding ratenum intrastate_ratenum 
                        calls_included
-                       min_charge min_included sec_granularity
+                       min_charge min_included show_min_included
+                       sec_granularity
                        ignore_unrateable
                        default_prefix
                        disable_src
@@ -333,7 +341,7 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                        use_cdrtypenum ignore_cdrtypenum
                        use_calltypenum ignore_calltypenum
                        ignore_disposition disposition_in
-                       skip_dcontext skip_dst_prefix 
+                       skip_dcontext skip_dcontext_suffix skip_dst_prefix 
                        skip_dstchannel_prefix skip_src_length_more 
                        noskip_src_length_accountcode_tollfree
                        accountcode_tollfree_ratenum accountcode_tollfree_field
@@ -398,10 +406,11 @@ sub calc_usage {
 
   my $charges = 0;
 
-  my $included_min = $self->option('min_included', 1) || 0;
+  my $included_min_total = ($self->option('min_included', 1) || 0)
+                           * ($cust_pkg->quantity || 1);
     #single price rating
     #or region group
-  $included_min *= ($cust_pkg->quantity || 1);
+  my $included_min_left = $included_min_total;
 
   my $included_calls = $self->option('calls_included', 1) || 0;
   $included_calls *= ($cust_pkg->quantity || 1);
@@ -420,7 +429,8 @@ sub calc_usage {
 
   my $formatter = FS::detail_format->new($output_format,
     buffer => $details,
-    locale => $cust_pkg->cust_main->locale
+    locale => $cust_pkg->cust_main->locale,
+    rounding  => ($self->option_cacheable('rounding') || 2),
   );
 
   my $use_duration = $self->option('use_duration');
@@ -496,7 +506,7 @@ sub calc_usage {
         'part_pkg'                          => $self,
         'cust_pkg'                          => $cust_pkg,
         'svcnum'                            => $svc_x->svcnum,
-        'plan_included_min'                 => \$included_min,
+        'plan_included_min'                 => \$included_min_left,
         'detail_included_min_hashref'       => \%detail_included_min,
       );
       die $error if $error; #??
@@ -537,6 +547,16 @@ sub calc_usage {
   $formatter->finish; #writes into $details
   unshift @$details, $formatter->header if @$details;
 
+  if ( $self->option_cacheable('show_min_included', 1)
+       and $included_min_total > 0 ) {
+
+    my $min_detail = sprintf('%d / %d ',
+                       $included_min_total - $included_min_left,
+                       $included_min_total
+                     ) .  $cust_pkg->mt('included minutes used');
+    unshift @$details, $min_detail;
+  }
+
   $charges;
 }
 
@@ -588,6 +608,11 @@ sub check_chargable {
     if $self->option_cacheable('skip_dcontext') =~ /\S/
     && grep { $cdr->dcontext eq $_ } split(/\s*,\s*/, $self->option_cacheable('skip_dcontext'));
 
+  my $len_suffix = length($self->option_cacheable('skip_dcontext_suffix'));
+  return "dcontext ends with ". $self->option_cacheable('skip_dcontext_suffix')
+    if $len_suffix
+    && substr($cdr->dcontext,-$len_suffix,$len_suffix) eq $self->option_cacheable('skip_dcontext_suffix');
+
   my $len_prefix = length($self->option_cacheable('skip_dstchannel_prefix'));
   return "dstchannel starts with ". $self->option_cacheable('skip_dstchannel_prefix')
     if $len_prefix