diff options
| author | ivan <ivan> | 2012-02-12 20:53:13 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2012-02-12 20:53:13 +0000 |
| commit | 308d5fa31ae6abf84392f940587e3f0902d78ffa (patch) | |
| tree | 6aa5e92bfb89a5678b455a89b775aee85626a079 | |
| parent | 236c838b7b4c45fa07c477e67b8ca268ca90c337 (diff) | |
fix adv. customer search (i.e. no_censustract, RT#15381)
| -rw-r--r-- | FS/FS/cust_main/Search.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm index 0de3a13e7..04e4d2478 100644 --- a/FS/FS/cust_main/Search.pm +++ b/FS/FS/cust_main/Search.pm @@ -736,7 +736,7 @@ sub search { my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : ''; - my $addl_from = 'LEFT JOIN cust_pkg USING ( custnum ) '; + my $pkg_join = 'LEFT JOIN cust_pkg USING ( custnum ) '; my $count_query = "SELECT COUNT(*) FROM cust_main $extra_sql"; @@ -756,13 +756,13 @@ sub search { }elsif ($dbh->{Driver}->{Name} =~ /^mysql/i) { push @select, "GROUP_CONCAT(part_pkg.pkg SEPARATOR '|') as magic"; - $addl_from .= " LEFT JOIN part_pkg using ( pkgpart )"; + $pkg_join .= " LEFT JOIN part_pkg using ( pkgpart )"; }else{ warn "warning: unknown database type ". $dbh->{Driver}->{Name}. "omitting packing information from report."; } - my $header_query = "SELECT COUNT(cust_pkg.custnum = cust_main.custnum) AS count FROM cust_main $addl_from $extra_sql $pkgwhere group by cust_main.custnum order by count desc limit 1"; + my $header_query = "SELECT COUNT(cust_pkg.custnum = cust_main.custnum) AS count FROM cust_main $pkg_join $extra_sql $pkgwhere group by cust_main.custnum order by count desc limit 1"; my $sth = dbh->prepare($header_query) or die dbh->errstr; $sth->execute() or die $sth->errstr; @@ -797,7 +797,6 @@ sub search { my $sql_query = { 'table' => 'cust_main', 'select' => $select, - 'addl_from' => $addl_from, 'hashref' => {}, 'extra_sql' => $extra_sql, 'order_by' => $orderby, |