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

Merge branch '473-cmb-reassign-issue' into '472-cmb-release'

Browse source 
Fix reassign issue. #473

See merge request jankstudio/resq!552
This commit is contained in:
Kendrick Chan 2020-08-24 03:09:22 +00:00
commit 28ded5faa8
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -456,7 +456,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
}
else
{
//$old_rider = $jo->getRider();
// need to get old values of rider and status to see if we need to change JO status or not
$old_rider = $jo->getRider();
$old_jo_status = $jo->getStatus();
}
@ -639,10 +640,19 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// and JO is already in_transit or in_progress?
// retain old jo status if it's an update JO
if ($old_jo_status != null)
$jo->setStatus($old_jo_status);
else
// check old rider if it is also a reassignment
// old_rider should be null if JO has been rejected
$new_rider = $jo->getRider();
if ($new_rider != $old_rider)
{
// reassignment
$jo->setStatus(JOStatus::ASSIGNED);
}
else
{
if ($old_jo_status != null)
$jo->setStatus($old_jo_status);
}
// check if user is null, meaning call to create came from API
if ($user != null)
@ -702,8 +712,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$em->flush();
// check if JO has been reassigned
//if ($old_rider != $rider)
if ($old_jo_status != $jo->getStatus())
if ($old_rider != $jo->getRider())
//if ($old_jo_status != $jo->getStatus())
{
error_log('JO has been reassigned');
// TODO: refactor later