[interchange-cvs] interchange - danb modified lib/Vend/Order.pm
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Thu Jan 29 23:32:30 UTC 2009
User: danb
Date: 2009-01-29 23:32:30 GMT
Modified: lib/Vend Order.pm
Log:
Revert accidental commit for custom invalid quantity error messages.
The last commit, "Correct issue with hi-bit characters in search strings."
contained an unrelated change to allow customization of the in-core
invalid quantity error message. Incidentally, I now prefer using the
regular internationalization features (by using, for example, errmsg())
to achieve the same purpose. Sorry for the noise.
Revision Changes Path
2.106 interchange/lib/Vend/Order.pm
rev 2.106, prev_rev 2.105
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.105
retrieving revision 2.106
diff -u -r2.105 -r2.106
--- Order.pm 29 Jan 2009 22:52:38 -0000 2.105
+++ Order.pm 29 Jan 2009 23:32:30 -0000 2.106
@@ -1,6 +1,6 @@
# Vend::Order - Interchange order routing routines
#
-# $Id: Order.pm,v 2.105 2009-01-29 22:52:38 danb Exp $
+# $Id: Order.pm,v 2.106 2009-01-29 23:32:30 danb Exp $
#
# Copyright (C) 2002-2008 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -29,7 +29,7 @@
package Vend::Order;
require Exporter;
-$VERSION = substr(q$Revision: 2.105 $, 10);
+$VERSION = substr(q$Revision: 2.106 $, 10);
@ISA = qw(Exporter);
@@ -2134,14 +2134,8 @@
else {
my $item = $line->{'code'};
$line->{quantity} = int $line->{quantity};
- my $invalid_qty_error = $::Variable->{MV_INVALID_QTY_ERROR}
- || "'%s' for item %s is not numeric/integer";
- if (my $invalid_qty_label = $::Variable->{MV_INVALID_QTY_LABEL}) {
- $Vend::Session->{errorlabels}{mv_order_quantity}
- = $invalid_qty_label;
- }
$Vend::Session->{errors}{mv_order_quantity} =
- errmsg($invalid_qty_error, $quantity, $item);
+ errmsg("'%s' for item %s is not numeric/integer", $quantity, $item);
}
if($do_update and my $oe = $Vend::Cfg->{OptionsAttribute}) {
More information about the interchange-cvs
mailing list