[freeside-commits] branch master updated. 845a6ea956c4725b800a82cc1b2ae68cd485a015

[Carl J. Adams-Collier]

The branch, master has been updated
       via  845a6ea956c4725b800a82cc1b2ae68cd485a015 (commit)
      from  e9a847b88426bc542b99620cb11d8309175e684e (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 845a6ea956c4725b800a82cc1b2ae68cd485a015
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Tue Sep 9 17:18:41 2014 -0700

    calling FS::UI::Web::cust_sql_fields() with ->param('cust_fields'); reduced number of calls to FS::UI::Web::cust_header() by 3 in this component

diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index ce12402..ddde23a 100644
--- a/httemplate/search/elements/cust_main_dayranges.html
+++ b/httemplate/search/elements/cust_main_dayranges.html
@@ -19,8 +19,8 @@ Example:
                  'name'        => 'customers',
                  'query'       => $sql_query,
                  'count_query' => $count_sql,
-                 'header'      => [ 
-                                    FS::UI::Web::cust_header($cgi->param('cust_fields')),
+                 'header'      => [
+                                    @cust_header,
                                     '0-30',
                                     '30-60',
                                     '60-90',
@@ -30,12 +30,7 @@ Example:
                                   ],
                  'footer'      => [
                                     'Total',
-                                    ( map '',
-                                          ( 1 .. 
-                                            scalar(FS::UI::Web::cust_header($cgi->param('cust_fields'))-1)
-                                          ),
-                                    ),
-                                    
+                                    ( map '',( 1 .. $#cust_header ),),
                                     sprintf( $money_char.'%.2f',
                                              $row->{'rangecol_0_30'} ),
                                     sprintf( $money_char.'%.2f',
@@ -59,7 +54,7 @@ Example:
                                   ],
                  'links'       => [
                                     ( map { $_ ne 'Cust. Status' ? $clink : '' }
-                                          FS::UI::Web::cust_header($cgi->param('cust_fields'))
+                                          @cust_header
                                     ),
                                     '',
                                     '',
@@ -71,7 +66,7 @@ Example:
                  'align'       => FS::UI::Web::cust_aligns(). 
                                    'rrrrr'.
                                   ('c' x @pay_labels),
-                 'size'        => [ ( map '', FS::UI::Web::cust_header($cgi->param('cust_fields')) ),
+                 'size'        => [ ( map '', @cust_header ),
                                     #'-1', '', '', '', '',  '', ],
                                     '', '', '', '', '',  '', 
                                     ( map '', @pay_labels ),
@@ -98,7 +93,7 @@ Example:
 &>
 <%init>
 
-my @cust_field = FS::UI::Web::cust_header($cgi->param('cust_fields'));
+my @cust_header = FS::UI::Web::cust_header($cgi->param('cust_fields'));
 my %opt = @_;
 
 #actually need to auto-generate other things too for a passed-in ranges to work
@@ -192,7 +187,7 @@ my $sql_query = {
                    'cust_main.custnum',
                    $range_cols,
                    $packages_cols,
-                   FS::UI::Web::cust_sql_fields(),
+                   FS::UI::Web::cust_sql_fields($cgi->param('cust_fields')),
                    'payby',
                  ),
   'extra_sql' => $where,

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

Summary of changes:
 httemplate/search/elements/cust_main_dayranges.html |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)