[freeside-commits] branch master updated. e9a847b88426bc542b99620cb11d8309175e684e

[Carl J. Adams-Collier]

The branch, master has been updated
       via  e9a847b88426bc542b99620cb11d8309175e684e (commit)
      from  513af819159383f127a731934e4b7aff67a846b7 (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 e9a847b88426bc542b99620cb11d8309175e684e
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Tue Sep 9 16:53:13 2014 -0700

    repaired a compile error I caused in cust_main_dayranges.html

diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index e78f2a4..ce12402 100644
--- a/httemplate/search/elements/cust_main_dayranges.html
+++ b/httemplate/search/elements/cust_main_dayranges.html
@@ -15,13 +15,12 @@ Example:
   };
 
 </%doc>
-
 <& search.html,
                  'name'        => 'customers',
                  'query'       => $sql_query,
                  'count_query' => $count_sql,
-                 'header'      => [
-				    @cust_header = FS::UI::Web::cust_header($cgi->param('cust_fields')),
+                 'header'      => [ 
+                                    FS::UI::Web::cust_header($cgi->param('cust_fields')),
                                     '0-30',
                                     '30-60',
                                     '60-90',
@@ -31,8 +30,12 @@ Example:
                                   ],
                  'footer'      => [
                                     'Total',
-                                    ( map '', ( 1 .. $#cust_header ) ),
-
+                                    ( map '',
+                                          ( 1 .. 
+                                            scalar(FS::UI::Web::cust_header($cgi->param('cust_fields'))-1)
+                                          ),
+                                    ),
+                                    
                                     sprintf( $money_char.'%.2f',
                                              $row->{'rangecol_0_30'} ),
                                     sprintf( $money_char.'%.2f',
@@ -55,7 +58,9 @@ Example:
                                     @pay_labels,
                                   ],
                  'links'       => [
-                                    ( map { $_ ne 'Cust. Status' ? $clink : '' } @cust_header) ),
+                                    ( map { $_ ne 'Cust. Status' ? $clink : '' }
+                                          FS::UI::Web::cust_header($cgi->param('cust_fields'))
+                                    ),
                                     '',
                                     '',
                                     '',
@@ -63,10 +68,10 @@ Example:
                                     '',
                                     @pay_links,
                                   ],
-                 'align'       => FS::UI::Web::cust_aligns().
+                 'align'       => FS::UI::Web::cust_aligns(). 
                                    'rrrrr'.
                                   ('c' x @pay_labels),
-                 'size'        => [ ( map '', @cust_header ) ),
+                 'size'        => [ ( map '', FS::UI::Web::cust_header($cgi->param('cust_fields')) ),
                                     #'-1', '', '', '', '',  '', ],
                                     '', '', '', '', '',  '', 
                                     ( map '', @pay_labels ),
@@ -93,8 +98,8 @@ Example:
 &>
 <%init>
 
+my @cust_field = FS::UI::Web::cust_header($cgi->param('cust_fields'));
 my %opt = @_;
-my @cust_header = ();
 
 #actually need to auto-generate other things too for a passed-in ranges to work
 my $ranges = $opt{'ranges'} ? delete($opt{'ranges'}) : [

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

Summary of changes:
 .../search/elements/cust_main_dayranges.html       |   23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)