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.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-oracle.xql 10 Jul 2001 20:33:53 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-oracle.xql 23 Jul 2001 05:40:41 -0000 1.2 @@ -3,6 +3,27 @@ oracle8.1.6 + + + and sysdate-o.confirmed_date <= 1 + + + + + + + and sysdate-o.confirmed_date <= 7 + + + + + + + and months_between(sysdate,o.confirmed_date) <= 1 + + + + 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 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time-postgresql.xql 23 Jul 2001 05:40:41 -0000 1.1 @@ -0,0 +1,27 @@ + + + + postgresql7.1 + + + + and now()-o.confirmed_date <= timespan_days(1) + + + + + + + and now()-o.confirmed_date <= timespan_days(7) + + + + + + + and now()-o.confirmed_date <= '1 month'::interval + + + + + 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.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl 23 Jul 2001 05:40:41 -0000 1.2 @@ -77,11 +77,14 @@ } if { $view_confirmed == "last_24" } { - set confirmed_query_bit "and sysdate-o.confirmed_date <= 1" + #set confirmed_query_bit "and sysdate-o.confirmed_date <= 1" + set confirmed_query_bit [db_map last_24] } elseif { $view_confirmed == "last_week" } { - set confirmed_query_bit "and sysdate-o.confirmed_date <= 7" + #set confirmed_query_bit "and sysdate-o.confirmed_date <= 7" + set confirmed_query_bit [db_map last_week] } elseif { $view_confirmed == "last_month" } { - set confirmed_query_bit "and months_between(sysdate,o.confirmed_date) <= 1" + #set confirmed_query_bit "and months_between(sysdate,o.confirmed_date) <= 1" + set confirmed_query_bit [db_map last_month] } else { set confirmed_query_bit "" }