X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htdocs%2Fsearch%2Fcust_main.cgi;h=8b3092ebab9ef1184129e2de32784c5f9285122c;hb=e890290677daab75e0ce28d5679baddb8a997a8e;hp=55139e9a89e4ef736b95467a63afc12d5499734c;hpb=cd6989b0380bb289bffac0b947a3bfa6eb8c773e;p=freeside.git

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 55139e9a8..8b3092eba 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.7 1999-01-25 12:19:11 ivan Exp $
+# $Id: cust_main.cgi,v 1.15 2000-07-17 16:45:41 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 96-dec-12
 #
 # rewrite ivan@sisd.com 98-mar-4
@@ -19,7 +17,32 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.7  1999-01-25 12:19:11  ivan
+# Revision 1.15  2000-07-17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# 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
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:36  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/25 12:19:11  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.6  1999/01/19 05:14:12  ivan
@@ -45,19 +68,22 @@
 #
 
 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;
 use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar idiot popurl table);
+use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+
 if ( $cgi->keywords ) {
   my($query)=$cgi->keywords;
   if ( $query eq 'custnum' ) {
@@ -69,28 +95,35 @@ if ( $cgi->keywords ) {
   } elsif ( $query eq 'company' ) {
     $sortby=\*company_sort;
     @cust_main=qsearch('cust_main',{});
+  } else {
+    die "unknown query string $query";
   }
 } 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);
   exit;
 } elsif ( scalar(@cust_main) == 0 ) {
-  idiot "No matching customers found!\n";
-  exit;
+  eidiot "No matching customers found!\n";
 } else { 
 
   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>
@@ -156,7 +189,6 @@ END
  
   print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
@@ -183,7 +215,7 @@ sub cardsearch {
 
   my($card)=$cgi->param('card');
   $card =~ s/\D//g;
-  $card =~ /^(\d{13,16})$/ or do { idiot "Illegal card number\n"; exit; };
+  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
   my($payinfo)=$1;
 
   push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
@@ -197,7 +229,7 @@ sub lastsearch {
   }
 
   $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-    or do { idiot "Illegal last name"; exit; };
+    or eidiot "Illegal last name";
   my($last)=$1;
 
   if ( $last_type{'Exact'}
@@ -237,7 +269,7 @@ sub companysearch {
   };
 
   $cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
-    or do { idiot "Illegal company"; exit; };
+    or eidiot "Illegal company";
   my($company)=$1;
 
   if ( $company_type{'Exact'}