spree_core 5.4.2 → 5.5.0.rc1

data/app/services/spree/sample_data/loader.rb

@@ -15,6 +15,9 @@ module Spree
               puts 'Loading sample markets...'
               load_ruby_file('markets')
 
+              puts 'Loading sample channels...'
+              load_ruby_file('channels')
+
               puts 'Loading sample metafield definitions...'
               load_ruby_file('metafield_definitions')
 
@@ -24,6 +27,12 @@ module Spree
               puts 'Loading sample products...'
               load_products
 
+              puts 'Publishing sample products on the default channel...'
+              publish_sample_products
+
+              puts 'Loading sample categories...'
+              load_categories
+
               puts 'Loading sample product translations...'
               load_product_translations
 
@@ -67,6 +76,27 @@ module Spree
         Spree::SampleData::ImportRunner.call(csv_path: csv_path, import_class: Spree::Imports::Products)
       end
 
+      def publish_sample_products
+        store = Spree::Store.default
+        store.default_channel.add_products(store.product_ids)
+      end
+
+      def load_categories
+        store = Spree::Store.default
+        csv_path = sample_data_path.join('products.csv')
+
+        require 'csv'
+        ::CSV.foreach(csv_path, headers: true) do |row|
+          product = store.products.find_by(slug: row['slug'])
+          next unless product
+
+          categories = [row['category1'], row['category2'], row['category3']].compact_blank
+          next if categories.empty?
+
+          Spree::Imports::CreateCategoriesJob.perform_now(product.id, store.id, categories)
+        end
+      end
+
       def load_product_translations
         csv_path = sample_data_path.join('product_translations.csv')
         return unless csv_path.exist?

data/app/services/spree/stock_reservations/extend.rb

@@ -0,0 +1,19 @@
+module Spree
+  module StockReservations
+    class Extend
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        return success(order) unless Spree::Config[:stock_reservations_enabled]
+
+        expires_at = Time.current + Spree::StockReservation.ttl_for(order)
+
+        Spree::StockReservation
+          .where(order_id: order.id)
+          .update_all(expires_at: expires_at, updated_at: Time.current)
+
+        success(order)
+      end
+    end
+  end
+end

data/app/services/spree/stock_reservations/release.rb

@@ -0,0 +1,12 @@
+module Spree
+  module StockReservations
+    class Release
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        Spree::StockReservation.where(order_id: order.id).delete_all
+        success(order)
+      end
+    end
+  end
+end

data/app/services/spree/stock_reservations/reserve.rb

