*** empty log message ***

[freeside.git] / htdocs / edit / cust_main.cgi
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi

index 1455601..1a91f3d 100755 (executable)
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
  #!/usr/bin/perl -Tw
  #
-# cust_main.cgi: Edit a customer (output form)
+# $Id: cust_main.cgi,v 1.3 1998-12-17 06:17:00 ivan Exp $
  #
  # Usage: cust_main.cgi custnum
  #        http://server.name/path/cust_main.cgi?custnum
@@ -38,24 +38,28 @@
  #      bmccane@maxbaud.net     98-apr-3
  #
  # fixed one missed day->daytime ivan@sisd.com 98-jul-13
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.3  1998-12-17 06:17:00  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
  
  use strict;
-use CGI::Base;
+use CGI;
  use CGI::Carp qw(fatalsToBrowser);
  use FS::UID qw(cgisuidsetup getotaker);
  use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
  use FS::cust_main;
  
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
  
  cgisuidsetup($cgi);
  
-SendHeaders(); # one guess.
-
  #get record
  my($custnum,$action,$cust_main);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
    $custnum=$1;
    $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
    $action='Edit';
@@ -63,20 +67,12 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
    $custnum='';
    $cust_main = create FS::cust_main ( {} );
    $cust_main->setfield('otaker',&getotaker);
-  $cust_main->setfield('country','US');
    $action='Add';
  }
  
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Customer $action</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Customer $action</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_main.cgi" METHOD=POST>
+my $p1 = popurl(1);'
+print $cgi->header, header("Customer $action", ''), <<END;
+    <FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>
      <PRE>
  END
  
@@ -130,21 +126,23 @@ Name (last)<INPUT TYPE="text" NAME="last" VALUE="$last"> (first)<INPUT TYPE="tex
  Company <INPUT TYPE="text" NAME="company" VALUE="$company">
  Address <INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=40 MAXLENGTH=40>
          <INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=40 MAXLENGTH=40>
-City <INPUT TYPE="text" NAME="city" VALUE="$city">  State (county) <SELECT NAME="state" SIZE="1">
+City <INPUT TYPE="text" NAME="city" VALUE="$city">  State (county) / Country<SELECT NAME="state" SIZE="1">
  END
  
  foreach ( qsearch('cust_main_county',{}) ) {
    print "<OPTION";
    print " SELECTED" if ( $cust_main->state eq $_->state
-                      && $cust_main->county eq $_->county );
+                         && $cust_main->county eq $_->county 
+                         && $cust_main->country eq $_->country
+                       );
    print ">",$_->state;
    print " (",$_->county,")" if $_->county;
+  print " / ", $_->country;
  }
  print "</SELECT>";
  
-my($zip,$country,$daytime,$night,$fax)=(
+my($zip,$daytime,$night,$fax)=(
    $cust_main->zip,
-  $cust_main->country,
    $cust_main->daytime,
    $cust_main->night,
    $cust_main->fax,
@@ -152,7 +150,6 @@ my($zip,$country,$daytime,$night,$fax)=(
  
  print <<END;
    Zip <INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10 MAXLENGTH=10>
-Country: <FONT SIZE="+1"><B>$country</B></FONT><INPUT TYPE="hidden" NAME="country" VALUE="$country">
  
  Phone (daytime)<INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18 MAXLENGTH=20>  (night)<INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18 MAXLENGTH=20>  (fax)<INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12 MAXLENGTH=12>