spree_core 4.3.0 → 4.5.1

data/lib/spree/core/configuration.rb

@@ -0,0 +1,90 @@
+# This is the primary location for defining spree preferences
+#
+# The expectation is that this is created once and stored in
+# the spree environment
+#
+# setters:
+# a.color = :blue
+# a[:color] = :blue
+# a.set :color = :blue
+# a.preferred_color = :blue
+#
+# getters:
+# a.color
+# a[:color]
+# a.get :color
+# a.preferred_color
+#
+require 'spree/core/search/base'
+require 'spree/core/preferences/configuration'
+
+module Spree
+  module Core
+    class Configuration < Preferences::Configuration
+      # Alphabetized to more easily lookup particular preferences
+      preference :address_requires_state, :boolean, default: true # should state/state_name be required
+      preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
+      preference :admin_path, :string, deprecated: true
+      preference :admin_products_per_page, :integer, deprecated: true
+      preference :admin_orders_per_page, :integer, deprecated: true
+      preference :admin_properties_per_page, :integer, deprecated: true
+      preference :admin_promotions_per_page, :integer, deprecated: true
+      preference :admin_customer_returns_per_page, :integer, deprecated: true
+      preference :admin_users_per_page, :integer, deprecated: true
+      preference :admin_show_version, :boolean, deprecated: true
+      preference :allow_checkout_on_gateway_error, :boolean, default: false
+      preference :allow_guest_checkout, :boolean, default: true
+      preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
+      preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
+      preference :always_put_site_name_in_title, :boolean, deprecated: true
+      preference :title_site_name_separator, :string, deprecated: true
+      preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
+      preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
+      preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
+      preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
+      preference :company, :boolean, default: false # Request company field for billing and shipping addr
+      preference :currency, :string, default: 'USD', deprecated: true
+      preference :default_country_id, :integer, deprecated: true
+      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 :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 :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
+      preference :logo, :string, deprecated: true
+      preference :mailer_logo, :string, deprecated: true
+      preference :max_level_in_taxons_menu, :integer, deprecated: true
+      preference :products_per_page, :integer, default: 12
+      preference :require_master_price, :boolean, default: true
+      preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
+      preference :return_eligibility_number_of_days, :integer, default: 365
+      preference :send_core_emails, :boolean, default: true # Default mail headers settings
+      preference :shipping_instructions, :boolean, deprecated: true
+      preference :show_only_complete_orders_by_default, :boolean, deprecated: true
+      preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
+      preference :show_products_without_price, :boolean, default: false
+      preference :show_raw_product_description, :boolean, deprecated: true
+      preference :tax_using_ship_address, :boolean, default: true
+      preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
+
+      # Store credits configurations
+      preference :non_expiring_credit_types, :array, default: []
+      preference :credit_to_new_allocation, :boolean, default: false
+
+      # Multi store configurations
+      preference :show_store_selector, :boolean, deprecated: true
+
+      # searcher_class allows spree extension writers to provide their own Search class
+      def searcher_class
+        ActiveSupport::Deprecation.warn('`Spree::Config.searcher_class` is deprecated and will be removed in Spree v5, please use `Spree.searcher_class` instead.')
+        @searcher_class ||= Spree.searcher_class
+      end
+
+      # Sets the path used for products, taxons and pages.
+      preference :storefront_products_path, :string, default: 'products'
+      preference :storefront_taxons_path, :string, default: 't'
+      preference :storefront_pages_path, :string, default: 'pages'
+
+      attr_writer :searcher_class
+    end
+  end
+end

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

@@ -7,14 +7,16 @@ module Spree
 
         included do
           before_action :set_token
-          helper_method :try_spree_current_user
+          if defined?(helper_method)
+            helper_method :try_spree_current_user
+          end
 
           rescue_from CanCan::AccessDenied do |_exception|
             redirect_unauthorized_access
           end
         end
 
-        # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
+        # Needs to be overridden so that we use Spree's Ability rather than anyone else's.
         def current_ability
           @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user)
         end
@@ -34,8 +36,8 @@ module Spree
         end
 
         def current_oauth_token
-          get_last_access_token = ->(user) { Doorkeeper::AccessToken.active_for(user).where(expires_in: nil).last }
-          create_access_token = ->(user) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id) }
+          get_last_access_token = ->(user) { Spree::OauthAccessToken.active_for(user).where(expires_in: nil).last }
+          create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner: user) }
           user = try_spree_current_user
           return unless user
 
@@ -82,7 +84,7 @@ module Spree
             redirect_to spree.forbidden_path
           else
             store_location
-            if request.fullpath.match(Spree.admin_path) && defined?(spree.admin_login_path)
+            if Spree.respond_to?(:admin_path) && request.fullpath.match(Spree.admin_path) && defined?(spree.admin_login_path)
               redirect_to spree.admin_login_path
             elsif respond_to?(:spree_login_path)
               redirect_to spree_login_path

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

@@ -17,6 +17,9 @@ module Spree
           attr_writer :title
 
           def title
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
             title_string = @title.present? ? @title : accurate_title
             if title_string.present?
               if Spree::Config[:always_put_site_name_in_title] && !title_string.include?(default_title)
@@ -30,11 +33,17 @@ module Spree
           end
 
           def default_title
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
             current_store.name
           end
 
           # this is a hook for subclasses to provide title
           def accurate_title
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
             current_store.seo_title
           end
 
@@ -56,7 +65,12 @@ module Spree
           # Default layout is: +app/views/spree/layouts/spree_application+
           #
           def get_layout
-            layout ||= Spree::Config[:layout]
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
+            return unless defined?(Spree::Frontend)
+
+            layout ||= Spree::Frontend::Config[:layout]
           end
         end
       end

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

@@ -5,11 +5,13 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :supported_currencies
-          helper_method :supported_currencies_for_all_stores
-          helper_method :current_currency
-          helper_method :supported_currency?
-          helper_method :currency_param
+          if defined?(helper_method)
+            helper_method :supported_currencies
+            helper_method :supported_currencies_for_all_stores
+            helper_method :current_currency
+            helper_method :supported_currency?
+            helper_method :currency_param
+          end
         end
 
         def current_currency
@@ -20,7 +22,7 @@ module Spree
                                 elsif current_store.present?
                                   current_store.default_currency
                                 else
-                                  Spree::Config[:currency]
+                                  Spree::Store.default.default_currency
                                 end&.upcase
         end
 

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

@@ -7,12 +7,14 @@ module Spree
         included do
           before_action :set_locale
 
-          helper_method :supported_locales
-          helper_method :supported_locales_for_all_stores
-          helper_method :current_locale
-          helper_method :supported_locale?
-          helper_method :available_locales
-          helper_method :locale_param
+          if defined?(helper_method)
+            helper_method :supported_locales
+            helper_method :supported_locales_for_all_stores
+            helper_method :current_locale
+            helper_method :supported_locale?
+            helper_method :available_locales
+            helper_method :locale_param
+          end
         end
 
         def set_locale

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

@@ -5,8 +5,10 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :current_order
-          helper_method :simple_current_order
+          if defined?(helper_method)
+            helper_method :current_order
+            helper_method :simple_current_order
+          end
         end
 
         # Used in the link_to_cart helper.

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

@@ -3,7 +3,7 @@ module Spree
     module ControllerHelpers
       module Search
         def build_searcher(params)
-          Spree::Config.searcher_class.new(params).tap do |searcher|
+          Spree.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
             searcher.current_currency = current_currency&.upcase
             searcher.current_store = current_store

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

@@ -5,9 +5,11 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :current_store
-          helper_method :current_price_options
-          helper_method :available_menus
+          if defined?(helper_method)
+            helper_method :current_store
+            helper_method :current_price_options
+            helper_method :available_menus
+          end
         end
 
         def current_store

data/lib/spree/core/dependencies.rb

@@ -0,0 +1,130 @@
+require_relative 'dependencies_helper'
+
+module Spree
+  module Core
+    class Dependencies
+      include Spree::DependenciesHelper
+
+      INJECTION_POINTS = [
+        :ability_class,
+        :cart_create_service, :cart_add_item_service, :cart_remove_item_service,
+        :cart_remove_line_item_service, :cart_set_item_quantity_service, :cart_recalculate_service,
+        :cms_page_finder, :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
+        :checkout_complete_service, :checkout_add_store_credit_service, :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
+        :coupon_handler, :menu_finder, :country_finder, :current_order_finder, :credit_card_finder,
+        :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
+        :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
+        :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
+        :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
+        :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service,
+        :line_item_create_service, :line_item_update_service, :line_item_destroy_service,
+        :order_approve_service, :order_cancel_service, :shipment_change_state_service, :shipment_update_service,
+        :shipment_create_service, :shipment_add_item_service, :shipment_remove_item_service,
+        :payment_create_service, :address_create_service, :address_update_service,
+        :checkout_select_shipping_method_service
+      ].freeze
+
+      attr_accessor *INJECTION_POINTS
+
+      def initialize
+        set_default_ability
+        set_default_services
+        set_default_finders
+      end
+
+      private
+
+      def set_default_ability
+        @ability_class = 'Spree::Ability'
+      end
+
+      def set_default_services
+        # cart
+        @cart_compare_line_items_service = 'Spree::CompareLineItems'
+        @cart_create_service = 'Spree::Cart::Create'
+        @cart_add_item_service = 'Spree::Cart::AddItem'
+        @cart_update_service = 'Spree::Cart::Update'
+        @cart_recalculate_service = 'Spree::Cart::Recalculate'
+        @cart_remove_item_service = 'Spree::Cart::RemoveItem'
+        @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
+        @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
+        @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
+        @cart_empty_service = 'Spree::Cart::Empty'
+        @cart_destroy_service = 'Spree::Cart::Destroy'
+        @cart_associate_service = 'Spree::Cart::Associate'
+        @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
+
+        # checkout
+        @checkout_next_service = 'Spree::Checkout::Next'
+        @checkout_advance_service = 'Spree::Checkout::Advance'
+        @checkout_update_service = 'Spree::Checkout::Update'
+        @checkout_complete_service = 'Spree::Checkout::Complete'
+        @checkout_add_store_credit_service = 'Spree::Checkout::AddStoreCredit'
+        @checkout_remove_store_credit_service = 'Spree::Checkout::RemoveStoreCredit'
+        @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
+        @checkout_select_shipping_method_service = 'Spree::Checkout::SelectShippingMethod'
+
+        # order
+        @order_approve_service = 'Spree::Orders::Approve'
+        @order_cancel_service = 'Spree::Orders::Cancel'
+
+        # shipment
+        @shipment_change_state_service = 'Spree::Shipments::ChangeState'
+        @shipment_create_service = 'Spree::Shipments::Create'
+        @shipment_update_service = 'Spree::Shipments::Update'
+        @shipment_add_item_service = 'Spree::Shipments::AddItem'
+        @shipment_remove_item_service = 'Spree::Shipments::RemoveItem'
+
+        # sorter
+        @collection_sorter = 'Spree::BaseSorter'
+        @order_sorter = 'Spree::BaseSorter'
+        @products_sorter = 'Spree::Products::Sort'
+
+        # paginator
+        @collection_paginator = 'Spree::Shared::Paginate'
+
+        # coupons
+        # TODO: we should split this service into 2 separate - Add and Remove
+        @coupon_handler = 'Spree::PromotionHandler::Coupon'
+
+        # account
+        @account_create_service = 'Spree::Account::Create'
+        @account_update_service = 'Spree::Account::Update'
+
+        # addresses
+        @address_create_service = 'Spree::Addresses::Create'
+        @address_update_service = 'Spree::Addresses::Update'
+
+        # credit cards
+        @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
+
+        # classifications
+        @classification_reposition_service = 'Spree::Classifications::Reposition'
+
+        # line items
+        @line_item_create_service = 'Spree::LineItems::Create'
+        @line_item_update_service = 'Spree::LineItems::Update'
+        @line_item_destroy_service = 'Spree::LineItems::Destroy'
+
+        @payment_create_service = 'Spree::Payments::Create'
+
+        # errors
+        @error_handler = 'Spree::ErrorReporter'
+      end
+
+      def set_default_finders
+        @address_finder = 'Spree::Addresses::Find'
+        @country_finder = 'Spree::Countries::Find'
+        @cms_page_finder = 'Spree::CmsPages::Find'
+        @menu_finder = 'Spree::Menus::Find'
+        @current_order_finder = 'Spree::Orders::FindCurrent'
+        @current_store_finder = 'Spree::Stores::FindCurrent'
+        @completed_order_finder = 'Spree::Orders::FindComplete'
+        @credit_card_finder = 'Spree::CreditCards::Find'
+        @products_finder = 'Spree::Products::Find'
+        @taxon_finder = 'Spree::Taxons::Find'
+        @line_item_by_variant_finder = 'Spree::LineItems::FindByVariant'
+      end
+    end
+  end
+end

data/lib/spree/core/engine.rb

@@ -1,3 +1,6 @@
+require_relative 'dependencies'
+require_relative 'configuration'
+
 module Spree
   module Core
     class Engine < ::Rails::Engine
@@ -19,30 +22,16 @@ module Spree
       end
 
       initializer 'spree.environment', before: :load_config_initializers do |app|
-        app.config.spree = Environment.new(SpreeCalculators.new, Spree::AppConfiguration.new, Spree::AppDependencies.new)
+        app.config.spree = Environment.new(SpreeCalculators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
+        app.config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal]
         Spree::Config = app.config.spree.preferences
         Spree::Dependencies = app.config.spree.dependencies
       end
 
-      initializer 'spree.register.calculators' do |app|
-        app.config.spree.calculators.shipping_methods = [
-          Spree::Calculator::Shipping::FlatPercentItemTotal,
-          Spree::Calculator::Shipping::FlatRate,
-          Spree::Calculator::Shipping::FlexiRate,
-          Spree::Calculator::Shipping::PerItem,
-          Spree::Calculator::Shipping::PriceSack
-        ]
-
-        app.config.spree.calculators.tax_rates = [
-          Spree::Calculator::DefaultTax
-        ]
+      initializer 'spree.register.calculators', before: :after_initialize do |app|
       end
 
       initializer 'spree.register.stock_splitters', before: :load_config_initializers do |app|
-        app.config.spree.stock_splitters = [
-          Spree::Stock::Splitter::ShippingCategory,
-          Spree::Stock::Splitter::Backordered
-        ]
       end
 
       initializer 'spree.register.line_item_comparison_hooks', before: :load_config_initializers do |app|
@@ -50,19 +39,9 @@ module Spree
       end
 
       initializer 'spree.register.payment_methods', after: 'acts_as_list.insert_into_active_record' do |app|
-        app.config.spree.payment_methods = [
-          Spree::Gateway::Bogus,
-          Spree::Gateway::BogusSimple,
-          Spree::PaymentMethod::Check,
-          Spree::PaymentMethod::StoreCredit
-        ]
       end
 
       initializer 'spree.register.adjustable_adjusters' do |app|
-        app.config.spree.adjusters = [
-          Spree::Adjustable::Adjuster::Promotion,
-          Spree::Adjustable::Adjuster::Tax
-        ]
       end
 
       # We need to define promotions rules here so extensions and existing apps
@@ -73,7 +52,45 @@ module Spree
       end
 
       initializer 'spree.promo.register.promotion.calculators' do |app|
-        app.config.spree.calculators.promotion_actions_create_adjustments = [
+      end
+
+      # Promotion rules need to be evaluated on after initialize otherwise
+      # Spree.user_class would be nil and users might experience errors related
+      # to malformed model associations (Spree.user_class is only defined on
+      # the app initializer)
+      config.after_initialize do
+        Rails.application.config.spree.calculators.shipping_methods = [
+          Spree::Calculator::Shipping::FlatPercentItemTotal,
+          Spree::Calculator::Shipping::FlatRate,
+          Spree::Calculator::Shipping::FlexiRate,
+          Spree::Calculator::Shipping::PerItem,
+          Spree::Calculator::Shipping::PriceSack,
+          Spree::Calculator::Shipping::DigitalDelivery,
+        ]
+
+        Rails.application.config.spree.calculators.tax_rates = [
+          Spree::Calculator::DefaultTax
+        ]
+
+        Rails.application.config.spree.stock_splitters = [
+          Spree::Stock::Splitter::ShippingCategory,
+          Spree::Stock::Splitter::Backordered,
+          Spree::Stock::Splitter::Digital
+        ]
+
+        Rails.application.config.spree.payment_methods = [
+          Spree::Gateway::Bogus,
+          Spree::Gateway::BogusSimple,
+          Spree::PaymentMethod::Check,
+          Spree::PaymentMethod::StoreCredit
+        ]
+
+        Rails.application.config.spree.adjusters = [
+          Spree::Adjustable::Adjuster::Promotion,
+          Spree::Adjustable::Adjuster::Tax
+        ]
+
+        Rails.application.config.spree.calculators.promotion_actions_create_adjustments = [
           Spree::Calculator::FlatPercentItemTotal,
           Spree::Calculator::FlatRate,
           Spree::Calculator::FlexiRate,
@@ -81,18 +98,12 @@ module Spree
           Spree::Calculator::TieredFlatRate
         ]
 
-        app.config.spree.calculators.promotion_actions_create_item_adjustments = [
+        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = [
           Spree::Calculator::PercentOnLineItem,
           Spree::Calculator::FlatRate,
           Spree::Calculator::FlexiRate
         ]
-      end
 
-      # Promotion rules need to be evaluated on after initialize otherwise
-      # Spree.user_class would be nil and users might experience errors related
-      # to malformed model associations (Spree.user_class is only defined on
-      # the app initializer)
-      config.after_initialize do
         Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,
@@ -104,10 +115,8 @@ module Spree
           Spree::Promotion::Rules::OptionValue,
           Spree::Promotion::Rules::Country
         ]
-      end
 
-      initializer 'spree.promo.register.promotions.actions' do |app|
-        app.config.spree.promotions.actions = [
+        Rails.application.config.spree.promotions.actions = [
           Promotion::Actions::CreateAdjustment,
           Promotion::Actions::CreateItemAdjustments,
           Promotion::Actions::CreateLineItems,
@@ -115,13 +124,19 @@ module Spree
         ]
       end
 
+      initializer 'spree.promo.register.promotions.actions' do |app|
+      end
+
       # filter sensitive information during logging
       initializer 'spree.params.filter' do |app|
         app.config.filter_parameters += [
           :password,
           :password_confirmation,
           :number,
-          :verification_value
+          :verification_value,
+          :client_id,
+          :client_secret,
+          :refresh_token
         ]
       end
 
@@ -129,12 +144,6 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
-      initializer 'spree.core.checking_deprecated_preferences' do
-        Spree::Config.deprecated_preferences.each do |pref|
-          warn "[DEPRECATION] Spree::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
-        end
-      end
-
       config.to_prepare do
         # Ensure spree locale paths are present before decorators
         I18n.load_path.unshift(*(Dir.glob(

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

@@ -32,7 +32,7 @@ module Spree
             variants_attrs.each do |variant_attribute|
               # update the variant if the id is present in the payload
               if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
+                product.variants.find(variant_attribute['id']).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
                 product.variants.create({ product: product }.merge(variant_attribute))

data/lib/spree/core/number_generator.rb

@@ -16,8 +16,6 @@ module Spree
         generator_instance = self
 
         host.class_eval do
-          validates(:number, presence: true, uniqueness: { allow_blank: true })
-
           before_validation do |instance|
             instance.number ||= generate_permalink(host)
           end

data/{app/models/spree → lib/spree/core}/preferences/configuration.rb

@@ -1,5 +1,5 @@
-# This takes the preferrable methods and adds some
-# syntatic sugar to access the preferences
+# This takes the preferable methods and adds some
+# syntactic sugar to access the preferences
 #
 # class App < Configuration
 #   preference :color, :string
@@ -20,6 +20,9 @@
 # a.preferred_color
 #
 #
+
+require 'spree/core/preferences/preferable'
+
 module Spree::Preferences
   class Configuration
     include Spree::Preferences::Preferable

data/{app/models/spree → lib/spree/core}/preferences/preferable.rb

@@ -31,6 +31,9 @@
 #
 #   # Save the changes. All handled by activerecord
 #   s.save!
+
+require 'spree/core/preferences/preferable_class_methods'
+
 module Spree::Preferences::Preferable
   extend ActiveSupport::Concern
 

data/{app/models/spree → lib/spree/core}/preferences/preferable_class_methods.rb

@@ -19,6 +19,8 @@ module Spree::Preferences
         value = convert_preference_value(value, type)
         preferences[name] = value
 
+        ActiveSupport::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated
+
         # If this is an activerecord object, we need to inform
         # ActiveRecord::Dirty that this value has changed, since this is an
         # in-place update to the preferences hash.

data/{app/models/spree → lib/spree/core}/preferences/store.rb

@@ -36,7 +36,7 @@ module Spree::Preferences
 
     def get(key)
       # return the retrieved value, if it's in the cache
-      # use unless nil? incase the value is actually boolean false
+      # use unless nil? in case the value is actually boolean false
       #
       unless (val = @cache.read(key)).nil?
         return val

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

@@ -30,7 +30,13 @@ module Spree
         def extended_base_scope
           base_scope = current_store.products.spree_base_scopes
           base_scope = get_products_conditions_for(base_scope, keywords)
-          base_scope = Spree::Dependencies.products_finder.constantize.new(
+          base_scope = Spree::Dependencies.products_finder.constantize.new(**product_finder_params(base_scope)).execute
+          base_scope = add_search_scopes(base_scope)
+          add_eagerload_scopes(base_scope)
+        end
+
+        def product_finder_params(base_scope)
+          {
             scope: base_scope,
             params: {
               store: current_store,
@@ -43,9 +49,7 @@ module Spree
               },
               sort_by: sort_by
             }
-          ).execute
-          base_scope = add_search_scopes(base_scope)
-          add_eagerload_scopes(base_scope)
+          }
         end
 
         def add_eagerload_scopes(scope)
@@ -101,7 +105,7 @@ module Spree
             high_price = Monetize.parse(price_param.remove("#{less_than_string} ")).to_i
           else
             low_price, high_price = Monetize.parse_collection(price_param).map(&:to_i)
-            high_price = Float::INFINITY if high_price&.zero?
+            high_price = BigDecimal::INFINITY if high_price&.zero?
           end
 
           "#{low_price},#{high_price}"