Index: openacs-4/packages/ecommerce/www/admin/orders/comments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/comments.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/comments.adp 17 Aug 2008 23:08:05 -0000 1.1 @@ -0,0 +1,18 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +
+

Please add or edit comments below:

+ +
+ +
+ +
+
+ +
+ +
Index: openacs-4/packages/ecommerce/www/admin/orders/comments.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/comments.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/orders/comments.tcl 9 Mar 2004 00:59:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/orders/comments.tcl 17 Aug 2008 23:08:05 -0000 1.4 @@ -12,31 +12,11 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append "[ad_admin_header "Comments"] +set title "Comments" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

Comments

+set export_form_vars_html [export_form_vars order_id] -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "Comments"] +set previous_comments [db_string comments_select "select cs_comments from ec_orders where order_id=:order_id"] -
-
-[export_form_vars order_id] - -Please add or edit comments below: - -
- -
- -
- -

-

- -
- -
- -[ad_admin_footer] -" Index: openacs-4/packages/ecommerce/www/admin/orders/refunds.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/refunds.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/refunds.adp 17 Aug 2008 23:03:15 -0000 1.1 @@ -0,0 +1,21 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ + + + + + + + +
Refund Date
@linked_refund_date_list_html;noquote@
+ + + @table_header;noquote@ + @refunds_select_html;noquote@ + + +

None found.

+ Index: openacs-4/packages/ecommerce/www/admin/orders/refunds.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/refunds.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/refunds.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/refunds.tcl 17 Aug 2008 23:03:15 -0000 1.6 @@ -15,43 +15,22 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append " - [ad_admin_header "Refund History"] +set title "Refund History" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

Refund History

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "Refund History"] - -
- - - - - - - - -
Refund Date
" - set refund_date_list [list [list last_24 "last 24 hrs"] [list last_week "last week"] [list last_month "last month"] [list all all]] set linked_refund_date_list [list] - foreach refund_date $refund_date_list { if {$view_refund_date == [lindex $refund_date 0]} { - lappend linked_refund_date_list "[lindex $refund_date 1]" + lappend linked_refund_date_list "[lindex $refund_date 1]" } else { - lappend linked_refund_date_list "[lindex $refund_date 1]" + lappend linked_refund_date_list "[lindex $refund_date 1]" } } -doc_body_append " - \[ [join $linked_refund_date_list " | "] \] -
+set linked_refund_date_list_html "\[ [join $linked_refund_date_list " | "] \]" - -
" - if { $view_refund_date == "last_24" } { set refund_date_query_bit [db_map last_24] } elseif { $view_refund_date == "last_week" } { @@ -65,12 +44,12 @@ set link_beginning "refunds?[export_url_vars view_refund_date]" set order_by_clause [ec_decode $order_by \ - "refund_id" "r.refund_id" \ - "refund_date" "r.refund_date" \ - "order_id" "r.order_id" \ - "refund_amount" "r.refund_amount" \ - "n_items" "n_items" \ - "name" "u.last_name, u.first_names"] + "refund_id" "r.refund_id" \ + "refund_date" "r.refund_date" \ + "order_id" "r.order_id" \ + "refund_amount" "r.refund_amount" \ + "n_items" "n_items" \ + "name" "u.last_name, u.first_names"] set table_header " @@ -84,6 +63,7 @@ " set row_counter 0 +set refunds_select_html "" db_foreach refunds_select " select r.refund_id, r.refund_date, r.order_id, r.refund_amount, r.refunded_by, u.first_names, u.last_name, count(*) as n_items from ec_refunds r, cc_users u, ec_items i @@ -93,35 +73,19 @@ group by r.refund_id, r.refund_date, r.order_id, r.refund_amount, r.refunded_by, u.first_names, u.last_name order by $order_by_clause" { - if { $row_counter == 0 } { - doc_body_append $table_header - } - # Even rows are white, odd are grey - if { [expr floor($row_counter/2.)] == [expr $row_counter/2.] } { - set bgcolor "white" + set bgcolor "#white" } else { - set bgcolor "ececec" + set bgcolor "#ececec" } - doc_body_append " - - - - - - - " + append refunds_select_html " + + + + + + " incr row_counter } -if { $row_counter != 0 } { - doc_body_append "
$refund_id[util_AnsiDatetoPrettyDate $refund_date]$order_id[ec_pretty_price $refund_amount]$n_items$last_name, $first_names
$refund_id[util_AnsiDatetoPrettyDate $refund_date]$order_id[ec_pretty_pure_price $refund_amount]$n_items$last_name, $first_names
" -} else { - doc_body_append "
None Found
" -} - -doc_body_append " -
- - [ad_admin_footer]"