Merge branch 'main' into fix-bad-storelocal-resolver

Adyen · Sep 25, 2024 · 055749e · 055749e
2 parents 3b54b17 + 1db12b8
commit 055749e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Helper/Webhook/OfferClosedWebhookHandler.php b/Helper/Webhook/OfferClosedWebhookHandler.php
@@ -105,7 +105,10 @@ public function handleWebhook(MagentoOrder $order, Notification $notification, s
         }
 
         // Move the order from PAYMENT_REVIEW to NEW, so that it can be cancelled
-        if (!$order->canCancel() && $this->configHelper->getNotificationsCanCancel($order->getStoreId())) {
+        if (!$order->isCanceled()
+            && !$order->canCancel()
+            && $this->configHelper->getNotificationsCanCancel($order->getStoreId())
+        ) {
             $order->setState(MagentoOrder::STATE_NEW);
         }
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.8.0
+9.8.1
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "9.8.0",
+  "version": "9.8.1",
   "license": "MIT",
   "repositories": [
     {