Use textarea() for contact notes.

[readifood.git] / lib / order.php

diff --git a/lib/order.php b/lib/order.php
index 38a235a..7872f94 100644 (file)
--- a/lib/order.php
+++ b/lib/order.php
@@ -239,7 +239,10 @@
     foreach ($contacts as $contact) {
       option("requester_id", $contact->getId(), $contact->getDisplayname(), $order->getRequesterId());
     }
-    echo "</select></td>\n";
+    echo "</select>";
+    $contact = get_contact_by_id($order->getRequesterId(), false);
+    if ($contact) echo " " . get_small_link($contact->getDisplayname(), $contact->getURL());
+    echo "</td>\n";
     echo "</tr>\n";
 
     /* Beneficiary. */
@@ -257,7 +260,10 @@
         option("beneficiary_id", $contact->getId(), $contact->getDisplayname(), $order->getBeneficiaryId());
       }
     }
-    echo "</select></td>\n";
+    echo "</select>";
+    $contact = get_contact_by_id($order->getBeneficiaryId(), false);
+    if ($contact) echo " " . get_small_link($contact->getDisplayname(), $contact->getURL());
+    echo "</td>\n";
     echo "</tr>\n";
 
     /* Hub. */
@@ -269,7 +275,10 @@
     foreach ($hubs as $hub) {
       option("hub_id", $hub->getId(), $hub->getDisplayname(), $order->getHubId());
     }
-    echo "</select></td>\n";
+    echo "</select>";
+    $hub = get_hub_by_id($order->getHubId(), false);
+    if ($hub) echo " " . get_small_link($hub->getDisplayname(), $hub->getURL());
+    echo "</td>\n";
     echo "</tr>\n";
 
     /* Parcel type. */
@@ -295,6 +304,12 @@
     echo "</td>\n";
     echo "</tr>\n";
 
+    /* Notes. */
+    echo "<tr>\n";
+    echo "  <td>Notes</td>\n";
+    echo "  <td>"; textarea("notes", $order->getNotes()); echo "</td>\n";
+    echo "</tr>\n";
+
     /* Driver. */
     echo "<tr>\n";
     echo "  <td>Driver</td>\n";
@@ -305,7 +320,10 @@
       foreach ($contacts as $contact) {
         option("driver_id", $contact->getId(), $contact->getDisplayname(), $driver_id);
       }
-      echo "</select></td>\n";
+      echo "</select>";
+      $contact = get_contact_by_id($driver_id, false);
+      if ($contact) echo " " . get_small_link($contact->getDisplayname(), $contact->getURL());
+      echo "</td>\n";
     }
     else echo "  <td>No drivers!</td>\n";
     echo "</tr>\n";
@@ -413,6 +431,7 @@
     for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
       if ($_POST['parcel_' . $i] == "on") $parcel |= (1 << $i);
     }
+    $notes = $_POST['notes'];
 
     if ($date) {
       list($y, $m, $d) = explode('-', $date);
@@ -457,6 +476,7 @@
       $order->setBeneficiaryId($beneficiary_id);
       $order->setHubId($hub_id);
       $order->setParcel($parcel);
+      $order->setNotes($notes);
 
       /* XXX: begin/commit */
       try {
@@ -520,6 +540,7 @@
     if (! count($order_states)) return;
 
     echo "<h3>Order history</h3>\n";
+    echo "<p class=\"history\">\n";
     foreach ($order_states as $order_state) {
       $date = $order_state->getUpdated();
 
@@ -540,10 +561,11 @@
         }
       }
       #$state = $states[$order_state->getState()];
-      echo "<p><strong>$username</strong> changed order to state <strong>$state</strong>";
+      echo "<strong>$username</strong> changed order to state <strong>$state</strong>";
       if ($driver) echo " for driver " . $driver->getDisplayname();
-      echo " on $date.</p>\n";
+      echo " on $date.<br>\n";
     }
+    echo "</p>\n";
   }
 
   function show_order(&$id = null) {