[freeside-commits] branch FREESIDE_3_BRANCH updated. 861c90163e1b7c564ef7905d657b3cf16e7a328d

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  861c90163e1b7c564ef7905d657b3cf16e7a328d (commit)
      from  38e4d0297f45363d7b95d503bd0892b994d67e4e (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 861c90163e1b7c564ef7905d657b3cf16e7a328d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Apr 21 13:06:54 2017 -0700

    expose invoice_lines() to invoice_html template for legacy mailbug use, RT#71087

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index eb14db0..c8b419d 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1641,24 +1641,24 @@ sub print_generic {
   die "no invoice_lines() functions in template?"
     if ( $format eq 'template' && !$wasfunc );
 
-  if ($format eq 'template') {
+  if ( $invoice_lines ) {
+    $invoice_data{'total_pages'} = int( scalar(@buf) / $invoice_lines );
+    $invoice_data{'total_pages'}++
+      if scalar(@buf) % $invoice_lines;
+  }
 
-    if ( $invoice_lines ) {
-      $invoice_data{'total_pages'} = int( scalar(@buf) / $invoice_lines );
-      $invoice_data{'total_pages'}++
-        if scalar(@buf) % $invoice_lines;
+  #setup subroutine for the template
+  $invoice_data{invoice_lines} = sub {
+    my $lines = shift || scalar(@buf);
+    map { 
+      scalar(@buf)
+        ? shift @buf
+        : [ '', '' ];
     }
+    ( 1 .. $lines );
+  };
 
-    #setup subroutine for the template
-    $invoice_data{invoice_lines} = sub {
-      my $lines = shift || scalar(@buf);
-      map { 
-        scalar(@buf)
-          ? shift @buf
-          : [ '', '' ];
-      }
-      ( 1 .. $lines );
-    };
+  if ($format eq 'template') {
 
     my $lines;
     my @collect;

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

Summary of changes:
 FS/FS/Template_Mixin.pm |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)