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

Refactor reply_to setting

Browse Source
This commit is contained in:
Hillel Coren 2017-03-31 12:32:28 +03:00
parent 0ae8b85a35
commit 7a4513da7d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Traits/SendsEmails.php
View File

@ -182,4 +182,13 @@ trait SendsEmails
return Domain::getEmailFromId($this->domain_id); return Domain::getEmailFromId($this->domain_id);
} }
public function getReplyToEmail()
{
if (! $this->isPro()) {
return false;
}
return $this->reply_to_email;
}
} }

4
app/Ninja/Mailers/ContactMailer.php
View File

@ -199,7 +199,7 @@ class ContactMailer extends Mailer
} }
$subject = $this->templateService->processVariables($subject, $variables); $subject = $this->templateService->processVariables($subject, $variables);
$fromEmail = $account->reply_to_email ?: $user->email; $fromEmail = $account->getReplyToEmail() ?: $user->email;
$view = $account->getTemplateView(ENTITY_INVOICE); $view = $account->getTemplateView(ENTITY_INVOICE);
$response = $this->sendTo($invitation->contact->email, $fromEmail, $account->getDisplayName(), $subject, $view, $data); $response = $this->sendTo($invitation->contact->email, $fromEmail, $account->getDisplayName(), $subject, $view, $data);
@ -291,7 +291,7 @@ class ContactMailer extends Mailer
$data['invoice_id'] = $payment->invoice->id; $data['invoice_id'] = $payment->invoice->id;
$view = $account->getTemplateView('payment_confirmation'); $view = $account->getTemplateView('payment_confirmation');
$fromEmail = $account->reply_to_email ?: $user->email; $fromEmail = $account->getReplyToEmail() ?: $user->email;
if ($user->email && $contact->email) { if ($user->email && $contact->email) {
$this->sendTo($contact->email, $fromEmail, $accountName, $subject, $view, $data); $this->sendTo($contact->email, $fromEmail, $accountName, $subject, $view, $data);