From c4da604ac83a3506ba51dd9403505bd359d984c3 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 10 Mar 2020 06:07:29 +0000
Subject: [PATCH 1/2] Made plate number a required field if new customer. #367

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

diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index f0c4437a..4d9d5cab 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -448,6 +448,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             if (!($valid_mobile))
                 $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
             $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); 
             if (empty($new_vehicle))
@@ -2463,6 +2467,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             if (!($valid_mobile))
                 $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
             $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid'));
             if (empty($new_vehicle))
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index acd88d56..0285813f 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -184,7 +184,9 @@
                                 </div>
                                 <div class="form-group m-form__group row">
                                     <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>
                                         <div class="form-control-feedback hide" data-field="cv_plate"></div>
                                     </div>
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index a72973bd..e628d93b 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -184,7 +184,9 @@
                                 </div>
                                 <div class="form-group m-form__group row">
                                     <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>
                                         <div class="form-control-feedback hide" data-field="cv_plate"></div>
                                     </div>

From d61d82b6e7d233d02adcd2ca49c855850f6c3930 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 10 Mar 2020 06:22:25 +0000
Subject: [PATCH 2/2] Add default value false to checking for new customer.
 #367

---
 src/Service/JobOrderHandler/CMBJobOrderHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 4d9d5cab..d490ce56 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -436,7 +436,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // 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')))
             {
@@ -2455,7 +2455,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // 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')))
             {