Index: openacs-4/packages/ecommerce/www/shopping-cart.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart.xql	16 Feb 2002 23:32:07 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart.xql	26 May 2002 04:36:50 -0000	1.4
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <queryset>
 
   <fullquery name="get_n_items">      
@@ -9,20 +10,22 @@
       and o.user_session_id=:user_session_id and o.order_state='in_basket'
     </querytext>
   </fullquery>
- 
+
   <fullquery name="get_products_in_cart">      
     <querytext>
       select p.product_name, p.one_line_description, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice 
       from ec_orders o
-      JOIN ec_items i on (o.order_id=i.order_id)
-      JOIN ec_products p on (i.product_id=p.product_id)
-      LEFT JOIN (select product_id, offer_code from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u 
-        on (p.product_id=u.product_id)
-      where o.user_session_id=:user_session_id and o.order_state='in_basket'
+      join ec_items i on (o.order_id=i.order_id)
+      join ec_products p on (i.product_id=p.product_id)
+      left join (select product_id, offer_code 
+	  from ec_user_session_offer_codes usoc 
+	  where usoc.user_session_id=:user_session_id) u on (p.product_id=u.product_id)
+      where o.user_session_id=:user_session_id 
+      and o.order_state='in_basket'
       group by p.product_name, p.one_line_description, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice
     </querytext>
   </fullquery>
- 
+
   <fullquery name="tax_states">      
     <querytext>
       select tax_rate, initcap(state_name) as state