From c81a56c6e6b97c8055cfba9441fb41239d708fcc Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 12 Feb 2020 02:33:14 +0000
Subject: [PATCH] Modify the checking if service type is new battery. #336

---
 src/Service/JobOrderHandler/CMBJobOrderHandler.php  | 4 ++--
 src/Service/JobOrderHandler/ResqJobOrderHandler.php | 4 ++--
 src/Service/RiderAPIHandler/ResqRiderAPIHandler.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index aa11e4d0..40f428ee 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -916,7 +916,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $this->rah->fulfillJobOrder($obj, $image_url, $rider); 
 
             // create the warranty if new battery only
-            if ($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
+            if ($this->checkIfNewBattery($obj))
             {
                 $serial = $req->request->get('warranty_code') ;
                 $warranty_class = $obj->getWarrantyClass();
@@ -2280,7 +2280,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
     public function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery
-        if ($jo->getServiceType() != CMBServiceType::BATTERY_REPLACEMENT_NEW)
+        if (!($this->checkIfNewBattery($jo)))
             return;
 
         // customer vehicle
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 27613739..c6a6fa01 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -716,7 +716,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $this->rah->fulfillJobOrder($obj, $image_url, $rider);
 
             // create the warranty if new battery only
-            if ($obj->getServiceType () == ServiceType::BATTERY_REPLACEMENT_NEW)
+            if ($this->checkIfNewBattery($obj))
             {
                 $serial = null;
                 $warranty_class = $obj->getWarrantyClass();
@@ -2233,7 +2233,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
     public function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery
-        if ($jo->getServiceType() != ServiceType::BATTERY_REPLACEMENT_NEW)
+        if (!($this->checkIfNewBattery($jo)))
             return;
 
         // customer vehicle
diff --git a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
index a9ffc1b5..b5bed63b 100644
--- a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
@@ -523,7 +523,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
         $this->em->flush();
 
         // create warranty
-        if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW) 
+        if($this->jo_handler->checkIfNewBattery($jo))
         {
             $serial = null;
             $warranty_class = $jo->getWarrantyClass();