typo - missed a paren

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

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 1a9c591..ef076f9 100755 (executable)
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.14 1999-08-12 04:45:21 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,20 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.10  1999-04-09 03:52:55  ivan
+# Revision 1.14  1999-08-12 04:45:21  ivan
+# typo - missed a paren
+#
+# Revision 1.13  1999/08/12 04:32:21  ivan
+# hidecancelledcustomers
+#
+# Revision 1.12  1999/07/17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.11  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.10  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.9  1999/02/28 00:03:55  ivan
@@ -52,7 +65,8 @@
 #
 
 use strict;
-use vars qw(%ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
+#use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
+use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
@@ -65,6 +79,8 @@ use FS::cust_main;
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+
 if ( $cgi->keywords ) {
   my($query)=$cgi->keywords;
   if ( $query eq 'custnum' ) {
@@ -78,13 +94,19 @@ if ( $cgi->keywords ) {
     @cust_main=qsearch('cust_main',{});
   }
 } else {
+  @cust_main=();
   &cardsearch if ( $cgi->param('card_on') && $cgi->param('card') );
   &lastsearch if ( $cgi->param('last_on') && $cgi->param('last_text') );
   &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
 }
 
-#%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-%all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+@cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
+  if $conf->exists('hidecancelledcustomers');
+if ( $conf->exists('hidecancelledpackages' ) ) {
+  %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+} else {
+  %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+}
 
 if ( scalar(@cust_main) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
@@ -96,7 +118,7 @@ if ( scalar(@cust_main) == 1 ) {
   my($total)=scalar(@cust_main);
   print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
-  )), "$total matching customers found<BR>", &table, <<END;
+  )), "$total matching customers found<BR>", &table(), <<END;
       <TR>
         <TH></TH>
         <TH>Contact name</TH>