hidecancelledcustomers

diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
index 2c17bae..52323ba 100755 (executable)
--- a/htdocs/misc/bill.cgi
+++ b/htdocs/misc/bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: bill.cgi,v 1.4 1999-01-19 05:14:02 ivan Exp $
+# $Id: bill.cgi,v 1.5 1999-08-12 04:32:21 ivan Exp $
 #
 # s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
 #
@@ -8,7 +8,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: bill.cgi,v $
-# Revision 1.4  1999-01-19 05:14:02  ivan
+# Revision 1.5  1999-08-12 04:32:21  ivan
+# hidecancelledcustomers
+#
+# Revision 1.4  1999/01/19 05:14:02  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -51,5 +54,5 @@ $error = $cust_main->collect(
                             );
 &eidiot($error) if $error;
 
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
 

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 9af2fce..c754dd9 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.12 1999-07-17 10:38:52 ivan Exp $
+# $Id: cust_main.cgi,v 1.13 1999-08-12 04:32:21 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.12  1999-07-17 10:38:52  ivan
+# 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
 #
@@ -59,7 +62,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;
@@ -72,6 +76,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' ) {
@@ -91,8 +97,13 @@ if ( $cgi->keywords ) {
   &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);