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
Do not delete stock items when track inventory is set to false (#12546)
Damian Kaczmarczykb368bbf5fea3
diff --git a/admin/spec/controllers/spree/admin/products_controller_spec.rb b/admin/spec/controllers/spree/admin/products_controller_spec.rbindex 2d7580a57b..547574d671 100644--- a/admin/spec/controllers/spree/admin/products_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/products_controller_spec.rb@@ -866,13 +866,14 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller docreate(:stock_item, count_on_hand: 20, variant: product.master)end- it 'removes stock items' do+ it 'updates stock items' doexpect(product.master.stock_items.reload.count).to be > 0send_requestexpect(product.reload.track_inventory).to be(false)- expect(product.master.stock_items.reload.count).to eq(0)+ expect(product.master.stock_items.reload.first.backorderable).to be(true)+ expect(product.master.stock_items.reload.first.count_on_hand).to eq(0)endenddiff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rbindex 97122cf81e..6d691c8af2 100644--- a/core/app/models/spree/variant.rb+++ b/core/app/models/spree/variant.rb@@ -553,7 +553,7 @@ module Spreereturn unless track_inventory_previously_changed?return if track_inventory- stock_items.delete_all+ stock_items.update_all(backorderable: true, count_on_hand: 0, updated_at: Time.current)enddef remove_prices_from_master_variantdiff --git a/core/spec/models/spree/variant_spec.rb b/core/spec/models/spree/variant_spec.rbindex 6b8e987653..9c6344fb2d 100644--- a/core/spec/models/spree/variant_spec.rb+++ b/core/spec/models/spree/variant_spec.rb@@ -141,8 +141,13 @@ describe Spree::Variant, type: :model dolet!(:variant) { create(:variant, product: product, track_inventory: true) }let!(:stock_item) { create(:stock_item, variant: variant, count_on_hand: 100) }- it 'deletes stock items' do- expect { subject }.to change(variant.stock_items, :count).from(2).to(0)+ before do+ stock_item.update!(backorderable: false)+ end++ it 'updates stock items' do+ expect { subject }.+ to change { stock_item.reload.backorderable }.from(false).to(true).and change { stock_item.reload.count_on_hand }.from(110).to(0)endend@@ -153,7 +158,7 @@ describe Spree::Variant, type: :model dolet!(:stock_item) { create(:stock_item, variant: variant, count_on_hand: 100) }it 'keeps stock items' do- expect { subject }.to_not change(variant.stock_items, :count)+ expect { subject }.not_to change(variant.stock_items, :count)endendend@@ -620,33 +625,33 @@ describe Spree::Variant, type: :model dodescribe '#options' dolet(:product) { create(:product, option_types: [option_type, option_type2]) }let(:variant) { create(:variant, product: product, option_values: [option_value, option_value2]) }- let!(:option_type2) { create(:option_type, name: "material") }- let!(:option_type) { Spree::OptionType.find_by(name: "size") || create(:option_type, name: "size") }- let(:option_value) { create(:option_value, name: "medium", presentation: "M", option_type: option_type) }- let(:option_value2) { create(:option_value, name: "wool", presentation: "Wool", option_type: option_type2) }+ let!(:option_type2) { create(:option_type, name: 'material') }+ let!(:option_type) { Spree::OptionType.find_by(name: 'size') || create(:option_type, name: 'size') }+ let(:option_value) { create(:option_value, name: 'medium', presentation: 'M', option_type: option_type) }+ let(:option_value2) { create(:option_value, name: 'wool', presentation: 'Wool', option_type: option_type2) }- it "returns an array of hashes with option type name, value, and presentation orderd by option type position" do+ it 'returns an array of hashes with option type name, value, and presentation orderd by option type position' doexpect(variant.options).to eq([{- name: "size",- value: "medium",- presentation: "M"+ name: 'size',+ value: 'medium',+ presentation: 'M'},{- name: "material",- value: "wool",- presentation: "Wool"+ name: 'material',+ value: 'wool',+ presentation: 'Wool'}])endenddescribe '#options_text' do+ subject(:options_text) { variant.options_text }+let(:variant) { build :variant }let(:fake_presenter) { double :fake_presenter }- subject(:options_text) { variant.options_text }-before doallow(Spree::Variants::OptionsPresenter).to receive(:new).with(variant).and_return(fake_presenter)end