Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-06 15:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow customization of the sending email address when using Postmark or Mailgun drivers

Browse Source
This commit is contained in:
David Bomba 2023-02-02 08:26:20 +11:00
parent a69eae2f66
commit f218b47154
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/DataMapper/CompanySettings.php
View File

@ -443,6 +443,8 @@ class CompanySettings extends BaseSettings
public $postmark_secret = '';
public $custom_sending_email = '';
public $mailgun_secret = '';
public $mailgun_domain = '';
@ -460,6 +462,7 @@ class CompanySettings extends BaseSettings
public $show_shipping_address = false;
public static $casts = [
'custom_sending_email' => 'string',
'show_paid_stamp' => 'bool',
'show_shipping_address' => 'bool',
'company_logo_size' => 'string',

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

@ -386,12 +386,14 @@ class NinjaMailerJob implements ShouldQueue
return $this->setMailDriver();
}
$user = $this->resolveSendingUser();
$sending_email = (isset($this->nmo->settings->custom_sending_email) && stripos($this->nmo->settings->custom_sending_email, "@")) ? $this->nmo->settings->custom_sending_email : $user->email;
$sending_user = (isset($this->nmo->settings->email_from_name) && strlen($this->nmo->settings->email_from_name) > 2) ? $this->nmo->settings->email_from_name : $user->name();
$this->nmo
->mailable
->from($user->email, $user->name());
->from($sending_email, $sending_user);
}
/**
@ -410,9 +412,12 @@ class NinjaMailerJob implements ShouldQueue
$user = $this->resolveSendingUser();
$sending_email = (isset($this->nmo->settings->custom_sending_email) && stripos($this->nmo->settings->custom_sending_email, "@")) ? $this->nmo->settings->custom_sending_email : $user->email;
$sending_user = (isset($this->nmo->settings->email_from_name) && strlen($this->nmo->settings->email_from_name) > 2) ? $this->nmo->settings->email_from_name : $user->name();
$this->nmo
->mailable
->from($user->email, $user->name());
->from($sending_email, $sending_user);
}
/**