Merge branch '443-resq-add-battery-facilitated-by-in-view-all-page' into '453-resq-july-30-release'
Resolve "Resq - add Battery Facilitated By in View All page" See merge request jankstudio/resq!525
This commit is contained in:
commit
4003ddb489
2 changed files with 10 additions and 0 deletions
|
|
@ -183,6 +183,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
||||||
else
|
else
|
||||||
$row['assignor'] = $orow->getAssignedBy()->getFullName();
|
$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;
|
$rows[] = $row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -116,6 +116,10 @@
|
||||||
field: 'delivery_address',
|
field: 'delivery_address',
|
||||||
title: 'Customer Area'
|
title: 'Customer Area'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
field: 'hub_facilitated',
|
||||||
|
title: 'Battery Facilitated By'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
field: 'type',
|
field: 'type',
|
||||||
title: 'Schedule'
|
title: 'Schedule'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue