Merge pull request #436 from elcodi/fix/emails-override

Added emails override and fixed data fixtures
elcodi · May 7, 2015 · b30a196 · b30a196
2 parents 13b7c79 + 9ec5ec4
commit b30a196
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 13 deletions.
diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.ca.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.ca.yml
@@ -273,7 +273,7 @@ admin:
             title:
                 title: Título
                 placeholder: p.e. Mi magnífico correo
-            title:
+            content:
                 title: Contenido
                 placeholder: p.e. Este magnífico correo es exactamente lo que buscabas.
         section:

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.en.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.en.yml
@@ -277,7 +277,7 @@ admin:
             title:
                 title: Title
                 placeholder: e.g. My Awesome Mailing
-            title:
+            content:
                 title: Content
                 placeholder: e.g. This awesome mailing is exactly what you are lookin for.
         section:

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.es.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.es.yml
@@ -277,7 +277,7 @@ admin:
             title:
                 title: Título
                 placeholder: ej. Mi magnífico correo
-            title:
+            content:
                 title: Contenido
                 placeholder: ej. Este magnífico correo es exactamente lo que buscabas.
         section:

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.fr.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.fr.yml
@@ -273,7 +273,7 @@ admin:
             title:
                 title: Titre
                 placeholder: e.g. Ma super campagne
-            title:
+            content:
                 title: Contenu
                 placeholder: e.g. Cette super campagne est exactement ce que vous recherchez.
         section:

diff --git a/src/Elcodi/Fixtures/DataFixtures/ORM/Page/PageData.php b/src/Elcodi/Fixtures/DataFixtures/ORM/Page/PageData.php
@@ -232,7 +232,7 @@ public function load(ObjectManager $manager)
          */
         $customerRegistrationEmail = $pageDirector
             ->create()
-            ->setTitle('Registro de nuevo usuario')
+            ->setTitle('Bienvenido!')
             ->setContent('Hola {{ customer.fullname }}. Le damos la Bienvenida.')
             ->setName('customer_registration')
             ->setType(ElcodiPageTypes::TYPE_EMAIL)
@@ -244,7 +244,7 @@ public function load(ObjectManager $manager)
 
         $entityTranslator->save($customerRegistrationEmail, [
             'es' => [
-                'title'   => 'Confirmación de pedido',
+                'title'   => 'Bienvenido!',
                 'content' => 'Hola {{ customer.fullname }}.  Le damos la Bienvenida.',
             ],
         ]);
@@ -276,7 +276,7 @@ public function load(ObjectManager $manager)
          */
         $passwordRecoverEmail = $pageDirector
             ->create()
-            ->setTitle('Recordatorio de contraseña')
+            ->setTitle('Contraseña recuperada')
             ->setContent('Hola {{ customer.fullname }}. Tu contraseña ha sido recuperada.')
             ->setName('password_recover')
             ->setType(ElcodiPageTypes::TYPE_EMAIL)
@@ -288,7 +288,7 @@ public function load(ObjectManager $manager)
 
         $entityTranslator->save($passwordRecoverEmail, [
             'es' => [
-                'title'   => 'Recordatorio de contraseña',
+                'title'   => 'Contraseña recuperada',
                 'content' => 'Hola {{ customer.fullname }}. Tu contraseña ha sido recuperada.',
             ],
         ]);

diff --git a/src/Elcodi/Store/PageBundle/DependencyInjection/StorePageExtension.php b/src/Elcodi/Store/PageBundle/DependencyInjection/StorePageExtension.php
@@ -98,6 +98,7 @@ public function getConfigFiles(array $config)
         return [
             'eventListeners',
             'twig',
+            'services',
         ];
     }
 

diff --git a/src/Elcodi/Store/PageBundle/EventListener/Abstracts/AbstractEmailSenderEventListener.php b/src/Elcodi/Store/PageBundle/EventListener/Abstracts/AbstractEmailSenderEventListener.php
@@ -22,6 +22,7 @@
 
 use Elcodi\Component\Page\Entity\Interfaces\PageInterface;
 use Elcodi\Component\Page\Repository\PageRepository;
+use Elcodi\Store\CoreBundle\Services\TemplateLocator;
 
 /**
  * Class AbstractEmailSenderEventListener
@@ -49,6 +50,13 @@ abstract class AbstractEmailSenderEventListener
      */
     protected $pageRepository;
 
+    /**
+     * @var TemplateLocator
+     *
+     * Template locator
+     */
+    protected $templateLocator;
+
     /**
      * @var string
      *
@@ -59,20 +67,23 @@ abstract class AbstractEmailSenderEventListener
     /**
      * Construct
      *
-     * @param Swift_Mailer     $mailer         Mailer
-     * @param Twig_Environment $twig           Twig
-     * @param PageRepository   $pageRepository Page repository
-     * @param string           $storeEmail     Store email
+     * @param Swift_Mailer     $mailer          Mailer
+     * @param Twig_Environment $twig            Twig
+     * @param PageRepository   $pageRepository  Page repository
+     * @param TemplateLocator  $templateLocator A template locator
+     * @param string           $storeEmail      Store email
      */
     public function __construct(
         Swift_Mailer $mailer,
         Twig_Environment $twig,
         PageRepository $pageRepository,
+        TemplateLocator $templateLocator,
         $storeEmail
     ) {
         $this->mailer = $mailer;
         $this->twig = $twig;
         $this->pageRepository = $pageRepository;
+        $this->templateLocator = $templateLocator;
         $this->storeEmail = $storeEmail;
     }
 
@@ -92,9 +103,14 @@ protected function sendEmail($emailName, array $context, $receiverEmail)
             ]);
 
         if ($page instanceof PageInterface) {
+            $template = $this
+                ->templateLocator
+                ->locate(':email.html.twig');
+
             $resolvedPage = $this
                 ->twig
-                ->render('StorePageBundle::email.html.twig', array_merge([
+                ->render($template, array_merge([
+                    'title' => $page->getTitle(),
                     'content' => $page->getContent(),
                 ], $context));
 

diff --git a/src/Elcodi/Store/PageBundle/Resources/config/eventListeners.yml b/src/Elcodi/Store/PageBundle/Resources/config/eventListeners.yml
@@ -10,4 +10,5 @@ services:
             - @mailer
             - @twig
             - @elcodi.repository.page
+            - @store.page.services.template_locator
             - @=elcodi_config("store.email")
diff --git a/src/Elcodi/Store/PageBundle/Resources/config/services.yml b/src/Elcodi/Store/PageBundle/Resources/config/services.yml
@@ -0,0 +1,13 @@
+services:
+
+    #
+    # Services
+    #
+    store.page.services.template_locator:
+        class: Elcodi\Store\CoreBundle\Services\TemplateLocator
+        arguments:
+            engine: @templating.engine.twig
+            bundles:
+                - StoreOverrideBundle
+                - StorePageBundle
+                - StoreFallbackBundle
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,6 +98,7 @@ public function getConfigFiles(array $config) @@
             return [
                 'eventListeners',
                 'twig',
+                'services',
             ];
         }
@@ Expand Down @@