X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477partV.html;h=1d21649f56e9f0eee723e52bea3fa333e8e77cb3;hb=f0749e294656ac2615edaa59bbdb850eb3d20544;hp=885294d289e210f763840eeca0a3ac2ba6024a20;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git diff --git a/httemplate/search/477partV.html b/httemplate/search/477partV.html index 885294d28..1d21649f5 100755 --- a/httemplate/search/477partV.html +++ b/httemplate/search/477partV.html @@ -26,27 +26,30 @@ my %search_hash = (); my @sql_query = (); my @count_query = (); -for ( qw(agentnum magic classnum) ) { +for ( qw(agentnum magic) ) { $search_hash{$_} = $cgi->param($_) if $cgi->param($_); } +$search_hash{'classnum'} = [ $cgi->param('classnum') ]; +$search_hash{report_option} = $cgi->param('partv_report_option') + if $cgi->param('partv_report_option'); my $sql_query = FS::cust_pkg->search( { %search_hash, 'fcc_line' > 1 }); -$sql_query->{select} = 'DISTINCT zip'; +$sql_query->{select} = 'DISTINCT substr(zip,1,5) as zip'; $sql_query->{extra_sql} =~ s/ORDER BY [.\w]+//; push @sql_query, $sql_query; push @count_query, delete($sql_query->{'count_query'}); -$count_query[0] =~ s/count\(\*\)/count(DISTINCT zip)/; +$count_query[0] =~ s/COUNT\(\*\)/count(DISTINCT substr(zip,1,5))/; $count_query[0] =~ s/ORDER BY [.\w]+//; -$search_hash{classnum} = $cgi->param('part2a_classnum') - if $cgi->param('part2a_classnum'); +$search_hash{report_option} = $cgi->param('partv_report_option') + if $cgi->param('partv_report_option'); $sql_query = FS::cust_pkg->search( { %search_hash } ); -$sql_query->{select} = 'DISTINCT zip'; +$sql_query->{select} = 'DISTINCT substr(zip,1,5) as zip'; $sql_query->{extra_sql} =~ s/ORDER BY [.\w]+//; push @sql_query, $sql_query; push @count_query, delete($sql_query->{'count_query'}); -$count_query[1] =~ s/count\(\*\)/count(DISTINCT zip)/; +$count_query[1] =~ s/COUNT\(\*\)/count(DISTINCT substr(zip,1,5))/; $count_query[1] =~ s/ORDER BY [.\w]+//; my $count_query = join(' UNION ', @count_query);