[interchange-cvs] interchange - jon modified 3 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Thu Nov 21 17:24:00 2002
User: jon
Date: 2002-11-21 22:23:51 GMT
Modified: lib/Vend Order.pm
Modified: dist/foundation/include/checkout shipping_address
Modified: dist/foundation/pages account.html
Log:
Be more tolerant with zip/postal codes -- don't remove hyphen from
ZIP+4 (99686-2933) or space from Canadian postal code (T0L 0R0), and don't
reject ZIP+4 without hyphen.
Revision Changes Path
2.39 +3 -3 interchange/lib/Vend/Order.pm
rev 2.39, prev_rev 2.38
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -u -r2.38 -r2.39
--- Order.pm 18 Nov 2002 16:55:15 -0000 2.38
+++ Order.pm 21 Nov 2002 22:23:51 -0000 2.39
@@ -1,6 +1,6 @@
# Vend::Order - Interchange order routing routines
#
-# $Id: Order.pm,v 2.38 2002/11/18 16:55:15 mheins Exp $
+# $Id: Order.pm,v 2.39 2002/11/21 22:23:51 jon Exp $
#
# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
#
@@ -28,7 +28,7 @@
package Vend::Order;
require Exporter;
-$VERSION = substr(q$Revision: 2.38 $, 10);
+$VERSION = substr(q$Revision: 2.39 $, 10);
@ISA = qw(Exporter);
@@ -1150,7 +1150,7 @@
sub _zip {
my($ref,$var,$val) = @_;
- defined $val and $val =~ /^\s*\d{5}(?:[-]\d{4})?\s*$/
+ defined $val and $val =~ /^\s*\d{5}(?:-?\d{4})?\s*$/
and return (1, $var, '');
return (undef, $var, errmsg("'%s' not a US zip code", $val));
}
1.2 +1 -1 interchange/dist/foundation/include/checkout/shipping_address
rev 1.2, prev_rev 1.1
Index: shipping_address
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/shipping_address,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- shipping_address 14 Aug 2002 14:15:31 -0000 1.1
+++ shipping_address 21 Nov 2002 22:23:51 -0000 1.2
@@ -84,7 +84,7 @@
[error name=zip std_label="Zip/Postal Code" required=1]
</td>
<td class="contentbar1" colspan=3>
- <INPUT TYPE=text NAME=zip VALUE="[value name=zip filter=word]" size="10" maxlength="10">
+ <INPUT TYPE=text NAME=zip VALUE="[value zip]" size="10" maxlength="10">
</td>
</tr>
<tr>
2.5 +1 -1 interchange/dist/foundation/pages/account.html
rev 2.5, prev_rev 2.4
Index: account.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/account.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -u -r2.4 -r2.5
--- account.html 2 May 2002 17:10:56 -0000 2.4
+++ account.html 21 Nov 2002 22:23:51 -0000 2.5
@@ -115,7 +115,7 @@
[error name=zip std_label="Zip/Postal Code" required=1]
</td>
<td>
- <INPUT TYPE=text NAME=zip VALUE="[value name=zip filter=word]" size="10" maxlength="10">
+ <INPUT TYPE=text NAME=zip VALUE="[value zip]" size="10" maxlength="10">
</td>
<td> </td>
<td> </td>