Index: openacs.org-dev/packages/ecommerce/www/gift-certificate-claim-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/gift-certificate-claim-2.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/gift-certificate-claim-2.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/gift-certificate-claim-2.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -18,7 +18,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
 }
 
 # Make sure they have an in_basket order and a user_session_id; this
@@ -28,7 +28,7 @@
 set user_session_id [ec_get_user_session_id]
 if { $user_session_id == 0 } {
     ad_returnredirect "index"
-    return
+    ad_script_abort
 }
 
 set order_id [db_string get_order_id "
@@ -38,7 +38,7 @@
      and order_state='in_basket'" -default ""]
 if { [empty_string_p $order_id] } {
     ad_returnredirect "index"
-    return
+    ad_script_abort
 }
 
 # See if there's a gift certificate with that claim check
@@ -60,13 +60,16 @@
     	(problem_id, problem_date, problem_details)
     	values
     	(ec_problem_id_sequence.nextval, sysdate,:prob_details )"
-    return
+    ad_script_abort
 }
 
 # There is a gift certificate with that claim check;
 # now check whether it's already been claimed
 # and, if so, whether it was claimed by this user
 
+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_1row get_gc_user_id "
     select user_id as gift_certificate_user_id, amount 
     from ec_gift_certificates 
@@ -80,15 +83,8 @@
 	update ec_gift_certificates 
 	set user_id=:user_id, claimed_date = sysdate 
 	where gift_certificate_id = :gift_certificate_id"
-    doc_return 200 text/html "
-	[ad_header "Gift Certificate Claimed"]
-    	[ec_header_image]<br clear=all>
-    	<blockquote>
-    	  <p>[ec_pretty_price $amount] has been added to your gift certificate account!</p>
-    	  <p><a href=\"payment?address_id=$address_id\">Continue with your order</a></p>
-    	</blockquote>
-    	[ec_footer]"
-
+    set title "Gift Certificate Claimed"
+    set certificate_added_p "true"
 } else {
 
     # It's already been claimed. See if it was claimed by a different
@@ -106,15 +102,7 @@
 	    (ec_problem_id_sequence.nextval, sysdate, :gift_certificate_id, :prob_details)"
     }
 
+    set title "Gift Certificate Already Claimed"
+    set certificate_added_p "false"
     db_release_unused_handles
-    doc_return 200 text/html "
-	[ad_header "Gift Certificate Already Claimed"]
-    	[ec_header_image]<br clear=all>
-    	<blockquote>
-    	  <p>Your gift certificate has already been claimed.  Either you hit submit twice on the form, or it
-    	   was claimed previously.  Once you claim it, it goes into your gift certificate balance and you don't have to claim it again.</p>
-    	  <p><a href=\"payment?address_id=$address_id\">Continue with your order</a></p>
-    	</blockquote>
-    	[ec_footer]"
-
 }