Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-oracle.xql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-oracle.xql	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-oracle.xql	17 Oct 2002 04:38:01 -0000	1.3.2.1
@@ -115,5 +115,19 @@
       (ec_problem_id_sequence.nextval, sysdate, :problem_details, :order_id)
     </querytext>
   </fullquery>
+
+  <fullquery name="get_order_shipping">      
+    <querytext>
+      select nvl(shipping_charged, 0)
+      from ec_orders
+      where order_id = :order_id
+    </querytext>
+  </fullquery>
   
+  <fullquery name="get_order_shipping_tax">      
+    <querytext>
+      select ec_tax(0, :order_shipping, :order_id) from dual
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-postgresql.xql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-postgresql.xql	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3-postgresql.xql	17 Oct 2002 04:38:00 -0000	1.3.2.1
@@ -106,4 +106,18 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="get_order_shipping">      
+    <querytext>
+      select coalesce(shipping_charged, 0)
+      from ec_orders
+      where order_id = :order_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="get_order_shipping_tax">      
+    <querytext>
+      select ec_tax(0, :order_shipping, :order_id)
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql	19 Sep 2002 17:12:45 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql	17 Oct 2002 04:38:00 -0000	1.4.2.1
@@ -48,15 +48,7 @@
       where item_id in ([join $item_id_list ", "])
     </querytext>
   </fullquery>
-  
-  <fullquery name="total_shipping_of_items_select">      
-    <querytext>
-      select ${shipping_of_items}::numeric + shipping_charged
-      from ec_orders
-      where order_id=:order_id
-    </querytext>
-  </fullquery>
-  
+    
   <fullquery name="item_state_update">      
     <querytext>
       update ec_items