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

Merge branch '769-add-transaction-type-for-view-all-header' into '746-resq-2-0-final'

Browse source 
Resolve "Add Transaction Type for View All header"

See merge request jankstudio/resq!882
This commit is contained in:
Ramon Gutierrez 2023-11-08 07:19:54 +00:00
commit 0ba63cc106
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -241,12 +241,20 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
else
$row['assignor'] = $orow->getAssignedBy()->getFullName();
// not removing this since this might be used by other pages since getRows is also used by other pages
$hub_facilitated = $orow->getFacilitatedBy();
if ($hub_facilitated == null)
$row['hub_facilitated'] = '';
else
$row['hub_facilitated'] = $orow->getFacilitatedBy()->getName();
// get the assigned hub, if any
$assigned_hub = $orow->getHub();
if ($assigned_hub == null)
$row['assigned_hub'] = '';
else
$row['assigned_hub'] = $orow->getHub()->getName();
$rows[] = $row;
}

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

@ -117,12 +117,12 @@
title: 'Customer Area'
},
{
field: 'hub_facilitated',
title: 'Battery Facilitated By'
field: 'assigned_hub',
title: 'Assigned Hub'
},
{
field: 'type',
title: 'Schedule'
field: 'service_type',
title: 'Transaction Type'
},
{
field: 'date_schedule',