[7.x] Clear order's gateway data when Mollie payment expires

src/Data/HasData.php

@@ -46,6 +46,13 @@ public function merge($data): self
         return $this;
     }
 
+    public function remove(string $key): self
+    {
+        unset($this->data[$key]);
+
+        return $this;
+    }
+
     public function toArray(): array
     {
         return $this->data()->toArray();

src/Gateways/Builtin/MollieGateway.php

@@ -124,6 +124,19 @@ public function webhook(Request $request)
 
             event(new OrderPaymentFailed($order));
         }
+
+        if ($payment->status === MolliePaymentStatus::STATUS_EXPIRED) {
+            $order = $this->getOrderFromWebhookRequest($request);
+
+            if (! $order) {
+                throw new OrderNotFound("Order related to Mollie transaction [{$mollieId}] could not be found.");
+            }
+
+            $order
+                ->remove('mollie')
+                ->clearGatewayData()
+                ->save();
+        }
     }
 
     public function fieldtypeDisplay($value): array

src/Orders/Order.php

@@ -227,6 +227,13 @@ public function gatewayData(?string $gateway = null, ?array $data = null, ?array
         return new GatewayData($this->gateway);
     }
 
+    public function clearGatewayData(): self
+    {
+        $this->gateway = null;
+
+        return $this;
+    }
+
     public function resource($resource = null)
     {
         return $this