[interchange-cvs] interchange - heins modified
lib/Vend/Interpolate.pm
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Feb 6 11:29:56 EST 2008
User: heins
Date: 2008-02-06 16:29:56 GMT
Modified: lib/Vend Interpolate.pm
Log:
* Incorporate changes suggested by Lars Tode:
- Make sort apply even if type is custom and nothing is returned by
custom routine
- Allow inclusive attribute even for non-salestax items.
Revision Changes Path
2.294 +5 -5 interchange/lib/Vend/Interpolate.pm
rev 2.294, prev_rev 2.293
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.293
retrieving revision 2.294
diff -u -r2.293 -r2.294
--- Interpolate.pm 22 Dec 2007 20:49:34 -0000 2.293
+++ Interpolate.pm 6 Feb 2008 16:29:55 -0000 2.294
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.293 2007/12/22 20:49:34 kwalsh Exp $
+# $Id: Interpolate.pm,v 2.294 2008/02/06 16:29:55 mheins Exp $
#
# Copyright (C) 2002-2007 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.293 $, 10);
+$VERSION = substr(q$Revision: 2.294 $, 10);
@EXPORT = qw (
@@ -5949,7 +5949,7 @@
code => $name,
mode => $mode,
type => $type,
- sort => $sort,
+ sort => $sort || $l->{sort},
cost => round_to_frac_digits($cost),
currency => currency($cost),
group => $group,
@@ -5987,8 +5987,8 @@
for(@$lcart) {
next if $opt->{group} and $opt->{group} ne $_->{group};
- next if $_->{type} eq 'salestax'
- and $_->{inclusive} || $Vend::Cfg->{TaxInclusive};
+ next if $_->{inclusive};
+ next if $_->{type} eq 'salestax' and $Vend::Cfg->{TaxInclusive};
$run += $_->{cost};
}
More information about the interchange-cvs
mailing list