From 9327f02623c5e8e0a07c92f7d17a1182a5b9061d Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 10 Mar 2020 09:07:01 +0000
Subject: [PATCH 1/2] Display active job orders of rider. #368

---
 templates/rider/popup.html.twig | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/rider/popup.html.twig b/templates/rider/popup.html.twig
index 13b201d0..1a9f6e09 100644
--- a/templates/rider/popup.html.twig
+++ b/templates/rider/popup.html.twig
@@ -1,13 +1,13 @@
 <strong>{{ rider.getFullName }}</strong>
-{% set jo = rider.getActiveJobOrder %}
-{% if jo is not null %}
-{% set cust = jo.getCustomer %}
-{% set cv = jo.getCustomerVehicle %}
-<br>
-<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
-{{ jo.getServiceTypeName }}<br>
-{{ jo.getStatusText }}<br><br>
-{{ cust.getNameDisplay }}<br>
-{{ cv.getPlateNumber }}
+{% set job_orders = rider.getOpenJobOrders %}
+{% if job_orders is not empty %}
+    {% for jo in job_orders %}
+        {% set cust = jo.getCustomer %}
+        {% set cv = jo.getCustomerVehicle %}
+        <br>
+        <a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
+        {{ cust.getNameDisplay }}<br>
+        {{ cv.getPlateNumber }}
+    {% endfor %}
 {% endif %}
 

From a3c9c16d51344571c9db9c3931228c08f9012e21 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 10 Mar 2020 09:15:11 +0000
Subject: [PATCH 2/2] Restore active job order for rider. #368

---
 templates/rider/popup.html.twig | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/templates/rider/popup.html.twig b/templates/rider/popup.html.twig
index 1a9f6e09..15cdc26a 100644
--- a/templates/rider/popup.html.twig
+++ b/templates/rider/popup.html.twig
@@ -1,13 +1,25 @@
 <strong>{{ rider.getFullName }}</strong>
+{% set jo = rider.getActiveJobOrder %}
+{% if jo is not null %}
+{% set cust = jo.getCustomer %}
+{% set cv = jo.getCustomerVehicle %}
+<br>
+<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
+{{ jo.getServiceTypeName }}<br>
+{{ jo.getStatusText }}<br><br>
+{{ cust.getNameDisplay }}<br>
+{{ cv.getPlateNumber }}
+{% endif %}
+<br>
 {% set job_orders = rider.getOpenJobOrders %}
 {% if job_orders is not empty %}
-    {% for jo in job_orders %}
-        {% set cust = jo.getCustomer %}
-        {% set cv = jo.getCustomerVehicle %}
+    {% for job_order in job_orders %}
+        {% set customer = job_order.getCustomer %}
+        {% set cust_vehicle = job_order.getCustomerVehicle %}
         <br>
-        <a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
-        {{ cust.getNameDisplay }}<br>
-        {{ cv.getPlateNumber }}
+        <a href="{{ url('jo_onestep_edit_form', {'id': job_order.getID}) }}">Job Order #{{ job_order.getID }}</a><br>
+        {{ customer.getNameDisplay }}<br>
+        {{ cust_vehicle.getPlateNumber }}
     {% endfor %}
 {% endif %}