Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 9 Aug 2008 10:33:13 -0000 1.10
+++ openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 18 Aug 2008 09:53:32 -0000 1.11
@@ -26,7 +26,6 @@
}
# The customer service rep must be logged on
-
set customer_service_rep [ad_get_user_id]
if {$customer_service_rep == 0} {
set return_url "[ad_conn url]?[export_entire_form_as_url_vars]"
@@ -35,7 +34,6 @@
}
# Make sure they haven't already inserted this refund
-
if { [db_string get_refund_count "
select count(*)
from ec_refunds
@@ -51,7 +49,6 @@
# They must have either checked "All items" and none of the rest, or
# at least one of the rest and not "All items". They also need to have
# shipment_date filled in
-
if { [info exists all_items_p] && [info exists item_id] } {
incr exception_count
append exception_text "
Please either check off \"All items\" or check off some of the items, but not both."
@@ -66,16 +63,10 @@
ad_script_abort
}
-append doc_body "
- [ad_admin_header "Specify refund amount"]
+set title "Specify refund amount"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
-
Specify refund amount
-
- [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One"] "Mark Items Returned"]
- "
-
-set shipping_refund_percent [ad_parameter -package_id [ec_id] ShippingRefundPercent ecommerce]
-
+set shipping_refund_percent [parameter -package_id [ec_id] -parameter ShippingRefundPercent]
if { ![info exists all_items_p] } {
set item_id_list $item_id
set sql [db_map all_items_select]
@@ -88,54 +79,30 @@
# added to the order, thereby causing the query for all items to
# return one more item), only the items that they confirm here should
# be recorded as part of this return.
-
if { [info exists all_items_p] } {
set item_id_list [list]
}
set items_to_print ""
db_foreach get_return_item_list $sql {
-
if { [info exists all_items_p] } {
- lappend item_id_list $item_id
+ lappend item_id_list $item_id
}
- append items_to_print "
-
-
$product_name
+ append items_to_print "
$product_name
(out of [ec_pretty_pure_price $price_charged])
- (out of [ec_pretty_pure_price $shipping_charged])