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

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 262c1579c..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.4 1998-12-30 00:57:50 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,43 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.4  1998-12-30 00:57:50  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
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:37  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 00:57:50  ivan
 # bug
 #
 # Revision 1.3  1998/12/17 09:41:08  ivan
@@ -34,21 +68,21 @@
 #
 
 use strict;
-use vars qw(%ncancelled_pkgs %all_pkgs);
+#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;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
-my(@cust_main);
-my($sortby);
+$conf = new FS::Conf;
 
 if ( $cgi->keywords ) {
   my($query)=$cgi->keywords;
@@ -61,30 +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') );
 }
 
-my(%ncancelled_pkgs) =
-  map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-my(%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, header("Customer Search Results",menubar(
+  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>
@@ -126,12 +165,13 @@ END
     foreach ( @{$all_pkgs{$custnum}} ) {
       my($pkgnum) = ($_->pkgnum);
       my($pkg) = $_->part_pkg->pkg;
+      my $comment = $_->part_pkg->comment;
       my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
       #my(@cust_svc) = shift @lol_cust_svc;
       my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my($rowspan) = scalar(@cust_svc) || 1;
 
-      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg</FONT></A></TD>!;
+      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
       my($n2)='';
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
@@ -149,7 +189,6 @@ END
  
   print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
@@ -176,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'});
@@ -190,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'}
@@ -230,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'}