Fixes found during testing. #617
This commit is contained in:
parent
27c8cd1f2d
commit
dd34466593
2 changed files with 3 additions and 4 deletions
|
|
@ -997,9 +997,6 @@ class RiderController extends APIController
|
||||||
|
|
||||||
$rider->setAvailable(true);
|
$rider->setAvailable(true);
|
||||||
|
|
||||||
// set rider's current job order to null
|
|
||||||
$rider->setCurrentJobOrder();
|
|
||||||
|
|
||||||
$em->flush();
|
$em->flush();
|
||||||
|
|
||||||
$data = [];
|
$data = [];
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,9 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface
|
||||||
|
|
||||||
// get current user
|
// get current user
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
if ($user != null)
|
// check if user is User or APIUser
|
||||||
|
//if ($user != null)
|
||||||
|
if ($user instanceof User)
|
||||||
{
|
{
|
||||||
$invoice->setCreatedBy($user);
|
$invoice->setCreatedBy($user);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue