Index: openacs-4/packages/ecommerce/www/select-shipping.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/select-shipping.xql	16 Feb 2002 23:32:06 -0000	1.1
+++ openacs-4/packages/ecommerce/www/select-shipping.xql	26 May 2002 04:36:50 -0000	1.2
@@ -1,36 +1,49 @@
 <?xml version="1.0"?>
+
 <queryset>
 
   <fullquery name="get_order_id_and_order_owner">      
     <querytext>
-       select order_id, user_id as order_owner
-       from ec_orders 
-       where user_session_id=:user_session_id and order_state='in_basket'
+      select order_id, user_id as order_owner
+      from ec_orders 
+      where user_session_id=:user_session_id and order_state='in_basket'
     </querytext>
   </fullquery>
 
   <fullquery name="get_an_address_id">      
     <querytext>
-      select count(*) from ec_addresses where address_id=:address_id and user_id=:user_id
+      select count(*) 
+      from ec_addresses 
+      where address_id = :address_id
+      and user_id = :user_id
     </querytext>
   </fullquery>
 
   <fullquery name="update_ec_order_address">      
     <querytext>
-      update ec_orders set shipping_address=:address_id where order_id=:order_id
+      update ec_orders
+      set shipping_address = :address_id
+      where order_id = :order_id
     </querytext>
   </fullquery>
- 
+
   <fullquery name="get_address_id">      
     <querytext>
-      select shipping_address from ec_orders where order_id=:order_id
+      select shipping_address
+      from ec_orders
+      where order_id = :order_id
     </querytext>
   </fullquery>
- 
+
   <fullquery name="shipping_avail">      
     <querytext>
-      select distinct p.no_shipping_avail_p from ec_items i, ec_products p where i.product_id = p.product_id and p.no_shipping_avail_p = 't' and i.order_id = :order_id
+      select p.no_shipping_avail_p, count (*)
+      from ec_items i, ec_products p
+      where i.product_id = p.product_id
+      and p.no_shipping_avail_p = 'f' 
+      and i.order_id = :order_id
+      group by no_shipping_avail_p
     </querytext>
   </fullquery>
- 
+
 </queryset>