Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill.adp 18 Aug 2008 05:05:36 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill.adp 8 Sep 2008 12:34:47 -0000 1.2 @@ -4,7 +4,8 @@

@title@

- +@export_form_vars_html;noquote@ +@items_for_fulfillment;noquote@

Fulfillment date (required): @shipping_time_html;noquote@

Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl 18 Aug 2008 05:05:36 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl 8 Sep 2008 12:34:47 -0000 1.6 @@ -35,7 +35,7 @@ set shipping_time_html "[ad_dateentrywidget shipment_date] [ec_timeentrywidget shipment_time]" -if { ![string equal $shipping_method "no shipping" } { +if { ![string equal $shipping_method "no shipping"] } { set expected_arrival_time "[ad_dateentrywidget expected_arrival_date ""] [ec_timeentrywidget expected_arrival_time ""]" # carrier list is hardcoded because we need carrier names to be exactly what we have here for connecting to package tracking pages