From 2e1573feac2b24bd43425bea2c986b74ed5c8e4b Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 19:47:02 +0800
Subject: [PATCH] Update rider form hub list display + reposition plate number
 field

---
 templates/rider/form.html.twig | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/rider/form.html.twig b/templates/rider/form.html.twig
index def5e92c..7e40a6c5 100644
--- a/templates/rider/form.html.twig
+++ b/templates/rider/form.html.twig
@@ -53,23 +53,23 @@
 									<div class="form-control-feedback hide" data-field="contact_no"></div>
 								</div>
 								<div class="col-lg-6">
+									<label data-field="plate_number">Plate Number</label>
+									<input type="text" name="plate_number" class="form-control m-input" value="{{ obj.getPlateNumber() }}">
+									<div class="form-control-feedback hide" data-field="plate_number"></div>
+								</div>
+							</div>
+							<div class="form-group m-form__group row no-border">
+								<div class="col-lg-12">
 									<label data-field="hub">Hub</label>
 									<select class="form-control m-input" id="hub" name="hub">
 										<option value=""></option>
 										{% for hub in hubs %}
-											<option value="{{ hub.getID() }}"{{ obj.getHub() and hub.getID() == obj.getHub().getID() ? ' selected' }}>{{ hub.getName() }}</option>
-										{% endfor %}
+	                                        <option value="{{ hub.getID }}"{{ obj.getHub and hub.getID == obj.getHub.getID ? ' selected' }}>{{ hub.getName ~ (hub.getBranch ? ' - ' ~ hub.getBranch) }}</option>
+	                                    {% endfor %}
 									</select>
 									<div class="form-control-feedback hide" data-field="hub"></div>
 								</div>
 							</div>
-							<div class="form-group m-form__group row no-border">
-								<div class="col-lg-6">
-									<label data-field="plate_number">Plate Number</label>
-									<input type="text" name="plate_number" class="form-control m-input" value="{{ obj.getPlateNumber() }}">
-									<div class="form-control-feedback hide" data-field="plate_number"></div>
-								</div>
-							</div>
 							<div class="form-group m-form__group row">
 								<div class="col-lg-6">
 									<label data-field="image_file">