spree_core 5.2.5 → 5.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d349836816cd2c1ec5919e21868926cd4eec24cb0c38c33cb744b37a9402dc9
-  data.tar.gz: 8072164578532d141040fe3aab664d91cb00c2c8571c3b9a043cd4ccb23f1aa1
+  metadata.gz: 4e0552e5475aa54e072158a70ea648d02d5514550eca293f1c0e0c79554c4216
+  data.tar.gz: afe49cf6d48fa819396d1518e3531435ffc22d038ce1a75aef430082bbc429fb
 SHA512:
-  metadata.gz: 4ad9ed9392d8cb3b34cf3fa0c294dca288fe2c5162ed20c84616ef82c71e2368ea7debb5264208b26703df22640cb612e4deadb98882dcd872f8622197b8d0e5
-  data.tar.gz: a6cd8afa6b70d0fc758758c9555ab24da37800c7905220b7d5f0251bf19fa06f87d03315aba858476eb181705c32ba6d80fba4e387f419f892f7b1ec16631aac
+  metadata.gz: 46b12717f12408f073b31a2a4f70d8850204bcfd59d32b20a6d891bc0326b7ea0c563c9b876e81156c6ba40f6ba88705553f87bc349598f52e8d761a7ea887a7
+  data.tar.gz: 37e34cbc4020055babe24354344aae7306dde8343267b2bac666fe691881936e5ebf6daeaa982ad4ce1ea4df88eecc77cb168c5321c57c2329b920dba37d05d7

data/app/helpers/spree/addresses_helper.rb

@@ -1,6 +1,14 @@
 # https://github.com/spree-contrib/spree_address_book/blob/master/app/helpers/spree/addresses_helper.rb
 module Spree
   module AddressesHelper
+    def address_form_countries_states_cache_key
+      @address_form_countries_states_cache_key ||= [
+        I18n.locale,
+        current_store.cache_key_with_version,
+        current_store.checkout_zone&.cache_key_with_version
+      ].compact
+    end
+
     def address_field(form, method, address_id = 'b', required = false, text_field_attributes: {}, &handler)
       content_tag :div, id: [address_id, method].join, class: 'mb-4' do
         if handler

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

@@ -9,15 +9,18 @@ module Spree::RansackableAttributes
     self.default_ransackable_attributes = %w[id name updated_at created_at]
 
     def self.ransackable_associations(*_args)
-      whitelisted_ransackable_associations || []
+      base = whitelisted_ransackable_associations || []
+      base | Spree.ransack.custom_associations_for(self)
     end
 
     def self.ransackable_attributes(*_args)
-      default_ransackable_attributes | (whitelisted_ransackable_attributes || [])
+      base = default_ransackable_attributes | (whitelisted_ransackable_attributes || [])
+      base | Spree.ransack.custom_attributes_for(self)
     end
 
     def self.ransackable_scopes(*_args)
-      whitelisted_ransackable_scopes || []
+      base = whitelisted_ransackable_scopes || []
+      base | Spree.ransack.custom_scopes_for(self)
     end
   end
 end

data/app/models/spree/line_item.rb

@@ -50,7 +50,7 @@ module Spree
     delegate :name, :description, :sku, :should_track_inventory?, :product, :options_text, :slug, :product_id, :dimensions_unit, :weight_unit, to: :variant
     delegate :brand, :category, to: :product
     delegate :tax_zone, to: :order
-    delegate :digital?, to: :variant
+    delegate :digital?, :can_supply?, to: :variant
 
     scope :with_digital_assets, -> { joins(:variant).merge(Spree::Variant.with_digital_assets) }
 
@@ -134,7 +134,7 @@ module Spree
     alias money display_total
 
     def sufficient_stock?
-      Spree::Stock::Quantifier.new(variant).can_supply? quantity
+      can_supply? quantity
     end
 
     def insufficient_stock?

data/app/models/spree/order/digital.rb

@@ -5,10 +5,10 @@ module Spree
       #
       # @return [Boolean]
       def digital?
-        if line_items.empty?
+        if item_count.zero? || line_items.empty?
           false
         else
-          line_items.all?(&:digital?)
+          line_items.includes(variant: :product).all?(&:digital?)
         end
       end
 
@@ -16,21 +16,29 @@ module Spree
       #
       # @return [Boolean]
       def some_digital?
-        line_items.any?(&:digital?)
+        if item_count.zero? || line_items.empty?
+          false
+        else
+          line_items.includes(variant: :product).any?(&:digital?)
+        end
       end
 
       # Returns true if any order line item has digital assets
       #
       # @return [Boolean]
       def with_digital_assets?
-        line_items.any?(&:with_digital_assets?)
+        if item_count.zero? || line_items.empty?
+          false
+        else
+          line_items.includes(:variant).any?(&:with_digital_assets?)
+        end
       end
 
       # Returns all line items with digital assets
       #
       # @return [Array<Spree::LineItem>]
       def digital_line_items
-        line_items.with_digital_assets.distinct
+        line_items.joins(:variant).with_digital_assets.distinct
       end
 
       # Returns all digital links for the order

data/app/models/spree/payment/processing.rb

@@ -63,6 +63,7 @@ module Spree
 
       def void_transaction!
         return true if void?
+        return void if response_code.blank?
 
         protect_from_connection_error do
           if payment_method.payment_profiles_supported?

data/app/models/spree/policy.rb

@@ -39,6 +39,15 @@ module Spree
     #
     scope :with_body,    -> { joins(:rich_text_body).distinct }
     scope :without_body, -> { where.missing(:rich_text_body) }
+    scope :with_matching_name, ->(name_to_match) do
+      value = name_to_match.to_s.strip.downcase
+
+      if Spree.use_translations?
+        i18n { name.lower.eq(value) }
+      else
+        where(arel_table[:name].lower.eq(value))
+      end
+    end
 
     #
     #  Ransack

data/app/models/spree/product.rb

@@ -639,7 +639,7 @@ module Spree
     #
     # @return [Boolean]
     def digital?
-      @digital ||= shipping_methods&.digital&.exists?
+      @digital ||= shipping_category&.includes_digital_shipping_method?
     end
 
     def auto_match_taxons

data/app/models/spree/promotion/rules/option_value.rb

@@ -13,15 +13,24 @@ module Spree
         end
 
         def eligible?(promotable, _options = {})
+          return false if eligible_option_value_variant_ids.empty?
+
           case preferred_match_policy
           when 'any'
-            promotable.line_items.any? { |item| actionable?(item) }
+            Spree::OptionValueVariant.where(id: eligible_option_value_variant_ids, variant_id: promotable.variant_ids).exists?
           end
         end
 
         def actionable?(line_item)
-          option_value_variant_ids = line_item.variant.option_value_variant_ids.map(&:to_s)
-          (preferred_eligible_values & option_value_variant_ids).any?
+          return false if eligible_option_value_variant_ids.empty?
+
+          Spree::OptionValueVariant.where(id: eligible_option_value_variant_ids, variant_id: line_item.variant_id).exists?
+        end
+
+        private
+
+        def eligible_option_value_variant_ids
+          @eligible_option_value_variant_ids ||= preferred_eligible_values.map(&:to_s)
         end
       end
     end

data/app/models/spree/promotion/rules/product.rb

@@ -34,23 +34,27 @@ module Spree
           products
         end
 
+        def eligible_product_ids
+          @eligible_product_ids ||= product_promotion_rules.pluck(:product_id)
+        end
+
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)
         end
 
         def eligible?(order, _options = {})
-          return true if eligible_products.empty?
+          return true if eligible_product_ids.empty?
 
           if preferred_match_policy == 'all'
-            unless eligible_products.all? { |p| order.products.include?(p) }
+            unless eligible_product_ids.all? { |p| order.product_ids.include?(p) }
               eligibility_errors.add(:base, eligibility_error_message(:missing_product))
             end
           elsif preferred_match_policy == 'any'
-            unless order.products.any? { |p| eligible_products.include?(p) }
+            unless order.product_ids.any? { |p| eligible_product_ids.include?(p) }
               eligibility_errors.add(:base, eligibility_error_message(:no_applicable_products))
             end
           else
-            unless order.products.none? { |p| eligible_products.include?(p) }
+            unless order.product_ids.none? { |p| eligible_product_ids.include?(p) }
               eligibility_errors.add(:base, eligibility_error_message(:has_excluded_product))
             end
           end
@@ -61,9 +65,9 @@ module Spree
         def actionable?(line_item)
           case preferred_match_policy
           when 'any', 'all'
-            product_ids.include? line_item.variant.product_id
+            eligible_product_ids.include? line_item.variant.product_id
           when 'none'
