Index: openacs.org-dev/packages/ecommerce/www/gift-certificate-finalize-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/gift-certificate-finalize-order.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/gift-certificate-finalize-order.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/gift-certificate-finalize-order.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -62,7 +62,7 @@
 if {$user_id == 0} {
     set return_url "[ad_conn url]?[export_entire_form_as_url_vars]"
     ad_returnredirect "/register?[export_url_vars return_url]"
-    return
+    ad_script_abort
 }
 
 # first do all the usual checks
@@ -134,12 +134,12 @@
 
 if { $exception_count > 0 } {
     ad_return_complaint $exception_count $exception_text
-    return
+    ad_script_abort
 }
 
 if { [empty_string_p $gift_certificate_id] } {
     ad_returnredirect "gift-certificate-order-4?[export_entire_form_as_url_vars]"
-    return
+    ad_script_abort
 }
 
 # User session tracking
@@ -168,7 +168,7 @@
 	    # Present a thank you page
 
 	    ad_returnredirect "gift-certificate-thank-you"
-	    return
+            ad_script_abort
 	}
 
 	"failed_authorization" {
@@ -184,7 +184,7 @@
 		  credit card. Please check the number and the expiration date and
 		  try again or use a different credit card.</p>
 		  <form method=post action=gift-certificate-finalize-order>
-		    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email]
+		    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email address_id]
 		    <table>
 		      <tr>
 		       <td>Credit card number:</td>
@@ -420,7 +420,7 @@
     			  credit card. Please check the number and the expiration date and
     			  try again or use a different credit card.</p>
     			  <form method=post action=gift-certificate-finalize-order>
-    			    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email]
+    			    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email address_id]
     			    <table>
         		      <tr>
         		       <td>Credit card number:</td>
@@ -452,7 +452,7 @@
 		    # Present a thank-you page.
 
 		    ad_returnredirect "gift-certificate-thank-you"
-		    return
+                    ad_script_abort
 		}
 
 		"success" {
@@ -480,7 +480,7 @@
 		    # Present a thank-you page.
 
 		    ad_returnredirect "gift-certificate-thank-you"
-		    return
+                    ad_script_abort
 		}
 
 		"not_supported" -
@@ -521,3 +521,5 @@
 	}
     }
 }
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition $title]]
+set ec_system_owner [ec_system_owner]