X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=511e0cffea903ade8e8c7b0506f76efdbc4462dd;hb=87843f0ab772989647ce3116f2508b781f56f0b6;hp=f9da7135af116ea51ddbe2fd9f2c7b6457e336dd;hpb=637bc9bc7d65b625a322385b5700bfc169f877c0;p=readifood.git
diff --git a/lib/functions.php b/lib/functions.php
index f9da713..511e0cf 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -175,6 +175,23 @@
return $order;
}
+ function get_order_ids_by_state($state_mask) {
+ $order_ids = array();
+ $dbh = Propel::getConnection();
+ $sth = $dbh->prepare("select * from OrderState o where updated=(select max(updated) from OrderState where order_id=o.order_id) and state & $state_mask");
+ $sth->execute();
+ $order_states = OrderStatePeer::populateObjects($sth);
+ foreach ($order_states as $order_state) $order_ids[] = $order_state->getOrderId();
+ return $order_ids;
+ }
+
+ function get_contact_orders($contact, $state_mask = null) {
+ $q = new OrderQuery;
+ $q->filterByBeneficiaryId($contact->getId());
+ if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
+ return $q->orderByDate()->find();
+ }
+
function get_user_by_contact_id($id, $verbose = true) {
$q = new UserQuery;
$user = $q->findOneByContactId($id);
@@ -199,8 +216,27 @@
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 sprintf("%0.2fkg on %s", $order->getQuantity() / 1000, $order->getDate());
+ return sprintf("%s on %s", get_order_parcel_string($order), $order->getDate());
}
function get_address_area($address) {
@@ -227,6 +263,11 @@
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);
@@ -365,15 +406,22 @@
}
function show_date_form($name, $date = null) {
+ $past = 60;
+ $future = 60;
echo "\n";