[interchange-cvs] interchange - edl modified 3 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Nov 20 17:11:31 EST 2003


User:      edl
Date:      2003-11-20 22:11:31 GMT
Modified:  dist/foundation/etc log_transaction ship_notice
Modified:  dist/lib/UI/pages/admin order_view.html
Log:
Added recording of separate shipping addresses to orderline table. Added display of same in Admin order view and on ship notices.

Revision  Changes    Path
2.12      +9 -0      interchange/dist/foundation/etc/log_transaction


rev 2.12, prev_rev 2.11
Index: log_transaction
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/etc/log_transaction,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- log_transaction	20 Nov 2003 01:10:17 -0000	2.11
+++ log_transaction	20 Nov 2003 22:11:30 -0000	2.12
@@ -287,6 +287,15 @@
 description: [filter mac][item-description][/filter]
 [/import]
 
+[if-item-modifier mv_ad]
+	[data
+	base=orderline
+	field=separate_address
+	key="[value mv_order_number]-[item-increment]"
+	value=|[item-modifier mv_ad]|
+	]
+[/if]
+
 [if variable DECREMENT_INVENTORY]Inventory of [item-code] now:
 	[data
 		table=inventory



2.1       +8 -0      interchange/dist/foundation/etc/ship_notice


rev 2.1, prev_rev 2.0
Index: ship_notice
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/etc/ship_notice,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- ship_notice	18 Jul 2001 02:20:59 -0000	2.0
+++ ship_notice	20 Nov 2003 22:11:30 -0000	2.1
@@ -82,7 +82,15 @@
 	return $status;
 [/calc]
 [/column]
+[/row][if-item-data orderline separate_address]
+
+[row 82]
+[column width=5             gutter=1 align=right] [/column]
+[column width=12            gutter=1] SHIP TO: [/column]
+[column width=61 align=n][item-data orderline separate address][/column]
 [/row]
+[/if-item-data]
+
 
 [/loop]
 [row 82]



2.16      +14 -2     interchange/dist/lib/UI/pages/admin/order_view.html


rev 2.16, prev_rev 2.15
Index: order_view.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/order_view.html,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -r2.15 -r2.16
--- order_view.html	22 Jul 2003 22:27:54 -0000	2.15
+++ order_view.html	20 Nov 2003 22:11:31 -0000	2.16
@@ -319,7 +319,7 @@
                <td width="14%" class=rhead style="padding: 5px; text-align: right">[L]Total[/L]</td>
             </tr>
 [query list=1 sql="select * from orderline where order_number = '[loop-code]'"]
-            <tr class="[sql-alternate 2]rowalt[else]rownorm[/else][/sql-alternate]"> 
+            <tr class="[sql-alternate 2]rowalt[else]rownorm[/else][/sql-alternate]" valign=top> 
                <td style="padding: 5px">[page href="admin/order_status"
 			   							 form="order=[loop-code]"
 									]
@@ -352,6 +352,18 @@
                <td align=right style="padding: 5px">[sql-param price]</td>
                <td align=right style="padding: 5px">[sql-param subtotal]</td>
             </tr>
+[if-sql-param separate_address]
+            <tr class="[sql-alternate 2]rowalt[else]rownorm[/else][/sql-alternate]" valign=top> 
+	    <td>&nbsp;</td>
+	    <td colspan=4 align=left style="padding: 5px">
+	    <B>SHIP TO: </B>[calc]
+	    my $ad = q{[sql-param separate_address]}; $ad =~ s/\s*\n+\s*/ * /g; return $ad;
+	    [/calc]
+	    </td>
+	    <td>&nbsp;</td>
+	    </tr>
+[/if-sql-param]
+
 [/query]
             <tr> 
                <td height=4 colspan=5 class=lightshade><img src="bg.gif" width=1 height=4></td>
@@ -423,4 +435,4 @@
 <!-- ----- END REAL STUFF ----- -->
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: order_view.html,v 2.15 2003/07/22 22:27:54 racke Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: order_view.html,v 2.16 2003/11/20 22:11:31 edl Exp $ -->








More information about the interchange-cvs mailing list