[interchange-cvs] interchange - edl modified 3 files

[interchange-cvs at icdevgroup.org]

User:      edl
Date:      2003-11-17 20:38:42 GMT
Modified:  lib/Vend Interpolate.pm
Modified:  dist/foundation catalog.cfg
Modified:  dist/foundation/include/checkout shopping_cart
Log:
Removing / disabling stuff related to credit for now...

Revision  Changes    Path
2.197     +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.197, prev_rev 2.196
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.196
retrieving revision 2.197
diff -u -r2.196 -r2.197
--- Interpolate.pm	14 Nov 2003 22:51:38 -0000	2.196
+++ Interpolate.pm	17 Nov 2003 20:38:42 -0000	2.197
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.196 2003/11/14 22:51:38 edl Exp $
+# $Id: Interpolate.pm,v 2.197 2003/11/17 20:38:42 edl 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.196 $, 10);
+$VERSION = substr(q$Revision: 2.197 $, 10);
 
 @EXPORT = qw (
 
@@ -5773,6 +5773,7 @@
 
 # figures any credits the customer may have
 # that can be applied to this order
+# for future developements, not currently used!!
 
 sub credit {
     my $credit = 0;
@@ -5818,7 +5819,6 @@
 		$total += subtotal();
 		$total += $shipping;
 		$total += salestax();
-		$total -= credit();
 	}
 	$Vend::Items = $save if defined $save;
 	$Vend::Session->{latest_total} = $total;



2.27      +1 -6      interchange/dist/foundation/catalog.cfg


rev 2.27, prev_rev 2.26
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/catalog.cfg,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -r2.26 -r2.27
--- catalog.cfg	14 Nov 2003 22:51:38 -0000	2.26
+++ catalog.cfg	17 Nov 2003 20:38:42 -0000	2.27
@@ -184,12 +184,7 @@
 UserDB    default    time_field    mod_time
 
 # Don't want people setting their credit limit or dealer status directly
-UserDB    default    scratch       "dealer price_level credit_limit credit_balance"
-
-# Field in userdb which stores credit balance for cust (if any)
-# NOTE: the field needs to be defined in scratch space above!!
-CreditField credit_balance
-
+UserDB    default    scratch       "dealer price_level credit_limit"
 
 # minimal login stuff for affiliate
 UserDB    affiliate  user_field    affiliate



1.6       +0 -6      interchange/dist/foundation/include/checkout/shopping_cart


rev 1.6, prev_rev 1.5
Index: shopping_cart
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/shopping_cart,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shopping_cart	14 Nov 2003 23:23:14 -0000	1.5
+++ shopping_cart	17 Nov 2003 20:38:42 -0000	1.6
@@ -124,12 +124,6 @@
 			[/if]
 		[/else]
 		[/if]
-		[if type=explicit compare="[credit noformat=1]"]
-            <TR>
-              <TD ALIGN=left class="contentbar1" nowrap>[L]Payment/Credit Applied[/L]:&nbsp;</TD>
-              <TD ALIGN=RIGHT class="contentbar1">[credit]</TD>
-            </TR>
-		[/if]
             <TR>
               <TD ALIGN=left class="contentbar2">[L]TOTAL[/L]:</TD>
               <TD ALIGN=RIGHT class="contentbar2">[total-cost]</TD>