X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htdocs%2Fsearch%2Fcust_main.cgi;h=03f02e4be8679f33629d8b078685c76a8b528e22;hb=0f55176926123fca13ef61a7515da8e0ea7a1db8;hp=262c1579c3a33f01fbf7b1f96a5a5d2750e725b3;hpb=a3e720b5de05f45ab48d30d5fcfe07f1ef6c3a81;p=freeside.git
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 262c1579c..03f02e4be 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.9 1999-02-28 00:03:55 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,24 @@
# 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.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,22 +49,19 @@
#
use strict;
-use vars qw(%ncancelled_pkgs %all_pkgs);
+use vars qw(%ncancelled_pkgs %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);
-
if ( $cgi->keywords ) {
my($query)=$cgi->keywords;
if ( $query eq 'custnum' ) {
@@ -68,21 +80,18 @@ if ( $cgi->keywords ) {
&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;
+#%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+%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
", table, <
@@ -126,12 +135,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!$pkg | !;
+ print $n1, qq!$pkg - $comment | !;
my($n2)='';
foreach my $cust_svc ( @cust_svc ) {
my($label, $value, $svcdb) = $cust_svc->label;
@@ -149,7 +159,6 @@ END
print <
-