From bcd707afb8fc603484ddaa887d5dc4eae3fb439a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 29 Mar 2018 22:21:53 +0300
Subject: [PATCH] Filter email tags to client emails

---
 app/Ninja/Mailers/ContactMailer.php | 2 ++
 app/Ninja/Mailers/Mailer.php        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 94132ce1d..1de3cf671 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -202,6 +202,7 @@ class ContactMailer extends Mailer
             'bccEmail' => $isFirst ? $account->getBccEmail() : false,
             'fromEmail' => $account->getFromEmail(),
             'proposal' => $proposal,
+            'tag' => $account->account_key,
         ];
 
         if (! $proposal) {
@@ -306,6 +307,7 @@ class ContactMailer extends Mailer
             'bccEmail' => $account->getBccEmail(),
             'fromEmail' => $account->getFromEmail(),
             'isRefund' => $refunded > 0,
+            'tag' => $account->account_key,
         ];
 
         if (! $refunded && $account->attachPDF()) {
diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index 1270e0390..5fcad1bd4 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -163,8 +163,8 @@ class Mailer
                 $message['Bcc'] = $data['bccEmail'];
             }
 
-            if (! empty($data['account'])) {
-                $message['Tag'] = $data['account']->account_key;
+            if (! empty($data['tag'])) {
+                $message['Tag'] = $data['tag'];
             }
 
             $response = $client->sendEmailBatch([$message]);