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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-07-05 21:46:34 GMT
Modified:  lib/Vend Ship.pm
Log:
* Give access to the accumulated criteria with @@CRIT@@ in the "adder".
  It is a macro substitution as in @@TOTAL@@ (which gives access to the
  otherwise-final calculated shipping cost.

  This is a bit confusing, as @@TOTAL@@ gives access to the accumulated
  criteria in the "cost" area. We probably should add @@CRIT@@ there
  too.

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


rev 2.7, prev_rev 2.6
Index: Ship.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Ship.pm,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- Ship.pm	9 Apr 2004 03:18:55 -0000	2.6
+++ Ship.pm	5 Jul 2004 21:46:33 -0000	2.7
@@ -1,6 +1,6 @@
 # Vend::Ship - Interchange shipping code
 # 
-# $Id: Ship.pm,v 2.6 2004/04/09 03:18:55 mheins Exp $
+# $Id: Ship.pm,v 2.7 2004/07/05 21:46:33 mheins Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -848,6 +848,7 @@
 			return '' if $final == 0;
 			$o->{adder} =~ s/\bx\b/$final/g;
 			$o->{adder} =~ s/\@\@TOTAL\@\\?\@/$final/g;
+			$o->{adder} =~ s/\@\@CRIT\@\\?\@/$total/g;
 			$o->{adder} = $Vend::Interpolate::ready_safe->reval($o->{adder});
 			$final += $o->{adder} if $o->{adder};
 			$final = POSIX::ceil($final) if is_yes($o->{round});