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

Fixes for sending from email name

Browse Source
This commit is contained in:
David Bomba 2023-03-13 18:30:05 +11:00
parent ea319858e7
commit 23ebe8d6e9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Email/EmailDefaults.php
View File

@ -127,7 +127,15 @@ class EmailDefaults
private function setFrom(): self private function setFrom(): self
{ {
if (Ninja::isHosted() && $this->email->email_object->settings->email_sending_method == 'default') { if (Ninja::isHosted() && $this->email->email_object->settings->email_sending_method == 'default') {
$this->email->email_object->from = new Address(config('mail.from.address'), $this->email->company->owner()->name());
if ($this->email->company->account->isPaid() && property_exists($this->email->email_object->settings, 'email_from_name') && strlen($this->email->email_object->settings->email_from_name) > 1) {
$email_from_name = $this->email->email_object->settings->email_from_name;
} else {
$email_from_name = $this->email->company->present()->name();
}
$this->email->email_object->from = new Address(config('mail.from.address'), $email_from_name);
return $this; return $this;
} }