Index: openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-oracle.xql	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-oracle.xql	12 Sep 2002 02:57:26 -0000	1.4
@@ -21,4 +21,23 @@
     </querytext>
   </partialquery>
 
+  <partialquery name="all">
+    <querytext>
+      and 1=1
+    </querytext>
+  </partialquery>
+
+  <fullquery name="orders_select">      
+    <querytext>
+      select o.order_id, o.confirmed_date, o.order_state, ec_total_price(o.order_id) as price_to_display, o.user_id, u.first_names, u.last_name, count(*) as n_items
+      from ec_orders o, ec_items i, cc_users u
+      where o.order_id=i.order_id
+      and o.user_id(+)=u.user_id
+      $confirmed_query_bit 
+      $order_state_query_bit
+      group by o.order_id, o.confirmed_date, o.order_state, ec_total_price(o.order_id), o.user_id, u.first_names, u.last_name
+      order by $order_by_clause
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-postgresql.xql	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-postgresql.xql	12 Sep 2002 02:57:26 -0000	1.3
@@ -21,4 +21,23 @@
     </querytext>
   </partialquery>
   
+  <partialquery name="all">
+    <querytext>
+      where true
+    </querytext>
+  </partialquery>
+
+  <fullquery name="orders_select">      
+    <querytext>
+      select o.order_id, o.confirmed_date, o.order_state, ec_total_price(o.order_id) as price_to_display, o.user_id, u.first_names, u.last_name, count(*) as n_items
+      from ec_orders o
+      join ec_items i using (order_id)
+      left join cc_users u on (o.user_id=u.user_id)
+      $confirmed_query_bit 
+      $order_state_query_bit
+      group by o.order_id, o.confirmed_date, o.order_state, ec_total_price(o.order_id), o.user_id, u.first_names, u.last_name
+      order by $order_by_clause
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl	26 May 2002 04:36:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl	12 Sep 2002 02:57:26 -0000	1.5
@@ -93,7 +93,7 @@
 } elseif { $view_confirmed == "last_month" } {
     set confirmed_query_bit [db_map last_month]
 } else {
-    set confirmed_query_bit "where true"
+    set confirmed_query_bit [db_map all]
 }
 
 set link_beginning "by-order-state-and-time?[export_url_vars view_order_state view_confirmed]"
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.xql'.
Fisheye: No comparison available.  Pass `N' to diff?