[interchange-cvs] interchange - jon modified 3 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Jan 24 00:06:00 2003
User: jon
Date: 2003-01-24 05:05:00 GMT
Modified: dist/foundation/pages Tag: STABLE_4_8-branch account.html
Modified: dist/foundation/pages/ord Tag: STABLE_4_8-branch
Modified: checkout.html
Modified: lib/Vend Tag: STABLE_4_8-branch Order.pm
Log:
Merge from trunk:
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
No revision
No revision
2.1.2.2 +1 -1 interchange/dist/foundation/pages/account.html
rev 2.1.2.2, prev_rev 2.1.2.1
Index: account.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/account.html,v
retrieving revision 2.1.2.1
retrieving revision 2.1.2.2
diff -u -u -r2.1.2.1 -r2.1.2.2
--- account.html 20 Aug 2001 15:47:14 -0000 2.1.2.1
+++ account.html 24 Jan 2003 05:05:00 -0000 2.1.2.2
@@ -131,7 +131,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>
No revision
No revision
2.0.2.6 +1 -1 interchange/dist/foundation/pages/ord/checkout.html
rev 2.0.2.6, prev_rev 2.0.2.5
Index: checkout.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/ord/checkout.html,v
retrieving revision 2.0.2.5
retrieving revision 2.0.2.6
diff -u -u -r2.0.2.5 -r2.0.2.6
--- checkout.html 13 Jun 2002 23:58:07 -0000 2.0.2.5
+++ checkout.html 24 Jan 2003 05:05:00 -0000 2.0.2.6
@@ -408,7 +408,7 @@
[error name=zip std_label="Zip/Postal Code" required=1]
</td>
<td class="contentbar1">
- <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 class="contentbar1"> </td>
<td class="contentbar1"> </td>
No revision
No revision
2.6.2.14 +3 -3 interchange/lib/Vend/Order.pm
rev 2.6.2.14, prev_rev 2.6.2.13
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.6.2.13
retrieving revision 2.6.2.14
diff -u -u -r2.6.2.13 -r2.6.2.14
--- Order.pm 24 Jan 2003 03:26:55 -0000 2.6.2.13
+++ Order.pm 24 Jan 2003 05:05:00 -0000 2.6.2.14
@@ -1,6 +1,6 @@
# Vend::Order - Interchange order routing routines
#
-# $Id: Order.pm,v 2.6.2.13 2003/01/24 03:26:55 jon Exp $
+# $Id: Order.pm,v 2.6.2.14 2003/01/24 05:05:00 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. and
# Interchange Development Group, http://www.icdevgroup.org/
@@ -29,7 +29,7 @@
package Vend::Order;
require Exporter;
-$VERSION = substr(q$Revision: 2.6.2.13 $, 10);
+$VERSION = substr(q$Revision: 2.6.2.14 $, 10);
@ISA = qw(Exporter);
@@ -1078,7 +1078,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));
}