spree_core 5.2.6 → 5.3.0.rc1

data/db/migrate/20260118120000_add_statistics_to_store_products.rb

@@ -0,0 +1,11 @@
+class AddStatisticsToStoreProducts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_products_stores, :units_sold_count, :integer, default: 0, null: false, if_not_exists: true
+    add_column :spree_products_stores, :revenue, :decimal, precision: 10, scale: 2, default: 0, null: false, if_not_exists: true
+
+    add_index :spree_products_stores, [:store_id, :units_sold_count],
+              name: 'index_products_stores_on_store_and_units_sold', if_not_exists: true
+    add_index :spree_products_stores, [:store_id, :revenue],
+              name: 'index_products_stores_on_store_and_revenue', if_not_exists: true
+  end
+end

data/db/migrate/20260119120000_add_counter_caches_to_spree_products.rb

@@ -0,0 +1,9 @@
+class AddCounterCachesToSpreeProducts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_products, :variant_count, :integer, default: 0, null: false, if_not_exists: true
+    add_column :spree_products, :classification_count, :integer, default: 0, null: false, if_not_exists: true
+
+    add_index :spree_products, :variant_count, if_not_exists: true
+    add_index :spree_products, :classification_count, if_not_exists: true
+  end
+end

data/db/migrate/20260119170000_add_counter_caches_to_spree_taxons.rb

@@ -0,0 +1,9 @@
+class AddCounterCachesToSpreeTaxons < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_taxons, :children_count, :integer, default: 0, null: false, if_not_exists: true
+    add_column :spree_taxons, :classification_count, :integer, default: 0, null: false, if_not_exists: true
+
+    add_index :spree_taxons, :children_count, if_not_exists: true
+    add_index :spree_taxons, :classification_count, if_not_exists: true
+  end
+end

data/db/migrate/20260120120000_add_image_count_to_spree_variants.rb

@@ -0,0 +1,9 @@
+class AddImageCountToSpreeVariants < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_variants, :image_count, :integer, default: 0, null: false, if_not_exists: true
+    add_column :spree_products, :total_image_count, :integer, default: 0, null: false, if_not_exists: true
+
+    add_index :spree_variants, :image_count, if_not_exists: true
+    add_index :spree_products, :total_image_count, if_not_exists: true
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -11,6 +11,8 @@ module Spree
     class_option :lib_name, default: ''
     class_option :database, default: ''
     class_option :api, type: :boolean, default: false
+    class_option :javascript, type: :boolean, default: false
+    class_option :css, type: :string, default: ''
 
     def self.source_paths
       paths = superclass.source_paths
@@ -24,12 +26,22 @@ module Spree
 
     def generate_test_dummy
       puts 'Generating dummy Rails application...'
+      puts "Options: #{options.inspect}"
 
       args = [File.expand_path(dummy_path, destination_root)]
 
       # Database
       args << "--database=#{options[:database].presence || 'sqlite3'}"
 
+      # CSS framework (e.g., tailwind)
+      args << "--css=#{options[:css]}" if options[:css].present?
+
+      # JavaScript
+      args << '--skip-javascript' unless options[:javascript]
+
+      # Skip asset pipeline if no javascript or css is required
+      args << '--skip-asset-pipeline' unless options[:javascript] || options[:css].present?
+
       # Skip options
       args << '--force'
       args << '--skip-bundle'
@@ -55,6 +67,7 @@ module Spree
       # API mode (implies skip-asset-pipeline, skip-javascript, skip-hotwire)
       args << '--api' if options[:api]
 
+      puts "Rails app generator args: #{args.inspect}"
       Rails::Generators.invoke('app', args)
       inject_yaml_permitted_classes
     end
@@ -68,7 +81,6 @@ module Spree
       template 'rails/application.rb', "#{dummy_path}/config/application.rb", force: true
       template 'rails/routes.rb', "#{dummy_path}/config/routes.rb", force: true
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
-      template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
       template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true unless options[:api]
     end
 
@@ -94,7 +106,7 @@ module Spree
     def inject_yaml_permitted_classes
       inside dummy_path do
         inject_into_file 'config/application.rb', %Q[
-    config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess]
+    config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone]
         ], after: /config\.load_defaults.*$/, verbose: true
       end
     end

data/lib/spree/core/configuration.rb

@@ -42,6 +42,7 @@ module Spree
       preference :credit_to_new_allocation, :boolean, default: false
       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 :events_log_enabled, :boolean, default: true # Log all Spree events to Rails logger
       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

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

@@ -20,21 +20,6 @@ module Spree
           @current_ability ||= Spree.ability_class.new(try_spree_current_user, { store: current_store })
         end
 
-        def redirect_back_or_default(default)
-          Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')
-          redirect_back(fallback_location: default)
-        end
-
-        def set_token
-          Spree::Deprecation.warn('set_token is deprecated and will be removed in Spree 5.2. Please use create_token_cookie(token) instead.')
-          cookies.permanent.signed[:token] ||= cookies.signed[:guest_token]
-          cookies.permanent.signed[:token] ||= {
-            value: generate_token,
-            httponly: true
-          }
-          cookies.permanent.signed[:guest_token] ||= cookies.permanent.signed[:token]
-        end
-
         def current_oauth_token
           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) }

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

@@ -17,15 +17,19 @@ module Spree
         # Returns the currently selected currency.
         # @return [String] the currently selected currency, eg. `USD`
         def current_currency
-          @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
-                                  session[:currency]
-                                elsif params[:currency].present? && supported_currency?(params[:currency])
-                                  params[:currency]
-                                elsif current_store.present?
-                                  current_store.default_currency
-                                else
-                                  Spree::Store.default.default_currency
-                                end&.upcase
+          @current_currency ||= begin
+            currency = if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
+                         session[:currency]
+                       elsif params[:currency].present? && supported_currency?(params[:currency])
+                         params[:currency]
+                       elsif current_store.present?
+                         current_store.default_currency
+                       else
+                         Spree::Store.default.default_currency
+                       end&.upcase
+            Spree::Current.currency = currency
+            currency
+          end
         end
 
         # Returns the list of supported currencies for the current store.

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

@@ -3,7 +3,7 @@ module Spree
     module ControllerHelpers
       module Search
         def build_searcher(params)
-          Spree::Deprecation.warn("Spree::Core::ControllerHelpers::Search is deprecated and will be removed in Spree 6.")
+          Spree::Deprecation.warn("Spree::Core::ControllerHelpers::Search is deprecated and will be removed in Spree 5.5.")
 
           Spree.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user

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

@@ -60,7 +60,11 @@ module Spree
         private
 
         def current_tax_zone
-          @current_tax_zone ||= @current_order&.tax_zone || Spree::Zone.default_tax
+          @current_tax_zone ||= begin
+            zone = @current_order&.tax_zone || Spree::Zone.default_tax || current_store.checkout_zone
+            Spree::Current.zone = zone
+            zone
+          end
         end
 
         def current_store_finder

data/lib/spree/core/engine.rb

@@ -12,6 +12,7 @@ module Spree
                                :adjusters,
                                :stock_splitters,
                                :promotions,
+                               :pricing,
                                :line_item_comparison_hooks,
                                :data_feed_types,
                                :export_types,
@@ -27,14 +28,19 @@ module Spree
                                :metafields,
                                :analytics_events,
                                :analytics_event_handlers,
-                               :integrations)
+                               :integrations,
+                               :subscribers)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
+      PricingEnvironment = Struct.new(:rules)
       SpreeValidators = Struct.new(:addresses)
       MetafieldsEnvironment = Struct.new(:types, :enabled_resources)
       isolate_namespace Spree
       engine_name 'spree'
 
+      # Add app/subscribers to autoload paths
+      config.paths.add 'app/subscribers', eager_load: true
+
       rake_tasks do
         load File.join(root, 'lib', 'tasks', 'exchanges.rake')
       end
@@ -43,13 +49,18 @@ module Spree
         app.config.spree = Environment.new(SpreeCalculators.new, SpreeValidators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
 
         app.config.active_record.yaml_column_permitted_classes ||= []
-        app.config.active_record.yaml_column_permitted_classes.concat([Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess])
+        app.config.active_record.yaml_column_permitted_classes.concat([Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone])
         Spree::Config = app.config.spree.preferences
         Spree::RuntimeConfig = app.config.spree.preferences # for compatibility
         Spree::Dependencies = app.config.spree.dependencies
         Spree::Deprecation = ActiveSupport::Deprecation.new('6.0', 'Spree')
       end
 
+      initializer 'spree.register.subscribers', before: :load_config_initializers do |app|
+        # Initialize subscribers array early so engines can add subscribers via initializers
+        app.config.spree.subscribers = []
+      end
+
       initializer 'spree.register.calculators', before: :after_initialize do |app|
       end
 
@@ -82,6 +93,12 @@ module Spree
       initializer 'spree.promo.register.promotion.calculators' do |app|
       end
 
+      # Pricing configuration for price lists and price rules
+      initializer 'spree.pricing.environment', after: 'spree.environment' do |app|
+        app.config.spree.pricing = PricingEnvironment.new
+        app.config.spree.pricing.rules = []
+      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
@@ -139,6 +156,7 @@ module Spree
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,
           Spree::Promotion::Rules::User,
+          Spree::Promotion::Rules::CustomerGroup,
           Spree::Promotion::Rules::FirstOrder,
           Spree::Promotion::Rules::UserLoggedIn,
           Spree::Promotion::Rules::OneUsePerUser,
@@ -146,6 +164,13 @@ module Spree
           Spree::Promotion::Rules::OptionValue,
         ]
 
+        Rails.application.config.spree.pricing.rules.concat [
+          Spree::PriceRules::ZoneRule,
+          Spree::PriceRules::UserRule,
+          Spree::PriceRules::CustomerGroupRule,
+          Spree::PriceRules::VolumeRule
+        ]
+
         Rails.application.config.spree.promotions.actions = [
           Promotion::Actions::CreateAdjustment,
           Promotion::Actions::CreateItemAdjustments,
@@ -175,82 +200,6 @@ module Spree
           Spree::TaxonRules::Sale,
         ]
 
-        Rails.application.config.spree.themes = [
-          Spree::Themes::Default
-        ]
-
-        Rails.application.config.spree.theme_layout_sections = [
-          Spree::PageSections::AnnouncementBar,
-          Spree::PageSections::Header,
-          Spree::PageSections::Newsletter,
-          Spree::PageSections::Footer
-        ]
-
-        Rails.application.config.spree.pages = [
-          Spree::Pages::Cart,
-          Spree::Pages::Post,
-          Spree::Pages::TaxonList,
-          Spree::Pages::Custom,
-          Spree::Pages::ProductDetails,
-          Spree::Pages::ShopAll,
-          Spree::Pages::Taxon,
-          Spree::Pages::Wishlist,
-          Spree::Pages::SearchResults,
-          Spree::Pages::Checkout,
-          Spree::Pages::Password,
-          Spree::Pages::Homepage,
-          Spree::Pages::Login,
-          Spree::Pages::PostList,
-          Spree::Pages::Account
-        ]
-
-        Rails.application.config.spree.page_sections = [
-          Spree::PageSections::Breadcrumbs,
-          Spree::PageSections::FeaturedPosts,
-          Spree::PageSections::TaxonGrid,
-          Spree::PageSections::ImageWithText,
-          Spree::PageSections::FeaturedTaxon,
-          Spree::PageSections::CollectionBanner,
-          Spree::PageSections::ProductDetails,
-          Spree::PageSections::MainPasswordFooter,
-          Spree::PageSections::RelatedProducts,
-          Spree::PageSections::CustomCode,
-          Spree::PageSections::TaxonBanner,
-          Spree::PageSections::FeaturedProduct,
-          Spree::PageSections::ProductGrid,
-          Spree::PageSections::ImageBanner,
-          Spree::PageSections::PageTitle,
-          Spree::PageSections::MainPasswordHeader,
-          Spree::PageSections::PostDetails,
-          Spree::PageSections::PostGrid,
-          Spree::PageSections::FeaturedTaxons,
-          Spree::PageSections::RichText,
-          Spree::PageSections::Video,
-          Spree::PageSections::Footer,
-          Spree::PageSections::Newsletter,
-          Spree::PageSections::Header,
-          Spree::PageSections::AnnouncementBar
-        ]
-
-        Rails.application.config.spree.page_blocks = [
-          Spree::PageBlocks::Link,
-          Spree::PageBlocks::MegaNav,
-          Spree::PageBlocks::MegaNavWithSubcategories,
-          Spree::PageBlocks::Subheading,
-          Spree::PageBlocks::Heading,
-          Spree::PageBlocks::Nav,
-          Spree::PageBlocks::Buttons,
-          Spree::PageBlocks::Text,
-          Spree::PageBlocks::NewsletterForm,
-          Spree::PageBlocks::Image,
-          Spree::PageBlocks::Products::Title,
-          Spree::PageBlocks::Products::Share,
-          Spree::PageBlocks::Products::Price,
-          Spree::PageBlocks::Products::QuantitySelector,
-          Spree::PageBlocks::Products::VariantPicker,
-          Spree::PageBlocks::Products::BuyButtons
-        ]
-
         Rails.application.config.spree.reports = [
           Spree::Reports::ProductsPerformance,
           Spree::Reports::SalesTotal
@@ -341,6 +290,20 @@ module Spree
         Rails.application.config.spree.validators.addresses = [
           Spree::Addresses::PhoneValidator
         ]
+
+        # Attach event log subscriber if enabled
+        if Spree::Config.events_log_enabled
+          Spree::EventLogSubscriber.attach_to_notifications
+        end
+
+        # Add core event subscribers
+        # Other engines add their subscribers in their own after_initialize blocks
+        Spree.subscribers.concat [
+          Spree::ExportSubscriber,
+          Spree::ReportSubscriber,
+          Spree::InvitationEmailSubscriber,
+          Spree::ProductMetricsSubscriber
+        ]
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|
@@ -379,6 +342,15 @@ module Spree
         end
       end
 
+      # Activate event subscribers after all engines have registered their subscribers
+      # This registers an after_initialize callback late, ensuring it runs after all engine callbacks
+      # Needed for console, jobs, and other contexts where to_prepare doesn't run
+      initializer 'spree.events.schedule_activation', after: :load_config_initializers do |app|
+        app.config.after_initialize do
+          Spree::Events.activate!
+        end
+      end
+
       config.to_prepare do
         # Ensure spree locale paths are present before decorators
         I18n.load_path.unshift(*(Dir.glob(
@@ -391,6 +363,17 @@ module Spree
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
+
+        # Reset and re-activate event subscribers on code reload
+        # activate! will register all subscribers from Spree.subscribers
+        # Note: resolve_subscriber in register_subscribers! handles stale class references
+        Spree::Events.reset!
+        Spree::Events.activate!
+
+        # Re-attach event log subscriber if enabled
+        if Spree::Config.events_log_enabled
+          Spree::EventLogSubscriber.attach_to_notifications
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@ 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.')
+          Spree::Deprecation.warn('Spree::Core::Importer::Order is deprecated and will be removed in Spree 5.5. Please use `Spree::Imports::Order` instead.')
 
           ensure_country_id_from_params params[:ship_address_attributes]
           ensure_state_id_from_params params[:ship_address_attributes]

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

@@ -5,7 +5,7 @@ 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.')
+          Spree::Deprecation.warn('Spree::Core::Importer::Product is deprecated and will be removed in Spree 5.5. Please use `Spree::Imports::Product` instead.')
 
           @store = options[:store] || Spree::Store.default
           @product = product || Spree::Product.new(product_params)

data/lib/spree/core/preferences/preferable.rb

@@ -131,7 +131,9 @@ module Spree::Preferences::Preferable
       decimal_value ||= 0 unless nullable
       decimal_value.present? ? decimal_value.to_s.to_d : decimal_value
     when :integer
-      value.to_i
+      int_value = value.presence
+      int_value ||= 0 unless nullable
+      int_value.present? ? int_value.to_i : int_value
     when :boolean
       if value.is_a?(FalseClass) ||
           value.nil? ||
@@ -162,6 +164,17 @@ module Spree::Preferences::Preferable
       else
         value.class.ancestors.include?(Hash) ? value : {}
       end
+    when :datetime
+      return nil if value.blank?
+
+      case value
+      when Time, Date, DateTime, ActiveSupport::TimeWithZone
+        value
+      when String
+        Time.zone.parse(value)
+      else
+        value.to_time
+      end
     else
       value
     end

data/lib/spree/core/pricing/context.rb

@@ -0,0 +1,63 @@
+module Spree
+  module Pricing
+    class Context
+      attr_reader :variant, :currency, :store, :zone, :user, :quantity, :date, :order
+
+      # Initializes the context
+      # @param variant [Spree::Variant]
+      # @param currency [String]
+      # @param store [Spree::Store]
+      # @param zone [Spree::Zone]
+      # @param user [Spree::User]
+      # @param quantity [Integer]
+      # @param date [Time]
+      # @param order [Spree::Order]
+      def initialize(variant: nil, currency:, store: nil, zone: nil, user: nil, quantity: nil, date: nil, order: nil)
+        @variant = variant
+        @currency = currency
+        @store = store || Spree::Current.store
+        @zone = zone || Spree::Current.zone
+        @user = user
+        @quantity = quantity
+        @date = date || Time.current
+        @order = order
+      end
+
+      # Returns a new context from a variant and currency
+      # @param variant [Spree::Variant]
+      # @param currency [String]
+      # @return [Spree::Pricing::Context]
+      def self.from_currency(variant, currency)
+        new(variant: variant, currency: currency)
+      end
+
+      def self.from_order(variant, order, quantity: nil)
+        new(
+          variant: variant,
+          currency: order.currency,
+          store: order.store,
+          zone: order.tax_zone || order.store.checkout_zone,
+          user: order.user,
+          quantity: quantity || order.line_items.find_by(variant: variant)&.quantity,
+          order: order
+        )
+      end
+
+      # Returns the cache key for the context
+      # @return [String]
+      def cache_key
+        [
+          'spree',
+          'pricing',
+          variant.id,
+          currency,
+          store&.id,
+          zone&.id,
+          user&.id,
+          quantity,
+          date&.to_i
+        ].compact.join('/')
+      end
+    end
+  end
+end

data/lib/spree/core/pricing/resolver.rb

@@ -0,0 +1,129 @@
+module Spree
+  module Pricing
+    class Resolver
+      attr_reader :context
+
+      # Initializes the resolver
+      # @param context [Spree::Pricing::Context]
+      def initialize(context)
+        @context = context
+      end
+
+      # Returns the best price for the variant
+      # @return [Spree::Price]
+      def resolve
+        Rails.cache.fetch(cache_key, expires_in: 15.minutes) do
+          find_best_price
+        end
+      end
+
+      private
+
+      # Returns the best price for the variant
+      # @return [Spree::Price]
+      def find_best_price
+        # Try to find a price from applicable price lists first
+        price_from_list = find_price_from_lists
+        return price_from_list if price_from_list
+
+        # Fall back to base price (no price_list_id)
+        find_base_price
+      end
+
+      # Returns the price from applicable price lists
+      # @return [Spree::Price]
+      def find_price_from_lists
+        applicable_price_lists.each do |price_list|
+          price = find_price_for_list(price_list)
+          return price if price
+        end
+
+        nil
+      end
+
+      # Returns the price lists that are applicable to the context
+      # @return [Array<Spree::PriceList>]
+      def applicable_price_lists
+        @applicable_price_lists ||= price_lists_for_context.select { |list| list.applicable?(context) }
+      end
+
+      # Returns the price lists for the context's store
+      # Uses Spree::Current.price_lists if the context matches, otherwise fetches directly
+      # @return [ActiveRecord::Relation<Spree::PriceList>]
+      def price_lists_for_context
+        if context.store == Spree::Current.store && context.currency == Spree::Current.currency
+          Spree::Current.price_lists
+        else
+          Spree::PriceList.for_context(context)
+        end
+      end
+
+      # Returns the price for a given price list
+      # @param price_list [Spree::PriceList]
+      # @return [Spree::Price]
+      def find_price_for_list(price_list)
+        currency = context.currency&.upcase
+
+        if prices.loaded?
+          prices.detect do |p|
+            p.currency == currency &&
+              p.price_list_id == price_list.id &&
+              p.amount.present? &&
+              !p.amount.zero?
+          end
+        else
+          context.variant.prices
+                 .with_currency(currency)
+                 .where(price_list_id: price_list.id)
+                 .non_zero
+                 .first
+        end
+      end
+
+      # Returns the base price for the variant in the current currency
+      # @return [Spree::Price]
+      def find_base_price
+        currency = context.currency&.upcase
+
+        price = if prices.loaded?
+                  prices.detect do |p|
+                    p.currency == currency &&
+                      p.price_list_id.nil? &&
+                      p.amount.present?
+                  end
+                else
+                  context.variant.prices
+                         .with_currency(currency)
+                         .where(price_list_id: nil)
+                         .where.not(amount: nil)
+                         .first
+                end
+
+        price || build_empty_price
+      end
+
+      # Returns the prices for the variant
+      # @return [ActiveRecord::Relation<Spree::Price>]
+      def prices
+        context.variant.prices
+      end
+
+      # Builds an empty price for the variant
+      # @return [Spree::Price]
+      def build_empty_price
+        context.variant.prices.build(
+          variant: context.variant,
+          currency: context.currency,
+          amount: nil,
+          price_list_id: nil
+        )
+      end
+
+      # Returns the cache key for the resolver
+      # @return [String]
+      def cache_key
+        "#{context.cache_key}/resolved_price"
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Spree
         attr_accessor :properties, :current_user, :current_currency, :current_store, :taxon
 
         def initialize(params)
-          Spree::Deprecation.warn("Spree::Core::Search::Base is deprecated and will be removed in Spree 6. Please use `Spree::Products::Find` finder instead.")
+          Spree::Deprecation.warn("Spree::Core::Search::Base is deprecated and will be removed in Spree 5.5. Please use `Spree::Products::Find` finder instead.")
 
           @properties = {}
           @current_store = params[:current_store] || Spree::Store.default

data/lib/spree/core/token_generator.rb

@@ -2,7 +2,7 @@ module Spree
   module Core
     module TokenGenerator
       def generate_token(model_class = Spree::Order)
-        Spree::Deprecation.warn('generate_token is deprecated and will be removed in Spree 6.0. Please use Rails secure token generator: https://api.rubyonrails.org/classes/ActiveRecord/SecureToken/ClassMethods.html')
+        Spree::Deprecation.warn('generate_token is deprecated and will be removed in Spree 5.5. Please use Rails secure token generator: https://api.rubyonrails.org/classes/ActiveRecord/SecureToken/ClassMethods.html')
         loop do
           token = "#{random_token}#{unique_ending}"
           break token unless model_class.exists?(token: token)