<%
+ my $title = 'Payment Search Results';
my( $count_query, $sql_query );
if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
- my %search;
- my @search;
+ my @search = ();
+
+ if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
+ my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+ die "unknown agentnum $1" unless $agent;
+ $title = $agent->agent. " $title";
+ }
if ( $cgi->param('payby') ) {
$cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
or die "illegal payby ". $cgi->param('payby');
- $search{'payby'} = $1;
+ push @search, "cust_pay.payby = '$1'";
if ( $3 ) {
if ( $3 eq 'VisaMC' ) {
#avoid posix regexes for portability
push @search, " _date < $1 ";
}
- my $search;
+ my $search = '';
if ( @search ) {
- $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
- join(' AND ', @search);
+ $search = ' WHERE '. join(' AND ', @search);
}
- my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
- $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
- ( $hsearch ? " WHERE $hsearch " : '' ).
+ $count_query = "SELECT COUNT(*), SUM(paid) ".
+ "FROM cust_pay LEFT JOIN cust_main USING ( custnum )".
$search;
$sql_query = {
'table' => 'cust_pay',
- 'hashref' => \%search,
+ 'select' => 'cust_pay.*, cust_main.last, cust_main.first, cust_main.company',
+ 'hashref' => {},
'extra_sql' => "$search ORDER BY _date",
+ 'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
};
} else {
%>
<%= include( 'elements/search.html',
- 'title' => 'Payment Search Results',
+ 'title' => $title,
'name' => 'payments',
'query' => $sql_query,
'count_query' => $count_query,
sub { sprintf('$%.2f', shift->paid ) },
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;
- },
+ sub { $_[0]->get('last'). ', '. $_[0]->first; },
+ 'company',
],
'align' => 'lrrrll',
'links' => [