solidus_core 3.1.6 → 3.2.0

data/db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTypeBeforeRemovalToSpreePaymentMethods < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_payment_methods, :type_before_removal, :string
+  end
+end

data/db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class SetPromotionsWithAnyPolicyToAllIfPossible < ActiveRecord::Migration[5.2]
+  def up
+    Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.each do |promotion|
+      if promotion.promotion_rules.length <= 1
+        promotion.update!(match_policy: :all)
+      else
+        raise StandardError, <<~MSG
+          You have promotions with a match policy of any and more than one rule. Please
+          run `bundle exec rake solidus:split_promotions_with_any_match_policy`.
+        MSG
+      end
+    end
+  end
+
+  def down
+    # No-Op
+  end
+end

data/lib/generators/solidus/install/install_generator/bundler_context.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Solidus
+  class InstallGenerator < Rails::Generators::Base
+    # Bundler context during the install process.
+    #
+    # This class gives access to information about the bundler context in which
+    # the install generator is run. I.e., which solidus components are present
+    # in the user's Gemfile. It also allows modifying the Gemfile to add or
+    # remove gems.
+    #
+    # @api private
+    class BundlerContext
+      # Write and remove into and from a Gemfile
+      #
+      # This custom injector fixes support for path, git and custom sources,
+      # which is missing in bundler's upstream injector for a dependency fetched
+      # with `Bundled.locked_gems.dependencies`.
+      #
+      # @api private
+      class InjectorWithPathSupport < Bundler::Injector
+        private def build_gem_lines(conservative_versioning)
+          @deps.map do |d|
+            name = d.name.dump
+            is_local = d.source.instance_of?(Bundler::Source::Path)
+            is_git = d.source.instance_of?(Bundler::Source::Git)
+
+            requirement = if is_local
+                            ", path: \"#{d.source.path}\""
+                          elsif is_git
+                            ", git: \"#{d.git}\"".yield_self { |g| d.ref ? g + ", ref: \"#{d.ref}\"" : g }
+                          elsif conservative_versioning
+                            ", \"#{conservative_version(@definition.specs[d.name][0])}\""
+                          else
+                            ", #{d.requirement.as_list.map(&:dump).join(", ")}"
+                          end
+
+            source = ", :source => \"#{d.source.remotes.join(",")}\"" unless is_local || is_git || d.source.nil?
+
+            %(gem #{name}#{requirement}#{source})
+          end.join("\n")
+        end
+      end
+
+      attr_reader :dependencies, :injector
+
+      def self.bundle_cleanly(&block)
+        Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+      end
+
+      def initialize
+        @dependencies = Bundler.locked_gems.dependencies
+        @injector = InjectorWithPathSupport
+      end
+
+      def solidus_in_gemfile?
+        !solidus_dependency.nil?
+      end
+
+      def component_in_gemfile?(name)
+        !@dependencies["solidus_#{name}"].nil?
+      end
+
+      def break_down_components(components)
+        raise <<~MSG  unless solidus_in_gemfile?
+          solidus meta gem needs to be present in the Gemfile to build the component dependency
+        MSG
+
+        @injector.inject(
+          components.map { |component| dependency_for_component(component) }
+        )
+      end
+
+      def remove(*args, **kwargs, &block)
+        @injector.remove(*args, **kwargs, &block)
+      end
+
+      private
+
+      def dependency_for_component(component)
+        Bundler::Dependency.new(
+          "solidus_#{component}",
+          solidus_dependency.requirement,
+          {
+            "source" => solidus_dependency.source,
+            "git" => solidus_dependency.source.try(:uri),
+            "ref" => solidus_dependency.source.try(:ref)
+          }
+        )
+      end
+
+      def solidus_dependency
+        @dependencies['solidus']
+      end
+    end
+  end
+end

data/lib/generators/solidus/install/install_generator/install_frontend.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Solidus
+  class InstallGenerator < Rails::Generators::Base
+    class InstallFrontend
+      attr_reader :bundler_context,
+                  :generator_context
+
+      def initialize(bundler_context:, generator_context:)
+        @bundler_context = bundler_context
+        @generator_context = generator_context
+      end
+
+      def call(frontend, installer_adds_auth:)
+        case frontend
+        when 'solidus_frontend'
+          install_solidus_frontend
+        when 'solidus_starter_frontend'
+          install_solidus_starter_frontend(installer_adds_auth)
+        end
+      end
+
+      private
+
+      def install_solidus_frontend
+        unless @bundler_context.component_in_gemfile?(:frontend)
+          BundlerContext.bundle_cleanly do
+            `bundle add solidus_frontend`
+            `bundle install`
+          end
+        end
+
+        @generator_context.generate('solidus_frontend:install')
+      end
+
+      def install_solidus_starter_frontend(installer_adds_auth)
+        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(:frontend)
+
+        # TODO: Move installation of solidus_auth_devise to the
+        # solidus_starter_frontend template
+        unless auth_present?(installer_adds_auth)
+          BundlerContext.bundle_cleanly { `bundle add solidus_auth_devise` }
+          @generator_context.generate('solidus:auth:install --auto-run-migrations')
+        end
+        `LOCATION="https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/main/template.rb" bin/rails app:template`
+      end
+
+      def auth_present?(installer_adds_auth)
+        installer_adds_auth || @bundler_context.component_in_gemfile?(:auth_devise)
+      end
+    end
+  end
+end

data/lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Solidus
+  class InstallGenerator < Rails::Generators::Base
+    # Helper for extracting solidus_frontend from solidus meta-gem
+    #
+    # We're recommending users use newer solidus_starter_frontend. However,
+    # we're still shipping solidus_frontend as part of the solidus meta-gem. The
+    # reason is that we don't want users updating previous versions to see its
+    # storefront gone suddenly.
+    #
+    # In future solidus releases, solidus_frontend won't be a component anymore.
+    # However, until that happens:
+    #
+    # - For users of the new frontend, we need to prevent pulling
+    # solidus_frontend.
+    # - For users of the legacy frontend, we need to prevent Bundler from
+    # resolving it from the mono-repo while it's still there.
+    #
+    # This class is a needed companion during the deprecation
+    # path. It'll modify the user's Gemfile, breaking the solidus gem down into
+    # its components but solidus_frontend.
+    class SupportSolidusFrontendExtraction
+      attr_reader :bundler_context
+
+      def initialize(bundler_context:)
+        @bundler_context = bundler_context
+      end
+
+      def call
+        return unless needs_to_break_down_solidus_meta_gem?
+
+        break_down_solidus_meta_gem
+      end
+
+      private
+
+      def break_down_solidus_meta_gem
+        @bundler_context.break_down_components(%w[core backend api sample])
+        @bundler_context.remove(['solidus'])
+      end
+
+      def needs_to_break_down_solidus_meta_gem?
+        @bundler_context.solidus_in_gemfile?
+      end
+    end
+  end
+end

data/lib/generators/solidus/install/install_generator.rb

@@ -1,21 +1,28 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
+require 'rails/version'
+require_relative 'install_generator/bundler_context'
+require_relative 'install_generator/support_solidus_frontend_extraction'
+require_relative 'install_generator/install_frontend'
 
 module Solidus
   # @private
   class InstallGenerator < Rails::Generators::Base
     CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
 
-    PAYMENT_METHODS = {
-      'paypal' => 'solidus_paypal_commerce_platform',
-      'none' => nil,
-    }
+    LEGACY_FRONTEND = 'solidus_frontend'
+    DEFAULT_FRONTEND = 'solidus_starter_frontend'
+    FRONTENDS = [
+      DEFAULT_FRONTEND,
+      LEGACY_FRONTEND,
+      'none'
+    ].freeze
 
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations must be run)'
-    class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
+    class_option :active_storage, type: :boolean, default: Rails.gem_version >= Gem::Version.new("6.1.0"), banner: 'Install ActiveStorage as image attachments handler for products and taxons'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -23,11 +30,11 @@ module Solidus
     class_option :lib_name, type: :string, default: 'spree'
     class_option :with_authentication, type: :boolean, default: true
     class_option :enforce_available_locales, type: :boolean, default: nil
-    class_option :payment_method,
+    class_option :frontend,
                  type: :string,
-                 enum: PAYMENT_METHODS.keys,
-                 default: PAYMENT_METHODS.keys.first,
-                 desc: "Indicates which payment method to install."
+                 enum: FRONTENDS,
+                 default: nil,
+                 desc: "Indicates which frontend to install."
 
     def self.source_paths
       paths = superclass.source_paths
@@ -83,16 +90,10 @@ module Solidus
       empty_directory 'app/assets/images'
 
       %w{javascripts stylesheets images}.each do |path|
-        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
-        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
+        empty_directory "vendor/assets/#{path}/spree/backend" if defined?(Spree::Backend) || Rails.env.test?
       end
 
-      if defined? Spree::Frontend || Rails.env.test?
-        template "vendor/assets/javascripts/spree/frontend/all.js"
-        template "vendor/assets/stylesheets/spree/frontend/all.css"
-      end
-
-      if defined? Spree::Backend || Rails.env.test?
+      if defined?(Spree::Backend) || Rails.env.test?
         template "vendor/assets/javascripts/spree/backend/all.js"
         template "vendor/assets/stylesheets/spree/backend/all.css"
       end
@@ -103,17 +104,6 @@ module Solidus
     end
 
     def configure_application
-      application <<-RUBY
-    # Load application's model / class decorators
-    initializer 'spree.decorators' do |app|
-      config.to_prepare do
-        Dir.glob(Rails.root.join('app/**/*_decorator*.rb')) do |path|
-          require_dependency(path)
-        end
-      end
-    end
-      RUBY
-
       if !options[:enforce_available_locales].nil?
         application <<-RUBY
     # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
@@ -132,6 +122,9 @@ module Solidus
         Solidus has a default authentication extension that uses Devise.
         You can find more info at https://github.com/solidusio/solidus_auth_devise.
 
+        Regardless of what you answer here, it'll be installed if you choose
+        solidus_starter_frontend as your storefront in a later step.
+
         Would you like to install it? (Y/n)"))
 
         @plugins_to_be_installed << 'solidus_auth_devise'
@@ -139,25 +132,6 @@ module Solidus
       end
     end
 
-    def install_payment_method
-      name = options[:payment_method]
-
-      unless options[:auto_accept]
-        available_names = PAYMENT_METHODS.keys
-
-        name = ask("
-  You can select a payment method to be included in the installation process.
-  Please select a payment method name:", limited_to: available_names, default: available_names.first)
-      end
-
-      gem_name = PAYMENT_METHODS.fetch(name)
-
-      if gem_name
-        @plugins_to_be_installed << gem_name
-        @plugin_generators_to_run << "#{gem_name}:install"
-      end
-    end
-
     def include_seed_data
       append_file "db/seeds.rb", <<-RUBY.strip_heredoc
 
@@ -181,7 +155,7 @@ module Solidus
         gem plugin_name
       end
 
-      bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
+      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
       run "spring stop" if defined?(Spring)
 
       @plugin_generators_to_run.each do |plugin_generator_name|
@@ -189,6 +163,22 @@ module Solidus
       end
     end
 
+    def install_frontend
+      return if options[:frontend] == 'none'
+
+      bundler_context = BundlerContext.new
+
+      frontend = detect_frontend_to_install(bundler_context)
+
+      support_solidus_frontend_extraction(bundler_context) unless frontend == LEGACY_FRONTEND
+
+      say_status :installing, frontend
+
+      InstallFrontend.
+        new(bundler_context: bundler_context, generator_context: self).
+        call(frontend, installer_adds_auth: @plugins_to_be_installed.include?('solidus_auth_devise'))
+    end
+
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
@@ -257,8 +247,26 @@ module Solidus
 
     private
 
-    def bundle_cleanly(&block)
-      Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+    def detect_frontend_to_install(bundler_context)
+      ENV['FRONTEND'] ||
+        options[:frontend] ||
+        (bundler_context.component_in_gemfile?(:frontend) && LEGACY_FRONTEND) ||
+        (options[:auto_accept] && DEFAULT_FRONTEND) ||
+        ask(<<~MSG.indent(8), limited_to: FRONTENDS, default: DEFAULT_FRONTEND)
+
+          Which frontend would you like to use? solidus_starter_frontend is
+          recommended. However, some extensions are still only compatible with
+          the now deprecated solidus_frontend.
+
+        MSG
+    end
+
+    def support_solidus_frontend_extraction(bundler_context)
+      say_status "break down", "solidus"
+
+      SupportSolidusFrontendExtraction.
+        new(bundler_context: bundler_context).
+        call
     end
   end
 end

data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt

@@ -31,16 +31,6 @@ Spree.config do |config|
   # to a custom users role:
   # config.roles.assign_permissions :role_name, ['Spree::PermissionSets::CustomPermissionSet']
 
-
-  # Frontend:
-
-  # Custom logo for the frontend
-  # config.logo = "logo/solidus.svg"
-
-  # Template to use when rendering layout
-  # config.layout = "spree/layouts/spree_application"
-
-
   # Admin:
 
   # Custom logo for the admin
@@ -62,12 +52,6 @@ Spree.config do |config|
   # )
 end
 
-<% if defined?(Spree::Frontend::Engine) -%>
-Spree::Frontend::Config.configure do |config|
-  config.locale = 'en'
-end
-<% end -%>
-
 <% if defined?(Spree::Backend::Engine) -%>
 Spree::Backend::Config.configure do |config|
   config.locale = 'en'
@@ -80,6 +64,12 @@ Spree::Backend::Config.configure do |config|
   #   'icon-name',
   #   url: 'https://solidus.io/'
   # )
+
+  # Custom frontend product path
+  #
+  # config.frontend_product_path = ->(template_context, product) {
+  #   template_context.spree.product_path(product)
+  # }
 end
 <% end -%>
 

data/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js

@@ -1,10 +1,10 @@
 // This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// Add new JavaScript code in separate files in this directory and they'll automatically
 // be included in the compiled file accessible from http://example.com/assets/application.js
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
+//= require jquery3
 //= require rails-ujs
 //= require spree/backend
 //= require_tree .

data/lib/spree/app_configuration.rb

@@ -60,6 +60,11 @@ module Spree
     #   @return [Boolean] When false, customers must create an account to complete an order (default: +true+)
     preference :allow_guest_checkout, :boolean, default: true
 
+    # @!attribute [rw] allow_promotions_any_match_policy
+    #   @return [Boolean] When false, admins cannot create promotions with an "any" match policy (default: +false+)
+    #                     Create individual, separate promotions for each of your rules instead.
+    preference :allow_promotions_any_match_policy, :boolean, default: false
+
     # @!attribute [rw] guest_token_cookie_options
     #   @return [Hash] Add additional guest_token cookie options here (ie. domain or path)
     preference :guest_token_cookie_options, :hash, default: {}
@@ -145,6 +150,10 @@ module Spree
     #   @return [String] Two-letter ISO code of a {Spree::Country} to assumed as the country of an unidentified customer (default: "US")
     preference :default_country_iso, :string, default: 'US'
 
+    # @!attribute [rw] default_email_regexp
+    #   @return [Regexp] Regex to be used in email validations, for example in Spree::EmailValidator
+    preference :default_email_regexp, :regexp, default: URI::MailTo::EMAIL_REGEXP
+
     # @!attribute [rw] generate_api_key_for_all_roles
     #   @return [Boolean] Allow generating api key automatically for user
     #   at role_user creation for all roles. (default: +false+)
@@ -165,6 +174,22 @@ module Spree
     #   @return [String] URL of logo used on frontend (default: +'logo/solidus.svg'+)
     preference :logo, :string, default: 'logo/solidus.svg'
 
+    # @!attribute [rw] log_entry_permitted_classes
+    #   @return [Array<String>] An array of extra classes that are allowed to be
+    #     loaded from a serialized YAML as details in {Spree::LogEntry}
+    #     (defaults to a non-frozen empty array, so that extensions can add
+    #     their own classes).
+    #   @example
+    #     config.log_entry_permitted_classes = ['Date']
+    preference :log_entry_permitted_classes, :array, default: []
+
+    # @!attribute [rw] log_entry_allow_aliases
+    #   @return [Boolean] Whether YAML aliases are allowed when loading
+    #     serialized data in {Spree::LogEntry}. It defaults to true. Depending
+    #     on the source of your data, you may consider disabling it to prevent
+    #     entity expansion attacks.
+    preference :log_entry_allow_aliases, :boolean, default: true
+
     # @!attribute [rw] mails_from
     #   @return [String] Email address used as +From:+ field in transactional emails.
     preference :mails_from, :string, default: 'solidus@example.com'
@@ -263,6 +288,13 @@ module Spree
     #   @return [] Track on_hand values for variants / products. (default: true)
     preference :track_inventory_levels, :boolean, default: true
 
+    # @!attribute [rw] use_legacy_events
+    #   Before v3.2, Solidus used a custom pub/sub implementation based on
+    #   ActiveSupport::Notifications. Now, we internally use and recommend
+    #   [Omnes](https://github.com/nebulab/omnes). This preference allows falling
+    #   back to the old system.
+    #   @return [Boolean]
+    versioned_preference :use_legacy_events, :boolean, initial_value: true, boundaries: { "3.2.0.alpha" => false }
 
     # Other configurations
 
@@ -525,6 +557,17 @@ module Spree
     # Enumerable of taxons adhering to the present_taxon_class interface
     class_name_attribute :taxon_attachment_module, default: 'Spree::Taxon::ActiveStorageAttachment'
 
+    # 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.
+    #
+    # @!attribute [rw] migration_path
+    # @return [Pathname] the configured path. (default: `Rails.root.join('db', 'migrate')`)
+    attr_writer :migration_path
+    def migration_path
+      @migration_path ||= ::Rails.root.join('db', 'migrate')
+    end
+
     # Allows providing your own class instance for generating order numbers.
     #
     # @!attribute [rw] order_number_generator

data/lib/spree/bus.rb

@@ -0,0 +1,20 @@
+require 'omnes'
+
+module Spree
+  # Global [Omnes](https://github.com/nebulab/omnes) bus.
+  #
+  # This is used for internal events, while host applications are also able to
+  # use it.
+  #
+  # It has some modifications to support internal usage of the legacy event
+  # system {see Spree::AppConfiguration#use_legacy_events}.
+  Bus = Omnes::Bus.new
+  Bus.define_singleton_method(:publish) do |*args, **kwargs, &block|
+    if Spree::Config.use_legacy_events
+      Spree::Event.fire(*args, **kwargs, &block)
+    else
+      # Override caller_location to point to the actual event publisher
+      super(*args, **kwargs, caller_location: caller_locations(1)[0], &block)
+    end
+  end
+end

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

@@ -18,6 +18,7 @@ module Spree
         included do
           before_action :set_guest_token
           helper_method :try_spree_current_user
+          helper_method :spree_current_user
 
           class_attribute :unauthorized_redirect
           self.unauthorized_redirect = -> do
@@ -32,7 +33,7 @@ module Spree
 
         # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Ability.new(try_spree_current_user)
+          @current_ability ||= Spree::Ability.new(spree_current_user)
         end
 
         def redirect_back_or_default(default)
@@ -53,6 +54,11 @@ module Spree
           Spree::UserLastUrlStorer.new(self).store_location
         end
 
+        # Auth extensions are expected to define it, otherwise it's a no-op
+        def spree_current_user
+          defined?(super) ? super : nil
+        end
+
         # proxy method to *possible* spree_current_user method
         # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
         def try_spree_current_user
@@ -65,6 +71,8 @@ module Spree
             current_spree_user
           end
         end
+
+        deprecate try_spree_current_user: :spree_current_user, deprecator: Spree::Deprecation
       end
     end
   end

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

@@ -7,9 +7,7 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          before_action do
-            ActiveStorage::Current.host = request.base_url
-          end
+          Spree::RailsCompatibility.active_storage_set_current(self)
         end
       end
     end

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

@@ -24,9 +24,9 @@ module Spree
 
           if should_build && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.new(new_order_params)
-            @current_order.user ||= try_spree_current_user
+            @current_order.user ||= spree_current_user
             # See issue https://github.com/spree/spree/issues/3346 for reasons why this line is here
-            @current_order.created_by ||= try_spree_current_user
+            @current_order.created_by ||= spree_current_user
             @current_order.save! if should_create
           end
 
@@ -38,15 +38,15 @@ module Spree
 
         def associate_user
           @order ||= current_order
-          if try_spree_current_user && @order
-            @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
+          if spree_current_user && @order
+            @order.associate_user!(spree_current_user) if @order.user.blank? || @order.email.blank?
           end
         end
 
         def set_current_order
-          if try_spree_current_user && current_order
-            try_spree_current_user.orders.by_store(current_store).incomplete.where('id != ?', current_order.id).each do |order|
-              current_order.merge!(order, try_spree_current_user)
+          if spree_current_user && current_order
+            spree_current_user.orders.by_store(current_store).incomplete.where('id != ?', current_order.id).each do |order|
+              current_order.merge!(order, spree_current_user)
             end
           end
         end
@@ -58,11 +58,11 @@ module Spree
         private
 
         def last_incomplete_order
-          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(store: current_store)
+          @last_incomplete_order ||= spree_current_user.last_incomplete_spree_order(store: current_store)
         end
 
         def current_order_params
-          { currency: current_pricing_options.currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
+          { currency: current_pricing_options.currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: spree_current_user.try(:id) }
         end
 
         def new_order_params
@@ -76,7 +76,7 @@ module Spree
           order = Spree::Order.incomplete.lock(should_lock).find_by(current_order_params)
 
           # Find any incomplete orders for the current user
-          if order.nil? && try_spree_current_user
+          if order.nil? && spree_current_user
             order = last_incomplete_order
           end
 

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

@@ -6,7 +6,7 @@ module Spree
       module Search
         def build_searcher(params)
           Spree::Config.searcher_class.new(params).tap do |searcher|
-            searcher.current_user = try_spree_current_user
+            searcher.current_user = spree_current_user
             searcher.pricing_options = current_pricing_options
           end
         end