Index: openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql 30 Jul 2005 22:19:00 -0000 1.3 +++ openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql 10 Aug 2005 21:18:23 -0000 1.4 @@ -61,7 +61,7 @@ create table dotlrn_ecommerce_transactions ( order_id integer references ec_orders on delete cascade not null unique, - method char(1) check (method in ('cc', 'internal_account', 'check', 'cash', 'invoice', 'scholarship')) not null, + method char(1) check (method in ('cc', 'internal_account', 'check', 'cash', 'invoice', 'scholarship', 'lockbox')) not null, internal_account clob ); Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql 5 Aug 2005 10:38:24 -0000 1.19 +++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql 10 Aug 2005 21:18:23 -0000 1.20 @@ -64,7 +64,7 @@ create table dotlrn_ecommerce_transactions ( order_id integer references ec_orders on delete cascade not null unique, - method text check (method in ('cc', 'internal_account', 'check', 'cash', 'invoice', 'scholarship')) not null, + method text check (method in ('cc', 'internal_account', 'check', 'cash', 'invoice', 'scholarship', 'lockbox')) not null, internal_account text ); Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/index.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/index.tcl 9 Aug 2005 12:58:47 -0000 1.9 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/index.tcl 10 Aug 2005 21:18:23 -0000 1.10 @@ -39,6 +39,7 @@ cash "[_ dotlrn-ecommerce.Cash]" \ invoice "[_ dotlrn-ecommerce.Invoice]" \ scholarship "[_ dotlrn-ecommerce.Scholarship]" \ + lockbox "[_ dotlrn-ecommerce.Lock_Box]" \ "[_ dotlrn-ecommerce.Credit_Card]" ] \ $_payment_method] @@ -55,6 +56,9 @@ link_url_col order_url html { align center } } + confirmed_date { + label "[_ dotlrn-ecommerce.Date]" + } _section_name { label "[_ dotlrn-ecommerce.Section_Name]" link_url_col section_url @@ -147,6 +151,10 @@ label "[_ dotlrn-ecommerce.Order_ID]" orderby o.order_id } + confirmed_date { + label "[_ dotlrn-ecommerce.Date]" + orderby o.confirmed_date + } _section_name { label "[_ dotlrn-ecommerce.Section_Name]" orderby _section_name @@ -178,7 +186,7 @@ } db_multirow -extend { order_url section_url pretty_total pretty_balance person_url pretty_refund pretty_actual_total } orders orders [subst { - select o.order_id, o.confirmed_date, o.order_state, + select o.order_id, to_char(o.confirmed_date, 'Mon dd, yyyy hh:miam') as confirmed_date, o.order_state, ec_total_price(o.order_id) - (case when t.method = 'invoice' then ec_total_price(o.order_id) - @@ -211,11 +219,11 @@ join dotlrn_ecommerce_section s on (i.product_id = s.product_id) left join cc_users u on (o.user_id=u.user_id) - where true + where o.order_state in ('confirmed', 'authorized', 'fulfilled', 'returned') [template::list::filter_where_clauses -and -name orders] - 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, o.in_basket_date, t.method, _section_name, s.section_id, s.course_id, o.authorized_date, balance, refund_price, refund_date, purchaser + 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, o.in_basket_date, t.method, section_name, s.section_id, s.course_id, o.authorized_date, balance, refund_price, refund_date, purchaser [template::list::orderby_clause -name orders -orderby] }] { @@ -229,6 +237,7 @@ cash "[_ dotlrn-ecommerce.Cash]" \ invoice "[_ dotlrn-ecommerce.Invoice]" \ scholarship "[_ dotlrn-ecommerce.Scholarship]" \ + lockbox "[_ dotlrn-ecommerce.Lock_Box]" \ "[_ dotlrn-ecommerce.Credit_Card]" ] set order_state [string totitle $order_state] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.tcl 5 Aug 2005 12:03:07 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.tcl 10 Aug 2005 21:18:23 -0000 1.3 @@ -100,6 +100,9 @@ cash { lappend method_options [list "[_ dotlrn-ecommerce.Cash]" cash] } + lockbox { + lappend method_options [list "[_ dotlrn-ecommerce.Lock_Box]" lockbox] + } } incr method_count } Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.tcl 8 Aug 2005 13:10:07 -0000 1.3 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.tcl 10 Aug 2005 21:18:23 -0000 1.4 @@ -365,6 +365,7 @@ # Check if this was payed via another method switch $method { cash - + lockbox - check { doc_body_append "
This order was fully paid by ${method}.
" }