solidus_core 4.3.4 → 4.4.0

data/lib/spree/app_configuration.rb

@@ -26,6 +26,7 @@ require 'uri'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
+    include Spree::Core::EnvironmentExtension
     # Preferences (alphabetized to more easily lookup particular preferences)
 
     # @!attribute [rw] address_requires_phone
@@ -216,10 +217,6 @@ module Spree
     #   @return [Integer] Products to show per-page in the frontend (default: +12+)
     preference :products_per_page, :integer, default: 12
 
-    # @!attribute [rw] promotions_per_page
-    #   @return [Integer] Promotions to show per-page in the admin (default: +15+)
-    preference :promotions_per_page, :integer, default: 15
-
     # @!attribute [rw] require_master_price
     #   @return [Boolean] Require a price on the master variant of a product (default: +true+)
     preference :require_master_price, :boolean, default: true
@@ -324,12 +321,6 @@ module Spree
     #   Spree::Variant::VatPriceGenerator.
     class_name_attribute :variant_vat_prices_generator_class, default: 'Spree::Variant::VatPriceGenerator'
 
-    # promotion_chooser_class allows extensions to provide their own PromotionChooser
-    class_name_attribute :promotion_chooser_class, default: 'Spree::PromotionChooser'
-
-    # promotion_adjuster_class allows extensions to provide their own Promotion Adjuster
-    class_name_attribute :promotion_adjuster_class, default: 'Spree::Promotion::OrderAdjustmentsRecalculator'
-
     class_name_attribute :allocator_class, default: 'Spree::Stock::Allocator::OnHandFirst'
 
     class_name_attribute :shipping_rate_sorter_class, default: 'Spree::Stock::ShippingRateSorter'
@@ -367,31 +358,6 @@ module Spree
     #   Spree::OrderUpdater.
     class_name_attribute :order_recalculator_class, default: 'Spree::OrderUpdater'
 
-    # Allows providing a different coupon code handler.
-    # @!attribute [rw] coupon_code_handler_class
-    # @see Spree::PromotionHandler::Coupon
-    # @return [Class] an object that conforms to the API of
-    #   the standard coupon code handler class
-    #   Spree::PromotionHandler::Coupon.
-    class_name_attribute :coupon_code_handler_class, default: 'Spree::PromotionHandler::Coupon'
-
-    # Allows providing a different shipping promotion handler.
-    # @!attribute [rw] shipping_promotion_handler_class
-    # @see Spree::PromotionHandler::Shipping
-    # @return [Class] an object that conforms to the API of
-    #   the standard shipping promotion handler class
-    #   Spree::PromotionHandler::Coupon.
-    class_name_attribute :shipping_promotion_handler_class, default: 'Spree::PromotionHandler::Shipping'
-
-    # Allows providing your own Mailer for promotion code batch mailer.
-    #
-    # @!attribute [rw] promotion_code_batch_mailer_class
-    # @return [ActionMailer::Base] an object that responds to "promotion_code_batch_finished",
-    #   and "promotion_code_batch_errored"
-    #   (e.g. an ActionMailer with a "promotion_code_batch_finished" method) with the same
-    #   signature as Spree::PromotionCodeBatchMailer.promotion_code_batch_finished.
-    class_name_attribute :promotion_code_batch_mailer_class, default: 'Spree::PromotionCodeBatchMailer'
-
     # Allows providing your own Mailer for reimbursement mailer.
     #
     # @!attribute [rw] reimbursement_mailer_class
@@ -428,7 +394,7 @@ module Spree
     # @!attribute [rw] order_contents_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::OrderContents.
-    class_name_attribute :order_contents_class, default: 'Spree::OrderContents'
+    class_name_attribute :order_contents_class, default: 'Spree::SimpleOrderContents'
 
     # Allows providing your own class for shipping an order.
     #
@@ -585,6 +551,9 @@ module Spree
     # Enumerable of taxons adhering to the present_taxon_class interface
     class_name_attribute :taxon_attachment_module, default: "Spree::Taxon::ActiveStorageAttachment"
 
+    # Set of classes that can be promotion adjustment sources
+    add_class_set :adjustment_promotion_source_types, default: []
+
     # Configures the absolute path that contains the Solidus engine
     # migrations. This will be checked at app boot to confirm that all Solidus
     # migrations are installed.
@@ -619,6 +588,54 @@ module Spree
       @stock_configuration ||= Spree::Core::StockConfiguration.new
     end
 
+    # Allows providing your own promotion configuration instance
+    # @!attribute [rw] promotions
+    # @return [Spree::Core::NullPromotionConfiguration] an object that conforms to the API of
+    #   the example promotion configuration class Spree::Core::NullPromotionConfiguration.
+    attr_writer :promotions
+    def promotions
+      @promotions ||= Spree::Core::NullPromotionConfiguration.new
+    end
+
+    class << self
+      private
+
+      def promotions_deprecation_message(method, new_method_name = nil)
+        "The `Spree::Config.#{method}` preference is deprecated and will be removed in Solidus 5.0. " \
+        "Use `Spree::Config.promotions.#{new_method_name || method}` instead"
+      end
+    end
+
+    def promotion_adjuster_class
+      promotions.order_adjuster_class
+    end
+
+    def promotion_adjuster_class=(klass)
+      promotions.order_adjuster_class = klass
+    end
+    deprecate promotion_adjuster_class: promotions_deprecation_message("promotion_adjuster_class", "order_adjuster_class"), deprecator: Spree.deprecator
+    deprecate "promotion_adjuster_class=": promotions_deprecation_message("promotion_adjuster_class=", "order_adjuster_class="), deprecator: Spree.deprecator
+
+    delegate :promotion_chooser_class, :promotion_chooser_class=, to: :promotions
+    deprecate promotion_chooser_class: promotions_deprecation_message("promotion_chooser_class"), deprecator: Spree.deprecator
+    deprecate "promotion_chooser_class=": promotions_deprecation_message("promotion_chooser_class="), deprecator: Spree.deprecator
+
+    delegate :shipping_promotion_handler_class, :shipping_promotion_handler_class=, to: :promotions
+    deprecate shipping_promotion_handler_class: promotions_deprecation_message("shipping_promotion_handler_class"), deprecator: Spree.deprecator
+    deprecate "shipping_promotion_handler_class=": promotions_deprecation_message("shipping_promotion_handler_class="), deprecator: Spree.deprecator
+
+    delegate :coupon_code_handler_class, :coupon_code_handler_class=, to: :promotions
+    deprecate coupon_code_handler_class: promotions_deprecation_message("coupon_code_handler_class"), deprecator: Spree.deprecator
+    deprecate "coupon_code_handler_class=": promotions_deprecation_message("coupon_code_handler_class"), deprecator: Spree.deprecator
+
+    delegate :promotion_code_batch_mailer_class, :promotion_code_batch_mailer_class=, to: :promotions
+    deprecate promotion_code_batch_mailer_class: promotions_deprecation_message("promotion_code_batch_mailer_class"), deprecator: Spree.deprecator
+    deprecate "promotion_code_batch_mailer_class=": promotions_deprecation_message("promotion_code_batch_mailer_class="), deprecator: Spree.deprecator
+
+    delegate :preferred_promotions_per_page, :preferred_promotions_per_page=, to: :promotions
+    deprecate preferred_promotions_per_page: promotions_deprecation_message("preferred_promotions_per_page"), deprecator: Spree.deprecator
+    deprecate "preferred_promotions_per_page=": promotions_deprecation_message("preferred_promotions_per_page="), deprecator: Spree.deprecator
+
     def roles
       @roles ||= Spree::RoleConfiguration.new.tap do |roles|
         roles.assign_permissions :default, ['Spree::PermissionSets::DefaultCustomer']
@@ -634,27 +651,6 @@ module Spree
 
     def environment
       @environment ||= Spree::Core::Environment.new(self).tap do |env|
-        env.calculators.promotion_actions_create_adjustments = %w[
-          Spree::Calculator::FlatPercentItemTotal
-          Spree::Calculator::FlatRate
-          Spree::Calculator::FlexiRate
-          Spree::Calculator::TieredPercent
-          Spree::Calculator::TieredFlatRate
-        ]
-
-        env.calculators.promotion_actions_create_item_adjustments = %w[
-          Spree::Calculator::DistributedAmount
-          Spree::Calculator::FlatRate
-          Spree::Calculator::FlexiRate
-          Spree::Calculator::PercentOnLineItem
-          Spree::Calculator::TieredPercent
-        ]
-
-        env.calculators.promotion_actions_create_quantity_adjustments = %w[
-          Spree::Calculator::PercentOnLineItem
-          Spree::Calculator::FlatRate
-        ]
-
         env.calculators.shipping_methods = %w[
           Spree::Calculator::Shipping::FlatPercentItemTotal
           Spree::Calculator::Shipping::FlatRate
@@ -675,33 +671,6 @@ module Spree
           Spree::PaymentMethod::Check
         ]
 
-        env.promotions.rules = %w[
-          Spree::Promotion::Rules::ItemTotal
-          Spree::Promotion::Rules::Product
-          Spree::Promotion::Rules::User
-          Spree::Promotion::Rules::FirstOrder
-          Spree::Promotion::Rules::UserLoggedIn
-          Spree::Promotion::Rules::OneUsePerUser
-          Spree::Promotion::Rules::Taxon
-          Spree::Promotion::Rules::MinimumQuantity
-          Spree::Promotion::Rules::NthOrder
-          Spree::Promotion::Rules::OptionValue
-          Spree::Promotion::Rules::FirstRepeatPurchaseSince
-          Spree::Promotion::Rules::UserRole
-          Spree::Promotion::Rules::Store
-        ]
-
-        env.promotions.actions = %w[
-          Spree::Promotion::Actions::CreateAdjustment
-          Spree::Promotion::Actions::CreateItemAdjustments
-          Spree::Promotion::Actions::CreateQuantityAdjustments
-          Spree::Promotion::Actions::FreeShipping
-        ]
-
-        env.promotions.shipping_actions = %w[
-          Spree::Promotion::Actions::FreeShipping
-        ]
-
         env.stock_splitters = %w[
           Spree::Stock::Splitter::ShippingCategory
           Spree::Stock::Splitter::Backordered

data/lib/spree/core/class_constantizer.rb

@@ -8,8 +8,8 @@ module Spree
       class Set
         include Enumerable
 
-        def initialize
-          @collection = ::Set.new
+        def initialize(default: [])
+          @collection = ::Set.new(default)
         end
 
         def <<(klass)

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

@@ -106,7 +106,7 @@ module Spree
       params[:order][:payments_attributes] = [
         {
           source_attributes: {
-            wallet_payment_source_id: wallet_payment_source_id,
+            wallet_payment_source_id:,
             verification_value: cvc_confirm
           }
         }

data/lib/spree/core/engine.rb

@@ -56,6 +56,7 @@ module Spree
           Spree::Bus.clear
 
           %i[
+            order_emptied
             order_finalized
             order_recalculated
             reimbursement_reimbursed

data/lib/spree/core/environment/calculators.rb

@@ -9,9 +9,41 @@ module Spree
         add_class_set :shipping_methods
         add_class_set :tax_rates
 
-        add_class_set :promotion_actions_create_adjustments
-        add_class_set :promotion_actions_create_item_adjustments
-        add_class_set :promotion_actions_create_quantity_adjustments
+        def promotion_actions_create_adjustments
+          promotion_config.calculators["Spree::Promotion::Actions::CreateAdjustment"]
+        end
+        deprecate :promotion_actions_create_adjustments, deprecator: Spree.deprecator
+
+        def promotion_actions_create_adjustments=(value)
+          promotion_config.calculators["Spree::Promotion::Actions::CreateAdjustment"] = value
+        end
+        deprecate :promotion_actions_create_adjustments=, deprecator: Spree.deprecator
+
+        def promotion_actions_create_item_adjustments
+          promotion_config.calculators["Spree::Promotion::Actions::CreateItemAdjustments"]
+        end
+        deprecate :promotion_actions_create_item_adjustments, deprecator: Spree.deprecator
+
+        def promotion_actions_create_item_adjustments=(value)
+          promotion_config.calculators["Spree::Promotion::Actions::CreateItemAdjustments"] = value
+        end
+        deprecate :promotion_actions_create_item_adjustments=, deprecator: Spree.deprecator
+
+        def promotion_actions_create_quantity_adjustments
+          promotion_config.calculators["Spree::Promotion::Actions::CreateQuantityAdjustments"]
+        end
+        deprecate :promotion_actions_create_quantity_adjustments, deprecator: Spree.deprecator
+
+        def promotion_actions_create_quantity_adjustments=(value)
+          promotion_config.calculators["Spree::Promotion::Actions::CreateQuantityAdjustments"] = value
+        end
+        deprecate :promotion_actions_create_quantity_adjustments=, deprecator: Spree.deprecator
+
+        private
+
+        def promotion_config
+          Spree::Config.promotions
+        end
       end
     end
   end

data/lib/spree/core/environment/promotions.rb

@@ -4,11 +4,32 @@ module Spree
   module Core
     class Environment
       class Promotions
-        include EnvironmentExtension
+        class << self
+          private
 
-        add_class_set :rules
-        add_class_set :actions
-        add_class_set :shipping_actions
+          def promotions_deprecation_message(method)
+            "The `Rails.application.config.spree.promotions.#{method}` preference is deprecated and will be removed in Solidus 5.0. " \
+            "Use `Spree::Config.promotions.#{method}` instead."
+          end
+        end
+
+        delegate :rules, :rules=, to: :promotion_config
+        deprecate rules: promotions_deprecation_message("rules"), deprecator: Spree.deprecator
+        deprecate "rules=": promotions_deprecation_message("rules="), deprecator: Spree.deprecator
+
+        delegate :actions, :actions=, to: :promotion_config
+        deprecate actions: promotions_deprecation_message("actions"), deprecator: Spree.deprecator
+        deprecate "actions=": promotions_deprecation_message("actions="), deprecator: Spree.deprecator
+
+        delegate :shipping_actions, :shipping_actions=, to: :promotion_config
+        deprecate shipping_actions: promotions_deprecation_message("shipping_actions"), deprecator: Spree.deprecator
+        deprecate "shipping_actions=": promotions_deprecation_message("shipping_actions="), deprecator: Spree.deprecator
+
+        private
+
+        def promotion_config
+          Spree::Config.promotions
+        end
       end
     end
   end

data/lib/spree/core/environment_extension.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spree/core/class_constantizer'
+require 'spree/core/nested_class_set'
 
 module Spree
   module Core
@@ -8,10 +9,10 @@ module Spree
       extend ActiveSupport::Concern
 
       class_methods do
-        def add_class_set(name)
+        def add_class_set(name, default: [])
           define_method(name) do
             set = instance_variable_get("@#{name}")
-            set ||= send("#{name}=", [])
+            set ||= send("#{name}=", default)
             set
           end
 
@@ -21,6 +22,19 @@ module Spree
             instance_variable_set("@#{name}", set)
           end
         end
+
+        def add_nested_class_set(name, default: {})
+          define_method(name) do
+            set = instance_variable_get(:"@#{name}")
+            set ||= send(:"#{name}=", default)
+            set
+          end
+
+          define_method(:"#{name}=") do |hash|
+            set = Spree::Core::NestedClassSet.new(hash)
+            instance_variable_set(:"@#{name}", set)
+          end
+        end
       end
     end
   end

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

@@ -74,7 +74,7 @@ module Spree
               # able to find the line item if line_item.variant_id |= iu.variant_id
               shipment.inventory_units.new(
                 variant_id: inventory_unit[:variant_id],
-                line_item: line_item
+                line_item:
               )
             end
 
@@ -91,7 +91,7 @@ module Spree
             shipment.save!
 
             shipping_method = Spree::ShippingMethod.find_by(name: target[:shipping_method]) || Spree::ShippingMethod.find_by!(admin_name: target[:shipping_method])
-            rate = shipment.shipping_rates.create!(shipping_method: shipping_method,
+            rate = shipment.shipping_rates.create!(shipping_method:,
                                                    cost: target[:cost])
             shipment.selected_shipping_rate_id = rate.id
             shipment.update_amounts
@@ -129,7 +129,7 @@ module Spree
           return [] unless adjustments
           adjustments.each do |target|
             adjustment = order.adjustments.build(
-              order:  order,
+              order:,
               amount: target[:amount].to_d,
               label:  target[:label]
             )
@@ -141,7 +141,7 @@ module Spree
         def self.create_payments_from_params(payments_hash, order)
           return [] unless payments_hash
           payments_hash.each do |target|
-            payment = order.payments.build order: order
+            payment = order.payments.build(order:)
             payment.amount = target[:amount].to_f
             # Order API should be using state as that's the normal payment field.
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
@@ -170,7 +170,7 @@ module Spree
         def self.ensure_variant_id_from_params(hash)
           sku = hash.delete(:sku)
           unless hash[:variant_id].present?
-            hash[:variant_id] = Spree::Variant.with_prices.find_by!(sku: sku).id
+            hash[:variant_id] = Spree::Variant.with_prices.find_by!(sku:).id
           end
           hash
         end

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

@@ -18,7 +18,7 @@ module Spree
           if product.save
             variants_attrs.each do |variant_attribute|
               # make sure the product is assigned before the options=
-              product.variants.create({ product: product }.merge(variant_attribute))
+              product.variants.create({ product: }.merge(variant_attribute))
             end
 
             set_up_options
@@ -35,7 +35,7 @@ module Spree
                 product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
-                product.variants.create({ product: product }.merge(variant_attribute))
+                product.variants.create({ product: }.merge(variant_attribute))
               end
             end
 
@@ -49,7 +49,7 @@ module Spree
 
         def set_up_options
           options_attrs.each do |name|
-            option_type = Spree::OptionType.where(name: name).first_or_initialize do |ot|
+            option_type = Spree::OptionType.where(name:).first_or_initialize do |ot|
               ot.presentation = name
               ot.save!
             end

data/lib/spree/core/nested_class_set.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "spree/core/class_constantizer"
+
+module Spree
+  module Core
+    class NestedClassSet
+      attr_reader :klass_sets
+
+      def initialize(hash = {})
+        @klass_sets = hash.map do |key, value|
+          [
+            key.to_s,
+            ClassConstantizer::Set.new(default: value)
+          ]
+        end.to_h
+      end
+
+      def [](klass)
+        klass_sets[klass.to_s] || []
+      end
+
+      def []=(klass, klasses)
+        klass_sets[klass.to_s] = ClassConstantizer::Set.new(default: klasses.map(&:to_s))
+      end
+    end
+  end
+end

data/lib/spree/core/null_promotion_configuration.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Spree
+  module Core
+    class NullPromotionConfiguration < Spree::Preferences::Configuration
+      include Spree::Core::EnvironmentExtension
+
+      # order_adjuster_class allows extensions to provide their own Order Adjuster
+      class_name_attribute :order_adjuster_class, default: 'Spree::NullPromotionAdjuster'
+
+      # Allows providing a different coupon code handler.
+      # @!attribute [rw] coupon_code_handler_class
+      # @see Spree::NullPromotionHandler
+      # @return [Class] an object that conforms to the API of
+      #   the standard coupon code handler class
+      #   Spree::NullPromotionHandler.
+      class_name_attribute :coupon_code_handler_class, default: 'Spree::NullPromotionHandler'
+
+      # Allows providing a different promotion finder.
+      # @!attribute [rw] promotion_finder_class
+      # @see Spree::NullPromotionFinder
+      # @return [Class] an object that conforms to the API of
+      #   the standard promotion finder class
+      #   Spree::NullPromotionFinder.
+      class_name_attribute :promotion_finder_class, default: 'Spree::NullPromotionFinder'
+
+      # Allows getting and setting `Spree::Config.promotion_code_batch_mailer_class`.
+      # Both will issue a deprecation warning.
+      class_name_attribute :promotion_code_batch_mailer_class, default: 'Spree::DeprecatedConfigurableClass'
+      deprecate :promotion_code_batch_mailer_class, :promotion_code_batch_mailer_class=, deprecator: Spree.deprecator
+
+      # Allows getting and setting `Spree::Config.promotion_chooser_class`.
+      # Both will issue a deprecation warning.
+      class_name_attribute :promotion_chooser_class, default: 'Spree::DeprecatedConfigurableClass'
+      deprecate :promotion_chooser_class, :promotion_chooser_class=, deprecator: Spree.deprecator
+
+      # Allows getting and setting rules. Deprecated.
+      # @!attribute [rw] rules
+      # @return [Array] a set of rules
+      add_class_set :rules
+      deprecate :rules, :rules=, deprecator: Spree.deprecator
+
+      # Allows getting and setting actions. Deprecated.
+      # @!attribute [rw] actions
+      # @return [Array] a set of actions
+      add_class_set :actions
+      deprecate :actions, :actions=, deprecator: Spree.deprecator
+
+      # Allows getting and setting shipping actions. Deprecated.
+      # @!attribute [rw] shipping_actions
+      # @return [Array] a set of shipping_actions
+      add_class_set :shipping_actions
+      deprecate :shipping_actions, :shipping_actions=, deprecator: Spree.deprecator
+
+      # Allows getting an setting calculators for actions. Deprecated.
+      # @!attribute [rw] calculators
+      # @return [Spree::Core::NestedClassSet] a set of calculators
+      add_nested_class_set :calculators
+      deprecate :calculators, :calculators=, deprecator: Spree.deprecator
+
+      # Allows providing a different promotion shipping promotion handler.
+      # @!attribute [rw] shipping_promotion_handler_class
+      # @see Spree::NullPromotionHandler
+      # @return [Class] an object that conforms to the API of
+      #   the standard promotion finder class
+      #   Spree::NullPromotionHandler.
+      class_name_attribute :shipping_promotion_handler_class, default: 'Spree::NullPromotionHandler'
+      deprecate :shipping_promotion_handler_class, deprecator: Spree.deprecator
+      deprecate :shipping_promotion_handler_class=, deprecator: Spree.deprecator
+
+      # Allows providing a different promotion advertiser.
+      # @!attribute [rw] advertiser_class
+      # @see Spree::NullPromotionAdvertiser
+      # @return [Class] an object that conforms to the API of
+      #   the standard promotion advertiser class
+      #   Spree::NullPromotionAdvertiser.
+      class_name_attribute :advertiser_class, default: 'Spree::NullPromotionAdvertiser'
+
+      # !@attribute [rw] promotion_api_attributes
+      #   @return [Array<Symbol>] Attributes to be returned by the API for a promotion
+      preference :promotion_api_attributes, :array, default: []
+    end
+  end
+end

data/lib/spree/core/product_filters.rb

@@ -112,7 +112,7 @@ module Spree
         {
           name:   'Brands',
           scope:  :brand_any,
-          conds:  conds,
+          conds:,
           labels: brands.sort.map { |key| [key, key] }
         }
       end

data/lib/spree/core/search/variant.rb

@@ -22,7 +22,7 @@ module Spree
 
         def initialize(query_string, scope: Spree::Variant.all)
           @query_string = query_string
-          @scope = scope
+          @scope = scope.non_template_variants
         end
 
         # Searches the variants table using the ransack 'search_terms' defined on the class.
@@ -39,7 +39,7 @@ module Spree
             @scope.ransack(search_term_params(word)).result.pluck(:id)
           end
 
-          Spree::Variant.where(id: matches.inject(:&))
+          @scope.where(id: matches.inject(:&))
         end
 
         private

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

@@ -106,7 +106,6 @@ module Spree
                 before_transition to: :delivery, do: :ensure_shipping_address
                 before_transition to: :delivery, do: :create_proposed_shipments
                 before_transition to: :delivery, do: :ensure_available_shipping_rates
-                before_transition from: :delivery, do: :apply_shipping_promotions
               end
 
               before_transition to: :resumed, do: :ensure_line_item_variants_are_not_deleted

data/lib/spree/core/validators/email.rb

@@ -14,7 +14,7 @@ module Spree
   class EmailValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       unless Spree::Config.default_email_regexp.match? value
-        record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
+        record.errors.add(attribute, :invalid, **{ value: }.merge!(options))
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.3.4"
+  VERSION = "4.4.0"
 
   def self.solidus_version
     VERSION
   end
 
   def self.previous_solidus_minor_version
-    '4.2'
+    '4.3'
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -11,6 +11,7 @@ require "sprockets/railtie"
 
 require 'active_support/deprecation'
 require 'spree/deprecated_instance_variable_proxy'
+require 'spree/deprecator'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -21,17 +22,11 @@ require 'paperclip'
 require 'ransack'
 require 'state_machines-activerecord'
 
-require_relative './ransack_4_1_patch'
-
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
-  def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'Solidus')
-  end
-
   autoload :Deprecation, 'spree/deprecation'
 
   mattr_accessor :user_class, default: 'Spree::LegacyUser'
@@ -123,6 +118,7 @@ require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/role_configuration'
 require 'spree/core/state_machines'
 require 'spree/core/stock_configuration'
+require 'spree/core/null_promotion_configuration'
 require 'spree/core/validators/email'
 require 'spree/permission_sets'
 require 'spree/user_class_handle'

data/lib/spree/deprecator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'active_support/deprecation'
+
+module Spree
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'Solidus')
+  end
+end

data/lib/spree/i18n.rb

@@ -5,7 +5,7 @@ require 'i18n'
 module Spree
   def self.i18n_available_locales
     I18n.available_locales.select do |locale|
-      I18n.t('spree.i18n.this_file_language', locale: locale, fallback: false, default: nil)
+      I18n.t('spree.i18n.this_file_language', locale:, fallback: false, default: nil)
     end
   end
 

data/lib/spree/mailer_previews/carton_preview.rb

@@ -7,7 +7,7 @@ module Spree
         carton = Carton.joins(:orders).last
         raise "Your database needs at least one shipped order with a carton to render this preview" unless carton
 
-        Spree::Config.carton_shipped_email_class.shipped_email(order: carton.orders.first, carton: carton)
+        Spree::Config.carton_shipped_email_class.shipped_email(order: carton.orders.first, carton:)
       end
     end
   end