Upgrade to v26 (#172)

* A bunch of new updates from icehrm pro * Push changes to frontend
2019-02-03 14:00:34 +01:00
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions
@@ -76,6 +76,16 @@ class EmployeeRestEndPoint extends RestEndPoint
        );

        $emp = $this->enrichElement($emp, $mapping);
+        //Get User for the employee
+        $user = new User();
+        $user->Load('employee = ?', [$emp->id]);
+
+        if (!empty($user->id)) {
+            $emp->user_name = $user->username;
+            $emp->user_email = $user->email;
+            $emp->user_level = $user->user_level;
+        }
+
        if (!empty($emp)) {
            $emp = $this->cleanObject($emp);
            $emp = $this->removeNullFields($emp);