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
handle default address when previous is removed (#11081)
Kacper Mękarski0824569e1151
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex 66899200e9..827d7f5afc 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -158,6 +158,7 @@ module Spreesuperelseupdate_column :deleted_at, Time.current+ assign_new_default_address_to_userendend@@ -225,5 +226,13 @@ module Spreeerrors.add(:zipcode, :invalid) unless ::ValidatesZipcode.valid?(formatted_zip, country_iso.upcase)end++ def assign_new_default_address_to_user+ return unless user++ user.bill_address = user.addresses.last if user.bill_address == self+ user.ship_address = user.addresses.last if user.ship_address == self+ user.save!+ endendenddiff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rbindex 6e1e1e2ec0..8a664d2276 100644--- a/core/spec/models/spree/address_spec.rb+++ b/core/spec/models/spree/address_spec.rb@@ -475,8 +475,10 @@ describe Spree::Address, type: :model doendcontext 'editable & destroy' do- let(:address) { create(:address) }- let(:address2) { create(:address) }+ subject(:destroy_address) { address.destroy }++ let(:address) { create(:address, user: user) }+ let(:address2) { create(:address, user: user) }let(:order) { create(:completed_order_with_totals) }let(:user) { create(:user) }@@ -512,6 +514,34 @@ describe Spree::Address, type: :model doexpect(Spree::Address.where(['id = (?)', address2.id])).not_to be_emptyexpect(Spree::Address.not_deleted.where(['id = (?)', address2.id])).to be_emptyend++ context 'when address can not be deleted' do+ let!(:order) { create(:completed_order_with_totals, bill_address: address, ship_address: address) }++ context 'when address is default user address' do+ before { user.update(bill_address: address, ship_address: address) }++ context 'when user have many addresses' do+ it 'assigns last available address as default to bill and ship address' do+ destroy_address++ expect(user.reload.bill_address_id).to eq address2.id+ expect(user.reload.ship_address_id).to eq address2.id+ end+ end++ context 'when deleted address was the only one' do+ before { address2.destroy }++ it 'does not assign any address' do+ destroy_address++ expect(user.reload.bill_address_id).to be nil+ expect(user.reload.ship_address_id).to be nil+ end+ end+ end+ endenddescribe '#to_s' do