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

Added validations to customer and customer vehicle data. #319

Browse source
This commit is contained in:
Korina Cordero 2020-02-05 05:28:59 +00:00
parent a3e40de170
commit cf783bf1cb
3 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -411,22 +411,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// check if new customer // check if new customer
if ($req->request->get('new_customer')) if ($req->request->get('new_customer'))
{ {
// get customer details if (empty($req->request->get('customer_customer_notes')))
$c_first_name = $req->request->get('customer_first_name'); {
$c_last_name = $req->request->get('customer_last_name'); $error_array['customer_customer_notes'] = 'Customer notes cannot be null.';
$c_phone_mobile = $req->request->get('customer_phone_mobile'); }
$c_phone_landline = $req->request->get('customer_phone_landline');
$c_phone_office = $req->request->get('customer_phone_office');
$c_phone_fax = $req->request->get('customer_phone_fax');
$c_notes = $req->request->get('customer_customer_notes');
// get customer vehicle details
$cv_mfg_id = $req->request->get('cv_mfg');
$cv_make_id = $req->request->get('cv_make');
$cv_year = $req->request->get('cv_year');
$cv_plate = $req->request->get('cv_plate');
// TODO: need to add validation
$new_cust = new Customer(); $new_cust = new Customer();
$new_cv = new CustomerVehicle(); $new_cv = new CustomerVehicle();
@ -435,31 +423,38 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
if (empty($new_vehicle)) if (empty($new_vehicle))
{ {
// TODO: temporary validation $error_array['cv_mfg'] = 'Invalid manufacturer specified.';
$error_array['customer_vehicle'] = 'Invalid vehicle specified.'; $error_array['cv_make'] = 'Invalid make specified.';
} }
else else
{ {
$new_cust->setLastName($c_last_name) $new_cust->setLastName($req->request->get('customer_last_name'))
->setFirstName($c_first_name) ->setFirstName($req->request->get('customer_first_name'))
->setPhoneMobile($c_phone_mobile) ->setPhoneMobile($req->request->get('customer_phone_mobile'))
->setPhoneLandline($c_phone_landline) ->setPhoneLandline($req->request->get('customer_phone_landline'))
->setPhoneOffice($c_phone_office) ->setPhoneOffice($req->request->get('customer_phone_office'))
->setPhoneFax($c_phone_office) ->setPhoneFax($req->request->get('customer_phone_fax'))
->setCustomerNotes($c_notes); ->setCustomerNotes($req->request->get('customer_customer_notes'));
// TODO: set setHasMotoliteBattery to true if battery purchase
$new_cv->setCustomer($new_cust) $new_cv->setCustomer($new_cust)
->setVehicle($new_vehicle) ->setVehicle($new_vehicle)
->setPlateNumber($cv_plate) ->setPlateNumber($req->request->get('cv_plate'))
->setModelYear($cv_year) ->setModelYear($req->request->get('cv_year'))
->setColor('') ->setColor('')
->setStatusCondition('') ->setStatusCondition('')
->setFuelType('') ->setFuelType('')
->setHasMotoliteBattery(false)
->setActive(); ->setActive();
if (($req->request->get('service_type')) == CMBServiceType::BATTERY_REPLACEMENT_NEW)
{
$new_cv->setHasMotoliteBattery(true);
}
else
{
$new_cv->setHasMotoliteBattery(false);
}
// link JO to new customer // link JO to new customer
$jo->setCustomer($new_cust); $jo->setCustomer($new_cust);
$jo->setCustomerVehicle($new_cv); $jo->setCustomerVehicle($new_cv);

1
src/Service/JobOrderManager.php
View file

@ -45,6 +45,7 @@ class JobOrderManager
{ {
$new_battery = $item->getBattery(); $new_battery = $item->getBattery();
$cust_vehicle->setCurrentBattery($new_battery); $cust_vehicle->setCurrentBattery($new_battery);
$cust_vehicle->setHasMotoliteBattery(true);
} }
$this->em->flush(); $this->em->flush();

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

@ -162,7 +162,7 @@
<option value="{{ manufacturer.getID() }}" {% if vmfg_id == manufacturer.getID %}selected{% endif %}>{{ manufacturer.getName() }}</option> <option value="{{ manufacturer.getID() }}" {% if vmfg_id == manufacturer.getID %}selected{% endif %}>{{ manufacturer.getName() }}</option>
{% endfor %} {% endfor %}
</select> </select>
<div class="form-control-feedback hide" data-field="cv-mfg"></div> <div class="form-control-feedback hide" data-field="cv_mfg"></div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="cv-make">Make</label> <label data-field="cv-make">Make</label>