spree_core 5.4.0.rc5 → 5.4.0.rc7

data/lib/spree/core/configuration.rb

@@ -40,6 +40,7 @@ module Spree
       preference :currency, :string, default: 'USD', deprecated: true
       preference :credit_to_new_allocation, :boolean, default: false
       preference :disable_migration_check, :boolean, default: false # when turned on disables the startup warning about missing engine migrations
+      preference :enable_legacy_default_price, :boolean, default: false # when enabled, keeps the legacy DefaultPrice concern active (has_one :default_price, variant.price= delegation, check_price validation). Disable (default) to use set_price exclusively.
       preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
       preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
       preference :events_log_enabled, :boolean, default: true # Log all Spree events to Rails logger

data/lib/spree/core/controller_helpers/order.rb

@@ -168,18 +168,20 @@ module Spree
         end
 
         def order_includes
+          variant_includes = [
+            :images,
+            :prices,
+            :stock_items,
+            :stock_locations,
+            { option_values: :option_type },
+            { stock_items: :stock_location },
+            { product: :master }
+          ]
+          variant_includes << :default_price if Spree::Config.enable_legacy_default_price
+
           {
             line_items: {
-              variant: [
-                :images,
-                :prices,
-                :default_price,
-                :stock_items,
-                :stock_locations,
-                { option_values: :option_type },
-                { stock_items: :stock_location },
-                { product: :master }
-              ]
+              variant: variant_includes
             }
           }
         end

data/lib/spree/core/engine.rb

