Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Add ability to swap Order Updater via Spree dependencies (#13033)
Damian Legawiec3c2e70534af0
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 9584300348..1b558eaedb 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -350,7 +350,7 @@ module Spreeenddef updater- @updater ||= OrderUpdater.new(self)+ @updater ||= Spree::Dependencies.order_updater.constantize.new(self)enddef update_with_updater!diff --git a/core/app/services/spree/cart/recalculate.rb b/core/app/services/spree/cart/recalculate.rbindex 2096a2d7ea..819afc4091 100644--- a/core/app/services/spree/cart/recalculate.rb+++ b/core/app/services/spree/cart/recalculate.rb@@ -4,7 +4,7 @@ module Spreeprepend Spree::ServiceModule::Basedef call(order:, line_item:, line_item_created: false, options: {})- order_updater = ::Spree::OrderUpdater.new(order)+ order_updater = order.updaterorder.remove_gift_card if order.gift_card.present?order.payments.store_credits.checkout.destroy_all if order.payments.store_credits.checkout.any?diff --git a/core/lib/spree/core/dependencies.rb b/core/lib/spree/core/dependencies.rbindex 2b029466d8..31a40718ca 100644--- a/core/lib/spree/core/dependencies.rb+++ b/core/lib/spree/core/dependencies.rb@@ -41,6 +41,7 @@ module Spree# orderorder_approve_service: 'Spree::Orders::Approve',order_cancel_service: 'Spree::Orders::Cancel',+ order_updater: 'Spree::OrderUpdater',# shipmentshipment_change_state_service: 'Spree::Shipments::ChangeState',diff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rbindex bd1182b0b4..da924ff9fb 100644--- a/core/spec/models/spree/order/checkout_spec.rb+++ b/core/spec/models/spree/order/checkout_spec.rb@@ -466,7 +466,7 @@ describe Spree::Order, type: :model doallow(order).to receive_messages(payment_required?: true)order.line_items << FactoryBot.create(:line_item, variant: variant_digital)order.line_items << FactoryBot.create(:line_item, variant: variant_physical_with_digital_asset)- Spree::OrderUpdater.new(order).update+ order.updater.updateorder.save!enddiff --git a/core/spec/models/spree/order/payment_spec.rb b/core/spec/models/spree/order/payment_spec.rbindex 4b502a4eaa..221bf37491 100644--- a/core/spec/models/spree/order/payment_spec.rb+++ b/core/spec/models/spree/order/payment_spec.rb@@ -3,7 +3,7 @@ require 'spec_helper'module Spreedescribe Spree::Order, type: :model dolet(:order) { create(:order, total: 100, payment_total: 0) }- let(:updater) { Spree::OrderUpdater.new(order) }+ let(:updater) { order.updater }context 'processing payments' dobefore dodiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 6f494fbb23..79d4338d48 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -120,7 +120,7 @@ describe Spree::Order, type: :model doenddescribe '#update_with_updater!' do- let(:updater) { Spree::OrderUpdater.new(order) }+ let(:updater) { order.updater }before doallow(order).to receive(:updater).and_return(updater)diff --git a/core/spec/models/spree/order_updater_spec.rb b/core/spec/models/spree/order_updater_spec.rbindex 52531ec160..e17436b3b3 100644--- a/core/spec/models/spree/order_updater_spec.rb+++ b/core/spec/models/spree/order_updater_spec.rb@@ -4,7 +4,7 @@ require 'spree/testing_support/order_walkthrough'module Spreedescribe OrderUpdater, type: :model dolet(:order) { create(:order) }- let(:updater) { Spree::OrderUpdater.new(order) }+ let(:updater) { order.updater }context 'order totals' dobefore do@@ -15,7 +15,7 @@ module Spreeit 'updates payment totals' docreate(:payment_with_refund, amount: 20, order: order)- Spree::OrderUpdater.new(order).update_payment_total+ order.updater.update_payment_totalexpect(order.payment_total).to eq(15)enddiff --git a/core/spec/services/spree/checkout/advance_spec.rb b/core/spec/services/spree/checkout/advance_spec.rbindex 931d6413e7..7ef1614a78 100644--- a/core/spec/services/spree/checkout/advance_spec.rb+++ b/core/spec/services/spree/checkout/advance_spec.rb@@ -162,7 +162,7 @@ RSpec.describe Spree::Checkout::Advance doenddef ensure_states_updated_only_once- updater_spy = Spree::OrderUpdater.new(order)+ updater_spy = order.updaterallow(order).to receive(:updater).and_return(updater_spy)expect(updater_spy).to receive(:update_shipment_state).once.and_call_originalexpect(updater_spy).to receive(:update_payment_state).once.and_call_original