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
FIX disappearing addresses on update (#13211)
brozek245381199fbe
diff --git a/core/app/services/spree/addresses/update.rb b/core/app/services/spree/addresses/update.rbindex 57aa26bc43..7240afc2b3 100644--- a/core/app/services/spree/addresses/update.rb+++ b/core/app/services/spree/addresses/update.rb@@ -12,12 +12,19 @@ module Spreedefault_shipping = opts.fetch(:default_shipping, false)address_changes_except = opts.fetch(:address_changes_except, [])create_new_address_on_update = opts.fetch(:create_new_address_on_update, false)+ Spree::Deprecation.warn('Spree::Addresses::Update create_new_address_on_update parameter is deprecated and will be removed in Spree 6.') if create_new_address_on_updateprepare_address_params!(address, address_params)address.assign_attributes(address_params)- address_changed = address.changes.except(*address_changes_except).any?+ address_changes = address.changes.except(*address_changes_except)+ # Ignore changes that are only different in case as encrypted fields are processed by rails as downcased+ address_changes.reject! do |attr, (old_val, new_val)|+ old_val.to_s.casecmp?(new_val.to_s)+ end++ address_changed = address_changes.any?if !address_changed && defaults_changed?(address, default_billing, default_shipping)assign_to_user_as_default(user: address.user,diff --git a/core/spec/services/spree/addresses/update_spec.rb b/core/spec/services/spree/addresses/update_spec.rbindex b19632f043..0af1b1ebfc 100644--- a/core/spec/services/spree/addresses/update_spec.rb+++ b/core/spec/services/spree/addresses/update_spec.rb@@ -50,6 +50,14 @@ RSpec.describe Spree::Addresses::Update doexpect { subject.call(address: address, address_params: new_address_params, order: order) }.not_to change { Spree::Address.count }end+ it 'does not update address nor create when attribute changed only in case' do+ result.value.update(address1: '123 Main St')++ new_address_params[:address1] = '123 MAIN ST'+ expect { subject.call(address: address, address_params: new_address_params, order: order) }.not_to change { address.reload }+ expect { subject.call(address: address, address_params: new_address_params, order: order) }.not_to change { Spree::Address.count }+ end+context 'when setting the create_new_address_on_update param to true' doit 'does not create new address' doexpect { subject.call(address: address, address_params: new_address_params, order: order, create_new_address_on_update: true) }.not_to change { Spree::Address.count }