Index: openacs-4/packages/ecommerce/www/admin/orders/track.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/track.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/orders/track.tcl	1 Jan 2009 12:37:22 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/orders/track.tcl	1 Jan 2009 15:22:41 -0000	1.8
@@ -15,10 +15,30 @@
 set title "Track Shipment"
 set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-db_1row shipment_select "select to_char(shipment_date, 'MMDDYY') as ship_date_for_fedex, to_char(shipment_date, 'MM/DD/YYYY') as pretty_ship_date, carrier, tracking_number
+set carrier_list [db_list get_carrier_list "
+    select distinct carrier
+    from ec_shipments 
+    where carrier is not null
+    order by carrier"]
+
+
+
+db_1row shipment_select "select to_char(shipment_date, 'MMDDYY') as ship_date_for_fedex, to_char(shipment_date, 'MM/DD/YYYY') as pretty_ship_date, carrier, tracking_number, expected_arrival_date, order_id
 from ec_shipments
 where shipment_id = :shipment_id"
 
+set export_form_vars_html [export_form_vars shipment_id order_id]
+
+set carrier_select_html "<select name=\"carrier\">"
+foreach carrier_choice $carrier_list {
+    if {$carrier_choice eq $carrier} {
+        append carrier_select_html "<option value=\"$carrier_choice\" selected>$carrier_choice</option>"
+    } else {
+        append carrier_select_html "<option value=\"$carrier_choice\">$carrier_choice</option>"
+    }
+}
+append carrier_select_html "</select>"
+
 set carrier_info ""
 
 if { $carrier == "FedEx" } {
@@ -35,7 +55,7 @@
         
         if { ![info exists status] || $status ne "200" } {
             # no page info returned, just return error
-            ns_log Warning "ecommerce/www/admin/orders/track.tcl Unable to retrieve FedEx data for ${tracking_number}. Error is $errmsg"
+            ns_log Warning "ecommerce/www/admin/orders/track.tcl Unable to retrieve FedEx data for ${tracking_number}. Error is $err"
         } else {
             # Received page, Remove links
             set scan_activity [ecds_get_contents_from_tag {<!-- BEGIN Scan Activity -->} {<!-- END Scan Activity -->} $page_from_fedex]
@@ -62,3 +82,13 @@
 }
 set carrier_name [ec_decode $carrier "" "Carrier" $carrier]
 set carrier_tracking_info [ec_decode $carrier_info "" "Unvailable to retrieve details for this carrier." $carrier_info]
+if { ![info exists expected_arrival_date] } {
+    set expected_arrival_date 0
+    set expected_arrival_time "5:00:00 PM"
+} else {
+    regsub {[ ]+} $expected_arrival_date { } expected_arrival_date
+    set expected_arrival_date_list [split $expected_arrival_date " "]
+    set expected_arrival_date [lindex $expected_arrival_date_list 0]
+    set expected_arrival_time [lindex $expected_arrival_date_list 1]
+}
+set expected_arrival_html "[ad_dateentrywidget expected_arrival_date $expected_arrival_date] [ec_timeentrywidget expected_arrival_time $expected_arrival_time]"
\ No newline at end of file