[interchange-cvs] interchange - racke modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Fri Oct 15 14:35:02 EDT 2004


User:      racke
Date:      2004-10-15 18:35:02 GMT
Modified:  lib/Vend Config.pm Interpolate.pm
Log:
added TaxInclusive directive to display prices with salestax
inclusive which is pretty common in European B2C stores

Revision  Changes    Path
2.147     +5 -4      interchange/lib/Vend/Config.pm


rev 2.147, prev_rev 2.146
Index: Config.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.146
retrieving revision 2.147
diff -u -r2.146 -r2.147
--- Config.pm	14 Oct 2004 23:01:16 -0000	2.146
+++ Config.pm	15 Oct 2004 18:35:02 -0000	2.147
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.146 2004/10/14 23:01:16 racke Exp $
+# $Id: Config.pm,v 2.147 2004/10/15 18:35:02 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -48,7 +48,7 @@
 use Vend::File;
 use Vend::Data;
 
-$VERSION = substr(q$Revision: 2.146 $, 10);
+$VERSION = substr(q$Revision: 2.147 $, 10);
 
 my %CDname;
 my %CPname;
@@ -89,7 +89,7 @@
 		SalesTax
 		Levies
 		TaxShipping
-
+		TaxInclusive
 /	);
 
 @Locale_keys_currency = (
@@ -128,7 +128,7 @@
 		SalesTax
         SpecialPageDir
 		TaxShipping
-
+		TaxInclusive
 /   );
 
 @Locale_directives_ary = (
@@ -502,6 +502,7 @@
 	['CodeDef',			 'mapped_code',    	 ''],
 	['RemoteUser',		 undef,     	     ''],
 	['TaxShipping',		 undef,     	     ''],
+	['TaxInclusive',     'yesno',			 'No'],
 	['FractionalItems',  'yesno',			 'No'],
 	['SeparateItems',    'yesno',			 'No'],
 	['PageSelectField',  undef,     	     ''],



2.223     +4 -3      interchange/lib/Vend/Interpolate.pm


rev 2.223, prev_rev 2.222
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.222
retrieving revision 2.223
diff -u -r2.222 -r2.223
--- Interpolate.pm	23 Sep 2004 16:39:02 -0000	2.222
+++ Interpolate.pm	15 Oct 2004 18:35:02 -0000	2.223
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.222 2004/09/23 16:39:02 mheins Exp $
+# $Id: Interpolate.pm,v 2.223 2004/10/15 18:35:02 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.222 $, 10);
+$VERSION = substr(q$Revision: 2.223 $, 10);
 
 @EXPORT = qw (
 
@@ -5947,7 +5947,8 @@
 			if $::Values->{mv_handling};
 		$total += subtotal();
 		$total += $shipping;
-		$total += salestax();
+		$total += salestax()
+			unless $Vend::Cfg->{TaxInclusive};
 	}
 	$Vend::Items = $save if defined $save;
 	$Vend::Session->{latest_total} = $total;








More information about the interchange-cvs mailing list