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

Merge branch '623-rider-revamp-issues' into 'master-fix'

Browse source 
Draft: Resolve "Rider revamp issues"

See merge request jankstudio/resq!737
This commit is contained in:
Korina Cordero 2022-01-03 08:45:15 +00:00
commit 41fa8430f2
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Controller/APIController.php
View file

@ -1842,6 +1842,19 @@ class APIController extends Controller implements LoggedController
$jo->cancel($cancel_reason);
$jo->setDeliveryStatus(DeliveryStatus::CANCELLED);
// check if jo has a rider assigned
$rider = $jo->getRider();
if ($rider != null)
{
// need to reset rider's current job order
// TODO: do we now mark rider as available?
// still waiting for feedback on what happens to the timestamp cycle if JO is cancelled
// while rider is working on the jo
$rider->setCurrentJobOrder();
}
// add event log
$event = new JOEvent();
$event->setDateHappen(new DateTime())

11
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -1156,6 +1156,17 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$obj->cancel($cancel_reason);
// check if jo has a rider assigned
$rider = $obj->getRider();
if ($rider != null)
{
// need to reset rider's current job order
// TODO: do we now mark rider as available?
// still waiting for feedback on what happens to the timestamp cycle if JO is cancelled
// while rider is working on the jo
$rider->setCurrentJobOrder();
}
// the event
$event = new JOEvent();
$event->setDateHappen(new DateTime())