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.

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.rb
index 66899200e9..827d7f5afc 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -158,6 +158,7 @@ module Spree
super
else
update_column :deleted_at, Time.current
+ assign_new_default_address_to_user
end
end
@@ -225,5 +226,13 @@ module Spree
errors.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!
+ end
end
end
diff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rb
index 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 do
end
context '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 do
expect(Spree::Address.where(['id = (?)', address2.id])).not_to be_empty
expect(Spree::Address.not_deleted.where(['id = (?)', address2.id])).to be_empty
end
+
+ 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
+ end
end
describe '#to_s' do