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

Merge branch '83-make-battery-dropdown-display-in-cvehicle-incoming-job-order' into 'master'

Browse source 
Resolve "Make battery dropdown display in cvehicle incoming job order"

Closes #83

See merge request jankstudio/resq!70
This commit is contained in:
Kendrick Chan 2018-04-09 04:42:17 +00:00
commit 4e633033ba
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Controller/JobOrderController.php
View file

@ -174,6 +174,7 @@ class JobOrderController extends BaseController
// get customer vehicle // get customer vehicle
$cv = $em->getRepository(CustomerVehicle::class)->find($cvid); $cv = $em->getRepository(CustomerVehicle::class)->find($cvid);
$params['vid'] = $cv->getVehicle()->getID();
// make sure this customer vehicle exists // make sure this customer vehicle exists
if (empty($cv)) if (empty($cv))

18
templates/job-order/form.html.twig
View file

@ -380,7 +380,7 @@
</div> </div>
</div> </div>
<div class="m-form__seperator m-form__seperator--dashed"></div> <div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section{{ mode == 'create' ? ' m-form__section--last' }}"> <div class="m-form__section{{ mode == 'create' or mode == 'create_vehicle' ? ' m-form__section--last' }}">
<div class="m-form__heading"> <div class="m-form__heading">
<h3 class="m-form__heading-title"> <h3 class="m-form__heading-title">
Invoice Invoice
@ -401,7 +401,7 @@
<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">
<label>Discount Type</label> <label>Discount Type</label>
{% if mode == 'create' %} {% if mode == 'create' or mode == 'create_vehicle' %}
<select class="form-control m-input" id="invoice-promo" name="invoice_promo"> <select class="form-control m-input" id="invoice-promo" name="invoice_promo">
<option value="">None</option> <option value="">None</option>
{% for promo in promos %} {% for promo in promos %}
@ -469,7 +469,7 @@
</table> </table>
</div> </div>
</div> </div>
{% if mode == 'create' %} {% if mode == 'create' or mode == 'create_vehicle' %}
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-2 hide"> <div class="col-lg-2 hide">
<label for="invoice-bmfg">Manufacturer</label> <label for="invoice-bmfg">Manufacturer</label>
@ -1108,6 +1108,13 @@ $(function() {
// update battery list when changing manufacturer // update battery list when changing manufacturer
$("#invoice-bmfg").change(function() { $("#invoice-bmfg").change(function() {
{% if mode == 'create_vehicle' %}
vdata = {
'vehicle': {
'id': {{ vid }}
}
};
{% endif %}
// must have a selected vehicle // must have a selected vehicle
if (!vdata) if (!vdata)
return; return;
@ -1147,6 +1154,11 @@ $(function() {
}); });
}); });
// populate battery dropdown for create from vehicle mode
{% if mode == 'create_vehicle' %}
$("#invoice-bmfg").change();
{% endif %}
// mask quantity field // mask quantity field
$("#invoice-quantity").inputmask("mask", { $("#invoice-quantity").inputmask("mask", {
mask: "9999999", mask: "9999999",