Merge branch '434-cmb-uat-issues' into '424-cmb-release'

Modify checking for JO reassignment. #434

See merge request jankstudio/resq!504
This commit is contained in:
Korina Cordero 2020-07-08 09:13:24 +00:00
commit 451ea6c280

View file

@ -432,7 +432,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
} }
else else
{ {
$old_rider = $jo->getRider(); //$old_rider = $jo->getRider();
$old_jo_status = $jo->getStatus();
} }
// check if lat and lng are provided // check if lat and lng are provided
@ -668,8 +669,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$em->flush(); $em->flush();
// check if JO has been reassigned // check if JO has been reassigned
if ($old_rider != $rider) //if ($old_rider != $rider)
if ($old_jo_status != $jo->getStatus())
{ {
//error_log('JO has been reassigned');
// TODO: refactor later // TODO: refactor later
$channel = 'rider/' . $rider->getID() . '/events'; $channel = 'rider/' . $rider->getID() . '/events';
$payload = [ $payload = [