spree_core 5.4.0.rc5 → 5.4.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5513fa58ed4667fb34788917d1fa52e803267a9a9e43a2c76d6fa318d40645b
-  data.tar.gz: 02b5467d26e71c5f111ffdd0677aa7e6b2732a5ff42ef75a25e7a782a7090737
+  metadata.gz: 10b8425a8850b155fa6d2a2d6d452e016fd142d62849ce757e00b4b2db1efcdc
+  data.tar.gz: 38b6187ef6b92566261d617d65e3eb59d2e760eca6d3519390189a40858a62c3
 SHA512:
-  metadata.gz: e83cdd25848537e36b5f96b113697818cacec896a58b663415d28295d2e368c1b81dbe076baa86d7858ea8357ad1fd9b1754212c5b4d13a8a54e77c0d360ee29
-  data.tar.gz: 6c6cf8922e2b2c242572723b176608b12a675e64f4982647aca28a0ce85269d23889ba44d5db7ad539a04f1765fde2afbb7c552b28a7e3e7163d263559b79bc6
+  metadata.gz: 76058003b7c03e556c6f7d035fa6b1283688927ad6102cacd955932440e81054a8ace08032fc593545b897bdc321ca5d6ae2e720170468c9e64adee5b7083a53
+  data.tar.gz: 1783fc54faf9da589237ac09af8f665a2d145382eb6246911eecdfc2abdb26fce3d780e47f180fa6644a534164236232b4b30e3d8392c4fb869843405dfd2eaa

data/app/mailers/spree/base_mailer.rb

@@ -1,5 +1,7 @@
 module Spree
   class BaseMailer < ActionMailer::Base
+    helper Spree::ImagesHelper
+
     def current_store
       @current_store ||= @order&.store.presence || Spree::Store.current || Spree::Store.default
     end

data/app/models/concerns/spree/stores/markets.rb

@@ -104,12 +104,14 @@ module Spree
                                     end
       end
 
-      private
-
+      # Returns true if the store has markets, false otherwise
+      # @return [Boolean]
       def has_markets?
         @has_markets ||= persisted? && (markets.loaded? ? markets.any? : markets.exists?)
       end
 
+      private
+
       def legacy_supported_currencies_list
         ([default_currency] + read_attribute(:supported_currencies).to_s.split(',')).uniq.map(&:to_s).map do |code|
           ::Money::Currency.find(code.strip)

data/app/models/spree/market.rb

@@ -13,6 +13,7 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store', touch: true
     has_many :market_countries, class_name: 'Spree::MarketCountry', dependent: :destroy
     has_many :countries, through: :market_countries, class_name: 'Spree::Country'
+    has_many :orders, class_name: 'Spree::Order', dependent: :nullify
 
     #
     # Validations

data/app/models/spree/option_type.rb

@@ -3,6 +3,7 @@ module Spree
     has_prefix_id :opt  # Spree-specific: option type
 
     COLOR_NAMES = %w[color colour].freeze
+    KINDS = %w[dropdown color_swatch buttons].freeze
 
     include Spree::ParameterizableName
     include Spree::UniqueName
@@ -40,12 +41,14 @@ module Spree
     # Validations
     #
     validates :presentation, presence: true
+    validates :kind, presence: true, inclusion: { in: KINDS }
 
     #
     # Scopes
     #
     default_scope { order(:position) }
     scope :colors, -> { where(name: COLOR_NAMES) }
+    scope :color_swatches, -> { where(kind: 'color_swatch') }
     scope :filterable, -> { where(filterable: true) }
 
     #
@@ -72,8 +75,15 @@ module Spree
       colors.first
     end
 
+    def color_swatch?
+      kind == 'color_swatch'
+    end
+
     def color?
-      name.in?(COLOR_NAMES)
+      Spree::Deprecation.warn(
+        'Spree::OptionType#color? is deprecated. Use #color_swatch? instead. Will be removed in Spree 6.0.'
+      )
+      color_swatch?
     end
 
     private

data/app/models/spree/option_value.rb

@@ -20,6 +20,11 @@ module Spree
     acts_as_list scope: :option_type
     self.whitelisted_ransackable_attributes = ['presentation']
 
+    #
+    # Attachments
+    #
+    has_one_attached :image
+
     #
     # Associations
     #
@@ -39,6 +44,9 @@ module Spree
       validates :presentation
     end
 
