[freeside-commits] branch master updated. 29ed5abdfcc723bf8a3c29a0ae71775a07477033

[Mark Wells]

The branch, master has been updated
       via  29ed5abdfcc723bf8a3c29a0ae71775a07477033 (commit)
       via  6dfa4e6c301d65fdecfb6891fe0bb545aabc8d43 (commit)
      from  5dc4f5c7bd581510e6601d8e0a3a2c517e54280f (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 29ed5abdfcc723bf8a3c29a0ae71775a07477033
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Sep 30 15:31:13 2016 -0700

    on 5.x, always 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 4b5158e..420026d 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -120,10 +120,6 @@ 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',
                     },
 
@@ -329,7 +325,7 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                        cdr_svc_method
                        rating_method rounding ratenum intrastate_ratenum 
                        calls_included
-                       min_charge min_included show_min_included
+                       min_charge min_included
                        sec_granularity
                        ignore_unrateable
                        default_prefix
@@ -547,8 +543,7 @@ 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 ) {
+  if ( $included_min_total > 0 ) {
 
     my $min_detail = sprintf('%d / %d ',
                        $included_min_total - $included_min_left,

commit 6dfa4e6c301d65fdecfb6891fe0bb545aabc8d43
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 50ae0af..4b5158e 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',
                     },
 
@@ -325,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
@@ -401,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);
@@ -500,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; #??
@@ -541,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;
 }
 

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

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