X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=a4610a7330cb3c330b45550d8433db3f88ed9863;hb=0925aeead950582ca1136feeb597730086bec498;hp=c56102389c997839848861a5af966faf192320b6;hpb=4cd13bda037940724f018b8bfc62413156c52b75;p=readifood.git
diff --git a/lib/contact.php b/lib/contact.php
index c561023..a4610a7 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -129,15 +129,20 @@
return;
}
- echo "
\n";
}
function show_contact_cities_form($city_id = null) {
@@ -149,29 +154,34 @@
return;
}
- echo "\n";
}
function show_contact_search_form() {
- echo "\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) {
@@ -182,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'];
@@ -195,9 +205,9 @@
echo "\n";
echo "\n";
- echo " \n";
+ echo " | \n";
foreach ($orders as $order) {
- echo " Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order) . " \n";
+ echo " " . get_order_summary($order) . " \n";
}
echo " | \n";
echo "
\n";
@@ -253,7 +263,7 @@
/* Postcode. */
echo "\n";
echo " Postcode | \n";
- echo " "; input("postcode", $address->getPostcode()); echo " | \n";
+ echo " "; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo " | \n";
echo "
\n";
/* Telephone. */
@@ -312,7 +322,7 @@
/* Notes. */
echo "\n";
echo " Notes | \n";
- echo " | \n";
+ echo " "; textarea("notes", $contact->getNotes()); echo " | \n";
echo "
\n";
}
@@ -325,7 +335,7 @@
return;
}
- echo "\n";
+ end_form();
}
function show_add_new_contact_form() {
@@ -348,7 +358,7 @@
return;
}
- echo "\n";
+ end_form();
}
function update_contact(&$contact, $area_id, $new = false) {
@@ -496,7 +506,7 @@
else $contact = get_contact_by_name($name);
if (! $contact) return;
- echo "\n";
+ end_form();
}
/* /contact/in/area/Cambridge/1 */
@@ -538,8 +548,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]);
@@ -555,14 +563,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);
?>