Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Expose pre-order fields on the product-level inventory form (#14262)

Damian Legawiec19e1f34e8071
diff --git a/spree/admin/app/controllers/spree/admin/products_controller.rb b/spree/admin/app/controllers/spree/admin/products_controller.rb
index a5d4d74007..5a9404e13d 100644
--- a/spree/admin/app/controllers/spree/admin/products_controller.rb
+++ b/spree/admin/app/controllers/spree/admin/products_controller.rb
@@ -311,6 +311,7 @@ module Spree
params.require(:product).permit(permitted_product_attributes)
end
parse_datetime_in_store_timezone(attrs, :available_on, :discontinue_on, :make_active_at)
+ parse_datetime_in_store_timezone(attrs[:master_attributes], :preorder_ships_at) if attrs[:master_attributes].present?
attrs
end
end
diff --git a/spree/admin/app/views/spree/admin/products/form/_inventory.html.erb b/spree/admin/app/views/spree/admin/products/form/_inventory.html.erb
index 1977ac41f9..70ca3b930e 100644
--- a/spree/admin/app/views/spree/admin/products/form/_inventory.html.erb
+++ b/spree/admin/app/views/spree/admin/products/form/_inventory.html.erb
@@ -17,6 +17,25 @@
%>
<%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %>
</div>
+ <%= f.fields_for :master, @product.master do |vf| %>
+ <div class="mb-2">
+ <%= vf.spree_check_box :preorderable, label: Spree.t('admin.variants_form.preorderable_label') %>
+ <small class="text-muted text-xs d-block"><%= Spree.t('admin.variants_form.preorderable_hint') %></small>
+ </div>
+ <div class="mb-2">
+ <%# datetime-local inputs have no timezone; render in the store's timezone so admins see and submit store-local times (parsed back in ProductsController#permitted_resource_params). %>
+ <% preorder_ships_at_local = vf.object.preorder_ships_at&.in_time_zone(current_timezone)&.strftime('%Y-%m-%dT%H:%M') %>
+ <%= vf.spree_datetime_field :preorder_ships_at,
+ value: preorder_ships_at_local,
+ label: Spree.t('admin.variants_form.preorder_ships_at_label'),
+ help: "#{Spree.t('admin.variants_form.preorder_ships_at_hint')} #{Spree.t('admin.datetime_field_timezone_help', zone: current_timezone.name)}" %>
+ </div>
+ <div class="mb-6">
+ <%= vf.spree_number_field :backorder_limit, min: 0,
+ label: Spree.t('admin.variants_form.backorder_limit_label'),
+ help: Spree.t('admin.variants_form.backorder_limit_hint') %>
+ </div>
+ <% end %>
<div
class="master-variant-quantity-form <%= @product.has_variants? || [email protected]_inventory ? 'hidden' : '' %>"
data-product-form-target="<%= @product.has_variants? ? '' : 'quantityForm' %>"
diff --git a/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb
index 0f1440a8ef..8f04436626 100644
--- a/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb
@@ -637,6 +637,32 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do
end
end
+ describe 'master variant pre-order' do
+ before { store.update!(preferred_timezone: 'Asia/Tokyo') }
+
+ let(:product_params) do
+ {
+ master_attributes: {
+ id: product.master_id,
+ preorderable: '1',
+ preorder_ships_at: '2026-05-01T12:00',
+ backorder_limit: '25'
+ }
+ }
+ end
+
+ it 'updates the pre-order settings of the master variant' do
+ send_request
+
+ product.master.reload
+ expect(product.master).to be_preorderable
+ expect(product.master.backorder_limit).to eq(25)
+ # The datetime-local value carries no zone, so it must be parsed in the
+ # store timezone: 12:00 in Tokyo (UTC+9) is stored as 03:00 UTC.
+ expect(product.master.preorder_ships_at).to eq(ActiveSupport::TimeZone['Asia/Tokyo'].parse('2026-05-01T12:00'))
+ end
+ end
+
describe 'master variant prices' do
let(:product_params) do
{
@@ -1181,7 +1207,11 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do
status: 'draft',
make_active_at: '2026-04-10T09:00',
available_on: '2026-04-11T10:30',
- discontinue_on: '2026-04-20T18:45'
+ discontinue_on: '2026-04-20T18:45',
+ master_attributes: {
+ id: product.master_id,
+ preorder_ships_at: '2026-04-15T14:00'
+ }
}
end
@@ -1193,6 +1223,7 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do
expect(product.make_active_at).to eq(tokyo.parse('2026-04-10T09:00'))
expect(product.available_on).to eq(tokyo.parse('2026-04-11T10:30'))
expect(product.discontinue_on).to eq(tokyo.parse('2026-04-20T18:45'))
+ expect(product.master.preorder_ships_at).to eq(tokyo.parse('2026-04-15T14:00'))
# Tokyo is UTC+9, so 09:00 local is 00:00 UTC.
expect(product.make_active_at.utc.strftime('%Y-%m-%dT%H:%M')).to eq('2026-04-10T00:00')
end