From b42536fa2409ee96fd3abc3c781174393e649e9c Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Wed, 10 Apr 2013 17:39:37 -0400
Subject: [PATCH] Fix driver display in order form.

Drivers were being correctly recorded but not always correctly displayed
when viewing existing orders.
---
 lib/order.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/order.php b/lib/order.php
index 12a34aa..a392f6e 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -235,7 +235,10 @@
     if ($order) {
       $q = new OrderStateQuery;
       $order_state = $q->filterByOrderId($order->getId())->orderByUpdated('desc')->limit(1)->findOne();
-      if ($order_state) $state = $order_state->getState();
+      if ($order_state) {
+        $state = $order_state->getState();
+        $driver_id = $order_state->getDriverId();
+      }
     }
     else $order = new Order;
 
@@ -501,6 +504,7 @@
 
       $driver_id = $order_state->getDriverId();
       if ($driver_id) $driver = get_contact_by_id($driver_id);
+      else $driver = null;
 
       /* XXX */
       $state = $order_state->getState();
-- 
2.20.1