X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=73ea46443743007dd483b8a2d5d80bc6dd888516;hb=8d1046edac05814d1a7ddd4d55aa356a46d06685;hp=ecaf2adfdc561d1ee481c8c79c4dc91307b23477;hpb=cc703b79a6e9d646b44bdf63df58b48162b80856;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index ecaf2ad..73ea464 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -185,13 +185,27 @@
     return $order_ids;
   }
 
-  function get_contact_orders($contact, $state_mask = null) {
+  function get_beneficiary_orders($contact, $state_mask = null) {
     $q = new OrderQuery;
     $q->filterByBeneficiaryId($contact->getId());
     if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
     return $q->orderByDate()->find();
   }
 
+  function get_requester_orders($contact, $state_mask = null) {
+    $q = new OrderQuery;
+    $q->filterByRequesterId($contact->getId());
+    if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
+    return $q->orderByDate()->find();
+  }
+
+  function get_contact_orders($contact, $state_mask = null) {
+    $q = new OrderQuery;
+    $q->filterByBeneficiaryId($contact->getId())->_or()->filterByRequesterId($contact->getId());
+    if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
+    return $q->orderByDate()->find();
+  }
+
   function get_user_by_contact_id($id, $verbose = true) {
     $q = new UserQuery;
     $user = $q->findOneByContactId($id);
@@ -243,8 +257,30 @@
     return sprintf("<span class=\"small\">%s</span> on %s", get_order_parcel_string($order), $order->getDate());
   }
 
+  function get_order_state_string($order_state = null) {
+    global $states;
+
+    if (is_null($order_state)) return null;
+
+    for ($i = 0; $i < count($states); $i++) {
+      if ($order_state->getState() & (1 << $i)) {
+        return $states[$i];
+      }
+    }
+
+    return "unknown";
+  }
+
+  function get_order_state($order) {
+    $q = new OrderStateQuery();
+    return $q->filterByOrderId($order->getId())->orderByUpdated('desc')->findOne();
+  }
+
   function get_order_summary($order) {
-    $ret = "Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order);
+    $ret = "Order ";
+    $order_state = get_order_state($order);
+    if ($order_state) $ret = "<strong>" . ucfirst(get_order_state_string($order_state)) . "</strong> order ";
+    $ret .= $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order);
 
     if (check_admin(1)) $ret .= " " . $order->getDeleteLink();
 
@@ -281,6 +317,13 @@
     return $q->findOneById($address->getAreaId());
   }
 
+  function get_address_map_link($address) {
+    $postcode = trim($address->getPostcode());
+    if ($postcode) {
+      return " " . get_small_link("Map", "http://maps.google.co.uk/maps?q=" . urlencode($postcode));
+    }
+  }
+
   function get_contact_address($contact) {
     $q = new AddressQuery;
     return $q->findOneById($contact->getAddressId());