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

Change rejection report user created by to rejection user #191 #1035

Merged
jankstudio merged 1 commit from 191-bug-with-detailed-rejection-report into master 2019-03-03 17:52:39 +00:00
Conversation 2 Commits 1 Files changed 1 +10 -1
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Controller/ReportController.php
View file

@ -197,6 +197,15 @@ class ReportController extends BaseController
$hub_id = $hub->getID(); $hub_id = $hub->getID();
$hub_name = $hub->getName() . ' - ' . $hub->getBranch(); $hub_name = $hub->getName() . ' - ' . $hub->getBranch();
/*
// check if created by app
$create_user = $jo->getCreatedBy();
if ($create_user == null)
$create_user_text = 'Application';
else
$create_user_text = $create_user->getFullName();
*/
$reason = $jor->getReason(); $reason = $jor->getReason();
$res[] = [ $res[] = [
@ -207,7 +216,7 @@ class ReportController extends BaseController
JORejectionReason::getName($jor->getReason()), JORejectionReason::getName($jor->getReason()),
$jor->getContactPerson(), $jor->getContactPerson(),
$jor->getRemarks(), $jor->getRemarks(),
$jo->getCreatedBy()->getFullName(), $jor->getUser()->getFullName(),
ServiceType::getName($jo->getServiceType()), ServiceType::getName($jo->getServiceType()),
]; ];
} }