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

Merge branch '319-cmb-one-step-form-display-rider-distance' into '270-final-cmb-fixes'

Browse source 
Resolve "CMB - one step form display rider distance"

See merge request jankstudio/resq!368
This commit is contained in:
Kendrick Chan 2020-02-05 11:07:43 +00:00
commit 3e2d0db5cd
9 changed files with 85 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/JobOrderController.php
View file

@ -864,7 +864,7 @@ class JobOrderController extends Controller
// initialize error list
$error_array = [];
$id = -1;
$error_array = $jo_handler->generateOneStepJobOrder($req, $id);
$error_array = $jo_handler->processOneStepJobOrder($req, $id);
// check if any errors were found
if (!empty($error_array)) {

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

@ -19,11 +19,13 @@ use App\Entity\JobOrder;
use App\Entity\BatteryManufacturer;
use App\Entity\JOEvent;
use App\Entity\CustomerVehicle;
use App\Entity\Vehicle;
use App\Entity\Hub;
use App\Entity\Promo;
use App\Entity\Rider;
use App\Entity\JORejection;
use App\Entity\Warranty;
use App\Entity\Customer;
use App\Ramcar\InvoiceCriteria;
use App\Ramcar\CMBServiceType;
@ -387,7 +389,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
return $error_array;
}
public function generateOneStepJobOrder(Request $req, $id)
public function processOneStepJobOrder(Request $req, $id)
{
// initialize error list
$error_array = [];
@ -406,15 +408,79 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.';
}
// check if customer vehicle is set
if (empty($req->request->get('customer_vehicle'))) {
$error_array['customer_vehicle'] = 'No vehicle selected.';
} else {
// get customer vehicle
$cust_vehicle = $em->getRepository(CustomerVehicle::class)->find($req->request->get('customer_vehicle'));
// check if new customer
if ($req->request->get('new_customer'))
{
if (empty($req->request->get('customer_customer_notes')))
{
$error_array['customer_customer_notes'] = 'Customer notes cannot be null.';
}
if (empty($cust_vehicle)) {
$error_array['customer_vehicle'] = 'Invalid vehicle specified.';
$new_cust = new Customer();
$new_cv = new CustomerVehicle();
// find the vehicle using vid
$new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
if (empty($new_vehicle))
{
$error_array['cv_mfg'] = 'Invalid manufacturer specified.';
$error_array['cv_make'] = 'Invalid make specified.';
}
else
{
$new_cust->setLastName($req->request->get('customer_last_name'))
->setFirstName($req->request->get('customer_first_name'))
->setPhoneMobile($req->request->get('customer_phone_mobile'))
->setPhoneLandline($req->request->get('customer_phone_landline'))
->setPhoneOffice($req->request->get('customer_phone_office'))
->setPhoneFax($req->request->get('customer_phone_fax'))
->setCustomerNotes($req->request->get('customer_customer_notes'));
$new_cv->setCustomer($new_cust)
->setVehicle($new_vehicle)
->setPlateNumber($req->request->get('cv_plate'))
->setModelYear($req->request->get('cv_year'))
->setColor('')
->setStatusCondition('')
->setFuelType('')
->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
$jo->setCustomer($new_cust);
$jo->setCustomerVehicle($new_cv);
$em->persist($new_cust);
$em->persist($new_cv);
}
}
else
{
// check if customer vehicle is set
if (empty($req->request->get('customer_vehicle'))) {
$error_array['customer_vehicle'] = 'No vehicle selected.';
} else
{
// get customer vehicle
$cust_vehicle = $em->getRepository(CustomerVehicle::class)->find($req->request->get('customer_vehicle'));
if (empty($cust_vehicle)) {
$error_array['customer_vehicle'] = 'Invalid vehicle specified.';
}
else
{
$jo->setCustomerVehicle($cust_vehicle);
$jo->setCustomer($cust_vehicle->getCustomer());
}
}
}
@ -458,8 +524,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
->setAdvanceOrder($req->request->get('flag_advance') ?? false)
->setServiceType($stype)
->setWarrantyClass($req->request->get('warranty_class'))
->setCustomer($cust_vehicle->getCustomer())
->setCustomerVehicle($cust_vehicle)
->setSource($req->request->get('source'))
->setStatus(JOStatus::ASSIGNED)
->setDeliveryInstructions($req->request->get('delivery_instructions'))

2
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -1127,7 +1127,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
}
public function generateOneStepJobOrder(Request $req, $id)
public function processOneStepJobOrder(Request $req, $id)
{
// initialize error list
$error_array = [];

4
src/Service/JobOrderHandlerInterface.php
View file

@ -22,8 +22,8 @@ interface JobOrderHandlerInterface
// generate job order
public function generateJobOrder(Request $req, int $id);
// generate one step job order
public function generateOneStepJobOrder(Request $req, int $id);
// process one step job order
public function processOneStepJobOrder(Request $req, int $id);
// dispatch job order
public function dispatchJobOrder(Request $req, int $id, MQTTClient $mclient);

1
src/Service/JobOrderManager.php
View file

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

4
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>
{% endfor %}
</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 class="col-lg-6">
<label data-field="cv-make">Make</label>
@ -186,7 +186,7 @@
<div class="col-lg-3">
<label data-field="cv_plate">Plate #</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_color"></div>
<div class="form-control-feedback hide" data-field="cv_plate"></div>
</div>
<!--
<div class="col-lg-3">

3
templates/job-order/list.all.html.twig
View file

@ -33,9 +33,8 @@
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<div class="input-group">
<label>Rider:</label>
<select class="form-control m-input" id="rider_list" name="rider_list">
<option value=""></option>
<option value="">All Riders</option>
{% for rider in riders %}
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
{% endfor %}

3
templates/job-order/list.fulfillment.html.twig
View file

@ -33,9 +33,8 @@
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<div>
<label>Rider:</label>
<select class="form-control m-input" id="rider_list" name="rider_list">
<option value=""></option>
<option value="">All Riders</option>
{% for rider in riders %}
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
{% endfor %}

3
templates/job-order/list.open.html.twig
View file

@ -33,9 +33,8 @@
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<div>
<label>Rider:</label>
<select class="form-control m-input" id="rider_list" name="rider_list">
<option value=""></option>
<option value="">All Riders</option>
{% for rider in riders %}
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
{% endfor %}