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

Merge branch '367-cmb-plate-number-required-if-new-customer-or-car' into '270-final-cmb-fixes'

Browse source 
Resolve "CMB - plate number required if new customer or car"

See merge request jankstudio/resq!412
This commit is contained in:
Kendrick Chan 2020-03-10 06:23:04 +00:00
commit c0595684d6
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -436,7 +436,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
}
// check if new customer
if ($req->request->get('new_customer'))
if ($req->request->get('new_customer', false))
{
if (empty($req->request->get('customer_customer_notes')))
{
@ -448,6 +448,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
if (!($valid_mobile))
$error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
// check if plate number is in request
if (empty($req->request->get('cv_plate')))
$error_array['cv_plate'] = 'Plate number is required.';
// find the vehicle using vid
$new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
if (empty($new_vehicle))
@ -2451,7 +2455,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
}
// check if new customer
if ($req->request->get('new_customer'))
if ($req->request->get('new_customer', false))
{
if (empty($req->request->get('customer_customer_notes')))
{
@ -2463,6 +2467,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
if (!($valid_mobile))
$error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
// check if plate number is in request
if (empty($req->request->get('cv_plate')))
$error_array['cv_plate'] = 'Plate number is required.';
// find the vehicle using vid
$new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
if (empty($new_vehicle))

4
templates/job-order/cmb.form.onestep.html.twig
View file

@ -184,7 +184,9 @@
</div>
<div class="form-group m-form__group row">
<div class="col-lg-3">
<label data-field="cv_plate">Plate #</label>
<label data-field="cv_plate">Plate #
<span style="color:red"> *</span>
</label>
<input type="text" name="cv_plate" id="cv-plate" class="form-control m-input cv_field" value="{{ obj.getCustomerVehicle.getPlateNumber|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="cv_plate"></div>
</div>

4
templates/job-order/cmb.form.walkin.html.twig
View file

@ -184,7 +184,9 @@
</div>
<div class="form-group m-form__group row">
<div class="col-lg-3">
<label data-field="cv_plate">Plate #</label>
<label data-field="cv_plate">Plate #
<span style="color:red"> *</span>
</label>
<input type="text" name="cv_plate" id="cv-plate" class="form-control m-input cv_field" value="{{ obj.getCustomerVehicle.getPlateNumber|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="cv_plate"></div>
</div>