Merge pull request #27 from BITVAX/dev-1.1.9

Dev 1.1.9

Controller/Payment/Complete.php

@@ -18,6 +18,7 @@
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Monei\MoneiPayment\Api\Config\MoneiPaymentModuleConfigInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Monei\MoneiPayment\Api\Service\GenerateInvoiceInterface;
 use Monei\MoneiPayment\Model\PendingOrderFactory;
 use Monei\MoneiPayment\Model\ResourceModel\PendingOrder as PendingOrderResource;
@@ -67,9 +68,15 @@ class Complete implements ActionInterface
      */
     private $pendingOrderResource;
 
+    /**
+     * @var OrderSender
+     */
+    protected $orderSender;
+
     /**
      * @param Context $context
      * @param OrderRepositoryInterface $orderRepository
+     * @param OrderSender $orderSender
      * @param OrderInterfaceFactory $orderFactory
      * @param MoneiPaymentModuleConfigInterface $moduleConfig
      * @param GenerateInvoiceInterface $generateInvoiceService
@@ -78,6 +85,7 @@ class Complete implements ActionInterface
     public function __construct(
         Context $context,
         OrderRepositoryInterface $orderRepository,
+        OrderSender $orderSender,
         OrderInterfaceFactory $orderFactory,
         MoneiPaymentModuleConfigInterface $moduleConfig,
         GenerateInvoiceInterface $generateInvoiceService,
@@ -87,6 +95,7 @@ public function __construct(
     ) {
         $this->context = $context;
         $this->orderRepository = $orderRepository;
+        $this->orderSender = $orderSender;
         $this->orderFactory = $orderFactory;
         $this->moduleConfig = $moduleConfig;
         $this->generateInvoiceService = $generateInvoiceService;
@@ -128,6 +137,16 @@ public function execute()
                 $order->setStatus($this->moduleConfig->getConfirmedStatus())->setState(Order::STATE_NEW);
                 $order->setData('monei_payment_id', $data['id']);
                 $this->orderRepository->save($order);
+
+                // send Order email
+                if ($order->getCanSendNewEmailFlag()) {
+                    try {
+                        $this->orderSender->send($order);
+                    } catch (\Exception $e) {
+                        $this->logger->critical($e);
+                    }
+                }
+
                 return $this->resultRedirectFactory->setPath('checkout/onepage/success', ['_secure' => true]);
 
             default:

Controller/Payment/Redirect.php

@@ -60,7 +60,7 @@ public function execute()
          */
         $order = $this->checkoutSession->getLastRealOrder();
         $data = [
-            "amount"            => $order->getGrandTotal() * 100,
+            "amount"            => $order->getBaseGrandTotal() * 100,
             "orderId"           => (string) $order->getIncrementId(),
             "currency"          => $order->getBaseCurrencyCode(),
             "customer"          => $this->getCustomerDetails($order),

Setup/Patch/Data/SetupSales.php

@@ -51,7 +51,7 @@ public function getAliases(): array
      */
     public static function getVersion(): string
     {
-      return '1.1.8';
+      return '1.1.9';
     }
 
     public function apply(): void

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "monei/module-monei-payment",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "description": "MONEI Payments Adobe Commerce (Magento 2) module",
     "type": "magento2-module",
     "keywords": [

etc/config.xml

@@ -29,6 +29,7 @@
         <can_capture_partial>1</can_capture_partial>
         <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
         <can_refund>1</can_refund>
+        <order_place_redirect_url>1</order_place_redirect_url>
       </monei>
     </payment>
   </default>

etc/di.xml

@@ -48,9 +48,6 @@
   <type name="Magento\Sales\Model\Service\CreditmemoService">
     <plugin name="set_order_status_after_refund" type="Monei\MoneiPayment\Plugin\SetOrderStatusAfterRefund"/>
   </type>
-  <type name="Magento\Sales\Model\Order\Email\Container\OrderIdentity">
-    <plugin name="change_is_enable_method" type="Monei\MoneiPayment\Plugin\Sales\Order\Email\Container\OrderIdentityPlugin"/>
-  </type>
   <virtualType name="MoneiPaymentFacade" type="Magento\Payment\Model\Method\Adapter">
     <arguments>
       <argument name="code" xsi:type="const">Monei\MoneiPayment\Model\Payment\Monei::CODE</argument>

etc/events.xml

@@ -7,9 +7,6 @@
   <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>-->

etc/module.xml

@@ -4,7 +4,7 @@
   ~ @copyright Copyright © Monei (https://monei.com)
   -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Monei_MoneiPayment" setup_version="1.1.8">
+  <module name="Monei_MoneiPayment" setup_version="1.1.9">
     <sequence>
       <module name="Magento_Checkout"/>
       <module name="Magento_Config"/>