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
Cleanup duplicated market method
Damian Legawiec068c15041de1
diff --git a/spree/core/app/models/concerns/spree/purchase/market.rb b/spree/core/app/models/concerns/spree/purchase/market.rbindex f3ed3271bf..99609a5e0a 100644--- a/spree/core/app/models/concerns/spree/purchase/market.rb+++ b/spree/core/app/models/concerns/spree/purchase/market.rb@@ -8,7 +8,11 @@ module Spreevalidates :market, presence: true++ attr_accessor :skip_market_resolution+before_validation :ensure_market_presence+ before_validation :resolve_market_from_currency, if: -> { persisted? && currency_changed? && !skip_market_resolution }enddef ensure_market_presencediff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rbindex 81d1eb9abd..51f7869226 100644--- a/spree/core/app/models/spree/cart.rb+++ b/spree/core/app/models/spree/cart.rb@@ -124,8 +124,6 @@ module Spreeattr_accessor :skip_market_resolution- before_validation :resolve_market_from_currency, if: -> { persisted? && currency_changed? && !skip_market_resolution }-before_update :ensure_updated_fulfillments, :homogenize_line_item_currencies, if: :currency_changed?delegate :name, to: :customer, prefix: true, allow_nil: truediff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex a74d0978f1..e3b9f663ac 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -1105,16 +1105,6 @@ module Spreeendend- # When currency changes, auto-resolve the matching market.- # Only applies when the store has markets configured.- def resolve_market_from_currency- return unless store_has_markets?- return if market&.currency == currency-- resolved = store.markets.find_by(currency: currency)- self.market = resolved if resolved- end-def collect_payment_methodsSpree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 5.5. Use `collect_frontend_payment_methods` instead.')diff --git a/spree/core/spec/models/concerns/spree/purchase/addresses_spec.rb b/spree/core/spec/models/concerns/spree/purchase/addresses_spec.rbindex b498ecac00..12e69aea50 100644--- a/spree/core/spec/models/concerns/spree/purchase/addresses_spec.rb+++ b/spree/core/spec/models/concerns/spree/purchase/addresses_spec.rb@@ -209,18 +209,13 @@ RSpec.describe Spree::Purchase::Addresses doit_behaves_like 'an addresses host'describe 'use_billing clone callback (deprecated bridge, removed in 6.1)' do- let(:order) { Spree::Order.new }+ let(:order) { build(:order) }before doorder.bill_address = create(:address)order.ship_address = nilend- it 'warns on assignment' do- expect(Spree::Deprecation).to receive(:warn).with(/use_billing is deprecated/)- order.use_billing = true- end-%w[true 1].push(true).each do |truthy_value|context "with #{truthy_value.inspect}" dobefore { order.use_billing = truthy_value }