spree_core 4.0.0 → 4.6.0

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

@@ -5,17 +5,37 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :current_currency
-          helper_method :current_store
-          helper_method :current_price_options
+          if defined?(helper_method)
+            helper_method :current_store
+            helper_method :current_price_options
+            helper_method :available_menus
+          end
         end
 
-        def current_currency
-          Spree::Config[:currency]
+        def current_store
+          @current_store ||= current_store_finder.new(url: request.env['SERVER_NAME']).execute
         end
 
-        def current_store
-          @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
+        def available_menus
+          @available_menus ||= current_store.menus
+        end
+
+        def store_locale
+          current_store.default_locale
+        end
+
+        def ensure_current_store(object)
+          return if object.nil?
+
+          if object.has_attribute?(:store_id)
+            if object.store.present? && object.store != current_store
+              raise Spree.t('errors.messages.store_is_already_set')
+            else
+              object.store = current_store
+            end
+          elsif object.class.method_defined?(:stores) && object.stores.exclude?(current_store)
+            object.stores << current_store
+          end
         end
 
         # Return a Hash of things that influence the prices displayed in your shop.
@@ -43,7 +63,11 @@ module Spree
         private
 
         def current_tax_zone
-          @current_tax_zone ||= current_order.try(:tax_zone) || Spree::Zone.default_tax
+          @current_tax_zone ||= @current_order&.tax_zone || Spree::Zone.default_tax
+        end
+
+        def current_store_finder
+          Spree::Dependencies.current_store_finder.constantize
         end
       end
     end

data/lib/spree/core/dependencies.rb

@@ -0,0 +1,106 @@
+require_relative 'dependencies_helper'
+
+module Spree
+  module Core
+    class Dependencies
+      INJECTION_POINTS_WITH_DEFAULTS = {
+        # ability
+        ability_class: 'Spree::Ability',
+
+        # 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',
+
+        # data feeds
+        data_feeds_google_rss_service: 'Spree::DataFeeds::Google::Rss',
+        data_feeds_google_optional_attributes_service: 'Spree::DataFeeds::Google::OptionalAttributes',
+        data_feeds_google_required_attributes_service: 'Spree::DataFeeds::Google::RequiredAttributes',
+        data_feeds_google_optional_sub_attributes_service: 'Spree::DataFeeds::Google::OptionalSubAttributes',
+        data_feeds_google_products_list: 'Spree::DataFeeds::Google::ProductsList',
+
+        # 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'
+      }.freeze
+
+      include Spree::DependenciesHelper
+    end
+  end
+end

data/lib/spree/core/dependencies_helper.rb

@@ -0,0 +1,30 @@
+module Spree
+  module DependenciesHelper
+    def self.included(base)
+      injection_points = base::INJECTION_POINTS_WITH_DEFAULTS.keys.freeze
+      base.const_set(:INJECTION_POINTS, injection_points)
+      base.attr_accessor(*injection_points)
+    end
+
+    def initialize
+      set_default_values
+    end
+
+    def current_values
+      values = []
+      self.class::INJECTION_POINTS.each do |injection_point|
+        values << { injection_point.to_s => instance_variable_get("@#{injection_point}") }
+      end
+      values
+    end
+
+    private
+
+    def set_default_values
+      self.class::INJECTION_POINTS_WITH_DEFAULTS.each do |injection_point, default_value|
+        value = default_value.respond_to?(:call) ? default_value.call : default_value
+        instance_variable_set("@#{injection_point}", value)
+      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
@@ -8,7 +11,8 @@ module Spree
                                :adjusters,
                                :stock_splitters,
                                :promotions,
-                               :line_item_comparison_hooks)
+                               :line_item_comparison_hooks,
+                               :data_feed_types)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       isolate_namespace Spree
@@ -19,30 +23,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 +40,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 +53,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 +99,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,15 +116,20 @@ 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,
           Promotion::Actions::FreeShipping
         ]
