remove prepareMessage method in TransportBuilder

.gitignore

@@ -0,0 +1 @@
+.idea/

Block/Adminhtml/Rule/Add/Tab/Email/Media/Gallery/Content.php

@@ -89,8 +89,7 @@ protected function _prepareLayout()
         $this->unsetChild('new-video');
 
         $this->getUploader()->getConfig()->setUrl(
-            //  $this->_urlBuilder->addSessionParam()->getUrl('demo/media/upload')
-            $this->_urlBuilder->addSessionParam()->getUrl('ultimatefollowupemail/rule/upload')
+            $this->_urlBuilder->getUrl('ultimatefollowupemail/rule/upload')
         )->setFileField(
             'image'
         )->setFilters(

Controller/Adminhtml/Rule/Post.php

@@ -74,8 +74,8 @@ public function execute()
                         $template = $email['template'];
 
                         $day = isset($email['day'])?$email['day']:"";
-                        $hour = isset($email['day'])?$email['day']:"";
-                        $min = isset($email['day'])?$email['day']:"";
+                        $hour = isset($email['hour'])?$email['hour']:"";
+                        $min = isset($email['min'])?$email['min']:"";
 
                         $email = [
                             'template' => $template,

Model/Mail.php

@@ -235,7 +235,7 @@ protected function sendMail()
             $this->_magenestTransportBuilder->addBcc($bccMail);
         }
 
-        $this->_magenestTransportBuilder->setTemplateId((int)$templateId);
+        $this->_magenestTransportBuilder->setTemplateIdentifier((int)$templateId);
 
         /** @var  $transport \Magento\Framework\Mail\TransportInterface */
         if(method_exists($this->_magenestTransportBuilder->getMessage(),'createAttachment')) {

Model/Mail/TransportBuilder.php

@@ -103,51 +103,19 @@ protected function createZendMimePart($params){
         }
     }
 
-
-
-
-    public function prepare()
-    {
-        return $this->prepareMessage();
-    }
-
-
     public function setMessageContent($body, $subject)
     {
         $this->body    = $body;
         $this->subject = $subject;
     }
 
-
-    public function setTemplateId($templateId){
-        $this->templateId = $templateId;
-    }
-
-
     public function getTemplateChoosed($templateId){
 
         $templateData = $this->templateFactory->get($templateId);
         $templateData->setVars($this->templateVars)->setOptions($this->templateOptions);
         return $templateData;
     }
 
-
-    /**
-     * Prepare message
-     *
-     * @return $this
-     */
-    protected function prepareMessage()
-    {
-        $this->message->setMessageType('text/html');
-        $template = $this->getTemplateChoosed($this->templateId);
-        $body = $template->processTemplate();
-        $this->message->setBodyHtml($body);
-
-        $this->message->setSubject(html_entity_decode($template->getSubject(), ENT_QUOTES));
-        return $this;
-    }
-
     public function reset()
     {
         return parent::reset(); // TODO: Change the autogenerated stub

composer.json

@@ -5,15 +5,13 @@
         "magenest/core": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.1",
+    "version": "100.3.4",
     "license": [
         "BSD-3-Clause"
     ],
-    "authors": [
-        {
-            "name": "Magenest JSC"
-        }
-    ],
+    "authors": [{
+        "name": "Magenest JSC"
+    }],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +20,4 @@
             "Magenest\\UltimateFollowupEmail\\": ""
         }
     }
-}
+}

etc/module.xml

@@ -1,15 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magenest_UltimateFollowupEmail" setup_version="100.3.1">
+    <module name="Magenest_UltimateFollowupEmail" setup_version="100.3.4">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>
             <module name="Magento_Newsletter" />
         </sequence>
     </module>
-</config>
-
-
-
-
-
+</config>