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 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.rbindex 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 Spreehas_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_orderdef persist_order_address(order)b_address = bill_address || build_bill_address@@ -40,9 +40,11 @@ module Spreeerrors.add(:ship_address_id, :belongs_to_other_user) if ship_address&.user_id && self != ship_address&.userend- 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?endendenddiff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 8d7d3300cd..e5666b2d8f 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -158,6 +158,8 @@ module Spreescope :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_atscope :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.ymlindex 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 ordership_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 orderspree/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 ordership_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 orderspree/line_item:attributes:currency:diff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rbindex 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 doendend- describe '#address_not_associated_with_placed_order' do+ describe '#address_not_deprecated_in_completed_order' dosubject { user }let!(:user) { create(:user_with_addresses) }@@ -309,7 +309,7 @@ describe Spree.user_class, type: :model doshared_examples 'invalid' doit 'is invalid' doexpect(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')endend@@ -317,25 +317,37 @@ describe Spree.user_class, type: :model dobefore { 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'endcontext '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'endcontext '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)+ endendendend@@ -344,25 +356,37 @@ describe Spree.user_class, type: :model dobefore { 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'endcontext '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'endcontext '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)+ endendendend