spree_core 5.4.0.beta10 → 5.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73ed6afd1feda3d20e24a8910273785420d08dfadebf8af34aa90c20b017a0b8
-  data.tar.gz: 323a92ea512ad2d37bac8be8b8f878f60dbbc4058ed020875c5740ef02a7481b
+  metadata.gz: 5de0595dccb2046acb60805390c641e66c9e87c070c25df2587d5a8eaf9bc358
+  data.tar.gz: 6cd99e1b81481dd826565d1f579ea64965dfa04a808905f830505110f330473d
 SHA512:
-  metadata.gz: 711d0f622de8f398bd3f0e8696c5e12e476d3671a6330781fd5a34a0ecb15cc32f17fcf9d8e1e3028584108a354465ba7721ca990e723077c89dddb9c428fcbb
-  data.tar.gz: 3634efec05dc63e7c44a27bcfe0265331224592ee8d88bc1b417446967af051ccd450723344bc287977de3793b95d17ca0fef1235e905aa25e7a787f65325a81
+  metadata.gz: 1d27ab08a797c2f5419f36bd3ad368f1cecaf6610d1ca9289e9b5dea81f62a4856b8b767b23129b1dd20e0e0fd0c02f619581e58b7b347642cc801a2808de453
+  data.tar.gz: d551a808c3d989cf88e02c18b00bd9582b7672459b59e9c0ea281b6797cf5b0b95b698e32f98adc7a180723ab98e84aae99bc163ac5ee7de7a3d6745abc97e80

data/app/assets/images/payment_icons/banktransfer.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
-</svg>
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="pi-banktransfer"><title id="pi-banktransfer">Bank Transfer</title><g clip-path="url(#pi-banktransfer-clip)"><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M10 7l-4 2v1h8V9L10 7zM7 10.75v3.5h1v-3.5H7zm2 0v3.5h1v-3.5H9zm2 0v3.5h1.5v-3.5H11zM6 15v1h8v-1H6zM28 7l-4 2v1h8V9l-4-2zm-3 3.75v3.5h1v-3.5h-1zm2 0v3.5h1v-3.5h-1zm2 0v3.5h1.5v-3.5H29zM24 15v1h8v-1h-8z" fill="#4A4A4A"/><path d="M15.5 10h7M15.5 10l1.5-1.25M15.5 10l1.5 1.25" stroke="#4A4A4A" stroke-width=".9" stroke-linecap="round" stroke-linejoin="round"/><path d="M22.5 14h-7M22.5 14l-1.5-1.25M22.5 14l-1.5 1.25" stroke="#4A4A4A" stroke-width=".9" stroke-linecap="round" stroke-linejoin="round"/></g><defs><clipPath id="pi-banktransfer-clip"><path fill="#fff" d="M0 0h38v24H0z"/></clipPath></defs></svg>

data/app/models/concerns/spree/search_indexable.rb

@@ -29,7 +29,7 @@ module Spree
     #   => { id: 1, name: "Shirt", price_USD: 19.99, ... }
     def search_presentation(store = nil)
       store ||= Spree::Current.store
-      Spree::SearchProvider::ProductPresenter.new(self, store).call
+      Spree::Dependencies.search_product_presenter_class.new(self, store).call
     end
 
     # Remove this record from search index synchronously (inline, no job).

data/app/models/spree/address.rb

@@ -106,12 +106,26 @@ module Spree
     end
 
     def user_default_billing?
-      user.present? && id == user.bill_address_id
+      Spree::Deprecation.warn('Spree::Address#user_default_billing? is deprecated and will be removed in Spree 6.0. Use #is_default_billing? instead.')
+      is_default_billing?
     end
 
     def user_default_shipping?
+      Spree::Deprecation.warn('Spree::Address#user_default_shipping? is deprecated and will be removed in Spree 6.0. Use #is_default_shipping? instead.')
+      is_default_shipping?
+    end
+
+    # In 6.0 these become real columns on Address, replacing User#bill_address_id / ship_address_id.
+    # For now they delegate to the User FK so the API shape is stable.
+    def is_default_billing?
+      user.present? && id == user.bill_address_id
+    end
+    alias_method :is_default_billing, :is_default_billing?
+
+    def is_default_shipping?
       user.present? && id == user.ship_address_id
     end
+    alias_method :is_default_shipping, :is_default_shipping?
 
     # first_name / last_name aliases are defined via alias_attribute above
 

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

@@ -46,7 +46,6 @@ module Spree
       private
 
       def build_pagy(count, page, limit)
-        require 'pagy'
         Pagy::Offset.new(count: count, page: page, limit: limit)
       end
 

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

@@ -1,3 +1,5 @@
+require 'pagy/toolbox/paginators/meilisearch'
+
 module Spree
   module SearchProvider
     class Meilisearch < Base
@@ -29,7 +31,13 @@ module Spree
 
         Rails.logger.debug { "[Meilisearch] index=#{index_name} query=#{query.inspect} #{search_params.compact.inspect}" }
 
-        ms_result = client.index(index_name).search(query.to_s, search_params)
+        begin
+          ms_result = client.index(index_name).search(query.to_s, search_params)
+        rescue ::Meilisearch::ApiError => e
+          Rails.logger.warn { "[Meilisearch] Search failed: #{e.message}. Run `rake spree:search:reindex` to initialize the index." }
+          Rails.error.report(e, handled: true, context: { index: index_name, query: query })
+          return empty_result(scope, page, limit)
+        end
 
         Rails.logger.debug { "[Meilisearch] #{ms_result['estimatedTotalHits']} hits in #{ms_result['processingTimeMs']}ms" }
 
@@ -60,7 +68,7 @@ module Spree
       end
 
       def index(product)
-        documents = ProductPresenter.new(product, store).call
+        documents = presenter_class.new(product, store).call
         client.index(index_name).add_documents(documents, 'prefixed_id')
       end
 
@@ -85,9 +93,9 @@ module Spree
         ensure_index_settings!
 
         scope.reorder(id: :asc)
-             .preload(*ProductPresenter::REQUIRED_PRELOADS)
+             .preload_associations_lazily
              .find_in_batches(batch_size: 500) do |batch|
-          documents = batch.flat_map { |product| ProductPresenter.new(product, store).call }
+          documents = batch.flat_map { |product| presenter_class.new(product, store).call }
           index_batch(documents)
         end
       end
@@ -103,6 +111,10 @@ module Spree
 
       private
 
+      def presenter_class
+        Spree::Dependencies.search_product_presenter_class
+      end
+
       def client
         @client ||= ::Meilisearch::Client.new(
           ENV.fetch('MEILISEARCH_URL', 'http://localhost:7700'),
@@ -134,153 +146,165 @@ module Spree
         %w[price -price name -name -available_on available_on best_selling]
       end
 
-      # Convert Ransack-style filters to Meilisearch filter syntax.
-      # Always applies store scoping, active status, and currency availability
-      # so that Meilisearch results match what the AR scope would return.
-      # All values are sanitized to prevent filter injection.
+      # Build Meilisearch filter conditions from API params.
+      # Combines system scoping (always applied) with user-facing filters.
       def build_filters(filters)
-        conditions = []
+        conditions = system_filter_conditions
+        conditions.concat(user_filter_conditions(filters))
+        conditions
+      end
 
-        # Always scope to current store, locale, currency, active, not discontinued.
-        # This mirrors the AR scope: store.products.active(currency) with locale
+      # System scoping — always applied. Rarely overridden.
+      # Mirrors the AR scope: store.products.active(currency) with locale.
+      def system_filter_conditions
+        conditions = []
         conditions << "store_ids = '#{store.id}'"
         conditions << "status = 'active'"
         conditions << "locale = '#{locale.to_s.gsub(/[^a-zA-Z_-]/, '')}'"
         conditions << "currency = '#{currency.to_s.gsub(/[^A-Z]/, '')}'"
         conditions << "(discontinue_on = 0 OR discontinue_on > #{Time.current.to_i})"
+        conditions
+      end
 
+      # User-facing filters — override to add custom filter pre/post processing.
+      def user_filter_conditions(filters)
+        conditions = []
         filters = filters.to_unsafe_h if filters.respond_to?(:to_unsafe_h)
         return conditions if filters.blank?
 
         filters.each do |key, value|
           next if value.blank?
 
-          key = key.to_s
-          case key
-          when 'price_gte'
-            conditions << "price >= #{value.to_f}"
-          when 'price_lte'
-            conditions << "price <= #{value.to_f}"
-          when 'in_stock'
-            conditions << 'in_stock = true' if value.to_s != '0'
-          when 'out_of_stock'
-            conditions << 'in_stock = false' if value.to_s != '0'
-          when 'categories_id_eq'
-            conditions << "category_ids = '#{sanitize_prefixed_id(value)}'" if valid_prefixed_id?(value)
-          when 'with_option_value_ids'
-            Array(value).each do |ov|
-              conditions << "option_value_ids = '#{sanitize_prefixed_id(ov)}'" if valid_prefixed_id?(ov)
-            end
+          condition = build_filter_condition(key.to_s, value)
+          if condition.is_a?(Array)
+            conditions.concat(condition)
+          elsif condition
+            conditions << condition
           end
         end
 
         conditions
       end
 
+      # Translate a single Ransack-style filter param into Meilisearch filter syntax.
+      # Override in subclasses to handle custom filter keys — call super for built-in filters.
+      def build_filter_condition(key, value)
+        case key
+        when 'price_gte'
+          "price >= #{value.to_f}"
+        when 'price_lte'
+          "price <= #{value.to_f}"
+        when 'in_stock'
+          'in_stock = true' if value.to_s != '0'
+        when 'out_of_stock'
+          'in_stock = false' if value.to_s != '0'
+        when 'categories_id_eq'
+          "category_ids = '#{sanitize_prefixed_id(value)}'" if valid_prefixed_id?(value)
+        when 'with_option_value_ids'
+          Array(value).filter_map { |ov| "option_value_ids = '#{sanitize_prefixed_id(ov)}'" if valid_prefixed_id?(ov) }
+        end
+      end
+
+      # Sort param to Meilisearch sort syntax.
+      # Override in subclasses to handle custom sort keys — call super for built-in sorts.
       def build_sort(sort)
         return nil if sort.blank?
 
+        sort_mapping(sort)
+      end
+
+      # Map a sort param to Meilisearch sort syntax.
+      # Override in subclasses to add custom sorts — call super for built-in sorts.
+      def sort_mapping(sort)
         case sort
-        when 'price'
-          ['price:asc']
-        when '-price'
-          ['price:desc']
-        when 'name'
-          ['name:asc']
-        when '-name'
-          ['name:desc']
-        when '-available_on'
-          ['available_on:desc']
-        when 'available_on'
-          ['available_on:asc']
-        when 'best_selling'
-          ['units_sold_count:desc']
+        when 'price'         then ['price:asc']
+        when '-price'        then ['price:desc']
+        when 'name'          then ['name:asc']
+        when '-name'         then ['name:desc']
+        when '-available_on' then ['available_on:desc']
+        when 'available_on'  then ['available_on:asc']
+        when 'best_selling'  then ['units_sold_count:desc']
         end
       end
 
-      # Transform Meilisearch facetDistribution into our standard filter response format
+      # Transform Meilisearch facetDistribution into standard filter response format.
+      # Override in subclasses to add custom facets — call super and append.
       def build_facet_response(facet_distribution)
-        filters = []
-
-        # Price range
-        if facet_distribution['price'].present?
-          amounts = facet_distribution['price'].keys.map(&:to_f)
-          filters << {
-            id: 'price',
-            type: 'price_range',
-            min: amounts.min,
-            max: amounts.max,
-            currency: currency
-          }
-        end
+        facets = []
+        facets << build_price_facet(facet_distribution['price']) if facet_distribution['price'].present?
+        facets << build_availability_facet(facet_distribution['in_stock']) if facet_distribution['in_stock'].present?
+        facets.concat(build_option_facets(facet_distribution['option_value_ids'])) if facet_distribution['option_value_ids'].present?
+        facets << build_category_facet(facet_distribution['category_ids']) if facet_distribution['category_ids'].present?
+        facets.compact
+      end
 
-        # Availability
-        if facet_distribution['in_stock'].present?
-          in_stock = facet_distribution['in_stock']['true'] || 0
-          out_of_stock = facet_distribution['in_stock']['false'] || 0
-          filters << {
-            id: 'availability',
-            type: 'availability',
-            options: [
-              { id: 'in_stock', count: in_stock },
-              { id: 'out_of_stock', count: out_of_stock }
-            ]
-          }
-        end
+      def build_price_facet(distribution)
+        amounts = distribution.keys.map(&:to_f)
+        {
+          id: 'price',
+          type: 'price_range',
+          min: amounts.min,
+          max: amounts.max,
+          currency: currency
+        }
+      end
 
-        # Option values — group by option type for faceted display
-        if facet_distribution['option_value_ids'].present?
-          prefixed_ids = facet_distribution['option_value_ids'].keys
-          raw_ids = prefixed_ids.filter_map { |pid| Spree::OptionValue.decode_prefixed_id(pid) }
-          option_values = Spree::OptionValue.where(id: raw_ids).includes(:option_type).preload_associations_lazily.index_by(&:prefixed_id)
-
-          # Group by option type
-          by_option_type = {}
-          facet_distribution['option_value_ids'].each do |ov_prefixed_id, count|
-            ov = option_values[ov_prefixed_id]
-            next unless ov
-
-            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 }
-          end
+      def build_availability_facet(distribution)
+        {
+          id: 'availability',
+          type: 'availability',
+          options: [
+            { id: 'in_stock', count: distribution['true'] || 0 },
+            { id: 'out_of_stock', count: distribution['false'] || 0 }
+          ]
+        }
+      end
 
-          by_option_type.each do |option_type, values|
-            filters << {
-              id: option_type.prefixed_id,
-              type: 'option',
-              name: option_type.name,
-              label: option_type.label,
-              options: values.sort_by { |o| o[:position] }
-            }
-          end
+      def build_option_facets(distribution)
+        prefixed_ids = distribution.keys
+        raw_ids = prefixed_ids.filter_map { |pid| Spree::OptionValue.decode_prefixed_id(pid) }
+        option_values = Spree::OptionValue.where(id: raw_ids).includes(:option_type).preload_associations_lazily.index_by(&:prefixed_id)
+
+        # Group by option type
+        by_option_type = {}
+        distribution.each do |ov_prefixed_id, count|
+          ov = option_values[ov_prefixed_id]
+          next unless ov
+
+          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 }
         end
 
-        # Categories
-        if facet_distribution['category_ids'].present?
-          prefixed_ids = facet_distribution['category_ids'].keys
-          raw_ids = prefixed_ids.filter_map { |pid| Spree::Taxon.decode_prefixed_id(pid) }
-          categories = Spree::Taxon.where(id: raw_ids).index_by(&:prefixed_id)
-
-          filters << {
-            id: 'categories',
-            type: 'category',
-            options: facet_distribution['category_ids'].filter_map do |prefixed_id, count|
-              cat = categories[prefixed_id]
-              next unless cat
-
-              { id: cat.prefixed_id, name: cat.name, permalink: cat.permalink, count: count }
-            end
+        by_option_type.map do |option_type, values|
+          {
+            id: option_type.prefixed_id,
+            type: 'option',
+            name: option_type.name,
+            label: option_type.label,
+            options: values.sort_by { |o| o[:position] }
           }
         end
+      end
+
+      def build_category_facet(distribution)
+        prefixed_ids = distribution.keys
+        raw_ids = prefixed_ids.filter_map { |pid| Spree::Taxon.decode_prefixed_id(pid) }
+        categories = Spree::Taxon.where(id: raw_ids).index_by(&:prefixed_id)
 
-        filters
+        {
+          id: 'categories',
+          type: 'category',
+          options: distribution.filter_map do |prefixed_id, count|
+            cat = categories[prefixed_id]
+            next unless cat
+
+            { id: cat.prefixed_id, name: cat.name, permalink: cat.permalink, count: count }
+          end
+        }
       end
 
       def build_pagy(ms_result, page, limit)
-        require 'pagy'
-        require 'pagy/toolbox/paginators/meilisearch'
-
         fake_result = Struct.new(:raw_answer).new({
           'totalHits' => ms_result['estimatedTotalHits'] || 0,
           'hitsPerPage' => limit,
@@ -290,6 +314,17 @@ module Spree
         Pagy::MeilisearchPaginator.paginate(fake_result, {})
       end
 
+      def empty_result(scope, page, limit)
+        SearchResult.new(
+          products: scope.none,
+          filters: [],
+          sort_options: available_sort_options.map { |id| { id: id } },
+          default_sort: 'manual',
+          total_count: 0,
+          pagy: Pagy::Offset.new(count: 0, page: page, limit: limit)
+        )
+      end
+
       def valid_prefixed_id?(value)
         value.to_s.match?(PREFIXED_ID_PATTERN)
       end

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

@@ -1,12 +1,6 @@
 module Spree
   module SearchProvider
     class ProductPresenter
-      # Associations needed by this presenter — used by reindex and rake task for preloading
-      REQUIRED_PRELOADS = [
-        :taxons, :option_types, :primary_media, :store_products,
-        { variants_including_master: [:prices, :option_values] }
-      ].freeze
-
       attr_reader :product, :store
 
       def initialize(product, store)

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

@@ -8,8 +8,8 @@ module Spree
 
       def call(address_params: {}, user: nil, **opts)
         order = opts[:order]
-        default_billing = opts.fetch(:default_billing, false)
-        default_shipping = opts.fetch(:default_shipping, false)
+        default_billing = address_params.key?(:is_default_billing) ? address_params.delete(:is_default_billing) : opts.fetch(:default_billing, false)
+        default_shipping = address_params.key?(:is_default_shipping) ? address_params.delete(:is_default_shipping) : opts.fetch(:default_shipping, false)
 
         address_params = fill_country_and_state_ids(address_params)
 

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

@@ -8,8 +8,8 @@ module Spree
 
       def call(address:, address_params:, **opts)
         order = opts[:order]
-        default_billing = opts.fetch(:default_billing, false)
-        default_shipping = opts.fetch(:default_shipping, false)
+        default_billing = address_params.key?(:is_default_billing) ? address_params.delete(:is_default_billing) : opts.fetch(:default_billing, false)
+        default_shipping = address_params.key?(:is_default_shipping) ? address_params.delete(:is_default_shipping) : opts.fetch(:default_shipping, false)
         address_changes_except = opts.fetch(:address_changes_except, [])
         create_new_address_on_update = opts.fetch(:create_new_address_on_update, false)
         Spree::Deprecation.warn('Spree::Addresses::Update create_new_address_on_update parameter is deprecated and will be removed in Spree 5.5.') if create_new_address_on_update

data/config/locales/en.yml

@@ -50,6 +50,8 @@ en:
       spree/customer_group:
         description: Description
         name: Name
+      spree/customer_return:
+        stock_location_id: Stock Location
       spree/gift_card:
         amount_used: Amount used
         expires_at: Expires at

data/lib/spree/core/dependencies.rb

@@ -103,7 +103,10 @@ module Spree
         products_finder: 'Spree::Products::Find',
         taxon_finder: 'Spree::Taxons::Find',
         line_item_by_variant_finder: 'Spree::LineItems::FindByVariant',
-        variant_finder: 'Spree::Variants::Find'
+        variant_finder: 'Spree::Variants::Find',
+
+        # search
+        search_product_presenter: 'Spree::SearchProvider::ProductPresenter'
       }.freeze
 
       include Spree::DependenciesHelper

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.4.0.beta10'.freeze
+  VERSION = '5.4.0.rc2'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -7,6 +7,7 @@ require 'active_record/railtie'
 require 'active_storage/engine'
 require 'action_text/engine'
 require 'action_cable/engine'
+require 'pagy'
 
 require 'mail'
 require 'action_mailer/railtie'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta10
+  version: 5.4.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-19 00:00:00.000000000 Z
+date: 2026-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1695,9 +1695,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta10
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta10
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths: