Index: openacs.org-dev/packages/ecommerce/www/gift-certificate-billing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/gift-certificate-billing.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/gift-certificate-billing.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/gift-certificate-billing.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -25,7 +25,7 @@
 if {$user_id == 0} {
     set return_url "[ad_conn url]"
     ad_returnredirect "/register?[export_url_vars return_url]"
-    return
+    ad_script_abort
 }
 
 # Error checking
@@ -81,7 +81,7 @@
 
 if { $exception_count > 0 } {
     ad_return_complaint $exception_count $exception_text
-    return
+    ad_script_abort
 }
 
 set saved_addresses "
@@ -91,6 +91,7 @@
 # Present all saved addresses
 
 set address_type "billing"
+set referer "gift-certificate-billing"
 
 template::query get_user_addresses addresses multirow "
     select address_id, attn, line1, line2, city, usps_abbrev, zip_code, phone, country_code, full_state_name, phone_time, address_type
@@ -101,9 +102,12 @@
     set row(formatted) [ec_display_as_html [ec_pretty_mailing_address_from_args $row(line1) $row(line2) $row(city) $row(usps_abbrev) $row(zip_code) $row(country_code) \
 						$row(full_state_name) $row(attn) $row(phone) $row(phone_time)]]
     set address_id $row(address_id)
-    set row(delete) "[export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email]"
-    set row(edit) "[export_form_vars address_id address_type certificate_to certificate_from certificate_message amount recipient_email]"
+    set row(delete) "[export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email referer]"
+    set row(edit) "[export_form_vars address_id address_type certificate_to certificate_from certificate_message amount recipient_email referer]"
     set row(use) "[export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email]"
 }
 
-set hidden_form_vars [export_form_vars address_type certificate_to certificate_from certificate_message amount recipient_email]
+set hidden_form_vars [export_form_vars address_type certificate_to certificate_from certificate_message amount recipient_email referer]
+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]
+