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 -N -r1.11 -r1.12 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/index.tcl 17 Aug 2005 16:24:22 -0000 1.11 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/index.tcl 18 Aug 2005 14:29:40 -0000 1.12 @@ -92,9 +92,6 @@ html { align right } display_template { @orders.pretty_refund@ - - » - } aggregate sum aggregate_label "[_ dotlrn-ecommerce.Total_1]:" @@ -118,11 +115,20 @@ [_ dotlrn-ecommerce.Yes] - » } - aggregate sum - aggregate_label "[_ dotlrn-ecommerce.Total_1]:" } + refund { + display_template { + + Refund + + } + } + transactions { + display_template { + Transactions + } + } } -filters { section_id { where_clause { s.section_id = :section_id } Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.adp 18 Aug 2005 14:29:40 -0000 1.1 @@ -0,0 +1,5 @@ + + Invoice Payment + @context@ + + \ No newline at end of file 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 -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.tcl 17 Aug 2005 16:48:00 -0000 1.4 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/invoice-payment.tcl 18 Aug 2005 14:29:40 -0000 1.5 @@ -336,18 +336,20 @@ ad_script_abort } -doc_body_append " -[ad_admin_header "Invoice Payment"] +# doc_body_append " +# [ad_admin_header "Invoice Payment"] -

Invoice Payment

+#

Invoice Payment

-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "One Order"] +# [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "One Order"] -
+#
-

Invoice Payment

+#

Invoice Payment

-[eval [template::adp_compile -string [subst { - -}]]] -[ad_admin_footer]" +# [eval [template::adp_compile -string [subst { +# +# }]]] +# [ad_admin_footer]" + +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Invoice Payment"] \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.adp 18 Aug 2005 14:29:40 -0000 1.1 @@ -0,0 +1,5 @@ + + Refund + @context@ + + @doc_body;noquote@ \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl 17 Aug 2005 16:24:22 -0000 1.4 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl 18 Aug 2005 14:29:40 -0000 1.5 @@ -74,14 +74,6 @@ ad_script_abort } -append doc_body " - [ad_admin_header "Specify refund amount"] - -

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] if { ![info exists all_items_p] } { @@ -168,8 +160,7 @@ -
+
" - [ad_admin_footer]" - -doc_return 200 text/html $doc_body +#doc_return 200 text/html $doc_body +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.adp 18 Aug 2005 14:29:40 -0000 1.1 @@ -0,0 +1,5 @@ + + Refund + @context@ + + @doc_body;noquote@ \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl 12 Aug 2005 16:17:58 -0000 1.4 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl 18 Aug 2005 14:29:40 -0000 1.5 @@ -223,13 +223,6 @@ } append doc_body " - [ad_admin_header "Refund Totals"] - -

Refund Totals

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One"] "Refund Totals"] - -
[export_entire_form] [export_form_vars cash_amount_to_refund certificate_amount_to_reinstate cash_amount_to_refund_cc cash_amount_to_refund_manually] @@ -303,7 +296,7 @@
-
-[ad_admin_footer]" +" -doc_return 200 text/html $doc_body +#doc_return 200 text/html $doc_body +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.adp 18 Aug 2005 14:29:40 -0000 1.1 @@ -0,0 +1,5 @@ + + Refund + @context@ + + @doc_body;noquote@ \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl 12 Aug 2005 10:10:14 -0000 1.5 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl 18 Aug 2005 14:29:40 -0000 1.6 @@ -183,15 +183,15 @@ insert into ec_refunds (refund_id, order_id, refund_amount, refund_date, refunded_by, refund_reasons) values - (:refund_id, :order_id, :cash_amount_to_refund_cc, sysdate, :customer_service_rep,:reason_for_return)" + (:refund_id, :order_id, :cash_amount_to_refund_cc::float + :cash_amount_to_refund_manually::float, sysdate, :customer_service_rep,:reason_for_return)" foreach item_id $item_id_list { # This is annoying (doing these selects before each insert), # but that's how it goes because we don't want to refund more # tax than was actually paid even if the tax rates changed - set price_bind_variable $price_to_refund($item_id) + set price_bind_variable [expr $price_to_refund($item_id) + $price_to_refund_manually($item_id)] set shipping_bind_variable $shipping_to_refund($item_id) db_1row get_tax_charged_on_item " @@ -549,16 +549,10 @@ } append doc_body " - [ad_admin_header $page_title] - -

$page_title

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One"] "Refund Complete"] -
$results_explanation - Back to Order $order_id -
- [ad_admin_footer]" + Back to Order $order_id + " -doc_return 200 text/html $doc_body +#doc_return 200 text/html $doc_body +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.adp 18 Aug 2005 14:29:40 -0000 1.1 @@ -0,0 +1,5 @@ + + Refund + @context@ + + @doc_body;noquote@ \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.tcl 3 Aug 2005 22:45:46 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return.tcl 18 Aug 2005 14:29:40 -0000 1.2 @@ -26,19 +26,13 @@ return } -doc_body_append " - [ad_admin_header "Mark Items Returned"] +set doc_body "" -

Mark Items Returned

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?order_id=$order_id" "One Order"] "Mark Items Returned"] -
" - # Generate the new refund_id to prevent reusing this form. set refund_id [db_nextval refund_id_sequence] -doc_body_append " +append doc_body "
[export_form_vars order_id refund_id] @@ -57,6 +51,6 @@
-
+ " - [ad_admin_footer]" +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.adp 18 Aug 2005 14:29:40 -0000 1.1 @@ -0,0 +1,5 @@ + + One Order + @context@ + + @doc_body;noquote@ \ No newline at end of file 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 -N -r1.7 -r1.8 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.tcl 17 Aug 2005 16:24:22 -0000 1.7 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/one.tcl 18 Aug 2005 14:29:40 -0000 1.8 @@ -24,17 +24,9 @@ and o.user_id = u.user_id(+) and o.creditcard_id = c.creditcard_id(+)" -doc_body_append " - [ad_admin_header "One Order"] +set doc_body "" -

One Order

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "One Order"] - -
- -

