Index: openacs-4/packages/ecommerce/www/admin/orders/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/index.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/index.xql	10 Jul 2001 20:33:53 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/index.xql	29 Jan 2002 00:11:46 -0000	1.2
@@ -1,78 +1,65 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="recent_orders_select">      
-      <querytext>
-      
-select 
-  sum(one_if_within_n_days(confirmed_date,1)) as n_o_in_last_24_hours,
-  sum(one_if_within_n_days(confirmed_date,7)) as n_o_in_last_7_days
-from ec_orders_reportable
+  <fullquery name="recent_orders_select">      
+    <querytext>
+      select 
+      	sum(one_if_within_n_days(confirmed_date,1)) as n_o_in_last_24_hours,
+      	sum(one_if_within_n_days(confirmed_date,7)) as n_o_in_last_7_days
+      from ec_orders_reportable
+    </querytext>
+  </fullquery>
 
-      </querytext>
-</fullquery>
+  <fullquery name="recent_gift_certificates_purchased_select">      
+    <querytext>
+      select
+      	sum(one_if_within_n_days(issue_date,1)) as n_g_in_last_24_hours,
+      	sum(one_if_within_n_days(issue_date,7)) as n_g_in_last_7_days
+      from ec_gift_certificates_purchased
+    </querytext>
+  </fullquery>
 
- 
-<fullquery name="recent_gift_certificates_purchased_select">      
-      <querytext>
-      
-select
-  sum(one_if_within_n_days(issue_date,1)) as n_g_in_last_24_hours,
-  sum(one_if_within_n_days(issue_date,7)) as n_g_in_last_7_days
-from ec_gift_certificates_purchased
+  <fullquery name="recent_gift_certificates_issued_select">      
+    <querytext>
+      select
+      	sum(one_if_within_n_days(issue_date,1)) as n_gi_in_last_24_hours,
+      	sum(one_if_within_n_days(issue_date,7)) as n_gi_in_last_7_days
+      from ec_gift_certificates_issued
+    </querytext>
+  </fullquery>
 
-      </querytext>
-</fullquery>
+  <fullquery name="recent_shipments_select">      
+    <querytext>
+      select
+      	sum(one_if_within_n_days(shipment_date,1)) as n_s_in_last_24_hours,
+      	sum(one_if_within_n_days(shipment_date,7)) as n_s_in_last_7_days
+      from ec_shipments
+    </querytext>
+  </fullquery>
+  
+  <fullquery name="recent_refunds_select">      
+    <querytext>
+      select
+      	sum(one_if_within_n_days(refund_date,1)) as n_r_in_last_24_hours,
+      	sum(one_if_within_n_days(refund_date,7)) as n_r_in_last_7_days
+      from ec_refunds
+    </querytext>
+  </fullquery>
+  
+  <fullquery name="standard_shipping">      
+    <querytext>
+      select count(*) 
+      from ec_orders_shippable 
+      where shipping_method='standard'
+    </querytext>
+  </fullquery>
 
- 
-<fullquery name="recent_gift_certificates_issued_select">      
-      <querytext>
-      
-select
-  sum(one_if_within_n_days(issue_date,1)) as n_gi_in_last_24_hours,
-  sum(one_if_within_n_days(issue_date,7)) as n_gi_in_last_7_days
-from ec_gift_certificates_issued
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="recent_shipments_select">      
-      <querytext>
-      
-select
-  sum(one_if_within_n_days(shipment_date,1)) as n_s_in_last_24_hours,
-  sum(one_if_within_n_days(shipment_date,7)) as n_s_in_last_7_days
-from ec_shipments
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="recent_refunds_select">      
-      <querytext>
-      
-select
-  sum(one_if_within_n_days(refund_date,1)) as n_r_in_last_24_hours,
-  sum(one_if_within_n_days(refund_date,7)) as n_r_in_last_7_days
-from ec_refunds
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="unused">      
-      <querytext>
-      select count(*) from ec_orders_shippable where shipping_method='standard'
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="unused">      
-      <querytext>
-      select count(*) from ec_orders_shippable where shipping_method='standard'
-      </querytext>
-</fullquery>
-
- 
+  <fullquery name="express_shipping">      
+    <querytext>
+      select count(*) 
+      from ec_orders_shippable 
+      where shipping_method='express'
+    </querytext>
+  </fullquery>
+  
 </queryset>