git://git.iain.cx/iain
/
readifood.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filter area and city searches.
[readifood.git]
/
lib
/
contact.php
diff --git
a/lib/contact.php
b/lib/contact.php
index
2dd65ab
..
b33c97a
100644
(file)
--- a/
lib/contact.php
+++ b/
lib/contact.php
@@
-129,9
+129,16
@@
return;
}
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";
echo "<p>Show contacts in area\n";
echo "<select name=\"area_id\">\n";
- foreach ($
area
s as $area) {
+ foreach ($
candidate
s as $area) {
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
@@
-147,9
+154,16
@@
return;
}
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";
echo "<p>Show contacts in city\n";
echo "<select name=\"city_id\">\n";
- foreach ($c
iti
es as $city) {
+ foreach ($c
andidat
es as $city) {
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
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;
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'];
$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 "</tr>\n";
echo "<tr>\n";
- echo " <td colspan=2>\n";
+ echo " <td colspan=2
class=\"history\"
>\n";
foreach ($orders as $order) {
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";
}
echo " </td>\n";
echo "</tr>\n";
@@
-308,7
+322,7
@@
/* Notes. */
echo "<tr>\n";
echo " <td>Notes</td>\n";
/* 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";
}
echo "</tr>\n";
}