Index: openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql	19 Sep 2002 03:24:55 -0000	1.3
@@ -6,13 +6,18 @@
     <version>7.1</version>
   </rdbms>
 
-  <fullquery name="check_for_saved_carts">      
+  <fullquery name="get_products_in_cart">      
     <querytext>
-      select 1  where exists (select 1 
-	  from ec_orders 
-          where user_id=:user_id 
-          and order_state = 'in_basket' 
-          and saved_p='t')
+      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, '' as price 
+      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>