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
Fixed: both Order and Cart use `Carts::Associate` in `associate_user!`
Damian Legawiecc2ac42cdfab9
diff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rbindex c984dbc1d9..0befbf99e2 100644--- a/spree/core/app/models/spree/cart.rb+++ b/spree/core/app/models/spree/cart.rb@@ -303,13 +303,10 @@ module Spreestore.payment_methods.active.available_on_front_end.select { |payment_method| payment_method.available_for_order?(self) }end- # Binds a signing-in user to the cart (mirrors Order#associate_user!).+ # Binds a signing-in user to the cart through the swappable associate+ # service (same seam Order#associate_user! uses).def associate_user!(user, override_email = true)- self.customer = user- self.email = user.email if override_email || email.blank?- self.bill_address ||= user.bill_address if user.bill_address&.valid?- self.ship_address ||= user.ship_address if user.ship_address&.valid? && delivery_required?- save! if persisted?+ Spree.cart_associate_service.call(guest_cart: self, user: user, override_email: override_email)end# Merges another cart into this one through the swappable merge strategydiff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex 7db167ab31..7728787a15 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -226,11 +226,6 @@ module Spree# @deprecated legacy writer — removed in 6.1alias shipments_attributes= fulfillments_attributes=- # Needs to happen before save_permalink is called- before_validation :resolve_market_from_currency, if: -> { persisted? && currency_changed? && !skip_market_resolution }-- attr_accessor :skip_market_resolution-before_create :link_by_emailbefore_update :ensure_updated_fulfillments, :homogenize_line_item_currencies, if: :currency_changed?diff --git a/spree/core/app/services/spree/carts/associate.rb b/spree/core/app/services/spree/carts/associate.rbindex 76bd701e0a..d43add22e5 100644--- a/spree/core/app/services/spree/carts/associate.rb+++ b/spree/core/app/services/spree/carts/associate.rb@@ -12,8 +12,11 @@ module Spreeguest_cart.user = userguest_cart.email = user.email if override_email- guest_cart.bill_address ||= user.bill_address- guest_cart.ship_address ||= user.ship_address+ # Only valid saved defaults are copied — update_all below skips+ # validations, so a broken address-book entry must not land on the+ # cart. Digital-only checkouts never receive a ship address.+ guest_cart.bill_address ||= user.bill_address if user.bill_address&.valid?+ guest_cart.ship_address ||= user.ship_address if user.ship_address&.valid? && guest_cart.delivery_required?owner_key = guest_cart.is_a?(Spree::Cart) ? :customer_id : :user_idchanges = {diff --git a/spree/core/spec/services/spree/carts/associate_spec.rb b/spree/core/spec/services/spree/carts/associate_spec.rbindex 2eb511c942..3273605cb7 100644--- a/spree/core/spec/services/spree/carts/associate_spec.rb+++ b/spree/core/spec/services/spree/carts/associate_spec.rb@@ -14,6 +14,32 @@ module Spreeexpect(cart.reload.customer).to eq(user)expect(cart.email).to eq(user.email)end++ it 'copies valid saved default addresses, gated on physical delivery' do+ user.update!(bill_address: create(:address, user: user), ship_address: create(:address, user: user))+ cart_with_items = create(:cart_with_line_items, customer: nil)++ described_class.call(guest_cart: cart_with_items, user: user)++ expect(cart_with_items.reload.bill_address_id).to eq(user.bill_address_id)+ expect(cart_with_items.ship_address_id).to eq(user.ship_address_id)+ end++ it 'never copies an invalid saved default address' do+ invalid_address = build(:address, city: nil)+ invalid_address.save(validate: false)+ user.update_columns(bill_address_id: invalid_address.id)++ expect(subject).to be_success+ expect(cart.reload.bill_address_id).to be_nil+ end++ it 'skips the ship address when no physical delivery is required' do+ user.update!(ship_address: create(:address, user: user))++ expect(subject).to be_success+ expect(cart.reload.ship_address_id).to be_nil+ endendcontext 'when an already assigned cart is given' do