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

Merge branch '484-cmb-cmb-changes' into '472-cmb-release'

Browse source 
Resolve "CMB - CMB changes"

See merge request jankstudio/resq!569
This commit is contained in:
Korina Cordero 2020-09-08 03:32:40 +00:00
commit 4de3277030
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Entity/JobOrder.php
View file

@ -354,7 +354,7 @@ class JobOrder
// rider plate number since rider can change vehicles // rider plate number since rider can change vehicles
/** /**
* @ORM\Column(type="string", length=10) * @ORM\Column(type="string", length=10, nullable=true)
*/ */
protected $rider_plate_num; protected $rider_plate_num;

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

@ -467,6 +467,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.'; $error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.';
} }
// check if responsible party is present
if (empty($req->request->get('responsible_party')))
$error_array['responsible_party'] = 'Responsible party is required.';
// check if new customer // check if new customer
if ($req->request->get('new_customer', false)) if ($req->request->get('new_customer', false))
{ {
@ -553,6 +557,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
} }
// check if hub AND rider is selected // check if hub AND rider is selected
$rider_plate_number = '';
if ((empty($req->request->get('hub_id'))) && if ((empty($req->request->get('hub_id'))) &&
(empty($req->request->get('rider_id')))) { (empty($req->request->get('rider_id')))) {
$error_array['hub'] = 'No hub selected.'; $error_array['hub'] = 'No hub selected.';
@ -575,15 +580,16 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// check if rider is still available // check if rider is still available
if (!($rider->isAvailable())) if (!($rider->isAvailable()))
$error_array['rider'] = 'Selected rider is unavailable.'; $error_array['rider'] = 'Selected rider is unavailable.';
$rider_plate_number = $rider->getPlateNumber();
} }
} }
} }
} }
// get rider plate number from rider // delivery address
$rider_plate_number = ''; if (empty($req->request->get('delivery_address')))
if ($rider != null) $error_array['delivery_address'] = 'Delivery address is required.';
$rider_plate_number = $rider->getPlateNumber();
// get discount and set to meta // get discount and set to meta
$discount = $req->request->get('invoice_discount'); $discount = $req->request->get('invoice_discount');
@ -2600,6 +2606,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$jo = new JobOrder(); $jo = new JobOrder();
} }
// check if responsible party is present
if (empty($req->request->get('responsible_party')))
$error_array['responsible_party'] = 'Responsible party is required.';
// check if new customer // check if new customer
if ($req->request->get('new_customer', false)) if ($req->request->get('new_customer', false))
{ {

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

@ -342,7 +342,10 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<div class="col-lg-12 form-group-inner"> <div class="col-lg-12 form-group-inner">
<label>Responsible Party</label> <label>
Responsible Party
<span style="color:red"> *</span>
</label>
<input type="text" name="responsible_party" class="form-control m-input" value="{{ obj.getResponsibleParty|default('') }}" > <input type="text" name="responsible_party" class="form-control m-input" value="{{ obj.getResponsibleParty|default('') }}" >
<div class="form-control-feedback hide" data-field="responsible_party"></div> <div class="form-control-feedback hide" data-field="responsible_party"></div>
</div> </div>

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

@ -341,7 +341,10 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<div class="col-lg-12 form-group-inner"> <div class="col-lg-12 form-group-inner">
<label>Responsible Party</label> <label>
Responsible Party
<span style="color:red"> *</span>
</label>
<input type="text" name="responsible_party" class="form-control m-input" value="{{ obj.getResponsibleParty|default('') }}" > <input type="text" name="responsible_party" class="form-control m-input" value="{{ obj.getResponsibleParty|default('') }}" >
<div class="form-control-feedback hide" data-field="responsible_party"></div> <div class="form-control-feedback hide" data-field="responsible_party"></div>
</div> </div>