Merge pull request #23 from NicolasBarbey/main

fix send confirmation email
thelia-modules · Jun 9, 2023 · 0147990 · 0147990
2 parents d4edb9c + 3213f08
commit 0147990
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/Config/config.xml b/Config/config.xml
@@ -8,15 +8,6 @@
         <loop name="cmcic.check.rights" class="CmCIC\Loop\CheckRightsLoop" />
     </loops>
 
-    <services>
-        <service id="cmcic.confirmation.email" class="CmCIC\EventListeners\SendConfirmationEmail">
-            <argument type="service" id="mailer"/>
-            <argument type="service" id="event_dispatcher"/>
-
-            <tag name="kernel.event_subscriber"/>
-        </service>
-    </services>
-
     <hooks>
         <hook id="cmcic.back.hook" class="CmCIC\Hook\HookManager">
             <tag name="hook.event_listener" event="module.configuration" type="back" method="onModuleConfigure" />

diff --git a/Config/module.xml b/Config/module.xml
@@ -14,7 +14,7 @@
         <language>fr_FR</language>
         <language>en_US</language>
     </languages>
-    <version>1.4.5</version>
+    <version>2.0.0</version>
     <authors>
         <author>
             <name>Thelia</name>
@@ -28,6 +28,6 @@
         </author>
     </authors>
     <type>payment</type>
-    <thelia>2.2.0</thelia>
+    <thelia>2.5.0</thelia>
     <stability>prod</stability>
 </module>
diff --git a/EventListeners/SendConfirmationEmail.php b/EventListeners/SendConfirmationEmail.php
@@ -13,14 +13,21 @@
 namespace CmCIC\EventListeners;
 
 use CmCIC\CmCIC;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\Order\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Log\Tlog;
 
 class SendConfirmationEmail implements EventSubscriberInterface
 {
+    protected EventDispatcherInterface $dispatcher;
+
+    public function __construct(EventDispatcherInterface $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
     /**
      * @param OrderEvent $event
      *
@@ -39,16 +46,15 @@ public function sendConfirmationEmail(OrderEvent $event)
 
     /**
      * @param OrderEvent $event
-     * @param EventDispatcher $dispatcher
      * @throws \Propel\Runtime\Exception\PropelException
      */
-    public function updateStatus(OrderEvent $event, EventDispatcher $dispatcher)
+    public function updateStatus(OrderEvent $event)
     {
         $order = $event->getOrder();
         if ($order->isPaid() && $order->getPaymentModuleId() == CmCIC::getModuleId()) {
             // Send confirmation email if required.
             if (CmCIC::getConfigValue('send_confirmation_message_only_if_paid')) {
-                $dispatcher->dispatch($event, TheliaEvents::ORDER_SEND_CONFIRMATION_EMAIL);
+                $this->dispatcher->dispatch($event, TheliaEvents::ORDER_SEND_CONFIRMATION_EMAIL);
             }
 
             Tlog::getInstance()->debug("Confirmation email sent to customer " . $order->getCustomer()->getEmail());