[freeside-commits] branch FREESIDE_3_BRANCH updated. 073207439e4d49538b1b9111b8f03eb65d5a423c

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  073207439e4d49538b1b9111b8f03eb65d5a423c (commit)
      from  081c6b3eeb0d2627e00bc39683748622acce87ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 073207439e4d49538b1b9111b8f03eb65d5a423c
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Sep 30 12:12:09 2016 -0700

    show included minutes on invoice, #71455

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 2820cdf..7c8d2ff 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -123,6 +123,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',
                     },
 
@@ -328,7 +332,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
@@ -404,10 +409,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);
@@ -503,7 +509,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; #??
@@ -544,6 +550,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;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/voip_cdr.pm |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)