Merge pull request #24 from MONEI/move_send_main_on_success

Move send main on success
MONEI · Jul 6, 2023 · adc372b · adc372b
2 parents 0f136e1 + fa83b5f
commit adc372b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/Observer/SendMailOnOrderSuccess.php b/Observer/SendMailOnOrderSuccess.php
@@ -50,6 +50,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $this->checkoutSession->setForceOrderMailSentOnSuccess(true);
         $order = $this->orderModel->create()->load($orderIds[0]);
         $this->orderSender->send($order, true);
+        $this->checkoutSession->unsForceOrderMailSentOnSuccess();
       }
     }
   }
diff --git a/Plugin/Sales/Order/Email/Container/OrderIdentityPlugin.php b/Plugin/Sales/Order/Email/Container/OrderIdentityPlugin.php
@@ -38,7 +38,6 @@ public function aroundIsEnabled(\Magento\Sales\Model\Order\Email\Container\Order
         else
           $returnValue = true;
 
-        $this->checkoutSession->unsForceOrderMailSentOnSuccess();
       }
 
       return $returnValue;

diff --git a/etc/events.xml b/etc/events.xml
@@ -7,6 +7,9 @@
   <event name="sales_order_invoice_register">
     <observer name="set_monei_order_status_and_state_after_invoice" instance="Monei\MoneiPayment\Observer\SetOrderStatusAfterInvoice"/>
   </event>
+  <event name="checkout_onepage_controller_success_action">
+    <observer name="checkout_onepage_controller_success_action_sendmail" instance="Monei\MoneiPayment\Observer\SendMailOnOrderSuccess" />
+  </event>
 <!--  <event name="sales_order_creditmemo_refund">-->
 <!--    <observer name="set_monei_order_status_and_state_after_refund" instance="Monei\MoneiPayment\Observer\SetOrderStatusAfterRefund"/>-->
 <!--  </event>-->

diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
-Original file line number
+Diff line change
@@ Expand Up @@
             else
               $returnValue = true;
-            $this->checkoutSession->unsForceOrderMailSentOnSuccess();
           }
           return $returnValue;
@@ Expand Down @@