X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffunctions.php;h=ec0b35ade4763feb1890792972f1f01166b1e107;hb=refs%2Ftags%2Flive-2014-04-10;hp=fe442f820a2e90e6fe15d6ef3d511432b4cc9827;hpb=643b013ffaadfb032001ed0dde02176a2c382313;p=readifood.git
diff --git a/lib/functions.php b/lib/functions.php
index fe442f8..ec0b35a 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);
@@ -219,7 +233,7 @@
function get_order_parcel_string($order) {
global $parcel_sizes, $parcel_contents;
- $parcel_size = "";
+ $parcel_size = null;
for ($i = 0 ; $i < count($parcel_sizes); $i++) {
if ($order->getParcel() & (1 << $i)) {
$parcel_size = $parcel_sizes[$i];
@@ -232,15 +246,41 @@
if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
}
- return implode(": ", array($parcel_size, implode(", ", $selected)));
+ $ret = implode(": ", array($parcel_size, implode(", ", $selected)));
+ $ret = preg_replace('/^: /', '', $ret);
+ $ret = preg_replace('/: $/', '', $ret);
+
+ return $ret;
}
function get_order_displayname($order) {
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();
@@ -277,6 +317,38 @@
return $q->findOneById($address->getAreaId());
}
+ function get_address_map_link($address) {
+ $postcode = trim($address->getPostcode());
+ if ($postcode) {
+ # mrt=loc specifies a location search.
+ $map = "maps.google.co.uk/maps?q=" . urlencode($postcode) . "&mrt=loc";
+ $url = "http://$map";
+ # output=embed allows display in an iframe.
+ # iwloc=near hides the popup window for the embedded view.
+ $embed = $GLOBALS['http'] . "://$map&output=embed&iwloc=near";
+ $html = " ";
+ $html .= get_small_link_with_id("map", "Map", $url);
+ $html .= "";
+ return $html;
+ }
+ }
+
function get_contact_address($contact) {
$q = new AddressQuery;
return $q->findOneById($contact->getAddressId());
@@ -381,9 +453,9 @@
function show_role_form($role, $roles) {
for ($i = 0; $i < count($roles); $i++) {
- echo " $roles[$i]\n";
+ echo ">\n";
}
}
@@ -439,40 +511,71 @@
}
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_with_id() {
+ /* Args are , , , [ ...] */
+ $args = func_get_args();
+ $id = array_shift($args);
+ if (isset($id)) $id = " id=\"$id\"";
+ $html = htmlspecialchars(array_shift($args));
+ $url = array_shift($args);
+ return vsprintf("$html\n", $args);
}
function get_small_link() {
/* Args are , , [ ...] */
$args = func_get_args();
- $html = htmlspecialchars(array_shift($args));
- $url = array_shift($args);
- return vsprintf("$html\n", $args);
+ array_unshift($args, null);
+ return call_user_func_array("get_small_link_with_id", $args);
}
function small_link() {