From f550d1e9f37a2bf398b3426d258bb03504fda2ce Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 10 May 2021 15:39:35 +0100
Subject: [PATCH] Bring Order#ensure_updated_shipments from Spree 2.2

---
 app/models/spree/order.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 0a3042c418..75cdf9a2c4 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -517,6 +517,21 @@ module Spree
       shipments
     end
 
+    # Clear shipments and move order back to address state
+    def ensure_updated_shipments
+      if !self.completed? && shipments.any?
+        shipments.destroy_all
+        restart_checkout_flow
+      end
+    end
+
+    def restart_checkout_flow
+      self.update_columns(
+        state: checkout_steps.first,
+        updated_at: Time.zone.now,
+      )
+    end
+
     def refresh_shipment_rates
       shipments.map(&:refresh_rates)
     end