$orders = $q->orderByDate()->find();
if (count($orders)) {
foreach ($orders as $order) {
- echo "<br>\nOrder " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order);
- if (check_admin(1)) {
- echo " " . $order->getDeleteLink();
- }
-
- /* XXX: Should pull from query. */
- $q = new ContactQuery;
- $contact = $q->findOneById($order->getBeneficiaryId());
- if ($contact) {
- echo " for " . $contact->getLink();
- $area = get_contact_area($contact);
- if ($area) echo " in " . $area->getLink();
- }
-
- if ($order->getHubId()) {
- $q = new HubQuery;
- $hub = $q->findOneById($order->getHubId());
- if ($hub) echo " to hub " . $hub->getLink();
- $area = get_hub_area($hub);
- if ($area) echo " in " . $area->getLink();
- }
+ echo "<br>\n" . get_order_summary($order) . "<br>\n";
}
}
else echo " none";
}
function show_order_forms($city_id, $state_mask) {
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form("noprint standout");
show_order_state_form($state_mask);
show_order_areas_form($city_id);
show_order_cities_form($city_id);
- echo "</form>\n";
+ end_form();
}
function show_order_form($order = null, $area_id = null) {
foreach ($contacts as $contact) {
option("requester_id", $contact->getId(), $contact->getDisplayname(), $order->getRequesterId());
}
- echo "</select></td>\n";
+ echo "</select>";
+ $contact = get_contact_by_id($order->getRequesterId(), false);
+ if ($contact) echo " " . get_small_link($contact->getDisplayname(), $contact->getURL());
+ echo "</td>\n";
echo "</tr>\n";
/* Beneficiary. */
option("beneficiary_id", $contact->getId(), $contact->getDisplayname(), $order->getBeneficiaryId());
}
}
- echo "</select></td>\n";
+ echo "</select>";
+ $contact = get_contact_by_id($order->getBeneficiaryId(), false);
+ if ($contact) echo " " . get_small_link($contact->getDisplayname(), $contact->getURL());
+ echo "</td>\n";
echo "</tr>\n";
/* Hub. */
foreach ($hubs as $hub) {
option("hub_id", $hub->getId(), $hub->getDisplayname(), $order->getHubId());
}
- echo "</select></td>\n";
+ echo "</select>";
+ $hub = get_hub_by_id($order->getHubId(), false);
+ if ($hub) echo " " . get_small_link($hub->getDisplayname(), $hub->getURL());
+ echo "</td>\n";
echo "</tr>\n";
/* Parcel type. */
foreach ($contacts as $contact) {
option("driver_id", $contact->getId(), $contact->getDisplayname(), $driver_id);
}
- echo "</select></td>\n";
+ echo "</select>";
+ $contact = get_contact_by_id($driver_id, false);
+ if ($contact) echo " " . get_small_link($contact->getDisplayname(), $contact->getURL());
+ echo "</td>\n";
}
else echo " <td>No drivers!</td>\n";
echo "</tr>\n";
return;
}
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form("noprint");
echo "<p>Place an order:</p>\n";
echo "<table>\n";
echo " <td colspan=2>"; submit("add_order", "Order"); echo "</td></tr>\n";
echo "</tr>\n";
echo "</table>\n";
- echo "</form>\n";
+ end_form();
}
function show_contact_order_form($contact) {
$order = new Order;
$order->setBeneficiaryId($contact->getId());
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form("standout");
echo "<p>Placing order for " . $contact->getStrongLink() . ".";
$parcel = $contact->getParcel();
if ($parcel) {
echo " <td colspan=2>"; submit("add_order", "Order"); echo "</td></tr>\n";
echo "</tr>\n";
echo "</table>\n";
- echo "</form>\n";
+ end_form();
}
function show_add_new_order_form() {
return;
}
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form("noprint standout");
echo "<p>Place an order in <select name=\"area_id\">\n";
foreach ($areas as $area) {
option("area_id", $area->getId(), get_area_displayname($area));
echo "</select>";
submit("show_add_order", "Proceed");
echo "</p>\n";
- echo "</form>\n";
+ end_form();
}
function update_order(&$order, $new = false) {
if (! count($order_states)) return;
echo "<h3>Order history</h3>\n";
+ echo "<p class=\"history\">\n";
foreach ($order_states as $order_state) {
$date = $order_state->getUpdated();
}
}
#$state = $states[$order_state->getState()];
- echo "<p><strong>$username</strong> changed order to state <strong>$state</strong>";
+ echo "<strong>$username</strong> changed order to state <strong>$state</strong>";
if ($driver) echo " for driver " . $driver->getDisplayname();
- echo " on $date.</p>\n";
+ echo " on $date.<br>\n";
}
+ echo "</p>\n";
}
function show_order(&$id = null) {
if (isset($id)) $order = get_order_by_id($id);
if (! $order) return;
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form();
echo "<p>Order: <span class=\"strong\">" . $order->getId() . "</span>";
if (check_admin(1)) {
echo " " . $order->getDeleteLink();
}
echo "</table>\n";
- echo "</form>\n";
+ end_form();
show_order_history($order->getId());
}
}
else if (isset($id)) show_order($id);
else if ($state_mask) show_orders(0, 10, null, null, $state_mask);
- else {
- /* XXX: Shown after adding. */
- show_order_forms($city_id, $state_mask);
- show_add_new_order_form($city_id);
- }
- if (count($parameters)) {
- show_order_forms($city_id, $state_mask);
- }
+ show_order_forms($city_id, $state_mask);
+ show_add_new_order_form($city_id);
?>