X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=3727a65d5aa414e21a4271b920a7bb2e66c73d26;hb=6618cd51a335fa7413d58606cec3600f8f4a805d;hp=f9da7135af116ea51ddbe2fd9f2c7b6457e336dd;hpb=637bc9bc7d65b625a322385b5700bfc169f877c0;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index f9da713..3727a65 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -199,8 +199,27 @@
     return sprintf("%0.2fkg on %s", $donation->getQuantity() / 1000, $donation->getDate());
   }
 
+  function get_order_parcel_string($order) {
+    global $parcel_sizes, $parcel_contents;
+
+    $parcel_size = "";
+    for ($i = 0 ; $i < count($parcel_sizes); $i++) {
+      if ($order->getParcel() & (1 << $i)) {
+        $parcel_size = $parcel_sizes[$i];
+        break;
+      }
+    }
+
+    $selected = array();
+    for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
+      if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
+    }
+
+    return implode(": ", array($parcel_size, implode(", ", $selected)));
+  }
+
   function get_order_displayname($order) {
-    return sprintf("%0.2fkg on %s", $order->getQuantity() / 1000, $order->getDate());
+    return sprintf("<span class=\"small\">%s</span> on %s", get_order_parcel_string($order), $order->getDate());
   }
 
   function get_address_area($address) {