spree_core 5.2.0.rc1 → 5.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e9c99845e0d1dd7461034a9ec11d3e6d9130126a3ac517e0f7f387ebe43030
-  data.tar.gz: ae4d3a101a3e95d7360747fea07426118191f84e8f12d2b180824f179d1d6b24
+  metadata.gz: 531657763d76e0ce76fb2845acfeb30c110343666bc5e8e727de1f21249da4cd
+  data.tar.gz: 2d4f33f07d6b90d61c9578575889c7c597a39b98e19597c90f902e312832af2c
 SHA512:
-  metadata.gz: 32fd04918e07f12a433c2f0d2628dae894fcc022646deee37629f9626571e6b1e69c12fd608d3397a974c89ee40f4d071a11420eda7dd3a42f5205a3f4e6cdf4
-  data.tar.gz: 339e7572e1e91a7d02ba5b31daddec4388dfa607fb39b23b8d84b63d68eb9baca5b212f5935e9a4d3855ac5799466be542d30cc8fba337269597fd8dbb237194
+  metadata.gz: 1a5aa4b5e32b63a67c2cb557a77014fe1d6cbd55d4f1df437480ff2c3502e4f9fbb533caea745e90a3cb7fd8013439d591f4247c5203e44e75dec638a62abf3e
+  data.tar.gz: 7b66c4d564e21310dbc962eb1398886441a0a374b85f955a1e317cdbaef8fb27ea312d1987c33c611138e6ff1bf48e9f4de6a7301f0666423658bf7f831ec0ab

data/app/jobs/spree/images/save_from_url_job.rb

@@ -1,10 +1,11 @@
 require 'open-uri'
+require 'openssl'
 
 module Spree
   module Images
     class SaveFromUrlJob < ::Spree::BaseJob
       queue_as Spree.queues.images
-      retry_on ActiveRecord::RecordInvalid, OpenURI::HTTPError, wait: :polynomially_longer, attempts: 2
+      retry_on ActiveRecord::RecordInvalid, OpenURI::HTTPError, wait: :polynomially_longer, attempts: Spree::Config.images_save_from_url_job_attempts.to_i
       discard_on URI::InvalidURIError
 
       def perform(viewable_id, viewable_type, external_url, external_id = nil, position = nil)
@@ -33,7 +34,17 @@ module Spree
           raise URI::InvalidURIError, "Invalid URL scheme: #{uri.scheme}. Only http and https are allowed."
         end
 
-        file = uri.open
+        file = uri.open(
+          'User-Agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+          'Accept' => 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8',
+          'Accept-Language' => 'en-US,en;q=0.9',
+          'Accept-Encoding' => 'gzip, deflate, br',
+          'Cache-Control' => 'no-cache',
+          'Pragma' => 'no-cache',
+          read_timeout: 60,
+          ssl_verify_mode: OpenSSL::SSL::VERIFY_PEER,
+          redirect: true
+        )
         filename = File.basename(uri.path)
 
         image.attachment.attach(io: file, filename: filename)

data/app/models/spree/import_row.rb

@@ -76,6 +76,7 @@ module Spree
       self.item = import.row_processor_class.new(self).process!
       complete!
     rescue StandardError => e
+      Rails.error.report(e, handled: true, context: { import_row_id: id }, source: 'spree.core')
       self.validation_errors = e.message
       fail!
     end

data/app/models/spree/import_schemas/products.rb

@@ -26,7 +26,7 @@ module Spree
         { name: 'inventory_count', label: 'Inventory Count' },
         { name: 'inventory_backorderable', label: 'Inventory Backorderable' },
         { name: 'tax_category', label: 'Tax Category' },
-        { name: 'digital', label: 'Digital' },
+        { name: 'shipping_category', label: 'Shipping Category' },
         { name: 'image1_src', label: 'Image 1 URL' },
         { name: 'image2_src', label: 'Image 2 URL' },
         { name: 'image3_src', label: 'Image 3 URL' },

data/app/models/spree/line_item.rb

@@ -82,13 +82,19 @@ module Spree
     end
 
     extend DisplayMoney
-    money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,
+    money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price, :discounted_price,
                   :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,
                   :pre_tax_amount, :shipping_cost, :tax_total, :compare_at_amount
 
     alias single_money display_price
     alias single_display_amount display_price
 
+    def discounted_price
+      return price if quantity.zero?
+
+      price - (promo_total.abs / quantity)
+    end
+
     def amount
       price * quantity
     end

data/app/models/spree/post.rb

@@ -39,8 +39,8 @@ module Spree
     # Associations
     #
     belongs_to :author, class_name: Spree.admin_user_class.to_s, optional: true
