X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffunctions.php;h=ecaf2adfdc561d1ee481c8c79c4dc91307b23477;hb=cc703b79a6e9d646b44bdf63df58b48162b80856;hp=e970f54c529faaa6e2f6a9fabd93e7cf27ff4e7a;hpb=1f7a83666984030585efbd902006bd797da66ebc;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index e970f54..ecaf2ad 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -219,7 +219,7 @@
   function get_order_parcel_string($order) {
     global $parcel_sizes, $parcel_contents;
 
-    $parcel_size = "";
+    $parcel_size = null;
     for ($i = 0 ; $i < count($parcel_sizes); $i++) {
       if ($order->getParcel() & (1 << $i)) {
         $parcel_size = $parcel_sizes[$i];
@@ -232,13 +232,50 @@
       if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
     }
 
-    return implode(": ", array($parcel_size, implode(", ", $selected)));
+    $ret = implode(": ", array($parcel_size, implode(", ", $selected)));
+    $ret = preg_replace('/^: /', '', $ret);
+    $ret = preg_replace('/: $/', '', $ret);
+
+    return $ret;
   }
 
   function get_order_displayname($order) {
     return sprintf("<span class=\"small\">%s</span> on %s", get_order_parcel_string($order), $order->getDate());
   }
 
+  function get_order_summary($order) {
+    $ret = "Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order);
+
+    if (check_admin(1)) $ret .= " " . $order->getDeleteLink();
+
+    /* XXX: Should pull from query. */
+    $q = new ContactQuery;
+    $contact = $q->findOneById($order->getRequesterId());
+    if ($contact) {
+      $ret .= " referred by " . $contact->getLink();
+      $area = get_contact_area($contact);
+      if ($area) $ret .= " in " . $area->getLink();
+    }
+
+    $q = new ContactQuery;
+    $contact = $q->findOneById($order->getBeneficiaryId());
+    if ($contact) {
+      $ret .= " for " . $contact->getLink();
+      $area = get_contact_area($contact);
+      if ($area) $ret .= " in " . $area->getLink();
+    }
+
+    if ($order->getHubId()) {
+      $q = new HubQuery;
+      $hub = $q->findOneById($order->getHubId());
+      if ($hub) $ret .= " to hub " . $hub->getLink();
+      $area = get_hub_area($hub);
+      if ($area) $ret .= " in " . $area->getLink();
+    }
+
+    return $ret;
+  }
+
   function get_address_area($address) {
     $q = new AreaQuery;
     return $q->findOneById($address->getAreaId());