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
Fixed: Allow to cancel an order with already cancelled shipments
Damian Legawiecf16b176f3e97
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex fb7d096554..591a867d40 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -280,7 +280,7 @@ module Spreedef allow_cancel?return false if !completed? || canceled?- shipment_state.nil? || %w{ready backorder pending}.include?(shipment_state)+ shipment_state.nil? || %w{ready backorder pending canceled}.include?(shipment_state)enddef all_inventory_units_returned?diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex ff4df0ed9b..7137760a0f 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -70,7 +70,23 @@ describe Spree::Order, type: :model doendend- context '#cancel' do+ describe '#allow_cancel?' do+ context 'when all shipments are canceled or ready' do+ before do+ order.update_columns(state: 'complete', completed_at: Time.current)+ order.shipments.delete_all++ create(:shipment, order: order, state: 'canceled')+ create(:shipment, order: order, state: 'ready')+ end++ it 'should return true' do+ expect(order.reload.allow_cancel?).to eq true+ end+ end+ end++ describe '#cancel' dolet(:order) { create(:completed_order_with_totals, store: store) }let!(:payment) docreate(@@ -91,7 +107,7 @@ describe Spree::Order, type: :model doendend- context '#canceled_by' do+ describe '#canceled_by' dosubject { order.canceled_by(admin_user) }let(:admin_user) { create :admin_user }@@ -135,7 +151,7 @@ describe Spree::Order, type: :model doendend- context '#create' do+ describe '#create' dolet(:order) { Spree::Order.create }it 'assigns an order number' do@@ -162,7 +178,7 @@ describe Spree::Order, type: :model doendend- context '#finalize!' do+ describe '#finalize!' dolet(:order) { Spree::Order.create(email: '[email protected]', store: store) }before do@@ -349,42 +365,42 @@ describe Spree::Order, type: :model doendend- context '#display_outstanding_balance' do+ describe '#display_outstanding_balance' doit 'returns the value as a spree money' doallow(order).to receive(:outstanding_balance).and_return(10.55)expect(order.display_outstanding_balance).to eq(Spree::Money.new(10.55))endend- context '#display_item_total' do+ describe '#display_item_total' doit 'returns the value as a spree money' doallow(order).to receive(:item_total).and_return(10.55)expect(order.display_item_total).to eq(Spree::Money.new(10.55))endend- context '#display_adjustment_total' do+ describe '#display_adjustment_total' doit 'returns the value as a spree money' doorder.adjustment_total = 10.55expect(order.display_adjustment_total).to eq(Spree::Money.new(10.55))endend- context '#display_promo_total' do+ describe '#display_promo_total' doit 'returns the value as a spree money' doorder.promo_total = 10.55expect(order.display_promo_total).to eq(Spree::Money.new(10.55))endend- context '#display_total' do+ describe '#display_total' doit 'returns the value as a spree money' doorder.total = 10.55expect(order.display_total).to eq(Spree::Money.new(10.55))endend- context '#currency' do+ describe '#currency' docontext 'when object currency is ABC' dobefore { order.currency = 'ABC' }@@ -394,7 +410,7 @@ describe Spree::Order, type: :model doendend- context '#confirmation_required?' do+ describe '#confirmation_required?' do# Regression test for #4117it "is required if the state is currently 'confirm'" doorder = Spree::Order.new@@ -490,7 +506,7 @@ describe Spree::Order, type: :model doend# Regression tests for #4072- context '#state_changed' do+ describe '#state_changed' dolet(:order) { create(:order) }it 'logs state changes' do@@ -512,7 +528,7 @@ describe Spree::Order, type: :model doend# Regression test for #4199- context '#available_payment_methods' do+ describe '#available_payment_methods' dolet(:ok_method) { double :payment_method, available_for_order?: true, available_for_store?: true, stores: [store] }let(:no_method) { double :payment_method, available_for_order?: false, available_for_store?: true, stores: [store] }let(:methods) { [ok_method, no_method] }@@ -565,7 +581,7 @@ describe Spree::Order, type: :model doendend- context '#apply_free_shipping_promotions' do+ describe '#apply_free_shipping_promotions' doit 'calls out to the FreeShipping promotion handler' doshipment = double('Shipment')allow(order).to receive_messages shipments: [shipment]@@ -581,7 +597,7 @@ describe Spree::Order, type: :model doendend- context '#products' do+ describe '#products' dolet(:variant1) { create(:variant) }let(:variant2) { create(:variant) }let!(:variant3) { create(:variant) }@@ -759,7 +775,7 @@ describe Spree::Order, type: :model doendend- context '#can_ship?' do+ describe '#can_ship?' dolet(:order) { Spree::Order.create }it "is true for order in the 'complete' state" do@@ -788,7 +804,7 @@ describe Spree::Order, type: :model doendend- context '#can_be_destroyed?' do+ describe '#can_be_destroyed?' doshared_examples 'cannot be destroyed' doit { expect(order.can_be_destroyed?).to be false }end@@ -814,7 +830,7 @@ describe Spree::Order, type: :model doendend- context '#uneditable?' do+ describe '#uneditable?' dolet(:order) { create(:order) }it 'returns true when order is completed' do@@ -842,7 +858,7 @@ describe Spree::Order, type: :model doendend- context '#completed?' do+ describe '#completed?' doit 'indicates if order is completed' doorder.completed_at = nilexpect(order.completed?).to be false@@ -852,7 +868,7 @@ describe Spree::Order, type: :model doendend- context '#allow_checkout?' do+ describe '#allow_checkout?' doit 'is true if there are line_items in the order' doallow(order).to receive_message_chain(:line_items, :exists?).and_return(true)expect(order.checkout_allowed?).to be true@@ -863,7 +879,7 @@ describe Spree::Order, type: :model doendend- context '#amount' do+ describe '#amount' dobefore do@order = create(:order, user: user)@order.line_items = [create(:line_item, price: 1.0, quantity: 2),@@ -875,7 +891,7 @@ describe Spree::Order, type: :model doendend- context '#backordered?' do+ describe '#backordered?' dolet(:shipments) { create_list(:shipment, 2) }before do@@ -889,7 +905,7 @@ describe Spree::Order, type: :model doendend- context '#can_cancel?' do+ describe '#can_cancel?' doit 'is false for completed order in the canceled state' doorder.state = 'canceled'order.shipment_state = 'ready'@@ -905,7 +921,7 @@ describe Spree::Order, type: :model doendend- context '#tax_total' do+ describe '#tax_total' doit 'adds included tax and additional tax' doallow(order).to receive_messages(additional_tax_total: 10, included_tax_total: 20)diff --git a/emails/spec/models/spree/order_spec.rb b/emails/spec/models/spree/order_spec.rbindex da20c9d7a5..e976e2da01 100644--- a/emails/spec/models/spree/order_spec.rb+++ b/emails/spec/models/spree/order_spec.rb@@ -49,7 +49,7 @@ describe Spree::Order, type: :model doendend- context '#cancel' do+ describe '#cancel' dolet(:order) { build(:order) }let!(:variant) { create(:variant) }let!(:inventory_units) { create_list(:inventory_unit, 2, variant: variant) }