Index: openacs.org-dev/packages/ecommerce/www/checkout.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/checkout.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/checkout.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/checkout.tcl	5 Aug 2002 21:38:45 -0000	1.1.1.2
@@ -59,11 +59,14 @@
 
     # Present all saved addresses
 
-    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
-    from ec_addresses
-    where user_id=:user_id
-    and address_type = 'shipping'" -eval {
+    db_multirow get_user_addresses addresses {
+        select address_id, attn, line1, line2, city, usps_abbrev, 
+	       zip_code, phone, country_code, full_state_name, phone_time, 
+	       address_type
+          from ec_addresses
+         where user_id=:user_id
+           and address_type = 'shipping'
+    } {
 
 	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)]]
@@ -73,10 +76,14 @@
 	set row(use) "[export_form_vars address_id]"
     }
     set hidden_form_vars [export_form_vars address_type]
+
 } else {
-    set address_id ""
-    set hidden_form_vars [export_form_vars address_id address_type]
     set shipping_required false
 }
 
+if { $shipping_required == "false" } {
+    set address_id ""
+    ad_returnredirect "checkout-2?[export_url_vars address_id address_type]"
+}
+
 db_release_unused_handles