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 destroying carts with addresses assigned to other complete orders (#12055)
Łukasz Adamczyk77e9afce516b
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex 1feb02a8a5..9e6f84e36b 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -142,7 +142,7 @@ module Spreeenddef can_be_deleted?- shipments.empty? && !Order.where('bill_address_id = ? OR ship_address_id = ?', id, id).exists?+ shipments.empty? && !Order.complete.where('bill_address_id = ? OR ship_address_id = ?', id, id).exists?enddef checkdiff --git a/core/app/services/spree/cart/destroy.rb b/core/app/services/spree/cart/destroy.rbindex 7a37c39280..777c4b1d5f 100644--- a/core/app/services/spree/cart/destroy.rb+++ b/core/app/services/spree/cart/destroy.rb@@ -7,31 +7,41 @@ module Spreerun :check_if_can_be_destroyedrun :cancel_shipmentsrun :void_payments+ run :clear_addressesrun :destroy_orderendprivatedef check_if_can_be_destroyed(order:)- return failure(Spree.t(:cannot_be_destroyed)) unless order&.can_be_destroyed?+ return failure(false, Spree.t(:cannot_be_destroyed)) unless order&.can_be_destroyed?success(order: order)enddef cancel_shipments(order:)- order.shipments.each(&:cancel!)+ order.shipments.each(&:cancel)success(order: order)enddef void_payments(order:)- order.payments.each(&:void!)+ order.payments.each(&:void)++ success(order: order)+ end++ def clear_addresses(order:)+ order.ship_address = nil unless order.ship_address&.can_be_deleted?+ order.bill_address = nil unless order.bill_address&.can_be_deleted?success(order: order)enddef destroy_order(order:)- order.destroy+ destroyed_result = order.destroy++ return failure(false, Spree.t(:cannot_be_destroyed)) unless destroyed_result.present?success(order)enddiff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rbindex 9e3387cb69..a058d0ceaf 100644--- a/core/spec/models/spree/address_spec.rb+++ b/core/spec/models/spree/address_spec.rb@@ -436,10 +436,17 @@ describe Spree::Address, type: :model dolet(:address) { create(:address, user: user) }let(:address2) { create(:address, user: user) }+ let(:address3) { create(:address, user: user) }+let(:order) { create(:completed_order_with_totals) }+ let(:order2) { create(:order_with_line_items) }+let(:user) { create(:user) }- before { order.update_attribute(:bill_address, address2) }+ before do+ order.update_attribute(:bill_address, address2)+ order2.update_attribute(:ship_address, address3)+ endit 'has required attributes' doexpect(Spree::Address.required_fields).to eq([:firstname, :lastname, :address1, :city, :country, :zipcode, :phone])@@ -457,10 +464,14 @@ describe Spree::Address, type: :model doexpect(address2).to_not be_editableend- it "can't be deleted when there is an associated order" do+ it "can't be deleted when there is a complete associated order" doexpect(address2).to_not be_can_be_deletedend+ it 'can be deleted when there is an incomplete associated order' do+ expect(address3).to be_can_be_deleted+ end+it 'is destroyed without saving used' doaddress.destroyexpect(Spree::Address.where(['id = (?)', address.id])).to be_empty@@ -488,7 +499,10 @@ describe Spree::Address, type: :model doendcontext 'when deleted address was the only one' do- before { address2.destroy }+ before do+ address2.destroy+ address3.destroy+ endit 'does not assign any address' dodestroy_addressdiff --git a/core/spec/services/spree/cart/destroy_spec.rb b/core/spec/services/spree/cart/destroy_spec.rbindex 261a200de2..f9965072db 100644--- a/core/spec/services/spree/cart/destroy_spec.rb+++ b/core/spec/services/spree/cart/destroy_spec.rb@@ -6,25 +6,29 @@ module Spreecontext 'when order is given' docontext 'when can be destroyed' do- let(:order) { create(:order_with_line_items) }+ let(:order) { create(:order_with_line_items, ship_address: ship_address, bill_address: bill_address) }let(:shipment) { order.shipments.take }let!(:payment) { create(:payment, amount: order.total, order: order) }let!(:line_item_ids) { order.line_item_ids }let!(:shipment_ids) { order.shipment_ids }let!(:payment_ids) { order.payment_ids }+ let(:ship_address) { create(:address) }+ let(:bill_address) { create(:address) }+ let(:address_ids) { [ship_address.id, bill_address.id] }+it 'returns success' doexpect(subject.success?).to be trueendit 'voids pending payments' do- expect_any_instance_of(Spree::Payment).to receive(:void!).exactly(order.payments.count).times+ expect_any_instance_of(Spree::Payment).to receive(:void).exactly(order.payments.count).timessubjectendit 'cancel not shipped shipments' do- expect_any_instance_of(Spree::Shipment).to receive(:cancel!).exactly(order.shipments.count).times+ expect_any_instance_of(Spree::Shipment).to receive(:cancel).exactly(order.shipments.count).timessubjectend@@ -37,12 +41,35 @@ module Spreeexpect(order.destroyed?).to be trueend- it 'destroys line_items, shipments and payments' do+ it 'destroys line_items, addresses, shipments and payments' dosubjectexpect(Spree::LineItem.where(id: line_item_ids)).to be_emptyexpect(Spree::Shipment.where(id: shipment_ids)).to be_emptyexpect(Spree::Payment.where(id: payment_ids)).to be_empty+ expect(Spree::Address.where(id: address_ids)).to be_empty+ end++ context 'when addresses are assigned to other orders' do+ let!(:other_order) { create(:order_ready_to_ship, ship_address: ship_address, bill_address: bill_address) }++ it 'destroys the order' do+ expect(order.destroyed?).not_to be true++ subject++ expect(order.destroyed?).to be true+ end++ it 'destroys line_items, shipments and payments, but keeps addresses' do+ subject++ expect(Spree::LineItem.where(id: line_item_ids)).to be_empty+ expect(Spree::Shipment.where(id: shipment_ids)).to be_empty+ expect(Spree::Payment.where(id: payment_ids)).to be_empty++ expect(Spree::Address.where(id: address_ids)).to contain_exactly(ship_address, bill_address)+ endendcontext 'when empty service is called first' do@@ -63,7 +90,7 @@ module Spreeit 'returns failure' doexpect(subject.success?).to be false- expect(subject.value).to eq Spree.t(:cannot_be_destroyed)+ expect(subject.error.value).to eq Spree.t(:cannot_be_destroyed)endendend@@ -75,7 +102,7 @@ module Spreeit 'returns failure' doexpect(subject.success?).to be false- expect(subject.value).to eq Spree.t(:cannot_be_destroyed)+ expect(subject.error.value).to eq Spree.t(:cannot_be_destroyed)endendend