X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=801ed7806b61e1d0c29c80aed65ade172a0a074b;hb=0fd77b357d1868a57756e91f9e71dfa3b3db26b8;hp=86c81400e58706238ac2cdd424f498c9ff52c21d;hpb=8549c1776033e924ea50328bd2434529d85b5669;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index 86c8140..801ed78 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -196,11 +196,30 @@
   }
 
   function get_donation_displayname($donation) {
-    return $donation->getQuantity() . "kg on " . $donation->getDate();
+    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 $order->getQuantity() . "kg on " . $order->getDate();
+    return sprintf("<span class=\"small\">%s</span> on %s", get_order_parcel_string($order), $order->getDate());
   }
 
   function get_address_area($address) {
@@ -227,6 +246,11 @@
     return get_area_city($area);
   }
 
+  /* Parcel strings are the same so this can work. */
+  function get_contact_parcel_string($contact) {
+    return get_order_parcel_string($contact);
+  }
+
   /* Hub and Contact are similar enough that this can work. */
   function get_hub_address($hub) {
     return get_contact_address($hub);
@@ -365,15 +389,22 @@
   }
 
   function show_date_form($name, $date = null) {
+    $past = 60;
+    $future = 60;
     echo "<select name=\"$name\">\n";
-    $now = time();
+    $now = date('Y-m-d', time());
+    list($y, $m, $d) = explode('-', $now);
+    $today = mktime(0, 0, 0, $m, $d, $y);
     if (isset($date)) {
       list($y, $m, $d) = explode('-', $date);
       $then = mktime(0, 0, 0, $m, $d, $y);
-      option($name, $date, date('l j F Y', $then), $date);
+      if ($then < $today - 86400 * $past || $then > $today + 86400 * $future) {
+        option($name, $date, date('l j F Y', $then), $date);
+      }
     }
-    for ($i = 0; $i < 60; $i++) {
-      $then = $now + 86400 * $i;
+    else $date = $now;
+    for ($i = -$past; $i < $future; $i++) {
+      $then = $today + 86400 * $i;
       option($name, date('Y-m-d', $then), date('l j F Y', $then), $date);
     }
     echo "</select>\n";