bugfix prepayment in signup server

[freeside.git] / htdocs / edit / cust_main.cgi

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index c73a069..4eef9c7 100755 (executable)
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.20 1999-08-23 07:08:11 ivan Exp $
+# $Id: cust_main.cgi,v 1.24 2000-01-30 06:54:50 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,19 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.20  1999-08-23 07:08:11  ivan
+# Revision 1.24  2000-01-30 06:54:50  ivan
+# credit card expiration dates not sticky bug fixed?
+#
+# Revision 1.23  2000/01/27 00:53:14  ivan
+# 5.004_04 workaround
+#
+# Revision 1.22  1999/12/17 02:33:23  ivan
+# argh
+#
+# Revision 1.21  1999/08/23 07:40:38  ivan
+# missing </TD> flag
+#
+# Revision 1.20  1999/08/23 07:08:11  ivan
 # no CGI::Switch for now
 #
 # Revision 1.19  1999/08/21 02:14:25  ivan
@@ -182,7 +194,7 @@ $r = qq!<font color="#ff0000">*</font>!;
 
 @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
-die "You have not created any agents.  You must create at least one agent before adding a customer.  <a href=\"". popurl(2). "browse/agent.cgi\">Create at least one agent here.</a>" unless @agents;
+die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
@@ -242,7 +254,7 @@ print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
 $cust_main->country('US') unless $cust_main->country; #eww
@@ -276,13 +288,18 @@ print "</TABLE>$r required fields<BR>";
 
 sub expselect {
   my $prefix = shift;
-  my $date = shift || '';
-  my( $m, $y ) = ( 0, 0 );
-  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
-    ( $m, $y ) = ( $2, $1 );
-  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-    ( $m, $y ) = ( $1, $3 );
+  my( $m, $y ) = (0, 0);
+  if ( scalar(@_) ) {
+    my $date = shift;
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
+    }
   }
+
   my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
   for ( 1 .. 12 ) {
     $return .= "<OPTION";
@@ -357,8 +374,8 @@ unless ( $custnum ) {
     my %typenum;
     foreach my $agent ( @agents ) {
       next if $typenum{$agent->typenum}++;
-      #5.004_04 barfs (5.004_05 okay?)# $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
-      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; }
+      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
+      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
     }
   }
   #eslaf