Merge branch 'bugfix/mark-subscription-items-as-onetime-purchase' int…

…o release-week-15

Observer/AdminhtmlSalesOrderCreateProcessItemBefore/SetPurchaseTypeOnCreateOrderItem.php

@@ -0,0 +1,64 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Observer\AdminhtmlSalesOrderCreateProcessItemBefore;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class SetPurchaseTypeOnCreateOrderItem implements ObserverInterface
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    public function __construct(
+        ProductRepositoryInterface $productRepository
+    ) {
+        $this->productRepository = $productRepository;
+    }
+
+    public function execute(Observer $observer)
+    {
+        /** @var RequestInterface $request */
+        $request = $observer->getData('request_model');
+
+        if ($request->has('item') && !$request->getPost('update_items')
+        ) {
+            $itemsChanged = false;
+            $items = $request->getPost('item');
+            foreach ($items as $item => $requestData) {
+                if (!$this->productAllowsOneTimePurchase($item)) {
+                    continue;
+                }
+
+                $itemsChanged = true;
+                $items[$item]['purchase'] = 'onetime';
+            }
+
+            if ($itemsChanged) {
+                $request->setPostValue('item', $items);
+            }
+        }
+    }
+
+    private function productAllowsOneTimePurchase(int $productId): bool
+    {
+        try {
+            $product = $this->productRepository->getById($productId);
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+
+        return !!$product->getData('mollie_subscription_product');
+    }
+}

etc/events.xml

@@ -66,4 +66,7 @@
     <event name="sales_quote_payment_import_data_before">
         <observer name="mollie_clear_issuer_on_method_change" instance="Mollie\Payment\Observer\SalesQuotePaymentImportDataBefore\ClearIssuerOnMethodChange" />
     </event>
+    <event name="adminhtml_sales_order_create_process_item_before">
+        <observer name="mollie_set_purchase_type_on_create_order_item" instance="Mollie\Payment\Observer\AdminhtmlSalesOrderCreateProcessItemBefore\SetPurchaseTypeOnCreateOrderItem" />
+    </event>
 </config>