tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for email reply-to

Browse source
This commit is contained in:
Hillel Coren 2017-04-24 22:21:39 +03:00
parent 1b01beebe5
commit 6b1505aee0
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Ninja/Mailers/ContactMailer.php
View file

@ -8,7 +8,6 @@ use App\Models\Invitation;
use App\Models\Invoice;
use App\Models\Payment;
use App\Services\TemplateService;
use Auth;
use Event;
use Utils;
@ -139,14 +138,10 @@ class ContactMailer extends Mailer
) {
$client = $invoice->client;
$account = $invoice->account;
$user = $invitation->user;
if (Auth::check()) {
$user = Auth::user();
} else {
$user = $invitation->user;
if ($invitation->user->trashed()) {
$user = $account->users()->orderBy('id')->first();
}
if ($user->trashed()) {
$user = $account->users()->orderBy('id')->first();
}
if (! $user->email || ! $user->registered) {