From 4aee9f8cde7e0da85566ff272f1e104c4c95994d Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 26 Feb 2018 16:17:50 +0800
Subject: [PATCH] Move ticket type fields to top of form #21

---
 templates/ticket/form.html.twig | 56 ++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/templates/ticket/form.html.twig b/templates/ticket/form.html.twig
index 0a2c586c..61d16890 100644
--- a/templates/ticket/form.html.twig
+++ b/templates/ticket/form.html.twig
@@ -38,32 +38,6 @@
                     <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('ticket_update_submit', {'id': obj.getId}) : url('ticket_create_submit', {'customer_id': customer ? customer.getID : false}) }}">
 						<div class="m-portlet__body">
 							<div class="form-group m-form__group row no-border">
-								<div class="col-lg-4">
-									<label data-field="first_name">First Name</label>
-									<input type="text" name="first_name" class="form-control m-input" value="{{ customer and mode == 'create' ? customer.getFirstName : obj.getFirstName }}"{{ customer ? ' disabled' }}>
-									<div class="form-control-feedback hide" data-field="first_name"></div>
-								</div>
-								<div class="col-lg-4">
-									<label data-field="last_name">Last Name</label>
-									<input type="text" name="last_name" class="form-control m-input" value="{{ customer and mode == 'create' ? customer.getLastName : obj.getLastName }}"{{ customer ? ' disabled' }}>
-									<div class="form-control-feedback hide" data-field="last_name"></div>
-								</div>
-								<div class="col-lg-4">
-									<label data-field="contact_num">Contact Number</label>
-									<input type="text" name="contact_num" class="form-control m-input" value="{{ customer and mode == 'create' and customer.getMobileNumbers is not empty ? customer.getMobileNumbers[0].getID : obj.getContactNumber }}"{{ customer ? ' disabled' }}>
-									<div class="form-control-feedback hide" data-field="contact_num"></div>
-								</div>
-							</div>
-							<div class="form-group m-form__group row no-border">
-								<div class="col-lg-4">
-									<label data-field="status">Status</label>
-									<select class="form-control m-input" id="status" name="status">
-										{% for key, status in statuses %}
-											<option value="{{ key }}"{{ key == obj.getStatus ? ' selected' }}>{{ status }}</option>
-										{% endfor %}
-									</select>
-									<div class="form-control-feedback hide" data-field="status"></div>
-								</div>
 								<div class="col-lg-4">
 									<label data-field="status">Ticket Type</label>
 									<select class="form-control m-input" id="ticket-type" name="ticket_type">
@@ -80,6 +54,25 @@
 									<div class="form-control-feedback hide" data-field="other_ticket_type"></div>
 								</div>
 							</div>
+							<div class="form-group m-form__group row no-border">
+								<div class="col-lg-4">
+									<label data-field="first_name">First Name</label>
+									<input type="text" name="first_name" class="form-control m-input" value="{{ customer and mode == 'create' ? customer.getFirstName : obj.getFirstName }}"{{ customer ? ' disabled' }}>
+									<div class="form-control-feedback hide" data-field="first_name"></div>
+								</div>
+								<div class="col-lg-4">
+									<label data-field="last_name">Last Name</label>
+									<input type="text" name="last_name" class="form-control m-input" value="{{ customer and mode == 'create' ? customer.getLastName : obj.getLastName }}"{{ customer ? ' disabled' }}>
+									<div class="form-control-feedback hide" data-field="last_name"></div>
+								</div>
+							</div>
+							<div class="form-group m-form__group row no-border">
+								<div class="col-lg-4">
+									<label data-field="contact_num">Contact Number</label>
+									<input type="text" name="contact_num" class="form-control m-input" value="{{ customer and mode == 'create' and customer.getMobileNumbers is not empty ? customer.getMobileNumbers[0].getID : obj.getContactNumber }}"{{ customer ? ' disabled' }}>
+									<div class="form-control-feedback hide" data-field="contact_num"></div>
+								</div>
+							</div>
 							<div class="form-group m-form__group row no-border">
 								<div class="col-lg-4">
 									<label data-field="plate_number">Vehicle Plate Number</label>
@@ -87,6 +80,17 @@
 									<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-4">
+									<label data-field="status">Status</label>
+									<select class="form-control m-input" id="status" name="status">
+										{% for key, status in statuses %}
+											<option value="{{ key }}"{{ key == obj.getStatus ? ' selected' }}>{{ status }}</option>
+										{% endfor %}
+									</select>
+									<div class="form-control-feedback hide" data-field="status"></div>
+								</div>
+							</div>
 							<div class="form-group m-form__group row no-border">
 								<div class="col-lg-12">
 									<label data-field="subject">Subject</label>