Index: openacs-4/packages/ecommerce/www/checkout-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/checkout-2-oracle.xql 10 Jul 2001 20:42:02 -0000 1.1 +++ openacs-4/packages/ecommerce/www/checkout-2-oracle.xql 26 May 2002 04:36:50 -0000 1.2 @@ -1,28 +1,23 @@ - oracle8.1.6 + + oracle + 8.1.6 + - - - - select p.no_shipping_avail_p, 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 offer_code, product_id - 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' - group by p.no_shipping_avail_p, p.product_name, p.one_line_description, p.product_id, - u.offer_code, - i.color_choice, i.size_choice, i.style_choice - - + + + select p.no_shipping_avail_p, 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 offer_code, product_id + 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' + group by p.no_shipping_avail_p, p.product_name, p.one_line_description, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice + + -