Automatically set status for job orders when submitting form, set hub as mandatory on outlets
This commit is contained in:
Ramon Gutierrez
parent
2ec8a369f6
commit
ef2dccdf57
3 changed files with 69 additions and 62 deletions
|
|
@ -94,7 +94,7 @@ class JobOrderController extends BaseController
|
|||
->setCustomer($cust_vehicle->getCustomer())
|
||||
->setCustomerVehicle($cust_vehicle)
|
||||
->setSource('web')
|
||||
->setStatus($req->request->get('status'))
|
||||
->setStatus(JOStatus::PENDING)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setAgentNotes($req->request->get('agent_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'));
|
||||
|
|
@ -233,12 +233,12 @@ class JobOrderController extends BaseController
|
|||
->getQuery()
|
||||
->getResult();
|
||||
|
||||
$statuses = JOStatus::getCollection();
|
||||
$service_types = ServiceType::getCollection();
|
||||
|
||||
// process rows
|
||||
$rows = [];
|
||||
foreach ($obj_rows as $orow) {
|
||||
$statuses = JOStatus::getCollection();
|
||||
$service_types = ServiceType::getCollection();
|
||||
|
||||
// add row data
|
||||
$row['id'] = $orow->getID();
|
||||
$row['delivery_address'] = $orow->getDeliveryAddress();
|
||||
|
|
@ -364,7 +364,7 @@ class JobOrderController extends BaseController
|
|||
->setServiceType($req->request->get('service_type'))
|
||||
->setWarrantyClass($req->request->get('warranty_class'))
|
||||
->setSource('web')
|
||||
->setStatus($req->request->get('status'))
|
||||
->setStatus(JOStatus::RIDER_ASSIGN)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setAgentNotes($req->request->get('agent_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
|
|
@ -501,7 +501,7 @@ class JobOrderController extends BaseController
|
|||
->setServiceType($req->request->get('service_type'))
|
||||
->setWarrantyClass($req->request->get('warranty_class'))
|
||||
->setSource('web')
|
||||
->setStatus($req->request->get('status'))
|
||||
->setStatus(JOStatus::ASSIGNED)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setAgentNotes($req->request->get('agent_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
|
|
|
|||
|
|
@ -195,6 +195,8 @@ class OutletController extends BaseController
|
|||
$error_array['hub'] = 'Invalid hub selected.';
|
||||
else
|
||||
$obj->setHub($hub);
|
||||
} else {
|
||||
$error_array['hub'] = 'This value should not be blank.';
|
||||
}
|
||||
|
||||
// check if lat and lng are provided
|
||||
|
|
@ -296,7 +298,7 @@ class OutletController extends BaseController
|
|||
else
|
||||
$obj->setHub($hub);
|
||||
} else {
|
||||
$obj->clearHub();
|
||||
$error_array['hub'] = 'This value should not be blank.';
|
||||
}
|
||||
|
||||
// add errors to list
|
||||
|
|
|
|||
|
|
@ -209,11 +209,11 @@
|
|||
<div class="form-control-feedback hide" data-field="agent_notes"></div>
|
||||
</div>
|
||||
</div>
|
||||
<!--
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="status">Status</label>
|
||||
<select class="form-control m-input" name="status">
|
||||
<!--<option value=""></option>-->
|
||||
{% for key, status in statuses %}
|
||||
<option value="{{ key }}"{{ obj.getStatus == key ? ' selected' }}>{{ status }}</option>
|
||||
{% endfor %}
|
||||
|
|
@ -221,6 +221,7 @@
|
|||
<div class="form-control-feedback hide" data-field="status"></div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
<div class="m-form__seperator m-form__seperator--dashed"></div>
|
||||
<div class="m-form__section">
|
||||
|
|
@ -387,46 +388,48 @@
|
|||
|
||||
{% if mode == 'update-assigning' %}
|
||||
<div class="m-form__seperator m-form__seperator--dashed"></div>
|
||||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
<h3 class="m-form__heading-title">
|
||||
Hub Details
|
||||
</h3>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="hub_name">Name</label>
|
||||
<input type="text" name="hub_name" id="hub-name" class="form-control m-input" value="{{ obj.getOutlet ? obj.getOutlet.getHub.getName }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="hub_name"></div>
|
||||
{% if obj.getOutlet.getHub %}
|
||||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
<h3 class="m-form__heading-title">
|
||||
Hub Details
|
||||
</h3>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<label data-field="hub_time_open">Time Open</label>
|
||||
<input type="text" name="hub_time_open" id="hub-time-open" class="form-control m-input" value="{{ obj.getOutlet ? obj.getOutlet.getHub.getTimeOpen|date("g:i A") }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="hub_time_open"></div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="hub_name">Name</label>
|
||||
<input type="text" name="hub_name" id="hub-name" class="form-control m-input" value="{{ obj.getOutlet.getHub.getName }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="hub_name"></div>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<label data-field="hub_time_open">Time Open</label>
|
||||
<input type="text" name="hub_time_open" id="hub-time-open" class="form-control m-input" value="{{obj.getOutlet.getHub.getTimeOpen|date("g:i A") }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="hub_time_open"></div>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<label data-field="hub_time_close">Time Close</label>
|
||||
<input type="text" name="hub_time_close" id="hub-time-close" class="form-control m-input" value="{{ obj.getOutlet.getHub.getTimeClose|date("g:i A") }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="hub_time_close"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<label data-field="hub_time_close">Time Close</label>
|
||||
<input type="text" name="hub_time_close" id="hub-time-close" class="form-control m-input" value="{{ obj.getOutlet ? obj.getOutlet.getHub.getTimeClose|date("g:i A") }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="hub_time_close"></div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="hub_address">
|
||||
Address
|
||||
</label>
|
||||
<textarea class="form-control m-input" id="hub-address" rows="4" name="hub_address" disabled>{{ obj.getOutlet.getHub.getAddress }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="hub_address"></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label data-field="contact_nums">
|
||||
Contact Numbers
|
||||
</label>
|
||||
<textarea class="form-control m-input" id="hub-contact-nums" rows="4" name="hub_contact_nums" disabled>{{ obj.getOutlet.getHub.getContactNumbers }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="hub_contact_nums"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="hub_address">
|
||||
Address
|
||||
</label>
|
||||
<textarea class="form-control m-input" id="hub-address" rows="4" name="hub_address" disabled>{{ obj.getOutlet ? obj.getOutlet.getHub.getAddress }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="hub_address"></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label data-field="contact_nums">
|
||||
Contact Numbers
|
||||
</label>
|
||||
<textarea class="form-control m-input" id="hub-contact-nums" rows="4" name="hub_contact_nums" disabled>{{ obj.getOutlet ? obj.getOutlet.getHub.getContactNumbers }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="hub_contact_nums"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
<h3 class="m-form__heading-title">
|
||||
|
|
@ -436,17 +439,17 @@
|
|||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="outlet_name">Name</label>
|
||||
<input type="text" name="outlet_name" id="outlet-name" class="form-control m-input" value="{{ obj.getOutlet ? obj.getOutlet.getName }}" disabled>
|
||||
<input type="text" name="outlet_name" id="outlet-name" class="form-control m-input" value="{{ obj.getOutlet.getName }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="outlet_name"></div>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<label data-field="outlet_time_open">Time Open</label>
|
||||
<input type="text" name="outlet_time_open" id="outlet-time-open" class="form-control m-input" value="{{ obj.getOutlet ? obj.getOutlet.getTimeOpen|date("g:i A") }}" disabled>
|
||||
<input type="text" name="outlet_time_open" id="outlet-time-open" class="form-control m-input" value="{{ obj.getOutlet.getTimeOpen|date("g:i A") }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="outlet_time_open"></div>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<label data-field="outlet_time_close">Time Close</label>
|
||||
<input type="text" name="outlet_time_close" id="outlet-time-close" class="form-control m-input" value="{{ obj.getOutlet ? obj.getOutlet.getTimeClose|date("g:i A") }}" disabled>
|
||||
<input type="text" name="outlet_time_close" id="outlet-time-close" class="form-control m-input" value="{{ obj.getOutlet.getTimeClose|date("g:i A") }}" disabled>
|
||||
<div class="form-control-feedback hide" data-field="outlet_time_close"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -455,14 +458,14 @@
|
|||
<label data-field="outlet_address">
|
||||
Address
|
||||
</label>
|
||||
<textarea class="form-control m-input" id="outlet-address" rows="4" name="outlet_address" disabled>{{ obj.getOutlet ? obj.getOutlet.getAddress }}</textarea>
|
||||
<textarea class="form-control m-input" id="outlet-address" rows="4" name="outlet_address" disabled>{{ obj.getOutlet.getAddress }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="outlet_address"></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label data-field="contact_nums">
|
||||
Contact Numbers
|
||||
</label>
|
||||
<textarea class="form-control m-input" id="outlet-contact-nums" rows="4" name="hub_contact_nums" disabled>{{ obj.getOutlet ? obj.getOutlet.getContactNumbers }}</textarea>
|
||||
<textarea class="form-control m-input" id="outlet-contact-nums" rows="4" name="hub_contact_nums" disabled>{{ obj.getOutlet.getContactNumbers }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="hub_contact_nums"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -491,24 +494,26 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="placeholder-row{{ obj.getOutlet.getHub.getRiders|length > 0 ? ' hide' }}">
|
||||
<tr class="placeholder-row{{ obj.getOutlet.getHub and obj.getOutlet.getHub.getRiders|length > 0 ? ' hide' }}">
|
||||
<td colspan="6">
|
||||
No items to display.
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
{% for rider in obj.getOutlet.getHub.getRiders %}
|
||||
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}>
|
||||
<td>
|
||||
<div class="user-portrait-sm" style="background-image: url('{{ rider.getImageFile ? "/uploads/" ~ rider.getImageFile : "/assets/images/user.gif" }}');"></div>
|
||||
</td>
|
||||
<td>{{ rider.getFirstName }}</td>
|
||||
<td>{{ rider.getLastName }}</td>
|
||||
<td>{{ rider.getContactNumber }}</td>
|
||||
<td>{{ rider.getPlateNumber }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% if obj.getOutlet.getHub %}
|
||||
{% for rider in obj.getOutlet.getHub.getRiders %}
|
||||
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}>
|
||||
<td>
|
||||
<div class="user-portrait-sm" style="background-image: url('{{ rider.getImageFile ? "/uploads/" ~ rider.getImageFile : "/assets/images/user.gif" }}');"></div>
|
||||
</td>
|
||||
<td>{{ rider.getFirstName }}</td>
|
||||
<td>{{ rider.getLastName }}</td>
|
||||
<td>{{ rider.getContactNumber }}</td>
|
||||
<td>{{ rider.getPlateNumber }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue