diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f11b75 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ diff --git a/Block/Adminhtml/Rule/Add/Tab/Email/Media/Gallery/Content.php b/Block/Adminhtml/Rule/Add/Tab/Email/Media/Gallery/Content.php index 50b5f14..ac7dc78 100644 --- a/Block/Adminhtml/Rule/Add/Tab/Email/Media/Gallery/Content.php +++ b/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( diff --git a/Controller/Adminhtml/Rule/Post.php b/Controller/Adminhtml/Rule/Post.php index 2ee01a7..4f55f75 100644 --- a/Controller/Adminhtml/Rule/Post.php +++ b/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, diff --git a/Model/Mail.php b/Model/Mail.php index c06a7e1..ed1a665 100644 --- a/Model/Mail.php +++ b/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')) { diff --git a/Model/Mail/TransportBuilder.php b/Model/Mail/TransportBuilder.php index 1fc16fd..c29f90b 100644 --- a/Model/Mail/TransportBuilder.php +++ b/Model/Mail/TransportBuilder.php @@ -103,27 +103,12 @@ 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); @@ -131,23 +116,6 @@ public function getTemplateChoosed($templateId){ 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 diff --git a/composer.json b/composer.json index 0e97fbb..4c1a8b3 100644 --- a/composer.json +++ b/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\\": "" } } -} +} \ No newline at end of file diff --git a/etc/module.xml b/etc/module.xml index f2f1528..4af09c6 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,15 +1,10 @@ - + - - - - - - + \ No newline at end of file diff --git a/view/adminhtml/web/fonts/icomoon.woff2 b/view/adminhtml/web/fonts/icomoon.woff2 new file mode 100644 index 0000000..ffbdf4e Binary files /dev/null and b/view/adminhtml/web/fonts/icomoon.woff2 differ