Merge branch 'bugfix/first-available-method' into release-week-22

Author: michielgerritsen

src/Mollie_HyvaCheckout/Observer/SalesQuoteCollectTotalsBefore/SetDefaultSelectedPaymentMethod.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Quote\Api\Data\PaymentInterfaceFactory;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -26,19 +27,22 @@ class SetDefaultSelectedPaymentMethod implements ObserverInterface
     private StoreManagerInterface $storeManager;
     private ScopeConfigInterface $scopeConfig;
     private HyvaCheckoutConfig $hyvaCheckoutConfig;
+    private PaymentMethodManagementInterface $paymentMethodManagement;
 
     public function __construct(
         HyvaCheckoutConfig $hyvaCheckoutConfig,
         ScopeConfigInterface $scopeConfig,
         Config $config,
         PaymentInterfaceFactory $paymentFactory,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        PaymentMethodManagementInterface $paymentMethodManagement,
     ) {
         $this->paymentFactory = $paymentFactory;
         $this->config = $config;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
         $this->hyvaCheckoutConfig = $hyvaCheckoutConfig;
+        $this->paymentMethodManagement = $paymentMethodManagement;
     }
 
     public function execute(Observer $observer): void
@@ -56,7 +60,11 @@ public function execute(Observer $observer): void
             return;
         }
 
-        if (!$this->isMethodActive($defaultMethod)) {
+        if ($defaultMethod == 'first_mollie_method') {
+            $defaultMethod = $this->getFirstAvailableMollieMethod($quote);
+        }
+
+        if ($defaultMethod && !$this->isMethodActive($defaultMethod)) {
             return;
         }
 
@@ -66,10 +74,11 @@ public function execute(Observer $observer): void
         }
 
         /** @var \Magento\Quote\Api\Data\PaymentInterface $payment */
-        $payment = $this->paymentFactory->create();
+        $payment = $quote->getPayment() ?: $this->paymentFactory->create();
         $payment->setMethod($defaultMethod);
 
         $quote->setPayment($payment);
+        $this->paymentMethodManagement->set($quote->getId(), $payment);
     }
 
     /**
@@ -93,4 +102,21 @@ private function quoteHasActivePaymentMethod(Quote $quote): bool
     {
         return $quote->getPayment()->getMethod() !== null;
     }
+
+    private function getFirstAvailableMollieMethod(Quote $quote): ?string
+    {
+        $methods = $this->paymentMethodManagement->getList($quote->getId());
+
+        foreach ($methods as $method) {
+            $methodCode = $method->getCode();
+            if (strpos($methodCode, 'mollie_') === 0 &&
+                $methodCode != 'mollie_methods_applepay' &&
+                $this->isMethodActive($methodCode)
+            ) {
+                return $methodCode;
+            }
+        }
+
+        return null;
+    }
 }