+    validates :color_code, format: { with: /\A#[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?\z/, message: 'must be a valid hex color (e.g. #FF0000)' },
+                           allow_blank: true
+
     #
     # Scopes
     #

data/app/models/spree/order.rb

@@ -140,6 +140,7 @@ module Spree
     alias_attribute :shipping_address_id, :ship_address_id
 
     belongs_to :store, class_name: 'Spree::Store'
+    belongs_to :market, class_name: 'Spree::Market', optional: true
 
     with_options dependent: :destroy do
       has_many :state_changes, as: :stateful, class_name: 'Spree::StateChange'
@@ -181,6 +182,8 @@ module Spree
     alias_attribute :fulfillment_status, :shipment_state
     alias_attribute :payment_status, :payment_state
 
+    delegate :has_markets?, to: :store, prefix: true
+
     accepts_nested_attributes_for :line_items
     accepts_nested_attributes_for :bill_address
     accepts_nested_attributes_for :ship_address
@@ -191,12 +194,14 @@ module Spree
 
     # Needs to happen before save_permalink is called
     before_validation :ensure_store_presence
+    before_validation :ensure_market_presence
     before_validation :ensure_currency_presence
     before_validation :ensure_locale_presence
+    before_validation :resolve_market_from_currency, if: -> { persisted? && currency_changed? && !skip_market_resolution }
 
     before_validation :clone_billing_address, if: :use_billing?
     before_validation :clone_shipping_address, if: :use_shipping?
-    attr_accessor :use_billing, :use_shipping
+    attr_accessor :use_billing, :use_shipping, :skip_market_resolution
 
     before_create :link_by_email
     before_update :ensure_updated_shipments, :homogenize_line_item_currencies, if: :currency_changed?
@@ -220,6 +225,7 @@ module Spree
     validates :shipment_total,       MONEY_VALIDATION
     validates :promo_total,          NEGATIVE_MONEY_VALIDATION
     validates :total,                MONEY_VALIDATION
+    validates :market, presence: true, if: :store_has_markets?
     validate :currency_must_be_supported_by_store
     validate :locale_must_be_supported_by_store
 
@@ -450,6 +456,10 @@ module Spree
       self.store ||= Spree::Store.default
     end
 
+    def ensure_market_presence
+      self.market ||= Spree::Current.market || store&.default_market
+    end
+
     def allow_cancel?
       return false if !completed? || canceled?
 
@@ -1050,6 +1060,16 @@ module Spree
       end
     end
 
+    # When currency changes, auto-resolve the matching market.
+    # Only applies when the store has markets configured.
+    def resolve_market_from_currency
+      return unless store_has_markets?
+      return if market&.currency == currency
+
+      resolved = store.markets.find_by(currency: currency)
+      self.market = resolved if resolved
+    end
+
     def collect_payment_methods
       Spree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 5.5. Use `collect_frontend_payment_methods` instead.')
 

data/app/models/spree/search_provider/meilisearch.rb

@@ -103,9 +103,10 @@ module Spree
         product_prefixed_ids = ms_result['hits'].map { |h| h['product_id'] }.uniq
         raw_ids = product_prefixed_ids.filter_map { |pid| Spree::Product.decode_prefixed_id(pid) }
 
-        # Intersect with AR scope for security/visibility.
+        # Intersect with AR scope for security/visibility, preserving Meilisearch sort order.
         products = if raw_ids.any?
-                     scope.where(id: raw_ids).reorder(nil)
+                     records = scope.where(id: raw_ids).reorder(nil).index_by(&:id)
+                     raw_ids.filter_map { |id| records[id] }
                    else
                      scope.none
                    end
@@ -123,8 +124,9 @@ module Spree
       end
 
       def index(product)
+        ensure_index_settings_once!
         documents = presenter_class.new(product, store).call
-        client.index(index_name).add_documents(documents, 'prefixed_id')
+        client.index(index_name).add_documents(documents, 'id')
       end
 
       def remove(product)
@@ -132,7 +134,9 @@ module Spree
       end
 
       def index_batch(documents)
-        client.index(index_name).add_documents(documents, 'prefixed_id')
+        return if documents.empty?
+
+        client.index(index_name).add_documents(documents, 'id')
       end
 
       # Remove all documents for a product by its prefixed_id (e.g. 'prod_abc')
@@ -147,21 +151,44 @@ module Spree
         scope ||= store.products
         ensure_index_settings!
 
+        indexed = 0
         scope.reorder(id: :asc)
              .preload_associations_lazily
              .find_in_batches(batch_size: 500) do |batch|
           documents = batch.flat_map { |product| presenter_class.new(product, store).call }
+          next if documents.empty?
+
           index_batch(documents)
+          indexed += documents.size
+
+          Rails.logger.info { "[Meilisearch] Enqueued #{documents.size} documents (#{indexed} total) for #{index_name}" }
         end
+
+        Rails.logger.info { "[Meilisearch] Reindex complete: #{indexed} documents enqueued for #{index_name}" }
+        indexed
       end
 
       # Configure index settings for filtering, sorting, and faceting.
       # Called automatically by reindex, but can be called separately.
+      # Waits for all settings tasks to complete before returning so that
+      # subsequent add_documents calls use the correct filterable/sortable attributes.
       def ensure_index_settings!
         index = client.index(index_name)
-        index.update_filterable_attributes(filterable_attributes)
-        index.update_sortable_attributes(sortable_attributes)
-        index.update_searchable_attributes(searchable_attributes)
+        tasks = []
+        tasks << index.update_filterable_attributes(filterable_attributes)
+        tasks << index.update_sortable_attributes(sortable_attributes)
+        tasks << index.update_searchable_attributes(searchable_attributes)
+        tasks.each { |task| task&.await }
+        @index_settings_configured = true
+      end
+
+      # Lightweight guard — configures index settings once per provider instance.
+      # Meilisearch settings updates are idempotent, so repeated calls are safe
+      # but we avoid the overhead by memoizing.
+      def ensure_index_settings_once!
+        return if @index_settings_configured
+
+        ensure_index_settings!
       end
 
       private
@@ -359,7 +386,12 @@ module Spree
 
           ot = ov.option_type
           by_option_type[ot] ||= []
-          by_option_type[ot] << { id: ov.prefixed_id, name: ov.name, label: ov.label, position: ov.position, count: count }
+          by_option_type[ot] << {
+            id: ov.prefixed_id, name: ov.name, label: ov.label, position: ov.position,
+            color_code: ov.color_code,
+            image_url: ov.image.attached? ? Rails.application.routes.url_helpers.cdn_image_url(ov.image) : nil,
+            count: count
+          }
         end
 
         by_option_type.map do |option_type, values|
@@ -368,6 +400,7 @@ module Spree
             type: 'option',
             name: option_type.name,
             label: option_type.label,
+            kind: option_type.kind,
             options: values.sort_by { |o| o[:position] }
           }
         end

data/app/models/spree/stock_location.rb

@@ -27,7 +27,7 @@ module Spree
     after_save :ensure_one_default
     after_update :conditional_touch_records
 
-    delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
+    delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true, allow_nil: true
 
     def state_text
       state.try(:abbr) || state.try(:name) || state_name

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/sample_data/loader.rb

@@ -6,29 +6,32 @@ 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 metafield definitions...'
+              load_ruby_file('metafield_definitions')
 
-            puts 'Loading sample products...'
-            load_products
+              puts 'Loading sample options...'
+              load_ruby_file('options')
 
-            puts 'Loading sample customers...'
-            load_customers
+              puts 'Loading sample products...'
+              load_products
 
-            puts 'Loading sample orders...'
-            load_ruby_file('orders')
+              puts 'Loading sample customers...'
+              load_customers
 
-            puts 'Loading sample posts...'
-            load_ruby_file('posts')
+              puts 'Loading sample orders...'
+              load_ruby_file('orders')
 
-            clear_jobs_queue
+              puts 'Loading sample posts...'
+              load_ruby_file('posts')
 
-            puts 'Sample data loaded successfully!'
+              puts 'Sample data loaded successfully!'
+            end
           end
         end
       end
@@ -75,11 +78,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/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

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/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!

data/db/sample_data/orders.rb

@@ -1,8 +1,8 @@
 store = Spree::Store.default
 
 # Find products created by the product import
-product_1 = Spree::Product.find_by(name: 'Denim Shirt')
-product_2 = Spree::Product.find_by(name: 'Checked Shirt')
+product_1 = Spree::Product.find_by(name: 'Automatic Espresso Machine')
+product_2 = Spree::Product.find_by(name: 'Drip Coffee Maker 1.5L')
 
 unless product_1 && product_2
   puts '  Skipping orders: required products not found'