@@ -0,0 +1,103 @@
+module Spree
+  module StockReservations
+    class Reserve
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        return success(order) unless Spree::Config[:stock_reservations_enabled]
+
+        expires_at = Time.current + Spree::StockReservation.ttl_for(order)
+
+        ApplicationRecord.transaction do
+          targets = build_targets(order)
+          break if targets.empty?
+
+          # Pessimistic lock + fresh read of count_on_hand. The lock serializes
+          # concurrent checkouts and we use the locked rows below so we never
+          # check stock against a stale association cache.
+          locked_stock_items = Spree::StockItem
+            .where(id: targets.map { |_, si| si.id })
+            .lock
+            .index_by(&:id)
+
+          held = held_by_others(locked_stock_items.keys, order.id)
+          existing = existing_reservations_for(targets)
+
+          this_order_used = Hash.new(0)
+
+          targets.each do |line_item, stock_item|
+            stock_item = locked_stock_items.fetch(stock_item.id)
+            available = stock_item.count_on_hand - held.fetch(stock_item.id, 0) - this_order_used[stock_item.id]
+
+            if available < line_item.quantity
+              raise InsufficientStockError.new(
+                line_item,
+                Spree.t(
+                  :insufficient_stock_for_reservation,
+                  default: '%{item} has only %{available} available',
+                  item: line_item.variant.name,
+                  available: [available, 0].max
+                )
+              )
+            end
+
+            this_order_used[stock_item.id] += line_item.quantity
+
+            reservation = existing[[stock_item.id, line_item.id]] ||
+                          Spree::StockReservation.new(stock_item: stock_item, line_item: line_item)
+            reservation.order = order
+            reservation.quantity = line_item.quantity
+            reservation.expires_at = expires_at
+            reservation.save!
+          end
+        end
+
+        success(order)
+      rescue InsufficientStockError => e
+        failure(e.line_item, e.message)
+      end
+
+      private
+
+      def build_targets(order)
+        order.line_items.includes(variant: { stock_items: :stock_location }).filter_map do |line_item|
+          variant = line_item.variant
+          next unless variant&.should_track_inventory?
+
+          stock_item = select_stock_item(variant)
+          next if stock_item.nil? || stock_item.backorderable?
+
+          [line_item, stock_item]
+        end
+      end
+
+      def select_stock_item(variant)
+        variant.stock_items.detect { |si| si.stock_location&.active? && si.available? }
+      end
+
+      def held_by_others(stock_item_ids, exclude_order_id)
+        return {} if stock_item_ids.empty?
+
+        Spree::StockReservation
+          .active
+          .where(stock_item_id: stock_item_ids)
+          .where.not(order_id: exclude_order_id)
+          .group(:stock_item_id)
+          .sum(:quantity)
+      end
+
+      # One SELECT for all (stock_item_id, line_item_id) pairs we need to
+      # upsert. Returns a hash keyed by [stock_item_id, line_item_id].
+      def existing_reservations_for(targets)
+        return {} if targets.empty?
+
+        stock_item_ids = targets.map { |_, si| si.id }
+        line_item_ids = targets.map { |li, _| li.id }
+
+        Spree::StockReservation
+          .where(stock_item_id: stock_item_ids, line_item_id: line_item_ids)
+          .index_by { |r| [r.stock_item_id, r.line_item_id] }
+      end
+    end
+  end
+end

data/app/services/spree/taxons/remove_products.rb

@@ -36,7 +36,7 @@ module Spree
 
           if classifications_params.any?
             opts = {}
-            opts[:unique_by] = :index_spree_products_taxons_on_product_id_and_taxon_id unless ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+            opts[:unique_by] = :index_spree_products_taxons_on_product_id_and_taxon_id unless mysql_adapter?
 
             Spree::Classification.upsert_all(
               classifications_params,
@@ -58,6 +58,12 @@ module Spree
 
         success(true)
       end
+
+      private
+
+      def mysql_adapter?
+        ActiveRecord::Base.connection.adapter_name.downcase.include?('mysql')
+      end
     end
   end
 end

data/app/subscribers/spree/event_log_subscriber.rb

@@ -9,7 +9,7 @@ module Spree
   # Rails.application.config.filter_parameters.
   #
   # @example Output
-  #   [Spree Event] order.complete | payload: {"id"=>1} | 0.5ms
+  #   [Spree Event] order.completed | payload: {"id"=>1} | 0.5ms
   #
   class EventLogSubscriber
     NAMESPACE = 'spree'

data/app/subscribers/spree/product_metrics_subscriber.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
 module Spree
-  # Handles order completion events to update product metrics.
-  #
-  # When an order is completed, this subscriber enqueues background jobs
-  # to refresh the metrics (units_sold_count, revenue) for each product
-  # in the order.
+  # Handles order completion events to update product metrics
+  # (+units_sold_count+, +revenue+).
   class ProductMetricsSubscriber < Spree::Subscriber
     subscribes_to 'order.completed'
 
@@ -17,12 +14,11 @@ module Spree
 
       order = Spree::Order.find_by_param(order_id)
       return unless order
-      return unless order.store_id
 
       product_ids = order.line_items.includes(:variant).map { |li| li.variant.product_id }.uniq
       return if product_ids.empty?
 
-      jobs = product_ids.map { |product_id| Spree::Products::RefreshMetricsJob.new(product_id, order.store_id) }
+      jobs = product_ids.map { |product_id| Spree::Products::RefreshMetricsJob.new(product_id) }
       ActiveJob.perform_all_later(jobs)
     end
   end

data/app/views/spree/invitation_mailer/invitation_email.html.erb

@@ -12,6 +12,10 @@
   <p>
     <%= link_to Spree.t(:accept), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url) %>
   </p>
