i18n fixes

3 files changed, 27 insertions, 14 deletions

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index d144beba6..813c4b54f 100755
--- 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.13 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.14 1999-04-14 07:47:53 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.13  1999-04-09 03:52:55  ivan
+# Revision 1.14  1999-04-14 07:47:53  ivan
+# i18n fixes
+#
+# Revision 1.13  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.12  1999/04/06 11:16:16  ivan
@@ -115,9 +118,12 @@ if ( $cgi->param('error') ) {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
   $custnum = $cust_main->custnum;
-  $pkgpart = $cgi->param('pkgpart_svcpart');
-  $pkgpart =~ /^(\d+)_/;
-  $pkgpart = $1;
+  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
+  if ( $pkgpart =~ /^(\d+)_/ ) {
+    $pkgpart = $1;
+  } else {
+    $pkgpart = '';
+  }
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
@@ -385,9 +391,9 @@ unless ( $custnum ) {
 
     foreach my $part_pkg ( @part_pkg ) {
       print qq!<OPTION VALUE="!,
-              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"',
-            " SELECTED"x($part_pkg->pkgpart == $pkgpart),
-            ">", $part_pkg->pkg, " - ", $part_pkg->comment;
+              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
+      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
+      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
     print "</SELECT></TD></TR>";
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 729bed7c4..a66432ad1 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.9 1999-04-07 15:22:19 ivan Exp $
+# $Id: cust_main.cgi,v 1.10 1999-04-14 07:47:53 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.9  1999-04-07 15:22:19  ivan
+# Revision 1.10  1999-04-14 07:47:53  ivan
+# i18n fixes
+#
+# Revision 1.9  1999/04/07 15:22:19  ivan
 # don't use anchor in redirect
 #
 # Revision 1.8  1999/03/25 13:55:10  ivan
@@ -68,7 +71,8 @@ $cgi->param('tax','') unless defined($cgi->param('tax'));
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-$cgi->param('state') =~ /^(\w+)( \((\w+)\))? \/ (\w+)$/;
+$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
 $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 7dba86a7a..7bdbc08ac 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -216,7 +216,7 @@ sub check {
     || $self->ut_textn('address2')
     || $self->ut_text('city')
     || $self->ut_textn('county')
-    || $self->ut_text('state')
+    || $self->ut_textn('state')
     || $self->ut_phonen('daytime')
     || $self->ut_phonen('night')
     || $self->ut_phonen('fax')
@@ -885,7 +885,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.20 1999-04-10 08:35:14 ivan Exp $
+$Id: cust_main.pm,v 1.21 1999-04-14 07:47:53 ivan Exp $
 
 =head1 BUGS
 
@@ -941,7 +941,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.20  1999-04-10 08:35:14  ivan
+Revision 1.21  1999-04-14 07:47:53  ivan
+i18n fixes
+
+Revision 1.20  1999/04/10 08:35:14  ivan
 say what the unknown state/county/country are!
 
 Revision 1.19  1999/04/10 07:38:06  ivan