From 52f075ccbaf2aa6cff59f0f9f47a31208e2a3561 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 10 Feb 2020 02:48:21 +0000
Subject: [PATCH 1/7] Add new fields to customer. #324

---
 src/Entity/Customer.php | 50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
index d9dd9b98..afad3ce9 100644
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -165,6 +165,21 @@ class Customer
      */
     protected $privpol_promo;
 
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_promo_email;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_promo_sms;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_dpa_consent;
+
     public function __construct()
     {
         $this->numbers = new ArrayCollection();
@@ -191,6 +206,10 @@ class Customer
         $this->priv_promo = 0;
 
         $this->flag_csat = false;
+
+        $this->flag_promo_email = false;
+        $this->flag_promo_sms = false;
+        $this->flag_dpa_consent = false;
     }
 
     public function getID()
@@ -485,5 +504,36 @@ class Customer
         return $this->privpol_promo;
     }
 
+    public function setPromoEmail($flag_promo_email = true)
+    {
+        $this->flag_promo_email = $flag_promo_email;
+        return $this;
+    }
 
+    public function isPromoEmail()
+    {
+        return $this->flag_promo_email;
+    }
+
+    public function setPromoSms($flag_promo_sms = true)
+    {
+        $this->flag_promo_sms = $flag_promo_sms;
+        return $this;
+    }
+
+    public function isPromoSms()
+    {
+        return $this->flag_promo_sms;
+    }
+
+    public function setDpaConsent($flag_dpa_consent = true)
+    {
+        $this->flag_dpa_consent = $flag_dpa_consent;
+        return $this;
+    }
+
+    public function isDpaConsent()
+    {
+        return $this->flag_dpa_consent;
+    }
 }

From e260edc80d7628fefb60dd7bf06609dd627ca6d2 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 10 Feb 2020 03:40:00 +0000
Subject: [PATCH 2/7] Add new fields to incoming job order form. #324

---
 templates/job-order/form.html.twig | 36 +++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index fe9f00ac..8b250b52 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -148,6 +148,10 @@
 										<textarea name="customer_customer_notes" id="customer-customer-notes" class="form-control m-input" data-vehicle-field="1" rows="4" disabled>{{ obj.getCustomer ? obj.getCustomer.getCustomerNotes }}</textarea>
 										<div class="form-control-feedback hide" data-field="customer_customer_notes"></div>
 									</div>
+                                                                        <div class="col-lg-6">
+                                                                            <input type="checkbox" name="flag_dpa_consent" id="flag-dpa_consent" value="1"{{ obj.getCustomer ? obj.getCustomer.isDpaConsent ? ' checked' }} disabled>
+                                                                            <label class="switch-label">With DPA Consent</label>
+                                                                        </div>
 								</div>
 							</div>
 							<div class="m-form__section">
@@ -295,8 +299,8 @@
 										<div class="form-control-feedback hide" data-field="tier2_notes"></div>
 									</div>
 								</div>
-								<div class="form-group m-form__group row">
-									<div class="col-lg-6">
+				<div class="form-group m-form__group row">
+                                    <div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
                                             <label data-field="source">Transaction Origin</label>
                                             <select class="form-control m-input" id="source" name="source">
@@ -311,7 +315,7 @@
                                             <label data-field="delivery_instructions">Delivery Instructions</label>
                                             <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
                                         </div>
-									</div>
+				    </div>
                                     <div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
                                             <label>Prepared By</label>
@@ -331,6 +335,32 @@
                                             <div class="form-control-feedback hide" data-field="date_transaction"></div>
                                         </div>
                                     </div>
