spree_core 5.2.0.rc1 → 5.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e9c99845e0d1dd7461034a9ec11d3e6d9130126a3ac517e0f7f387ebe43030
-  data.tar.gz: ae4d3a101a3e95d7360747fea07426118191f84e8f12d2b180824f179d1d6b24
+  metadata.gz: dab40885bc7e0251d44dd6a304b6481ecfd0769bb010ac31d52934545e2c6757
+  data.tar.gz: 4997a5779b19f924e737192f1b0539cc84da5ae357110af959ebf0720cfd079f
 SHA512:
-  metadata.gz: 32fd04918e07f12a433c2f0d2628dae894fcc022646deee37629f9626571e6b1e69c12fd608d3397a974c89ee40f4d071a11420eda7dd3a42f5205a3f4e6cdf4
-  data.tar.gz: 339e7572e1e91a7d02ba5b31daddec4388dfa607fb39b23b8d84b63d68eb9baca5b212f5935e9a4d3855ac5799466be542d30cc8fba337269597fd8dbb237194
+  metadata.gz: c54c706398a2f808628857c04ff03fad05107f9649acd18ff5ec879e273d93575b05e009a2a1915d7109f7d62b38582d6c314d536b4448b942872f092528950f
+  data.tar.gz: 50bdfa531705e422848a0207caf2dc52c36bae0464cc9a867df66b4b8723b869a3eeb33cc610ff875d7b5efecbe3bc2fc33f3978833a585a33ca138be596052d

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/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/services/spree/imports/row_processors/product_variant.rb

@@ -52,16 +52,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

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/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.2.0.rc1'.freeze
+  VERSION = '5.2.0.rc2'.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
 

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.rc2
 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-09 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.rc2
   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.rc2
 post_install_message:
 rdoc_options: []
 require_paths: