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

Resolve "Resq - September 10 release" #1414

Merged
jankstudio merged 67 commits from 485-resq-september-10-release into master 2020-10-12 14:43:29 +00:00
Conversation 1 Commits 67 Files changed 26 +10
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ed0eefc1d8 - Show all commits

6
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -183,6 +183,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
else
$row['assignor'] = $orow->getAssignedBy()->getFullName();
$hub_facilitated = $orow->getFacilitatedBy();
if ($hub_facilitated == null)
$row['hub_facilitated'] = '';
else
$row['hub_facilitated'] = $orow->getFacilitatedBy()->getName();
$rows[] = $row;
}

4
templates/job-order/list.all.html.twig
View file

@ -116,6 +116,10 @@
field: 'delivery_address',
title: 'Customer Area'
},
{
field: 'hub_facilitated',
title: 'Battery Facilitated By'
},
{
field: 'type',
title: 'Schedule'