@@ -182,6 +182,7 @@ module Spree
 
         Rails.application.config.spree.export_types = [
           Spree::Exports::Products,
+          Spree::Exports::ProductTranslations,
           Spree::Exports::Orders,
           Spree::Exports::Customers,
           Spree::Exports::GiftCards,
@@ -191,6 +192,7 @@ module Spree
 
         Rails.application.config.spree.import_types = [
           Spree::Imports::Products,
+          Spree::Imports::ProductTranslations,
           Spree::Imports::Customers,
         ]
 

data/lib/spree/core/permission_configuration.rb

@@ -45,6 +45,18 @@ module Spree
       @role_permissions[role_key] |= Array(permission_sets)
     end
 
+    # Removes specific permission set(s) from a role.
+    #
+    # @param role_name [Symbol, String] the name of the role
+    # @param permission_sets [Array<Class>, Class] permission set class(es) to remove
+    # @return [Array<Class>] the remaining permission sets
+    def unassign(role_name, permission_sets)
+      role_key = normalize_role_name(role_name)
+      return [] unless @role_permissions[role_key]
+
+      @role_permissions[role_key] -= Array(permission_sets)
+    end
+
     # Clears all permission sets from a role.
     #
     # @param role_name [Symbol, String] the name of the role

data/lib/spree/core/pricing/resolver.rb

@@ -106,11 +106,13 @@ module Spree
         context.variant.prices
       end
 
-      # Builds an empty price for the variant
+      # Returns an empty price placeholder for the variant.
+      # Uses Price.new instead of prices.build to avoid polluting the association
+      # with an unsaved record that would fail validation on variant save.
       # @return [Spree::Price]
       def build_empty_price
-        context.variant.prices.build(
-          variant: context.variant,
+        Spree::Price.new(
+          variant_id: context.variant.id,
           currency: context.currency,
           amount: nil,
           price_list_id: nil

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -154,10 +154,10 @@ module Spree
 
     @@metafield_definition_attributes = [:key, :name, :namespace, :metafield_type, :resource_type, :display_on]
 
-    @@option_type_attributes = [:name, :presentation, :position, :filterable,
-                                option_values_attributes: [:id, :name, :presentation, :position, :_destroy]]
+    @@option_type_attributes = [:name, :presentation, :position, :filterable, :kind,
+                                option_values_attributes: [:id, :name, :presentation, :position, :color_code, :image, :_destroy]]
 
-    @@option_value_attributes = [:name, :presentation, :position]
+    @@option_value_attributes = [:name, :presentation, :position, :color_code, :image]
 
     @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
 

data/lib/spree/testing_support/authorization_helpers.rb

@@ -2,11 +2,12 @@ module Spree
   module TestingSupport
     module AuthorizationHelpers
       module CustomAbility
-        def build_ability(&block)
+        def build_permission_set(&block)
           block ||= proc { |_u| can :manage, :all }
-          Class.new do
-            include CanCan::Ability
-            define_method(:initialize, block)
+          Class.new(Spree::PermissionSets::Base) do
+            define_method(:activate!) do
+              instance_exec(user, &block)
+            end
           end
         end
       end
@@ -29,15 +30,14 @@ module Spree
         include CustomAbility
 
         def stub_authorization!
-          ability = build_ability
-          ability_class = Spree.ability_class
+          permission_set = build_permission_set
 
-          after(:all) do
-            ability_class.remove_ability(ability)
+          before(:all) do
+            Spree.permissions.assign(:admin, permission_set)
           end
 
-          before(:all) do
-            ability_class.register_ability(ability)
+          after(:all) do
+            Spree.permissions.unassign(:admin, permission_set)
           end
 
           let(:admin_user) { FactoryBot.create(:admin_user) }
@@ -50,14 +50,14 @@ module Spree
         end
 
         def custom_authorization!(&block)
-          ability = build_ability(&block)
-          ability_class = Spree.ability_class
+          permission_set = build_permission_set(&block)
 
-          after(:all) do
-            ability_class.remove_ability(ability)
-          end
           before(:all) do
-            ability_class.register_ability(ability)
+            Spree.permissions.assign(:admin, permission_set)
+          end
+
+          after(:all) do
+            Spree.permissions.unassign(:admin, permission_set)
           end
         end
       end

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

@@ -17,6 +17,18 @@ FactoryBot.define do
       end
     end
 
+    factory :product_translation_import, class: 'Spree::Imports::ProductTranslations', parent: :import do
+      type { 'Spree::Imports::ProductTranslations' }
+
+      after(:create) do |import|
+        import.attachment.attach(
+          io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'product_translations_import.csv')),
+          filename: 'product_translations_import.csv',
+          content_type: 'text/csv'
+        )
+      end
+    end
+
     factory :customer_import, class: 'Spree::Imports::Customers', parent: :import do
       type { 'Spree::Imports::Customers' }
 

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

@@ -22,6 +22,17 @@ FactoryBot.define do
     trait :color do
       name { 'color' }
       presentation { 'Color' }
+      kind { 'color_swatch' }
+    end
+
+    trait :color_swatch do
+      name { 'color' }
+      presentation { 'Color' }
+      kind { 'color_swatch' }
+    end
+
+    trait :buttons do
+      kind { 'buttons' }
     end
   end
 end

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

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :base_product, class: Spree::Product do
     sequence(:name)   { |n| "Product #{n}#{Kernel.rand(9999)}" }
     description       { generate(:random_description) }
-    price             { 19.99 }
     cost_price        { 17.00 }
     sku               { generate(:sku) }
     available_on      { 1.year.ago }
@@ -12,17 +11,28 @@ FactoryBot.define do
     status            { 'active' }
     stores            { [Spree::Store.default] }
 
+    transient do
+      price { 19.99 }
+      compare_at_price { nil }
+      currency { nil }
+    end
+
     # ensure stock item will be created for this products master
     # also attach this product to the default store if no stores are passed in
     before(:create) do |_product|
       create(:stock_location) unless Spree::StockLocation.any?
       create(:store, default: true) unless Spree::Store.any?
     end
-    after(:create) do |product|
+    after(:create) do |product, evaluator|
       existing_location_ids = product.master.stock_items.pluck(:stock_location_id)
       Spree::StockLocation.where.not(id: existing_location_ids).find_each do |stock_location|
         stock_location.propagate_variant(product.master)
       end
+
+      if evaluator.price.present?
+        price_currency = evaluator.currency || product.stores.first&.default_currency || 'USD'
+        product.master.set_price(price_currency, evaluator.price, evaluator.compare_at_price)
+      end
     end
 
     factory :custom_product do

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

@@ -2,7 +2,6 @@ FactoryBot.define do
   sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }
 
   factory :base_variant, class: Spree::Variant do
