X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=ef8c335f7eaa2555fd5d245c07c8e75e3c73c3dc;hb=6618cd51a335fa7413d58606cec3600f8f4a805d;hp=166fd9784b98ca8a5d84f5c443dcea8fc17b8afc;hpb=8549c1776033e924ea50328bd2434529d85b5669;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index 166fd97..ef8c335 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -44,19 +44,25 @@
     exit;
   }
 
-  function show_contact_summary(&$contact) {
-    echo "<br>\nContact " . $contact->getLink();
+  function show_contact_summary(&$contact, $editing = false) {
+    if ($editing) echo "<p>Contact: <span class=\"strong\">" . htmlspecialchars($contact->getDisplayname()) . "</span>";
+    else echo "<br>\nContact " . $contact->getStrongLink();
     $role = $contact->getRole();
     $role_string = get_contact_role_string($contact);
     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();
     }
     $area = get_contact_area($contact);
     echo " in " . $area->getLink();
+    $city = get_contact_city($contact);
+    echo ", " . $city->getLink(get_city_displayname($city));
   }
 
   function show_contacts($offset, $per_page, $address_ids) {
@@ -170,7 +176,7 @@
     return show_role_form($role, $GLOBALS['contact_roles']);
   }
 
-  function show_contact_form($contact = null) {
+  function show_contact_form($contact = null, $new = false) {
     global $contact_roles;
 
     if (! $contact) $contact = new Contact;
@@ -181,6 +187,14 @@
     echo "  <td>"; show_contact_role_form($contact->getRole()); echo "</td>\n";
     echo "</tr>\n";
 
+    /* Date added. */
+    if (! $new) {
+      echo "<tr>\n";
+      echo "  <td>Registered</td>\n";
+      echo "  <td>" . $contact->getAdded() . "</td>\n";
+      echo "</tr>\n";
+    }
+
     /* Forename. */
     echo "<tr>\n";
     echo "  <td>Forename</td>\n";
@@ -247,6 +261,12 @@
     }
     echo "  </select></td>\n";
     echo "</tr>\n";
+
+    /* Notes. */
+    echo "<tr>\n";
+    echo "  <td>Notes</td>\n";
+    echo "  <td><textarea name=\"notes\">" . $contact->getNotes() . "</textarea></td>\n";
+    echo "</tr>\n";
   }
 
   function show_new_contact_form($city_id = null) {
@@ -262,7 +282,7 @@
     echo "<p>Add a new contact:</p>\n";
 
     echo "<table>\n";
-    show_contact_form($contact);
+    show_contact_form($contact, true);
 
     echo "<tr>\n";
     echo "  <td colspan=2>"; submit("add_contact", "Add"); echo "</td></tr>\n";
@@ -351,6 +371,7 @@
     $telephone1 = $_POST['telephone1'];
     $telephone2 = $_POST['telephone2'];
     $email = $_POST['email'];
+    $notes = $_POST['notes'];
 
     $contact->setRole($role);
     $contact->setForename($forename);
@@ -360,6 +381,7 @@
     $contact->setTelephone1($telephone1);
     $contact->setTelephone2($telephone2);
     $contact->setEmail($email);
+    $contact->setNotes($notes);
     $contact->setAddressId($address->getId());
 
     try {
@@ -422,18 +444,7 @@
     if (! $contact) return;
 
     echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
-    echo "<p>Contact: <span class=\"strong\">" . $contact->getDisplayname() . "</span>";
-    $role = $contact->getRole();
-    $role_string = get_contact_role_string($contact);
-    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 (check_admin(1)) {
-      echo " " . $contact->getDeleteLink();
-    }
-    $city = get_contact_city($contact);
-    if ($city) echo " in " . $city->getLink(get_city_displayname($city));
+    show_contact_summary($contact, true);
     echo ": ";
     echo "\n</p>";