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

Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 330-entity-logging-service-bundle

Browse source
This commit is contained in:
Korina Cordero 2020-03-11 01:25:34 +00:00
commit bd9dff5ed8
6 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -431,7 +431,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
} }
// check if new customer // check if new customer
if ($req->request->get('new_customer')) if ($req->request->get('new_customer', false))
{ {
if (empty($req->request->get('customer_customer_notes'))) if (empty($req->request->get('customer_customer_notes')))
{ {
@ -443,6 +443,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
if (!($valid_mobile)) if (!($valid_mobile))
$error_array['customer_phone_mobile'] = 'Invalid mobile phone number.'; $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
// check if plate number is in request
if (empty($req->request->get('cv_plate')))
$error_array['cv_plate'] = 'Plate number is required.';
// find the vehicle using vid // find the vehicle using vid
$new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
if (empty($new_vehicle)) if (empty($new_vehicle))
@ -2447,7 +2451,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
} }
// check if new customer // check if new customer
if ($req->request->get('new_customer')) if ($req->request->get('new_customer', false))
{ {
if (empty($req->request->get('customer_customer_notes'))) if (empty($req->request->get('customer_customer_notes')))
{ {
@ -2459,6 +2463,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
if (!($valid_mobile)) if (!($valid_mobile))
$error_array['customer_phone_mobile'] = 'Invalid mobile phone number.'; $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
// check if plate number is in request
if (empty($req->request->get('cv_plate')))
$error_array['cv_plate'] = 'Plate number is required.';
// find the vehicle using vid // find the vehicle using vid
$new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
if (empty($new_vehicle)) if (empty($new_vehicle))

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

@ -184,7 +184,9 @@
</div> </div>
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-3"> <div class="col-lg-3">
<label data-field="cv_plate">Plate #</label> <label data-field="cv_plate">Plate #
<span style="color:red"> *</span>
</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> <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_plate"></div> <div class="form-control-feedback hide" data-field="cv_plate"></div>
</div> </div>
@ -319,7 +321,7 @@
</div> </div>
<br> <br>
<div class="col-lg-12 form-group-inner"> <div class="col-lg-12 form-group-inner">
<label data-field="delivery_instructions">Delivery Instructions</label> <label data-field="delivery_instructions">{% trans %}delivery_instructions_label{% endtrans %}</label>
<textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea> <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
</div> </div>
</div> </div>

4
templates/job-order/cmb.form.walkin.html.twig
View file

@ -184,7 +184,9 @@
</div> </div>
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-3"> <div class="col-lg-3">
<label data-field="cv_plate">Plate #</label> <label data-field="cv_plate">Plate #
<span style="color:red"> *</span>
</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> <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_plate"></div> <div class="form-control-feedback hide" data-field="cv_plate"></div>
</div> </div>

12
templates/rider/popup.html.twig
View file

@ -10,4 +10,16 @@
{{ cust.getNameDisplay }}<br> {{ cust.getNameDisplay }}<br>
{{ cv.getPlateNumber }} {{ cv.getPlateNumber }}
{% endif %} {% endif %}
<br>
{% set job_orders = rider.getOpenJobOrders %}
{% if job_orders is not empty %}
{% for job_order in job_orders %}
{% set customer = job_order.getCustomer %}
{% set cust_vehicle = job_order.getCustomerVehicle %}
<br>
<a href="{{ url('jo_onestep_edit_form', {'id': job_order.getID}) }}">Job Order #{{ job_order.getID }}</a><br>
{{ customer.getNameDisplay }}<br>
{{ cust_vehicle.getPlateNumber }}
{% endfor %}
{% endif %}

2
translations/cmb.messages.en.yaml
View file

@ -11,7 +11,7 @@ battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
jo_title_pdf: Res-Q for CMB Job Order jo_title_pdf: Res-Q for CMB Job Order
country_code_prefix: '+60' country_code_prefix: '+60'
delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.' delivery_instructions_label: 'CarFix Details'
# images # images
image_logo_login: /assets/images/black-text-logo-01.png image_logo_login: /assets/images/black-text-logo-01.png

10
translations/messages.en.yaml
View file

@ -11,7 +11,7 @@ battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
jo_title_pdf: Res-Q for CMB Job Order jo_title_pdf: Res-Q for CMB Job Order
country_code_prefix: '+60' country_code_prefix: '+60'
delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.' delivery_instructions_label: 'CarFix Details'
# images # images
image_logo_login: /assets/images/black-text-logo-01.png image_logo_login: /assets/images/black-text-logo-01.png
@ -22,8 +22,6 @@ image_dashboard: /assets/images/century_logo.png
image_jo_pdf: /public/assets/images/black-text-logo-01-115x115.png image_jo_pdf: /public/assets/images/black-text-logo-01-115x115.png
# default point for maps # default point for maps
default_lat: 14.6091 default_lat: 3.084216
default_long: 121.0223 default_long: 101.6129996
#default_lat: 3.084216 default_region: my
#default_long: 101.6129996
default_region: ph