}
function get_donation_displayname($donation) {
- return $donation->getQuantity() . "kg on " . $donation->getDate();
+ return sprintf("%0.2fkg on %s", $donation->getQuantity() / 1000, $donation->getDate());
+ }
+
+ function get_order_parcel_string($order) {
+ global $parcel_sizes, $parcel_contents;
+
+ $parcel_size = "";
+ for ($i = 0 ; $i < count($parcel_sizes); $i++) {
+ if ($order->getParcel() & (1 << $i)) {
+ $parcel_size = $parcel_sizes[$i];
+ break;
+ }
+ }
+
+ $selected = array();
+ for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
+ if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
+ }
+
+ return implode(": ", array($parcel_size, implode(", ", $selected)));
}
function get_order_displayname($order) {
- return $order->getQuantity() . "kg on " . $order->getDate();
+ return sprintf("<span class=\"small\">%s</span> on %s", get_order_parcel_string($order), $order->getDate());
}
function get_address_area($address) {
return get_area_city($area);
}
+ /* Parcel strings are the same so this can work. */
+ function get_contact_parcel_string($contact) {
+ return get_order_parcel_string($contact);
+ }
+
/* Hub and Contact are similar enough that this can work. */
function get_hub_address($hub) {
return get_contact_address($hub);
}
function show_date_form($name, $date = null) {
+ $past = 60;
+ $future = 60;
echo "<select name=\"$name\">\n";
- $now = time();
+ $now = date('Y-m-d', time());
+ list($y, $m, $d) = explode('-', $now);
+ $today = mktime(0, 0, 0, $m, $d, $y);
if (isset($date)) {
list($y, $m, $d) = explode('-', $date);
$then = mktime(0, 0, 0, $m, $d, $y);
- option($name, $date, date('l j F Y', $then), $date);
+ if ($then < $today - 86400 * $past || $then > $today + 86400 * $future) {
+ option($name, $date, date('l j F Y', $then), $date);
+ }
}
- for ($i = 0; $i < 60; $i++) {
- $then = $now + 86400 * $i;
+ else $date = $now;
+ for ($i = -$past; $i < $future; $i++) {
+ $then = $today + 86400 * $i;
option($name, date('Y-m-d', $then), date('l j F Y', $then), $date);
}
echo "</select>\n";