X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdonation.php;h=e9c75dabe59b244bc41b93f04eba379658853468;hb=46a6490756496e873962e54db2ad1b68921cd3c8;hp=8a62a84ef7a5b03daee93b9c5bbbb9d94fd47bb3;hpb=6fdbfe32798452ec1c0fdbda57edabb892518409;p=readifood.git
diff --git a/lib/donation.php b/lib/donation.php
index 8a62a84..e9c75da 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -127,7 +127,6 @@
return;
}
- echo "
\n";
}
function show_donation_cities_form($city_id = null) {
@@ -147,7 +145,6 @@
return;
}
- echo "\n";
}
function show_donation_forms($city_id) {
+ form("noprint standout");
show_donation_areas_form($city_id);
show_donation_cities_form($city_id);
+ end_form();
}
function show_donation_form($donation = null, $area_id = null) {
@@ -197,7 +195,7 @@
/* Quantity. */
echo "\n";
echo " Quantity (kg) | \n";
- echo " "; input("quantity", $donation->getQuantity()); echo " | \n";
+ echo " "; input("quantity", sprintf("%0.2f", $donation->getQuantity() / 1000)); echo " | \n";
echo "
\n";
}
@@ -210,7 +208,7 @@
return;
}
- echo "\n";
+ end_form();
}
function show_add_new_donation_form() {
@@ -233,7 +231,7 @@
return;
}
- echo "\n";
+ end_form();
}
function update_donation(&$donation, $new = false) {
@@ -274,7 +272,7 @@
$donation->setDate($date);
$donation->setContactId($contact_id);
$donation->setHubId($hub_id);
- $donation->setQuantity($quantity);
+ $donation->setQuantity($quantity * 1000);
try {
$donation->save();
@@ -318,7 +316,7 @@
if (isset($id)) $donation = get_donation_by_id($id);
if (! $donation) return;
- echo "\n";
+ end_form();
}
if (count($parameters)) {
@@ -397,15 +395,8 @@
}
}
else if (isset($id)) show_donation($id);
- else {
- /* XXX: Shown after adding. */
- show_donation_forms($city_id);
- show_add_new_donation_form($city_id);
- }
-
- if (count($parameters)) {
- show_donation_forms($city_id);
- }
+ show_donation_forms($city_id);
+ show_add_new_donation_form($city_id);
?>