From f02fc563cd38517d3c8cc572fd47c676aff4c974 Mon Sep 17 00:00:00 2001
From: Martijn <martijnvdbrug@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:23:47 +0100
Subject: [PATCH] fix(payments-plugin): Improve Mollie ignore order states
 (#2670)

---
 packages/payments-plugin/src/mollie/mollie.service.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/payments-plugin/src/mollie/mollie.service.ts b/packages/payments-plugin/src/mollie/mollie.service.ts
index 5c60a9a6fa..f277bdb0ed 100644
--- a/packages/payments-plugin/src/mollie/mollie.service.ts
+++ b/packages/payments-plugin/src/mollie/mollie.service.ts
@@ -12,6 +12,7 @@ import {
     Logger,
     Order,
     OrderService,
+    OrderState,
     OrderStateTransitionError,
     PaymentMethod,
     PaymentMethodService,
@@ -226,7 +227,15 @@ export class MollieService {
                 `Unable to find order ${mollieOrder.orderNumber}, unable to process Mollie order ${mollieOrder.id}`,
             );
         }
-        if (order.state === 'PaymentSettled' || order.state === 'Shipped' || order.state === 'Delivered') {
+        const statesThatRequireAction: OrderState[] = [
+            'AddingItems',
+            'ArrangingPayment',
+            'ArrangingAdditionalPayment',
+            'PaymentAuthorized',
+            'Draft',
+        ];
+        if (!statesThatRequireAction.includes(order.state)) {
+            // If order is not in one of these states, we don't need to handle the Mollie webhook
             Logger.info(
                 `Order ${order.code} is already '${order.state}', no need for handling Mollie status '${mollieOrder.status}'`,
                 loggerCtx,