solidus_core 4.4.1 → 4.5.0

data/lib/spree/permission_sets/order_display.rb

@@ -1,50 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read permissions for orders.
-    #
-    # This permission set allows users to view all related information about
-    # orders, also from the admin panel, including:
-    #
-    # - Orders
-    # - Payments
-    # - Shipments
-    # - Adjustments
-    # - Line items
-    # - Return authorizations
-    # - Customer returns
-    # - Order cancellations
-    # - Reimbursements
-    # - Return items
-    # - Refunds
-    #
-    # However, it does not allow any modifications to be made to any of these
-    # resources.
-    class OrderDisplay < PermissionSets::Base
-      class << self
-        def privilege
-          :display
-        end
-
-        def category
-          :order
-        end
-      end
-
-      def activate!
-        can [:read, :admin, :edit, :cart], Spree::Order
-        can [:read, :admin], Spree::Payment
-        can [:read, :admin], Spree::Shipment
-        can [:read, :admin], Spree::Adjustment
-        can [:read, :admin], Spree::LineItem
-        can [:read, :admin], Spree::ReturnAuthorization
-        can [:read, :admin], Spree::CustomerReturn
-        can [:read, :admin], Spree::OrderCancellations
-        can [:read, :admin], Spree::Reimbursement
-        can [:read, :admin], Spree::ReturnItem
-        can [:read, :admin], Spree::Refund
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/order_management.rb

@@ -1,50 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for order management.
-    #
-    # This permission set grants full control over all order and related resources,
-    # including:
-    #
-    # - Orders
-    # - Payments
-    # - Shipments
-    # - Adjustments
-    # - Line items
-    # - Return authorizations
-    # - Customer returns
-    # - Order cancellations
-    # - Reimbursements
-    # - Return items
-    # - Refunds
-    #
-    # It also allows reading reimbursement types, but not modifying them.
-    class OrderManagement < PermissionSets::Base
-      class << self
-        def privilege
-          :management
-        end
-
-        def category
-          :order
-        end
-      end
-
-      def activate!
-        can :read, Spree::ReimbursementType
-        can :manage, Spree::Order
-        can :manage, Spree::Payment
-        can :manage, Spree::Shipment
-        can :manage, Spree::Adjustment
-        can :manage, Spree::LineItem
-        can :manage, Spree::ReturnAuthorization
-        can :manage, Spree::CustomerReturn
-        can :manage, Spree::OrderCancellations
-        can :manage, Spree::Reimbursement
-        can :manage, Spree::ReturnItem
-        can :manage, Spree::Refund
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/product_display.rb

@@ -1,43 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read-only permissions for products.
-    #
-    # This permission set allows users to view all related information about
-    # products, also from the admin panel, including:
-    #
-    # - Products
-    # - Images
-    # - Variants
-    # - Option values
-    # - Product properties
-    # - Option types
-    # - Properties
-    # - Taxonomies
-    # - Taxons
-    class ProductDisplay < PermissionSets::Base
-      class << self
-        def privilege
-          :display
-        end
-
-        def category
-          :product
-        end
-      end
-
-      def activate!
-        can [:read, :admin, :edit], Spree::Product
-        can [:read, :admin], Spree::Image
-        can [:read, :admin], Spree::Variant
-        can [:read, :admin], Spree::OptionValue
-        can [:read, :admin], Spree::ProductProperty
-        can [:read, :admin], Spree::OptionType
-        can [:read, :admin], Spree::Property
-        can [:read, :admin], Spree::Taxonomy
-        can [:read, :admin], Spree::Taxon
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/product_management.rb

@@ -1,47 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for product management.
-    #
-    # This permission set grants full control over all product and related resources,
-    # including:
-    #
-    # - Products
-    # - Images
-    # - Variants
-    # - Option values
-    # - Product properties
-    # - Option types
-    # - Properties
-    # - Taxonomies
-    # - Taxons
-    # - Classifications
-    # - Prices
-    class ProductManagement < PermissionSets::Base
-      class << self
-        def privilege
-          :management
-        end
-
-        def category
-          :product
-        end
-      end
-
-      def activate!
-        can :manage, Spree::Classification
-        can :manage, Spree::Image
-        can :manage, Spree::OptionType
-        can :manage, Spree::OptionValue
-        can :manage, Spree::Price
-        can :manage, Spree::Product
-        can :manage, Spree::ProductProperty
-        can :manage, Spree::Property
-        can :manage, Spree::Taxon
-        can :manage, Spree::Taxonomy
-        can :manage, Spree::Variant
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/restricted_stock_display.rb

@@ -1,33 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read permissions for stock limited to allowed locations.
-    #
-    # This permission set allows users to view information about stock items and
-    # locations, both of them limited to locations they have access to.
-    # Permissions are also granted for the admin panel for items.
-    class RestrictedStockDisplay < PermissionSets::Base
-      class << self
-        def privilege
-          :display
-        end
-
-        def category
-          :restricted_stock
-        end
-      end
-
-      def activate!
-        can [:read, :admin], Spree::StockItem, stock_location_id: location_ids
-        can :read, Spree::StockLocation, id: location_ids
-      end
-
-      private
-
-      def location_ids
-        @ids ||= user.stock_locations.pluck(:id)
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/restricted_stock_management.rb

@@ -1,33 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for stock management limited to allowed locations.
-    #
-    # This permission set grants full control over all stock items a user has
-    # access to their locations. Those locations are also readable by the
-    # corresponding ability.
-    class RestrictedStockManagement < PermissionSets::Base
-      class << self
-        def privilege
-          :management
-        end
-
-        def category
-          :restricted_stock
-        end
-      end
-
-      def activate!
-        can :manage, Spree::StockItem, stock_location_id: location_ids
-        can :read, Spree::StockLocation, id: location_ids
-      end
-
-      private
-
-      def location_ids
-        @ids ||= user.stock_locations.pluck(:id)
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/stock_display.rb

@@ -1,26 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read-only permissions for stock.
-    #
-    # This permission set allows users to view information about stock items
-    # (also from the admin panel) and stock locations.
-    class StockDisplay < PermissionSets::Base
-      class << self
-        def privilege
-          :display
-        end
-
-        def category
-          :stock
-        end
-      end
-
-      def activate!
-        can [:read, :admin], Spree::StockItem
-        can :read, Spree::StockLocation
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/stock_management.rb

@@ -1,26 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for stock management.
-    #
-    # This permission set grants full control over all stock items and read
-    # access to locations.
-    class StockManagement < PermissionSets::Base
-      class << self
-        def privilege
-          :management
-        end
-
-        def category
-          :stock
-        end
-      end
-
-      def activate!
-        can :manage, Spree::StockItem
-        can :read, Spree::StockLocation
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/super_user.rb

@@ -1,26 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for store administration.
-    #
-    # This permission set is always added to users with the `:admin` role.
-    #
-    # It grants permission to perform any read or write action on any resource.
-    class SuperUser < PermissionSets::Base
-      class << self
-        def privilege
-          :other
-        end
-
-        def category
-          :super_user
-        end
-      end
-
-      def activate!
-        can :manage, :all
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/user_display.rb

@@ -1,27 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read-only permissions for users, roles and store credits.
-    #
-    # This permission set allows users to view all related information about
-    # users, roles and store credits, also from the admin panel.
-    class UserDisplay < PermissionSets::Base
-      class << self
-        def privilege
-          :display
-        end
-
-        def category
-          :user
-        end
-      end
-
-      def activate!
-        can [:read, :admin, :edit, :addresses, :orders, :items], Spree.user_class
-        can [:read, :admin], Spree::StoreCredit
-        can :read, Spree::Role
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/user_management.rb

@@ -1,44 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for user management.
-    #
-    # This permission set grants full control over all user and
-    # related resources, including:
-    #
-    # - Users
-    # - Store credits
-    # - Roles
-    # - API keys
-    class UserManagement < PermissionSets::Base
-      class << self
-        def privilege
-          :management
-        end
-
-        def category
-          :user
-        end
-      end
-
-      def activate!
-        can [:admin, :read, :create, :update, :save_in_address_book, :remove_from_address_book, :addresses, :orders, :items], Spree.user_class
-
-        # Note: This does not work with accessible_by.
-        # See https://github.com/solidusio/solidus/pull/1263
-        can :update_email, Spree.user_class do |user|
-          user.spree_roles.none?
-        end
-        can :update_password, Spree.user_class do |user|
-          user.spree_roles.none?
-        end
-
-        cannot :destroy, Spree.user_class
-        can :manage, Spree::StoreCredit
-        can :manage, :api_key
-        can :read, Spree::Role
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets.rb

@@ -1,18 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/permission_sets/base'
-require 'spree/permission_sets/configuration_display'
-require 'spree/permission_sets/configuration_management'
-require 'spree/permission_sets/dashboard_display'
-require 'spree/permission_sets/default_customer'
-require 'spree/permission_sets/order_display'
-require 'spree/permission_sets/order_management'
-require 'spree/permission_sets/product_display'
-require 'spree/permission_sets/product_management'
-require 'spree/permission_sets/restricted_stock_display'
-require 'spree/permission_sets/restricted_stock_management'
-require 'spree/permission_sets/stock_display'
-require 'spree/permission_sets/stock_management'
-require 'spree/permission_sets/super_user'
-require 'spree/permission_sets/user_display'
-require 'spree/permission_sets/user_management'
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permitted_attributes.rb

@@ -14,6 +14,7 @@ module Spree
       :checkout_confirm_attributes,
       :credit_card_update_attributes,
       :customer_return_attributes,
+      :customer_metadata_attributes,
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
@@ -55,21 +56,23 @@ module Spree
       :stock_location_id, return_items_attributes: [
         :id, :inventory_unit_id, :return_authorization_id, :returned, :amount,
         :reception_status_event, :acceptance_status, :exchange_variant_id,
-        :resellable, :return_reason_id
+        :resellable, :return_reason_id, customer_metadata: {}
       ]
     ]
 
+    @@customer_metadata_attributes = [customer_metadata: {}]
+
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
     @@inventory_unit_attributes = [:shipment, :variant_id]
 
-    @@line_item_attributes = [:id, :variant_id, :quantity]
+    @@line_item_attributes = [:id, :variant_id, :quantity, customer_metadata: {}]
 
     @@option_value_attributes = [:name, :presentation]
 
     @@option_type_attributes = [:name, :presentation, option_values_attributes: option_value_attributes]
 
-    @@payment_attributes = [:amount, :payment_method_id, :payment_method]
+    @@payment_attributes = [:amount, :payment_method_id, :payment_method, customer_metadata: {}]
 
     @@product_properties_attributes = [:property_name, :value, :position]
 
@@ -78,16 +81,24 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :option_type_ids, :cost_currency, :cost_price
+      :taxon_ids, :option_type_ids, :cost_currency, :cost_price, :primary_taxon_id,
+      :gtin, :condition
     ]
 
     @@property_attributes = [:name, :presentation]
 
-    @@return_authorization_attributes = [:memo, :stock_location_id, :return_reason_id, return_items_attributes: [:inventory_unit_id, :exchange_variant_id, :return_reason_id, :preferred_reimbursement_type_id]]
+    @@return_authorization_attributes = [:memo, :stock_location_id, :return_reason_id,
+                                         customer_metadata: {},
+                                         return_items_attributes: [
+                                           :inventory_unit_id,
+                                           :exchange_variant_id,
+                                           :return_reason_id,
+                                           :preferred_reimbursement_type_id
+                                         ]]
 
     @@shipment_attributes = [
       :special_instructions, :stock_location_id, :id, :tracking,
-      :selected_shipping_rate_id
+      :selected_shipping_rate_id, customer_metadata: {}
     ]
 
     # month / year may be provided by some sources, or others may elect to use one field
@@ -126,7 +137,7 @@ module Spree
     # by changing a user with higher priveleges' email to one a lower-priveleged
     # admin owns. Creating a user with an email is handled separate at the
     # controller level.
-    @@user_attributes = [:password, :password_confirmation]
+    @@user_attributes = [:password, :password_confirmation, customer_metadata: {}]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,

data/lib/spree/preferences/configuration.rb

@@ -173,6 +173,10 @@ module Spree::Preferences
         class_name = class_name.constantize if class_name.is_a?(String)
         class_name
       end
+
+      define_method("#{name}_name") do
+        instance_variable_get(ivar) || default
+      end
     end
 
     def self.by_version(*args)

data/lib/spree/preferences/persistable.rb

@@ -8,7 +8,7 @@ module Spree
       included do
         include Spree::Preferences::Preferable
 
-        if method(:serialize).parameters.include?([:key, :type]) # Rails 7.1+
+        if Rails.gem_version >= Gem::Version.new('7.1')
           serialize :preferences, type: Hash, coder: YAML
         else
           serialize :preferences, Hash, coder: YAML

data/lib/spree/testing_support/capybara_ext.rb

@@ -110,6 +110,16 @@ module Spree
         # find the original.
         find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
       end
+
+      def dialog(parent: 'body', **options)
+        within(parent) do
+          find('dialog', visible: :all, **options)
+        end
+      end
+
+      def turbo_frame_modal
+        dialog(parent: find('turbo-frame', visible: :all))
+      end
     end
   end
 end

data/lib/spree/testing_support/dummy_app.rb

@@ -80,7 +80,7 @@ module DummyApp
       config.action_dispatch.show_exceptions = false
     end
     config.consider_all_requests_local = true
-    config.active_support.deprecation = :stderr
+    config.active_support.deprecation = ENV['RAILS_DEPRECATIONS_BEHAVIOR'].presence&.to_sym || :stderr
     config.log_level = :debug
 
     # Improve test suite performance:

data/lib/spree/testing_support/extension_rake.rb

@@ -4,8 +4,8 @@ require 'spree/testing_support/common_rake'
 
 desc "Generates a dummy app for testing an extension"
 namespace :extension do
-  task :test_app, [:user_class] do |_t, _args|
+  task :test_app, [:user_class] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
-    Rake::Task['common:test_app'].invoke
+    Rake::Task['common:test_app'].invoke(args[:user_class])
   end
 end

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

@@ -43,7 +43,15 @@ FactoryBot.define do
         evaluator.stock_location # must evaluate before creating line items
 
         evaluator.line_items_attributes.each do |attributes|
-          attributes = { order:, price: evaluator.line_items_price }.merge(attributes)
+          attributes = { order:, price: evaluator.line_items_price }.merge(attributes).tap do |attrs|
+            tax_category = attributes.delete(:tax_category)
+            if attrs[:variant] && tax_category
+              attrs[:variant].update(tax_category: )
+            elsif tax_category
+              attrs[:variant] = create(:variant, tax_category: )
+            end
+          end
+
           create(:line_item, attributes)
         end
         order.line_items.reload

data/lib/spree/user_class_handle.rb

@@ -21,8 +21,8 @@ module Spree
     # @return [String] the name of the user class as a string.
     # @raise [RuntimeError] if Spree.user_class is nil
     def to_s
-      fail "'Spree.user_class' has not been set yet." unless Spree.user_class
-      "::#{Spree.user_class}"
+      fail "'Spree.user_class' has not been set yet." unless Spree.user_class_name
+      "::#{Spree.user_class_name}"
     end
   end
 end

data/solidus_core.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 7.0', '< 8.0.0.beta1']
+    s.add_dependency rails_dep, ['>= 7.0', '< 8.1.0.beta1']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'