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

Changed additional user emails to be sent from primary user name\email

Browse Source
This commit is contained in:
Hillel Coren 2014-09-14 14:46:59 +03:00
parent 0c2b75a324
commit 47edf3f565
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/ninja/mailers/UserMailer.php
View File

@ -23,7 +23,18 @@ class UserMailer extends Mailer {
'invitationMessage' => $invitor ? trans('texts.invitation_message', ['invitor' => $invitor->getDisplayName()]) : '' 'invitationMessage' => $invitor ? trans('texts.invitation_message', ['invitor' => $invitor->getDisplayName()]) : ''
]; ];
$this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); if ($invitor)
{
$fromEmail = $invitor->email;
$fromName = $invitor->getDisplayName();
}
else
{
$fromEmail = CONTACT_EMAIL;
$fromName = CONTACT_NAME;
}
$this->sendTo($user->email, $fromEmail, $fromName, $subject, $view, $data);
} }
public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null) public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null)
@ -46,7 +57,7 @@ class UserMailer extends Mailer {
'invoiceLink' => SITE_URL . "/{$entityType}s/{$invoice->public_id}" 'invoiceLink' => SITE_URL . "/{$entityType}s/{$invoice->public_id}"
]; ];
if ($payment) if ($payment)
{ {
$data['paymentAmount'] = Utils::formatMoney($payment->amount, $invoice->client->currency_id); $data['paymentAmount'] = Utils::formatMoney($payment->amount, $invoice->client->currency_id);
} }