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
Improve setting user addresses when adding new addresses during checkout (#12286)
Damian Legawiec0703ce29f1b2
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 9e0185bf13..39a84aee9b 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -89,7 +89,7 @@ module Spreeacts_as_taggable_on :tagsacts_as_taggable_tenant :store_id- belongs_to :user, class_name: "::#{Spree.user_class}", optional: true+ belongs_to :user, class_name: "::#{Spree.user_class}", optional: true, autosave: truebelongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: truebelongs_to :approver, class_name: "::#{Spree.admin_user_class}", optional: truebelongs_to :canceler, class_name: "::#{Spree.admin_user_class}", optional: truediff --git a/core/app/models/spree/order/address_book.rb b/core/app/models/spree/order/address_book.rbindex b03e28a832..0fb07e8c64 100644--- a/core/app/models/spree/order/address_book.rb+++ b/core/app/models/spree/order/address_book.rb@@ -2,12 +2,14 @@ module Spreeclass Order < Spree.base_classmodule AddressBookdef clone_shipping_address- self.bill_address_id = ship_address_id if ship_address_id+ self.bill_address = ship_address if ship_address+ user.bill_address = ship_address if should_assign_user_default_address?(ship_address)trueenddef clone_billing_address- self.ship_address_id = bill_address_id if bill_address_id+ self.ship_address = bill_address if bill_address+ user.ship_address = bill_address if should_assign_user_default_address?(bill_address)trueend@@ -23,12 +25,7 @@ module Spreedef bill_address_attributes=(attributes)self.bill_address = update_or_create_address(attributes)-- if should_assign_user_default_address?(bill_address)- user_old_address = user&.bill_address- user_old_address&.delete unless user_old_address&.valid?- user&.update(bill_address: bill_address)- end+ user.bill_address = bill_address if should_assign_user_default_address?(bill_address)enddef ship_address_id=(id)@@ -43,12 +40,7 @@ module Spreedef ship_address_attributes=(attributes)self.ship_address = update_or_create_address(attributes)-- if should_assign_user_default_address?(ship_address)- user_old_address = user&.ship_address- user_old_address&.delete unless user_old_address&.valid?- user&.update(ship_address: ship_address)- end+ user.ship_address = ship_address if should_assign_user_default_address?(ship_address)endprivate@@ -87,7 +79,7 @@ module Spreeenddef should_assign_user_default_address?(address)- address.present? && address.valid?+ user.present? && address.present? && address.valid? && address.user == userendendenddiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 7137760a0f..8128681dbb 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -42,15 +42,14 @@ describe Spree::Order, type: :model dodescribe '#clone_shipping_address' doit 'clones the shipping address when use_shipping is true' do- order.use_shipping = true- order.save!- expect(order.ship_address).to eq(order.bill_address)+ order.update!(use_shipping: true)+ expect(order.reload.bill_address).to eq(ship_address)+ expect(user.reload.bill_address).to eq(ship_address)endit 'does not clone the shipping address when use_shipping is false' do- order.use_shipping = false- order.save!- expect(order.ship_address).not_to eq(order.bill_address)+ order.update!(use_shipping: false)+ expect(order.reload.bill_address).not_to eq(order.ship_address)endendend@@ -1567,28 +1566,6 @@ describe Spree::Order, type: :model doendend- context 'when user\'s default address is invalid' do- let(:invalid_address) { build(:address, firstname: nil, lastname: nil, address1: nil, phone: nil) }- let(:user) { create(:user, bill_address_id: invalid_address.id) }-- before do- invalid_address.save(validate: false)- user- order.reload- end-- it 'deletes it and assign new address' do- expect(user.bill_address_id).to eq invalid_address.id-- subject-- expect(user.reload.bill_address_id).to be_present- expect(user.bill_address_id).to_not eq(invalid_address.id)-- expect { invalid_address.reload }.to raise_error ActiveRecord::RecordNotFound- end- end-context 'when user has no default address' dolet!(:user) { create(:user) }@@ -1663,28 +1640,6 @@ describe Spree::Order, type: :model doendend- context 'when user\'s default address is invalid' do- let(:invalid_address) { build(:address, firstname: nil, lastname: nil, address1: nil, phone: nil) }- let(:user) { create(:user, ship_address_id: invalid_address.id) }-- before do- invalid_address.save(validate: false)- user- order.reload- end-- it 'deletes it and assign new address' do- expect(user.ship_address_id).to eq invalid_address.id-- subject-- expect(user.reload.ship_address_id).to be_present- expect(user.ship_address_id).not_to eq(invalid_address.id)-- expect { invalid_address.reload }.to raise_error ActiveRecord::RecordNotFound- end- end-context 'when user has no default address' dolet!(:user) { create(:user) }