Merge branch 'master' of gitlab.com:jankstudio/resq

src/Controller/JobOrderController.php

@@ -257,6 +257,8 @@ class JobOrderController extends BaseController
             $row['status'] = $statuses[$orow->getStatus()];
             $row['flag_advance'] = $orow->isAdvanceOrder();
 
+            $row['processor'] = $orow->getProcessedBy()->getFullName();
+
             // add crud urls
             $row['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $row['id']]);
 

src/Entity/User.php

@@ -238,6 +238,11 @@ class User implements AdvancedUserInterface, Serializable
         return $this->last_name;
     }
 
+    public function getFullName()
+    {
+        return $this->first_name . ' ' . $this->last_name;
+    }
+
     public function setContactNumber($num)
     {
         $this->contact_num = $num;

templates/job-order/list.html.twig

@@ -94,8 +94,8 @@
 						title: 'Status'
 					},
 					{
-						field: 'owner',
-						title: 'Owner'
+						field: 'processor',
+						title: 'Processor'
 					},
 					{
 						field: 'Actions',
@@ -122,4 +122,4 @@
 			
 		});
 	</script>
-{% endblock %}
+{% endblock %}