From 06c9697d0d539b9767224bcecabe6099f9699001 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 2 Jun 2023 22:53:33 +0100
Subject: [PATCH] Don't try to cancel shipments that might already be cancelled

---
 app/models/spree/order/checkout.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index 6a6bee68c4..3575dc1ae0 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -147,7 +147,7 @@ module Spree
           private
 
           def after_cancel
-            shipments.each(&:cancel!)
+            shipments.reject(&:canceled?).each(&:cancel!)
             payments.checkout.each(&:void!)
 
             OrderMailer.cancel_email(id).deliver_later if send_cancellation_email