[interchange-cvs] interchange - edl modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Wed Nov 19 19:52:18 EST 2003


User:      edl
Date:      2003-11-20 00:52:18 GMT
Modified:  dist/foundation/etc mail_receipt log_transaction
Log:
Added separate shipping address display code to customer email copy. Also
added code to top of log_transaction to fix bug in which separate shipping
addresses could still appear even if separate_addresses was false.

Revision  Changes    Path
2.3       +7 -0      interchange/dist/foundation/etc/mail_receipt


rev 2.3, prev_rev 2.2
Index: mail_receipt
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/etc/mail_receipt,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- mail_receipt	9 Sep 2003 20:08:55 -0000	2.2
+++ mail_receipt	20 Nov 2003 00:52:18 -0000	2.3
@@ -45,6 +45,13 @@
     [column width=12 gutter=1][/column]
     [column width=32 wrap=1 gutter=1][filter op="tabbed decode_entities compress_space strip"][item-options type=display report=1][/filter][/column]
 [/row][/if-item-data][/if-item-data]
+[if-item-modifier mv_ad]
+[row 82]
+[column width=5             gutter=1 align=right] [/column]
+[column width=12            gutter=1] SHIP TO: [/column]
+[column width=61 align=n][item-modifier mv_ad][/column]
+[/row]
+[/if-item-modifier]
 [/item-list]
 [row 82]
 	[column width=5 align=right][/column]



2.10      +8 -0      interchange/dist/foundation/etc/log_transaction


rev 2.10, prev_rev 2.9
Index: log_transaction
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/etc/log_transaction,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- log_transaction	17 Sep 2003 12:44:30 -0000	2.9
+++ log_transaction	20 Nov 2003 00:52:18 -0000	2.10
@@ -1,4 +1,12 @@
 #### begin [value mv_order_number] #####
+[calc]
+	if (! $Values->{separate_addresses} ) {
+		foreach (@{$Carts->{main}}) {
+			$_->{mv_ad} = '';
+		}
+	}
+	return;
+[/calc]
 [tmpn auto_create][/tmpn]
 [loop list="transactions orderline inventory userdb"]
 [flag type=write table="[loop-code]"]








More information about the interchange-cvs mailing list