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

Filter email tags to client emails

Browse Source
This commit is contained in:
Hillel Coren 2018-03-29 22:21:53 +03:00
parent 744c6d923c
commit bcd707afb8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,6 +202,7 @@ class ContactMailer extends Mailer
'bccEmail' => $isFirst ? $account->getBccEmail() : false, 'bccEmail' => $isFirst ? $account->getBccEmail() : false,
'fromEmail' => $account->getFromEmail(), 'fromEmail' => $account->getFromEmail(),
'proposal' => $proposal, 'proposal' => $proposal,
'tag' => $account->account_key,
]; ];
if (! $proposal) { if (! $proposal) {
@ -306,6 +307,7 @@ class ContactMailer extends Mailer
'bccEmail' => $account->getBccEmail(), 'bccEmail' => $account->getBccEmail(),
'fromEmail' => $account->getFromEmail(), 'fromEmail' => $account->getFromEmail(),
'isRefund' => $refunded > 0, 'isRefund' => $refunded > 0,
'tag' => $account->account_key,
]; ];
if (! $refunded && $account->attachPDF()) { if (! $refunded && $account->attachPDF()) {

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

@ -163,8 +163,8 @@ class Mailer
$message['Bcc'] = $data['bccEmail']; $message['Bcc'] = $data['bccEmail'];
} }
if (! empty($data['account'])) { if (! empty($data['tag'])) {
$message['Tag'] = $data['account']->account_key; $message['Tag'] = $data['tag'];
} }
$response = $client->sendEmailBatch([$message]); $response = $client->sendEmailBatch([$message]);