+                                </div>
+                                <div class="form-group m-form__group row">
+                                    <div class="col-lg-6">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="source">Marketing Promo</label>
+                                                <div class="m-checkbox-list">
+                                                    <label class="m-checkbox">
+                                                        <input type="checkbox" name="flag_promo_sms" value="{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked': '' }}" >
+                                                            SMS
+                                                        <span></span>
+                                                    </label>
+                                                    <label class="m-checkbox">
+                                                        <input type="checkbox" name="flag_promo_email" value="{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked': '' }}" >
+                                                            Email
+                                                        <span></span>
+                                                    </label>
+                                                </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-6">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label>Email Address</label>
+                                            <input type="text" name="email_address" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getEmail|default('') }}" disabled>
+                                            <div class="form-control-feedback hide" data-field="email_address"></div>
+                                        </div>
+                                    </div>
                                 </div>
 								<!--
 								<div class="form-group m-form__group row">

From 5dc57dc073872c6b92b58e632ec25209e370bf1c Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 10 Feb 2020 05:44:00 +0000
Subject: [PATCH 3/7] Add new fields to customer form. #324

---
 .../CustomerHandler/ResqCustomerHandler.php   |  5 +-
 templates/customer/form.html.twig             | 70 +++++++++++++------
 templates/job-order/form.html.twig            |  4 +-
 3 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/src/Service/CustomerHandler/ResqCustomerHandler.php b/src/Service/CustomerHandler/ResqCustomerHandler.php
index 5f7e00e2..f0e77ebe 100644
--- a/src/Service/CustomerHandler/ResqCustomerHandler.php
+++ b/src/Service/CustomerHandler/ResqCustomerHandler.php
@@ -566,7 +566,10 @@ class ResqCustomerHandler implements CustomerHandlerInterface
             ->setCustomerNotes($req->request->get('customer_notes'))
             ->setEmail($req->request->get('email'))
             ->setIsCSAT($req->request->get('flag_csat') ? true : false)
-            ->setActive($req->request->get('flag_active') ? true : false);
+            ->setActive($req->request->get('flag_active') ? true : false)
+            ->setPromoSms($req->request->get('flag_promo_sms') ? true : false)
+            ->setPromoEmail($req->request->get('flag_promo_email') ? true : false)
+            ->setDpaConsent($req->request->get('flag_dpa_consent') ? true : false);
 
         // phone numbers
         $obj->setPhoneMobile($req->request->get('phone_mobile'))
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index f502e778..cb07b5a3 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -92,30 +92,54 @@
 	                                </div>
 	                            </div>
 	                            <div class="form-group m-form__group row">
-									<div class="col-lg-12">
-										<span class="m-switch m-switch--icon block-switch">
-											<label>
-												<input type="checkbox" name="flag_csat" id="flag_csat" value="1"{{ obj.isCSAT() ? ' checked' }}>
-												<label class="switch-label">CSAT</label>
-												<span></span>
-											</label>
-										</span>
-										<div class="form-control-feedback hide" data-field="flag_active"></div>
-									</div>
-								</div>
+                                        <div class="col-lg-4">
+                                            <span class="m-switch m-switch--icon block-switch">
+                                                <label>
+                                                    <input type="checkbox" name="flag_csat" id="flag_csat" value="1"{{ obj.isCSAT() ? ' checked' }}>
+                                                    <label class="switch-label">CSAT</label>
+                                                    <span></span>
+                                                </label>
+                                            </span>
+                                            <div class="form-control-feedback hide" data-field="flag_active"></div>
+                                        </div>
+                                        <div class="col-lg-4">
+                                            <div class="col-lg-12 form-group-inner">
+                                                <label data-field="source">Marketing Promo</label>
+                                                <div class="m-checkbox-list">
+                                                    <label class="m-checkbox">
+                                                        <input type="checkbox" name="flag_promo_sms" value="1"{{ obj.isPromoSms ? ' checked' }} >
+                                                            SMS
+                                                        <span></span>
+                                                        <div class="form-control-feedback hide" data-field="flag_promo_sms"></div> 
+                                                    </label>
+                                                    <label class="m-checkbox">
+                                                        <input type="checkbox" name="flag_promo_email" value="1"{{ obj.isPromoEmail ? ' checked' }} >
+                                                            Email
+                                                        <span></span>
+                                                        <div class="form-control-feedback hide" data-field="flag_promo_email"></div>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-lg-4">
+                                            <input type="checkbox" name="flag_dpa_consent" id="flag-dpa_consent" value="1"{{ obj.isDpaConsent ? ' checked' }} >
+                                            <label class="switch-label">With DPA Consent</label>
+                                            <div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
+                                        </div>
+                                    </div>
 	                            <div class="form-group m-form__group row">
-									<div class="col-lg-12">
-										<span class="m-switch m-switch--icon block-switch">
-											<label>
-												<input type="checkbox" name="flag_active" id="flag_active" value="1"{{ obj.isActive() ? ' checked' }}>
-												<label class="switch-label">Active</label>
-												<span></span>
-											</label>
-										</span>
-										<div class="form-control-feedback hide" data-field="flag_active"></div>
-									</div>
-								</div>
-							</div>
+                                        <div class="col-lg-12">
+                                            <span class="m-switch m-switch--icon block-switch">
+                                                <label>
+                                                    <input type="checkbox" name="flag_active" id="flag_active" value="1"{{ obj.isActive() ? ' checked' }}>
+                                                    <label class="switch-label">Active</label>
+                                                    <span></span>
+                                                </label>
+                                            </span>
+                                            <div class="form-control-feedback hide" data-field="flag_active"></div>
+                                        </div>
+                                    </div>
+                                </div>
 
 							<div class="m-form__seperator m-form__seperator--dashed"></div>
 
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 8b250b52..2ad82c91 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -342,12 +342,12 @@
                                             <label data-field="source">Marketing Promo</label>
                                                 <div class="m-checkbox-list">
                                                     <label class="m-checkbox">
-                                                        <input type="checkbox" name="flag_promo_sms" value="{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked': '' }}" >
+                                                        <input type="checkbox" name="flag_promo_sms" value="{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked': '' }}" disabled>
                                                             SMS
                                                         <span></span>
                                                     </label>
                                                     <label class="m-checkbox">
-                                                        <input type="checkbox" name="flag_promo_email" value="{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked': '' }}" >
+                                                        <input type="checkbox" name="flag_promo_email" value="{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked': '' }}" disabled>
                                                             Email
                                                         <span></span>
                                                     </label>

From 716f263e6be65d83ddeea64d7413aef16e3b7884 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 10 Feb 2020 08:13:36 +0000
Subject: [PATCH 4/7] Make editable the new fields in JO form. #324

---
 .../CustomerHandler/ResqCustomerHandler.php   |  4 +
 .../JobOrderHandler/ResqJobOrderHandler.php   | 20 +++-
 templates/job-order/form.html.twig            | 91 ++++++++++++-------
 3 files changed, 80 insertions(+), 35 deletions(-)

diff --git a/src/Service/CustomerHandler/ResqCustomerHandler.php b/src/Service/CustomerHandler/ResqCustomerHandler.php
index f0e77ebe..2a612a81 100644
--- a/src/Service/CustomerHandler/ResqCustomerHandler.php
+++ b/src/Service/CustomerHandler/ResqCustomerHandler.php
@@ -514,6 +514,10 @@ class ResqCustomerHandler implements CustomerHandlerInterface
                 'phone_landline' => $customer->getPhoneLandline(),
                 'phone_office' => $customer->getPhoneOffice(),
                 'phone_fax' => $customer->getPhoneFax(),
+                'email' => $customer->getEmail(),
+                'flag_dpa_consent' => $customer->isDpaConsent(),
+                'flag_promo_sms' => $customer->isPromoSms(),
+                'flag_promo_email' => $customer->isPromoEmail(),
             ],
             'vehicle' => [
                 'id' => $vehicle->getID(),
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 497b6599..43e213f7 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -24,6 +24,7 @@ use App\Entity\Promo;
 use App\Entity\Rider;
 use App\Entity\JORejection;
 use App\Entity\Warranty;
+use App\Entity\Customer;
 
 use App\Ramcar\InvoiceCriteria;
 use App\Ramcar\ServiceType;
@@ -280,6 +281,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $jo = new JobOrder();
         }
 
+        // find customer
+        $cust_id = $req->request->get('cid');
+        $customer = $em->getRepository(Customer::class)->find($cust_id);
+        if (empty($customer))
+        {
+            $error_array['customer_vehicle'] = 'Invalid customer specified.';
+        }
+        else
+        {
+            // get email, dpa_consent, promo_sms, and promo_email, if set
+            $customer->setEmail($req->request->get('customer_email'))
+                ->setPromoSms($req->request->get('flag_promo_sms') ? true : false)
+                ->setPromoEmail($req->request->get('flag_promo_email') ? true : false)
+                ->setDpaConsent($req->request->get('flag_dpa_consent') ? true : false);
+        }
+
         // check if lat and lng are provided
         if (empty($req->request->get('coord_lng')) || empty($req->request->get('coord_lat'))) {
             $error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.';
@@ -365,8 +382,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             // check if errors are found
             if (empty($error_array))
             {
-                // validated, no error. save the job order
+                // validated, no error. save the job order and customer
                 $em->persist($jo);
+                $em->persist($customer);
 
                 // the event
                 $event = new JOEvent();
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 2ad82c91..f2f57dbb 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -46,6 +46,7 @@
 					</div>
                     <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ submit_url }}">
                         <input type="hidden" id="invoice-change" name="invoice_change" value="0">
+                        <input type="hidden" id="cid" name="cid" value="0">
 						<div class="m-portlet__body">
 
                             {% if ftags.vehicle_dropdown %}
@@ -149,8 +150,9 @@
 										<div class="form-control-feedback hide" data-field="customer_customer_notes"></div>
 									</div>
                                                                         <div class="col-lg-6">
-                                                                            <input type="checkbox" name="flag_dpa_consent" id="flag-dpa_consent" value="1"{{ obj.getCustomer ? obj.getCustomer.isDpaConsent ? ' checked' }} disabled>
+                                                                            <input type="checkbox" name="flag_dpa_consent" id="flag-dpa-consent" value="1"{{ obj.getCustomer ? obj.getCustomer.isDpaConsent ? ' checked' }} >
                                                                             <label class="switch-label">With DPA Consent</label>
+                                                                            <div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
                                                                         </div>
 								</div>
 							</div>
@@ -342,14 +344,16 @@
                                             <label data-field="source">Marketing Promo</label>
                                                 <div class="m-checkbox-list">
                                                     <label class="m-checkbox">
-                                                        <input type="checkbox" name="flag_promo_sms" value="{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked': '' }}" disabled>
+                                                        <input type="checkbox" name="flag_promo_sms" id="flag-promo-sms" value="1"{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked' }} >
                                                             SMS
-                                                        <span></span>
+                                                        <span></span> 
+                                                        <div class="form-control-feedback hide" data-field="flag_promo_sms"></div>
                                                     </label>
                                                     <label class="m-checkbox">
-                                                        <input type="checkbox" name="flag_promo_email" value="{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked': '' }}" disabled>
+                                                        <input type="checkbox" name="flag_promo_email" id="flag-promo-email" value="1"{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked' }} >
                                                             Email
                                                         <span></span>
+                                                        <div class="form-control-feedback hide" data-field="flag_promo_email"></div>
                                                     </label>
                                                 </div>
                                         </div>
@@ -357,8 +361,8 @@
                                     <div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
                                             <label>Email Address</label>
-                                            <input type="text" name="email_address" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getEmail|default('') }}" disabled>
-                                            <div class="form-control-feedback hide" data-field="email_address"></div>
+                                            <input type="text" name="customer_email" id="customer-email" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getEmail|default('') }}" data-vehicle-field="1" >
+                                            <div class="form-control-feedback hide" data-field="customer_email"></div>
                                         </div>
                                     </div>
                                 </div>
