spree_core 4.2.3 → 4.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c152a93c7f008f29d4924552002413386a57ffad6889e735b020e5cb59ec7e0
-  data.tar.gz: 973a4f63078cab9a925ef921323df6a8207d2d2c49b5a1770cae4dd725db42a2
+  metadata.gz: 2b031163e0c77da6776854068fb9769ed6cd44ff048e75a088ee6526c40db986
+  data.tar.gz: 2cfbcbfb7a1c5221270e7b677222a94047b5965cb32e5144ca6540d927f2b51b
 SHA512:
-  metadata.gz: fd78758868388f04c61383131a2510e6253d3b8e334f9d74dca40f83c064de6b9e2afd5a5a3944b1114a70b53e846e7d33c690c6ee846319e7ef951458367aaa
-  data.tar.gz: 796583a22125857aa1c5e9dc883030e47c1b92b55d2118bb0b8bcef73fa7264c3af1bbc0ad55cb000bf3da11246369dc28c02e7b152ff1eb663b499e51b14548
+  metadata.gz: 375bd44efe93e706a1bd58abcc9be1fb3f2af0b0a993fe223a1e093033193105012284e0a7f03413fad0099feb105fa4b1526b8d576d76e58e62e37967c67768
+  data.tar.gz: c82f2406e121b6fff092677e91d0344e35c5b6e19aee5aca1916ee819d7909a42ef854653922413e215c67934cb73df2a1af002fbe3d48f53db99ff854d80f93

data/app/finders/concerns/spree/product_filterable.rb

@@ -0,0 +1,9 @@
+module Spree
+  module ProductFilterable
+    private
+
+    def find_available(scope, products_scope)
+      scope.filterable.for_products(products_scope)
+    end
+  end
+end

data/app/finders/spree/cms_pages/find.rb

@@ -0,0 +1,41 @@
+module Spree
+  module CmsPages
+    class Find < ::Spree::BaseFinder
+      ALLOWED_KINDS = %w[standard home feature].freeze
+
+      def initialize(scope:, params:)
+        @scope = scope
+        @title = params.dig(:filter, :title)
+        @kind  = params.dig(:filter, :type)
+      end
+
+      def execute
+        pages = by_title(scope)
+        pages = by_kind(pages)
+
+        pages
+      end
+
+      private
+
+      attr_reader :scope, :title, :kind
+
+      def title_matcher
+        Spree::CmsPage.arel_table[:title].matches("%#{title}%")
+      end
+
+      def by_title(pages)
+        return pages if title.blank?
+
+        pages.where(title_matcher)
+      end
+
+      def by_kind(pages)
+        return pages if kind.blank?
+        return pages if ALLOWED_KINDS.exclude?(kind)
+
+        pages.send(kind)
+      end
+    end
+  end
+end

data/app/finders/spree/menus/find.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Menus
+    class Find < ::Spree::BaseFinder
+      def execute
+        return scope.where(location: params[:filter]['location']) if params[:filter].present? && params[:filter]['location'].present?
+
+        scope
+      end
+    end
+  end
+end

data/app/finders/spree/option_values/find_available.rb

@@ -0,0 +1,20 @@
+module Spree
+  module OptionValues
+    class FindAvailable
+      include ProductFilterable
+
+      def initialize(scope: OptionValue.spree_base_scopes, products_scope: Product.spree_base_scopes)
+        @scope = scope
+        @products_scope = products_scope
+      end
+
+      def execute
+        find_available(scope, products_scope)
+      end
+
+      private
+
+      attr_reader :scope, :products_scope
+    end
+  end
+end

data/app/finders/spree/orders/find_complete.rb

@@ -1,18 +1,20 @@
 module Spree
   module Orders
     class FindComplete
-      attr_reader :user, :number, :token
+      attr_reader :user, :number, :token, :store
 
-      def initialize(user: nil, number: nil, token: nil)
+      def initialize(user: nil, number: nil, token: nil, store: nil)
         @user = user
         @number = number
         @token = token
+        @store = store
       end
 
       def execute
         orders = by_user(scope)
         orders = by_number(orders)
         orders = by_token(orders)
+        orders = by_store(orders)
 
         orders
       end
@@ -35,6 +37,10 @@ module Spree
         token.present?
       end
 
+      def store?
+        store.present?
+      end
+
       def by_user(orders)
         return orders unless user?
 
@@ -53,6 +59,12 @@ module Spree
         orders.where(token: token)
       end
 
