Index: openacs-4/packages/ecommerce/www/admin/orders/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/orders/one-oracle.xql	30 Nov 2002 17:31:38 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/one-oracle.xql	5 Dec 2008 23:32:30 -0000	1.4
@@ -11,7 +11,7 @@
 	select o.order_state, o.creditcard_id, o.confirmed_date, o.cs_comments,
         o.shipping_method, o.shipping_address, o.in_basket_date,
         o.authorized_date, o.shipping_charged, o.voided_by, o.voided_date,
-        o.reason_for_void, u.user_id, u.first_names, u.last_name, c.billing_address
+        o.reason_for_void, u.user_id, u.first_names, u.last_name, u.creation_ip, u.email, c.billing_address
         from ec_orders o, cc_users u, ec_creditcards c
         where order_id=:order_id
         and o.user_id = u.user_id(+)
Index: openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql	27 Feb 2005 17:07:19 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql	5 Dec 2008 23:32:30 -0000	1.6
@@ -8,7 +8,7 @@
       select o.order_state, o.creditcard_id, o.confirmed_date, o.cs_comments,
          o.shipping_method, o.shipping_address, o.in_basket_date,
          o.authorized_date, o.shipping_charged, o.voided_by, o.voided_date,
-         o.reason_for_void, u.user_id, u.first_names, u.last_name, c.billing_address
+         o.reason_for_void, u.user_id, u.first_names, u.last_name, u.creation_ip, u.email, c.billing_address
       from ec_orders o
       left join cc_users u using (user_id)
       left join ec_creditcards c using (creditcard_id)
Index: openacs-4/packages/ecommerce/www/admin/orders/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/one.adp	17 Aug 2008 11:35:18 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/one.adp	5 Dec 2008 23:32:30 -0000	1.2
@@ -15,11 +15,9 @@
       <tr>
         <td align=right><b>Ordered by</td>
         <td>@first_names@ @last_name@<br>
-<if @email@ eq "no email">
+
 @user_admin_page_html;noquote@
-</if><else>
-@email@
-</else>
+
 </td>
       </tr>
       <tr>
Index: openacs-4/packages/ecommerce/www/admin/orders/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ecommerce/www/admin/orders/one.tcl	8 Sep 2008 11:53:46 -0000	1.11
+++ openacs-4/packages/ecommerce/www/admin/orders/one.tcl	5 Dec 2008 23:32:30 -0000	1.12
@@ -14,27 +14,28 @@
 
 ad_require_permission [ad_conn package_id] admin
 
+
 db_1row order_select "
     select o.order_state, o.creditcard_id, o.confirmed_date, o.cs_comments,
         o.shipping_method, o.shipping_address, o.in_basket_date,
         o.authorized_date, o.shipping_charged, o.voided_by, o.voided_date,
-        o.reason_for_void, u.user_id, u.first_names, u.last_name, , u.email, c.billing_address
+        o.reason_for_void, u.user_id, u.first_names, u.last_name, u.creation_ip, u.email, c.billing_address
     from ec_orders o, cc_users u, ec_creditcards
     where order_id=:order_id
     and o.user_id = u.user_id(+)
     and o.creditcard_id = c.creditcard_id(+)"
 
-set email "no email"
-db_0or1row user_info_select "
-    select email from cc_users where user_id = :user_id"
-
 set title "One Order"
 set context [list [list index "Orders / Shipments / Refunds"] $title]
 
 set order_state_table_html  [ec_decode $order_state "void" "<table>" "<table width=90%>"]
 set order_state_gc_html [ec_decode $order_state "void" "" "<pre>[ec_formatted_price_shipping_gift_certificate_and_tax_in_an_order $order_id]</pre>"]
 
-set user_admin_page_html "(<a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">user admin page</a>)"
+if { [info exists email] && [string length $email] > 3 } {
+    set user_admin_page_html "$email<br>Registration&nbsp;IP: $creation_ip (<a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">user admin page</a>)"
+} else {
+    set user_admin_page_html ""
+}
 set confirmed_date_html "[ec_formatted_full_date $confirmed_date]"
 set order_state_void_html [ec_decode $order_state "void" "<font color=red>void</font>" $order_state]