From bf051fc35b2f0c2c3486eb51b9511e8ddecb389c Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 7 Jun 2023 18:49:20 +0100
Subject: [PATCH] Pull checkout-workflow-related callback methods out into the
 Checkout module which defines checkout state changes

---
 app/models/spree/order.rb          | 15 ---------------
 app/models/spree/order/checkout.rb | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index cc8bd1acf4..6c71181852 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -613,21 +613,6 @@ module Spree
       self.email = user.email if user
     end
 
-    def after_cancel
-      shipments.each(&:cancel!)
-      payments.checkout.each(&:void!)
-
-      OrderMailer.cancel_email(id).deliver_later if send_cancellation_email
-      update(payment_state: updater.update_payment_state)
-    end
-
-    def after_resume
-      shipments.each(&:resume!)
-      payments.void.each(&:resume!)
-
-      update(payment_state: updater.update_payment_state)
-    end
-
     def use_billing?
       @use_billing == true || @use_billing == 'true' || @use_billing == '1'
     end
diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index 23606d52cf..618cc6db27 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -151,6 +151,21 @@ module Spree
 
           private
 
+          def after_cancel
+            shipments.each(&:cancel!)
+            payments.checkout.each(&:void!)
+
+            OrderMailer.cancel_email(id).deliver_later if send_cancellation_email
+            update(payment_state: updater.update_payment_state)
+          end
+
+          def after_resume
+            shipments.each(&:resume!)
+            payments.void.each(&:resume!)
+
+            update(payment_state: updater.update_payment_state)
+          end
+
           def validate_payment_method!
             return unless checkout_processing
             return if payments.any?