From 4b42ae32e7901c91e77f739014f608fe53092cdc Mon Sep 17 00:00:00 2001
From: Michiel Gerritsen <michiel@controlaltdelete.nl>
Date: Mon, 26 Feb 2024 20:56:36 +0100
Subject: [PATCH 1/3] Bugfix: Check that the api key is available #752

---
 Model/Adminhtml/Backend/ChangeApiMode.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Model/Adminhtml/Backend/ChangeApiMode.php b/Model/Adminhtml/Backend/ChangeApiMode.php
index 7e632bf6229..82fc07e740f 100644
--- a/Model/Adminhtml/Backend/ChangeApiMode.php
+++ b/Model/Adminhtml/Backend/ChangeApiMode.php
@@ -69,7 +69,9 @@ public function beforeSave(): self
     public function afterSave()
     {
         $apiKey = $this->getApiKey($this->getValue());
-        $this->updateProfileId->execute($apiKey, $this->getScope(), $this->getScopeId());
+        if ($apiKey) {
+            $this->updateProfileId->execute($apiKey, $this->getScope(), $this->getScopeId());
+        }
 
         return parent::afterSave();
     }

From 07fee1789e985879b9ee436266e00c95c257fb42 Mon Sep 17 00:00:00 2001
From: Marvin Besselsen <marvin@magmodules.eu>
Date: Wed, 28 Feb 2024 10:17:14 +0100
Subject: [PATCH 2/3] Version bump

---
 composer.json  | 2 +-
 etc/config.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 06c364e255e..b4b61e1386a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mollie/magento2",
   "description": "Mollie Payment Module for Magento 2",
-  "version": "2.35.0",
+  "version": "2.35.1",
   "keywords": [
     "mollie",
     "payment",
diff --git a/etc/config.xml b/etc/config.xml
index 7fc0bffaf62..32a5b285514 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -3,7 +3,7 @@
     <default>
         <payment>
             <mollie_general>
-                <version>v2.35.0</version>
+                <version>v2.35.1</version>
                 <active>0</active>
                 <enabled>0</enabled>
                 <type>test</type>

From 69740a6a19f3648cfab2df8ed7aefc9f857057ce Mon Sep 17 00:00:00 2001
From: Mark Rees <35261502+Sental@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:09:58 +0100
Subject: [PATCH 3/3] Specify the Payment Link Url Scope

Specify the Payment Link Url Scope to prevent the payment link url from using the admin url when different.
---
 Service/Magento/PaymentLinkUrl.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Service/Magento/PaymentLinkUrl.php b/Service/Magento/PaymentLinkUrl.php
index 4f93f819d2d..b1e87c495b2 100644
--- a/Service/Magento/PaymentLinkUrl.php
+++ b/Service/Magento/PaymentLinkUrl.php
@@ -54,6 +54,7 @@ public function execute(int $orderId): string
 
         return $this->urlBuilder->getUrl('mollie/checkout/paymentlink', [
             'order' => $orderId,
+            '_scope' => $order->getStoreId()
         ]);
     }