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

Add saving of serial when adding/editing/fulfilling a JO. #335

Browse source
This commit is contained in:
Korina Cordero 2020-02-11 08:09:55 +00:00
parent cf7e026948
commit 9cd5915e88
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/JobOrderController.php
View file

@ -909,7 +909,7 @@ class JobOrderController extends Controller
$this->denyAccessUnlessGranted('jo_onestep.edit', null, 'No access.');
$error_array = [];
$error_array = $jo_handler->generateOneStepJobOrder($req, $id);
$error_array = $jo_handler->processOneStepJobOrder($req, $id);
// check if any errors were found
if (!empty($error_array)) {

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

@ -444,7 +444,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
->setColor('')
->setStatusCondition('')
->setFuelType('')
->setActive();
->setActive()
->setWarrantyCode($req->request->get('warranty_code'));
if (($req->request->get('service_type')) == CMBServiceType::BATTERY_REPLACEMENT_NEW)
{
@ -480,6 +481,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
{
$jo->setCustomerVehicle($cust_vehicle);
$jo->setCustomer($cust_vehicle->getCustomer());
// save serial into cv
$cust_vehicle->setWarrantyCode($req->request->get('warranty_code'));
$em->persist($cust_vehicle);
}
}
}
@ -893,8 +899,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// save to customer vehicle battery record
$this->updateVehicleBattery($obj);
// validated! save the entity
$em->flush();
// save serial to customer vehicle
$cust_vehicle = $obj->getCustomerVehicle();
$cust_vehicle->setWarrantyCode($req->request->get('warranty_code'));
$em->persist($cust_vehicle);
// get rider
$rider = $obj->getRider();
@ -909,7 +918,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// create the warranty if new battery only
if ($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW)
{
$serial = null;
$serial = $req->request->get('warranty_code') ;
$warranty_class = $obj->getWarrantyClass();
$first_name = $obj->getCustomer()->getFirstName();
$last_name = $obj->getCustomer()->getLastName();
@ -945,6 +954,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
}
}
// validated! save the entity
$em->flush();
}
}
@ -2301,6 +2313,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// warranty expiration
// use GetWarrantyPrivate for passenger warranty
$warr_months = 0;
$warr = $jo->getWarrantyClass();
if ($warr == CMBWarrantyClass::WTY_PASSENGER)
$warr_months = $battery->getWarrantyPrivate();

2
src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View file

@ -526,7 +526,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
// create warranty
if ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW)
{
$serial = null;
$serial = $jo->getCustomerVehicle()->getWarrantyCode();
$warranty_class = $jo->getWarrantyClass();
$first_name = $jo->getCustomer()->getFirstName();
$last_name = $jo->getCustomer()->getLastName();

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

@ -211,7 +211,7 @@
</div>
<div class="col-lg-3">
<label data-field="warranty_code">Serial Number</label>
<input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}" data-vehicle-field="1" disabled>
<input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}">
<div class="form-control-feedback hide" data-field="warranty_code"></div>
</div>
<div class="col-lg-3">