From aa16c64f20c99e9c507dbdfa7047a3031e8e91c9 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 14 Feb 2021 15:06:11 +0000
Subject: [PATCH] Update Order#finalize! to include all adjustments

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

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index bf15a455a6..6d4d5cb05c 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -423,7 +423,7 @@ module Spree
     def finalize!
       touch :completed_at
 
-      adjustments.update_all state: 'closed'
+      all_adjustments.update_all state: 'closed'
 
       # update payment and shipment(s) states, and save
       updater.update_payment_state
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 6c96d09792..37428d157f 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -181,7 +181,7 @@ describe Spree::Order do
       allow(order).to receive :has_available_shipment
       allow(Spree::OrderMailer).to receive_message_chain :confirm_email, :deliver_later
       adjustments = double
-      allow(order).to receive_messages adjustments: adjustments
+      allow(order).to receive_messages all_adjustments: adjustments
       expect(adjustments).to receive(:update_all).with(state: 'closed')
       order.finalize!
     end