Use get_order_state*() functions.

Use the new functions get_order_state() and get_order_state_string()
where we were previously accessing the state directly.

diff --git a/lib/order.php b/lib/order.php
index 4b1c42e..2eae9e0 100644 (file)
--- a/lib/order.php
+++ b/lib/order.php
@@ -206,8 +206,7 @@
     global $states, $parcel_sizes, $parcel_contents;
 
     if ($order) {
-      $q = new OrderStateQuery;
-      $order_state = $q->filterByOrderId($order->getId())->orderByUpdated('desc')->limit(1)->findOne();
+      $order_state = get_order_state($order);
       if ($order_state) {
         $state = $order_state->getState();
         $driver_id = $order_state->getDriverId();
@@ -215,7 +214,6 @@
     }
     else $order = new Order;
 
-
     /* Date. */
     echo "<tr>\n";
     echo "  <td>Delivery</td>\n";
@@ -552,16 +550,7 @@
       if ($driver_id) $driver = get_contact_by_id($driver_id);
       else $driver = null;
 
-      /* XXX */
-      $state = $order_state->getState();
-      for ($i = 0; $i < count($states); $i++) {
-        if ((1 << $i) == $state) {
-          $state = $states[$i];
-          break;
-        }
-      }
-      #$state = $states[$order_state->getState()];
-      echo "<strong>$username</strong> changed order to state <strong>$state</strong>";
+      echo "<strong>$username</strong> changed order to state <strong>" . get_order_state_string($order_state) . "</strong>";
       if ($driver) echo " for driver " . $driver->getDisplayname();
       echo " on $date.<br>\n";
     }