diff --git a/templates/job-order/incoming.html.twig b/templates/job-order/incoming.html.twig
index e38cc669..e905787a 100644
--- a/templates/job-order/incoming.html.twig
+++ b/templates/job-order/incoming.html.twig
@@ -38,6 +38,32 @@
 									</div>
 								</div>
 							</div>
+							<div class="m-form__section">
+								<div class="m-form__heading">
+									<h3 class="m-form__heading-title">
+										Customer Details
+									</h3>
+								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-6">
+										<label>First Name:</label>
+										<input type="text" name="customer_first_name" id="customer-first-name" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getFirstName }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<div class="form-control-feedback hide" data-field="customer_first_name"></div>
+									</div>
+									<div class="col-lg-6">
+										<label>Last Name:</label>
+										<input type="text" name="customer_last_name" id="customer-last-name" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getLastName }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<div class="form-control-feedback hide" data-field="customer_last_name"></div>
+									</div>
+								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-6">
+										<label>Mobile Numbers:</label>
+										<textarea name="customer_mobile_numbers" id="customer-mobile-numbers" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" rows="4" disabled>{{ obj.getCustomer ? obj.getCustomer.getMobileNumberList|join("\r\n") }}</textarea>
+										<div class="form-control-feedback hide" data-field="customer_mobile_numbers"></div>
+									</div>
+								</div>
+							</div>
 							<div class="m-form__section">
 								<div class="m-form__heading">
 									<h3 class="m-form__heading-title">
@@ -47,22 +73,22 @@
 								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
 										<label>Vehicle Manufacturer:</label>
-										<input type="text" name="vmfg" id="vmfg" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<input type="text" name="vmfg" id="vmfg" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getManufacturer.getName }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vmfg"></div>
 									</div>
 									<div class="col-lg-3">
-										<label>Vehicle Model:</label>
-										<input type="text" name="vehicle_model" id="vehicle-model" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
-										<div class="form-control-feedback hide" data-field="vehicle_model"></div>
+										<label>Vehicle Make:</label>
+										<input type="text" name="vehicle_make" id="vehicle-make" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getMake }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<div class="form-control-feedback hide" data-field="vehicle_make"></div>
 									</div>
 									<div class="col-lg-3">
 										<label>Vehicle Model Year:</label>
-										<input type="text" name="vehicle_year" id="vehicle-year" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<input type="text" name="vehicle_year" id="vehicle-year" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getModelYear }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_year"></div>
 									</div>
 									<div class="col-lg-3">
 										<label>Vehicle Color:</label>
-										<input type="text" name="vehicle_color" id="vehicle-color" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<input type="text" name="vehicle_color" id="vehicle-color" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getColor }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_color"></div>
 									</div>
 								</div>
@@ -76,17 +102,17 @@
 								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
 										<label>Current Battery:</label>
-										<input type="text" name="current_battery" id="current-battery" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<input type="text" name="current_battery" id="current-battery" class="form-control m-input" value="{{ obj.getCustomerVehicle and obj.getCustomerVehicle.getCurrentBattery ? obj.getCustomerVehicle.getCurrentBattery.getManufacturer.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getModel.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getSize.getName ~ ' (' ~ obj.getCustomerVehicle.getCurrentBattery.getProductCode ~ ')' }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="current_battery"></div>
 									</div>
 									<div class="col-lg-3">
 										<label>Warranty Code:</label>
-										<input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="warranty_code"></div>
 									</div>
 									<div class="col-lg-3">
 										<label>Warranty Expiration Date:</label>
-										<input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
+										<input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="warranty_expiration"></div>
 									</div>
 								</div>
@@ -99,7 +125,7 @@
 									</h3>
 									<span class="m-switch m-switch--icon block-switch">
 										<label>
-											<input type="checkbox" name="flag_advance" id="flag-advance" value="1">
+											<input type="checkbox" name="flag_advance" id="flag-advance" value="1"{{ obj.isAdvanceOrder ? ' checked' }}>
 											<label class="switch-label">This is an advance order</label>
 											<span></span>
 										</label>
@@ -111,7 +137,7 @@
 										<select class="form-control m-input" name="service_type">
 											<!--<option value=""></option>-->
 											{% for key, service in service_types %}
-												<option value="{{ key }}"{{ obj.getServiceType() == service ? ' selected' }}>{{ service }}</option>
+												<option value="{{ key }}"{{ obj.getServiceType == service ? ' selected' }}>{{ service }}</option>
 											{% endfor %}
 										</select>
 										<div class="form-control-feedback hide" data-field="service_type"></div>
