Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Always preserve User ID when creating a copy of non-editable address … (#11768)

Damian Legawiecf4b41dae46c8
diff --git a/.rubocop.yml b/.rubocop.yml
index a54cc3d3a9..55112ee247 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -51,6 +51,7 @@ Metrics/BlockLength:
- '**/*.rake'
- '**/factories/**/*'
- '**/config/routes.rb'
+ - '**/lib/**/testing_support/**/*'
Metrics/AbcSize:
Max: 45
diff --git a/core/app/services/spree/addresses/update.rb b/core/app/services/spree/addresses/update.rb
index bfb1707076..295bb3648a 100644
--- a/core/app/services/spree/addresses/update.rb
+++ b/core/app/services/spree/addresses/update.rb
@@ -9,6 +9,7 @@ module Spree
def call(address:, address_params:)
address_params[:country_id] ||= address.country_id
address_params = fill_country_and_state_ids(address_params)
+ address_params[:user_id] = address.user_id if address.user_id.present?
if address&.editable?
address.update(address_params) ? success(address) : failure(address)
diff --git a/core/spec/services/spree/account/addresses/update_spec.rb b/core/spec/services/spree/account/addresses/update_spec.rb
index bb01a9a4d1..726c084be9 100644
--- a/core/spec/services/spree/account/addresses/update_spec.rb
+++ b/core/spec/services/spree/account/addresses/update_spec.rb
@@ -32,6 +32,7 @@ module Spree
expect(value).to have_attributes(new_address_params)
expect(value.country).to eq(country)
expect(value.state).to eq(state)
+ expect(value.user).to eq(user)
end
end