+      def by_store(orders)
+        return orders unless store?
+
+        orders.where(store: store)
+      end
+
       def scope_includes
         {
           line_items: [

data/app/finders/spree/orders/find_current.rb

@@ -15,19 +15,7 @@ module Spree
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.not_canceled.includes(scope_includes)
-      end
-
-      def scope_includes
-        {
-          line_items: [
-            variant: [
-              :images,
-              option_values: :option_type,
-              product: :product_properties,
-            ]
-          ]
-        }
+        Spree::Order.incomplete.not_canceled
       end
     end
   end

data/app/finders/spree/product_properties/find_available.rb

@@ -0,0 +1,20 @@
+module Spree
+  module ProductProperties
+    class FindAvailable
+      include ProductFilterable
+
+      def initialize(scope: ProductProperty.spree_base_scopes, products_scope: Product.spree_base_scopes)
+        @scope = scope
+        @products_scope = products_scope
+      end
+
+      def execute
+        find_available(scope, products_scope)
+      end
+
+      private
+
+      attr_reader :scope, :products_scope
+    end
+  end
+end

data/app/finders/spree/products/find.rb

@@ -1,13 +1,23 @@
 module Spree
   module Products
     class Find
-      def initialize(scope:, params:, current_currency:)
+      def initialize(scope:, params:, current_currency: nil)
         @scope = scope
 
+        ActiveSupport::Deprecation.warn('`current_currency` param is deprecated and will be removed in Spree 5') if current_currency
+
+        if current_currency.present?
+          ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            `current_currency` param is deprecated and will be removed in Spree 5.
+            Please pass `:currency` in `params` hash instead.
+          DEPRECATION
+        end
+
         @ids              = String(params.dig(:filter, :ids)).split(',')
         @skus             = String(params.dig(:filter, :skus)).split(',')
-        @price            = String(params.dig(:filter, :price)).split(',').map(&:to_f)
-        @currency         = current_currency
+        @store            = params[:store] || Spree::Store.default
+        @price            = map_prices(String(params.dig(:filter, :price)).split(','))
+        @currency         = current_currency || params.dig(:filter, :currency) || params[:currency]
         @taxons           = taxon_ids(params.dig(:filter, :taxons))
         @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
         @name             = params.dig(:filter, :name)
@@ -16,6 +26,7 @@ module Spree
         @sort_by          = params.dig(:sort_by)
         @deleted          = params.dig(:filter, :show_deleted)
         @discontinued     = params.dig(:filter, :show_discontinued)
+        @properties       = params.dig(:filter, :properties)
       end
 
       def execute
@@ -28,6 +39,7 @@ module Spree
         products = by_name(products)
         products = by_options(products)
         products = by_option_value_ids(products)
+        products = by_properties(products)
         products = include_deleted(products)
         products = include_discontinued(products)
         products = ordered(products)
@@ -38,7 +50,7 @@ module Spree
       private
 
       attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options,
-                  :option_value_ids, :scope, :sort_by, :deleted, :discontinued
+                  :option_value_ids, :scope, :sort_by, :deleted, :discontinued, :properties, :store
 
       def ids?
         ids.present?
@@ -80,8 +92,8 @@ module Spree
         sort_by.present?
       end
 
-      def name_matcher
-        Spree::Product.arel_table[:name].matches("%#{name}%")
+      def properties?
+        properties.present? && properties.values.reject(&:empty?).present?
       end
 
       def by_ids(products)
@@ -99,19 +111,13 @@ module Spree
       def by_price(products)
         return products unless price?
 
-        products.joins(master: :prices).
-          where(
-            spree_prices: {
-              amount: price.min..price.max,
-              currency: currency&.upcase
-            }
-          )
+        products.price_between(price.min, price.max)
       end
 
       def by_currency(products)
         return products unless currency?
 
-        products.joins(master: :prices).where(spree_prices: { currency: currency.upcase })
+        products.with_currency(currency)
       end
 
       def by_taxons(products)
@@ -136,17 +142,14 @@ module Spree
       def by_name(products)
         return products unless name?
 
-        products.where(name_matcher)
+        products.like_any([:name], [name])
       end
 
       def by_options(products)
         return products unless options?
 
-        products.where(
-          id: options.map do |key, value|
-            products.with_option_value(key, value).ids
-          end.flatten.compact.uniq
-        )
+        products_ids = options.map { |key, value| products.with_option_value(key, value).ids }
+        products.where(id: products_ids.reduce(&:intersection))
       end
 
       def by_option_value_ids(products)
@@ -163,6 +166,27 @@ module Spree
         products.where(id: product_ids)
       end
 
+      def by_properties(products)
+        return products unless properties?
+
+        product_ids = []
+        index = 0
+
+        properties.to_unsafe_hash.each do |property_filter_param, product_properties_values|
+          next if property_filter_param.blank? || product_properties_values.empty?
+
+          values = product_properties_values.split(',').reject(&:empty?).uniq.map(&:parameterize)
+
+          next if values.empty?
+
+          ids = products.with_property_values(property_filter_param, values).ids
+          product_ids = index == 0 ? ids : product_ids & ids
+          index += 1
+        end
+
+        products.where(id: product_ids)
+      end
+
       def option_types_count(option_value_ids)
         Spree::OptionValue.
           where(id: option_value_ids).
@@ -176,12 +200,14 @@ module Spree
         case sort_by
         when 'default'
           if taxons?
-            products.
-              select("#{Product.table_name}.*, #{Classification.table_name}.position").
-              order("#{Classification.table_name}.position" => :asc)
+            products.ascend_by_taxons_min_position(taxons)
           else
             products
           end
+        when 'name-a-z'
+          products.order(name: :asc)
+        when 'name-z-a'
+          products.order(name: :desc)
         when 'newest-first'
           products.order(available_on: :desc)
         when 'price-high-to-low'
@@ -202,13 +228,19 @@ module Spree
       end
 
       def include_discontinued(products)
-        discontinued ? products : products.available
+        discontinued ? products : products.active(currency)
+      end
+
+      def map_prices(prices)
+        prices.map do |price|
+          price == 'Infinity' ? Float::INFINITY : price.to_f
+        end
       end
 
       def taxon_ids(taxons_ids)
         return if taxons_ids.nil? || taxons_ids.to_s.blank?
 
-        taxons = Spree::Taxon.where(id: taxons_ids.to_s.split(','))
+        taxons = store.taxons.where(id: taxons_ids.to_s.split(','))
         taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
       end
     end

data/app/finders/spree/stores/find_current.rb

@@ -0,0 +1,24 @@
+module Spree
+  module Stores
+    class FindCurrent
+      def initialize(scope: nil, url: nil)
+        @scope = scope || Spree::Store
+        @url = url
+      end
+
+      def execute
+        by_url(scope) || scope.default
+      end
+
+      protected
+
+      attr_reader :scope, :url
+
+      def by_url(scope)
+        return if url.blank?
+
+        scope.by_url(url).first
+      end
+    end
+  end
+end

data/app/helpers/spree/base_helper.rb

@@ -9,6 +9,25 @@ module Spree
       end.sort_by { |c| c.name.parameterize }
     end
 
+    def all_countries
+      countries = Spree::Country.all
+
+      countries.collect do |country|
+        country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
+        country
+      end.sort_by { |c| c.name.parameterize }
+    end
+
+    def spree_resource_path(resource)
+      last_word = resource.class.name.split('::', 10).last
+
+      spree_class_name_as_path(last_word)
+    end
+
+    def spree_class_name_as_path(class_name)
+      class_name.underscore.humanize.parameterize(separator: '_')
+    end
+
     def display_price(product_or_variant)
       product_or_variant.
         price_in(current_currency).
@@ -36,6 +55,11 @@ module Spree
     end
 
     def logo(image_path = nil, options = {})
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `BaseHelper#logo` is deprecated and will be removed in Spree 5.0.
+        Please use `FrontendHelper#logo` instead
+      DEPRECATION
+
       image_path ||= if current_store.logo.attached? && current_store.logo.variable?
                        main_app.url_for(current_store.logo.variant(resize: '244x104>'))
                      elsif current_store.logo.attached? && current_store.logo.image?
@@ -51,6 +75,10 @@ module Spree
       end
     end
 
+    def spree_favicon_path
+      main_app.url_for(current_store.favicon || 'favicon.ico')
+    end
+
     def object
       instance_variable_get('@' + controller_name.singularize)
     end
@@ -95,7 +123,7 @@ module Spree
                               description: [object.name, current_store.meta_description].reject(&:blank?).join(', '))
         else
           meta.reverse_merge!(keywords: (current_store.meta_keywords || current_store.seo_title),
-                              description: (current_store.meta_description || current_store.seo_title))
+                              description: (current_store.homepage(I18n.locale)&.seo_meta_description || current_store.seo_meta_description))
         end
       end
       meta
