spree_core 4.2.5 → 4.3.0

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)
@@ -171,7 +227,7 @@ module Spree
 
     def base_cache_key
       [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')]
+       defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]
     end
 
     def maximum_quantity
@@ -190,11 +246,13 @@ module Spree
         options = options.first || {}
         options[:alt] ||= product.name
         image_path = default_image_for_product_or_variant(product)
-        if image_path.present?
-          create_product_image_tag image_path, product, options, style
-        else
-          image_tag "noimage/#{style}.png", options
-        end
+        img = if image_path.present?
+                create_product_image_tag image_path, product, options, style
+              else
+               inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%"
+              end
+
+        content_tag(:div, img, class: "admin-product-image-container #{style}-img")
       end
     end
 
@@ -211,5 +269,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

data/app/helpers/spree/locale_helper.rb

@@ -16,12 +16,16 @@ module Spree
 
     def locale_presentation(locale)
       if I18n.exists?('spree.i18n.this_file_language', locale: locale)
-        [Spree.t('i18n.this_file_language', locale: locale), locale.to_s]
+        [locale_full_name(locale), locale.to_s]
       else
         locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
       end
     end
 
+    def locale_full_name(locale)
+      Spree.t('i18n.this_file_language', locale: locale)
+    end
+
     def should_render_locale_dropdown?
       return false if current_store.nil?
 

data/app/helpers/spree/products_helper.rb

@@ -44,9 +44,13 @@ module Spree
       variants_option_types_presenter(variants, product).options
     end
 
+    def product_wysiwyg_editor_enabled?
+      Spree::Config[:product_wysiwyg_editor_enabled]
+    end
+
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      description = if Spree::Config[:show_raw_product_description]
+      description = if Spree::Config[:show_raw_product_description] || product_wysiwyg_editor_enabled?
                       product.description
                     else
                       product.description.to_s.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>')
