X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdelivery.php;h=574094ada01704f4d684b03be6458c59e62225dd;hb=refs%2Ftags%2F2022-10-31;hp=43800caa4edd29d5bfb13058f2425f8651662d7a;hpb=bb7d5af591a4fbb9963afc46fa992f742a2d3355;p=readifood.git diff --git a/lib/delivery.php b/lib/delivery.php index 43800ca..574094a 100644 --- a/lib/delivery.php +++ b/lib/delivery.php @@ -109,28 +109,58 @@ $q = new OrderQuery; $orders = $q->filterById(get_driver_schedule_by_order_id($contact->getId(), $order_ids))->find(); + + /* + Only allow drag and drop if there's more than one order otherwise IE will + mess up the CSS. + */ + $count = count($orders); + if ($count) { + foreach ($orders as $order) { + if (! get_contact_by_id($order->getBeneficiaryId())) $count--; + } + } + + if ($count > 1) { + echo "
Order of " . get_order_parcel_string($order) . " for " . htmlspecialchars($contact->getDisplayname()) . " in " . htmlspecialchars(get_area_displayname($area)) . ".
\n"; $hub = get_hub_by_id($order->getHubId(), false); if ($hub) { echo "Deliver to hub " . htmlspecialchars($hub->getName()) . ""; $address = get_hub_address($hub); + $phone = $hub->getTelephone1(); + if ($phone) $phones[] = $phone; + $phone = $hub->getTelephone2(); + if ($phone) $phones[] = $phone; } else { echo "
Deliver direct to beneficiary";
$address = get_contact_address($contact);
+ $phone = $contact->getTelephone1();
+ if ($phone) $phones[] = $phone;
+ $phone = $contact->getTelephone2();
+ if ($phone) $phones[] = $phone;
}
$area = get_address_area($address);
- echo " in " . htmlspecialchars($area->getName()) . " at:
";
+ echo " in " . htmlspecialchars($area->getName()) . " at:";
$city = get_area_city($area);
- echo "\n
" . htmlspecialchars($address->getLine());
- echo "\n
" . htmlspecialchars($city->getName());
- echo "\n
" . htmlspecialchars($address->getPostcode());
+ echo "\n" . htmlspecialchars($address->getLine());
+ echo ",\n" . htmlspecialchars($address->getPostcode());
+ if (count($phones)) echo ";\nTelephone " . implode(" or ", $phones) . "";
echo "