@@ -143,6 +171,34 @@ module Spree
       Spree::Core::Engine.frontend_available?
     end
 
+    def rails_5?
+      Rails::VERSION::STRING < '6.0'
+    end
+
+    def spree_storefront_resource_url(resource, options = {})
+      if defined?(locale_param) && locale_param.present?
+        options.merge!(locale: locale_param)
+      end
+
+      localize = if options[:locale].present?
+                   "/#{options[:locale]}"
+                 else
+                   ''
+                 end
+
+      if resource.instance_of?(Spree::Product)
+        "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_products_path]}/#{resource.slug}"
+      elsif resource.instance_of?(Spree::Taxon)
+        "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_taxons_path]}/#{resource.permalink}"
+      elsif resource.instance_of?(Spree::Cms::Pages::FeaturePage) || resource.instance_of?(Spree::Cms::Pages::StandardPage)
+        "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_pages_path]}/#{resource.slug}"
+      elsif localize.blank?
+        current_store.formatted_url
+      else
+        current_store.formatted_url + localize
+      end
+    end
+
     # we should always try to render image of the default variant
     # same as it's done on PDP
     def default_image_for_product(product)
@@ -170,7 +226,8 @@ module Spree
     end
 
     def base_cache_key
-      [I18n.locale, current_currency]
+      [I18n.locale, current_currency, defined?(try_spree_current_user) && try_spree_current_user.present?,
+       defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]
     end
 
     def maximum_quantity
@@ -210,5 +267,9 @@ module Spree
 
       tag('meta', name: 'robots', content: current_store.seo_robots)
     end
+
+    def taxon_wysiwyg_editor_enabled?
+      Spree::Config[:taxon_wysiwyg_editor_enabled]
+    end
   end
 end