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: brought back `track inventory` checkbox in variant form, (#12925)
Damian Legawiec2e2fdfd7c2fc
diff --git a/admin/app/views/spree/admin/variants/form/_inventory.html.erb b/admin/app/views/spree/admin/variants/form/_inventory.html.erbindex 94ab69074c..c5700715cf 100644--- a/admin/app/views/spree/admin/variants/form/_inventory.html.erb+++ b/admin/app/views/spree/admin/variants/form/_inventory.html.erb@@ -4,8 +4,18 @@<%= Spree.t(:inventory) %></h5></div>- <div class="card-body p-0">- <table class="table">+ <div class="card-body p-0" data-controller="reveal" data-reveal-hidden-class="d-none">+ <div class="custom-control custom-checkbox mb-4 m-3">+ <%= f.check_box :track_inventory,+ class: 'custom-control-input',+ data: {+ action: 'change->reveal#toggle'+ }+ %>+ <%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %>+ </div>++ <table class="table <%= 'd-none' unless f.object.track_inventory? %>" data-reveal-target="item"><thead><tr><th><%= Spree.t(:stock_location) %></th>diff --git a/admin/spec/controllers/spree/admin/variants_controller_spec.rb b/admin/spec/controllers/spree/admin/variants_controller_spec.rbindex b3d998531d..8e726327df 100644--- a/admin/spec/controllers/spree/admin/variants_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/variants_controller_spec.rb@@ -226,6 +226,24 @@ RSpec.describe Spree::Admin::VariantsController, type: :controller doexpect(variant.stock_items.last.backorderable).to eq(true)endend++ context 'disabling track inventory' do+ let(:variant_params) do+ {+ id: variant.id,+ product_id: product.slug,+ variant: { track_inventory: '0' }+ }+ end++ it 'sets the track inventory to false' do+ expect(variant.track_inventory).to eq(true)+ put :update, params: variant_params+ variant.reload+ expect(variant.track_inventory).to eq(false)+ expect(variant.stock_items.first.count_on_hand).to eq(0)+ end+ endenddescribe 'DELETE #destroy' dodiff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex 5bc225d20b..44ad6034a0 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -251,7 +251,7 @@ module Spreedelegate method_name, :"#{method_name}=", to: :default_variantend- delegate :display_amount, :display_price, :has_default_price?,+ delegate :display_amount, :display_price, :has_default_price?, :track_inventory?,:display_compare_at_price, :images, to: :default_variantdelegate :name, to: :brand, prefix: true, allow_nil: truediff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rbindex 8433bb3150..d0312cf6ec 100644--- a/core/app/models/spree/variant.rb+++ b/core/app/models/spree/variant.rb@@ -74,7 +74,7 @@ module Spreeafter_create :set_master_out_of_stock, unless: :is_master?after_commit :clear_line_items_cache, on: :update- after_create :create_default_stock_item, unless: :track_inventory?+ after_save :create_default_stock_item, unless: :track_inventory?after_update_commit :handle_track_inventory_changeafter_commit :remove_prices_from_master_variant, on: [:create, :update], unless: :is_master?diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rbindex ad30a731fa..347cb4a60b 100644--- a/core/spec/models/spree/product_spec.rb+++ b/core/spec/models/spree/product_spec.rb@@ -566,6 +566,18 @@ describe Spree::Product, type: :model doexpect(product.variants.length).to eq(27)endend++ context 'when track inventory is disabled' do+ let(:product) { build(:product, track_inventory: false, stores: [store]) }++ it 'creates a default stock item' do+ product.save+ expect(product.master.track_inventory?).to eq(false)+ expect(product.master.stock_items.count).to eq(1)+ expect(product.master.stock_items.first.count_on_hand).to eq(0)+ expect(product.master.stock_items.first.backorderable).to eq(false)+ end+ endenddescribe '#images' dodiff --git a/core/spec/models/spree/variant_spec.rb b/core/spec/models/spree/variant_spec.rbindex a1993e77c1..1ba901ce02 100644--- a/core/spec/models/spree/variant_spec.rb+++ b/core/spec/models/spree/variant_spec.rb@@ -131,7 +131,7 @@ describe Spree::Variant, type: :model doendend- describe 'create_default_stock_item' do+ describe '#create_default_stock_item' dolet(:new_variant) { product.variants.create(track_inventory: track_inventory, is_master: true) }context 'when not tracking inventory' do@@ -178,6 +178,19 @@ describe Spree::Variant, type: :model doexpect(new_variant.reload.stock_items.count).to eq(0)endend++ context 'existing variant' do+ let(:variant) { create(:variant, product: product, track_inventory: true) }++ # clear out previous stock items+ before do+ variant.stock_items.delete_all+ end++ it 'creates a default stock item' do+ expect { variant.update!(track_inventory: false) }.to change(variant.stock_items, :count).by(1)+ end+ endendenddiff --git a/storefront/spec/features/checkout_steps_spec.rb b/storefront/spec/features/checkout_steps_spec.rbindex a7dc2cf57c..f361c371e0 100644--- a/storefront/spec/features/checkout_steps_spec.rb+++ b/storefront/spec/features/checkout_steps_spec.rb@@ -378,6 +378,31 @@ describe 'Checkout steps (address and delivery)' doendendend++ context 'when all items have track inventory disabled' do+ before do+ login_as(user, scope: :user)+ order.variants.each do |variant|+ variant.stock_items.delete_all+ end+ order.variants.each do |variant|+ variant.update(track_inventory: false)+ end+ end++ it 'still allows to checkout' do+ visit "/checkout/#{order.token}"+ choose "order_ship_address_id_#{user.shipping_address.id}"+ click_on 'Save and Continue'++ expect(page).to have_content('Delivery')+ expect(page).to have_content(Spree::ShippingMethod.first.name)++ page.find("input[data-cost='$10.00']").click++ expect(page).to have_content('Payment')+ end+ endenddescribe 'payment step', js: true do