From 63dd85da17222a2df1df665cb7f27b6e1de22c90 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Mon, 4 Mar 2019 01:51:20 +0800
Subject: [PATCH] Change rejection report user created by to rejection user
 #191

---
 src/Controller/ReportController.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Controller/ReportController.php b/src/Controller/ReportController.php
index 4c4ce772..7d302694 100644
--- a/src/Controller/ReportController.php
+++ b/src/Controller/ReportController.php
@@ -197,6 +197,15 @@ class ReportController extends BaseController
             $hub_id = $hub->getID();
             $hub_name = $hub->getName() . ' - ' . $hub->getBranch();
 
+            /*
+            // check if created by app
+            $create_user = $jo->getCreatedBy();
+            if ($create_user == null)
+                $create_user_text = 'Application';
+            else
+                $create_user_text = $create_user->getFullName();
+            */
+
             $reason = $jor->getReason();
 
             $res[] = [
@@ -207,7 +216,7 @@ class ReportController extends BaseController
                JORejectionReason::getName($jor->getReason()),
                $jor->getContactPerson(),
                $jor->getRemarks(),
-               $jo->getCreatedBy()->getFullName(),
+               $jor->getUser()->getFullName(),
                ServiceType::getName($jo->getServiceType()),
             ];
         }