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

Removed the color, status, and fuel type fields for customer vehicle. #270

Browse source
This commit is contained in:
Korina Cordero 2019-11-07 02:10:13 +00:00
parent 2bb213ef33
commit 954ae0e2d3
2 changed files with 14 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Controller/CustomerController.php
View file

@ -226,9 +226,9 @@ class CustomerController extends Controller
->setVehicle($vobj)
->setPlateNumber($vehicle->plate_number)
->setModelYear($vehicle->model_year)
->setColor($vehicle->color)
->setStatusCondition($vehicle->status_condition)
->setFuelType($vehicle->fuel_type)
->setColor('')
->setStatusCondition('')
->setFuelType('')
->setActive($vehicle->flag_active)
->setCustomer($row);
@ -330,6 +330,7 @@ class CustomerController extends Controller
protected function updateVehicles($em, Customer $cust, $vehicles)
{
error_log('updateVehicles');
$vehicle_ids = [];
foreach ($vehicles as $vehicle)
@ -362,9 +363,9 @@ class CustomerController extends Controller
->setVehicle($vobj)
->setPlateNumber($vehicle->plate_number)
->setModelYear($vehicle->model_year)
->setColor($vehicle->color)
->setStatusCondition($vehicle->status_condition)
->setFuelType($vehicle->fuel_type)
->setColor('')
->setStatusCondition('')
->setFuelType('')
->setActive($vehicle->flag_active);
// if specified, check if battery exists
@ -410,6 +411,7 @@ class CustomerController extends Controller
public function updateSubmit(Request $req, ValidatorInterface $validator, $id)
{
error_log('updateSubmit for customer');
$this->denyAccessUnlessGranted('customer.update', null, 'No access.');
// get row data

49
templates/customer/form.html.twig
View file

@ -325,14 +325,14 @@
<input type="text" name="plate_number" id="vehicle-plate-number" class="form-control m-input" data-required="1">
<div class="form-control-feedback hide" data-field="plate_number"></div>
</div>
<div class="col-lg-3">
<div class="col-lg-3" style="display:none">
<label for="vehicle-color" data-field="color">Color</label>
<input type="text" name="color" id="vehicle-color" class="form-control m-input" data-required="1">
<input type="text" name="color" id="vehicle-color" class="form-control m-input">
<div class="form-control-feedback hide" data-field="color"></div>
</div>
<div class="col-lg-3">
<div class="col-lg-3" style="display:none">
<label for="vehicle-status" data-field="status_condition">Status</label>
<select name="status_condition" class="form-control m-input" id="vehicle-status" data-required="1">
<select name="status_condition" class="form-control m-input" id="vehicle-status">
<option value=""></option>
{% for key, status_condition in status_conditions %}
<option value="{{ key }}">{{ status_condition }}</option>
@ -340,9 +340,9 @@
</select>
<div class="form-control-feedback hide" data-field="status_condition"></div>
</div>
<div class="col-lg-3">
<div class="col-lg-3" style="display:none">
<label for="vehicle-fuel-type" data-field="fuel_type">Fuel Type</label>
<select name="fuel_type" class="form-control m-input" id="vehicle-fuel-type" data-required="1">
<select name="fuel_type" class="form-control m-input" id="vehicle-fuel-type">
<option value=""></option>
{% for key, fuel_type in fuel_types %}
<option value="{{ key }}">{{ fuel_type }}</option>
@ -629,13 +629,10 @@
battery: "{{ battery ? battery.getID() }}",
battery_label: "{{ battery ? battery.getModel().getName() ~ ' ' ~ battery.getSize().getName() ~ ' (' ~ battery.getProductCode() ~ ')' }}",
bmfg: "{{ battery ? battery.getManufacturer().getID() }}",
color: "{{ cv.getColor() }}",
flag_active: {{ cv.isActive() ? 'true' : 'false' }},
flag_motolite_battery: {{ cv.hasMotoliteBattery() ? 'true' : 'false' }},
fuel_type: "{{ cv.getFuelType() }}",
model_year: "{{ cv.getModelYear() }}",
plate_number: "{{ cv.getPlateNumber() }}",
status_condition: "{{ cv.getStatusCondition() }}",
vehicle: "{{ vehicle ? vehicle.getID() }}",
vehicle_label: "{{ vehicle ? vehicle.getManufacturer().getName() ~ ' ' ~ vehicle.getMake() ~ ' (' ~ vehicle.getModelYearFrom() ~ ' ' ~ vehicle.getModelYearTo() ~ ')' }}",
vmfg: "{{ vehicle ? vehicle.getManufacturer().getID() }}",
@ -1002,40 +999,6 @@
return row.plate_number + '<div class="form-control-feedback hide" data-field="plate_number"></div>';
}
},
{
field: 'color',
title: 'Color',
width: 70,
template: function (row, index, datatable) {
return row.color + '<div class="form-control-feedback hide" data-field="color"></div>';
}
},
{
field: 'status_condition',
title: 'Cond.',
template: function (row, index, datatable) {
var status_conditions = {
{% for key, status_condition in status_conditions %}
"{{ key }}": "{{ status_condition }}",
{% endfor %}
};
return status_conditions[row.status_condition] + '<div class="form-control-feedback hide" data-field="status_condition"></div>';
}
},
{
field: 'fuel_type',
title: 'Fuel Type',
template: function (row, index, datatable) {
var fuel_types = {
{% for key, fuel_type in fuel_types %}
"{{ key }}": "{{ fuel_type }}",
{% endfor %}
};
return fuel_types[row.fuel_type] + '<div class="form-control-feedback hide" data-field="fuel_type"></div>';
}
},
{
field: 'warranty_code',
title: 'Wty. Code',