X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=a4610a7330cb3c330b45550d8433db3f88ed9863;hb=0925aeead950582ca1136feeb597730086bec498;hp=2dd65ab101cb9bf36d8ffbbab856e08f1704cdd7;hpb=6bd4ad3daf2cc870d96a3fed9ea9caf6798d2b78;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index 2dd65ab..a4610a7 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -129,9 +129,16 @@
       return;
     }
 
+    $candidates = array();
+    foreach ($areas as $area) {
+      if (! count(get_area_contacts($area->getId()))) continue;
+      $candidates[] = $area;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show contacts in area\n";
     echo "<select name=\"area_id\">\n";
-    foreach ($areas as $area) {
+    foreach ($candidates as $area) {
       option("area_id", $area->getId(), get_area_displayname($area));
     }
     echo "</select>\n";
@@ -147,9 +154,16 @@
       return;
     }
 
+    $candidates = array();
+    foreach ($cities as $city) {
+      if (! count(get_city_contacts($city->getId()))) continue;
+      $candidates[] = $city;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show contacts in city\n";
     echo "<select name=\"city_id\">\n";
-    foreach ($cities as $city) {
+    foreach ($candidates as $city) {
       option("city_id", $city->getId(), get_city_displayname($city), $city_id);
     }
     echo "</select>\n";
@@ -178,7 +192,7 @@
     global $contact_roles, $parcel_sizes, $parcel_contents;
 
     if (! $contact) $contact = new Contact;
-    else if ($contact->getRole() & $GLOBALS['ROLE_BENEFICIARY']) {
+    else if ($contact->getRole() & ($GLOBALS['ROLE_BENEFICIARY'] | $GLOBALS['ROLE_REQUESTER'])) {
       $state_mask = $GLOBALS['STATE_ANY'];
       $state_mask &= ~$GLOBALS['STATE_DELIVERED'];
       $state_mask &= ~$GLOBALS['STATE_CANCELLED'];
@@ -191,9 +205,9 @@
         echo "</tr>\n";
 
         echo "<tr>\n";
-        echo "  <td colspan=2>\n";
+        echo "  <td colspan=2 class=\"history\">\n";
         foreach ($orders as $order) {
-          echo "    Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order) . "<br>\n";
+          echo "    " . get_order_summary($order) . "<br>\n";
         }
         echo "  </td>\n";
         echo "</tr>\n";
@@ -249,7 +263,7 @@
     /* Postcode. */
     echo "<tr>\n";
     echo "  <td>Postcode</td>\n";
-    echo "  <td>"; input("postcode", $address->getPostcode()); echo "</td>\n";
+    echo "  <td>"; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo "</td>\n";
     echo "</tr>\n";
 
     /* Telephone. */
@@ -308,7 +322,7 @@
     /* Notes. */
     echo "<tr>\n";
     echo "  <td>Notes</td>\n";
-    echo "  <td><textarea name=\"notes\">" . $contact->getNotes() . "</textarea></td>\n";
+    echo "  <td>"; textarea("notes", $contact->getNotes()); echo "</td>\n";
     echo "</tr>\n";
   }