X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdelivery.php;h=574094ada01704f4d684b03be6458c59e62225dd;hb=refs%2Ftags%2F2022-10-31;hp=4c7c4f09b491cebb93ae92af5c9ad3a578b2a611;hpb=068aa1997b31e7f46e66977693b751f5fbbcb2b7;p=readifood.git

diff --git a/lib/delivery.php b/lib/delivery.php
index 4c7c4f0..574094a 100644
--- a/lib/delivery.php
+++ b/lib/delivery.php
@@ -109,32 +109,72 @@
 
     $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 "<h4>$count orders</h4>";
+      echo "<p class=\"noprint\">Drag delivery details to reorder the schedule.</p>\n";
+      echo "<div class=\"sortable\">\n";
+    }
+	   else echo "<h4>1 order</h4>";
+
     foreach ($orders as $order) {
       $contact = get_contact_by_id($order->getBeneficiaryId());
       if (! $contact) continue;
 
+      echo "<div class=\"delivery\">";
+
+      $phones = array();
       $area = get_contact_area($contact);
       echo "<p>Order of <em>" . get_order_parcel_string($order) . "</em> for <strong>" . htmlspecialchars($contact->getDisplayname()) . "</strong> in " . htmlspecialchars(get_area_displayname($area)) . ".</p>\n";
       $hub = get_hub_by_id($order->getHubId(), false);
       if ($hub) {
         echo "<p>Deliver to hub <strong> " . htmlspecialchars($hub->getName()) . "</strong>";
         $address = get_hub_address($hub);
+        $phone = $hub->getTelephone1();
+        if ($phone) $phones[] = $phone;
+        $phone = $hub->getTelephone2();
+        if ($phone) $phones[] = $phone;
       }
       else {
         echo "<p>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:<br>";
+      echo " in " . htmlspecialchars($area->getName()) . " at:";
       $city = get_area_city($area);
-      echo "\n<br>" . htmlspecialchars($address->getLine());
-      echo "\n<br>" . htmlspecialchars($city->getName());
-      echo "\n<br>" . htmlspecialchars($address->getPostcode());
+      echo "\n" . htmlspecialchars($address->getLine());
+      echo ",\n" . htmlspecialchars($address->getPostcode());
+      if (count($phones)) echo ";\nTelephone <strong>" . implode(" or ", $phones) . "</strong>";
       echo "</p>\n";
 
-      echo "<hr>\n\n";
+      $notes = $order->getNotes();
+      if ($notes) {
+        echo "<p><strong>Notes:</strong>\n";
+        echo htmlspecialchars($notes);
+        echo "</p>\n";
+      }
+
+      echo "<hr>\n";
+      echo "</div>\n\n";
     }
+
+    if ($count > 1) echo "</div>\n";
   }
 
   function show_delivery_date_form($date = null) {