X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=511e0cffea903ade8e8c7b0506f76efdbc4462dd;hb=068aa1997b31e7f46e66977693b751f5fbbcb2b7;hp=3727a65d5aa414e21a4271b920a7bb2e66c73d26;hpb=5f50c624101d671ec4147b3ad974c15178c6ebe5;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index 3727a65..511e0cf 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -175,6 +175,23 @@
     return $order;
   }
 
+  function get_order_ids_by_state($state_mask) {
+    $order_ids = array();
+    $dbh = Propel::getConnection();
+    $sth = $dbh->prepare("select * from OrderState o where updated=(select max(updated) from OrderState where order_id=o.order_id) and state & $state_mask");
+    $sth->execute();
+    $order_states = OrderStatePeer::populateObjects($sth);
+    foreach ($order_states as $order_state) $order_ids[] = $order_state->getOrderId();
+    return $order_ids;
+  }
+
+  function get_contact_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_user_by_contact_id($id, $verbose = true) {
     $q = new UserQuery;
     $user = $q->findOneByContactId($id);
@@ -246,6 +263,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);
@@ -384,15 +406,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";