Merge branch 'master' into 800-automatically-reject-jo-if-no-riders-or-inventory
This commit is contained in:
commit
4ab6b0659d
1 changed files with 4 additions and 0 deletions
|
|
@ -236,6 +236,10 @@ class ReportController extends Controller
|
||||||
|
|
||||||
$reason = $jor->getReason();
|
$reason = $jor->getReason();
|
||||||
|
|
||||||
|
$dispatched_by = 'system';
|
||||||
|
if ($jor->getUser() != null)
|
||||||
|
$dispatched_by = $jor->getUser()->getFullName();
|
||||||
|
|
||||||
$res[] = [
|
$res[] = [
|
||||||
$jo->getID(),
|
$jo->getID(),
|
||||||
$jo->getDateSchedule()->format('m/d/Y H:i'),
|
$jo->getDateSchedule()->format('m/d/Y H:i'),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue