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

Add source to invoice criteria. Modify invoice rules to get service fees from... #1701

Merged
arcticzero merged 217 commits from 746-resq-2-0-final into master 2023-11-22 08:54:48 +00:00
Conversation 2 Commits 217 Files changed 179 +10 -10
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b90fc2f8dd - Show all commits

20
src/Controller/CAPI/RiderAppController.php
View file

@ -389,7 +389,7 @@ class RiderAppController extends APIController
}
public function acceptJobOrder(Request $req, EntityManagerInterface $em, MQTTClientApiv2 $mclientv2)
public function acceptJobOrder(Request $req, EntityManagerInterface $em)
{
$required_params = ['jo_id'];
@ -412,14 +412,6 @@ class RiderAppController extends APIController
// set jo status to in transit
$jo->setStatus(JOStatus::IN_TRANSIT);
// NOTE: send new in transit event to new app
$payload = [
'event' => 'in_transit',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);
// set delivery status
$jo->setDeliveryStatus(DeliveryStatus::RIDER_ACCEPT);
@ -579,7 +571,7 @@ class RiderAppController extends APIController
return new APIResponse(true, 'Rider arrive at hub pre jo.', $data);
}
public function preHubDepart(Request $req, EntityManagerInterface $em)
public function preHubDepart(Request $req, EntityManagerInterface $em, MQTTClientApiv2 $mclientv2)
{
$required_params = [];
$missing = $this->checkMissingParameters($req, $required_params);
@ -605,6 +597,14 @@ class RiderAppController extends APIController
// set delivery status
$jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_PRE_JO);
// NOTE: send new in transit event to new app
$payload = [
'event' => 'in_transit',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);
// create time stamp event for JO event
$event = new JOEvent();
$event->setDateHappen(new DateTime())