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.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-3.tcl	1 Jul 2005 03:49:42 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-3.tcl	5 Jul 2005 23:57:38 -0000	1.5
@@ -35,54 +35,7 @@
 # 5. The order should have credit card and shipping method associated with it.
 
 # Require user to be logged in at this point
-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 {$user_id == 0} {
-    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 {
-    # Make sure all orders are owned by the user
-    db_transaction {
-	db_foreach orders {
-	    select order_id as in_basket_order_id
-	    from ec_orders
-	    where order_state = 'in_basket'
-	    and user_session_id = :user_session_id
-	} {
-	    db_dml set_session_orders {
-		update ec_orders
-		set user_id = :user_id
-		where order_id = :in_basket_order_id
-		and user_id = 0
-	    }
-	    
-	    db_foreach items { 
-		select item_id as in_basket_item_id
-		from ec_items
-		where order_id = :in_basket_order_id
-	    } {
-		db_dml set_dotlrn_ecommerce_orders {
-		    update dotlrn_ecommerce_orders
-		    set patron_id = :user_id
-		    where item_id = :in_basket_item_id
-		    and patron_id = 0
-		}
-		db_dml set_dotlrn_ecommerce_orders_2 {
-		    update dotlrn_ecommerce_orders
-		    set participant_id = :user_id
-		    where item_id = :in_basket_item_id
-		    and participant_id = 0
-		}
-	    }
-	}
-    }
-}
+source [acs_root_dir]/packages/dotlrn-ecommerce/www/ecommerce/check-shopping-cart.tcl
 
 # Make sure they have an in_basket order, otherwise they've probably
 # gotten here by pushing Back, so return them to index.tcl
@@ -200,7 +153,7 @@
 #    set display_progress "t"
 #}
 
-set order_summary [ec_order_summary_for_customer $order_id $user_id]
 set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set context [list "[_ dotlrn-ecommerce.lt_Completing_Your_Order_1]"]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles