spree_core 5.4.0 → 5.4.2

data/db/sample_data/markets.rb

@@ -28,3 +28,37 @@ if eu_zone
     eu_market.save!
   end
 end
+
+# Additional sample markets for the remaining continents. Each market pulls
+# its countries from the matching shipping zone so it only includes countries
+# with shipping coverage (and therefore valid market countries). Countries
+# already assigned to another market in the store are skipped, because
+# Spree::MarketCountry requires each country to belong to at most one market
+# per store.
+[
+  { name: 'South America', zone: 'South America', currency: 'USD', default_locale: 'es', supported_locales: 'es,pt' },
+  { name: 'Middle East', zone: 'Middle East', currency: 'USD', default_locale: 'en', supported_locales: 'en,ar' },
+  { name: 'Africa', zone: 'Africa', currency: 'USD', default_locale: 'en', supported_locales: 'en,fr,ar' },
+  { name: 'Asia', zone: 'Asia', currency: 'USD', default_locale: 'en', supported_locales: 'en' },
+  { name: 'Oceania', zone: 'Australia and Oceania', currency: 'AUD', default_locale: 'en', supported_locales: 'en' }
+].each do |attrs|
+  zone = Spree::Zone.find_by(name: attrs[:zone])
+  next unless zone
+
+  market = store.markets.find_or_initialize_by(name: attrs[:name])
+
+  assigned_scope = Spree::MarketCountry.joins(:market).
+    where(spree_markets: { store_id: store.id, deleted_at: nil })
+  assigned_scope = assigned_scope.where.not(market_id: market.id) if market.persisted?
+  assigned_country_ids = assigned_scope.pluck(:country_id).to_set
+
+  countries = zone.zone_members.where(zoneable_type: 'Spree::Country').map(&:zoneable).uniq.compact
+  countries = countries.reject { |c| assigned_country_ids.include?(c.id) }
+  next if countries.empty?
+
+  market.currency = attrs[:currency]
+  market.default_locale = attrs[:default_locale]
+  market.supported_locales = attrs[:supported_locales]
+  market.countries = countries
+  market.save!
+end

data/db/sample_data/orders.rb

@@ -122,7 +122,7 @@ if method
       source: credit_card.clone,
       payment_method: method
     ).first_or_create!
-    payment.update_columns(state: 'pending', response_code: '12345')
+    payment.update_columns(state: 'pending', response_code: "BGS-#{SecureRandom.hex(6)}")
   end
 end
 

data/db/sample_data/shipping_methods.rb

@@ -6,6 +6,12 @@ rescue ActiveRecord::RecordNotFound
 end
 
 europe_vat = Spree::Zone.find_by!(name: 'EU_VAT')
+central_america_and_caribbean = Spree::Zone.find_by(name: 'Central America and Caribbean')
+south_america = Spree::Zone.find_by(name: 'South America')
+middle_east = Spree::Zone.find_by(name: 'Middle East')
+africa = Spree::Zone.find_by(name: 'Africa')
+asia = Spree::Zone.find_by(name: 'Asia')
+australia_and_oceania = Spree::Zone.find_by(name: 'Australia and Oceania')
 shipping_category = Spree::ShippingCategory.find_or_create_by!(name: 'Default')
 
 shipping_methods = [
@@ -13,10 +19,18 @@ shipping_methods = [
   { name: 'UPS Two Day (USD)', zones: [north_america], display_on: 'both', shipping_categories: [shipping_category] },
   { name: 'UPS One Day (USD)', zones: [north_america], display_on: 'both', shipping_categories: [shipping_category] },
   { name: 'UPS Ground (EU)', zones: [europe_vat], display_on: 'both', shipping_categories: [shipping_category] },
-  { name: 'UPS Ground (EUR)', zones: [europe_vat], display_on: 'both', shipping_categories: [shipping_category] }
+  { name: 'UPS Ground (EUR)', zones: [europe_vat], display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Central America and Caribbean)', zones: [central_america_and_caribbean].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (South America)', zones: [south_america].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Middle East)', zones: [middle_east].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Africa)', zones: [africa].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Asia)', zones: [asia].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Australia and Oceania)', zones: [australia_and_oceania].compact, display_on: 'both', shipping_categories: [shipping_category] }
 ]
 
 shipping_methods.each do |attributes|
