diff options
Diffstat (limited to 'httemplate/search/cust_credit.html')
| -rwxr-xr-x | httemplate/search/cust_credit.html | 95 |
1 files changed, 39 insertions, 56 deletions
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html index 279d682cd..faaa7a817 100755 --- a/httemplate/search/cust_credit.html +++ b/httemplate/search/cust_credit.html @@ -1,18 +1,10 @@ <% - my $title = 'Credit Search Results'; #my( $count_query, $sql_query ); my @search = (); if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) { - push @search, "cust_credit.otaker = '$1'"; - } - - if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) { - push @search, "agentnum = $1"; - my $agent = qsearchs('agent', { 'agentnum' => $1 } ); - die "unknown agentnum $1" unless $agent; - $title = $agent->agent. " $title"; + push @search, "otaker = '$1'"; } #false laziness with cust_pkg.cgi and cust_pay.cgi @@ -40,58 +32,49 @@ ? 'WHERE '. join(' AND ', @search) : ''; - my $count_query = 'SELECT COUNT(*), SUM(amount) '. - 'FROM cust_credit LEFT JOIN cust_main USING ( custnum ) '. - $where; - + my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where"; my $sql_query = { 'table' => 'cust_credit', - 'select' => join(', ', - 'cust_credit.*', - 'cust_main.custnum as cust_main_custnum', - FS::UI::Web::cust_sql_fields(), - ), 'hashref' => {}, 'extra_sql' => $where, - 'addl_from' => 'LEFT JOIN cust_main USING ( custnum )', }; - my $clink = sub { - my $cust_bill = shift; - $cust_bill->cust_main_custnum - ? [ "${p}view/cust_main.cgi?", 'custnum' ] - : ''; - }; + my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ]; -%><%= include( 'elements/search.html', - 'title' => $title, - 'name' => 'credits', - 'query' => $sql_query, - 'count_query' => $count_query, - 'count_addl' => [ '$%.2f total credited', ], - #'redirect' => $link, - 'header' => [ 'Amount', - 'Date', - FS::UI::Web::cust_header(), - 'By', - 'Reason' - ], - 'fields' => [ - #'crednum', - sub { sprintf('$%.2f', shift->amount ) }, - sub { time2str('%b %d %Y', shift->_date ) }, - \&FS::UI::Web::cust_fields, - 'otaker', - 'reason', - ], - #'align' => 'rrrllll', - 'align' => 'rr', - 'links' => [ - '', - '', - ( map { $clink } FS::UI::Web::cust_header() ), - '', - '', - ], - ) +%> +<%= include( 'elements/search.html', + 'title' => 'Credit Search Results', + 'name' => 'credits', + 'query' => $sql_query, + 'count_query' => $count_query, + 'count_addl' => [ '$%.2f total credited', ], + #'redirect' => $link, + 'header' => + [ qw(Amount Date), 'Cust #', 'Contact name', + qw(Company By Reason) ], + 'fields' => [ + #'crednum', + sub { sprintf('$%.2f', shift->amount ) }, + sub { time2str('%b %d %Y', shift->_date ) }, + 'custnum', + sub { my $cust_main = shift->cust_main; + $cust_main->get('last'). ', '. $cust_main->first; + }, + sub { my $cust_main = shift->cust_main; + $cust_main->company; + }, + 'otaker', + 'reason', + ], + 'align' => 'rrrllll', + 'links' => [ + '', + '', + $clink, + $clink, + $clink, + '', + '', + ], + ) %> |