Merge pull request #10 from kuzmany/fix-same-value-campaign-batch

Prevent Same value for different contacts + support for subjects
Logicify · Feb 24, 2020 · ffeff77 · ffeff77
2 parents 510c369 + c3b5cb5
commit ffeff77
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/EventListener/EmailSubscriber.php b/EventListener/EmailSubscriber.php
@@ -36,8 +36,8 @@ public function __construct(TemplateProcessor $templateProcessor)
     public static function getSubscribedEvents()
     {
         return [
-            EmailEvents::EMAIL_ON_SEND => ['onEmailGenerate', 0],
-            EmailEvents::EMAIL_ON_DISPLAY => ['onEmailGenerate', 0]
+            EmailEvents::EMAIL_ON_SEND => ['onEmailGenerate', 300],
+            EmailEvents::EMAIL_ON_DISPLAY => ['onEmailGenerate', 0],
         ];
     }
 
@@ -52,9 +52,22 @@ public static function getSubscribedEvents()
     public function onEmailGenerate(Events\EmailSendEvent $event)
     {
         $this->logger->info('onEmailGenerate MauticAdvancedTemplatesBundle\EmailSubscriber');
-        $content = $event->getContent();
+
+        if ($event->getEmail()) {
+            $subject = $event->getEmail()->getSubject();
+            $content = $event->getEmail()->getCustomHtml();
+        }else{
+            $subject = $event->getSubject();
+            $content = $event->getContent();
+        }
+
+        $subject = $this->templateProcessor->processTemplate($subject,  $event->getLead());
+        $event->setSubject($subject);
+
         $content = $this->templateProcessor->processTemplate($content,  $event->getLead());
         $event->setContent($content);
+
+
         if ( empty( trim($event->getPlainText()) ) ) {
             $event->setPlainText( (new PlainTextHelper($content))->getText() );
         }