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

diff --git a/lib/contact.php b/lib/contact.php
index 170d342..2dd65ab 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -44,19 +44,27 @@
     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/requester/%s/%d\">Requested</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());
+    $d = urlencode($contact->getDisplayname());
+    $i = $contact->getId();
+    if ($role & $GLOBALS['ROLE_DONOR']) echo " " . get_small_link("Donations", "/donation/from/contact/%s/%d", $d, $i);
+    if ($role & $GLOBALS['ROLE_REQUESTER']) echo " " . get_small_link("Referred", "/order/from/referrer/%s/%d", $d, $i);
+    if ($role & $GLOBALS['ROLE_BENEFICIARY']) {
+      echo " " . get_small_link("Orders", "/order/to/beneficiary/%s/%d", $d, $contact->getId());
+      if (get_contact_area($contact)) echo " " . get_small_link("Place", "/order/place/for/beneficiary/%s/%d", $d, $i);
+    }
     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) {
@@ -121,7 +129,6 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Show contacts in area\n";
     echo "<select name=\"area_id\">\n";
     foreach ($areas as $area) {
@@ -129,7 +136,6 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
   }
 
   function show_contact_cities_form($city_id = null) {
@@ -141,7 +147,6 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Show contacts in city\n";
     echo "<select name=\"city_id\">\n";
     foreach ($cities as $city) {
@@ -149,37 +154,51 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
   }
 
   function show_contact_search_form() {
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Search for contacts:";
     input("search_contact");
     echo "<input type=\"submit\" value=\"Search\">\n";
-    echo "</form>\n";
   }
 
   function show_contact_forms($city_id) {
+    form("noprint standout");
     show_contact_areas_form($city_id);
     show_contact_cities_form($city_id);
     show_contact_search_form();
+    end_form();
   }
 
   function show_contact_role_form($role) {
-    global $roles;
-
-    for ($i = 0; $i < count($roles); $i++) {
-      echo " <input type=\"checkbox\" name=\"role_$i\"";
-      if ($role & (1 << $i)) echo " checked";
-      echo ">$roles[$i]\n";
-    }
+    return show_role_form($role, $GLOBALS['contact_roles']);
   }
 
-  function show_contact_form($contact = null) {
-    global $roles;
+  function show_contact_form($contact = null, $new = false) {
+    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";
@@ -187,6 +206,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";
@@ -253,6 +280,36 @@
     }
     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";
+    echo "  <td><textarea name=\"notes\">" . $contact->getNotes() . "</textarea></td>\n";
+    echo "</tr>\n";
   }
 
   function show_new_contact_form($city_id = null) {
@@ -264,17 +321,17 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint");
     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";
     echo "</tr>\n";
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function show_add_new_contact_form() {
@@ -287,7 +344,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
     echo "<p>Add a new contact in <select name=\"city_id\">\n";
     foreach ($cities as $city) {
       option("city_id", $city->getId(), get_city_displayname($city));
@@ -295,14 +352,14 @@
     echo "</select>";
     submit("show_add_contact", "Proceed");
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function update_contact(&$contact, $area_id, $new = false) {
-    global $roles;
+    global $contact_roles, $parcel_sizes, $parcel_contents;
 
     $role = 0;
-    for ($i = 0; $i < count($roles); $i++) {
+    for ($i = 0; $i < count($contact_roles); $i++) {
       if ($_POST['role_' . $i] == "on") $role |= (1 << $i);
     }
 
@@ -332,6 +389,7 @@
     }
 
     /* Get address. */
+    $area_id = $_POST['area_id'];
     $line = $_POST['address'];
     $postcode = $_POST['postcode'];
     $q = new AddressQuery;
@@ -357,6 +415,11 @@
     $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);
     $contact->setForename($forename);
@@ -366,6 +429,8 @@
     $contact->setTelephone1($telephone1);
     $contact->setTelephone2($telephone2);
     $contact->setEmail($email);
+    $contact->setParcel($parcel);
+    $contact->setNotes($notes);
     $contact->setAddressId($address->getId());
 
     try {
@@ -427,19 +492,8 @@
     else $contact = get_contact_by_name($name);
     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/requester/%s/%d\">Requested</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));
+    form();
+    show_contact_summary($contact, true);
     echo ": ";
     echo "\n</p>";
 
@@ -455,7 +509,7 @@
     }
 
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   /* /contact/in/area/Cambridge/1 */
@@ -480,8 +534,6 @@
           show_city_contacts(0, 10, $parameters[2], $city_id);
         break;
       }
-
-      show_add_new_contact_form($city_id);
     }
     else if ($parameters[0] == "search") {
       search_contacts(0, 10, $parameters[1]);
@@ -497,14 +549,8 @@
     }
   }
   else if (isset($name)) show_contact($name, $id);
-  else {
-    /* XXX: Shown after adding. */
-    show_contact_forms($city_id);
-    show_add_new_contact_form($city_id);
-  }
 
-  if (count($parameters)) {
-    show_contact_forms($city_id);
-  }
+  show_contact_forms($city_id);
+  show_add_new_contact_form($city_id);
 
 ?>