From cc883f0926424cc910c1975a26fbd1c027899b05 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 26 Feb 2021 22:20:17 +1100
Subject: [PATCH] Fixes for archived invoice not emailing

---
 app/Http/Requests/User/StoreUserRequest.php      | 8 ++++++--
 app/Http/ValidationRules/ValidUserForCompany.php | 2 +-
 app/Utils/TemplateEngine.php                     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index 0786dda42de9..512994be8b3e 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -39,9 +39,9 @@ class StoreUserRequest extends Request
         $rules['last_name'] = 'required|string|max:100';
 
         if (config('ninja.db.multi_db_enabled')) {
-            $rules['email'] = ['email', new ValidUserForCompany(), Rule::unique('users')];
+            $rules['email'] = ['email', new ValidUserForCompany(), Rule::unique('users')->ignore($this->input('company_user.account.id'), 'account_id')];
         } else {
-            $rules['email'] = ['email',Rule::unique('users')];
+            $rules['email'] = ['email',Rule::unique('users')->ignore($this->input('company_user.account.id'), 'account_id')];
         }
 
 
@@ -56,6 +56,10 @@ class StoreUserRequest extends Request
     {
         $input = $this->all();
 
+nlog($this->input('company_user.account'));
+// nlog($this->input('company_user.account.id'));
+// nlog($this->input('company_user.account.id'));
+
         if (isset($input['company_user'])) {
             if (! isset($input['company_user']['is_admin'])) {
                 $input['company_user']['is_admin'] = false;
diff --git a/app/Http/ValidationRules/ValidUserForCompany.php b/app/Http/ValidationRules/ValidUserForCompany.php
index d09b5760aa40..967ca56591d7 100644
--- a/app/Http/ValidationRules/ValidUserForCompany.php
+++ b/app/Http/ValidationRules/ValidUserForCompany.php
@@ -26,7 +26,7 @@ class ValidUserForCompany implements Rule
      */
     public function passes($attribute, $value)
     {
-        return MultiDB::checkUserAndCompanyCoExist($value, auth()->user()->company()->company_key);
+        return MultiDB::checkUserAndCompanyCoExist($value, auth()->user()->company()->company_key, auth()->user()->company()->id);
     }
 
     /**
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index d5501ef87411..fb9b863e0949 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -78,7 +78,7 @@ class TemplateEngine
     {
         if (strlen($this->entity) > 1 && strlen($this->entity_id) > 1) {
             $class = 'App\Models\\'.ucfirst($this->entity);
-            $this->entity_obj = $class::whereId($this->decodePrimaryKey($this->entity_id))->company()->first();
+            $this->entity_obj = $class::withTrashed()->where('id', $this->decodePrimaryKey($this->entity_id))->company()->first();
         } else {
             $this->mockEntity();
         }