-            product_ids.exclude? line_item.variant.product_id
+            eligible_product_ids.exclude? line_item.variant.product_id
           else
             raise "unexpected match policy: #{preferred_match_policy.inspect}"
           end
@@ -89,9 +93,18 @@ module Spree
           return if product_ids_to_add.nil?
 
           product_promotion_rules.delete_all
-          product_promotion_rules.insert_all(
-            product_ids_to_add.map { |product_id| { product_id: product_id, promotion_rule_id: id } }
-          )
+
+          if product_ids_to_add.any?
+            Spree::ProductPromotionRule.insert_all(
+              product_ids_to_add.map { |product_id| { product_id: product_id, promotion_rule_id: id } }
+            )
+          end
+
+          # Invalidate cache after bulk operations
+          touch
+
+          # Clear memoized values
+          @eligible_product_ids = nil
         end
       end
     end

data/app/models/spree/promotion/rules/taxon.rb

@@ -30,14 +30,21 @@ module Spree
           promotable.is_a?(Spree::Order)
         end
 
+        def eligible_taxon_ids
+          @eligible_taxon_ids ||= promotion_rule_taxons.pluck(:taxon_id)
+        end
+
         def eligible?(order, _options = {})
+          return true if eligible_taxon_ids.empty?
+
           if preferred_match_policy == 'all'
-            unless (taxons.to_a - taxons_in_order_including_parents(order)).empty?
+            order_taxon_ids_with_ancestors = taxon_ids_in_order_including_ancestors(order)
+            unless eligible_taxon_ids.all? { |id| order_taxon_ids_with_ancestors.include?(id) }
               eligibility_errors.add(:base, eligibility_error_message(:missing_taxon))
             end
           else
-            order_taxons = taxons_in_order_including_parents(order)
-            unless taxons.any? { |taxon| order_taxons.include? taxon }
+            order_taxon_ids_with_ancestors = taxon_ids_in_order_including_ancestors(order)
+            unless eligible_taxon_ids.any? { |id| order_taxon_ids_with_ancestors.include?(id) }
               eligibility_errors.add(:base, eligibility_error_message(:no_matching_taxons))
             end
           end
@@ -46,12 +53,7 @@ module Spree
         end
 
         def actionable?(line_item)
-          store = line_item.order.store
-
-          store.products.
-            joins(:classifications).
-            where(Spree::Classification.table_name => { taxon_id: taxon_ids, product_id: line_item.product_id }).
-            exists?
+          Spree::Classification.where(taxon_id: eligible_taxon_ids_including_children, product_id: line_item.product_id).exists?
         end
 
         def taxon_ids_string
@@ -71,34 +73,40 @@ module Spree
 
         private
 
-        # All taxons in an order
-        def order_taxons(order)
-          taxon_ids = Spree::Classification.where(product_id: order.product_ids).pluck(:taxon_id).uniq
+        # IDs of taxons in rule including all their children
+        def eligible_taxon_ids_including_children
+          @eligible_taxon_ids_including_children ||= begin
+            return [] if eligible_taxon_ids.empty?
 
-          order.store.taxons.where(id: taxon_ids)
+            Spree::Taxon.where(id: eligible_taxon_ids).flat_map(&:cached_self_and_descendants_ids).uniq
+          end
         end
 
-        # ids of taxons rules and taxons rules children
-        def taxons_including_children_ids
-          taxons.inject([]) { |ids, taxon| ids += taxon.self_and_descendants.ids }
-        end
+        # IDs of taxons in order that match rule taxons (or their children), plus all ancestors
+        def taxon_ids_in_order_including_ancestors(order)
+          # Get taxon IDs from order products that are within rule taxons or their children
+          order_taxon_ids = Spree::Classification.where(product_id: order.product_ids, taxon_id: eligible_taxon_ids_including_children).pluck(:taxon_id).uniq
 
-        # taxons order vs taxons rules and taxons rules children
-        def order_taxons_in_taxons_and_children(order)
-          order_taxons(order).where(id: taxons_including_children_ids)
-        end
+          return [] if order_taxon_ids.empty?
 
-        def taxons_in_order_including_parents(order)
-          order_taxons_in_taxons_and_children(order).inject([]) { |taxons, taxon| taxons << taxon.self_and_ancestors }.flatten.uniq
+          # Get those taxons plus all their ancestors
+          Spree::Taxon.where(id: order_taxon_ids).flat_map { |taxon| taxon.self_and_ancestors.ids }.uniq
         end
 
         def add_taxons
           return if taxon_ids_to_add.nil?
 
           promotion_rule_taxons.delete_all
-          promotion_rule_taxons.insert_all(
-            taxon_ids_to_add.map { |taxon_id| { taxon_id: taxon_id, promotion_rule_id: id } }
-          )
+
+          if taxon_ids_to_add.any?
+            Spree::PromotionRuleTaxon.insert_all(
+              taxon_ids_to_add.map { |taxon_id| { taxon_id: taxon_id, promotion_rule_id: id } }
+            )
+          end
+
+          # Clear memoized values
+          @eligible_taxon_ids = nil
+          @eligible_taxon_ids_including_children = nil
         end
       end
     end

data/app/models/spree/promotion/rules/user.rb

@@ -24,8 +24,12 @@ module Spree
           promotable.is_a?(Spree::Order)
         end
 
+        def eligible_user_ids
+          @eligible_user_ids ||= promotion_rule_users.pluck(:user_id)
+        end
+
         def eligible?(order, _options = {})
-          user_ids.include?(order.user_id)
+          eligible_user_ids.include?(order.user_id)
         end
 
         def user_ids_string
@@ -50,9 +54,18 @@ module Spree
           return if user_ids_to_add.nil?
 
           promotion_rule_users.delete_all
-          promotion_rule_users.insert_all(
-            user_ids_to_add.map { |user_id| { user_id: user_id, promotion_rule_id: id } }
-          )
+
+          if user_ids_to_add.any?
+            Spree::PromotionRuleUser.insert_all(
+              user_ids_to_add.map { |user_id| { user_id: user_id, promotion_rule_id: id } }
+            )
+          end
+
+          # Invalidate cache after bulk operations
+          touch
+
+          # Clear memoized values
+          @eligible_user_ids = nil
         end
       end
     end

data/app/models/spree/shipping_category.rb

@@ -16,5 +16,11 @@ module Spree
     def self.digital
       find_by(name: DIGITAL_NAME)
     end
+
+    def includes_digital_shipping_method?
+      Rails.cache.fetch("#{cache_key_with_version}/includes-digital-shipping-method") do
+        shipping_methods.digital.exists?
+      end
+    end
   end
 end

data/app/models/spree/stock/quantifier.rb

@@ -25,7 +25,7 @@ module Spree
       end
 
       def can_supply?(required = 1)
-        variant.available? && (total_on_hand >= required || backorderable?)
+        variant.available? && (backorderable? || total_on_hand >= required)
       end
 
       def stock_items

data/app/models/spree/store.rb

@@ -496,48 +496,78 @@ module Spree
     end
 
     def ensure_default_taxonomies_are_created
-      taxonomies.find_or_create_by(name: I18n.t('spree.taxonomy_categories_name', default: I18n.t('spree.taxonomy_categories_name', locale: :en)))
-      taxonomies.find_or_create_by(name: I18n.t('spree.taxonomy_brands_name', default: I18n.t('spree.taxonomy_brands_name', locale: :en)))
-      taxonomies.find_or_create_by(name: I18n.t('spree.taxonomy_collections_name', default: I18n.t('spree.taxonomy_collections_name', locale: :en)))
-    rescue ActiveRecord::NotNullViolation
+      [
+        translate_with_store_locale_fallback('spree.taxonomy_categories_name'),
+        translate_with_store_locale_fallback('spree.taxonomy_brands_name'),
+        translate_with_store_locale_fallback('spree.taxonomy_collections_name')
+      ].each do |taxonomy_name|
+        # Manual exists?/create to work around Mobility bug with find_or_create_by
+        next if taxonomies.with_matching_name(taxonomy_name).exists?
+
+        taxonomies.create(name: taxonomy_name)
+      end
     end
 
     def ensure_default_automatic_taxons
-      collections_taxonomy = taxonomies.find_by(name: Spree.t(:taxonomy_collections_name))
+      # Use Mobility-safe lookup for taxonomy
+      collections_taxonomy = taxonomies.with_matching_name(translate_with_store_locale_fallback('spree.taxonomy_collections_name')).first
+      return unless collections_taxonomy.present?
 
-      if collections_taxonomy.present?
-        on_sale_taxon = collections_taxonomy.taxons.automatic.where(name: Spree.t('automatic_taxon_names.on_sale')).first_or_create! do |taxon|
-          taxon.parent = collections_taxonomy.root
-          taxon.rules.new(type: 'Spree::TaxonRules::Sale', value: 'true')
-        end
+      automatic_taxons_config = [
+        { name: translate_with_store_locale_fallback('spree.automatic_taxon_names.on_sale'), rule_type: 'Spree::TaxonRules::Sale', rule_value: 'true' },
+        { name: translate_with_store_locale_fallback('spree.automatic_taxon_names.new_arrivals'), rule_type: 'Spree::TaxonRules::AvailableOn', rule_value: 30 }
+      ]
 
-        new_arrivals_taxon = collections_taxonomy.taxons.automatic.where(name: Spree.t('automatic_taxon_names.new_arrivals')).first_or_create! do |taxon|
-          taxon.parent = collections_taxonomy.root
-          taxon.rules.new(type: 'Spree::TaxonRules::AvailableOn', value: 30)
-        end
+      automatic_taxons_config.map do |config|
+        # Manual exists?/create to work around Mobility bug with first_or_create
+        taxon_scope = collections_taxonomy.taxons.automatic.with_matching_name(config[:name])
 
-        [on_sale_taxon, new_arrivals_taxon]
+        if taxon_scope.exists?
+          taxon_scope.first
+        else
+          collections_taxonomy.taxons.create!(
+            name: config[:name],
+            automatic: true,
+            parent: collections_taxonomy.root,
+            taxon_rules: [TaxonRule.new(type: config[:rule_type], value: config[:rule_value])]
+          )
+        end
       end
     end
 
     def ensure_default_post_categories_are_created
-      post_categories.find_or_create_by(title: Spree.t('default_post_categories.resources'))
-      post_categories.find_or_create_by(title: Spree.t('default_post_categories.articles'))
-      post_categories.find_or_create_by(title: Spree.t('default_post_categories.news'))
+      [
+        translate_with_store_locale_fallback('spree.default_post_categories.resources'),
+        translate_with_store_locale_fallback('spree.default_post_categories.articles'),
+        translate_with_store_locale_fallback('spree.default_post_categories.news')
+      ].each do |category_title|
+        # Use exists?/create pattern for safety
+        next if post_categories.where(title: category_title).exists?
+
+        post_categories.create(title: category_title)
+      end
     end
 
     def create_default_policies
-      policies.find_or_create_by(name: Spree.t('terms_of_service'))
-      policies.find_or_create_by(name: Spree.t('privacy_policy'))
-      policies.find_or_create_by(name: Spree.t('returns_policy'))
-      policies.find_or_create_by(name: Spree.t('shipping_policy'))
-
-      # Create checkout links to the policies
-      policies.each do |policy|
-        links.find_or_create_by(linkable: policy)
+      [
+        translate_with_store_locale_fallback('spree.terms_of_service'),
+        translate_with_store_locale_fallback('spree.privacy_policy'),
+        translate_with_store_locale_fallback('spree.returns_policy'),
+        translate_with_store_locale_fallback('spree.shipping_policy')
+      ].each do |policy_name|
+        # Manual exists?/create to work around Mobility bug with find_or_create_by
+        next if policies.with_matching_name(policy_name).exists?
+
+        policies.create(name: policy_name)
       end
     end
 
+    # Translates a key using the store's default locale with fallback to :en
+    def translate_with_store_locale_fallback(key)
+      locale = default_locale.presence&.to_sym || :en
+      I18n.t(key, locale: locale, default: I18n.t(key, locale: :en))
+    end
+
     # code is slug, so we don't want to generate new slug when code changes
     # we use friendlyId only for history feature
     def should_generate_new_friendly_id?

data/app/models/spree/variant.rb

@@ -245,7 +245,11 @@ module Spree
     end
 
     def options_text
-      @options_text ||= Spree::Variants::OptionsPresenter.new(self).to_sentence
+      @options_text ||= if option_values.loaded?
+                          option_values.sort_by { |ov| ov.option_type.position }.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence(words_connector: ', ', two_words_connector: ', ')
+                        else
+                          option_values.includes(:option_type).joins(:option_type).order("#{Spree::OptionType.table_name}.position").map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence(words_connector: ', ', two_words_connector: ', ')
+                        end
     end
 
     # Default to master name

data/app/presenters/spree/variants/options_presenter.rb

@@ -8,6 +8,7 @@ module Spree
       delegate :option_values, to: :variant
 
       def initialize(variant)
+        Spree::Deprecation.warn('Spree::Variants::OptionsPresenter is deprecated and will be removed in Spree 5.5. Please use Spree::Variant#options_text instead.')
         @variant = variant
       end
 

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

@@ -5,8 +5,13 @@ module Spree
 
       def call(order:)
         @messages = []
+
+        return success([order, @messages]) if order.item_count.zero? || order.line_items.none?
+
+        line_items = order.line_items.includes(variant: [:product, :stock_items, :stock_locations, { stock_items: :stock_location }])
+
         ActiveRecord::Base.transaction do
-          line_items(order).each do |line_item|
+          line_items.each do |line_item|
             cart_remove_line_item_service.call(order: order, line_item: line_item) if !valid_status?(line_item) || !stock_available?(line_item)
           end
         end
@@ -20,17 +25,6 @@ module Spree
 
       private
 
-      def line_items(order)
-        if order.line_items.empty?
-          []
-        elsif order.line_items.first.association_cached?(:variant) && order.line_items.first.variant.association_cached?(:product)
-          # Don't include associations if it is already included, because it breaks other includes
-          order.line_items
-        else
-          order.line_items.includes(variant: :product)
-        end
-      end
-
       def valid_status?(line_item)
         product = line_item.product
         if !product.active? || product.deleted? || product.discontinued? || line_item.variant.discontinued?

data/app/views/spree/addresses/_form.html.erb

@@ -3,8 +3,10 @@
 
 <div class="inner"
      data-controller="address-form address-autocomplete"
-     data-address-form-countries-value="<%= available_countries.to_json %>"
-     data-address-form-states-value="<%= available_states.to_json %>"
+     <% cache address_form_countries_states_cache_key do %>
+      data-address-form-countries-value="<%= available_countries.to_json %>"
+      data-address-form-states-value="<%= available_states.to_json %>"
+     <% end %>
      data-address-form-current-state-id-value="<%= address.state_id || address_form.object.state_id %>"
 >
   <div id="<%= "#{address_id}country" %>">

data/lib/generators/spree/cursor_rules/templates/spree_rules.mdc

@@ -148,7 +148,7 @@ class MyAddToCartService < Spree::Cart::AddItem
   def call(order:, variant:, quantity: nil, public_metadata: {}, private_metadata: {}, options: {})
     ApplicationRecord.transaction do
       run :add_to_line_item
-      run Spree::Dependencies.cart_recalculate_service.constantize
+      run Spree.cart_recalculate_service
       run :update_external_system
     end
   end
@@ -363,7 +363,7 @@ module Spree
         private
 
         def serialized_collection
-          Spree::Api::Dependencies.storefront_product_serializer.constantize.new(
+          Spree.api.storefront_product_serializer.new(
             collection,
             include: resource_includes,
             fields: sparse_fields

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -10,6 +10,7 @@ module Spree
 
     class_option :lib_name, default: ''
     class_option :database, default: ''
+    class_option :api, type: :boolean, default: false
 
     def self.source_paths
       paths = superclass.source_paths
@@ -21,34 +22,40 @@ module Spree
       remove_directory_if_exists(dummy_path)
     end
 
-    PASSTHROUGH_OPTIONS = [
-      :skip_active_record, :skip_javascript, :database, :javascript, :quiet, :pretend, :force, :skip
-    ]
-
     def generate_test_dummy
-      # calling slice on a Thor::CoreExtensions::HashWithIndifferentAccess
-      # object has been known to return nil
-      opts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)
-      opts[:database] = 'sqlite3' if opts[:database].blank?
-      opts[:force] = true
-      opts[:skip_bundle] = true
-      opts[:skip_git] = true
-      opts[:skip_listen] = true
-      opts[:skip_rc] = true
-      opts[:skip_spring] = true
-      opts[:skip_test] = true
-      opts[:skip_bootsnap] = true
-      opts[:skip_docker] = true
-      opts[:skip_rubocop] = true
-      opts[:skip_brakeman] = true
-      opts[:skip_ci] = true
-      opts[:skip_kamal] = true
-      opts[:skip_devcontainer] = true
-      opts[:skip_solid] = true
-
       puts 'Generating dummy Rails application...'
-      invoke Rails::Generators::AppGenerator,
-        [File.expand_path(dummy_path, destination_root)], opts
+
+      args = [File.expand_path(dummy_path, destination_root)]
+
+      # Database
+      args << "--database=#{options[:database].presence || 'sqlite3'}"
+
+      # Skip options
+      args << '--force'
+      args << '--skip-bundle'
+      args << '--skip-git'
+      args << '--skip-keeps'
+      args << '--skip-rc'
+      args << '--skip-spring'
+      args << '--skip-test'
+      args << '--skip-bootsnap'
+      args << '--skip-docker'
+      args << '--skip-rubocop'
+      args << '--skip-brakeman'
+      args << '--skip-ci'
+      args << '--skip-kamal'
+      args << '--skip-devcontainer'
+      args << '--skip-solid'
+      args << '--skip-thruster'
+      args << '--skip-bundler-audit'
+      args << '--skip-dev-gems'
+      args << '--skip-action-mailbox'
+      args << '--skip-jbuilder'
+
+      # API mode (implies skip-asset-pipeline, skip-javascript, skip-hotwire)
+      args << '--api' if options[:api]
+
+      Rails::Generators.invoke('app', args)
       inject_yaml_permitted_classes
     end
 
@@ -62,7 +69,7 @@ module Spree
       template 'rails/routes.rb', "#{dummy_path}/config/routes.rb", force: true
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
       template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
-      template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
+      template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true unless options[:api]
     end
 
     def test_dummy_inject_extension_requirements

data/lib/spree/core/ransack_configuration.rb

@@ -0,0 +1,79 @@
+module Spree
+  # Centralized configuration for Ransack searchable attributes, associations, and scopes.
+  #
+  # This class allows developers to extend Spree models with custom ransackable
+  # configurations without using decorators.
+  #
+  # @example Adding custom searchable fields
+  #   Spree.ransack.add_attribute(Spree::Product, :vendor_id)
+  #   Spree.ransack.add_scope(Spree::Product, :by_vendor)
+  #   Spree.ransack.add_association(Spree::Product, :vendor)
+  #
+  class RansackConfiguration
+    def initialize
+      @custom_attributes = Hash.new { |h, k| h[k] = [] }
+      @custom_associations = Hash.new { |h, k| h[k] = [] }
+      @custom_scopes = Hash.new { |h, k| h[k] = [] }
+    end
+
+    # Add a custom ransackable attribute to a model.
+    #
+    # @param model [Class] the model class to configure (e.g., Spree::Product)
+    # @param attribute [String, Symbol] the attribute to add
+    # @return [Array<String>] the updated list of custom attributes
+    def add_attribute(model, attribute)
+      @custom_attributes[model.name.to_sym] |= [attribute.to_s]
+    end
+
+    # Add a custom ransackable association to a model.
+    #
+    # @param model [Class] the model class to configure (e.g., Spree::Product)
+    # @param association [String, Symbol] the association to add
+    # @return [Array<String>] the updated list of custom associations
+    def add_association(model, association)
+      @custom_associations[model.name.to_sym] |= [association.to_s]
+    end
+
+    # Add a custom ransackable scope to a model.
+    #
+    # @param model [Class] the model class to configure (e.g., Spree::Product)
+    # @param scope [String, Symbol] the scope to add
+    # @return [Array<String>] the updated list of custom scopes
+    def add_scope(model, scope)
+      @custom_scopes[model.name.to_sym] |= [scope.to_s]
+    end
+
+    # Get custom ransackable attributes for a model.
+    #
+    # @param model [Class] the model class to query
+    # @return [Array<String>] the custom attributes
+    def custom_attributes_for(model)
+      @custom_attributes[model.name.to_sym]
+    end
+
+    # Get custom ransackable associations for a model.
+    #
+    # @param model [Class] the model class to query
+    # @return [Array<String>] the custom associations
+    def custom_associations_for(model)
+      @custom_associations[model.name.to_sym]
+    end
+
+    # Get custom ransackable scopes for a model.
+    #
+    # @param model [Class] the model class to query
+    # @return [Array<String>] the custom scopes
+    def custom_scopes_for(model)
+      @custom_scopes[model.name.to_sym]
+    end
+
+    # Reset all custom configurations. Useful for testing.
+    #
+    # @return [void]
+    def reset!
+      @custom_attributes.clear
+      @custom_associations.clear
+      @custom_scopes.clear
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.2.5'.freeze
+  VERSION = '5.2.6'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -374,6 +374,19 @@ module Spree
     @permissions ||= PermissionConfiguration.new
   end
 
+  # Ransack configuration accessor for managing custom ransackable attributes,
+  # associations, and scopes across Spree models.
+  #
+  # @example Adding custom searchable fields
+  #   Spree.ransack.add_attribute(Spree::Product, :vendor_id)
+  #   Spree.ransack.add_scope(Spree::Product, :by_vendor)
+  #   Spree.ransack.add_association(Spree::Product, :vendor)
+  #
+  # @return [Spree::RansackConfiguration] the ransack configuration instance
+  def self.ransack
+    @ransack ||= RansackConfiguration.new
+  end
+
   class << self
     # Dynamic methods for core dependencies
     #
@@ -451,3 +464,4 @@ require 'spree/core/preferences/runtime_configuration'
 
 require 'spree/core/webhooks'
 require 'spree/core/permission_configuration'
+require 'spree/core/ransack_configuration'

data/lib/spree/database_type_utilities.rb

@@ -1,9 +1,12 @@
 module Spree
   module DatabaseTypeUtilities
+    # Maximum value for a 4-byte signed integer (default database integer type)
+    INTEGER_MAX = (2**31) - 1
+
     def self.maximum_value_for(data_type)
       case data_type
       when :integer
-        ActiveModel::Type::Integer.new.instance_eval { range.max }
+        INTEGER_MAX
       else
         raise ArgumentError, 'Currently only :integer argument is acceptable'
       end

data/lib/spree/testing_support/common_rake.rb

@@ -19,12 +19,15 @@ namespace :common do
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
-    skip_javascript = ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+    api_only = ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+    skip_javascript = api_only || ENV['LIB_NAME'] == 'spree/emails'
 
     dummy_app_args = [
       "--lib_name=#{ENV['LIB_NAME']}"
     ]
-    if skip_javascript
+    if api_only
+      dummy_app_args << '--api'
+    elsif skip_javascript
       dummy_app_args << '--skip_javascript'
     end
     Spree::DummyGenerator.start dummy_app_args

data/lib/spree/testing_support/factories/order_factory.rb

@@ -24,6 +24,9 @@ FactoryBot.define do
       after(:create) do |order, evaluator|
         create(:line_item, order: order, price: evaluator.line_items_price)
         order.line_items.reload # to ensure order.line_items is accessible after
+
+        order.update_column(:item_count, order.line_items.count)
+        order.reload
       end
     end
 

data/lib/spree/testing_support/factories/store_credit_factory.rb

@@ -3,7 +3,7 @@ FactoryBot.define do
 
   factory :store_credit, class: Spree::StoreCredit do
     user
-    created_by { create(:user) }
+    created_by { create(:admin_user) }
     category { create(:store_credit_category) }
     amount { 150.00 }
     currency { 'USD' }

data/lib/spree/testing_support/store.rb

@@ -13,8 +13,12 @@ RSpec.configure do |config|
 
   config.before(:all) do
     unless self.class.metadata[:without_global_store]
-      @default_country = Spree::Country.find_by(iso: 'US') || FactoryBot.create(:country_us)
-      @default_store = Spree::Store.find_by(default: true) || FactoryBot.create(:store, default: true, default_country: @default_country, default_currency: 'USD')
+      # Ensure locale is set to :en before creating store to avoid translation issues
+      # when previous tests left the locale in a different language
+      I18n.with_locale(:en) do
+        @default_country = Spree::Country.find_by(iso: 'US') || FactoryBot.create(:country_us)
+        @default_store = Spree::Store.find_by(default: true) || FactoryBot.create(:store, default: true, default_country: @default_country, default_currency: 'USD')
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.5
+  version: 5.2.6
 platform: ruby
 authors:
 - Sean Schofield
@@ -34,7 +34,7 @@ dependencies:
         version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -1549,6 +1549,7 @@ files:
 - lib/spree/core/query_filters/date.rb
 - lib/spree/core/query_filters/number.rb
 - lib/spree/core/query_filters/text.rb
+- lib/spree/core/ransack_configuration.rb
 - lib/spree/core/routes.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_generator.rb
@@ -1703,9 +1704,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.2.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.6
 rdoc_options: []
 require_paths:
 - lib