zip code report

[freeside.git] / httemplate / search / cust_main.cgi

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index a325667..36ad39d 100755 (executable)
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -57,6 +57,7 @@ if ( $cgi->param('browse')
 ) {
 
   my %search = ();
+
   if ( $cgi->param('browse') ) {
     my $query = $cgi->param('browse');
     if ( $query eq 'custnum' ) {
@@ -80,15 +81,16 @@ if ( $cgi->param('browse')
   } else {
     $sortby = \*last_sort; #??
     $orderby = "ORDER BY LOWER(last || ' ' || first)"; #??
-    if ( $cgi->param('otaker_on') ) {
-      $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
-      $search{otaker} = $1;
-    } elsif ( $cgi->param('agentnum_on') ) {
-      $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
-      $search{agentnum} = $1;
-    } else {
-      die "unknown query...";
-    }
+  }
+
+  if ( $cgi->param('otaker_on') ) {
+    $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
+    $search{otaker} = $1;
+  } elsif ( $cgi->param('agentnum_on') ) {
+    $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
+    $search{agentnum} = $1;
+#  } else {
+#    die "unknown query...";
   }
 
   my @qual = ();
@@ -100,18 +102,8 @@ if ( $cgi->param('browse')
              && ! $cgi->param('showcancelledcustomers') )
      ) {
     #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
-    push @qual, "
-       ( 0 < ( SELECT COUNT(*) FROM cust_pkg
-                      WHERE cust_pkg.custnum = cust_main.custnum
-                        AND ( cust_pkg.cancel IS NULL
-                              OR cust_pkg.cancel = 0
-                            )
-             )
-         OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-                    WHERE cust_pkg.custnum = cust_main.custnum
-                )
-       )
-    ";
+    push @qual, FS::cust_main->uncancel_sql;
+
    }
 
   push @qual, FS::cust_main->cancel_sql   if $cgi->param('cancelled');