spree_core 5.4.0.rc5 → 5.4.0.rc7

data/app/models/spree/stock_movement.rb

@@ -31,7 +31,8 @@ module Spree
     delegate :variant, :variant_id, to: :stock_item, allow_nil: true
     delegate :product, to: :variant
 
-    self.whitelisted_ransackable_attributes = ['quantity']
+    self.whitelisted_ransackable_attributes = %w[quantity action created_at stock_item_id originator_type]
+    self.whitelisted_ransackable_associations = %w[stock_item]
 
     def readonly?
       persisted?

data/app/models/spree/variant.rb

@@ -62,14 +62,13 @@ module Spree
 
     before_validation :set_cost_currency
 
-    validate :check_price
+    validate :check_price, if: -> { Spree::Config.enable_legacy_default_price }
 
     validates :option_value_variants, presence: true, unless: :is_master?
 
-    with_options numericality: { greater_than_or_equal_to: 0, allow_nil: true } do
-      validates :cost_price
-      validates :price
-    end
+    validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
+    validates :price, numericality: { greater_than_or_equal_to: 0, allow_nil: true },
+                      if: -> { Spree::Config.enable_legacy_default_price }
     validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) }, case_sensitive: false, scope: spree_base_uniqueness_scope },
                     allow_blank: true, unless: :disable_sku_validation?
 
@@ -447,8 +446,8 @@ module Spree
     def set_price(currency, amount, compare_at_amount = nil)
       price = prices.base_prices.find_or_initialize_by(currency: currency)
       price.amount = amount
-      price.compare_at_amount = compare_at_amount if compare_at_amount.present?
-      price.save!
+      price.compare_at_amount = compare_at_amount
+      price.save! if persisted?
     end
 
     # Returns the price for the given context or options.
@@ -607,18 +606,21 @@ module Spree
 
     # Ensures a new variant takes the product master price when price is not supplied
     def check_price
-      return if (has_default_price? && default_price.valid?) || prices.any?
+      return if prices.any?
 
       infer_price_from_default_variant_if_needed
-      self.currency = Spree::Store.default.default_currency if price.present? && currency.nil?
     end
 
     def infer_price_from_default_variant_if_needed
-      if price.nil?
+      default_currency = Spree::Store.default.default_currency
+      current_price = price_in(default_currency).amount
+
+      if current_price.nil?
         return errors.add(:base, :no_master_variant_found_to_infer_price) unless product&.master
 
         # At this point, master can have or have no price, so let's use price from the default variant
-        self.price = product.default_variant.price
+        inferred_price = product.default_variant.price_in(default_currency).amount
+        set_price(default_currency, inferred_price) if inferred_price.present?
       end
     end
 

data/app/presenters/spree/csv/product_translation_presenter.rb

@@ -0,0 +1,31 @@
+module Spree
+  module CSV
+    class ProductTranslationPresenter
+      CSV_HEADERS = %w[
+        slug
+        locale
+        name
+        description
+        meta_title
+        meta_description
+      ].freeze
+
+      TRANSLATABLE_FIELDS = %i[name description meta_title meta_description].freeze
+
+      def initialize(product, locale)
+        @product = product
+        @locale = locale.to_s
+      end
+
+      attr_reader :product, :locale
+
+      def call
+        [
+          product.slug,
+          locale,
+          *TRANSLATABLE_FIELDS.map { |field| product.get_field_with_locale(locale, field) }
+        ]
+      end
+    end
+  end
+end

data/app/presenters/spree/csv/product_variant_presenter.rb

@@ -47,18 +47,19 @@ module Spree
         'category3',
       ].freeze
 
-      def initialize(product, variant, index = 0, properties = [], taxons = [], store = nil, metafields = [])
+      def initialize(product, variant, index = 0, properties = [], taxons = [], store = nil, metafields = [], currency = nil)
         @product = product
         @variant = variant
         @index = index
         @properties = properties
         @taxons = taxons
         @store = store || product.stores.first
-        @currency = @store.default_currency
+        @currency = currency || @store.default_currency
+        @price_only = @currency != @store.default_currency
         @metafields = metafields
       end
 
-      attr_accessor :product, :variant, :index, :properties, :taxons, :store, :currency, :metafields
+      attr_accessor :product, :variant, :index, :properties, :taxons, :store, :currency, :price_only, :metafields
 
       ##
       # Generates an array representing a CSV row of product variant data.
@@ -72,6 +73,8 @@ module Spree
       #
       # @return [Array] An array containing the combined product and variant CSV data.
       def call
+        return price_only_row if price_only
+
         total_on_hand = variant.total_on_hand
 
         csv = [
@@ -134,6 +137,16 @@ module Spree
 
       private
 
+      def price_only_row
+        csv = Array.new(CSV_HEADERS.size)
+        csv[CSV_HEADERS.index('sku')] = variant.sku
+        csv[CSV_HEADERS.index('slug')] = product.slug
+        csv[CSV_HEADERS.index('price')] = variant.amount_in(currency)&.to_f
+        csv[CSV_HEADERS.index('compare_at_price')] = variant.compare_at_amount_in(currency)&.to_f
+        csv[CSV_HEADERS.index('currency')] = currency
+        csv
+      end
+
       def image_url_options
         { variant: :xlarge }
       end

data/app/presenters/spree/search_provider/product_presenter.rb

@@ -35,10 +35,15 @@ module Spree
 
       private
 
+      # Build a document for a given locale and currency
+      # @param locale [String] the locale to build the document for
+      # @param currency [String] the currency to build the document for
+      # @param fallback_locale [String] the fallback locale to use if the product has no translation for the given locale
+      # @return [Hash] the document
       def build_document(locale, currency, fallback_locale)
         {
           # Composite ID: product + locale + currency
-          prefixed_id: "#{product.prefixed_id}_#{locale}_#{currency}",
+          id: "#{product.prefixed_id}_#{locale}_#{currency}",
           product_id: product.prefixed_id,
           locale: locale.to_s,
           currency: currency,
@@ -53,7 +58,7 @@ module Spree
           status: product.status,
           sku: product.sku,
           in_stock: product.in_stock?,
-          store_ids: cached_store_ids,
+          store_ids: product.store_ids.map(&:to_s),
           discontinue_on: product.discontinue_on&.to_i || 0,
           category_ids: category_ids_with_ancestors,
           category_names: product.taxons.map { |t| translated(t, :name, fallback_locale) },
@@ -62,8 +67,7 @@ module Spree
           option_value_ids: variant_option_value_ids,
           option_values: variant_option_values_data.map { |ov| translated(ov, :presentation, fallback_locale) }.uniq,
           tags: product.tag_list || [],
-          thumbnail_url: product.primary_media&.url(:large),
-          units_sold_count: cached_units_sold_count,
+          units_sold_count: product.store_products.find { |sp| sp.store_id == store.id }&.units_sold_count || 0,
           available_on: product.available_on&.iso8601,
           created_at: product.created_at&.iso8601,
           updated_at: product.updated_at&.iso8601
@@ -111,15 +115,6 @@ module Spree
         }.uniq
       end
 
-      # Memoized — avoids N+1 when called per document
-      def cached_store_ids
-        @cached_store_ids ||= product.store_ids.map(&:to_s)
-      end
-
-      def cached_units_sold_count
-        @cached_units_sold_count ||= product.store_products.detect { |sp| sp.store_id == store.id }&.units_sold_count || 0
-      end
-
       def variant_option_value_ids
         variant_option_values_data.map(&:prefixed_id).uniq
       end

data/app/services/spree/cart/create.rb

@@ -11,6 +11,7 @@ module Spree
 
         default_params = {
           user: user,
+          market: Spree::Current.market,
           currency: currency || store.default_currency,
           token: Spree::GenerateToken.new.call(Spree::Order),
           public_metadata: public_metadata.to_h,

data/app/services/spree/carts/create.rb

@@ -11,6 +11,7 @@ module Spree
 
         cart = store.carts.create!(
           user: @params.delete(:user),
+          market: @params.delete(:market) || Spree::Current.market,
           currency: @params.delete(:currency) || store.default_currency,
           locale: @params.delete(:locale) || Spree::Current.locale
         )

data/app/services/spree/carts/update.rb

@@ -9,6 +9,7 @@ module Spree
 
         ApplicationRecord.transaction do
           assign_cart_attributes
+          clear_shipping_address_if_outside_market
           assign_address(:shipping_address)
           assign_address(:billing_address)
 
@@ -35,6 +36,8 @@ module Spree
       def assign_cart_attributes
         cart.email = params[:email] if params[:email].present?
         cart.customer_note = params[:customer_note] if params.key?(:customer_note)
+
+        assign_market if params[:market_id].present?
         cart.currency = params[:currency].upcase if params[:currency].present?
         cart.locale = params[:locale] if params[:locale].present?
         cart.metadata = cart.metadata.merge(params[:metadata].to_h) if params[:metadata].present?
@@ -83,6 +86,24 @@ module Spree
         decoded ? cart.user.addresses.find_by(id: decoded)&.id : nil
       end
 
+      def assign_market
+        market = cart.store.markets.find_by_prefix_id!(params[:market_id])
+        cart.market = market
+        cart.skip_market_resolution = true
+      end
+
+      # When the market changes, clear the shipping address if its country
+      # is not part of the new market. The market dictates which countries
+      # are available for checkout.
+      def clear_shipping_address_if_outside_market
+        return unless cart.market_id_changed? && cart.ship_address&.country
+
+        unless cart.market.country_ids.include?(cart.ship_address.country_id)
+          cart.ship_address = nil
+          revert_to_address_state if cart.has_checkout_step?('address')
+        end
+      end
+
       def revert_to_address_state
         return if ['cart', 'address'].include?(cart.state)
 

data/app/services/spree/imports/row_processors/product_translation.rb

@@ -0,0 +1,45 @@
+module Spree
+  module Imports
+    module RowProcessors
+      class ProductTranslation < Base
+        TRANSLATABLE_FIELDS = %w[name description meta_title meta_description].freeze
+
+        def initialize(row)
+          super
+          @store = row.store
+        end
+
+        attr_reader :store
+
+        def process!
+          locale = attributes['locale'].to_s.strip
+          raise ArgumentError, 'Locale is required' if locale.blank?
+
+          slug = attributes['slug'].to_s.strip
+          raise ArgumentError, 'Slug is required' if slug.blank?
+
+          product = product_scope.find_by!(slug: slug)
+
+          translation_attrs = TRANSLATABLE_FIELDS.each_with_object({}) do |field, hash|
+            value = attributes[field]
+            hash[field.to_sym] = value.to_s.strip if value.present?
+          end
+
+          return product if translation_attrs.empty?
+
+          Mobility.with_locale(locale) do
+            product.update!(translation_attrs)
+          end
+
+          product
+        end
+
+        private
+
+        def product_scope
+          Spree::Product.accessible_by(import.current_ability, :manage)
+        end
+      end
+    end
+  end
+end

data/app/services/spree/imports/row_processors/product_variant.rb

@@ -32,7 +32,7 @@ module Spree
           variant.width = attributes['width'] if attributes['width'].present?
           variant.depth = attributes['depth'] if attributes['depth'].present?
           variant.track_inventory = attributes['track_inventory'] if attributes['track_inventory'].present?
-          variant.option_value_variants = prepare_option_value_variants
+          variant.option_value_variants = prepare_option_value_variants if options.any?
 
           if attributes['tax_category'].present?
             tax_category = prepare_tax_category
@@ -68,7 +68,7 @@ module Spree
 
             product = assign_attributes_to_product(product)
             product.save!
-            handle_metafields(product)
+            handle_metafields(product) if has_product_attributes?
             product
           else
             # For non-master variants, only look up the product
@@ -105,7 +105,11 @@ module Spree
               shipping_category = prepare_shipping_category
               product.shipping_category = shipping_category if shipping_category.present?
             end
-            product.taxons = prepare_taxons
+
+            taxons = prepare_taxons
+            # Full product rows (with name/status/description) clear taxons when categories are blank.
+            # Price-only rows (no product attributes) never touch taxons.
+            product.taxons = taxons if taxons.any? || has_product_attributes?
           end
 
           product
@@ -197,6 +201,10 @@ module Spree
           end
         end
 
+        def has_product_attributes?
+          %w[name status description category1 category2 category3].any? { |key| attributes[key].present? }
+        end
+
         def handle_metafields(product)
           return unless product.class.included_modules.include?(Spree::Metafields)
 

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -33,8 +33,11 @@ module Spree
             existing_variant = variant_params[:id].presence && @product.variants.find_by(id: variant_params[:id])
             variants_to_remove.delete(variant_params[:id]) if variant_params[:id].present?
 
+            variant_params.delete(:price) # remove legacy price param
+
             if can_update_prices?
-              # If the variant price is nil then mark it for destruction
+              backfill_price_ids!(variant_params, existing_variant)
+
               variant_params[:prices_attributes]&.each do |price_key, price_params|
                 variant_params[:prices_attributes][price_key]['_destroy'] = '1' if price_params[:amount].blank?
               end
@@ -95,6 +98,20 @@ module Spree
 
       delegate :can?, :cannot?, to: :ability
 
+      # Backfill IDs for prices_attributes entries that reference existing prices
+      # so that ActiveRecord updates them instead of inserting duplicates
+      def backfill_price_ids!(variant_params, existing_variant)
+        return unless existing_variant && variant_params[:prices_attributes]
+
+        variant_params[:prices_attributes].each do |_key, price_params|
+          next if price_params[:id].present?
+          next if price_params[:currency].blank?
+
+          existing_price = existing_variant.prices.base_prices.find_by(currency: price_params[:currency])
+          price_params[:id] = existing_price.id if existing_price
+        end
+      end
+
       def product_option_types_params
         @product_option_types_params ||= {}
       end

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

@@ -6,29 +6,38 @@ module Spree
       def call
         Spree::Events.disable do
           without_geocoding do
-            ensure_seeds_loaded
+            ActiveRecord::Base.no_touching do
+              ensure_seeds_loaded
 
-            puts 'Loading sample configuration data...'
-            load_configuration_data
+              puts 'Loading sample configuration data...'
+              load_configuration_data
 
-            puts 'Loading sample metafield definitions...'
-            load_ruby_file('metafield_definitions')
+              puts 'Loading sample markets...'
+              load_ruby_file('markets')
 
-            puts 'Loading sample products...'
-            load_products
+              puts 'Loading sample metafield definitions...'
+              load_ruby_file('metafield_definitions')
 
-            puts 'Loading sample customers...'
-            load_customers
+              puts 'Loading sample options...'
+              load_ruby_file('options')
 
-            puts 'Loading sample orders...'
-            load_ruby_file('orders')
+              puts 'Loading sample products...'
+              load_products
 
-            puts 'Loading sample posts...'
-            load_ruby_file('posts')
+              puts 'Loading sample product translations...'
+              load_product_translations
 
-            clear_jobs_queue
+              puts 'Loading sample customers...'
+              load_customers
 
-            puts 'Sample data loaded successfully!'
+              puts 'Loading sample orders...'
+              load_ruby_file('orders')
+
+              puts 'Loading sample posts...'
+              load_ruby_file('posts')
+
+              puts 'Sample data loaded successfully!'
+            end
           end
         end
       end
@@ -58,6 +67,13 @@ module Spree
         Spree::SampleData::ImportRunner.call(csv_path: csv_path, import_class: Spree::Imports::Products)
       end
 
+      def load_product_translations
+        csv_path = sample_data_path.join('product_translations.csv')
+        return unless csv_path.exist?
+
+        Spree::SampleData::ImportRunner.call(csv_path: csv_path, import_class: Spree::Imports::ProductTranslations)
+      end
+
       def load_customers
         csv_path = sample_data_path.join('customers.csv')
         Spree::SampleData::ImportRunner.call(csv_path: csv_path, import_class: Spree::Imports::Customers)
@@ -75,11 +91,6 @@ module Spree
       ensure
         Spree::Config[:geocode_addresses] = previous
       end
-
-      def clear_jobs_queue
-        adapter = ActiveJob::Base.queue_adapter
-        adapter.enqueued_jobs.clear if adapter.respond_to?(:enqueued_jobs)
-      end
     end
   end
 end

data/app/services/spree/seeds/all.rb

@@ -5,30 +5,32 @@ module Spree
 
       def call
         Spree::Events.disable do
-          # GEO
-          Countries.call
-          States.call
-          Zones.call
+          ActiveRecord::Base.no_touching do
+            # GEO
+            Countries.call
+            States.call
+            Zones.call
 
-          # user roles
-          Roles.call
+            # user roles
+            Roles.call
 
-          # additional data
-          ReturnsEnvironment.call
-          ShippingCategories.call
-          StoreCreditCategories.call
-          TaxCategories.call
-          DigitalDelivery.call
+            # additional data
+            ReturnsEnvironment.call
+            ShippingCategories.call
+            StoreCreditCategories.call
+            TaxCategories.call
+            DigitalDelivery.call
 
-          # store & stock location
-          Stores.call
-          StockLocations.call
-          AdminUser.call
+            # store & stock location
+            Stores.call
+            StockLocations.call
+            AdminUser.call
 
-          # add store resources
-          PaymentMethods.call
-          ApiKeys.call
-          AllowedOrigins.call
+            # add store resources
+            PaymentMethods.call
+            ApiKeys.call
+            AllowedOrigins.call
+          end
         end
       end
     end

data/app/views/spree/shared/_mailer_line_item.html.erb

@@ -1,9 +1,9 @@
 <tr>
   <td class="six sub-columns">
     <strong>
-      <%= link_to raw(line_item.variant.product.name), spree_storefront_resource_url(line_item.variant.product) %>
+      <%= link_to line_item.variant.product.name, spree_storefront_resource_url(line_item.variant.product) %>
     </strong>
-    <%= raw(line_item.variant.options_text) -%>
+    <%= line_item.variant.options_text -%>
     (<%= line_item.variant.sku %>)
   </td>
   <td class="six sub-columns last right">

data/config/locales/en.yml

@@ -73,8 +73,12 @@ en:
         namespace: Namespace
       spree/option_type:
         filterable: Filterable
+        kind: Kind
         name: Name
         presentation: Presentation
+      spree/option_value:
+        color_code: Color Code
+        image: Swatch Image
       spree/order:
         checkout_complete: Checkout Complete
         completed_at: Completed At
@@ -775,6 +779,7 @@ en:
     approver: Approver
     are_you_sure: Are you sure?
     are_you_sure_delete: Are you sure you want to delete this record?
+    assets: Media
     associated_adjustment_closed: The associated adjustment is closed, and will not be recalculated. Do you want to open it?
     at_symbol: "@"
     attachments: Attachments
@@ -897,6 +902,7 @@ en:
     close_sidebar: Close sidebar
     closed: Closed
     code: Code
+    color_code: Color Code
     colors: Colors
     company: Company
     compare_at_amount: Compare at amount
@@ -1573,6 +1579,11 @@ en:
     option_name: Option name
     option_type: Option Type
     option_type_filterable_info: When an option type is set to Filterable, your storefront visitors are presented with the option to filter a taxon of products based on the option type. A typical example of this would be to filter clothing by size and color.<br><br><b>Please Note:</b> Filters will only be visible in the storefront taxons that contain products with this option type set.
+    option_type_kind_info: Controls how the option is displayed on the storefront. Color swatches show color circles, buttons show clickable chips, and dropdown shows a select menu.
+    option_type_kinds:
+      buttons: Buttons
+      color_swatch: Color Swatch
+      dropdown: Dropdown
     option_type_placeholder: Choose an option type
     option_types: Option Types
     option_value: Option Value
@@ -1826,6 +1837,7 @@ en:
         group: From product group
         manual: Manually choose
     product_sold_out: This item is sold out
+    product_translations: Product Translations
     products: Products
     products_added: Products added
     products_cannot_be_shipped: We cannot ship %{product_names} to your current location at the moment. Please change your shipping address or remove %{product_names} from your cart.

data/db/migrate/20250217171018_create_action_text_video_embeds.rb

@@ -0,0 +1,11 @@
+class CreateActionTextVideoEmbeds < ActiveRecord::Migration[6.1]
+  def change
+    create_table :action_text_video_embeds, if_not_exists: true do |t|
+      t.string :url, null: false
+      t.string :thumbnail_url, null: false
+      t.text :raw_html, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20260402000001_add_kind_to_spree_option_types.rb

@@ -0,0 +1,13 @@
+class AddKindToSpreeOptionTypes < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_option_types, :kind, :string, null: false, default: 'dropdown'
+    add_index :spree_option_types, :kind
+
+    # Backfill: option types named 'color'/'colour' get kind 'color_swatch'
+    reversible do |dir|
+      dir.up do
+        execute "UPDATE spree_option_types SET kind = 'color_swatch' WHERE name IN ('color', 'colour')"
+      end
+    end
+  end
+end

data/db/migrate/20260402000002_add_color_code_to_spree_option_values.rb

@@ -0,0 +1,5 @@
+class AddColorCodeToSpreeOptionValues < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_option_values, :color_code, :string
+  end
+end

data/db/migrate/20260403000000_add_market_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddMarketToSpreeOrders < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_orders, :market, foreign_key: false, index: true
+  end
+end

data/db/sample_data/markets.rb

@@ -0,0 +1,30 @@
+store = Spree::Store.default
+
+us = Spree::Country.find_by(iso: 'US')
+ca = Spree::Country.find_by(iso: 'CA')
+
+if us
+  # Store auto-creates a default market on creation — update it rather than creating a new one
+  us_market = store.markets.default.first || store.markets.order(:position).first || store.markets.new
+  us_market.name = 'US'
+  us_market.currency = 'USD'
+  us_market.default_locale = 'en'
+  us_market.default = true
+  us_market.countries = [us, ca].compact
+  us_market.save!
+end
+
+eu_zone = Spree::Zone.find_by(name: 'EU_VAT')
+
+if eu_zone
+  eu_countries = eu_zone.zone_members.where(zoneable_type: 'Spree::Country').map(&:zoneable)
+
+  if eu_countries.any?
+    eu_market = store.markets.find_or_initialize_by(name: 'Europe')
+    eu_market.currency = 'EUR'
+    eu_market.default_locale = 'de'
+    eu_market.supported_locales = 'de,fr,es,it'
+    eu_market.countries = eu_countries
+    eu_market.save!
+  end
+end

data/db/sample_data/metafield_definitions.rb

@@ -1,6 +1,6 @@
-%w[manufacturer material fit].each do |key|
+%w[warranty capacity voltage wattage runtime room_coverage noise_level connectivity].each do |key|
   Spree::MetafieldDefinition.find_or_create_by!(
-    namespace: 'properties',
+    namespace: 'custom',
     key: key,
     resource_type: 'Spree::Product'
   )

data/db/sample_data/options.rb

@@ -0,0 +1,4 @@
+color = Spree::OptionType.find_or_initialize_by(name: 'color')
+color.presentation = 'Color'
+color.kind = 'color_swatch'
+color.save!