Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-3.tcl	23 Jun 2005 12:28:22 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-3.tcl	30 Jun 2005 11:50:07 -0000	1.2
@@ -17,7 +17,7 @@
     usca_p:optional
     referer:optional
 
-    user_id:integer,notnull
+    user_id:integer,notnull,optional
     participant_id:integer,optional
 }
 
@@ -34,10 +34,14 @@
 
 # We need them to be logged in
 
-#set user_id [ad_verify_and_get_user_id]
+if { ! [info exists user_id] } {
+    set user_id [ad_verify_and_get_user_id]
+}
 if {$user_id == 0} {
-    set return_url "[ad_conn url]"
-    ad_returnredirect "/register?[export_url_vars return_url]"
+    set form [rp_getform]
+    ns_set delkey $form user_id
+    set return_url [ad_return_url]
+    ad_returnredirect [export_vars -base login {return_url}]
     ad_script_abort
 }
 
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl	28 Jun 2005 03:27:22 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl	30 Jun 2005 11:50:07 -0000	1.3
@@ -99,7 +99,7 @@
     usca_p:optional
     value_currency_code:optional
 
-    user_id:integer,notnull
+    user_id:integer,notnull,optional
     participant_id:integer,optional
 
     {method cc}
@@ -108,12 +108,28 @@
 
 # We need them to be logged in
 
-#set user_id [ad_conn user_id]
+if { ! [info exists user_id] } {
+    set user_id [ad_verify_and_get_user_id]
+}
 if {$user_id == 0} {
     ns_log Notice "checkout-one-form-2.tcl,ref(137): user_id is 0 which should never happen, redirecting user."
-    rp_form_put return_url "[ad_conn url]?[export_entire_form_as_url_vars]" 
-    rp_internal_redirect "/register"
+    set form [rp_getform]
+    ns_set delkey $form user_id
+    set return_url [ad_return_url]
+    ad_returnredirect [export_vars -base login {return_url}]
     ad_script_abort
+} else {
+    # Check user's session
+    set user_session_id [ec_get_user_session_id]
+    ec_create_new_session_if_necessary [ad_conn query]
+
+    # Make sure all orders are owned by the user
+    db_dml set_session_order {
+	update ec_orders
+	set user_id = :user_id
+	where user_id = 0
+	and order_state = 'in_basket'
+    }
 }
 
 # eventually evolve this so checks come first, then ad_return_complaints 
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl	23 Jun 2005 12:28:21 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl	30 Jun 2005 11:50:07 -0000	1.2
@@ -16,10 +16,16 @@
     @revision-date April 2002
 
 } {
-    user_id:integer,notnull
+    user_id:integer,notnull,optional
     participant_id:integer,optional
 }
 
+if { ! [info exists user_id] } {
+    set user_id [ad_verify_and_get_user_id]
+} elseif { $user_id == 0 } {
+    set user_id [ad_verify_and_get_user_id]
+}
+
 # If they reload, we don't have to worry about the credit card
 # authorization code being executed twice because the order has
 # already been moved to the 'confirmed' state, which means that they