Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 03:07:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Always load user even if they're deleted

Browse Source
This commit is contained in:
Hillel Coren 2016-06-08 08:11:48 +03:00
parent d9af83fd54
commit 44d46a01ab
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/AccountToken.php
View File

@ -19,6 +19,6 @@ class AccountToken extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
} }

2
app/Models/Contact.php
View File

@ -33,7 +33,7 @@ class Contact extends EntityModel implements AuthenticatableContract, CanResetPa
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function client() public function client()

8
app/Models/Credit.php
View File

@ -8,7 +8,7 @@ class Credit extends EntityModel
{ {
use SoftDeletes; use SoftDeletes;
use PresentableTrait; use PresentableTrait;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
protected $presenter = 'App\Ninja\Presenters\CreditPresenter'; protected $presenter = 'App\Ninja\Presenters\CreditPresenter';
@ -19,7 +19,7 @@ class Credit extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function invoice() public function invoice()
@ -59,9 +59,9 @@ class Credit extends EntityModel
} }
Credit::creating(function ($credit) { Credit::creating(function ($credit) {
}); });
Credit::created(function ($credit) { Credit::created(function ($credit) {
event(new CreditWasCreated($credit)); event(new CreditWasCreated($credit));
}); });

2
app/Models/Document.php
View File

@ -86,7 +86,7 @@ class Document extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function expense() public function expense()

8
app/Models/Expense.php
View File

@ -35,7 +35,7 @@ class Expense extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function vendor() public function vendor()
@ -90,13 +90,13 @@ class Expense extends EntityModel
{ {
return round($this->amount * $this->exchange_rate, 2); return round($this->amount * $this->exchange_rate, 2);
} }
public function toArray() public function toArray()
{ {
$array = parent::toArray(); $array = parent::toArray();
if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['converted_amount'] = $this->convertedAmount(); if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['converted_amount'] = $this->convertedAmount();
return $array; return $array;
} }
} }

4
app/Models/Task.php
View File

@ -24,7 +24,7 @@ class Task extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function client() public function client()
@ -91,4 +91,4 @@ class Task extends EntityModel
{ {
return round($this->getDuration() / (60 * 60), 2); return round($this->getDuration() / (60 * 60), 2);
} }
} }

2
app/Models/Vendor.php
View File

@ -87,7 +87,7 @@ class Vendor extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function payments() public function payments()

4
app/Models/VendorContact.php
View File

@ -9,7 +9,7 @@ class VendorContact extends EntityModel
use SoftDeletes; use SoftDeletes;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
protected $table = 'vendor_contacts'; protected $table = 'vendor_contacts';
protected $fillable = [ protected $fillable = [
'first_name', 'first_name',
'last_name', 'last_name',
@ -30,7 +30,7 @@ class VendorContact extends EntityModel
public function user() public function user()
{ {
return $this->belongsTo('App\Models\User'); return $this->belongsTo('App\Models\User')->withTrashed();
} }
public function vendor() public function vendor()