Overview

- +append doc_body " [ec_decode $order_state "void" "" "
"] @@ -56,7 +48,7 @@
Order ID
" if { $order_state == "void" } { - doc_body_append " + append doc_body "

Details of Void

@@ -67,7 +59,7 @@
" } -doc_body_append " +append doc_body " [ec_decode $cs_comments "" "" "

Comments

\n
[ec_display_as_html $cs_comments]
"]
    @@ -168,141 +160,28 @@ " } -doc_body_append "$items_ul" +append doc_body "$items_ul" if { $order_state == "authorized" || $order_state == "partially_fulfilled" } { - doc_body_append " + append doc_body "
  • Record a Shipment
  • Add Items
    • " } if { $order_state == "fulfilled" || $order_state == "partially_fulfilled" } { - doc_body_append " -
  • Mark Items Returned
    • " + append doc_body " +
  • Refund
    • " } -doc_body_append " +append doc_body "
- -

Details

- - - - - - " - -if { ![empty_string_p $creditcard_id] } { - doc_body_append " - - - - - - " -} - -doc_body_append " - - - - - - - - - - - - - - - - -
[ec_decode $shipping_method "pickup" "Address" "no shipping" "Address" "Ship to"][ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $shipping_address]]
" - -if { $order_state == "confirmed" || $order_state == "authorized" || $order_state == "partially_fulfilled" } { - doc_body_append " - (modify)" -} - -doc_body_append " -
Bill to[ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $billing_address]]
- (modify)		Credit card[ec_display_as_html [ec_creditcard_summary $creditcard_id] ]
- (modify)
In basket date[ec_formatted_full_date $in_basket_date]
Confirmed date[ec_formatted_full_date $confirmed_date]
Authorized date[ec_formatted_full_date $authorized_date]
Base shipping charged[ec_pretty_price $shipping_charged] [ec_decode $shipping_method "pickup" "(Pickup)" "no shipping" "(No Shipping)" ""]
" - -#set financial_transactions [template::adp_compile -string {}] -# Hack to not display ds stuff even if it's enabled, demo purposes -#regsub -all {\[::ds_show_p\]} $financial_transactions 0 financial_transactions -#[eval $financial_transactions] - -doc_body_append " + " -

Shipments

-
" - -set old_shipment_id 0 - -db_foreach shipments_items_products_select " - select s.shipment_id, s.address_id, s.shipment_date, s.expected_arrival_date, s.carrier, s.tracking_number, s.actual_arrival_date, s.actual_arrival_detail, - p.product_name, p.product_id, i.price_name, i.price_charged, count(*) as quantity - from ec_shipments s, ec_items i, ec_products p - where i.shipment_id=s.shipment_id - and i.product_id=p.product_id - and s.order_id=:order_id - group by s.shipment_id, s.address_id, s.shipment_date, s.expected_arrival_date, s.carrier, s.tracking_number, s.actual_arrival_date, s.actual_arrival_detail, - p.product_name, p.product_id, i.price_name, i.price_charged - order by s.shipment_id" { - if { $shipment_id != $old_shipment_id } { - if { $old_shipment_id != 0 } { - doc_body_append "" - } - doc_body_append " - - - - - -
- Shipment ID: $shipment_id
- Date: [util_AnsiDatetoPrettyDate $shipment_date]
- [ec_decode $expected_arrival_date "" "" "Expected Arrival: [util_AnsiDatetoPrettyDate $expected_arrival_date]
"] - [ec_decode $carrier "" "" "Carrier: $carrier
"] - [ec_decode $tracking_number "" "" "Tracking #: $tracking_number
"] - [ec_decode $actual_arrival_date "" "" "Actual Arrival Date: [util_AnsiDatetoPrettyDate $actual_arrival_date]
"] - [ec_decode $actual_arrival_detail "" "" "Actual Arrival Detail: $actual_arrival_detail
"] - (track) - 		- [ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $address_id]] -
-
    " - } - doc_body_append "
  • Quantity $quantity: $product_name
    • " - set old_shipment_id $shipment_id -} - -if { $old_shipment_id == 0 } { - doc_body_append "No Shipments Have Been Made" -} else { - doc_body_append "
" -} - -doc_body_append " -
" - set refunds [template::adp_compile -string {}] # Hack to not display ds stuff even if it's enabled, demo purposes regsub -all {\[::ds_show_p\]} $refunds 0 refunds -doc_body_append "[eval $refunds]" +append doc_body "[eval $refunds]" -if { $order_state != "void" } { - doc_body_append " -

Actions

- -[ad_admin_footer]" +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "One Order"] \ No newline at end of file