<?php
if (isset($_POST['show_add_order'])) {
+ set_last_selected("area_id", $_POST['area_id']);
$area_id = $_POST['area_id'];
show_new_order_form($area_id);
}
else if (isset($_POST['add_order'])) {
+ set_last_selected("area_id", $_POST['area_id']);
$id = add_order();
if ($id !== false) {
echo "<p>Order placed.</p>\n";
}
}
else if ($_POST['show_in_area']) {
+ set_last_selected("area_id", $_POST['area_id']);
$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_query_uri(get_order_state_mask())));
+ header(sprintf("Location: http%s://%s/%s/in/area/%s/%d%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id'], get_order_state_query_uri(get_order_state_mask(), get_order_date_query_uri($_POST['from'], $_POST['to']))));
exit;
}
else if ($_POST['show_in_city']) {
+ set_last_selected("city_id", $_POST['city_id']);
$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_query_uri(get_order_state_mask())));
+ header(sprintf("Location: http%s://%s/%s/in/city/%s/%d%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id'], get_order_state_query_uri(get_order_state_mask()), get_order_date_query_uri($_POST['from'], $_POST['to'])));
exit;
}
- function show_orders($offset, $per_page, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
+ function show_orders($city_id = null, $area_id = null, $requester_ids = null, $beneficiary_ids = null, $state_mask = null, $from = null, $to = null) {
+ list($first_page, $per_page) = pagination();
/* XXX: Use Propel methods. */
if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
$q = new OrderQuery;
if (isset($beneficiary_ids)) $q->filterByBeneficiaryId($beneficiary_ids);
# XXX: Doesn't work.
#if (isset($state_mask)) $q->useOrderStateQuery()->addSelectQuery($latest_state, 'latestState')->where("order_id=latestState.order_id")->where("state & $state_mask")->endUse();
+ if (isset($city_id) || isset($area_id)) {
+ $q->joinWith('Order.Beneficiary');
+ $q->joinWith('Beneficiary.Address');
+ if (isset($area_id)) $q->where('Address.AreaId=?', $area_id);
+ if (isset($city_id)) {
+ $q->joinWith('Address.Area');
+ $q->where('Area.CityId=?', $city_id);
+ }
+ }
if (isset($state_mask)) $q->filterById($order_ids);
- $orders = $q->orderByDate()->find();
+ if (isset($from)) $q->where('Order.Date >= ?', $from);
+ if (isset($to)) $q->where('Order.Date <= ?', $to);
+ $orders = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
if (count($orders)) {
foreach ($orders as $order) {
echo "<br>\n" . get_order_summary($order) . "<br>\n";
}
+ show_pagination($orders);
}
else echo " none";
}
- function show_city_orders($offset, $per_page, $city_name, $city_id = null, $state_mask = null) {
+ function show_city_orders($city_name, $city_id = null, $state_mask = null, $from = null, $to = null) {
if (isset($city_id)) $city = get_city_by_id($city_id);
else if ($city_name) $city = get_city_by_name($city_name);
if ($city) {
- $contacts = get_city_contacts($city->getId(), $GLOBALS['ROLE_BENEFICIARY']);
- $beneficiary_ids = array();
- foreach ($contacts as $contact) $beneficiary_ids[] = $contact->getId();
-
echo "<p>Orders in city " . $city->getLink(get_city_displayname($city)) . ":";
- return show_orders($offset, $per_page, null, $beneficiary_ids, $state_mask);
+ return show_orders($city->getId(), null, null, null, $state_mask, $from, $to);
}
else echo "<p>No such city!</p>\n";
}
- function show_requester_orders($offset, $per_page, $contact_name, $contact_id = null, $state_mask = null) {
+ function show_requester_orders($contact_name, $contact_id = null, $state_mask = null, $from = null, $to = null) {
if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
else if ($contact_name) $contact = get_contact_by_name($contact_name);
if ($contact) {
echo "<p>Orders from referrer " . $contact->getLink() . ":";
- return show_orders($offset, $per_page, $contact->getId(), null, $state_mask);
+ return show_orders(null, null, $contact->getId(), null, $state_mask, $from, $to);
}
else echo "<p>No such contact!</p>\n";
}
- function show_beneficiary_orders($offset, $per_page, $contact_name, $contact_id = null, $state_mask = null) {
+ function show_beneficiary_orders($contact_name, $contact_id = null, $state_mask = null, $from = null, $to = null) {
if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
else if ($contact_name) $contact = get_contact_by_name($contact_name);
if ($contact) {
echo "<p>Orders to beneficiary " . $contact->getLink() . ":";
- return show_orders($offset, $per_page, null, $contact->getId(), $state_mask);
+ return show_orders(null, null, null, $contact->getId(), $state_mask, $from, $to);
}
else echo "<p>No such contact!</p>\n";
}
- function show_area_orders($offset, $per_page, $area_name, $area_id = null, $state_mask = null) {
+ function show_area_orders($area_name, $area_id = null, $state_mask = null, $from = null, $to = null) {
if (isset($area_id)) $area = get_area_by_id($area_id);
else if ($area_name) $area = get_area_by_name($area_name);
if ($area) {
- $contacts = get_area_contacts($area->getId(), $GLOBALS['ROLE_BENEFICIARY']);
- $contact_ids = array();
- foreach ($contacts as $contact) $contact_ids[] = $contact->getId();
-
echo "<p>Orders in area " . $area->getLink() . ":";
- return show_orders($offset, $per_page, null, $contact_ids, $state_mask);
+ return show_orders(null, $area->getId(), null, null, $state_mask, $from, $to);
}
else echo "<p>No such area!</p>\n";
}
echo "<p>Restrict to order states:\n";
for ($i = 0; $i < count($states); $i++) {
- echo " <input type=\"checkbox\" name=\"state_$i\"";
+ echo " <input type=\"checkbox\" id=\"state_$i\" name=\"state_$i\"";
if ($state_mask & (1 << $i)) echo " checked";
- echo ">$states[$i]\n";
+ echo "><label for=\"state_$i\">$states[$i]</label>\n";
}
echo "</p>\n";
}
return "/state/" . get_order_state_query_string($mask);
}
+ function get_order_date_query_uri($from, $to) {
+ $uri = "";
+ if ($from) $uri .= "/from/$from";
+ if ($to) $uri .= "/to/$to";
+
+ if (! $uri) return "";
+
+ return "/dated$uri";
+ }
+
function show_order_areas_form($city_id = null) {
$areas = get_city_areas($city_id);
if (! count($areas)) {
echo "<input type=\"submit\" name=\"show_in_city\" value=\"Show\">\n";
}
- function show_order_forms($city_id, $state_mask) {
+ function show_order_forms($city_id, $state_mask, $from = null, $to = null) {
form("noprint standout");
show_order_state_form($state_mask);
+ echo "<p>Restrict to orders for delivery between ";
+ datepicker("from", $from, true, null, false, "to");
+ echo " and ";
+ datepicker("to", $to, true, "from", false);
show_order_areas_form($city_id);
show_order_cities_form($city_id);
end_form();
echo " <td>Parcel contents</td>\n";
echo " <td>";
for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
- echo " <input type=\"checkbox\" name=\"parcel_$i\"";
+ echo " <input type=\"checkbox\" id=\"parcel_$i\" name=\"parcel_$i\"";
if ($order->getParcel() & (1 << $i)) echo " checked";
- echo ">$parcel_contents[$i]\n";
+ echo "><label for=\"parcel_$i\">$parcel_contents[$i]</label>\n";
}
echo "</td>\n";
echo "</tr>\n";
echo " <td>State</td>\n";
echo " <td><select name=\"state\">\n";
for ($i = 0; $i < count($states); $i++) {
- option("state", $i << 1, ucfirst($states[$i]), $state);
+ option("state", 1 << $i, ucfirst($states[$i]), $state);
}
echo "</select></td>\n";
echo "</tr>\n";
}
}
+ for ($i = 1; $i < count($parameters); $i++) {
+ if ($parameters[$i] == "dated") {
+ for ($j = $i + 1; $j < count($parameters) - 1; $j++) {
+ if ($parameters[$j] == "from") $from = $parameters[$j + 1];
+ if ($parameters[$j] == "to") $to = $parameters[$j + 1];
+ }
+
+ if ($from || $to) check_dates('order', $from, $to, false, false);
+ break;
+ }
+ }
+
if ($parameters[0] == "in") {
/* /order/in/area/Romsey+Town/1 */
switch ($parameters[1]) {
$area = $q->findOneById($area_id);
$city = get_area_city($area);
if ($city) $city_id = $city->getId();
- show_area_orders(0, 10, $parameters[2], $area_id, $state_mask);
+ show_area_orders($parameters[2], $area_id, $state_mask, $from, $to);
break;
case "city":
$_POST['city_id'] = $city_id;
$q = new CityQuery;
$city = $q->findOneById($city_id);
- show_city_orders(0, 10, $parameters[2], $city_id, $state_mask);
+ show_city_orders($parameters[2], $city_id, $state_mask, $from, $to);
break;
}
}
$contact_id = $parameters[3];
$q = new ContactQuery;
$contact = $q->findOneById($contact_id);
- show_requester_orders(0, 10, $parameters[2], $contact_id, $state_mask);
+ show_requester_orders($parameters[2], $contact_id, $state_mask, $from, $to);
break;
}
}
$contact_id = $parameters[3];
$q = new ContactQuery;
$hub = $q->findOneById($contact_id);
- show_beneficiary_orders(0, 10, $parameters[2], $contact_id, $state_mask);
+ show_beneficiary_orders($parameters[2], $contact_id, $state_mask, $from, $to);
break;
}
}
}
}
else if (isset($id)) show_order($id);
- else if ($state_mask) show_orders(0, 10, null, null, $state_mask);
+ else if ($state_mask) show_orders(null, null, null, null, $state_mask, $from, $to);
- show_order_forms($city_id, $state_mask);
+ show_order_forms($city_id, $state_mask, $from, $to);
show_add_new_order_form($city_id);
git://git.iain.cx/iain / readifood.git / blobdiff