Index: openacs.org-dev/packages/ecommerce/www/checkout-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/checkout-3.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/checkout-3.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/checkout-3.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -33,7 +33,7 @@
 if {$user_id == 0} {
     set return_url "[ad_conn url]"
     ad_returnredirect "/register?[export_url_vars return_url]"
-    return
+    ad_script_abort
 }
 
 # Make sure they have an in_basket order, otherwise they've probably
@@ -52,7 +52,7 @@
     # them to index.tcl
 
     ad_returnredirect index
-    return
+    ad_script_abort
 }
 
 # Make sure there's something in their shopping cart, otherwise
@@ -64,7 +64,7 @@
     from ec_items 
     where order_id=:order_id"] == 0 } {
     ad_returnredirect shopping-cart
-    return
+    ad_script_abort
 }
 
 # Make sure the order belongs to this user_id, otherwise they managed
@@ -77,7 +77,7 @@
     where order_id=:order_id"]
 if { $order_owner != $user_id } {
     ad_returnredirect checkout
-    return
+    ad_script_abort
 }
 
 # Make sure there is an address for this order, otherwise they've
@@ -101,7 +101,7 @@
 	and i.order_id = :order_id
 	group by no_shipping_avail_p"]} {
 	ad_returnredirect [ec_securelink [ec_url]checkout]
-	return
+        ad_script_abort
     }
 }
 
@@ -139,11 +139,13 @@
     where order_id=:order_id" -default ""]
 if { [empty_string_p $shipping_method] || ([empty_string_p $creditcard_id] && (![info exists gift_certificate_covers_cost_p] || $gift_certificate_covers_cost_p == "f")) } {
     ad_returnredirect checkout-2
-    return
+    ad_script_abort
 }
 
 # Done with all the checks.  Their order is ready to go!  Now show
 # them a summary before they submit their order
 
 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 ec_system_owner [ec_system_owner]
 db_release_unused_handles