rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Conversation 18 Commits 258 Files changed 143 +5 -5
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c81a56c6e6 - Show all commits

4
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -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

4
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -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

2
src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
View file

@ -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();