rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Automatically set status for job orders when submitting form, set hub as mandatory on outlets

Browse source
This commit is contained in:
Ramon Gutierrez 2018-02-01 17:08:43 +08:00
parent 2ec8a369f6
commit ef2dccdf57
3 changed files with 69 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Controller/JobOrderController.php
View file

@ -94,7 +94,7 @@ class JobOrderController extends BaseController
->setCustomer($cust_vehicle->getCustomer()) ->setCustomer($cust_vehicle->getCustomer())
->setCustomerVehicle($cust_vehicle) ->setCustomerVehicle($cust_vehicle)
->setSource('web') ->setSource('web')
->setStatus($req->request->get('status')) ->setStatus(JOStatus::PENDING)
->setDeliveryInstructions($req->request->get('delivery_instructions')) ->setDeliveryInstructions($req->request->get('delivery_instructions'))
->setAgentNotes($req->request->get('agent_notes')) ->setAgentNotes($req->request->get('agent_notes'))
->setDeliveryAddress($req->request->get('delivery_address')); ->setDeliveryAddress($req->request->get('delivery_address'));
@ -233,12 +233,12 @@ class JobOrderController extends BaseController
->getQuery() ->getQuery()
->getResult(); ->getResult();
$statuses = JOStatus::getCollection();
$service_types = ServiceType::getCollection();
// process rows // process rows
$rows = []; $rows = [];
foreach ($obj_rows as $orow) { foreach ($obj_rows as $orow) {
$statuses = JOStatus::getCollection();
$service_types = ServiceType::getCollection();
// add row data // add row data
$row['id'] = $orow->getID(); $row['id'] = $orow->getID();
$row['delivery_address'] = $orow->getDeliveryAddress(); $row['delivery_address'] = $orow->getDeliveryAddress();
@ -364,7 +364,7 @@ class JobOrderController extends BaseController
->setServiceType($req->request->get('service_type')) ->setServiceType($req->request->get('service_type'))
->setWarrantyClass($req->request->get('warranty_class')) ->setWarrantyClass($req->request->get('warranty_class'))
->setSource('web') ->setSource('web')
->setStatus($req->request->get('status')) ->setStatus(JOStatus::RIDER_ASSIGN)
->setDeliveryInstructions($req->request->get('delivery_instructions')) ->setDeliveryInstructions($req->request->get('delivery_instructions'))
->setAgentNotes($req->request->get('agent_notes')) ->setAgentNotes($req->request->get('agent_notes'))
->setDeliveryAddress($req->request->get('delivery_address')) ->setDeliveryAddress($req->request->get('delivery_address'))
@ -501,7 +501,7 @@ class JobOrderController extends BaseController
->setServiceType($req->request->get('service_type')) ->setServiceType($req->request->get('service_type'))
->setWarrantyClass($req->request->get('warranty_class')) ->setWarrantyClass($req->request->get('warranty_class'))
->setSource('web') ->setSource('web')
->setStatus($req->request->get('status')) ->setStatus(JOStatus::ASSIGNED)
->setDeliveryInstructions($req->request->get('delivery_instructions')) ->setDeliveryInstructions($req->request->get('delivery_instructions'))
->setAgentNotes($req->request->get('agent_notes')) ->setAgentNotes($req->request->get('agent_notes'))
->setDeliveryAddress($req->request->get('delivery_address')) ->setDeliveryAddress($req->request->get('delivery_address'))

4
src/Controller/OutletController.php
View file

@ -195,6 +195,8 @@ class OutletController extends BaseController
$error_array['hub'] = 'Invalid hub selected.'; $error_array['hub'] = 'Invalid hub selected.';
else else
$obj->setHub($hub); $obj->setHub($hub);
} else {
$error_array['hub'] = 'This value should not be blank.';
} }
// check if lat and lng are provided // check if lat and lng are provided
@ -296,7 +298,7 @@ class OutletController extends BaseController
else else
$obj->setHub($hub); $obj->setHub($hub);
} else { } else {
$obj->clearHub(); $error_array['hub'] = 'This value should not be blank.';
} }
// add errors to list // add errors to list

115
templates/job-order/form.html.twig
View file

