Index: openacs-4/packages/ecommerce/www/checkout.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/checkout.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/checkout.adp	5 Aug 2002 15:29:18 -0000	1.2
@@ -6,7 +6,6 @@
 
 <blockquote>
 
-  <if @shipping_required@ >
     <p><b>Please choose your shipping address.</b></p>
 
     <blockquote>
@@ -77,15 +76,5 @@
 	</td>
       </tr>
     </table>
-  </if>
-  <else>
-    <p>Your order does not need a shipping address</p>
-    <form method="post" action="checkout-2">
-      @hidden_form_vars@
-      <center>
-	<input type="submit" value="Continue"></input>
-      </center>
-    </form>
-  </else>
    
 </blockquote>
Index: openacs-4/packages/ecommerce/www/checkout.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/checkout.tcl	26 May 2002 04:36:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/checkout.tcl	5 Aug 2002 15:29:18 -0000	1.5
@@ -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