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;
}
+ $candidates = array();
+ foreach ($areas as $area) {
+ if (! count(get_area_contacts($area->getId()))) continue;
+ $candidates[] = $area;
+ }
+ if (! count($candidates)) return;
+
echo "<p>Show orders in area\n";
echo "<select name=\"area_id\">\n";
- foreach ($areas as $area) {
+ foreach ($candidates as $area) {
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
return;
}
+ $candidates = array();
+ foreach ($cities as $city) {
+ if (! count(get_city_contacts($city->getId()))) continue;
+ $candidates[] = $city;
+ }
+ if (! count($candidates)) return;
+
echo "<p>Show orders in city\n";
echo "<select name=\"city_id\">\n";
- foreach ($cities as $city) {
+ foreach ($candidates as $city) {
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
global $states, $parcel_sizes, $parcel_contents;
if ($order) {
- $q = new OrderStateQuery;
- $order_state = $q->filterByOrderId($order->getId())->orderByUpdated('desc')->limit(1)->findOne();
+ $order_state = get_order_state($order);
if ($order_state) {
$state = $order_state->getState();
$driver_id = $order_state->getDriverId();
}
else $order = new Order;
-
/* Date. */
echo "<tr>\n";
echo " <td>Delivery</td>\n";
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";
return $order->getId();
}
+ function confirm_delete_order($id = null) {
+ if (! check_admin(1, "delete an order")) return;
+
+ if (isset($id)) $order = get_order_by_id($id);
+ if (! $order) return false;
+
+ echo "<h3>Confirm deletion</h3>\n";
+ echo "<p>You must confirm deletion of order $id: " . $order->getDeleteLink(true) . "</p>\n";
+ }
+
function delete_order($id = null) {
if (! check_admin(1, "delete an order")) return;
if ($driver_id) $driver = get_contact_by_id($driver_id);
else $driver = null;
- /* XXX */
- $state = $order_state->getState();
- for ($i = 0; $i < count($states); $i++) {
- if ((1 << $i) == $state) {
- $state = $states[$i];
- break;
- }
- }
- #$state = $states[$order_state->getState()];
- echo "<strong>$username</strong> changed order to state <strong>$state</strong>";
+ echo "<strong>$username</strong> changed order to state <strong>" . get_order_state_string($order_state) . "</strong>";
if ($driver) echo " for driver " . $driver->getDisplayname();
echo " on $date.<br>\n";
}
if (count($args)) {
switch ($args[0]) {
case "delete":
+ confirm_delete_order($id);
+ break;
+
+ case "confirmdelete":
delete_order($id);
break;
}