X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdelivery.php;h=9cdd3385e0ed814ea1a2d789923db78c1b2e386f;hb=f44ed8d0e1de072ea341c013c967714cd0217fee;hp=43800caa4edd29d5bfb13058f2425f8651662d7a;hpb=bb7d5af591a4fbb9963afc46fa992f742a2d3355;p=readifood.git

diff --git a/lib/delivery.php b/lib/delivery.php
index 43800ca..9cdd338 100644
--- a/lib/delivery.php
+++ b/lib/delivery.php
@@ -109,20 +109,48 @@
 
     $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 "<div class=\"sortable\">\n";
+      echo "<p class=\"noprint\">Drag delivery details to reorder the schedule.</p>\n";
+    }
+
     foreach ($orders as $order) {
       $contact = get_contact_by_id($order->getBeneficiaryId());
       if (! $contact) continue;
 
+      echo "<span>\n";
+
+      $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);
 
@@ -131,6 +159,7 @@
       echo "\n<br>" . htmlspecialchars($address->getLine());
       echo "\n<br>" . htmlspecialchars($city->getName());
       echo "\n<br>" . htmlspecialchars($address->getPostcode());
+      if (count($phones)) echo "\n<br><br>Telephone <strong>" . implode(" or ", $phones) . "</strong>";
       echo "</p>\n";
 
       $notes = $order->getNotes();
@@ -140,8 +169,11 @@
         echo "</p>\n";
       }
 
-      echo "<hr>\n\n";
+      echo "<hr>\n";
+      echo "</span>\n\n";
     }
+
+    if ($count > 1) echo "</div>\n";
   }
 
   function show_delivery_date_form($date = null) {