+  next if attributes[:zones].empty?
+
   Spree::ShippingMethod.where(name: attributes[:name]).first_or_create! do |shipping_method|
     shipping_method.calculator = Spree::Calculator::Shipping::FlatRate.create!
     shipping_method.zones = attributes[:zones]
@@ -30,9 +44,17 @@ end
   'UPS Ground (EU)' => [5, 'USD'],
   'UPS One Day (USD)' => [15, 'USD'],
   'UPS Two Day (USD)' => [10, 'USD'],
-  'UPS Ground (EUR)' => [8, 'EUR']
+  'UPS Ground (EUR)' => [8, 'EUR'],
+  'DHL Standard (Central America and Caribbean)' => [15, 'USD'],
+  'DHL Standard (South America)' => [20, 'USD'],
+  'DHL Standard (Middle East)' => [20, 'USD'],
+  'DHL Standard (Africa)' => [25, 'USD'],
+  'DHL Standard (Asia)' => [20, 'USD'],
+  'DHL Standard (Australia and Oceania)' => [25, 'USD']
 }.each do |shipping_method_name, (price, currency)|
-  shipping_method = Spree::ShippingMethod.find_by!(name: shipping_method_name)
+  shipping_method = Spree::ShippingMethod.find_by(name: shipping_method_name)
+  next unless shipping_method
+
   shipping_method.calculator.preferences = { amount: price, currency: currency }
   shipping_method.calculator.save!
   shipping_method.save!

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

@@ -106,7 +106,7 @@ module Spree
     def inject_yaml_permitted_classes
       inside dummy_path do
         inject_into_file 'config/application.rb', %Q[
-    config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone]
+    config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, Time]
         ], after: /config\.load_defaults.*$/, verbose: true
       end
     end

data/lib/spree/core/configuration.rb

@@ -117,6 +117,9 @@ module Spree
       preference :gift_card_batch_web_limit, :integer, default: 500 # number of gift card codes to be generated in the web process, more than this will be generated in a background job
       preference :gift_card_batch_limit, :integer, default: 50_000
 
+      # imports
+      preference :large_import_threshold, :integer, default: 500 # imports with more rows than this skip per-row UI broadcasts and use bulk processing
+
     end
   end
 end

data/lib/spree/core/engine.rb

@@ -47,7 +47,7 @@ module Spree
         app.config.spree = Environment.new(SpreeCalculators.new, SpreeValidators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
 
         app.config.active_record.yaml_column_permitted_classes ||= []
-        app.config.active_record.yaml_column_permitted_classes.concat([Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone])
+        app.config.active_record.yaml_column_permitted_classes.concat([Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, Time])
         Spree::Config = app.config.spree.preferences
         Spree::RuntimeConfig = app.config.spree.preferences # for compatibility
         Spree::Dependencies = app.config.spree.dependencies
@@ -289,13 +289,10 @@ module Spree
           Spree::Addresses::PhoneValidator
         ]
 
-        # Attach event log subscriber if enabled
-        if Spree::Config.events_log_enabled
-          Spree::EventLogSubscriber.attach_to_notifications
-        end
-
         # Add core event subscribers
         # Other engines add their subscribers in their own after_initialize blocks
+        # Note: Spree::EventLogSubscriber is attached in to_prepare (below) so it
+        # survives Zeitwerk code reloads in development.
         Spree.subscribers.concat [
           Spree::ExportSubscriber,
           Spree::ReportSubscriber,

data/lib/spree/core/version.rb

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

data/lib/spree/events.rb

@@ -28,6 +28,12 @@ module Spree
   #
   module Events
     class << self
+      # Reference to the AS::N subscription created by Spree::EventLogSubscriber.
+      # Stored here (on a module in lib/, not reloaded by Zeitwerk) so that code
+      # reloads in development don't orphan the subscription and cause events to
+      # be logged multiple times.
+      attr_accessor :log_subscription
+
       # Publish an event to all matching subscribers
       #
       # @param name [String] The event name (e.g., 'order.complete')

data/lib/spree/permitted_attributes.rb

@@ -115,7 +115,7 @@ module Spree
 
     @@customer_return_attributes = [:stock_location_id, {
       return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
-                                :acceptance_status, :exchange_variant_id, :resellable]
+                                :acceptance_status, :exchange_variant_id, :resellable, :return_quantity]
     }]
 
     @@digital_attributes = [:attachment, :variant_id]
@@ -222,14 +222,14 @@ module Spree
           :id, :inventory_unit_id,
           :preferred_reimbursement_type_id,
           :return_authorization_id, :returned, :pre_tax_amount,
-          :acceptance_status, :exchange_variant_id, :resellable
+          :acceptance_status, :exchange_variant_id, :resellable, :return_quantity
         ]
       }
     ]
 
     @@return_authorization_reason_attributes = [:name, :active]
 
-    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]
+    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable, :return_quantity]
 
     @@role_attributes = [:name]
 

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     order         { create(:order, total: amount) }
     amount        { 45.75 }
     state         { 'checkout' }
-    response_code { '12345' }
+    response_code { "BGS-#{SecureRandom.hex(6)}" }
 
     payment_method { create(:credit_card_payment_method, stores: [order.store]) }
     association(:source, factory: :credit_card)

data/lib/tasks/markets.rake

@@ -27,13 +27,10 @@ namespace :spree do
           name: primary_country&.name || 'Default',
           currency: iso_country&.currency_code || store.read_attribute(:default_currency) || 'USD',
           default_locale: iso_country&.languages_official&.first || store.read_attribute(:default_locale) || 'en',
-          default: true
+          default: true,
+          country_ids: countries.map(&:id)
         )
 
-        countries.each do |country|
-          market.market_countries.build(country: country).save!(validate: false)
-        end
-
         store.update_column(:checkout_zone_id, nil) if checkout_zone_id
 
         puts "  Created market '#{market.name}' with #{countries.size} countries for store '#{store.name}' (#{store.code})"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-08 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -404,16 +404,22 @@ dependencies:
   name: active_storage_validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: mobility
   requirement: !ruby/object:Gem::Requirement
@@ -584,16 +590,16 @@ dependencies:
   name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '43.0'
+        version: '43.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '43.0'
+        version: '43.3'
 description: Spree Models, Helpers, Services and core libraries
 email: hello@spreecommerce.org
 executables: []
@@ -859,6 +865,7 @@ files:
 - app/jobs/spree/gift_cards/bulk_generate_job.rb
 - app/jobs/spree/images/save_from_url_job.rb
 - app/jobs/spree/imports/create_rows_job.rb
+- app/jobs/spree/imports/process_group_job.rb
 - app/jobs/spree/imports/process_rows_job.rb
 - app/jobs/spree/payments/handle_webhook_job.rb
 - app/jobs/spree/products/auto_match_taxons_job.rb
@@ -1144,6 +1151,7 @@ files:
 - app/models/spree/role_user.rb
 - app/models/spree/search_provider/base.rb
 - app/models/spree/search_provider/database.rb
+- app/models/spree/search_provider/filters_result.rb
 - app/models/spree/search_provider/meilisearch.rb
 - app/models/spree/search_provider/search_result.rb
 - app/models/spree/shipment.rb
@@ -1359,6 +1367,7 @@ files:
 - config/importmap.rb
 - config/initializers/active_storage.rb
 - config/initializers/acts_as_taggable_on.rb
+- config/initializers/carmen.rb
 - config/initializers/friendly_id.rb
 - config/initializers/inflections.rb
 - config/initializers/mobility.rb
@@ -1503,6 +1512,8 @@ files:
 - db/migrate/20260402000002_add_color_code_to_spree_option_values.rb
 - db/migrate/20260403000000_add_market_to_spree_orders.rb
 - db/migrate/20260408000001_add_unique_index_to_spree_zone_members.rb
+- db/migrate/20260424000001_add_unique_index_to_spree_payments_response_code.rb
+- db/migrate/20260424100000_add_processing_groups_to_spree_imports.rb
 - db/sample_data/customers.csv
 - db/sample_data/markets.rb
 - db/sample_data/metafield_definitions.rb
@@ -1733,9 +1744,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
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.2
 post_install_message:
 rdoc_options: []
 require_paths: