my $join_cust = "
JOIN cust_bill USING ( invnum )
- JOIN cust_main USING ( custnum )
+ LEFT JOIN cust_main USING ( custnum )
";
my $join_pkg = "
AND payby != 'COMP'
";
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ $where .= " AND agentnum = $1 ";
+}
+
if ( $cgi->param('out') ) {
$where .= "
- AND 0 = ( SELECT COUNT(*) FROM cust_main_county
- WHERE ( cust_main_county.county = cust_main.county
- OR cust_main_county.county IS NULL AND cust_main.county = ''
- OR cust_main_county.county = '' AND cust_main.county IS NULL
- )
- AND ( cust_main_county.state = cust_main.state
- OR cust_main_county.state IS NULL AND cust_main.state = ''
- OR cust_main_county.state = '' AND cust_main.state IS NULL
- )
- AND cust_main_county.country = cust_main.country
- AND cust_main_county.tax > 0
+ AND 0 = (
+ SELECT COUNT(*) FROM cust_main_county
+ WHERE ( cust_main_county.county = cust_main.county
+ OR ( cust_main_county.county IS NULL AND cust_main.county = '' )
+ OR ( cust_main_county.county = '' AND cust_main.county IS NULL)
+ OR ( cust_main_county.county IS NULL AND cust_main.county IS NULL)
+ )
+ AND ( cust_main_county.state = cust_main.state
+ OR ( cust_main_county.state IS NULL AND cust_main.state = '' )
+ OR ( cust_main_county.state = '' AND cust_main.state IS NULL )
+ OR ( cust_main_county.state IS NULL AND cust_main.state IS NULL )
)
+ AND cust_main_county.country = cust_main.country
+ AND cust_main_county.tax > 0
+ )
";
} elsif ( $cgi->param('country' ) ) {
if ( $cgi->param('pkg_tax') ) {
$count_query =
- "SELECT COUNT(*), SUM( ( CASE WHEN part_pkg.setuptax = 'Y'
- THEN cust_bill_pkg.setup
- ELSE 0 )
- +
- ( CASE WHEN part_pkg.recurtax = 'Y'
- THEN cust_bill_pkg.recur
- ELSE 0 )
- )";
+ "SELECT COUNT(*), SUM(
+ ( CASE WHEN part_pkg.setuptax = 'Y'
+ THEN cust_bill_pkg.setup
+ ELSE 0
+ END
+ )
+ +
+ ( CASE WHEN part_pkg.recurtax = 'Y'
+ THEN cust_bill_pkg.recur
+ ELSE 0
+ END
+ )
+ )
+ ";
$where .= " AND (
( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
- )";
+ )
+ AND ( tax != 'Y' OR tax IS NULL )
+ ";
} else {