@@ -63,7 +67,7 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      max_updated_at = (products.maximum(:updated_at) || Date.today).to_s(:number)
+      max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_s(:number)
       products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
       (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
@@ -131,7 +135,7 @@ module Spree
 
       return [] if product_ids.empty?
 
-      Spree::Product.
+      current_store.products.
         available.not_discontinued.distinct.
         where(id: product_ids).
         includes(

data/app/models/concerns/spree/display_link.rb

@@ -0,0 +1,42 @@
+module Spree
+  module DisplayLink
+    def link
+      case linked_resource_type
+      when 'Spree::Taxon'
+        return if linked_resource&.permalink.blank?
+
+        if spree_routes.method_defined?(:nested_taxons_path)
+          spree_routes.nested_taxons_path(linked_resource.permalink)
+        else
+          "/#{Spree::Config[:storefront_taxons_path]}/#{linked_resource.permalink}"
+        end
+      when 'Spree::Product'
+        return if linked_resource&.slug.blank?
+
+        if spree_routes.method_defined?(:products_path)
+          spree_routes.product_path(linked_resource)
+        else
+          "/#{Spree::Config[:storefront_products_path]}/#{linked_resource.slug}"
+        end
+      when 'Spree::CmsPage'
+        return if linked_resource&.slug.blank?
+
+        if spree_routes.method_defined?(:page_path)
+          spree_routes.page_path(linked_resource.slug)
+        else
+          "/#{Spree::Config[:storefront_pages_path]}/#{linked_resource.slug}"
+        end
+      when 'Home Page'
+        '/'
+      when 'URL'
+        destination
+      end
+    end
+
+    private
+
+    def spree_routes
+      Spree::Core::Engine.routes.url_helpers
+    end
+  end
+end

data/app/models/concerns/spree/display_money.rb

@@ -17,13 +17,17 @@ module Spree
     # Decorate a method, but with some additional options
     #     extend Spree::DisplayMoney
     #     money_methods tax_amount: { currency: "CAD", no_cents: true }, :price
+    # Use generated method with the same arguments as in wrapped method
+    #     def tax_amount(order, country)
+    #     display_tax_amount(order, country)
     def money_methods(*args)
       args.each do |money_method|
         money_method = { money_method => {} } unless money_method.is_a? Hash
         money_method.each do |method_name, opts|
-          define_method("display_#{method_name}") do
+          define_method("display_#{method_name}") do |**args_list|
             default_opts = respond_to?(:currency) ? { currency: currency } : {}
-            Spree::Money.new(send(method_name), default_opts.merge(opts))
+
+            Spree::Money.new(send(method_name, **args_list), default_opts.merge(opts).merge(args_list.slice(:currency)))
           end
         end
       end

data/app/models/concerns/spree/filter_param.rb

@@ -0,0 +1,21 @@
+module Spree
+  module FilterParam
+    extend ActiveSupport::Concern
+
+    included do
+      before_save :set_filter_param
+    end
+
+    protected
+
+    def set_filter_param
+      return if param_candidate.blank?
+
+      self.filter_param = param_candidate.parameterize
+    end
+
+    def param_candidate
+      name
+    end
+  end
+end

data/app/models/concerns/spree/image_methods.rb

@@ -0,0 +1,24 @@
+module Spree
+  module ImageMethods
+    extend ActiveSupport::Concern
+
+    def generate_url(size:, gravity: 'center', quality: 80, background: 'show')
+      return if size.blank?
+      size = size.gsub(/\s+/, '')
+
+      return unless size.match(/(\d+)x(\d+)/)
+
+      polymorphic_path(attachment.variant(
+        gravity: gravity,
+        resize: size,
+        extent: size,
+        background: background,
+        quality: quality.to_i
+      ), only_path: true)
+    end
+
+    def original_url
+      polymorphic_path(attachment, only_path: true)
+    end
+  end
+end

data/app/models/concerns/spree/memoized_data.rb

@@ -0,0 +1,24 @@
+module Spree
+  module MemoizedData
+    extend ActiveSupport::Concern
+
+    included do
+      # reset cache on save inside trasaction and transaction commit
+      after_save :reset_memoized_data
+      after_commit :reset_memoized_data
+
+      def reload(options = {})
+        reset_memoized_data
+        super(options)
+      end
+
+      private
+
+      def reset_memoized_data
+        self.class.const_get('MEMOIZED_METHODS').each do |v|
+          instance_variable_set(:"@#{v.gsub(/\?/, '')}", nil)
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree/multi_store_resource.rb

@@ -0,0 +1,24 @@
+module Spree
+  module MultiStoreResource
+    extend ActiveSupport::Concern
+
+    included do
+      scope :for_store, ->(store) { joins(:stores).where(Store.table_name => { id: store.id }) }
+
+      validate :must_have_one_store, unless: :disable_store_presence_validation?
+    end
+
+    protected
+
+    def must_have_one_store
+      return if stores.any?
+
+      errors.add(:stores, Spree.t(:must_have_one_store))
+    end
+
+    # this can be overriden on model basis
+    def disable_store_presence_validation?
+      Spree::Config[:disable_store_presence_validation]
+    end
+  end
+end

data/app/models/concerns/spree/product_scopes.rb

@@ -43,23 +43,35 @@ module Spree
       add_simple_scopes simple_scopes
 
       add_search_scope :ascend_by_master_price do
-        joins(master: :default_price).order("#{price_table_name}.amount ASC")
+        order("#{price_table_name}.amount ASC")
       end
 
       add_search_scope :descend_by_master_price do
-        joins(master: :default_price).order("#{price_table_name}.amount DESC")
+        order("#{price_table_name}.amount DESC")
       end
 
       add_search_scope :price_between do |low, high|
-        joins(master: :default_price).where(Price.table_name => { amount: low..high })
+        where(Price.table_name => { amount: low..high })
       end
 
       add_search_scope :master_price_lte do |price|
-        joins(master: :default_price).where("#{price_table_name}.amount <= ?", price)
+        where("#{price_table_name}.amount <= ?", price)
       end
 
       add_search_scope :master_price_gte do |price|
-        joins(master: :default_price).where("#{price_table_name}.amount >= ?", price)
+        where("#{price_table_name}.amount >= ?", price)
+      end
+
+      add_search_scope :in_stock do
+        joins(:variants_including_master).merge(Spree::Variant.in_stock)
+      end
+
+      add_search_scope :backorderable do
+        joins(:variants_including_master).merge(Spree::Variant.backorderable)
+      end
+
+      add_search_scope :in_stock_or_backorderable do
+        joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
       end
 
       # This scope selects products in taxon AND all its descendants
@@ -94,6 +106,19 @@ module Spree
         taxons.first ? prepare_taxon_conditions(taxons) : where(nil)
       end
 
+      add_search_scope :ascend_by_taxons_min_position do |taxon_ids|
+        joins(:classifications).
+          where(Classification.table_name => { taxon_id: taxon_ids }).
+          select(
+            [
+              "#{Product.table_name}.*",
+              "MIN(#{Classification.table_name}.position) AS min_position"
+            ].join(', ')
+          ).
+          group(:id).
+          order(min_position: :asc)
+      end
+
       # a scope that finds all products having property specified by name, object or id
       add_search_scope :with_property do |property|
         joins(:properties).where(property_conditions(property))
@@ -107,6 +132,12 @@ module Spree
           where(property_conditions(property))
       end
 
+      add_search_scope :with_property_values do |property_filter_param, property_values|
+        joins(product_properties: :property).
+          where(Property.table_name => { filter_param: property_filter_param }).
+          where(ProductProperty.table_name => { filter_param: property_values.map(&:parameterize) })
+      end
+
       add_search_scope :with_option do |option|
         option_types = OptionType.table_name
         conditions = case option
@@ -198,18 +229,50 @@ module Spree
         end
       end
       search_scopes << :not_discontinued
+
+      def self.with_currency(currency)
+        joins(variants_including_master: :prices).
+          where(Price.table_name => { currency: currency.upcase }).
+          where.not(Price.table_name => { amount: nil }).
+          distinct
+      end
+      search_scopes << :with_currency
+
       # Can't use add_search_scope for this as it needs a default argument
-      def self.available(available_on = nil, _currency = nil)
+      def self.available(available_on = nil, currency = nil)
         available_on ||= Time.current
-        not_discontinued.joins(master: :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+
+        scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+
+        unless Spree::Config.show_products_without_price
+          currency ||= Spree::Config[:currency]
+          scope = scope.with_currency(currency)
+        end
+
+        scope
       end
       search_scopes << :available
 
       def self.active(currency = nil)
-        available(nil, currency&.upcase)
+        available(nil, currency)
       end
       search_scopes << :active
 
+      def self.for_filters(currency, taxon: nil)
+        scope = active(currency)
+        scope = scope.in_taxon(taxon) if taxon.present?
+        scope
+      end
+      search_scopes << :for_filters
+
+      def self.for_user(user = nil)
+        if user.try(:has_spree_role?, 'admin')
+          with_deleted
+        else
+          not_deleted.not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", Time.current)
+        end
+      end
+
       add_search_scope :taxons_name_eq do |name|
         group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
       end