@ -209,11 +209,11 @@
<div class="form-control-feedback hide" data-field="agent_notes"></div> <div class="form-control-feedback hide" data-field="agent_notes"></div>
</div> </div>
</div> </div>
<!--
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="status">Status</label> <label data-field="status">Status</label>
<select class="form-control m-input" name="status"> <select class="form-control m-input" name="status">
<!--<option value=""></option>-->
{% for key, status in statuses %} {% for key, status in statuses %}
<option value="{{ key }}"{{ obj.getStatus == key ? ' selected' }}>{{ status }}</option> <option value="{{ key }}"{{ obj.getStatus == key ? ' selected' }}>{{ status }}</option>
{% endfor %} {% endfor %}
@ -221,6 +221,7 @@
<div class="form-control-feedback hide" data-field="status"></div> <div class="form-control-feedback hide" data-field="status"></div>
</div> </div>
</div> </div>
-->
</div> </div>
<div class="m-form__seperator m-form__seperator--dashed"></div> <div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section"> <div class="m-form__section">
@ -387,46 +388,48 @@
{% if mode == 'update-assigning' %} {% if mode == 'update-assigning' %}
<div class="m-form__seperator m-form__seperator--dashed"></div> <div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section"> {% if obj.getOutlet.getHub %}
<div class="m-form__heading"> <div class="m-form__section">
<h3 class="m-form__heading-title"> <div class="m-form__heading">
Hub Details <h3 class="m-form__heading-title">
</h3> Hub Details
</div> </h3>
<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>
</div> </div>
<div class="col-lg-3"> <div class="form-group m-form__group row">
<label data-field="hub_time_open">Time Open</label> <div class="col-lg-6">
<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> <label data-field="hub_name">Name</label>
<div class="form-control-feedback hide" data-field="hub_time_open"></div> <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>
<div class="col-lg-3"> <div class="form-group m-form__group row">
<label data-field="hub_time_close">Time Close</label> <div class="col-lg-6">
<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> <label data-field="hub_address">
<div class="form-control-feedback hide" data-field="hub_time_close"></div> 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> </div>
<div class="form-group m-form__group row"> {% endif %}
<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>
<div class="m-form__section"> <div class="m-form__section">
<div class="m-form__heading"> <div class="m-form__heading">
<h3 class="m-form__heading-title"> <h3 class="m-form__heading-title">
@ -436,17 +439,17 @@
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="outlet_name">Name</label> <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 class="form-control-feedback hide" data-field="outlet_name"></div>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<label data-field="outlet_time_open">Time Open</label> <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 class="form-control-feedback hide" data-field="outlet_time_open"></div>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<label data-field="outlet_time_close">Time Close</label> <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 class="form-control-feedback hide" data-field="outlet_time_close"></div>
</div> </div>
</div> </div>
@ -455,14 +458,14 @@
<label data-field="outlet_address"> <label data-field="outlet_address">
Address Address
</label> </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 class="form-control-feedback hide" data-field="outlet_address"></div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="contact_nums"> <label data-field="contact_nums">
Contact Numbers Contact Numbers
</label> </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 class="form-control-feedback hide" data-field="hub_contact_nums"></div>
</div> </div>
</div> </div>
@ -491,24 +494,26 @@
</tr> </tr>
</thead> </thead>
<tbody> <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"> <td colspan="6">
No items to display. No items to display.
</td> </td>
</tr> </tr>
{% for rider in obj.getOutlet.getHub.getRiders %} {% if obj.getOutlet.getHub %}
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}> {% for rider in obj.getOutlet.getHub.getRiders %}
<td> <tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}>
<div class="user-portrait-sm" style="background-image: url('{{ rider.getImageFile ? "/uploads/" ~ rider.getImageFile : "/assets/images/user.gif" }}');"></div> <td>
</td> <div class="user-portrait-sm" style="background-image: url('{{ rider.getImageFile ? "/uploads/" ~ rider.getImageFile : "/assets/images/user.gif" }}');"></div>
<td>{{ rider.getFirstName }}</td> </td>
<td>{{ rider.getLastName }}</td> <td>{{ rider.getFirstName }}</td>
<td>{{ rider.getContactNumber }}</td> <td>{{ rider.getLastName }}</td>
<td>{{ rider.getPlateNumber }}</td> <td>{{ rider.getContactNumber }}</td>
<td></td> <td>{{ rider.getPlateNumber }}</td>
</tr> <td></td>
{% endfor %} </tr>
{% endfor %}
{% endif %}
</tbody> </tbody>
</table> </table>
</div> </div>