X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Forder.php;h=cb40f6314a63e055ef204d87169bedab7a06eaaa;hb=5f50c624101d671ec4147b3ad974c15178c6ebe5;hp=8b1bbcd1c68137911260d69ba75a413d13d36acc;hpb=6fdbfe32798452ec1c0fdbda57edabb892518409;p=readifood.git
diff --git a/lib/order.php b/lib/order.php
index 8b1bbcd..cb40f63 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -101,7 +101,7 @@
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 "
Orders from requester " . $contact->getLink() . ":";
+ echo "
Orders from referrer " . $contact->getLink() . ":";
return show_orders($offset, $per_page, $contact->getId(), null, $state_mask);
}
else echo "
No such contact!
\n";
@@ -230,12 +230,15 @@
}
function show_order_form($order = null, $area_id = null) {
- global $states;
+ global $states, $parcel_sizes, $parcel_contents;
if ($order) {
$q = new OrderStateQuery;
$order_state = $q->filterByOrderId($order->getId())->orderByUpdated('desc')->limit(1)->findOne();
- if ($order_state) $state = $order_state->getState();
+ if ($order_state) {
+ $state = $order_state->getState();
+ $driver_id = $order_state->getDriverId();
+ }
}
else $order = new Order;
@@ -244,12 +247,19 @@
echo "\n";
echo " Delivery | \n";
/* XXX: Find suitable dates from area. */
- echo " "; show_date_form("date", $order->getDate()); echo " | \n";
+ echo " ";
+ show_date_form("date", $order->getDate());
+ if (! $order->getDate()) {
+ echo " and recur for weeks";
+ }
+ echo " | \n";
echo "
\n";
- /* Requester. */
+ /* Referrer. */
echo "\n";
- echo " Requester | \n";
+ echo " Referrer | \n";
echo " |