X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdonation.php;h=a5036f312a4bd1e58d3a43c72ca2a185d3929b21;hb=f01f7f07701d082995cd4919d51449a2db2ed9bc;hp=4fc7a8d293d7b79c68e710be6454944453c985a5;hpb=99c95916fa6901a10f864f25f9a05f95d792902e;p=readifood.git
diff --git a/lib/donation.php b/lib/donation.php
index 4fc7a8d..a5036f3 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -43,11 +43,12 @@
exit;
}
- function show_donations($offset, $per_page, $contact_ids = null, $hub_ids = null) {
+ function show_donations($contact_ids = null, $hub_ids = null) {
+ list($first_page, $per_page) = pagination();
$q = new DonationQuery;
if (isset($contact_ids)) $q->filterByContactId($contact_ids);
if (isset($hub_ids)) $q->filterByHubId($hub_ids);
- $donations = $q->find();
+ $donations = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
if (count($donations)) {
foreach ($donations as $donation) {
echo "
\nDonation " . $donation->getStrongLink($donation->getId()) . ": " . get_donation_displayname($donation);
@@ -72,11 +73,12 @@
echo " " . $donation->getDeleteLink();
}
}
+ show_pagination($donations);
}
else echo " none";
}
- function show_city_donations($offset, $per_page, $city_name, $city_id = null) {
+ function show_city_donations($city_name, $city_id = null) {
if (isset($city_id)) $city = get_city_by_id($city_id);
else if ($city_name) $city = get_city_by_name($city_name);
if ($city) {
@@ -85,32 +87,32 @@
foreach ($hubs as $hub) $hub_ids[] = $hub->getId();
echo "
Donations in city " . $city->getLink(get_city_displayname($city)) . ":"; - return show_donations($offset, $per_page, null, $hub_ids); + return show_donations(null, $hub_ids); } else echo "
No such city!
\n"; } - function show_contact_donations($offset, $per_page, $contact_name, $contact_id = null) { + function show_contact_donations($contact_name, $contact_id = null) { if (isset($contact_id)) $contact = get_contact_by_id($contact_id); else if ($contact_name) $contact = get_contact_by_name($contact_name); if ($contact) { echo "Donations from contact " . $contact->getLink() . ":"; - return show_donations($offset, $per_page, $contact->getId()); + return show_donations($contact->getId()); } else echo "
No such contact!
\n"; } - function show_hub_donations($offset, $per_page, $hub_name, $hub_id = null) { + function show_hub_donations($hub_name, $hub_id = null) { if (isset($hub_id)) $hub = get_hub_by_id($hub_id); else if ($hub_name) $hub = get_hub_by_name($hub_name); if ($hub) { echo "Donations to hub " . $hub->getLink() . ":"; - return show_donations($offset, $per_page, null, $hub->getId()); + return show_donations(null, $hub->getId()); } else echo "
No such hub!
\n"; } - function show_area_donations($offset, $per_page, $area_name, $area_id = null) { + function show_area_donations($area_name, $area_id = null) { if (isset($area_id)) $area = get_area_by_id($area_id); else if ($area_name) $area = get_area_by_name($area_name); if ($area) { @@ -119,7 +121,7 @@ foreach ($hubs as $hub) $hub_ids[] = $hub->getId(); echo "Donations in area " . $area->getLink() . ":"; - return show_donations($offset, $per_page, null, $hub_ids); + return show_donations(null, $hub_ids); } else echo "
No such area!
\n"; } @@ -240,6 +242,31 @@ end_form(); } + function show_hub_donation_form($hub) { + if (! check_admin(1)) return; + + $area = get_hub_area($hub); + if (! $area) { + echo "No such area!
\n"; + return; + } + + $donation = new Donation; + $donation->setHubId($hub->getId()); + + form(); + echo "Record a donation:
\n"; + + echo ""; submit("add_donation", "Record"); echo " |
$name($id) " . print_r($args, true) . "
\n";