else if ($_POST['show_in_area']) {
$q = new AreaQuery;
$area = $q->findOneById($_POST['area_id']);
- header(sprintf("Location: http%s://%s/%s/in/area/%s/%d%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id'], get_order_state_uri(get_order_state_mask())));
+ header(sprintf("Location: http%s://%s/%s/in/area/%s/%d%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id'], get_order_state_query_uri(get_order_state_mask())));
exit;
}
else if ($_POST['show_in_city']) {
$q = new CityQuery;
$city = $q->findOneById($_POST['city_id']);
- header(sprintf("Location: http%s://%s/%s/in/city/%s/%d%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id'], get_order_state_uri(get_order_state_mask())));
+ header(sprintf("Location: http%s://%s/%s/in/city/%s/%d%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id'], get_order_state_query_uri(get_order_state_mask())));
exit;
}
return $mask;
}
- function get_order_state_string($mask) {
+ function get_order_state_query_string($mask) {
global $states;
$selected = array();
return implode("+", $selected);
}
- function get_order_state_uri($mask) {
+ function get_order_state_query_uri($mask) {
global $all_states;
if (is_null($mask)) return "";
if ($mask == $all_states) return "";
- return "/state/" . get_order_state_string($mask);
+ return "/state/" . get_order_state_query_string($mask);
}
function show_order_areas_form($city_id = null) {
echo "</td>\n";
echo "</tr>\n";
+ /* Notes. */
+ echo "<tr>\n";
+ echo " <td>Notes</td>\n";
+ echo " <td>"; textarea("notes", $order->getNotes()); echo "</td>\n";
+ echo "</tr>\n";
+
/* Driver. */
echo "<tr>\n";
echo " <td>Driver</td>\n";
for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
if ($_POST['parcel_' . $i] == "on") $parcel |= (1 << $i);
}
+ $notes = $_POST['notes'];
if ($date) {
list($y, $m, $d) = explode('-', $date);
$order->setBeneficiaryId($beneficiary_id);
$order->setHubId($hub_id);
$order->setParcel($parcel);
+ $order->setNotes($notes);
/* XXX: begin/commit */
try {