Merge pull request #30 from mageplaza/2.3-develop

2.3-develop
mageplaza · May 26, 2021 · 4b016e9 · 4b016e9
2 parents 9a0134c + 8874b2d
commit 4b016e9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/Model/MailEvent.php b/Model/MailEvent.php
@@ -144,15 +144,18 @@ public function dispatch($message)
             if ($this->dataHelper->isEnabledAttachPdf($storeId)
                 && in_array($emailType, $this->dataHelper->getAttachPdf($storeId), true)) {
                 $this->setPdfAttachment($emailType, $message, $obj, $attachmentPDF);
+                $attachmentPDF = true;
             }
 
             if ($this->dataHelper->getTacFile($storeId)
                 && in_array($emailType, $this->dataHelper->getAttachTac($storeId), true)) {
                 $this->setTACAttachment($message, $storeId);
+                $attachmentPDF = true;
             }
 
-            if ($this->dataHelper->versionCompare('2.2.9')) {
+            if ($this->dataHelper->versionCompare('2.2.9') && $attachmentPDF) {
                 $this->setBodyAttachment($message);
+                $this->parts = [];
             }
 
             foreach ($this->dataHelper->getCcTo($storeId) as $email) {

diff --git a/composer.json b/composer.json
@@ -1,26 +1,26 @@
-{
-  "name": "mageplaza/module-email-attachments",
-  "description": "Magento 2 Email Attachments Extension",
-  "require": {
-    "mageplaza/module-core": "^1.4.5"
-  },
-  "type": "magento2-module",
-  "version": "1.0.6",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "Mageplaza",
-      "email": "[email protected]",
-      "homepage": "https://www.mageplaza.com",
-      "role": "Technical Support"
-    }
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Mageplaza\\EmailAttachments\\": ""
-    }
-  }
-}
+{
+  "name": "mageplaza/module-email-attachments",
+  "description": "Magento 2 Email Attachments Extension",
+  "require": {
+    "mageplaza/module-core": "^1.4.5"
+  },
+  "type": "magento2-module",
+  "version": "1.0.7",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "Mageplaza",
+      "email": "[email protected]",
+      "homepage": "https://www.mageplaza.com",
+      "role": "Technical Support"
+    }
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Mageplaza\\EmailAttachments\\": ""
+    }
+  }
+}