-    price           { 19.99 }
     cost_price      { 17.00 }
     sku             { generate(:sku) }
     weight          { generate(:random_float) }
@@ -16,6 +15,9 @@ FactoryBot.define do
     option_values { [build(:option_value)] }
 
     transient do
+      price { 19.99 }
+      compare_at_price { nil }
+      currency { nil }
       create_stock { true }
     end
 
@@ -31,6 +33,11 @@ FactoryBot.define do
           stock_location.propagate_variant(variant)
         end
       end
+
+      if evaluator.price.present?
+        price_currency = evaluator.currency || variant.product&.stores&.first&.default_currency || 'USD'
+        variant.set_price(price_currency, evaluator.price, evaluator.compare_at_price)
+      end
     end
 
     factory :variant do
@@ -44,7 +51,6 @@ FactoryBot.define do
       trait :with_no_price do
         price { nil }
         cost_price { nil }
-        currency { nil }
       end
     end
 

data/lib/tasks/markets.rake

@@ -27,10 +27,13 @@ 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,
-          countries: countries
+          default: true
         )
 
+        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})"

data/lib/tasks/search.rake

@@ -6,9 +6,9 @@ namespace :spree do
         provider = Spree.search_provider.constantize.new(store)
         total = store.products.count
 
-        puts "Reindexing #{store.name} (#{total} products)..."
-        provider.reindex(store.products)
-        puts "Done."
+        puts "Reindexing #{store.name} (#{total} products) using #{Spree.search_provider}..."
+        indexed = provider.reindex(store.products.preload_associations_lazily)
+        puts "Done. #{indexed || total} documents enqueued."
       end
     end
   end

data/lib/tasks/variants.rake

@@ -1,12 +1,12 @@
 namespace :spree do
   namespace :variants do
-    desc 'Reset image_count counter cache on variants'
+    desc 'Reset media_count counter cache on variants'
     task reset_counter_caches: :environment do |_t, _args|
       puts 'Resetting variant counter caches...'
 
       Spree::Variant.find_each do |variant|
         variant.update_columns(
-          image_count: variant.images.count,
+          media_count: variant.images.count,
           updated_at: Time.current
         )
         print '.'

data/spec/fixtures/files/product_translations_import.csv

@@ -0,0 +1,3 @@
+slug,locale,name,description,meta_title,meta_description
+denim-shirt,de,Jeanshemd,"Ein klassisches Jeanshemd aus 100% Baumwolle.",Jeanshemd | Demo Store,"Klassisches Jeanshemd aus Baumwolle."
+denim-shirt,fr,Chemise en Jean,"Une chemise en jean classique en 100% coton.",Chemise en Jean | Demo Store,"Chemise en jean classique en coton."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc5
+  version: 5.4.0.rc7
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -494,16 +494,22 @@ dependencies:
   name: safely_block
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: phonelib
   requirement: !ruby/object:Gem::Requirement
@@ -967,6 +973,7 @@ files:
 - app/models/spree/exports/gift_cards.rb
 - app/models/spree/exports/newsletter_subscribers.rb
 - app/models/spree/exports/orders.rb
+- app/models/spree/exports/product_translations.rb
 - app/models/spree/exports/products.rb
 - app/models/spree/fulfilment_changer.rb
 - app/models/spree/gateway.rb
@@ -982,8 +989,10 @@ files:
 - app/models/spree/import_row.rb
 - app/models/spree/import_schema.rb
 - app/models/spree/import_schemas/customers.rb
+- app/models/spree/import_schemas/product_translations.rb
 - app/models/spree/import_schemas/products.rb
 - app/models/spree/imports/customers.rb
+- app/models/spree/imports/product_translations.rb
 - app/models/spree/imports/products.rb
 - app/models/spree/integration.rb
 - app/models/spree/inventory_unit.rb
@@ -1205,6 +1214,7 @@ files:
 - app/presenters/spree/csv/metafields_helper.rb
 - app/presenters/spree/csv/newsletter_subscriber_presenter.rb
 - app/presenters/spree/csv/order_line_item_presenter.rb
+- app/presenters/spree/csv/product_translation_presenter.rb
 - app/presenters/spree/csv/product_variant_presenter.rb
 - app/presenters/spree/data_feeds/base_presenter.rb
 - app/presenters/spree/data_feeds/google_presenter.rb
@@ -1261,6 +1271,7 @@ files:
 - app/services/spree/gift_cards/remove.rb
 - app/services/spree/imports/row_processors/base.rb
 - app/services/spree/imports/row_processors/customer.rb
+- app/services/spree/imports/row_processors/product_translation.rb
 - app/services/spree/imports/row_processors/product_variant.rb
 - app/services/spree/line_items/create.rb
 - app/services/spree/line_items/destroy.rb
@@ -1433,6 +1444,7 @@ files:
 - db/migrate/20250127151258_add_phone_to_spree_users.rb
 - db/migrate/20250204162453_create_spree_reports.rb
 - db/migrate/20250207084000_add_accepts_email_marketing_field_to_spree_users_table.rb
+- db/migrate/20250217171018_create_action_text_video_embeds.rb
 - db/migrate/20250304115943_add_performed_by_to_spree_reimbursements.rb
 - db/migrate/20250311105934_create_spree_gateway_customers.rb
 - db/migrate/20250312202705_add_unique_index_on_promotion_rules_associations.rb
@@ -1487,10 +1499,16 @@ files:
 - db/migrate/20260317000000_create_spree_refresh_tokens.rb
 - db/migrate/20260323000000_create_spree_price_histories.rb
 - db/migrate/20260326000001_improve_spree_webhooks.rb
+- db/migrate/20260402000001_add_kind_to_spree_option_types.rb
+- db/migrate/20260402000002_add_color_code_to_spree_option_values.rb
+- db/migrate/20260403000000_add_market_to_spree_orders.rb
 - db/sample_data/customers.csv
+- db/sample_data/markets.rb
 - db/sample_data/metafield_definitions.rb
+- db/sample_data/options.rb
 - db/sample_data/orders.rb
 - db/sample_data/payment_methods.rb
+- db/sample_data/product_translations.csv
 - db/sample_data/products.csv
 - db/sample_data/promotions.rb
 - db/sample_data/shipping_methods.rb
@@ -1685,8 +1703,8 @@ files:
 - lib/tasks/cli.rake
 - lib/tasks/core.rake
 - lib/tasks/dependencies.rake
-- lib/tasks/images.rake
 - lib/tasks/markets.rake
+- lib/tasks/media.rake
 - lib/tasks/price_history.rake
 - lib/tasks/products.rake
 - lib/tasks/sample_data.rake
@@ -1700,6 +1718,7 @@ files:
 - spec/fixtures/files/icon_256x256.png
 - spec/fixtures/files/icon_512x512.png
 - spec/fixtures/files/img_256x128.png
+- spec/fixtures/files/product_translations_import.csv
 - spec/fixtures/files/products_import.csv
 - spec/fixtures/text-file.txt
 - spec/fixtures/thinking-cat.jpg
@@ -1713,9 +1732,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.rc5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc7
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc5
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc7
 post_install_message:
 rdoc_options: []
 require_paths: