X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=a5bceee8f906d0ff57c5aaab45c8f389042799dd;hb=2cce3a10f172ca1ee7150d80d80d98ecb7527d3b;hp=98340b8ce095b845acfbecc989e9d4c20a649218;hpb=d11f3b9f2da834281ab505d371d4b23bae80251a;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index 98340b8..a5bceee 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -52,7 +52,10 @@
     if ($role_string) echo " $role_string";
     if ($role & $GLOBALS['ROLE_DONOR']) printf(" <a class=\"small\" href=\"/donation/from/contact/%s/%d\">Donations</a>", urlencode($contact->getDisplayname()), $contact->getId());
     if ($role & $GLOBALS['ROLE_REQUESTER']) printf(" <a class=\"small\" href=\"/order/from/referrer/%s/%d\">Referred</a>", urlencode($contact->getDisplayname()), $contact->getId());
-    if ($role & $GLOBALS['ROLE_BENEFICIARY']) printf(" <a class=\"small\" href=\"/order/to/beneficiary/%s/%d\">Orders</a>", urlencode($contact->getDisplayname()), $contact->getId());
+    if ($role & $GLOBALS['ROLE_BENEFICIARY']) {
+      printf(" <a class=\"small\" href=\"/order/to/beneficiary/%s/%d\">Orders</a>", urlencode($contact->getDisplayname()), $contact->getId());
+      if (get_contact_area($contact)) printf(" <a class=\"small\" href=\"/order/place/for/beneficiary/%s/%d\">Place</a>", urlencode($contact->getDisplayname()), $contact->getId());
+    }
     if (check_admin(1)) {
       echo " " . $contact->getDeleteLink();
     }
@@ -174,9 +177,30 @@
   }
 
   function show_contact_form($contact = null, $new = false) {
-    global $contact_roles;
+    global $contact_roles, $parcel_sizes, $parcel_contents;
 
     if (! $contact) $contact = new Contact;
+    else if ($contact->getRole() & $GLOBALS['ROLE_BENEFICIARY']) {
+      $state_mask = $GLOBALS['STATE_ANY'];
+      $state_mask &= ~$GLOBALS['STATE_DELIVERED'];
+      $state_mask &= ~$GLOBALS['STATE_CANCELLED'];
+
+      $orders = get_contact_orders($contact, $state_mask);
+
+      if (count($orders)) {
+        echo "<tr>\n";
+        echo "  <td colspan=2><strong>Outstanding orders:</strong></td>\n";
+        echo "</tr>\n";
+
+        echo "<tr>\n";
+        echo "  <td colspan=2>\n";
+        foreach ($orders as $order) {
+          echo "    Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order) . "<br>\n";
+        }
+        echo "  </td>\n";
+        echo "</tr>\n";
+      }
+    }
 
     /* Role. */
     echo "<tr>\n";
@@ -259,6 +283,30 @@
     echo "  </select></td>\n";
     echo "</tr>\n";
 
+    /* Parcel type. */
+    echo "<tr>\n";
+    echo "  <td>Family unit</td>\n";
+    echo "  <td><select name=\"parcel_size\">\n";
+    $mask = 1 << count($parcel_sizes);
+    for ($i = 0; $i < count($parcel_sizes); $i++) {
+      option("parcel_size", 1 << $i, $parcel_sizes[$i], $contact->getParcel() % $mask);
+    }
+    echo "</select></td>\n";
+    echo "</tr>\n";
+
+    /* Parcel contents. */
+    echo "<tr>\n";
+    echo "  <td>Dietary requirements</td>\n";
+    echo "  <td>";
+    for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
+      if (1 << $i == $GLOBALS['PARCEL_TOILETRY']) continue;
+      echo "  <input type=\"checkbox\" name=\"parcel_$i\"";
+      if ($contact->getParcel() & (1 << $i)) echo " checked";
+      echo ">$parcel_contents[$i]\n";
+    }
+    echo "</td>\n";
+    echo "</tr>\n";
+
     /* Notes. */
     echo "<tr>\n";
     echo "  <td>Notes</td>\n";
@@ -310,7 +358,7 @@
   }
 
   function update_contact(&$contact, $area_id, $new = false) {
-    global $contact_roles;
+    global $contact_roles, $parcel_sizes, $parcel_contents;
 
     $role = 0;
     for ($i = 0; $i < count($contact_roles); $i++) {
@@ -343,6 +391,7 @@
     }
 
     /* Get address. */
+    $area_id = $_POST['area_id'];
     $line = $_POST['address'];
     $postcode = $_POST['postcode'];
     $q = new AddressQuery;
@@ -368,6 +417,10 @@
     $telephone1 = $_POST['telephone1'];
     $telephone2 = $_POST['telephone2'];
     $email = $_POST['email'];
+    $parcel = $_POST['parcel_size'];
+    for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
+      if ($_POST['parcel_' . $i] == "on") $parcel |= (1 << $i);
+    }
     $notes = $_POST['notes'];
 
     $contact->setRole($role);
@@ -378,6 +431,7 @@
     $contact->setTelephone1($telephone1);
     $contact->setTelephone2($telephone2);
     $contact->setEmail($email);
+    $contact->setParcel($parcel);
     $contact->setNotes($notes);
     $contact->setAddressId($address->getId());