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

Fix for email reply-to

Browse Source
This commit is contained in:
Hillel Coren 2017-04-24 22:23:11 +03:00
parent 4ec8b8dea4
commit 3a9e12c29a
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\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\Services\TemplateService; use App\Services\TemplateService;
use Auth;
use Event; use Event;
use Utils; use Utils;
@ -139,14 +138,10 @@ class ContactMailer extends Mailer
) { ) {
$client = $invoice->client; $client = $invoice->client;
$account = $invoice->account; $account = $invoice->account;
$user = $invitation->user;
if (Auth::check()) { if ($invitation->user->trashed()) {
$user = Auth::user(); $user = $account->users()->orderBy('id')->first();
} else {
$user = $invitation->user;
if ($invitation->user->trashed()) {
$user = $account->users()->orderBy('id')->first();
}
} }
if (! $user->email || ! $user->registered) { if (! $user->email || ! $user->registered) {