@@ -1178,44 +1182,59 @@ $(function() {
 
     	// get info for this customer vehicle
     	$.ajax({
-			method: "GET",
-			url: "{{ url('customer_vehicle_info') }}",
-			data: { id: data.id }
-		}).done(function(response) {
-			vdata = response.data;
+            method: "GET",
+            url: "{{ url('customer_vehicle_info') }}",
+            data: { id: data.id }
+        }).done(function(response) {
+            vdata = response.data;
 
-			// reset vehicle fields
-			resetVehicleFields();
+            // reset vehicle fields
+            resetVehicleFields();
 
-			// reset invoice fields
-			$("#btn-reset-invoice").click();
+            // reset invoice fields
+            $("#btn-reset-invoice").click();
 
-			// get compatible batteries
-			$("#invoice-bmfg").change();
+            // get compatible batteries
+            $("#invoice-bmfg").change();
 			
-			// set form fields
-			$("[data-vehicle-field='1']").prop('placeholder', '');
-			$("#customer-first-name").val(vdata.customer.first_name);
-			$("#customer-last-name").val(vdata.customer.last_name);
+            // set form fields
+            $("[data-vehicle-field='1']").prop('placeholder', '');
+            $("#customer-first-name").val(vdata.customer.first_name);
+            $("#customer-last-name").val(vdata.customer.last_name);
             $("#customer-phone-mobile").val(vdata.customer.phone_mobile);
             $("#customer-phone-landline").val(vdata.customer.phone_landline);
             $("#customer-phone-office").val(vdata.customer.phone_office);
             $("#customer-phone-fax").val(vdata.customer.phone_fax);
-			$("#customer-customer-notes").val(vdata.customer.customer_notes);
-			$("#vmfg").val(vdata.vehicle.mfg_name);
-			$("#vehicle-make").val(vdata.vehicle.make);
-			$("#vehicle-year").val(vdata.vehicle.model_year);
-			$("#vehicle-color").val(vdata.vehicle.color);
+            $("#customer-customer-notes").val(vdata.customer.customer_notes);
+            $("#customer-email").val(vdata.customer.email);
+            $("#vmfg").val(vdata.vehicle.mfg_name);
+            $("#vehicle-make").val(vdata.vehicle.make);
+            $("#vehicle-year").val(vdata.vehicle.model_year);
+            $("#vehicle-color").val(vdata.vehicle.color);
             $("#vehicle-plate").val(vdata.vehicle.plate_number);
 
-			if (typeof vdata.battery !== 'undefined') {
-				$("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")");
-				$("#warranty-code").val(vdata.battery.warranty_code);
-				$("#warranty-expiration").val(vdata.battery.warranty_expiration);
-			} else {
-				$("#current-battery, #warranty-code, #warranty-expiration").val("No current battery").css('color', '#f4516c');
-			}
-		})
+            // checkboxes
+            if (vdata.customer.flag_dpa_consent === true) {
+                $("#flag-dpa-consent").prop("checked", true);
+            }
+            if (vdata.customer.flag_promo_sms === true) {
+                $("#flag-promo-sms").prop("checked", true);
+            }
+            if (vdata.customer.flag_promo_email === true) {
+                $("#flag-promo-email").prop("checked", true);
+            }
+
+            // set hidden customer id
+            $("#cid").val(vdata.customer.id);
+
+            if (typeof vdata.battery !== 'undefined') {
+                $("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")");
+                $("#warranty-code").val(vdata.battery.warranty_code);
+                $("#warranty-expiration").val(vdata.battery.warranty_expiration);
+            } else {
+                $("#current-battery, #warranty-code, #warranty-expiration").val("No current battery").css('color', '#f4516c');
+            }
+        })
     }).focus();
     {% endif %}
 