@@ -126,7 +152,7 @@
 									<div class="col-lg-3">
 										<label>Scheduled Date:</label>
 										<div class="input-group date dp">
-											<input type="text" name="date_schedule_date" class="form-control m-input" data-default-value="{{ obj.getDateSchedule()|date('Y-m-d') }}" value="{{ obj.getDateSchedule()|date('d M Y') }}" readonly placeholder="Select a date" disabled>
+											<input type="text" name="date_schedule_date" class="form-control m-input" data-default-value="{{ obj.getDateSchedule ? obj.getDateSchedule|date('Y-m-d') : "now"|date('Y-m-d') }}" value="{{ obj.getDateSchedule ? obj.getDateSchedule|date('d M Y') : "now"|date('d M Y') }}" readonly placeholder="Select a date" disabled>
 											<span class="input-group-addon">
 												<i class="la la-calendar glyphicon-th"></i>
 											</span>
@@ -136,7 +162,7 @@
 									<div class="col-lg-3">
 										<label>Scheduled Time:</label>
 										<div class="input-group">
-											<input type="text" name="date_schedule_time" class="form-control m-input tp" data-default-value="{{ obj.getDateSchedule()|date('g:i A') }}" value="{{ obj.getDateSchedule()|date('g:i A') }}" readonly placeholder="Select a time" disabled>
+											<input type="text" name="date_schedule_time" class="form-control m-input tp" data-default-value="{{ obj.getDateSchedule ? obj.getDateSchedule|date('g:i A') : "now"|date('g:i A') }}" value="{{ obj.getDateSchedule ? obj.getDateSchedule|date('g:i A') : "now"|date('g:i A') }}" readonly placeholder="Select a time" disabled>
 											<span class="input-group-addon">
 												<i class="la la-clock-o glyphicon-th"></i>
 											</span>
@@ -147,12 +173,12 @@
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
 										<label>Delivery Instructions:</label>
-										<textarea name="delivery_instructions" class="form-control m-input" rows="4"></textarea>
+										<textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
 										<div class="form-control-feedback hide" data-field="delivery_instructions"></div>
 									</div>
 									<div class="col-lg-6">
 										<label>Agent Notes:</label>
-										<textarea name="agent_notes" class="form-control m-input" rows="4"></textarea>
+										<textarea name="agent_notes" class="form-control m-input" rows="4">{{ obj.getAgentNotes }}</textarea>
 										<div class="form-control-feedback hide" data-field="agent_notes"></div>
 									</div>
 								</div>
@@ -162,7 +188,7 @@
 										<select class="form-control m-input" name="status">
 											<!--<option value=""></option>-->
 											{% for key, status in statuses %}
-												<option value="{{ key }}"{{ obj.getStatus() == status ? ' selected' }}>{{ status }}</option>
+												<option value="{{ key }}"{{ obj.getStatus == status ? ' selected' }}>{{ status }}</option>
 											{% endfor %}
 										</select>
 										<div class="form-control-feedback hide" data-field="status"></div>
@@ -200,6 +226,11 @@
 										Invoice
 									</h3>
 								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-12">
+										
+									</div>
+								</div>
 							</div>
 						</div>
 			            <div class="m-portlet__foot m-portlet__foot--fit">
@@ -392,8 +423,11 @@ $(function() {
 			
 			// set form fields
 			$("[data-vehicle-field='1']").prop('placeholder', '');
+			$("#customer-first-name").val(vdata.customer.first_name);
+			$("#customer-last-name").val(vdata.customer.last_name);
+			$("#customer-mobile-numbers").val(vdata.customer.mobile_numbers.join("\r\n"));
 			$("#vmfg").val(vdata.vehicle.mfg_name);
-			$("#vehicle-model").val(vdata.vehicle.make);
+			$("#vehicle-make").val(vdata.vehicle.make);
 			$("#vehicle-year").val(vdata.vehicle.model_year);
 			$("#vehicle-color").val(vdata.vehicle.color);
 
@@ -450,7 +484,7 @@ $(function() {
 			dp.prop('disabled', true).parent().datepicker('setDate', dateObj.toDate());
 			tp.prop('disabled', true).timepicker('setTime', tp.data('default-value'));
 		}
-	});
+	}).change();
 });
 </script>
 {% endblock %}