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

Add source to invoice criteria. Modify invoice rules to get service fees from... #1701

Merged
arcticzero merged 217 commits from 746-resq-2-0-final into master 2023-11-22 08:54:48 +00:00
Conversation 2 Commits 217 Files changed 179 +86 -78
2 changed files with 86 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e070d6df18 - Show all commits

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

@ -243,12 +243,20 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
else else
$row['assignor'] = $orow->getAssignedBy()->getFullName(); $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(); $hub_facilitated = $orow->getFacilitatedBy();
if ($hub_facilitated == null) if ($hub_facilitated == null)
$row['hub_facilitated'] = ''; $row['hub_facilitated'] = '';
else else
$row['hub_facilitated'] = $orow->getFacilitatedBy()->getName(); $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; $rows[] = $row;
} }

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

@ -130,12 +130,12 @@
title: 'Customer Area' title: 'Customer Area'
}, },
{ {
field: 'hub_facilitated', field: 'assigned_hub',
title: 'Battery Facilitated By' title: 'Assigned Hub'
}, },
{ {
field: 'type', field: 'service_type',
title: 'Schedule' title: 'Transaction Type'
}, },
{ {
field: 'date_schedule', field: 'date_schedule',
@ -183,7 +183,7 @@
} }
return dateEnd ? '<span class="m-badge m-badge--wide m--font-boldest ' + (incrementing ? 'm-badge--warning" data-incrementing="1"' : 'm-badge--success"') + '>' + timeDiff(dateAssign, dateEnd) + '</span>' : '-'; return dateEnd ? '<span class="m-badge m-badge--wide m--font-boldest ' + (incrementing ? 'm-badge--warning" data-incrementing="1"' : 'm-badge--success"') + '>' + timeDiff(dateAssign, dateEnd) + '</span>' : '-';
} },
}, },
{ {
field: 'Actions', field: 'Actions',
@ -197,7 +197,7 @@
return actions; return actions;
}, },
} },
], ],
search: { search: {
onEnter: false, onEnter: false,