@@ -1243,6 +1262,10 @@ $(function() {
     // reset all vehicle info form fields
     function resetVehicleFields() {
     	$("[data-vehicle-field='1']").val("").css('color', '').prop('placeholder', 'Select a vehicle first');
+
+        $("#flag-dpa-consent").prop("checked", false);
+        $("#flag-promo-sms").prop("checked", false);
+        $("#flag-promo-email").prop("checked", false);
     }
 
 	// datepicker

From e202fb650c8ceef264bb22cbd14c807437d34158 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 10 Feb 2020 08:35:31 +0000
Subject: [PATCH 5/7] Disable the new fields if editing JO form. #324

---
 templates/job-order/form.html.twig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index f2f57dbb..a0e5985c 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -1066,6 +1066,14 @@ $(function() {
         {% endfor %}
     {% endif %}
 
+    // disable the enabled customer fields
+    {% if mode != 'create' %}
+        $("#customer-email").prop("disabled", true);
+        $("#flag-dpa-consent").prop("disabled", true);
+        $("#flag-promo-sms").prop("disabled", true);
+        $("#flag-promo-email").prop("disabled", true);
+    {% endif %}
+
 	$("#row-form").submit(function(e) {
         if (form_in_process) {
             alert("Cannot submit form twice. First submission still in progress.");

From 38d56d9c0902cc3f74a8336f439dabb6a9471014 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 11 Feb 2020 01:36:13 +0000
Subject: [PATCH 6/7] Set default value for the flags to false. #324

---
 src/Entity/Customer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
index 41da4454..de60e772 100644
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -166,17 +166,17 @@ class Customer
     protected $privpol_promo;
 
     /**
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", options={"default":false})
      */
     protected $flag_promo_email;
 
     /**
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", options={"default":false})
      */
     protected $flag_promo_sms;
 
     /**
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", options={"default":false})
      */
     protected $flag_dpa_consent;
 

From 4d8ddc53235e339724b19d30813d9b33ed69e612 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 11 Feb 2020 01:49:24 +0000
Subject: [PATCH 7/7] Modify the retrieval of the flags from request object.
 #324

---
 src/Service/CustomerHandler/ResqCustomerHandler.php | 6 +++---
 src/Service/JobOrderHandler/ResqJobOrderHandler.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Service/CustomerHandler/ResqCustomerHandler.php b/src/Service/CustomerHandler/ResqCustomerHandler.php
index 2a612a81..e27399e3 100644
--- a/src/Service/CustomerHandler/ResqCustomerHandler.php
+++ b/src/Service/CustomerHandler/ResqCustomerHandler.php
@@ -571,9 +571,9 @@ class ResqCustomerHandler implements CustomerHandlerInterface
             ->setEmail($req->request->get('email'))
             ->setIsCSAT($req->request->get('flag_csat') ? true : false)
             ->setActive($req->request->get('flag_active') ? true : false)
-            ->setPromoSms($req->request->get('flag_promo_sms') ? true : false)
-            ->setPromoEmail($req->request->get('flag_promo_email') ? true : false)
-            ->setDpaConsent($req->request->get('flag_dpa_consent') ? true : false);
+            ->setPromoSms($req->request->get('flag_promo_sms', false))
+            ->setPromoEmail($req->request->get('flag_promo_email', false))
+            ->setDpaConsent($req->request->get('flag_dpa_consent', false));
 
         // phone numbers
         $obj->setPhoneMobile($req->request->get('phone_mobile'))
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 43e213f7..2badddaa 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -292,9 +292,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         {
             // get email, dpa_consent, promo_sms, and promo_email, if set
             $customer->setEmail($req->request->get('customer_email'))
-                ->setPromoSms($req->request->get('flag_promo_sms') ? true : false)
-                ->setPromoEmail($req->request->get('flag_promo_email') ? true : false)
-                ->setDpaConsent($req->request->get('flag_dpa_consent') ? true : false);
+                ->setPromoSms($req->request->get('flag_promo_sms', false))
+                ->setPromoEmail($req->request->get('flag_promo_email', false))
+                ->setDpaConsent($req->request->get('flag_dpa_consent', false));
         }
 
         // check if lat and lng are provided