Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-08-11 15:34:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add mailgun endpoint configuration

Browse Source
This commit is contained in:
David Bomba 2023-03-24 13:08:28 +11:00
parent a3fde9f1fc
commit e59d3a3af5
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,13 +128,7 @@ class NinjaMailerJob implements ShouldQueue
} }
if ($this->client_mailgun_secret) { if ($this->client_mailgun_secret) {
$mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $this->nmo->settings->mailgun_endpoint);
$endpoint = 'api.mailgun.net';
if(strpos($this->client_mailgun_secret, 'key') !== false)
$endpoint = 'api.eu.mailgun.net';
$mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $endpoint);
} }
$mailer $mailer

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

@ -58,6 +58,8 @@ class Email implements ShouldQueue
protected ?string $client_mailgun_domain = null; protected ?string $client_mailgun_domain = null;
protected ?string $client_mailgun_endpoint = null;
private string $mailer = 'default'; private string $mailer = 'default';
public Mailable $mailable; public Mailable $mailable;
@ -236,13 +238,7 @@ class Email implements ShouldQueue
if ($this->client_mailgun_secret) { if ($this->client_mailgun_secret) {
$endpoint = 'api.mailgun.net'; $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $this->client_mailgun_endpoint);
if (strpos($this->client_mailgun_secret, 'key') !== false) {
$endpoint = 'api.eu.mailgun.net';
}
$mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $endpoint);
} }
/* Attempt the send! */ /* Attempt the send! */
@ -488,6 +484,8 @@ class Email implements ShouldQueue
$this->client_mailgun_domain = null; $this->client_mailgun_domain = null;
$this->client_mailgun_endpoint = null;
//always dump the drivers to prevent reuse //always dump the drivers to prevent reuse
app('mail.manager')->forgetMailers(); app('mail.manager')->forgetMailers();
} }
@ -537,6 +535,8 @@ class Email implements ShouldQueue
if (strlen($this->email_object->settings->mailgun_secret) > 2 && strlen($this->email_object->settings->mailgun_domain) > 2) { if (strlen($this->email_object->settings->mailgun_secret) > 2 && strlen($this->email_object->settings->mailgun_domain) > 2) {
$this->client_mailgun_secret = $this->email_object->settings->mailgun_secret; $this->client_mailgun_secret = $this->email_object->settings->mailgun_secret;
$this->client_mailgun_domain = $this->email_object->settings->mailgun_domain; $this->client_mailgun_domain = $this->email_object->settings->mailgun_domain;
$this->client_mailgun_endpoint = $this->email_object->settings->mailgun_endpoint;
} else { } else {
$this->email_object->settings->email_sending_method = 'default'; $this->email_object->settings->email_sending_method = 'default';
return $this->setMailDriver(); return $this->setMailDriver();