Index: openacs-4/packages/ecommerce/www/finalize-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/finalize-order.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/finalize-order.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/finalize-order.tcl	18 Sep 2002 21:33:46 -0000	1.4
@@ -43,7 +43,7 @@
     set return_url "[ad_conn url]"
 
     ad_returnredirect "/register?[export_url_vars return_url]"
-    template::adp_abort
+    ad_script_abort
 }
 
 # make sure they have an in_basket order
@@ -84,7 +84,7 @@
     } else {
 	ad_returnredirect thank-you
     }
-    template::adp_abort
+    ad_script_abort
 }
 
 # Make sure there's something in their shopping cart, otherwise
@@ -98,7 +98,7 @@
     from ec_items 
     where order_id = :order_id"] == 0 } {
     ad_returnredirect shopping-cart
-    template::adp_abort
+    ad_script_abort
 }
 
 # Make sure the order belongs to this user_id, otherwise they managed
@@ -111,7 +111,7 @@
     where order_id = :order_id"]
 if { $order_owner != $user_id } {
     ad_returnredirect checkout
-    template::adp_abort
+    ad_script_abort
 }
 
 # Make sure there is an address for this order, otherwise they've
@@ -135,7 +135,7 @@
 	and i.order_id = :order_id
 	group by no_shipping_avail_p"]} {
 	ad_returnredirect [ec_securelink [ec_url]checkout]
-	return
+        ad_script_abort
     }
 }
 
@@ -172,7 +172,7 @@
     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
-    template::adp_abort
+    ad_script_abort
 }
 
 # Done with all the checks!
@@ -284,7 +284,7 @@
 
 		if { [string equal $result "authorized"] || [string equal $result "no_recommendation"] } {
 		    ad_returnredirect thank-you
-		    template::adp_abort
+                    ad_script_abort
 		} elseif { [string equal $result "failed_authorization"] } {
 
 		    # Updates everything that needs to be updated if a
@@ -293,7 +293,7 @@
 		    ec_update_state_to_in_basket $order_id
 
 		    ad_returnredirect credit-card-correction
-		    template::adp_abort
+                    ad_script_abort
 		} else {
 
 		    # Then result is probably "invalid_input".  This should never
@@ -304,6 +304,7 @@
 			<h2>Sorry</h2>
 			<p>There has been an error in the processing of your credit card information.
 			   Please contact <a href=\"mailto:[ec_system_owner]\">[ec_system_owner]</a> to report the error.</p>"
+                    ad_script_abort
 		}
 	    }
 	} else {
@@ -406,7 +407,7 @@
 		    ec_update_state_to_in_basket $order_id
 
 		    ad_returnredirect credit-card-correction
-		    template::adp_abort
+                    ad_script_abort
 		} else {
 
 		    # Then result is probably "invalid_input".  This should never
@@ -565,7 +566,7 @@
 		    ec_update_state_to_in_basket $order_id
 
 		    ad_returnredirect credit-card-correction
-		    template::adp_abort
+                    ad_script_abort
 		} else {
 
 		    # Then result is probably "invalid_input".  This should never
@@ -633,7 +634,7 @@
 
 	    if { [string equal $result "authorized"] || [string equal $result "no_recommendation"] } {
 		ad_returnredirect thank-you
-		template::adp_abort
+                ad_script_abort
 	    } elseif { [string equal $result "failed_authorization"] } {
 
 		# If the gateway returns no recommendation then
@@ -668,7 +669,7 @@
 		ec_update_state_to_in_basket $order_id
 
 		ad_returnredirect credit-card-correction
-		template::adp_abort
+                ad_script_abort
 	    } else {
 
 		# Then result is probably "invalid_input".  This should never
@@ -793,7 +794,7 @@
 		ec_update_state_to_in_basket $order_id
 		
 		ad_returnredirect credit-card-correction
-		template::adp_abort
+                ad_script_abort
 
 	    } else {