From 290c1d0ebf2268652986e8ae477c256f53b06107 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:43:28 +0100
Subject: [PATCH] Bring in shipment state updating from Spree 2.2

---
 app/models/spree/shipment.rb                             | 9 +++++++++
 .../app/services/order_management/order/updater.rb       | 1 +
 2 files changed, 10 insertions(+)

diff --git a/app/models/spree/shipment.rb b/app/models/spree/shipment.rb
index b5f7516f06..e4790a7ad5 100644
--- a/app/models/spree/shipment.rb
+++ b/app/models/spree/shipment.rb
@@ -331,6 +331,15 @@ module Spree
       fee_adjustment.finalize!
       send_shipped_email
       touch :shipped_at
+      update_order_shipment_state
+    end
+
+    def update_order_shipment_state
+      new_state = order.updater.update_shipment_state
+      order.update_columns(
+        shipment_state: new_state,
+        updated_at: Time.now,
+      )
     end
 
     def send_shipped_email
diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index e1bd346619..649a5e604d 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -101,6 +101,7 @@ module OrderManagement
                                end
 
         order.state_changed('shipment')
+        order.shipment_state
       end
 
       # Updates the +payment_state+ attribute according to the following logic: