Merge branch '621-check-for-null-current-job-order-when-re-assigning-rider-to-jo' into 'master-fix'

Resolve "Check for null current job order when re-assigning rider to JO"

See merge request jankstudio/resq!735
This commit is contained in:
Kendrick Chan 2021-09-09 03:52:47 +00:00
commit 0ababa77c2

View file

@ -1475,10 +1475,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// need to unset first rider's current job order
$old_rider = $obj->getRider();
$old_rider->setCurrentJobOrder();
// set available flag for first rider
$old_rider->setAvailable(true);
if ($old_rider != null)
{
$old_rider->setCurrentJobOrder();
// set available flag for first rider
$old_rider->setAvailable(true);
}
// coordinates
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));