Index: openacs.org-dev/packages/ecommerce/www/payment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/payment.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/payment.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/payment.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -22,7 +22,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
@@ -51,8 +51,8 @@
     # No rows came back, so they probably got here by pushing "Back",
     # so just redirect them to index.tcl
 
-    ad_returnredirect index.tcl
-    return
+    ad_returnredirect index
+    ad_script_abort
 } 
 
 if { $order_owner != $user_id } {
@@ -70,8 +70,8 @@
     # otherwise they've probably gotten here via url surgery, so
     # redirect them to checkout.tcl
     
-    ad_returnredirect checkout.tcl
-    return
+    ad_returnredirect checkout
+    ad_script_abort
 }
 
 if { [empty_string_p $address_id] } {
@@ -87,7 +87,7 @@
 	and i.order_id = :order_id
 	group by no_shipping_avail_p"]} {
 	ad_returnredirect [ec_securelink [ec_url]checkout]
-	return
+        ad_script_abort
     }
 }
 
@@ -99,8 +99,8 @@
     select count(*) 
     from ec_items 
     where order_id=:order_id"] == 0 } {
-    ad_returnredirect shopping-cart.tcl
-    return
+    ad_returnredirect shopping-cart
+    ad_script_abort
 }
 
 # Everything is ok now; the user has a non-empty in_basket order and
@@ -131,7 +131,7 @@
 
 # Now get the other necessary information
 
-set form_action [ec_securelink [ec_url]process-payment.tcl]
+set form_action [ec_securelink [ec_url]process-payment]
 
 # ec_order_cost returns price + shipping + tax - gift_certificate BUT
 # no gift certificates have been applied to in_basket orders, so this
@@ -227,5 +227,7 @@
     append old_cards_to_choose_from "</table>"
 }
 
+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
 ad_return_template