From 365f89aae87c8779f719fa032500376e9a7c6355 Mon Sep 17 00:00:00 2001
From: jcuervas <javier.cuervas@gmail.com>
Date: Wed, 5 Jul 2023 23:41:42 +0200
Subject: [PATCH 1/2] Revert "moved events.xml inside etc/frontend"

This reverts commit 9e0532770ef20e7b308cf761f23514fedebecb16.
---
 etc/events.xml          |  3 +++
 etc/frontend/events.xml | 10 ----------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 etc/frontend/events.xml

diff --git a/etc/events.xml b/etc/events.xml
index 295da33..f795f7e 100644
--- 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
deleted file mode 100644
index 6a9346a..0000000
--- a/etc/frontend/events.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ @author Monei Team
-  ~ @copyright Copyright © Monei (https://monei.com)
-  -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-  <event name="checkout_onepage_controller_success_action">
-    <observer name="checkout_onepage_controller_success_action_sendmail" instance="Monei\MoneiPayment\Observer\SendMailOnOrderSuccess" />
-  </event>
-</config>

From fa83b5ffc47a03926e3df8fc1765b550588d1c19 Mon Sep 17 00:00:00 2001
From: jcuervas <javier.cuervas@gmail.com>
Date: Thu, 6 Jul 2023 11:14:45 +0200
Subject: [PATCH 2/2] move        
 $this->checkoutSession->unsForceOrderMailSentOnSuccess(); to
 SendMailOnOrderSuccess.php

---
 Observer/SendMailOnOrderSuccess.php                        | 1 +
 Plugin/Sales/Order/Email/Container/OrderIdentityPlugin.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Observer/SendMailOnOrderSuccess.php b/Observer/SendMailOnOrderSuccess.php
index ce8e051..e754fe5 100644
--- 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();
       }
     }
   }
\ No newline at end of file
diff --git a/Plugin/Sales/Order/Email/Container/OrderIdentityPlugin.php b/Plugin/Sales/Order/Email/Container/OrderIdentityPlugin.php
index ac3c78e..5bcb238 100644
--- 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;