+<% else %>
+  <p>
+    <%= link_to Spree.t(:accept), main_app.admin_invitation_acceptance_url(@invitation) %>
+  </p>
 <% end %>
 
 <p>

data/config/locales/en.yml

@@ -299,6 +299,11 @@ en:
           attributes:
             currency:
               must_match_order_currency: Must match order currency
+        spree/market:
+          attributes:
+            base:
+              cannot_destroy_default_market: Cannot delete the default market.
+              cannot_destroy_last_market: Cannot delete the only market.
         spree/market_country:
           attributes:
             country:
@@ -318,6 +323,10 @@ en:
               cannot_destroy_if_attached_to_line_items: Cannot delete Products that are added to placed Orders. In such cases, please discontinue them.
             discontinue_on:
               invalid_date_range: must be later than available date
+        spree/product_publication:
+          attributes:
+            unpublished_at:
+              must_be_after_published_at: must be after published date
         spree/promotion:
           attributes:
             expires_at:
@@ -780,6 +789,8 @@ en:
     are_you_sure: Are you sure?
     are_you_sure_delete: Are you sure you want to delete this record?
     assets: Media
+    assigned_variants: Assigned variants
+    assigned_variants_help: Pick the variants this image represents. Leave blank to apply to all variants.
     associated_adjustment_closed: The associated adjustment is closed, and will not be recalculated. Do you want to open it?
     at_symbol: "@"
     attachments: Attachments
@@ -874,7 +885,8 @@ en:
     change: Change
     change_password: Change password
     changes_published: Changes published!
-    channel: Channel
+    channel: Sales channel
+    channels: Sales channels
     charged: Charged
     checkout: Checkout
     checkout_message: Checkout message
@@ -1124,8 +1136,12 @@ en:
     errors:
       messages:
         blank: can't be blank
+        cannot_delete_default_channel: Default channel cannot be deleted. Promote another channel to default first.
         cannot_remove_icon: Cannot remove image
+        channel_store_mismatch: must belong to the same store
         could_not_create_taxon: Could not create taxon
+        invalid_order_routing_rule: is not a registered order routing rule
+        invalid_order_routing_strategy: is not a registered order routing strategy
         must_be_origin_only: must be an origin (scheme and host) without path, query, or fragment
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
         store_association_can_not_be_changed: The store association can not be changed
@@ -1311,6 +1327,9 @@ en:
     inventory_error_flash_for_insufficient_quantity: An item in your cart has become unavailable.
     inventory_state: Inventory State
     invitation_accepted: Invitation accepted!
+    invitation_expired:
+      body: This invitation link is no longer valid. Please ask the person who invited you to send a new one.
+      heading: Invitation invalid or expired
     invitation_mailer:
       greeting: Hi %{user_name},
       invitation_accepted:
@@ -1445,6 +1464,7 @@ en:
     new_api_key: New API Key
     new_balance: New balance
     new_billing_address: New Billing Address
+    new_channel: New sales channel
     new_country: New Country
     new_custom_domain: New Custom Domain
     new_customer: New Customer
@@ -1633,6 +1653,10 @@ en:
     order_number: Order %{number}
     order_processed_successfully: Your order has been processed successfully
     order_resumed: Order resumed
+    order_routing:
+      strategies:
+        legacy: Legacy
+        rules: Rules (ordered)
     order_state:
       address: address
       awaiting_return: awaiting return
@@ -1878,15 +1902,24 @@ en:
     promotion_not_cloned: 'Promotion has not been cloned. Reason: %{error}'
     promotion_rule: Promotion Rule
     promotion_rule_types:
+      category:
+        description: Order includes products in specified categories
+        name: Categories
       country:
         description: Limit to orders with shipping address in a specific country
         name: Country
       currency:
         description: Limit to orders in a specific currency
         name: Currency
+      customer:
+        description: Available only to the specified customers
+        name: Customers
       customer_group:
         description: Available only to customers in specified customer group(s)
         name: Customer Group(s)
+      customer_logged_in:
+        description: Available only to logged in customers
+        name: Only logged in customers
       first_order:
         description: Must be the customer's first order
         name: First order
@@ -1902,15 +1935,6 @@ en:
       product:
         description: Order includes specified product(s)
         name: Product(s)
-      taxon:
-        description: Order includes products with specified taxon(s)
-        name: Taxon(s)
-      user:
-        description: Available only to the specified customers
-        name: User
-      user_logged_in:
-        description: Available only to logged in users
-        name: User Logged In
     promotion_uses: Promotion uses
     promotionable: Promotable
     promotions: Promotions
@@ -2479,6 +2503,7 @@ en:
     view: View
     view_all: View all
     view_full_details: View full details
+    view_full_size: View full size
     view_store: View store
     view_your_store: View your store
     visibility: Visibility

data/config/routes.rb

@@ -40,6 +40,15 @@ Rails.application.routes.draw do
       )
     end
   end
+  # Used by admin mailers; the SPA derives the URL from `window.location.origin` instead.
+  direct :admin_invitation_acceptance do |invitation, _options = {}|
+    path = "/accept-invitation/#{invitation.prefixed_id}?token=#{invitation.token}"
+    base = Spree::Config[:admin_url].presence ||
+           (Rails.env.development? ? 'http://localhost:5173' : nil) ||
+           invitation.store&.formatted_url
+
+    base.present? ? "#{base.chomp('/')}#{path}" : path
+  end
 end
 
 Spree::Core::Engine.draw_routes

data/db/migrate/20260429000001_create_spree_order_cancellations.rb

@@ -0,0 +1,25 @@
+class CreateSpreeOrderCancellations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_order_cancellations do |t|
+      t.references :order, null: false, index: false
+      t.string :reason, null: false
+      t.text :note
+      t.boolean :restock_items, null: false
+      t.boolean :refund_payments, null: false
+      t.decimal :refund_amount, precision: 10, scale: 2
+      t.boolean :notify_customer, null: false
+      t.references :canceled_by, polymorphic: true, index: false
+      if t.respond_to? :jsonb
+        t.jsonb :metadata
+      else
+        t.json :metadata
+      end
+      t.timestamps
+    end
+
+    add_index :spree_order_cancellations, :order_id
+    add_index :spree_order_cancellations, [:canceled_by_id, :canceled_by_type],
+              name: 'idx_order_cancellations_canceled_by'
+    add_index :spree_order_cancellations, :created_at
+  end
+end

data/db/migrate/20260429000002_create_spree_order_approvals.rb

@@ -0,0 +1,22 @@
+class CreateSpreeOrderApprovals < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_order_approvals do |t|
+      t.references :order, null: false, index: false
+      t.string :status, null: false
+      t.string :level
+      t.text :note
+      t.references :approver, polymorphic: true, index: false
+      t.datetime :decided_at
+      if t.respond_to? :jsonb
+        t.jsonb :metadata
+      else
+        t.json :metadata
+      end
+      t.timestamps
+    end
+
+    add_index :spree_order_approvals, [:order_id, :status]
+    add_index :spree_order_approvals, [:approver_id, :approver_type],
+              name: 'idx_order_approvals_approver'
+  end
+end

data/db/migrate/20260429000003_add_status_to_spree_orders.rb

@@ -0,0 +1,6 @@
+class AddStatusToSpreeOrders < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_orders, :status, :string
+    add_index :spree_orders, :status
+  end
+end

data/db/migrate/20260429000004_add_scopes_to_spree_api_keys.rb

@@ -0,0 +1,11 @@
+class AddScopesToSpreeApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    change_table :spree_api_keys do |t|
+      if t.respond_to?(:jsonb)
+        t.jsonb :scopes
+      else
+        t.json :scopes
+      end
+    end
+  end
+end

data/db/migrate/20260501000001_create_spree_stock_reservations.rb

@@ -0,0 +1,19 @@
+class CreateSpreeStockReservations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_stock_reservations do |t|
+      t.references :stock_item, null: false, index: false
+      t.references :line_item, null: false
+      t.references :order, null: false
+      t.integer :quantity, null: false
+      t.datetime :expires_at, null: false
+      t.timestamps
+    end
+
+    # Composite (stock_item_id, expires_at) is the hot-path Quantifier query;
+    # leading on stock_item_id makes it cover the standalone-by-stock-item lookup too.
+    add_index :spree_stock_reservations, [:stock_item_id, :expires_at]
+    add_index :spree_stock_reservations, [:stock_item_id, :line_item_id], unique: true,
+              name: 'idx_stock_reservations_item_line_item'
+    add_index :spree_stock_reservations, :expires_at
+  end
+end

data/db/migrate/20260504103113_add_type_to_spree_payment_setup_sessions.rb

@@ -0,0 +1,6 @@
+class AddTypeToSpreePaymentSetupSessions < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_payment_setup_sessions, :type, :string
+    add_index :spree_payment_setup_sessions, :type
+  end
+end

data/db/migrate/20260507162651_create_spree_variant_media.rb

@@ -0,0 +1,23 @@
+class CreateSpreeVariantMedia < ActiveRecord::Migration[7.2]
+  # `media_id` references spree_assets.id in 5.5 — the parent table renames to
+  # spree_media in 6.0 (see 5.4-6.0-product-media-system.md Phase 3 of the 6.0
+  # cleanup). Using `media_id` from the start saves a column rename in 6.0.
+  #
+  # Table name is `spree_variant_media` (not the Rails default `spree_variant_medias`)
+  # since "media" reads as collective; the model overrides `self.table_name`.
+  #
+  # No per-variant `position` column — gallery order comes from the asset's
+  # product-level position (Asset#position). Variant gallery resolution filters
+  # product media down to the linked subset and inherits the product's order.
+  def change
+    create_table :spree_variant_media do |t|
+      t.references :variant, null: false, index: false
+      t.bigint :media_id, null: false
+      t.timestamps
+    end
+
+    add_index :spree_variant_media, [:variant_id, :media_id], unique: true,
+              name: 'idx_variant_media_unique'
+    add_index :spree_variant_media, :media_id, name: 'idx_variant_media_media'
+  end
+end

data/db/migrate/20260508175303_add_pickup_to_spree_stock_locations.rb

@@ -0,0 +1,12 @@
+class AddPickupToSpreeStockLocations < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_stock_locations, :kind, :string, null: false, default: 'warehouse'
+    add_column :spree_stock_locations, :pickup_enabled, :boolean, null: false, default: false
+    add_column :spree_stock_locations, :pickup_stock_policy, :string, null: false, default: 'local'
+    add_column :spree_stock_locations, :pickup_ready_in_minutes, :integer
+    add_column :spree_stock_locations, :pickup_instructions, :text
+
+    add_index :spree_stock_locations, :pickup_enabled
+    add_index :spree_stock_locations, :kind
+  end
+end

data/db/migrate/20260508204040_create_spree_channels.rb

@@ -0,0 +1,18 @@
+class CreateSpreeChannels < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_channels do |t|
+      t.references :store, null: false
+      t.string :name, null: false
+      t.string :code, null: false
+      t.boolean :active, null: false
+      t.text :preferences
+      t.timestamps
+    end
+
+    add_index :spree_channels, %i[store_id code], unique: true
+
+    # Default-channel backfill for existing stores lives in
+    # +rake spree:channels:create_defaults+ (data transformations don't belong
+    # in migrations per Spree's guidelines).
+  end
+end

data/db/migrate/20260508204041_create_spree_order_routing_rules.rb

@@ -0,0 +1,18 @@
+class CreateSpreeOrderRoutingRules < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_order_routing_rules do |t|
+      t.references :store, null: false
+      t.references :channel, null: false
+      t.string :type, null: false
+      t.integer :position, null: false
+      t.boolean :active, null: false
+      t.text :preferences
+      t.timestamps
+    end
+
+    add_index :spree_order_routing_rules, [:channel_id, :position]
+    add_index :spree_order_routing_rules, [:channel_id, :active, :position],
+              name: 'idx_order_routing_rules_lookup'
+    add_index :spree_order_routing_rules, :type
+  end
+end

data/db/migrate/20260508204042_add_preferred_stock_location_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddPreferredStockLocationToSpreeOrders < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_orders, :preferred_stock_location
+  end
+end

data/db/migrate/20260508204043_add_channel_id_to_spree_orders.rb

@@ -0,0 +1,10 @@
+class AddChannelIdToSpreeOrders < ActiveRecord::Migration[7.2]
+  # Non-destructive: adds the FK column alongside the existing `channel`
+  # string column. Old reads keep working until the upgrade rake task
+  # `spree:order_routing:backfill_channel_ids` populates `channel_id`.
+  # The string column is dropped in a follow-up migration once the
+  # backfill has run.
+  def change
+    add_reference :spree_orders, :channel
+  end
+end

data/db/migrate/20260511000001_backfill_status_on_spree_orders.rb

@@ -0,0 +1,57 @@
+class BackfillStatusOnSpreeOrders < ActiveRecord::Migration[7.2]
+  BATCH_SIZE = 10_000
+
+  STATE_TO_STATUS = {
+    'placed'   => %w[complete resumed returned awaiting_return],
+    'canceled' => %w[canceled partially_canceled]
+  }.freeze
+
+  def up
+    STATE_TO_STATUS.each do |target_status, states|
+      backfill_in_batches(target_status, states)
+    end
+
+    # Anything still NULL (carts, in-progress checkouts) becomes draft.
+    backfill_in_batches('draft', nil)
+
+    change_column_default :spree_orders, :status, 'draft'
+    change_column_null    :spree_orders, :status, false
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration,
+          'Backfilled status values cannot be safely restored: writes made after deploy ' \
+          'are indistinguishable from the backfill. Roll back manually if needed.'
+  end
+
+  private
+
+  def backfill_in_batches(target_status, source_states)
+    quoted_status = connection.quote(target_status)
+    state_filter =
+      if source_states
+        quoted = Array(source_states).map { |s| connection.quote(s) }.join(',')
+        "AND state IN (#{quoted})"
+      else
+        ''
+      end
+
+    loop do
+      # The nested SELECT wrap (`SELECT id FROM (SELECT id ... LIMIT N) AS t`) is
+      # required for MySQL, which refuses an UPDATE that selects from the same
+      # table in the WHERE clause without an intermediate derived table.
+      affected = connection.update(<<~SQL.squish)
+        UPDATE spree_orders SET status = #{quoted_status}
+         WHERE id IN (
+           SELECT id FROM (
+             SELECT id FROM spree_orders
+              WHERE status IS NULL #{state_filter}
+              LIMIT #{BATCH_SIZE}
+           ) AS spree_orders_batch
+         )
+      SQL
+
+      break if affected < BATCH_SIZE
+    end
+  end
+end