-    belongs_to :store, class_name: 'Spree::Store'
-    belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true
+    belongs_to :store, class_name: 'Spree::Store', inverse_of: :posts
+    belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true, touch: true, inverse_of: :posts
     alias category post_category
 
     #

data/app/models/spree/post_category.rb

@@ -9,8 +9,8 @@ module Spree
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
-    has_many :posts, class_name: 'Spree::Post'
+    belongs_to :store, class_name: 'Spree::Store', inverse_of: :post_categories
+    has_many :posts, class_name: 'Spree::Post', dependent: :nullify, inverse_of: :post_category
 
     #
     # Validations
@@ -18,8 +18,16 @@ module Spree
     validates :title, :store, presence: true
     validates :slug, presence: true, uniqueness: { scope: :store_id }
 
+    #
+    # ActionText
+    #
     has_rich_text :description
 
+    #
+    # Ransack
+    #
+    self.whitelisted_ransackable_attributes = %w[title slug]
+
     def should_generate_new_friendly_id?
       slug.blank? || title_changed?
     end

data/app/models/spree/shipping_rate.rb

@@ -7,9 +7,9 @@ module Spree
 
     money_methods :base_price, :final_price, :tax_amount
 
-    delegate :order, :currency, :free?, :with_free_shipping_promotion?, to: :shipment
-    delegate :name,             to: :shipping_method
-    delegate :code,             to: :shipping_method, prefix: true
+    delegate :order, :currency, :with_free_shipping_promotion?, to: :shipment
+    delegate :name, to: :shipping_method
+    delegate :code, to: :shipping_method, prefix: true
 
     def display_price
       price = display_base_price.to_s
@@ -27,6 +27,10 @@ module Spree
     alias display_cost display_price
     alias_attribute :base_price, :cost
 
+    def free?
+      final_price.zero?
+    end
+
     def tax_amount
       @tax_amount ||= tax_rate&.calculator&.compute_shipping_rate(self) || BigDecimal(0)
     end

data/app/models/spree/store.rb

@@ -106,8 +106,8 @@ module Spree
     has_many :custom_domains, class_name: 'Spree::CustomDomain', dependent: :destroy
     has_one :default_custom_domain, -> { where(default: true) }, class_name: 'Spree::CustomDomain'
 
-    has_many :posts, class_name: 'Spree::Post'
-    has_many :post_categories, class_name: 'Spree::PostCategory'
+    has_many :posts, class_name: 'Spree::Post', dependent: :destroy, inverse_of: :store
+    has_many :post_categories, class_name: 'Spree::PostCategory', dependent: :destroy, inverse_of: :store
 
     has_many :integrations, class_name: 'Spree::Integration'
 

data/app/models/spree/variant.rb

@@ -403,11 +403,10 @@ module Spree
 
     def set_stock(count_on_hand, backorderable = nil, stock_location = nil)
       stock_location ||= Spree::Store.current.default_stock_location
-      stock_items.find_or_initialize_by(stock_location: stock_location) do |stock_item|
-        stock_item.count_on_hand = count_on_hand
-        stock_item.backorderable = backorderable if backorderable.present?
-        stock_item.save!
-      end
+      stock_item = stock_items.find_or_initialize_by(stock_location: stock_location)
+      stock_item.count_on_hand = count_on_hand
+      stock_item.backorderable = backorderable if backorderable.present?
+      stock_item.save!
     end
 
     def price_modifier_amount_in(currency, options = {})

data/app/presenters/spree/csv/product_variant_presenter.rb

@@ -32,7 +32,7 @@ module Spree
         'inventory_count',
         'inventory_backorderable',
         'tax_category',
-        'digital',
+        'shipping_category',
         'image1_src',
         'image2_src',
         'image3_src',
@@ -66,7 +66,7 @@ module Spree
       # For the primary variant row (when the index is zero), product-level details such as name,
       # slug, status, vendor and brand names, description, meta tags, and tag/label lists are included.
       # In all cases, variant-specific attributes (e.g., id, SKU, pricing, dimensions, weight,
-      # availability dates, inventory count, digital flag, tax category, image URLs via original_url,
+      # availability dates, inventory count, shipping category, tax category, image URLs via original_url,
       # and the first three option types and corresponding option values) are appended.
       # Additionally, when the index is zero, associated taxons and properties are added.
       #
@@ -103,7 +103,7 @@ module Spree
           total_on_hand == BigDecimal::INFINITY ? '∞' : total_on_hand,
           variant.backorderable?,
           variant.tax_category&.name,
-          variant.digital?,
+          product.shipping_category&.name,
           spree_image_url(variant.images[0], image_url_options),
           spree_image_url(variant.images[1], image_url_options),
           spree_image_url(variant.images[2], image_url_options),

data/app/services/spree/imports/row_processors/product_variant.rb

@@ -33,6 +33,12 @@ module Spree
           variant.depth = attributes['depth'] if attributes['depth'].present?
           variant.track_inventory = attributes['track_inventory'] if attributes['track_inventory'].present?
           variant.option_value_variants = prepare_option_value_variants
+
+          if attributes['tax_category'].present?
+            tax_category = prepare_tax_category
+            variant.tax_category = tax_category if tax_category.present?
+          end
+
           variant.save!
 
           if attributes['price'].present?
@@ -52,16 +58,26 @@ module Spree
         private
 
         def ensure_product_exists
-          product = Spree::Product.new
-          if attributes['slug'].present?
-            existing_product = product_scope.find_by(slug: attributes['slug'].strip.downcase)
-            product = existing_product if existing_product.present?
-          end
+          if options.empty?
+            # For master variants, create or update the product
+            product = Spree::Product.new
+            if attributes['slug'].present?
+              existing_product = product_scope.find_by(slug: attributes['slug'].strip.downcase)
+              product = existing_product if existing_product.present?
+            end
 
-          product = assign_attributes_to_product(product)
-          product.save!
-          handle_metafields(product)
-          product
+            product = assign_attributes_to_product(product)
+            product.save!
+            handle_metafields(product)
+            product
+          else
+            # For non-master variants, only look up the product
+            if attributes['slug'].present?
+              product_scope.find_by!(slug: attributes['slug'].strip.downcase)
+            else
+              raise ActiveRecord::RecordNotFound, 'Product slug is required for variant rows'
+            end
+          end
         end
 
         def product_scope
@@ -84,10 +100,27 @@ module Spree
           product.status = to_spree_status(attributes['status']) if attributes['status'].present?
           product.tag_list = attributes['tags'] if attributes['tags'].present?
 
-          product.taxons = prepare_taxons if options.empty?
+          if options.empty?
+            if attributes['shipping_category'].present?
+              shipping_category = prepare_shipping_category
+              product.shipping_category = shipping_category if shipping_category.present?
+            end
+            product.taxons = prepare_taxons
+          end
+
           product
         end
 
+        def prepare_shipping_category
+          shipping_category_name = attributes['shipping_category'].strip
+          Spree::ShippingCategory.find_by(name: shipping_category_name)
+        end
+
+        def prepare_tax_category
+          tax_category_name = attributes['tax_category'].strip
+          Spree::TaxCategory.find_by(name: tax_category_name)
+        end
+
         def prepare_taxons
           taxon_pretty_names = [
             attributes['category1'],

data/app/services/spree/seeds/admin_user.rb

@@ -6,11 +6,11 @@ module Spree
       def call
         if Spree.admin_user_class.present? && Spree.admin_user_class.count.zero?
           user = Spree.admin_user_class.create!(
-            email: 'spree@example.com',
-            password: 'spree123',
-            password_confirmation: 'spree123',
-            first_name: 'Spree',
-            last_name: 'Admin'
+            email: ENV.fetch('ADMIN_EMAIL', 'spree@example.com'),
+            password: ENV.fetch('ADMIN_PASSWORD', 'spree123'),
+            password_confirmation: ENV.fetch('ADMIN_PASSWORD', 'spree123'),
+            first_name: ENV.fetch('ADMIN_FIRST_NAME', 'Spree'),
+            last_name: ENV.fetch('ADMIN_LAST_NAME', 'Admin')
           )
           user.save!
 

data/lib/generators/spree/authentication/devise/devise_generator.rb

@@ -48,6 +48,30 @@ module Spree
           say "Please replace < ApplicationRecord with < Spree.base_class in #{user_class_file}"
         end
 
+        if Spree.admin_user_class != Spree.user_class
+          admin_user_class_file = Rails.root.join('app', 'models', "#{Spree.admin_user_class.name.underscore}.rb")
+
+          if File.exist?(admin_user_class_file)
+            inject_into_file admin_user_class_file, after: "class #{Spree.admin_user_class.name} < ApplicationRecord\n" do
+              <<-RUBY
+    # Spree modules
+    include Spree::UserMethods
+              RUBY
+            end
+            gsub_file admin_user_class_file, "< ApplicationRecord", "< Spree.base_class"
+
+            say "Successfully added Spree admin user modules into #{admin_user_class_file}"
+          else
+            say "Could not locate admin user model file at #{admin_user_class_file}. Please add these lines manually:", :red
+            say <<~RUBY
+              # Spree modules
+              include Spree::UserMethods
+            RUBY
+
+            say "Please replace < ApplicationRecord with < Spree.base_class in #{admin_user_class_file}"
+          end
+        end
+
         append_file 'config/initializers/spree.rb' do
           %Q{
             if defined?(Devise) && Devise.respond_to?(:parent_controller)

data/lib/generators/spree/install/install_generator.rb

@@ -14,6 +14,7 @@ module Spree
     class_option :install_admin, type: :boolean, default: false, banner: 'installs default rails admin'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
+    class_option :admin_user_class, type: :string
     class_option :admin_email, type: :string
     class_option :admin_password, type: :string
     class_option :lib_name, type: :string, default: 'spree'
@@ -69,6 +70,11 @@ module Spree
     def install_admin
       if @install_admin && Spree::Core::Engine.admin_available?
         generate 'spree:admin:install'
+
+        # generate devise controllers if authentication is devise
+        if @authentication == 'devise'
+          generate 'spree:admin:devise'
+        end
       end
     end
 
@@ -95,7 +101,6 @@ module Spree
       append_file 'db/seeds.rb', <<-SEEDS.strip_heredoc
 
         Spree::Core::Engine.load_seed if defined?(Spree::Core)
-        Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
       SEEDS
     end
 
@@ -133,7 +138,7 @@ module Spree
           cmd.call
         end
       else
-        say_status :skipping, 'seed data (you can always run rake db:seed)'
+        say_status :skipping, 'seed data (you can always run bin/rails db:seed)'
       end
     end
 

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -91,5 +91,4 @@ Rails.application.config.after_initialize do
 end
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>
-# Use a different class for admin users
-# Spree.admin_user_class = 'AdminUser'
+Spree.admin_user_class = <%= (options[:admin_user_class].blank? ? (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]) : options[:admin_user_class]).inspect %>

data/lib/spree/core/configuration.rb

@@ -45,6 +45,7 @@ module Spree
       preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
       preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
       preference :geocode_addresses, :boolean, default: true
+      preference :images_save_from_url_job_attempts, :integer, default: 5
       preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
       preference :logo, :string, deprecated: true
       preference :mailer_logo, :string, deprecated: true

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

@@ -118,11 +118,20 @@ module Spree
             value: token,
             expires: 90.days.from_now,
             secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],
-            domain: current_store.url_or_custom_domain,
+            domain: cookie_domain_without_port,
             httponly: true
           }
         end
 
+        def cookie_domain_without_port
+          domain = current_store.url_or_custom_domain
+          return nil if domain.blank?
+
+          # Remove port from domain (e.g., "localhost:3000" -> "localhost")
+          # Cookies don't support port numbers in the domain attribute
+          domain.split(':').first
+        end
+
         def last_incomplete_order(includes = {})
           @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)
         end

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

@@ -3,6 +3,8 @@ module Spree
     module Importer
       class Order
         def self.import(user, params)
+          Spree::Deprecation.warn('Spree::Core::Importer::Order is deprecated and will be removed in Spree 6.0. Please use `Spree::Imports::Order` instead.')
+
           ensure_country_id_from_params params[:ship_address_attributes]
           ensure_state_id_from_params params[:ship_address_attributes]
           ensure_country_id_from_params params[:bill_address_attributes]

data/lib/spree/core/importer/product.rb

@@ -5,6 +5,8 @@ module Spree
         attr_reader :product, :product_attrs, :variants_attrs, :options_attrs, :store
 
         def initialize(product, product_params, options = {})
+          Spree::Deprecation.warn('Spree::Core::Importer::Product is deprecated and will be removed in Spree 6.0. Please use `Spree::Imports::Product` instead.')
+
           @store = options[:store] || Spree::Store.default
           @product = product || Spree::Product.new(product_params)
           @product.stores << @store if @product.stores.exclude?(@store)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.2.0.rc1'.freeze
+  VERSION = '5.2.0.rc3'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/common_rake.rb

@@ -30,6 +30,7 @@ namespace :common do
     Spree::DummyGenerator.start dummy_app_args
 
     unless skip_javascript
+      system('bundle add sprockets-rails') # we need this until we will remove bootstrap/popper_js gems
       system('bundle exec rails importmap:install turbo:install stimulus:install')
     end
 

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

@@ -11,11 +11,11 @@ FactoryBot.define do
   end
 
   factory :shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 10.0) }
+    preferred_amount { 10.0 }
   end
 
   factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 0) }
+    preferred_amount { 0 }
   end
 
   factory :flat_rate_calculator, class: Spree::Calculator::FlatRate do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-04 00:00:00.000000000 Z
+date: 2025-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1656,9 +1656,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.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0.rc3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths: