X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_main_dayranges.html;h=e78f2a4102c2db0551e1e01e1ec0078b71fbdcc2;hb=47697b2c3988393de996dca3889a24c480c586b5;hp=eb75664944cc1c05f8fdaebeb3411274a6c87298;hpb=9bc9485d65cb202cc8df6ed37602664aafb80ea1;p=freeside.git

diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index eb7566494..e78f2a410 100644
--- a/httemplate/search/elements/cust_main_dayranges.html
+++ b/httemplate/search/elements/cust_main_dayranges.html
@@ -2,10 +2,10 @@
 
 Example:
 
-  include( 'elements/cust_main_dayranges.html',
+  <& elements/cust_main_dayranges.html,
                  'title'       => 'Accounts Receivable Aging Summary',
                  'range_sub'   => $mysub,
-         )
+  &>
 
   my $mysub = sub {
     my( $start, $end ) = @_;
@@ -15,12 +15,13 @@ Example:
   };
 
 </%doc>
+
 <& search.html,
                  'name'        => 'customers',
                  'query'       => $sql_query,
                  'count_query' => $count_sql,
-                 'header'      => [ 
-                                    FS::UI::Web::cust_header(),
+                 'header'      => [
+				    @cust_header = FS::UI::Web::cust_header($cgi->param('cust_fields')),
                                     '0-30',
                                     '30-60',
                                     '60-90',
@@ -30,12 +31,8 @@ Example:
                                   ],
                  'footer'      => [
                                     'Total',
-                                    ( map '',
-                                          ( 1 .. 
-                                            scalar(FS::UI::Web::cust_header()-1)
-                                          ),
-                                    ),
-                                    
+                                    ( map '', ( 1 .. $#cust_header ) ),
+
                                     sprintf( $money_char.'%.2f',
                                              $row->{'rangecol_0_30'} ),
                                     sprintf( $money_char.'%.2f',
@@ -44,7 +41,7 @@ Example:
                                              $row->{'rangecol_60_90'} ),
                                     sprintf( $money_char.'%.2f',
                                              $row->{'rangecol_90_0'} ),
-                                    sprintf( '<b>'. $money_char.'%.2f'. '</b>',
+                                    sprintf( '<b>'.$money_char.'%.2f</b>',
                                              $row->{'rangecol_0_0'} ),
                                     ('') x @pay_labels,
                                   ],
@@ -58,9 +55,7 @@ Example:
                                     @pay_labels,
                                   ],
                  'links'       => [
-                                    ( map { $_ ne 'Cust. Status' ? $clink : '' }
-                                          FS::UI::Web::cust_header()
-                                    ),
+                                    ( map { $_ ne 'Cust. Status' ? $clink : '' } @cust_header) ),
                                     '',
                                     '',
                                     '',
@@ -68,10 +63,10 @@ Example:
                                     '',
                                     @pay_links,
                                   ],
-                 'align'       => FS::UI::Web::cust_aligns(). 
+                 'align'       => FS::UI::Web::cust_aligns().
                                    'rrrrr'.
                                   ('c' x @pay_labels),
-                 'size'        => [ ( map '', FS::UI::Web::cust_header() ),
+                 'size'        => [ ( map '', @cust_header ) ),
                                     #'-1', '', '', '', '',  '', ],
                                     '', '', '', '', '',  '', 
                                     ( map '', @pay_labels ),
@@ -81,6 +76,9 @@ Example:
                                     '', '', '', '', 'b', 
                                     ( map '', @pay_labels ),
                                     ],
+                 'xls_format'  => [ (map '', FS::UI::Web::cust_styles),
+                                    '', '', '', '', { bold => 1 },
+                                  ],
                  'color'       => [
                                     FS::UI::Web::cust_colors(),
                                     '',
@@ -96,6 +94,7 @@ Example:
 <%init>
 
 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'}) : [
@@ -162,6 +161,15 @@ if ( grep { $cgi->param('status') eq $_ } FS::cust_main->statuses() ) {
   push @where, FS::cust_main->$method();
 }
 
+# cust_classnum (false laziness w/prepaid_income.html, elements/cust_pay_or_refund.html, cust_bill_pay.html, cust_bill_pkg.html, cust_bill_pkg_referral.html, unearned_detail.html, cust_credit.html, cust_credit_refund.html, cust_main::Search::search_sql)
+if ( grep { $_ eq 'cust_classnum' } $cgi->param ) {
+  my @classnums = grep /^\d*$/, $cgi->param('cust_classnum');
+  push @where, 'COALESCE( cust_main.classnum, 0) IN ( '.
+                   join(',', map { $_ || '0' } @classnums ).
+               ' )'
+    if @classnums;
+}
+
 #here is the agent virtualization
 push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
 
@@ -172,10 +180,11 @@ my $count_sql = "select count(*) from cust_main $where";
 
 my $sql_query = {
   'table'     => 'cust_main',
+  'addl_from' => FS::UI::Web::join_cust_main('cust_main'),
   'hashref'   => {},
   'select'    => join(',',
                    #'cust_main.*',
-                   'custnum',
+                   'cust_main.custnum',
                    $range_cols,
                    $packages_cols,
                    FS::UI::Web::cust_sql_fields(),