X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdelivery.php;h=574094ada01704f4d684b03be6458c59e62225dd;hb=refs%2Ftags%2F2022-10-31;hp=3b45558917aac13e623e501179d9e88d8614ffc5;hpb=d3dba43622775318e70ab6980a271d1702e757f8;p=readifood.git diff --git a/lib/delivery.php b/lib/delivery.php index 3b45558..574094a 100644 --- a/lib/delivery.php +++ b/lib/delivery.php @@ -109,10 +109,31 @@ $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 "

$count orders

"; + echo "

Drag delivery details to reorder the schedule.

\n"; + echo "
\n"; + } + else echo "

1 order

"; + foreach ($orders as $order) { $contact = get_contact_by_id($order->getBeneficiaryId()); if (! $contact) continue; + echo "
"; + $phones = array(); $area = get_contact_area($contact); echo "

Order of " . get_order_parcel_string($order) . " for " . htmlspecialchars($contact->getDisplayname()) . " in " . htmlspecialchars(get_area_displayname($area)) . ".

\n"; @@ -135,12 +156,11 @@ } $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()); - if (count($phones)) echo "\n

Telephone " . implode(" or ", $phones) . ""; + echo "\n" . htmlspecialchars($address->getLine()); + echo ",\n" . htmlspecialchars($address->getPostcode()); + if (count($phones)) echo ";\nTelephone " . implode(" or ", $phones) . ""; echo "

\n"; $notes = $order->getNotes(); @@ -150,8 +170,11 @@ echo "

\n"; } - echo "
\n\n"; + echo "
\n"; + echo "
\n\n"; } + + if ($count > 1) echo "
\n"; } function show_delivery_date_form($date = null) {