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

Fixes for returning mail providers

Browse Source
This commit is contained in:
David Bomba 2023-06-30 14:34:24 +10:00
parent d53c36d3ef
commit 53a930f6c4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -243,19 +243,19 @@ class NinjaMailerJob implements ShouldQueue
case 'gmail': case 'gmail':
$this->mailer = 'gmail'; $this->mailer = 'gmail';
$this->setGmailMailer(); $this->setGmailMailer();
return; return $this;
case 'office365': case 'office365':
$this->mailer = 'office365'; $this->mailer = 'office365';
$this->setOfficeMailer(); $this->setOfficeMailer();
return; return $this;
case 'client_postmark': case 'client_postmark':
$this->mailer = 'postmark'; $this->mailer = 'postmark';
$this->setPostmarkMailer(); $this->setPostmarkMailer();
return; return $this;
case 'client_mailgun': case 'client_mailgun':
$this->mailer = 'mailgun'; $this->mailer = 'mailgun';
$this->setMailgunMailer(); $this->setMailgunMailer();
return; return $this;
default: default:
break; break;
@ -264,6 +264,8 @@ class NinjaMailerJob implements ShouldQueue
if (Ninja::isSelfHost()) { if (Ninja::isSelfHost()) {
$this->setSelfHostMultiMailer(); $this->setSelfHostMultiMailer();
} }
return $this;
} }
/** /**

3
app/Services/Email/Email.php
View File

@ -445,7 +445,8 @@ class Email implements ShouldQueue
return $this; return $this;
default: default:
break; $this->mailer = config('mail.default');
return $this;
} }
if (Ninja::isSelfHost()) { if (Ninja::isSelfHost()) {