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

Fix to display service charge amount when loading an existing JO. #355

Browse source
This commit is contained in:
Korina Cordero 2020-02-24 03:06:47 +00:00
parent 311cea8d48
commit 4b9b3622d5
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1407,7 +1407,22 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$params['mode'] = 'onestep-edit'; $params['mode'] = 'onestep-edit';
$params['cvid'] = $obj->getCustomerVehicle()->getID(); $params['cvid'] = $obj->getCustomerVehicle()->getID();
$params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID(); $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
$params['jo_service_charges'] = $obj->getMeta('service_charges');
// get service charges
$sc_array = [];
$jo_service_charges = $obj->getMeta('service_charges');
if (!(empty($jo_service_charges)))
{
foreach ($jo_service_charges as $jo_sc_id)
{
// find service charge
$sc_obj = $em->getRepository(ServiceCharge::class)->find($jo_sc_id);
$sc_array[] = $sc_obj;
}
}
$params['jo_service_charges'] = $sc_array;
$this->fillDropdownParameters($params); $this->fillDropdownParameters($params);
$this->fillFormTags($params); $this->fillFormTags($params);

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

@ -508,19 +508,19 @@
{% endif %} {% endif %}
</div> </div>
<!-- loop through existing service charges for job order --> <!-- loop through existing service charges for job order -->
{% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %} {% for jo_sc in jo_service_charges %}
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<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">
<select class="form-control m-input sc-select" name="service_charges"> <select class="form-control m-input sc-select" name="service_charges">
{% for key, sc in service_charges %} {% for key, sc in service_charges %}
<option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.id == sc.getID ? ' selected' }}>{{ sc.getName }}</option> <option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.getID == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
</div> </div>
<div class="col-lg-5"> <div class="col-lg-5">
<input class="form-control sc-amount" type="text" value="0" disabled> <input class="form-control sc-amount" type="text" value="{{ jo_sc.getAmount }}" disabled>
</div> </div>
<div class="col-lg-1"> <div class="col-lg-1">
<button class="btn btn-danger btn-sc-remove">X</button> <button class="btn btn-danger btn-sc-remove">X</button>