X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=inline;f=lib%2Ffunctions.php;h=eb48c4b75ada85a3ee21d79a75cb3653185627b2;hb=1a03841178f8c990b3b196b915c5b288f629879f;hp=ecaf2adfdc561d1ee481c8c79c4dc91307b23477;hpb=cc703b79a6e9d646b44bdf63df58b48162b80856;p=readifood.git
diff --git a/lib/functions.php b/lib/functions.php
index ecaf2ad..eb48c4b 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -185,13 +185,27 @@
return $order_ids;
}
- function get_contact_orders($contact, $state_mask = null) {
+ function get_beneficiary_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_requester_orders($contact, $state_mask = null) {
+ $q = new OrderQuery;
+ $q->filterByRequesterId($contact->getId());
+ if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
+ return $q->orderByDate()->find();
+ }
+
+ function get_contact_orders($contact, $state_mask = null) {
+ $q = new OrderQuery;
+ $q->filterByBeneficiaryId($contact->getId())->_or()->filterByRequesterId($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);
@@ -243,8 +257,30 @@
return sprintf("%s on %s", get_order_parcel_string($order), $order->getDate());
}
+ function get_order_state_string($order_state = null) {
+ global $states;
+
+ if (is_null($order_state)) return null;
+
+ for ($i = 0; $i < count($states); $i++) {
+ if ($order_state->getState() & (1 << $i)) {
+ return $states[$i];
+ }
+ }
+
+ return "unknown";
+ }
+
+ function get_order_state($order) {
+ $q = new OrderStateQuery();
+ return $q->filterByOrderId($order->getId())->orderByUpdated('desc')->findOne();
+ }
+
function get_order_summary($order) {
- $ret = "Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order);
+ $ret = "Order ";
+ $order_state = get_order_state($order);
+ if ($order_state) $ret = "" . ucfirst(get_order_state_string($order_state)) . " order ";
+ $ret .= $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order);
if (check_admin(1)) $ret .= " " . $order->getDeleteLink();
@@ -281,6 +317,13 @@
return $q->findOneById($address->getAreaId());
}
+ function get_address_map_link($address) {
+ $postcode = trim($address->getPostcode());
+ if ($postcode) {
+ return " " . get_small_link("Map", "http://maps.google.co.uk/maps?q=" . urlencode($postcode));
+ }
+ }
+
function get_contact_address($contact) {
$q = new AddressQuery;
return $q->findOneById($contact->getAddressId());
@@ -385,9 +428,9 @@
function show_role_form($role, $roles) {
for ($i = 0; $i < count($roles); $i++) {
- echo " $roles[$i]\n";
+ echo ">\n";
}
}
@@ -443,32 +486,54 @@
}
function show_date_form($name, $date = null) {
- $past = 60;
- $future = 60;
- echo "\n";
- return;
- if (! isset($date)) $date = date('Y-m-d');
- list($y, $m, $d) = iso8601_to_ymd($date);
-
- echo "Year: ";
- echo "Month: ";
- echo "Day: ";
}
function get_small_link() {