From be52d089d2528740391b714b86bde30c7aa9953b Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Thu, 25 Jun 2020 08:50:08 +0000
Subject: [PATCH] Fix JO saving when plate number is blank. #424

---
 src/Service/JobOrderHandler/CMBJobOrderHandler.php | 14 ++++++++------
 templates/job-order/cmb.form.onestep.html.twig     |  6 +++---
 templates/job-order/cmb.form.walkin.html.twig      |  8 +++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 899ba83e..cb12cf00 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -454,8 +454,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
 
             // check if plate number is in request
-            if (empty(trim($req->request->get('cv_plate'))))
-                $error_array['cv_plate'] = 'Plate number is required.';
+            if (empty(trim($req->request->get('plate_number'))))
+                $error_array['plate_number'] = 'Plate number is required.';
 
             // find the vehicle using vid
             $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); 
@@ -479,7 +479,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
                 $new_cv->setCustomer($new_cust)
                     ->setVehicle($new_vehicle)
-                    ->setPlateNumber(trim($req->request->get('cv_plate')))
+                    ->setPlateNumber(trim($req->request->get('plate_number')))
                     ->setModelYear($req->request->get('cv_year'))
                     ->setColor('')
                     ->setStatusCondition('')
@@ -648,6 +648,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
             // add errors to list
             foreach ($errors as $error) {
+                error_log($error->getPropertyPath());
                 $error_array[$error->getPropertyPath()] = $error->getMessage();
             }
 
@@ -2490,8 +2491,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
 
             // check if plate number is in request
-            if (empty(trim($req->request->get('cv_plate'))))
-                $error_array['cv_plate'] = 'Plate number is required.';
+            if (empty(trim($req->request->get('plate_number'))))
+                $error_array['plate_number'] = 'Plate number is required.';
 
             // find the vehicle using vid
             $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
@@ -2516,7 +2517,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
                 $new_cv->setCustomer($new_cust)
                     ->setVehicle($new_vehicle)
-                    ->setPlateNumber(trim($req->request->get('cv_plate')))
+                    ->setPlateNumber(trim($req->request->get('plate_number')))
                     ->setModelYear($req->request->get('cv_year'))
                     ->setColor('')
                     ->setStatusCondition('')
@@ -2650,6 +2651,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
             // add errors to list
             foreach ($errors as $error) {
+                error_log($error->getPropertyPath());
                 $error_array[$error->getPropertyPath()] = $error->getMessage();
             }
 
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index c3ad623f..e10d0add 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -184,11 +184,11 @@
                                 </div>
                                 <div class="form-group m-form__group row">
                                     <div class="col-lg-3">
-                                        <label data-field="cv_plate">Plate #
+                                        <label data-field="plate_number">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>
-                                        <div class="form-control-feedback hide" data-field="cv_plate"></div>
+                                        <input type="text" name="plate_number" 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="plate_number"></div>
                                     </div>
                                     <!--
                                     <div class="col-lg-3">
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index fa9104af..20daef7b 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -184,11 +184,11 @@
                                 </div>
                                 <div class="form-group m-form__group row">
                                     <div class="col-lg-3">
-                                        <label data-field="cv_plate">Plate #
+                                        <label data-field="plate_number">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>
-                                        <div class="form-control-feedback hide" data-field="cv_plate"></div>
+                                        <input type="text" name="plate_number" 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="plate_number"></div>
                                     </div>
                                     <!--
                                     <div class="col-lg-3">
@@ -616,6 +616,8 @@ $(function() {
 
             // display errors contextually
             $.each(errors, function(field, msg) {
+                console.log(field);
+                console.log(msg);
                 var formfield = $("[name='" + field + "'], [data-name='" + field + "']");
                 var label = $("label[data-field='" + field + "']");
                 var msgbox = $(".form-control-feedback[data-field='" + field + "']");