Fixed configuration of plain text email templates (#201)

* Fixed configuration of plain text email templates

* Updated CHANGELOG

* Added methods to type interface

* Use template variable in plaintext method

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1
+
+ - BUGFIX      #201    Fix configuration of plain text emails   
+
 ## 1.0.0
 
  - No changes

Configuration/FormConfigurationFactory.php

@@ -151,6 +151,7 @@ private function buildAdminMailConfigurationByTypeAndData(AbstractType $type, $f
         $adminMailConfiguration->setReplyTo($type->getNotifyReplyToMailAddress($formData));
         $adminMailConfiguration->setAddAttachments($type->getNotifySendAttachments($formData));
         $adminMailConfiguration->setTemplate($type->getNotifyMail($formData));
+        $adminMailConfiguration->setPlainTextTemplate($type->getNotifyPlainMail($formData));
         $adminMailConfiguration->setTemplateAttributes($attributes);
 
         return $adminMailConfiguration;
@@ -180,6 +181,7 @@ private function buildWebsiteMailConfigurationByTypeAndData(AbstractType $type,
         $websiteMailConfiguration->setReplyTo($type->getCustomerReplyToMailAddress($formData));
         $websiteMailConfiguration->setAddAttachments(false); // Currently not implemented in the AbstractType.
         $websiteMailConfiguration->setTemplate($type->getCustomerMail($formData));
+        $websiteMailConfiguration->setPlainTextTemplate($type->getCustomerPlainMail($formData));
         $websiteMailConfiguration->setTemplateAttributes($attributes);
 
         return $websiteMailConfiguration;

Form/Handler.php

@@ -281,15 +281,22 @@ protected function getMediaData(
 
     /**
      * Get plain text variant for email, overridable and customizable per form.
+     *
      * @param FormInterface $form
      * @param MailConfigurationInterface $configuration
      * @param array $additionalData
      * @return string
      */
     protected function getPlainText(FormInterface $form, MailConfigurationInterface $configuration, array $additionalData)
     {
+        $template = $configuration->getPlainTextTemplate();
+
+        if (!$template) {
+            return null;
+        }
+
         return $this->templating->render(
-            $configuration->getPlainTextTemplate(),
+            $template,
             array_merge(
                 $configuration->getTemplateAttributes(),
                 $additionalData

Form/Type/AbstractType.php

@@ -127,6 +127,22 @@ public function getNotifyMail($formData = [])
         return 'ClientWebsiteBundle:views:form/mail/' . $this->getName() . '/notify.html.twig';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getCustomerPlainMail($formData = [])
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNotifyPlainMail($formData = [])
+    {
+        return null;
+    }
+
     /**
      * {@inheritdoc}
      */

Form/Type/TypeInterface.php

@@ -46,6 +46,16 @@ public function getCustomerMail($formData = []);
      */
     public function getNotifyMail($formData = []);
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getCustomerPlainMail($formData = []);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNotifyPlainMail($formData = []);
+
     /**
      * @param $formData
      *