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.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql	10 Jul 2001 20:33:53 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql	22 Jul 2001 07:04:48 -0000	1.2
@@ -45,7 +45,7 @@
  
 <fullquery name="total_shipping_of_items_select">      
       <querytext>
-      select $shipping_of_items + shipping_charged from ec_orders where order_id=:order_id
+      select ${shipping_of_items}::numeric + shipping_charged from ec_orders where order_id=:order_id
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql	10 Jul 2001 20:33:53 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql	22 Jul 2001 07:04:48 -0000	1.2
@@ -1,20 +1,27 @@
 <?xml version="1.0"?>
-
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+<fullquery name="get_carrier_list">      
+      <querytext>
+      select unique carrier from ec_shipments where carrier is not null order by carrier
+      </querytext>
+</fullquery>
+
+ 
 <fullquery name="shipments_select">      
       <querytext>
       
-select s.shipment_id, 
-       s.shipment_date, 
-       s.order_id, 
-       s.carrier, 
-       case when nvl((select count(*) from ec_items where order_id=s.order_id) = 0) then nvl((select count(*) from ec_items where shipment_id=s.shipment_id) else 0 end,'Full','Partial') as full_or_partial,
+select s.shipment_id,
+       s.shipment_date,
+       s.order_id,
+       s.carrier,
+       decode(nvl((select count(*) from ec_items where order_id=s.order_id),0),nvl((select count(*) from ec_items where shipment_id=s.shipment_id),0),'Full','Partial') as full_or_partial,
        nvl((select count(*) from ec_items where shipment_id=s.shipment_id),0) as n_items
 from ec_shipments s
 $where_clause
 order by $order_by_clause
+
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/ecommerce/www/admin/orders/shipments-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/shipments-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/shipments-postgresql.xql	22 Jul 2001 07:04:48 -0000	1.1
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="get_carrier_list">      
+      <querytext>
+      select distinct carrier from ec_shipments where carrier is not null order by carrier
+      </querytext>
+</fullquery>
+
+
+<partialquery name="last_24">
+      <querytext>
+        now()-s.shipment_date <= timespan_days(1)
+      </querytext>
+</partialquery>
+
+
+<partialquery name="last_week">
+      <querytext>
+        now()-s.shipment_date <= timespan_days(7)
+      </querytext>
+</partialquery>
+
+
+<partialquery name="last_month">
+      <querytext>
+        now()-s.shipment_date <= '1 month'::interval
+      </querytext>
+</partialquery>
+
+ 
+<fullquery name="shipments_select">      
+      <querytext>
+      
+select s.shipment_id, 
+       s.shipment_date, 
+       s.order_id, 
+       s.carrier, 
+       case when coalesce((select count(*) from ec_items where order_id=s.order_id),0) = coalesce((select count(*) from ec_items where shipment_id=s.shipment_id),0) then 'Full' else 'Partial' end as full_or_partial,
+       coalesce((select count(*) from ec_items where shipment_id=s.shipment_id),0) as n_items
+from ec_shipments s
+$where_clause
+order by $order_by_clause
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/shipments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/shipments.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/shipments.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/shipments.tcl	22 Jul 2001 07:04:48 -0000	1.2
@@ -77,11 +77,14 @@
 }
 
 if { $view_shipment_date == "last_24" } {
-    set shipment_date_query_bit "sysdate-s.shipment_date <= 1"
+    #set shipment_date_query_bit "sysdate-s.shipment_date <= 1"
+    set shipment_date_query_bit [db_map last_24]
 } elseif { $view_shipment_date == "last_week" } {
-    set shipment_date_query_bit "sysdate-s.shipment_date <= 7"
+    #set shipment_date_query_bit "sysdate-s.shipment_date <= 7"
+    set shipment_date_query_bit [db_map last_week]
 } elseif { $view_shipment_date == "last_month" } {
-    set shipment_date_query_bit "months_between(sysdate,s.shipment_date) <= 1"
+    #set shipment_date_query_bit "months_between(sysdate,s.shipment_date) <= 1"
+    set shipment_date_query_bit [db_map last_month]
 } else {
     set shipment_date_query_bit ""
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/shipments.xql'.
Fisheye: No comparison available.  Pass `N' to diff?