From 44d46a01ab3a549c58c3361e78b25d247ce1e485 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jun 2016 08:11:48 +0300
Subject: [PATCH] Always load user even if they're deleted

---
 app/Models/AccountToken.php  | 2 +-
 app/Models/Contact.php       | 2 +-
 app/Models/Credit.php        | 8 ++++----
 app/Models/Document.php      | 2 +-
 app/Models/Expense.php       | 8 ++++----
 app/Models/Task.php          | 4 ++--
 app/Models/Vendor.php        | 2 +-
 app/Models/VendorContact.php | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/Models/AccountToken.php b/app/Models/AccountToken.php
index 87728b37016e..55781aabb95e 100644
--- a/app/Models/AccountToken.php
+++ b/app/Models/AccountToken.php
@@ -19,6 +19,6 @@ class AccountToken extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 }
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index 9c86c4ce5b84..54610e93f049 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -33,7 +33,7 @@ class Contact extends EntityModel implements AuthenticatableContract, CanResetPa
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function client()
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index c46095e80ee3..340417e7d424 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -8,7 +8,7 @@ class Credit extends EntityModel
 {
     use SoftDeletes;
     use PresentableTrait;
-    
+
     protected $dates = ['deleted_at'];
     protected $presenter = 'App\Ninja\Presenters\CreditPresenter';
 
@@ -19,7 +19,7 @@ class Credit extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function invoice()
@@ -59,9 +59,9 @@ class Credit extends EntityModel
 }
 
 Credit::creating(function ($credit) {
-    
+
 });
 
 Credit::created(function ($credit) {
     event(new CreditWasCreated($credit));
-});
\ No newline at end of file
+});
diff --git a/app/Models/Document.php b/app/Models/Document.php
index f1d6d6b9c5bd..efa9426e9581 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -86,7 +86,7 @@ class Document extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function expense()
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 316491a5356b..ccb4ccb684ac 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -35,7 +35,7 @@ class Expense extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function vendor()
@@ -90,13 +90,13 @@ class Expense extends EntityModel
     {
         return round($this->amount * $this->exchange_rate, 2);
     }
-    
+
     public function toArray()
     {
         $array = parent::toArray();
-        
+
         if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['converted_amount'] = $this->convertedAmount();
-        
+
         return $array;
     }
 }
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 17b667558c49..3aa2f8b2f8d7 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -24,7 +24,7 @@ class Task extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function client()
@@ -91,4 +91,4 @@ class Task extends EntityModel
     {
         return round($this->getDuration() / (60 * 60), 2);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 6fcd10f14092..d537b1ca9d00 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -87,7 +87,7 @@ class Vendor extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function payments()
diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php
index 5546b27d2adb..6b2ad12c8025 100644
--- a/app/Models/VendorContact.php
+++ b/app/Models/VendorContact.php
@@ -9,7 +9,7 @@ class VendorContact extends EntityModel
     use SoftDeletes;
     protected $dates = ['deleted_at'];
     protected $table = 'vendor_contacts';
-    
+
     protected $fillable = [
         'first_name',
         'last_name',
@@ -30,7 +30,7 @@ class VendorContact extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function vendor()