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
Flatten the company address book onto the address itself
Damian Legawiec1998a68971dd
diff --git a/spree/api/app/controllers/spree/api/v3/admin/companies/addresses_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/companies/addresses_controller.rbindex 9615069c76..a4e1616aa0 100644--- a/spree/api/app/controllers/spree/api/v3/admin/companies/addresses_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/companies/addresses_controller.rb@@ -13,8 +13,9 @@ module Spreeprotected+def model_class- Spree::CompanyAddress+ Spree::Addressenddef serializer_class@@ -22,15 +23,11 @@ module Spreeenddef scope- @parent.company_addresses+ @parent.addressesenddef parent_association- :company_addresses- end-- def collection_includes- [:address]+ :addressesendendenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/company_addresses_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/company_addresses_controller.rbindex 5c73f7abb3..91d542a496 100644--- a/spree/api/app/controllers/spree/api/v3/admin/company_addresses_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/company_addresses_controller.rb@@ -11,8 +11,9 @@ module Spreeprotected+def model_class- Spree::CompanyAddress+ Spree::Addressenddef serializer_class@@ -20,13 +21,10 @@ module Spreeenddef scope- Spree::CompanyAddress.where(company_id: current_store.companies.select(:id)).+ Spree::Address.where(owner_type: 'Spree::Company',+ owner_id: current_store.companies.select(:id)).accessible_by(current_ability, ability_action_for_request)end-- def collection_includes- [:address]- endendendenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/concerns/company_address_params.rb b/spree/api/app/controllers/spree/api/v3/admin/concerns/company_address_params.rbindex 3507260a60..e69c55c844 100644--- a/spree/api/app/controllers/spree/api/v3/admin/concerns/company_address_params.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/concerns/company_address_params.rb@@ -5,16 +5,55 @@ module Spreemodule Concerns# Shared by the two places an address-book entry is written: nested# creation under a company, and direct edits by entry id.+ #+ # An entry is an ordinary address owned by the node, so the payload is+ # address attributes plus the label it is filed under. The two default+ # flags are not columns on the row — they are pointers on the node —+ # so they are applied after the save.module CompanyAddressParamsextend ActiveSupport::Concernprotecteddef permitted_params- params.permit(- :label, :default_billing, :default_shipping,- address: Spree::Api::V3::AddressParams::ADDRESS_KEYS- )+ params.permit(:label, *Spree::Api::V3::AddressParams::ADDRESS_KEYS)+ end++ # The default flags are pointers on the node, not columns on the+ # row, so they are applied once the address itself has been written.+ def save_and_render(resource, status: :ok)+ saved = resource.save+ apply_default_flags!(resource) if saved++ if saved+ render json: serialize_resource(resource.reload), status: status+ else+ render_errors(resource.errors)+ end+ end++ def apply_default_flags!(address)+ company = address.owner+ return if company.nil?++ attributes = {}+ attributes[:default_bill_address_id] = address.id if flag_param(:default_billing) == true+ attributes[:default_ship_address_id] = address.id if flag_param(:default_shipping) == true+ # Clearing a flag only unsets it when this row is the one holding+ # it — another entry's default is not this request's business.+ attributes[:default_bill_address_id] = nil if flag_param(:default_billing) == false &&+ company.default_bill_address_id == address.id+ attributes[:default_ship_address_id] = nil if flag_param(:default_shipping) == false &&+ company.default_ship_address_id == address.id++ company.update!(attributes) if attributes.any?+ end++ # @return [Boolean, nil] nil when the client said nothing about it+ def flag_param(name)+ return nil unless params.key?(name)++ ActiveModel::Type::Boolean.new.cast(params[name])endendenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/customers/addresses_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/customers/addresses_controller.rbindex 78cc34442a..e3f6742304 100644--- a/spree/api/app/controllers/spree/api/v3/admin/customers/addresses_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/customers/addresses_controller.rb@@ -7,7 +7,7 @@ module Spree# POST /api/v3/admin/customers/:customer_id/addressesdef create- authorize_resource!(Spree::Address.new(user_id: @parent.id), :create)+ authorize_resource!(Spree::Address.new(owner: @parent), :create)result = Spree.address_create_service.call(address_params: address_attrs,diff --git a/spree/api/app/controllers/spree/api/v3/store/companies/addresses_controller.rb b/spree/api/app/controllers/spree/api/v3/store/companies/addresses_controller.rbindex 8e760a477f..7407e70253 100644--- a/spree/api/app/controllers/spree/api/v3/store/companies/addresses_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/companies/addresses_controller.rb@@ -7,28 +7,23 @@ module Spree# deleting an entry are addressed directly# (Store::CompanyAddressesController).class AddressesController < BaseController- # Enumerated rather than borrowing a global list, which permits- # :id, :user_id and :deleted_at.- ADDRESS_KEYS = [- :first_name, :last_name, :company, :address1, :address2, :city,- :postal_code, :zipcode, :phone, :country_code, :state_code, :state_name, :label- ].freeze-+ include Spree::Api::V3::Store::Concerns::CompanyAddressDefaults# POST /api/v3/store/companies/:company_id/addressesdef create- entry = @parent.company_addresses.new(permitted_params)+ address = @parent.addresses.new(permitted_params)- if entry.save- render json: serialize_resource(entry), status: :created+ if address.save+ apply_default_flags!(address)+ render json: serialize_resource(address), status: :createdelse- render_validation_error(entry.errors)+ render_validation_error(address.errors)endendprotecteddef model_class- Spree::CompanyAddress+ Spree::Addressenddef serializer_class@@ -36,19 +31,15 @@ module Spreeenddef scope- @parent.company_addresses+ @parent.addressesenddef parent_association- :company_addresses- end-- def collection_includes- [:address]+ :addressesenddef permitted_params- params.permit(:label, :default_billing, :default_shipping, address: ADDRESS_KEYS)+ params.permit(:label, *Spree::Api::V3::AddressParams::ADDRESS_KEYS)endendenddiff --git a/spree/api/app/controllers/spree/api/v3/store/company_addresses_controller.rb b/spree/api/app/controllers/spree/api/v3/store/company_addresses_controller.rbindex 125f27d8f8..c3ff1b5ae9 100644--- a/spree/api/app/controllers/spree/api/v3/store/company_addresses_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/company_addresses_controller.rb@@ -6,11 +6,14 @@ module Spree# caller's standing — an entry of a node they may not act for is a# 404.class CompanyAddressesController < ResourceController+ include Spree::Api::V3::Store::Concerns::CompanyAddressDefaults+prepend_before_action :require_authentication!# PATCH /api/v3/store/company_addresses/:iddef updateif @resource.update(permitted_params)+ apply_default_flags!(@resource)render json: serialize_resource(@resource.reload)elserender_validation_error(@resource.errors)@@ -28,7 +31,7 @@ module Spreeprotecteddef model_class- Spree::CompanyAddress+ Spree::Addressenddef serializer_class@@ -36,15 +39,16 @@ module Spreeenddef scope- Spree::CompanyAddress.where(- company_id: storefront_access_policy.scope(current_store.companies).select(:id)+ Spree::Address.where(+ owner_type: 'Spree::Company',+ owner_id: storefront_access_policy.scope(current_store.companies).select(:id))enddef permitted_params- params.permit(:label, :default_billing, :default_shipping,- address: Companies::AddressesController::ADDRESS_KEYS)+ params.permit(:label, *Spree::Api::V3::AddressParams::ADDRESS_KEYS)end+endendenddiff --git a/spree/api/app/controllers/spree/api/v3/store/concerns/company_address_defaults.rb b/spree/api/app/controllers/spree/api/v3/store/concerns/company_address_defaults.rbnew file mode 100644index 0000000000..8be6ed7134--- /dev/null+++ b/spree/api/app/controllers/spree/api/v3/store/concerns/company_address_defaults.rb@@ -0,0 +1,43 @@+module Spree+ module Api+ module V3+ module Store+ module Concerns+ # An address-book entry's "is this the default" flags are pointers on+ # the node rather than columns on the row, so they are applied after+ # the address itself is saved. Shared by the two places the storefront+ # writes one: nested creation under a company, and direct edits.+ module CompanyAddressDefaults+ extend ActiveSupport::Concern++ protected++ def apply_default_flags!(address)+ company = address.owner+ return if company.nil?++ attributes = {}+ attributes[:default_bill_address_id] = address.id if flag_param(:default_billing) == true+ attributes[:default_ship_address_id] = address.id if flag_param(:default_shipping) == true+ # Clearing a flag only unsets it when this row is the one holding+ # it — another entry's default is not this request's business.+ attributes[:default_bill_address_id] = nil if flag_param(:default_billing) == false &&+ company.default_bill_address_id == address.id+ attributes[:default_ship_address_id] = nil if flag_param(:default_shipping) == false &&+ company.default_ship_address_id == address.id++ company.update!(attributes) if attributes.any?+ end++ # @return [Boolean, nil] nil when the client said nothing about it+ def flag_param(name)+ return nil unless params.key?(name)++ ActiveModel::Type::Boolean.new.cast(params[name])+ end+ end+ end+ end+ end+ end+enddiff --git a/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rbindex 074256c596..89e5c857ab 100644--- a/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rb@@ -24,7 +24,7 @@ module Spreeendattribute :customer_id do |address|- address.customer&.prefixed_id+ address.customer_owner&.prefixed_idendendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/company_address_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/company_address_serializer.rbindex a3f2b331e4..4b2e28b979 100644--- a/spree/api/app/serializers/spree/api/v3/admin/company_address_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/company_address_serializer.rb@@ -5,19 +5,24 @@ module Spree# An entry in a company node's address book. Admin-only shape; the# storefront self-service surface serializes the same record through# its own class.- class CompanyAddressSerializer < V3::BaseSerializer+ class CompanyAddressSerializer < Admin::AddressSerializertypelize label: [:string, nullable: true], company_id: :string,default_billing: :boolean, default_shipping: :boolean- attributes :label, :default_billing, :default_shipping,- created_at: :iso8601, updated_at: :iso8601+ attributes :label# An entry always belongs to a company, so this is never null.- attribute :company_id do |entry|- entry.company.prefixed_id+ attribute :company_id do |address|+ address.owner.prefixed_idend- one :address, resource: proc { Spree.api.admin_address_serializer }+ attribute :default_billing do |address|+ address.owner.default_bill_address_id == address.id+ end++ attribute :default_shipping do |address|+ address.owner.default_ship_address_id == address.id+ endendendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rbindex fd3ff8b0c8..c0d440e2a6 100644--- a/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rb@@ -24,7 +24,7 @@ module Spreeresource: proc { Spree.api.admin_company_serializer },if: proc { expand?('children') }- many :company_addresses, key: :addresses,+ many :addresses,resource: proc { Spree.api.admin_company_address_serializer },if: proc { expand?('addresses') }diff --git a/spree/api/app/serializers/spree/api/v3/company_address_serializer.rb b/spree/api/app/serializers/spree/api/v3/company_address_serializer.rbindex ded9563326..005571011d 100644--- a/spree/api/app/serializers/spree/api/v3/company_address_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/company_address_serializer.rb@@ -1,19 +1,28 @@module Spreemodule Apimodule V3- # An entry in a company node's address book, as members manage it.- class CompanyAddressSerializer < BaseSerializer+ # An entry in a company node's address book, as members manage it. The+ # entry is the address itself — what makes it a book entry is its owner,+ # so this adds only the label it is filed under and which defaults it+ # holds for its node.+ class CompanyAddressSerializer < AddressSerializertypelize label: [:string, nullable: true], company_id: :string,default_billing: :boolean, default_shipping: :boolean- attributes :label, :default_billing, :default_shipping+ attributes :label# An entry always belongs to a company, so this is never null.- attribute :company_id do |entry|- entry.company.prefixed_id+ attribute :company_id do |address|+ address.owner.prefixed_idend- one :address, resource: proc { Spree.api.address_serializer }+ attribute :default_billing do |address|+ address.owner.default_bill_address_id == address.id+ end++ attribute :default_shipping do |address|+ address.owner.default_ship_address_id == address.id+ endendendenddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/companies/addresses_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/companies/addresses_controller_spec.rbindex 6e63042246..842584ef14 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/companies/addresses_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/companies/addresses_controller_spec.rb@@ -11,7 +11,7 @@ RSpec.describe Spree::Api::V3::Admin::Companies::AddressesController, type: :condescribe 'GET #index' doit 'lists the node address book' do- entry = create(:company_address, company: company, label: 'HQ')+ entry = create(:company_address, owner: company, label: 'HQ')get :index, params: { company_id: company.prefixed_id }, as: :json@@ -19,7 +19,7 @@ RSpec.describe Spree::Api::V3::Admin::Companies::AddressesController, type: :conrow = json_response['data'].firstexpect(row['id']).to eq(entry.prefixed_id)expect(row['label']).to eq('HQ')- expect(row['address']).to be_present+ expect(row['address1']).to be_presentendit '404s under another store company' do@@ -30,33 +30,51 @@ RSpec.describe Spree::Api::V3::Admin::Companies::AddressesController, type: :conenddescribe 'POST #create' do- it 'creates an owned address row with a label and defaults' do+ it 'creates an owned address with a label and defaults' dopost :create, params: {company_id: company.prefixed_id,label: 'Plant 2 dock',default_shipping: true,- address: { first_name: 'Ops', last_name: 'Team', address1: '1 Dock Rd',- city: 'Springfield', postal_code: '62704', country_code: 'US', state_code: 'IL' }+ first_name: 'Ops', last_name: 'Team', address1: '1 Dock Rd',+ city: 'Springfield', postal_code: '62704', country_code: 'US', state_code: 'IL'}, as: :jsonexpect(response).to have_http_status(:created)expect(json_response['label']).to eq('Plant 2 dock')expect(json_response['default_shipping']).to be(true)- expect(company.company_addresses.sole.address.city).to eq('Springfield')+ expect(company.addresses.sole.city).to eq('Springfield')+ expect(company.reload.default_ship_address_id).to eq(company.addresses.sole.id)end- it 'demotes the previous default of the same kind' do- previous = create(:company_address, company: company, default_shipping: true)+ # The node points at one address per kind, so promoting a new entry moves+ # the pointer — there is no previous flag left to contradict it.+ it 'moves the default to the new entry' do+ previous = create(:company_address, owner: company)+ company.update!(default_ship_address: previous)post :create, params: {company_id: company.prefixed_id,default_shipping: true,- address: { first_name: 'A', last_name: 'B', address1: '2 Way', city: 'Metropolis',- postal_code: '10001', country_code: 'US', state_code: 'NY' }+ first_name: 'A', last_name: 'B', address1: '2 Way', city: 'Metropolis',+ postal_code: '10001', country_code: 'US', state_code: 'NY'}, as: :jsonexpect(response).to have_http_status(:created)- expect(previous.reload.default_shipping).to be(false)+ expect(company.reload.default_ship_address_id).not_to eq(previous.id)+ expect(json_response['default_shipping']).to be(true)+ end++ # A company address names no person: the node names itself.+ it 'accepts an entry with no contact name' do+ post :create, params: {+ company_id: company.prefixed_id,+ label: 'Warehouse',+ address1: '9 Depot Way', city: 'Springfield',+ postal_code: '62704', country_code: 'US', state_code: 'IL'+ }, as: :json++ expect(response).to have_http_status(:created)+ expect(company.addresses.sole.first_name).to be_blankendendenddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/companies_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/companies_controller_spec.rbindex d45158fd04..5a03ad0d97 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/companies_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/companies_controller_spec.rb@@ -66,7 +66,7 @@ RSpec.describe Spree::Api::V3::Admin::CompaniesController, type: :controller doendit 'expands the address book and memberships on request' do- create(:company_address, company: company, label: 'HQ')+ create(:company_address, owner: company, label: 'HQ')create(:company_membership, company: company)get :show, params: { id: company.prefixed_id, expand: 'addresses,memberships' }, as: :jsondiff --git a/spree/api/spec/controllers/spree/api/v3/admin/company_addresses_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/company_addresses_controller_spec.rbindex 3e9d2270cb..6193a16a9e 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/company_addresses_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/company_addresses_controller_spec.rb@@ -6,7 +6,7 @@ RSpec.describe Spree::Api::V3::Admin::CompanyAddressesController, type: :controlinclude_context 'API v3 Admin authenticated'let(:company) { create(:company, store: store) }- let!(:entry) { create(:company_address, company: company, label: 'HQ') }+ let!(:entry) { create(:company_address, owner: company, label: 'HQ') }before { request.headers.merge!(headers) }@@ -20,7 +20,7 @@ RSpec.describe Spree::Api::V3::Admin::CompanyAddressesController, type: :controlendit '404s an entry of another store company' do- foreign = create(:company_address, company: create(:company, store: create(:store)))+ foreign = create(:company_address, owner: create(:company, store: create(:store)))get :show, params: { id: foreign.prefixed_id }, as: :json@@ -30,25 +30,23 @@ RSpec.describe Spree::Api::V3::Admin::CompanyAddressesController, type: :controldescribe 'PATCH #update' doit 'edits the address in place instead of replacing it' do- original_address_id = entry.address_id-- patch :update, params: { id: entry.prefixed_id, address: { city: 'Shelbyville' } }, as: :json+ patch :update, params: { id: entry.prefixed_id, city: 'Shelbyville' }, as: :jsonexpect(response).to have_http_status(:ok)- expect(entry.reload.address_id).to eq(original_address_id)- expect(entry.address.city).to eq('Shelbyville')+ expect(entry.reload.city).to eq('Shelbyville')endit 'promotes an entry to default billing' dopatch :update, params: { id: entry.prefixed_id, default_billing: true }, as: :jsonexpect(response).to have_http_status(:ok)- expect(entry.reload.default_billing).to be(true)+ expect(company.reload.default_bill_address_id).to eq(entry.id)+ expect(json_response['default_billing']).to be(true)endenddescribe 'DELETE #destroy' do- it 'removes the entry and its owned address row' do+ it 'removes the owned address row' doexpect {delete :destroy, params: { id: entry.prefixed_id }, as: :json}.to change(Spree::Address, :count).by(-1)diff --git a/spree/api/spec/controllers/spree/api/v3/store/companies/addresses_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/companies/addresses_controller_spec.rbindex 7b38ddf66d..4bbf03eeb4 100644--- a/spree/api/spec/controllers/spree/api/v3/store/companies/addresses_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/companies/addresses_controller_spec.rb@@ -14,7 +14,7 @@ RSpec.describe Spree::Api::V3::Store::Companies::AddressesController, type: :condescribe 'GET #index' doit 'lists the node address book' do- create(:company_address, company: company, label: 'HQ')+ create(:company_address, owner: company, label: 'HQ')get :index, params: { company_id: company.prefixed_id }, as: :json@@ -30,18 +30,19 @@ RSpec.describe Spree::Api::V3::Store::Companies::AddressesController, type: :conenddescribe 'POST #create' do- it 'creates an entry with a nested address' do+ it 'creates an owned address for the node' dopost :create, params: {company_id: company.prefixed_id,label: 'Plant 2 dock', default_shipping: true,- address: { first_name: 'Ops', last_name: 'Team', address1: '1 Dock Rd',- city: 'Springfield', postal_code: '62704', country_code: 'US', state_code: 'IL' }+ first_name: 'Ops', last_name: 'Team', address1: '1 Dock Rd',+ city: 'Springfield', postal_code: '62704', country_code: 'US', state_code: 'IL'}, as: :jsonexpect(response).to have_http_status(:created)expect(json_response['label']).to eq('Plant 2 dock')expect(json_response['default_shipping']).to be(true)- expect(json_response['address']['city']).to eq('Springfield')+ expect(json_response['city']).to eq('Springfield')+ expect(company.reload.default_ship_address_id).to eq(company.addresses.sole.id)endendenddiff --git a/spree/api/spec/controllers/spree/api/v3/store/company_addresses_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/company_addresses_controller_spec.rbindex 086518538c..26c77ea0fb 100644--- a/spree/api/spec/controllers/spree/api/v3/store/company_addresses_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/company_addresses_controller_spec.rb@@ -6,25 +6,22 @@ RSpec.describe Spree::Api::V3::Store::CompanyAddressesController, type: :controlinclude_context 'API v3 Store authenticated'let(:company) { create(:company, store: store) }- let!(:entry) { create(:company_address, company: company, label: 'HQ') }+ let!(:entry) { create(:company_address, owner: company, label: 'HQ') }before { request.headers.merge!(headers) }context 'with standing' dobefore { create(:company_membership, company: company, customer: user) }- it 'edits the entry, keeping the address row' do- original_address_id = entry.address_id-- patch :update, params: { id: entry.prefixed_id, label: 'Head office', address: { city: 'Shelbyville' } }, as: :json+ it 'edits the entry in place' do+ patch :update, params: { id: entry.prefixed_id, label: 'Head office', city: 'Shelbyville' }, as: :jsonexpect(response).to have_http_status(:ok)expect(entry.reload.label).to eq('Head office')- expect(entry.address_id).to eq(original_address_id)- expect(entry.address.city).to eq('Shelbyville')+ expect(entry.city).to eq('Shelbyville')end- it 'removes the entry and its owned address row' do+ it 'removes the owned address row' doexpect {delete :destroy, params: { id: entry.prefixed_id }, as: :json}.to change(Spree::Address, :count).by(-1)diff --git a/spree/api/spec/integration/spree/api/v3/store/companies_spec.rb b/spree/api/spec/integration/spree/api/v3/store/companies_spec.rbindex 75d0d11e80..4a00157dc1 100644--- a/spree/api/spec/integration/spree/api/v3/store/companies_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/store/companies_spec.rb@@ -184,7 +184,7 @@ RSpec.describe 'Company Self-Service API', type: :request, swagger_doc: 'api-refresponse '200', 'addresses listed' dolet!(:membership) { create(:company_membership, company: company, customer: user) }- let!(:entry) { create(:company_address, company: company, label: 'Headquarters') }+ let!(:entry) { create(:company_address, owner: company, label: 'Headquarters') }let(:company_id) { company.prefixed_id }let(:'x-spree-api-key') { api_key.token }let(:'Authorization') { "Bearer #{jwt_token}" }@@ -218,7 +218,7 @@ RSpec.describe 'Company Self-Service API', type: :request, swagger_doc: 'api-refresponse '200', 'address book entry updated' dolet!(:membership) { create(:company_membership, company: company, customer: user) }- let!(:entry) { create(:company_address, company: company, label: 'Headquarters') }+ let!(:entry) { create(:company_address, owner: company, label: 'Headquarters') }let(:id) { entry.prefixed_id }let(:body) { { label: 'Northern Warehouse', default_shipping: true } }let(:'x-spree-api-key') { api_key.token }@@ -241,7 +241,7 @@ RSpec.describe 'Company Self-Service API', type: :request, swagger_doc: 'api-refresponse '204', 'address book entry removed' dolet!(:membership) { create(:company_membership, company: company, customer: user) }- let!(:entry) { create(:company_address, company: company, label: 'Headquarters') }+ let!(:entry) { create(:company_address, owner: company, label: 'Headquarters') }let(:id) { entry.prefixed_id }let(:'x-spree-api-key') { api_key.token }let(:'Authorization') { "Bearer #{jwt_token}" }diff --git a/spree/core/app/models/spree/seller.rb b/spree/core/app/models/spree/seller.rbindex b27569fce4..e33760461a 100644--- a/spree/core/app/models/spree/seller.rb+++ b/spree/core/app/models/spree/seller.rb@@ -72,16 +72,25 @@ module Spree# go with it.accepts_nested_attributes_for :billing_address, update_only: true+ # The address is validated through the association, so its owner has to be+ # set before that runs — this is what tells the row it is a business+ # address and so asks for no personal name.+ before_validation :set_billing_address_owner+# The API reads and writes this under one name, so the writer takes the# attributes a client sends as well as a record. Never an id: an address# carries no store of its own, so binding one by id would reach another- # store's rows. Either way the row is stamped as this seller's, which is+ # store's rows. Either way the row is marked as this seller's, which is# what makes it read back with the business rules.def billing_address=(value)case valuewhen Hash, ActionController::Parameters- super(Spree::Address.new(owner: self)) if billing_address.nil?+ super(Spree::Address.new) if billing_address.nil?self.billing_address_attributes = value+ # Set after the attributes are applied: nested assignment builds the+ # row itself, and the owner is what tells it no personal name is+ # wanted here.+ billing_address.owner = selfwhen Spree::Addressvalue.owner = selfsuper(value)@@ -260,6 +269,10 @@ module Spreeprivate+ def set_billing_address_owner+ billing_address.owner = self if billing_address.present? && billing_address.owner != self+ end+def normalize_slugself.slug = (slug.presence || name).to_s.parameterize.presenceend