Index: openacs-4/packages/ecommerce/www/finalize-order-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/finalize-order-postgresql.xql,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/ecommerce/www/finalize-order-postgresql.xql	17 Oct 2002 01:57:27 -0000	1.2.2.1
+++ openacs-4/packages/ecommerce/www/finalize-order-postgresql.xql	19 Oct 2002 19:43:49 -0000	1.2.2.2
@@ -21,6 +21,7 @@
   <fullquery name="get_soft_goods_costs">      
     <querytext>
       select coalesce(sum(i.price_charged),0) - coalesce(sum(i.price_refunded),0) as soft_goods_cost
+      coalesce(sum(i.price_tax_charged),0) - coalesce(sum(i.price_tax_refunded),0) as soft_goods_tax
       from ec_items i, ec_products p
       where i.order_id = :order_id
       and i.item_state <> 'void'
@@ -32,6 +33,9 @@
   <fullquery name="get_hard_goods_costs">      
     <querytext>
       select coalesce(sum(i.price_charged),0) - coalesce(sum(i.price_refunded),0) as hard_goods_cost
+      coalesce(sum(i.price_tax_charged),0) - coalesce(sum(i.shipping_refunded),0) as hard_goods_tax,
+      coalesce(sum(i.shipping_charged),0) - coalesce(sum(i.shipping_refunded),0) as hard_goods_shipping,
+      coalesce(sum(i.shipping_tax_charged),0) - coalesce(sum(i.shipping_tax_refunded),0) as hard_goods_shipping_tax
       from ec_items i, ec_products p
       where i.order_id = :order_id
       and i.item_state <> 'void'