Merge branch '742-add-checking-if-jo-is-null-in-hubarrive' into 'master'
Resolve "Add checking if JO is null in hubArrive" Closes #742 See merge request jankstudio/resq!856
This commit is contained in:
commit
fb1cef2f27
1 changed files with 12 additions and 8 deletions
|
|
@ -725,16 +725,20 @@ class RiderAppController extends APIController
|
|||
// get rider's current job order
|
||||
$jo = $rider->getCurrentJobOrder();
|
||||
|
||||
// set delivery status
|
||||
$jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB);
|
||||
// check if JO is null
|
||||
if ($jo)
|
||||
{
|
||||
// set delivery status
|
||||
$jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB);
|
||||
|
||||
$timestamp_event = new JOEvent();
|
||||
$timestamp_event->setDateHappen(new DateTime())
|
||||
->setTypeID(JOEventType::RIDER_ARRIVE_HUB)
|
||||
->setJobOrder($jo)
|
||||
->setRider($rider);
|
||||
$timestamp_event = new JOEvent();
|
||||
$timestamp_event->setDateHappen(new DateTime())
|
||||
->setTypeID(JOEventType::RIDER_ARRIVE_HUB)
|
||||
->setJobOrder($jo)
|
||||
->setRider($rider);
|
||||
|
||||
$em->persist($timestamp_event);
|
||||
$em->persist($timestamp_event);
|
||||
}
|
||||
|
||||
// tag rider as available
|
||||
$rider->setAvailable(true);
|
||||
|
|
|
|||
Loading…
Reference in a new issue