Merge pull request #3 from team23/release/2.2.1

Fix type errors

Author: fatality

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.2.1] - 2024-07-08
+
+### Fixed
+
+- Fix type id error (`int` versus `string`)
+- Fix wrong template type check
+
 ## [2.2.0] - 2024-06-19
 
 ### Changed

composer.json

@@ -2,7 +2,7 @@
     "name": "team23/module-email-attachments",
     "description": "Attach different files to transaction mails",
     "type": "magento2-component",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "license": ["BSD-3-Clause"],
     "authors": [
         {

src/module-email-attachments-admin-ui/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "team23/module-email-attachments-admin-ui",
     "description": "Attach different files to transaction mails.",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "type": "magento2-module",
     "license": ["BSD-3-Clause"],
     "authors": [

src/module-email-attachments-api/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "team23/module-email-attachments-api",
     "description": "Attach different files to transaction mails",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "type": "magento2-module",
     "license": ["BSD-3-Clause"],
     "authors": [

src/module-email-attachments/Model/Order/Email/SenderBuilder.php

@@ -75,7 +75,7 @@ public function sendCopyTo()
     private function addAttachments(): array
     {
         $templateVars = $this->templateContainer->getTemplateVars();
-        $storeId = $templateVars['store']->getId();
+        $storeId = (int)$templateVars['store']->getId();
         $type = false;
         $result = [];
 

src/module-email-attachments/Model/Template/TransportBuilder.php

@@ -183,14 +183,19 @@ protected function prepareMessage()
         $template = $this->getTemplate();
         $content = $template->processTemplate();
 
-        $partType = match ($template->getType()) {
-            TemplateTypesInterface::TYPE_TEXT => MimeInterface::TYPE_TEXT,
-            TemplateTypesInterface::TYPE_HTML => MimeInterface::TYPE_HTML,
-            default => throw new LocalizedException(
-                new Phrase('Unknown template type')
-            ),
-        };
-        $mimePart = $this->mimePartInterfaceFactory->create(['content' => $content, 'type' => $partType]);
+        switch ($template->getType()) {
+            case TemplateTypesInterface::TYPE_TEXT:
+                $part['type'] = MimeInterface::TYPE_TEXT;
+                break;
+            case TemplateTypesInterface::TYPE_HTML:
+                $part['type'] = MimeInterface::TYPE_HTML;
+                break;
+            default:
+                throw new LocalizedException(
+                    new Phrase('Unknown template type')
+                );
+        }
+        $mimePart = $this->mimePartInterfaceFactory->create(['content' => $content]);
         $parts = [$mimePart];
 
         foreach ($this->attachments as $attachment) {

src/module-email-attachments/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "team23/module-email-attachments",
     "description": "Attach different files to transaction mails.",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "type": "magento2-module",
     "license": ["BSD-3-Clause"],
     "authors": [