Index: openacs-4/packages/ecommerce/www/checkout-one-form.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/checkout-one-form.xql 13 Jan 2005 13:57:58 -0000 1.2 +++ openacs-4/packages/ecommerce/www/checkout-one-form.xql 11 Aug 2008 07:08:17 -0000 1.3 @@ -22,11 +22,11 @@ - select i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice, p.product_name, p.one_line_description, p.product_id, count(*) as quantity + select i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice, p.product_name, p.one_line_description, p.product_id, p.sku, count(*) as quantity from ec_items i, ec_products p where i.order_id = :order_id and i.product_id = p.product_id - group by p.product_name, p.one_line_description, p.product_id, i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice + group by p.product_name, p.sku, p.one_line_description, p.product_id, i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice @@ -84,9 +84,9 @@ - select attn, line1, line2, city, usps_abbrev, zip_code, phone, country_code, full_state_name, phone_time - from ec_addresses - where address_id=:address_id + select attn, line1, line2, city, usps_abbrev, zip_code, phone, country_code, full_state_name, phone_time + from ec_addresses + where address_id=:address_id @@ -132,6 +132,14 @@ + + + select shipping, shipping_additional, weight, no_shipping_avail_p + from ec_products + where product_id=:product_id + + + select c.creditcard_id, c.creditcard_type, c.creditcard_last_four, c.creditcard_expire