X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_main_dayranges.html;h=5dbece8614c7961b91c90e1880c17f926f444346;hb=4e68cf76788b220cc15f2a080df5e7a1ea4962b8;hp=eb75664944cc1c05f8fdaebeb3411274a6c87298;hpb=246670205503b6bcd91130325d2d9050fb7b74e5;p=freeside.git
diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index eb7566494..5dbece861 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 ) = @_;
@@ -19,8 +19,8 @@ Example:
'name' => 'customers',
'query' => $sql_query,
'count_query' => $count_sql,
- 'header' => [
- FS::UI::Web::cust_header(),
+ 'header' => [
+ @cust_header,
'0-30',
'30-60',
'60-90',
@@ -30,12 +30,7 @@ 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 +39,7 @@ Example:
$row->{'rangecol_60_90'} ),
sprintf( $money_char.'%.2f',
$row->{'rangecol_90_0'} ),
- sprintf( ''. $money_char.'%.2f'. '',
+ sprintf( ''.$money_char.'%.2f',
$row->{'rangecol_0_0'} ),
('') x @pay_labels,
],
@@ -59,7 +54,7 @@ Example:
],
'links' => [
( map { $_ ne 'Cust. Status' ? $clink : '' }
- FS::UI::Web::cust_header()
+ @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() ),
+ '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(),
'',
@@ -95,6 +93,7 @@ Example:
&>
<%init>
+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
@@ -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(),