From 53c2db072f9c3874343d99e02300a5f97b2615b2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 3 Dec 2020 09:26:46 +1100
Subject: [PATCH] Fixes for pdf attachment to invoices

---
 app/Mail/Engine/BaseEmailEngine.php    | 5 +++--
 app/Mail/Engine/CreditEmailEngine.php  | 2 +-
 app/Mail/Engine/InvoiceEmailEngine.php | 2 +-
 app/Mail/Engine/QuoteEmailEngine.php   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Mail/Engine/BaseEmailEngine.php b/app/Mail/Engine/BaseEmailEngine.php
index 37c13c1f263b..f1b8a7b6cc53 100644
--- a/app/Mail/Engine/BaseEmailEngine.php
+++ b/app/Mail/Engine/BaseEmailEngine.php
@@ -25,7 +25,7 @@ class BaseEmailEngine implements EngineInterface
 
     public $template_style;
 
-    public $attachments;
+    public $attachments = [];
 
     public $link;
 
@@ -83,7 +83,8 @@ class BaseEmailEngine implements EngineInterface
 
     public function setAttachments($attachments)
     {
-        $this->attachments = $attachments;
+
+        $this->attachments = array_merge($this->getAttachments(), $attachments);
 
         return $this;
     }
diff --git a/app/Mail/Engine/CreditEmailEngine.php b/app/Mail/Engine/CreditEmailEngine.php
index 7cbcbc0ec44b..71a2e01e15e3 100644
--- a/app/Mail/Engine/CreditEmailEngine.php
+++ b/app/Mail/Engine/CreditEmailEngine.php
@@ -88,7 +88,7 @@ class CreditEmailEngine extends BaseEmailEngine
             ->setViewText(ctrans('texts.view_credit'));
 
         if ($this->client->getSetting('pdf_email_attachment') !== false) {
-            $this->setAttachments($invitation->pdf_file_path());
+            $this->setAttachments([$this->credit->pdf_file_path()]);
         }
 
         return $this;
diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index af72ac485fe9..711b4bdc6dc7 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -97,7 +97,7 @@ class InvoiceEmailEngine extends BaseEmailEngine
             ->setViewText(ctrans('texts.view_invoice'));
 
         if ($this->client->getSetting('pdf_email_attachment') !== false) {
-            $this->setAttachments($this->invoice->pdf_file_path());
+            $this->setAttachments([$this->invoice->pdf_file_path()]);
         }
 
         return $this;
diff --git a/app/Mail/Engine/QuoteEmailEngine.php b/app/Mail/Engine/QuoteEmailEngine.php
index eeea79ccc26a..02ca6150beb4 100644
--- a/app/Mail/Engine/QuoteEmailEngine.php
+++ b/app/Mail/Engine/QuoteEmailEngine.php
@@ -88,7 +88,7 @@ class QuoteEmailEngine extends BaseEmailEngine
             ->setViewText(ctrans('texts.view_quote'));
 
         if ($this->client->getSetting('pdf_email_attachment') !== false) {
-            $this->setAttachments($this->invitation->pdf_file_path());
+            $this->setAttachments([$this->invitation->pdf_file_path()]);
         }
 
         return $this;