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.1 -r1.2
--- openacs-4/packages/ecommerce/www/shopping-cart.xql	10 Jul 2001 20:42:02 -0000	1.1
+++ openacs-4/packages/ecommerce/www/shopping-cart.xql	11 Jul 2001 04:52:05 -0000	1.2
@@ -13,15 +13,16 @@
  
 <fullquery name="get_products_in_cart">      
       <querytext>
-      FIX ME OUTER JOIN
+
 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, ec_items i, ec_products p, 
-(select product_id, offer_code from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u
-where i.product_id=p.product_id
-and o.order_id=i.order_id
-and p.product_id=u.product_id(+)
-and o.user_session_id=:user_session_id and o.order_state='in_basket'
+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'
 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>