mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-09 09:04:37 -04:00
Allow customization of the sending email address when using Postmark or Mailgun drivers
This commit is contained in:
parent
a69eae2f66
commit
f218b47154
@ -443,6 +443,8 @@ class CompanySettings extends BaseSettings
|
|||||||
|
|
||||||
public $postmark_secret = '';
|
public $postmark_secret = '';
|
||||||
|
|
||||||
|
public $custom_sending_email = '';
|
||||||
|
|
||||||
public $mailgun_secret = '';
|
public $mailgun_secret = '';
|
||||||
|
|
||||||
public $mailgun_domain = '';
|
public $mailgun_domain = '';
|
||||||
@ -460,6 +462,7 @@ class CompanySettings extends BaseSettings
|
|||||||
public $show_shipping_address = false;
|
public $show_shipping_address = false;
|
||||||
|
|
||||||
public static $casts = [
|
public static $casts = [
|
||||||
|
'custom_sending_email' => 'string',
|
||||||
'show_paid_stamp' => 'bool',
|
'show_paid_stamp' => 'bool',
|
||||||
'show_shipping_address' => 'bool',
|
'show_shipping_address' => 'bool',
|
||||||
'company_logo_size' => 'string',
|
'company_logo_size' => 'string',
|
||||||
|
@ -386,12 +386,14 @@ class NinjaMailerJob implements ShouldQueue
|
|||||||
return $this->setMailDriver();
|
return $this->setMailDriver();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$user = $this->resolveSendingUser();
|
$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
|
$this->nmo
|
||||||
->mailable
|
->mailable
|
||||||
->from($user->email, $user->name());
|
->from($sending_email, $sending_user);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -410,9 +412,12 @@ class NinjaMailerJob implements ShouldQueue
|
|||||||
|
|
||||||
$user = $this->resolveSendingUser();
|
$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
|
$this->nmo
|
||||||
->mailable
|
->mailable
|
||||||
->from($user->email, $user->name());
|
->from($sending_email, $sending_user);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user