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.

fix address_not_deprecated_in_completed_order validation (#11074)

Kacper Mękarski0f86848994f0
diff --git a/core/app/models/concerns/spree/user_address.rb b/core/app/models/concerns/spree/user_address.rb
index 256a9581d9..3630e3826f 100644
--- a/core/app/models/concerns/spree/user_address.rb
+++ b/core/app/models/concerns/spree/user_address.rb
@@ -16,7 +16,7 @@ module Spree
has_many :addresses, -> { where(deleted_at: nil).order('updated_at DESC') },
class_name: 'Spree::Address', foreign_key: :user_id
- validate :address_not_associated_with_other_user, :address_not_associated_with_placed_order
+ validate :address_not_associated_with_other_user, :address_not_deprecated_in_completed_order
def persist_order_address(order)
b_address = bill_address || build_bill_address
@@ -40,9 +40,11 @@ module Spree
errors.add(:ship_address_id, :belongs_to_other_user) if ship_address&.user_id && self != ship_address&.user
end
- def address_not_associated_with_placed_order
- errors.add(:bill_address_id, :associated_with_completed_order) if orders.complete.where(bill_address: bill_address_id).any?
- errors.add(:ship_address_id, :associated_with_completed_order) if orders.complete.where(ship_address: ship_address_id).any?
+ def address_not_deprecated_in_completed_order
+ errors.add(:bill_address_id, :deprecated_in_completed_order) if
+ orders.complete.with_deleted_bill_address.where(bill_address: bill_address_id).any?
+ errors.add(:ship_address_id, :deprecated_in_completed_order) if
+ orders.complete.with_deleted_ship_address.where(ship_address: ship_address_id).any?
end
end
end
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 8d7d3300cd..e5666b2d8f 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -158,6 +158,8 @@ module Spree
scope :complete, -> { where.not(completed_at: nil) }
scope :incomplete, -> { where(completed_at: nil) }
scope :not_canceled, -> { where.not(state: 'canceled') }
+ scope :with_deleted_bill_address, -> { joins(:bill_address).where.not(Address.table_name => { deleted_at: nil }) }
+ scope :with_deleted_ship_address, -> { joins(:ship_address).where.not(Address.table_name => { deleted_at: nil }) }
# shows completed orders first, by their completed_at date, then uncompleted orders by their created_at
scope :reverse_chronological, -> { order(Arel.sql('spree_orders.completed_at IS NULL'), completed_at: :desc, created_at: :desc) }
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index cdad615440..5fff8ade15 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -329,18 +329,18 @@ en:
attributes:
bill_address_id:
belongs_to_other_user: belongs to other user
- associated_with_completed_order: associated with completed order
+ deprecated_in_completed_order: deprecated in completed order
ship_address_id:
belongs_to_other_user: belongs to other user
- associated_with_completed_order: associated with completed order
+ deprecated_in_completed_order: deprecated in completed order
spree/user:
attributes:
bill_address_id:
belongs_to_other_user: belongs to other user
- associated_with_completed_order: associated with completed order
+ deprecated_in_completed_order: deprecated in completed order
ship_address_id:
belongs_to_other_user: belongs to other user
- associated_with_completed_order: associated with completed order
+ deprecated_in_completed_order: deprecated in completed order
spree/line_item:
attributes:
currency:
diff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rb
index da62b64511..9962532ac0 100644
--- a/core/spec/models/spree/user_spec.rb
+++ b/core/spec/models/spree/user_spec.rb
@@ -300,7 +300,7 @@ describe Spree.user_class, type: :model do
end
end
- describe '#address_not_associated_with_placed_order' do
+ describe '#address_not_deprecated_in_completed_order' do
subject { user }
let!(:user) { create(:user_with_addresses) }
@@ -309,7 +309,7 @@ describe Spree.user_class, type: :model do
shared_examples 'invalid' do
it 'is invalid' do
expect(subject.valid?).to be false
- expect(subject.errors.messages.values.flatten).to include('associated with completed order')
+ expect(subject.errors.messages.values.flatten).to include('deprecated in completed order')
end
end
@@ -317,25 +317,37 @@ describe Spree.user_class, type: :model do
before { subject.update(bill_address: address) }
context 'when default bill address is not associated to completed order' do
- let!(:comleted_order) { create(:completed_order_with_totals, user: user) }
+ let!(:completed_order) { create(:completed_order_with_totals, user: user) }
it_should_behave_like 'valid'
end
context 'when default bill address is associated to uncompleted order' do
- let!(:uncomleted_order) { create(:order, user: user, bill_address: address, ship_address: address) }
+ let!(:uncompleted_order) { create(:order, user: user, bill_address: address, ship_address: address) }
it_should_behave_like 'valid'
end
context 'when default bill address is associated to completed order' do
- let!(:comleted_order) { create(:completed_order_with_totals, user: user, bill_address: address, ship_address: address) }
+ let!(:completed_order) { create(:completed_order_with_totals, user: user, bill_address: address, ship_address: address) }
- it_should_behave_like 'invalid'
+ context 'when default bill address is the same as associated to order' do
+ it { expect(user.addresses).to include(address) }
- it 'assigns error to bill address' do
- expect(subject.valid?).to be false
- expect(subject.errors.messages.keys).to include(:bill_address_id)
+ it_should_behave_like 'valid'
+ end
+
+ context 'when user changed bill address which was used in completed order so the old one is deprecated' do
+ before { address.update(deleted_at: Time.now) }
+
+ it { expect(user.addresses).not_to include(address) }
+
+ it_should_behave_like 'invalid'
+
+ it 'assigns error to bill address' do
+ expect(subject.valid?).to be false
+ expect(subject.errors.messages.keys).to include(:bill_address_id)
+ end
end
end
end
@@ -344,25 +356,37 @@ describe Spree.user_class, type: :model do
before { subject.update(ship_address: address) }
context 'when default ship address is not associated to completed order' do
- let!(:comleted_order) { create(:completed_order_with_totals, user: user) }
+ let!(:completed_order) { create(:completed_order_with_totals, user: user) }
it_should_behave_like 'valid'
end
context 'when default ship address is associated to uncompleted order' do
- let!(:uncomleted_order) { create(:order, user: user, ship_address: address, ship_address: address) }
+ let!(:uncompleted_order) { create(:order, user: user, ship_address: address, ship_address: address) }
it_should_behave_like 'valid'
end
context 'when default ship address is associated to completed order' do
- let!(:comleted_order) { create(:completed_order_with_totals, user: user, ship_address: address, ship_address: address) }
+ let!(:completed_order) { create(:completed_order_with_totals, user: user, bill_address: address, ship_address: address) }
- it_should_behave_like 'invalid'
+ context 'when default ship address is the same as associated to order' do
+ it { expect(user.addresses).to include(address) }
- it 'assigns error to ship address' do
- expect(subject.valid?).to be false
- expect(subject.errors.messages.keys).to include(:ship_address_id)
+ it_should_behave_like 'valid'
+ end
+
+ context 'when user changed ship address which was used in completed order so the old one is deprecated' do
+ before { address.update(deleted_at: Time.now) }
+
+ it { expect(user.addresses).not_to include(address) }
+
+ it_should_behave_like 'invalid'
+
+ it 'assigns error to ship address' do
+ expect(subject.valid?).to be false
+ expect(subject.errors.messages.keys).to include(:ship_address_id)
+ end
end
end
end