Merge pull request #410 from vidhyut-pandya/develop

Issue : #354

Author: vidhyut-pandya

app/Repositories/Backend/Access/User/UserRepository.php

@@ -96,6 +96,8 @@ public function create($request)
         $permissions = $request->get('permissions');
         $user = $this->createUserStub($data);
 
+        $this->checkUserByEmail($data, $user);
+
         DB::transaction(function () use ($user, $data, $roles, $permissions) {
             if ($user->save()) {
 
@@ -323,15 +325,19 @@ public function mark($user, $status)
      * @param  $user
      *
      * @throws GeneralException
+     *
+     * @return null
      */
-    protected function checkUserByEmail($input, $user)
+    protected function checkUserByEmail($input, $user = null)
     {
         //Figure out if email is not the same
-        if ($user->email != $input['email']) {
-            //Check to see if email exists
-            if ($this->query()->where('email', '=', $input['email'])->first()) {
-                throw new GeneralException(trans('exceptions.backend.access.users.email_error'));
-            }
+        if ($user && $user->email === $input['email']) {
+            return;
+        }
+
+        //Check to see if email exists
+        if ($this->query()->where('email', '=', $input['email'])->withTrashed()->exists()) {
+            throw new GeneralException(trans('exceptions.backend.access.users.email_error'));
         }
     }