[interchange-cvs] interchange - jon modified lib/Vend/Ship.pm

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2007-02-14 05:24:03 GMT
Modified:  lib/Vend Ship.pm
Log:
Stop the [shipping] tag from setting mv_shipmode behind your back,
even if you have no_set in your [shipping] tag's options, because
the options are not carried forward into each possible invocation of
resolve_shipping().

Patch from Jeff Boes <jeff at endpoint.com>.

Revision  Changes    Path
2.20      +2 -2      interchange/lib/Vend/Ship.pm


rev 2.20, prev_rev 2.19
Index: Ship.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Ship.pm,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -u -r2.19 -r2.20
--- Ship.pm	24 Aug 2006 20:57:25 -0000	2.19
+++ Ship.pm	14 Feb 2007 05:24:03 -0000	2.20
@@ -1,6 +1,6 @@
 # Vend::Ship - Interchange shipping code
 # 
-# $Id: Ship.pm,v 2.19 2006/08/24 20:57:25 kwalsh Exp $
+# $Id: Ship.pm,v 2.20 2007/02/14 05:24:03 jon Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -968,7 +968,7 @@
 	$Ship_its = 0;
 	if(! $mode) {
 		if($opt->{widget} || $opt->{label}) {
-			$mode = resolve_shipmode(undef, { possible => 1});
+			$mode = resolve_shipmode(undef, { no_set => $opt->{no_set}, possible => 1});
 		}
 		else {
 			$mode = $opt->{handling}