Resolve "Set rider's current jo id to null if JO's hub is reassigned and JO has been rider assigned" #1600

Merged
korina.cordero merged 4 commits from 675-set-rider-s-current-jo-id-to-null-if-jo-s-hub-is-reassigned-and-jo-has-been-rider-assigned into master 2022-06-01 08:04:08 +00:00
Showing only changes of commit e2bdf91f1c - Show all commits

View file

@ -1398,7 +1398,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$old_rider = $obj->getRider();
if ($old_rider != null)
{
if ($old_rider->getCurrentJobOrder() != null)
if (($old_rider->getCurrentJobOrder() != null) &&
($old_rider->getCurrentJobOrder()->getID() == $obj->getID()))
{
$old_rider->setCurrentJobOrder();
// set available flag for first rider
@ -1660,7 +1661,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$old_rider = $obj->getRider();
if ($old_rider != null)
{
if ($old_rider->getCurrentJobOrder() != null)
if (($old_rider->getCurrentJobOrder() != null) &&
($old_rider->getCurrentJobOrder()->getID() == $obj->getID()))
{
$old_rider->setCurrentJobOrder();
// set available flag for first rider