From 91182fbc381ff1862aba07649b095add08098d08 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 5 Feb 2020 23:47:53 +0000 Subject: [PATCH 1/3] Remove git conflict message. #311 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 27631d7f..de8581ad 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2197,7 +2197,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface return null; } -<<<<<<< HEAD public function updateVehicleBattery(JobOrder $jo) { // check if new battery -- 2.43.5 From 1fc64cef8a4d652eb3a8ff7444b1421f8d853518 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 6 Feb 2020 04:59:48 +0000 Subject: [PATCH 2/3] Add checking for valid plate number before warranty creation after JO is fulfilled. #311 --- .../RiderAPIHandler/CMBRiderAPIHandler.php | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php index cf96181d..fa416e27 100644 --- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php +++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php @@ -30,6 +30,7 @@ use App\Entity\Promo; use App\Entity\Battery; use App\Entity\BatteryModel; use App\Entity\BatterySize; +use App\Entity\Warranty; use DateTime; @@ -537,25 +538,29 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface else $date_purchase = $jo->getDateFulfill(); - $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); - - $batt_list = array(); - $invoice = $jo->getInvoice(); - if (!empty($invoice)) + // validate plate number + // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); + $plate_number = Warranty::cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); + if ($plate_number != false) { - // get battery - $invoice_items = $invoice->getItems(); - foreach ($invoice_items as $item) + $batt_list = array(); + $invoice = $jo->getInvoice(); + if (!empty($invoice)) { - $battery = $item->getBattery(); - if ($battery != null) + // get battery + $invoice_items = $invoice->getItems(); + foreach ($invoice_items as $item) { - $batt_list[] = $item->getBattery(); + $battery = $item->getBattery(); + if ($battery != null) + { + $batt_list[] = $item->getBattery(); + } } } - } - $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class); + $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class); + } } // send mqtt event (fulfilled) -- 2.43.5 From 075c83fb0dfd36ec5a50de416de695899746e4c1 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 6 Feb 2020 05:25:30 +0000 Subject: [PATCH 3/3] Add checking for valid plate number before warranty creation after JO is fulfilled. #311 --- .../JobOrderHandler/CMBJobOrderHandler.php | 30 ++++++++++-------- .../JobOrderHandler/ResqJobOrderHandler.php | 31 ++++++++++--------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index de8581ad..ae6cb838 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -857,25 +857,29 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface else $date_purchase = $obj->getDateFulfill(); - $plate_number = $this->wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber()); - - $batt_list = array(); - $invoice = $obj->getInvoice(); - if (!empty($invoice)) + // validate plate number + // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); + $plate_number = Warranty::cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber()); + if ($plate_number != false) { - // get battery - $invoice_items = $invoice->getItems(); - foreach ($invoice_items as $item) + $batt_list = array(); + $invoice = $obj->getInvoice(); + if (!empty($invoice)) { - $battery = $item->getBattery(); - if ($battery != null) + // get battery + $invoice_items = $invoice->getItems(); + foreach ($invoice_items as $item) { - $batt_list[] = $item->getBattery(); + $battery = $item->getBattery(); + if ($battery != null) + { + $batt_list[] = $item->getBattery(); + } } } - } - $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class); + $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class); + } } } } diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 105a98ac..94067844 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -723,27 +723,30 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface else $date_purchase = $obj->getDateFulfill(); - $plate_number = $this->wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber()); - - $batt_list = array(); - $invoice = $obj->getInvoice(); - if (!empty($invoice)) + // validate plate number + // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); + $plate_number = Warranty::cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber()); + if ($plate_number != false) { - // get battery - $invoice_items = $invoice->getItems(); - foreach ($invoice_items as $item) + $batt_list = array(); + $invoice = $obj->getInvoice(); + if (!empty($invoice)) { - $battery = $item->getBattery(); - if ($battery != null) + // get battery + $invoice_items = $invoice->getItems(); + foreach ($invoice_items as $item) { - $batt_list[] = $item->getBattery(); + $battery = $item->getBattery(); + if ($battery != null) + { + $batt_list[] = $item->getBattery(); + } } } + + $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class); } - - $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class); } - } } -- 2.43.5