on 5.x, always show included minutes on invoice, #71455

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

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 7d9a7f5..420026d 100644 (file)
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -325,7 +325,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
+                       sec_granularity
                        ignore_unrateable
                        default_prefix
                        disable_src
@@ -401,10 +402,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);
@@ -423,7 +425,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');
@@ -499,7 +502,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; #??
@@ -540,6 +543,15 @@ sub calc_usage {
   $formatter->finish; #writes into $details
   unshift @$details, $formatter->header if @$details;
 
+  if ( $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;
 }