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

Resolve "Add Transaction Type for View All header"

See merge request jankstudio/resq!882

src/Service/JobOrderHandler/ResqJobOrderHandler.php

@@ -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;
         }
 

templates/job-order/list.all.html.twig

@@ -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',