spree_core 4.1.1 → 4.5.0

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
 

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

@@ -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
 
@@ -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

@@ -28,6 +28,7 @@ module Spree
       product.dup.tap do |new_product|
         new_product.name = "COPY OF #{product.name}"
         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),

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

@@ -2,25 +2,19 @@ module Spree
   module Core
     module Search
       class Base
-        attr_accessor :properties
-        attr_accessor :current_user
-        attr_accessor :current_currency
+        attr_accessor :properties, :current_user, :current_currency, :current_store, :taxon
 
         def initialize(params)
-          self.current_currency = Spree::Config[:currency]
           @properties = {}
+          @current_store = params[:current_store] || Spree::Store.default
+          @current_currency = @current_store.default_currency
+          @taxon = params[:taxon]
+
           prepare(params)
         end
 
         def retrieve_products
-          @products = extended_base_scope&.available
-          curr_page = page || 1
-
-          unless Spree::Config.show_products_without_price
-            @products = @products.where('spree_prices.amount IS NOT NULL').
-                        where('spree_prices.currency' => current_currency)
-          end
-          @products = @products.page(curr_page).per(per_page)
+          @products = extended_base_scope.page(page || 1).per(per_page)
         end
 
         def method_missing(name)
@@ -34,27 +28,32 @@ module Spree
         protected
 
         def extended_base_scope
-          base_scope = Spree::Product.spree_base_scopes.active
+          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,
               filter: {
                 price: price,
                 option_value_ids: option_value_ids,
-                taxons: taxon&.id
+                properties: product_properties,
+                taxons: taxon&.id,
+                currency: current_currency
               },
               sort_by: sort_by
-            },
-            current_currency: current_currency
-          ).execute
-          base_scope = add_search_scopes(base_scope)
-          base_scope = add_eagerload_scopes(base_scope)
-          base_scope
+            }
+          }
         end
 
         def add_eagerload_scopes(scope)
-          scope = scope.includes(
+          scope.includes(
             :tax_category,
             variants: [
               { images: { attachment_attachment: :blob } }
@@ -64,7 +63,6 @@ module Spree
               { images: { attachment_attachment: :blob } }
             ]
           )
-          scope
         end
 
         def add_search_scopes(base_scope)
@@ -107,13 +105,14 @@ 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 = BigDecimal::INFINITY if high_price&.zero?
           end
 
           "#{low_price},#{high_price}"
         end
 
         def build_option_value_ids(params)
-          filter_params = Spree::OptionType.all.map(&:filter_param)
+          filter_params = Spree::OptionType.filterable.map(&:filter_param)
 
           filter_params.reduce([]) do |acc, filter_param|
             acc + params[filter_param].to_s.split(',')
@@ -121,7 +120,6 @@ module Spree
         end
 
         def prepare(params)
-          @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
           @properties[:keywords] = params[:keywords]
           @properties[:option_value_ids] = build_option_value_ids(params)
           @properties[:price] = get_price_range(params[:price])
@@ -136,6 +134,7 @@ module Spree
                                else
                                  1
                                end
+          @properties[:product_properties] = params[:properties]
         end
       end
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,7 @@
 module Spree
+  VERSION = '4.5.0'.freeze
+
   def self.version
-    '4.1.1'
+    VERSION
   end
 end