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
Showing only changes of commit 9c36baa3d3 - Show all commits

View file

@ -817,6 +817,8 @@ class JobOrderController extends ApiController
->setJobOrder($jo);
$this->em->persist($event);
$this->em->flush();
// check JO status
if ($jo->getStatus() == JOStatus::ASSIGNED) {
// add event logs for hub and rider assignments
@ -834,12 +836,9 @@ class JobOrderController extends ApiController
$this->em->persist($rider_assign_event);
error_log("Outlet assigned A");
// user mqtt event
$payload = [
'event' => 'outlet_assign',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);
@ -855,12 +854,9 @@ class JobOrderController extends ApiController
$this->em->persist($hub_assign_event);
error_log("Outlet assigned B");
// user mqtt event
$payload = [
'event' => 'outlet_assign',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);
}
@ -1184,12 +1180,9 @@ class JobOrderController extends ApiController
$this->em->persist($rider_assign_event);
error_log("Outlet assigned C");
// user mqtt event
$payload = [
'event' => 'outlet_assign',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);