Merge pull request solidusio#5797 from mamhoff/fix-reloading-state-ma…

…chine-transition

Legacy Promotions: Fix shipping promo application after state machine reload

legacy_promotions/app/decorators/solidus_legacy_promotions/lib/spree_order_state_machine_decorator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_dependency "spree/core/state_machines/order"
+
+module SolidusLegacyPromotions
+  module SpreeOrderStateMachineDecorator
+    def define_state_machine!
+      super
+      state_machine do
+        if states[:delivery]
+          before_transition from: :delivery, do: :apply_shipping_promotions
+        end
+      end
+    end
+
+    Spree::Core::StateMachines::Order::ClassMethods.prepend self
+  end
+end

legacy_promotions/app/decorators/solidus_legacy_promotions/models/spree/order_decorator.rb

@@ -2,15 +2,7 @@
 
 module SolidusLegacyPromotions
   module OrderDecorator
-    def self.prepended(base)
-      base.state_machine do
-        if states[:delivery]
-          before_transition from: :delivery, do: :apply_shipping_promotions
-        end
-      end
-    end
-
-    def apply_shipping_promotions
+    def apply_shipping_promotions(_event = nil)
       ::Spree::Config.promotions.shipping_promotion_handler_class.new(self).activate
       recalculate
     end

legacy_promotions/spec/models/spree/order_spec.rb

@@ -19,6 +19,20 @@
 
       order.apply_shipping_promotions
     end
+
+    context "after the order state machine is reloaded" do
+      let(:order) { create(:order_with_line_items, state: :delivery) }
+
+      before do
+        @old_checkout_flow = Spree::Order.checkout_flow
+        Spree::Order.checkout_flow(&@old_checkout_flow)
+      end
+
+      it "calls apply_shipping_promotions " do
+        expect(order).to receive(:apply_shipping_promotions)
+        order.next!
+      end
+    end
   end
 
   context "empty!" do