+
+        Rails.application.config.spree.data_feed_types = [
+          Spree::DataFeed::Google
+        ]
+      end
+
+      initializer 'spree.promo.register.promotions.actions' do |app|
       end
 
       # filter sensitive information during logging
@@ -121,7 +138,10 @@ module Spree
           :password,
           :password_confirmation,
           :number,
-          :verification_value
+          :verification_value,
+          :client_id,
+          :client_secret,
+          :refresh_token
         ]
       end
 

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

@@ -38,7 +38,7 @@ module Spree
             end
           end
           order.reload
-        rescue Exception => e
+        rescue StandardError => e
           order.destroy if order&.persisted?
           raise e.message
         end
@@ -80,7 +80,7 @@ module Spree
 
             adjustments = s.delete(:adjustments_attributes)
             create_adjustments_from_params(adjustments, order, shipment)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import shipments: #{e.message} #{s}"
           end
         end
@@ -115,7 +115,7 @@ module Spree
               line_item.save!
             end
             create_adjustments_from_params(adjustments, order, line_item)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import line items: #{e.message} #{line_item}"
           end
         end
@@ -132,7 +132,7 @@ module Spree
             )
             adjustment.save!
             adjustment.close!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import adjustments: #{e.message} #{a}"
           end
         end
@@ -150,7 +150,7 @@ module Spree
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
             payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import payments: #{e.message} #{p}"
           end
         end
@@ -167,7 +167,7 @@ module Spree
             gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
             imported: true
           )
-        rescue Exception => e
+        rescue StandardError => e
           raise "Order import source payments: #{e.message} #{source_hash}"
         end
 
@@ -179,7 +179,7 @@ module Spree
           hash
         rescue ActiveRecord::RecordNotFound => e
           raise "Ensure order import variant: Variant w/SKU #{sku} not found."
-        rescue Exception => e
+        rescue StandardError => e
           raise "Ensure order import variant: #{e.message} #{hash}"
         end
 
@@ -200,7 +200,7 @@ module Spree
 
             address.delete(:country)
             address[:country_id] = Spree::Country.where(search).first!.id
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address country: #{e.message} #{search}"
           end
         end
@@ -224,7 +224,7 @@ module Spree
             else
               address[:state_name] = search[:name] || search[:abbr]
             end
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address state: #{e.message} #{search}"
           end
         end

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

@@ -2,10 +2,12 @@ module Spree
   module Core
     module Importer
       class Product
-        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs
+        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs, :store
 
         def initialize(product, product_params, options = {})
+          @store = options[:store] || Spree::Store.default
           @product = product || Spree::Product.new(product_params)
+          @product.stores << @store if @product.stores.exclude?(@store)
 
           @product_attrs = product_params.to_h
           @variants_attrs = (options[:variants_attrs] || []).map(&:to_h)
@@ -30,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

@@ -13,22 +13,21 @@ module Spree
       end
 
       def included(host)
-        generator_method   = method(:generate_permalink)
         generator_instance = self
 
         host.class_eval do
-          validates(:number, presence: true, uniqueness: { allow_blank: true })
-
           before_validation do |instance|
-            instance.number ||= generator_method.call(host)
+            instance.number ||= generate_permalink(host)
           end
 
           define_singleton_method(:number_generator) { generator_instance }
+
+          def generate_permalink(host)
+            host.number_generator.generate_permalink(host)
+          end
         end
       end
 
-      private
-
       def generate_permalink(host)
         length = @length
 

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
 
@@ -58,6 +61,11 @@ module Spree::Preferences::Preferable
     send self.class.preference_default_getter_method(name)
   end
 
+  def preference_deprecated(name)
+    has_preference! name
+    send(self.class.preference_deprecated_getter_method(name))
+  end
+
   def has_preference!(name)
     raise NoMethodError, "#{name} preference not defined" unless has_preference? name
   end
@@ -72,6 +80,13 @@ module Spree::Preferences::Preferable
     end
   end
 
+  def deprecated_preferences
+    defined_preferences.each_with_object([]) do |pref_name, array|
+      deprecated_message = preference_deprecated(pref_name)
+      array << { name: pref_name, message: deprecated_message } unless deprecated_message.nil?
+    end
+  end
+
   def default_preferences
     Hash[
       defined_preferences.map do |preference|
@@ -100,7 +115,7 @@ module Spree::Preferences::Preferable
       if value.is_a?(FalseClass) ||
           value.nil? ||
           value == 0 ||
-          value =~ /^(f|false|0)$/i ||
+          value&.to_s =~ /^(f|false|0)$/i ||
           (value.respond_to?(:empty?) && value.empty?)
         false
       else

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

@@ -2,9 +2,10 @@ module Spree::Preferences
   module PreferableClassMethods
     def preference(name, type, *args)
       options = args.extract_options!
-      options.assert_valid_keys(:default)
+      options.assert_valid_keys(:default, :deprecated)
       default = options[:default]
       default = -> { options[:default] } unless default.is_a?(Proc)
+      deprecated = options[:deprecated]
 
       # cache_key will be nil for new objects, then if we check if there
       # is a pending preference before going to default
@@ -18,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.
@@ -29,6 +32,10 @@ module Spree::Preferences
       define_method preference_type_getter_method(name) do
         type
       end
+
+      define_method preference_deprecated_getter_method(name) do
+        deprecated
+      end
     end
 
     def preference_getter_method(name)
@@ -43,6 +50,10 @@ module Spree::Preferences
       "preferred_#{name}_default".to_sym
     end
 
+    def preference_deprecated_getter_method(name)
+      "preferred_#{name}_deprecated".to_sym
+    end
+
     def preference_type_getter_method(name)
       "preferred_#{name}_type".to_sym
     end

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

@@ -6,7 +6,7 @@
 
 require 'singleton'
 
-DB_EXCEPTIONS = if defined? PG
+DB_EXCEPTIONS ||= if defined? PG
                   [PG::ConnectionBad, ActiveRecord::NoDatabaseError]
                 elsif defined? Mysql2
                   [Mysql2::Error::ConnectionError, ActiveRecord::NoDatabaseError]
@@ -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/product_duplicator.rb

@@ -26,8 +26,9 @@ module Spree
 
     def duplicate_product
       product.dup.tap do |new_product|
-        new_product.name = "COPY OF #{product.name}"
+        product.translations.each { |t| new_product.send(:name=, "COPY OF #{t.name}", locale: t.locale) }
         new_product.taxons = product.taxons
+        new_product.stores = product.stores
         new_product.created_at = nil
         new_product.deleted_at = nil
         new_product.updated_at = nil

data/lib/spree/core/product_filters.rb

@@ -68,9 +68,9 @@ module Spree
       def self.price_filter
         v = Spree::Price.arel_table
         conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
-                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
-                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
-                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].between(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].between(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].between(18..20)],
                  [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name: Spree.t(:price_range),
@@ -98,18 +98,21 @@ module Spree
         conds.each do |new_scope|
           scope = scope.or(new_scope)
         end
-        Spree::Product.with_property('brand').where(scope)
+        Product.with_property('brand').join_translation_table(ProductProperty).where(scope)
       end
 
       def self.brand_filter
         brand_property = Spree::Property.find_by(name: 'brand')
         brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
-        pp = Spree::ProductProperty.arel_table
-        conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
+
+        conditions = brands.map do |brand|
+          [brand, { ProductProperty.translation_table_alias => { value: brand } }]
+        end.to_h
+
         {
           name: I18n.t('spree.taxonomy_brands_name'),
           scope: :brand_any,
-          conds: conds,
+          conds: conditions,
           labels: brands.sort.map { |k| [k, k] }
         }
       end