MAGETWO-69668: [#7291] Change the default contact form email template to HTML #9786

Author: Oleksii Korshenko

app/code/Magento/Contact/Model/Mail.php

@@ -6,7 +6,9 @@
 namespace Magento\Contact\Model;
 
 use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Translate\Inline\StateInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Mail implements MailInterface
 {
@@ -26,18 +28,29 @@ class Mail implements MailInterface
     private $inlineTranslation;
 
     /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * Initialize dependencies.
+     *
      * @param ConfigInterface $contactsConfig
      * @param TransportBuilder $transportBuilder
      * @param StateInterface $inlineTranslation
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         ConfigInterface $contactsConfig,
         TransportBuilder $transportBuilder,
-        StateInterface $inlineTranslation
+        StateInterface $inlineTranslation,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->contactsConfig = $contactsConfig;
         $this->transportBuilder = $transportBuilder;
         $this->inlineTranslation = $inlineTranslation;
+        $this->storeManager = $storeManager ?:
+            ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -58,8 +71,8 @@ public function send($replyTo, array $variables)
                 ->setTemplateIdentifier($this->contactsConfig->emailTemplate())
                 ->setTemplateOptions(
                     [
-                        'area' => 'adminhtml',
-                        'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                        'area' => 'frontend',
+                        'store' => $this->storeManager->getStore()->getId()
                     ]
                 )
                 ->setTemplateVars($variables)

app/code/Magento/Contact/Test/Unit/Model/MailTest.php

@@ -8,6 +8,8 @@
 
 use Magento\Contact\Model\ConfigInterface;
 use Magento\Contact\Model\Mail;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
 
 class MailTest extends \PHPUnit_Framework_TestCase
 {
@@ -32,6 +34,11 @@ class MailTest extends \PHPUnit_Framework_TestCase
      */
     private $inlineTranslationMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
     /**
      * @var Mail
      */
@@ -50,10 +57,13 @@ protected function setUp()
         )->disableOriginalConstructor(
         )->getMock();
 
+        $this->storeManagerMock = $this->getMock(StoreManagerInterface::class);
+
         $this->mail = new Mail(
             $this->configMock,
             $this->transportBuilderMock,
-            $this->inlineTranslationMock
+            $this->inlineTranslationMock,
+            $this->storeManagerMock
         );
     }
 
@@ -64,15 +74,20 @@ public function testSendMail()
 
         $transport = $this->getMock(\Magento\Framework\Mail\TransportInterface::class, [], [], '', false);
 
+        $store = $this->getMock(StoreInterface::class);
+        $store->expects($this->once())->method('getId')->willReturn(555);
+
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($store);
+
         $this->transportBuilderMock->expects($this->once())
             ->method('setTemplateIdentifier')
             ->will($this->returnSelf());
 
         $this->transportBuilderMock->expects($this->once())
             ->method('setTemplateOptions')
             ->with([
-                'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
-                'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                'area' => 'frontend',
+                'store' => 555,
             ])
             ->will($this->returnSelf());
 

app/code/Magento/Contact/etc/email_templates.xml

@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
-    <template id="contact_email_email_template" label="Contact Form" file="submitted_form.html" type="text" module="Magento_Contact" area="adminhtml"/>
+    <template id="contact_email_email_template" label="Contact Form" file="submitted_form.html" type="html" module="Magento_Contact" area="frontend"/>
 </config>

app/code/Magento/Contact/view/adminhtml/email/submitted_form.html

@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@subject {{trans "Contact Form"}} @-->
+<!--@vars {
+"var data.comment":"Comment",
+"var data.email":"Sender Email",
+"var data.name":"Sender Name",
+"var data.telephone":"Sender Telephone"
+} @-->
+
+{{template config_path="design/email/header_template"}}
+
+<table class="message-details">
+    <tr>
+        <td><b>{{trans "Name"}}</b></td>
+        <td>{{var data.name}}</td>
+    </tr>
+    <tr>
+        <td><b>{{trans "Email"}}</b></td>
+        <td>{{var data.email}}</td>
+    </tr>
+    <tr>
+        <td><b>{{trans "Phone"}}</b></td>
+        <td>{{var data.telephone}}</td>
+    </tr>
+</table>
+<p><b>{{trans "Message"}}</b></p>
+<p>{{var data.comment}}</p>
+
+{{template config_path="design/email/footer_template"}}

app/code/Magento/Contact/view/frontend/email/submitted_form.html

@@ -287,3 +287,19 @@ body {
         }
     }
 }
+
+.message-details {
+    margin-bottom: @indent__s;
+
+    b {
+        font-weight: bold;
+    }
+
+    td {
+        padding-bottom: @indent__xs;
+
+        b {
+            margin-right: @indent__s;
+        }
+    }
+}