spree_core 4.4.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07abab7dbe8d8b60a019e561b5668c3f336a7eb6970336b6a94b47046837fc1
-  data.tar.gz: 212b678f9f9df3a4de9de428bd9291fc87cd1f7020ed0c7f50b97c81fbd68a08
+  metadata.gz: 619f5416fb099c1cccaeb2432fd6002b53aa605aff90c9b4078f2a51ba73e89b
+  data.tar.gz: e53a5c780f9c4e79c50cc38d2fdd055dc20b04bef93c89e33e88b7a4fd9facce
 SHA512:
-  metadata.gz: 81e442e30106ce5756519d41717004ebcff0e6219f0e6fcfb563b3133b5635e5bde772ea3939edffac037f55f2eda42ca8ee69da69feb6f44f79d96f60fc4392
-  data.tar.gz: 02dd0236576e01b96c237d1989fee5a4ef669f4f4e39764b0a2ebbae26ad3847aca21915e0c6196a60088aa5f76bb817d6b478f9b04459d873f8508c00814b66
+  metadata.gz: 7e8cc84789a7c8564b45576c2aa9f8974f62da3b2c752869a9950497b01382b073b50a4d7746d9f2142bee4248115b58a527637b104f3750504499f2a6608459
+  data.tar.gz: fab84d0b2eb02221f96209f11c118feb77928d69269b009abb4c9a773089f1a011a96bbb3b731abce9cd8af45208eaabdef464c27244b7fd954554de1203c15b

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

@@ -9,7 +9,7 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope).select(select_args).order(order_args)
+        find_available(scope, products_scope).includes(:translations).select(select_args).order(order_args)
       end
 
       private

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

@@ -9,7 +9,7 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope)
+        find_available(scope, products_scope).includes(:translations)
       end
 
       private

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

@@ -4,8 +4,6 @@ module Spree
       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.
@@ -148,7 +146,10 @@ module Spree
       def by_name(products)
         return products unless name?
 
-        products.like_any([:name], [name])
+        product_name = name
+
+        # i18n mobility scope doesn't automatically get set for query blocks (Mobility issue #599) - set it explicitly
+        products.i18n { name.matches("%#{product_name}%") }
       end
 
       def by_options(products)
@@ -185,7 +186,7 @@ module Spree
 
           next if values.empty?
 
-          ids = products.with_property_values(property_filter_param, values).ids
+          ids = scope.unscope(:order, :includes).with_property_values(property_filter_param, values).ids
           product_ids = index == 0 ? ids : product_ids & ids
           index += 1
         end
@@ -211,21 +212,19 @@ module Spree
             products
           end
         when 'name-a-z'
-          products.order(name: :asc)
+          # workaround for Mobility issue #596 - explicitly select fields to avoid error when selecting distinct
+          products.i18n.
+            select("#{Product.table_name}.*").select(:name).order(name: :asc)
         when 'name-z-a'
-          products.order(name: :desc)
+          # workaround for Mobility issue #596
+          products.i18n.
+            select("#{Product.table_name}.*").select(:name).order(name: :desc)
         when 'newest-first'
           products.order(available_on: :desc)
         when 'price-high-to-low'
-          products.
-            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
-            reorder('').
-            send(:descend_by_master_price)
+          order_by_price(products, :descend_by_master_price)
         when 'price-low-to-high'
-          products.
-            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
-            reorder('').
-            send(:ascend_by_master_price)
+          order_by_price(products, :ascend_by_master_price)
         end
       end
 
@@ -257,7 +256,7 @@ module Spree
 
       def map_prices(prices)
         prices.map do |price|
-          price == 'Infinity' ? Float::INFINITY : price.to_f
+          price == 'Infinity' ? BigDecimal::INFINITY : price.to_f
         end
       end
 
@@ -267,6 +266,13 @@ module Spree
         taxons = store.taxons.where(id: taxons_ids.to_s.split(','))
         taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
       end
+
+      def order_by_price(scope, order_type)
+        scope.
+          select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
+          reorder('').
+          send(order_type)
+      end
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Spree
         taxons = by_roots(taxons)
         taxons = by_name(taxons)
 
-        taxons
+        taxons.distinct
       end
 
       private
@@ -50,10 +50,6 @@ module Spree
         name.present?
       end
 
-      def name_matcher
-        Spree::Taxon.arel_table[:name].matches("%#{name}%")
-      end
-
       def by_ids(taxons)
         return taxons unless ids?
 
@@ -70,9 +66,13 @@ module Spree
         return taxons unless parent_permalink?
 
         if Rails::VERSION::STRING >= '6.1'
-          taxons.joins(:parent).where(parent: { permalink: parent_permalink })
+          taxons.joins(:parent).
+            join_translation_table(Taxon, 'parents_spree_taxons').
+            where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
         else
-          taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").where(["parent_taxon.permalink = ?", parent_permalink])
+          taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").
+            join_translation_table(Taxon, 'parent_taxon').
+            where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
         end
       end
 
@@ -91,7 +91,10 @@ module Spree
       def by_name(taxons)
         return taxons unless name?
 
-        taxons.where(name_matcher)
+        taxon_name = name
+
+        # i18n mobility scope doesn't automatically get set for query blocks (Mobility issue #599) - set it explicitly
+        taxons.i18n { name.matches("%#{taxon_name}%") }
       end
     end
   end

data/app/helpers/spree/base_helper.rb

@@ -61,11 +61,11 @@ module Spree
       DEPRECATION
 
       image_path ||= if current_store.logo.attached? && current_store.logo.variable?
-                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
+                       main_app.cdn_image_url(current_store.logo.variant(resize_to_limit: [244, 104]))
                      elsif current_store.logo.attached? && current_store.logo.image?
-                       main_app.url_for(current_store.logo)
+                       main_app.cdn_image_url(current_store.logo)
                      else
-                      'logo/spree_50.png'
+                       'logo/spree_50.png'
                      end
 
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
@@ -76,7 +76,11 @@ module Spree
     end
 
     def spree_favicon_path
-      main_app.url_for(current_store.favicon || 'favicon.ico')
+      if current_store.favicon.present?
+        main_app.cdn_image_url(current_store.favicon)
+      else
+        url_for('favicon.ico')
+      end
     end
 
     def object
@@ -88,7 +92,7 @@ module Spree
 
       if object.is_a? Spree::Product
         image                             = default_image_for_product_or_variant(object)
-        og_meta['og:image']               = main_app.url_for(image.attachment) if image&.attachment
+        og_meta['og:image']               = main_app.cdn_image_url(image.attachment) if image&.attachment
 
         og_meta['og:url']                 = spree.url_for(object) if frontend_available? # url_for product needed
         og_meta['og:type']                = object.class.name.demodulize.downcase
@@ -109,8 +113,8 @@ module Spree
       meta = {}
 
       if object.is_a? ApplicationRecord
-        meta[:keywords] = object.meta_keywords if object[:meta_keywords].present?
-        meta[:description] = object.meta_description if object[:meta_description].present?
+        meta[:keywords] = object.meta_keywords if object.try(:meta_keywords).present?
+        meta[:description] = object.meta_description if object.try(:meta_description).present?
       end
 
       if meta[:description].blank? && object.is_a?(Spree::Product)
@@ -163,8 +167,7 @@ module Spree
     end
 
     def seo_url(taxon, options = {})
-      options.merge(locale: locale_param)
-      spree.nested_taxons_path(taxon.permalink, options)
+      spree.nested_taxons_path(taxon.permalink, options.merge(locale: locale_param))
     end
 
     def frontend_available?
@@ -238,7 +241,7 @@ module Spree
 
     def create_product_image_tag(image, product, options, style)
       options[:alt] = image.alt.blank? ? product.name : image.alt
-      image_tag main_app.url_for(image.url(style)), options
+      image_tag main_app.cdn_image_url(image.url(style)), options
     end
 
     def define_image_method(style)
@@ -249,7 +252,7 @@ module Spree
         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%"
+                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")

data/app/helpers/spree/locale_helper.rb

@@ -15,10 +15,14 @@ module Spree
     end
 
     def locale_presentation(locale)
-      if I18n.exists?('spree.i18n.this_file_language', locale: locale)
+      if I18n.exists?('spree.i18n.this_file_language', locale: locale, fallback: false)
         [locale_full_name(locale), locale.to_s]
+      elsif defined?(SpreeI18n::Locale) && (language_name = SpreeI18n::Locale.local_language_name(locale))
+        ["#{language_name} (#{locale})", locale.to_s]
+      elsif locale.to_s == 'en'
+        ['English (US)', 'en']
       else
-        locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
+        [locale, locale.to_s]
       end
     end
 

data/app/helpers/spree/products_helper.rb

@@ -76,15 +76,20 @@ module Spree
 
     # will return a human readable string
     def available_status(product)
-      return Spree.t(:discontinued) if product.discontinued?
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Spree::ProductsHelper#available_status` method from spree/core is deprecated and will be removed.
+        Please use `Spree::Admin::ProductsHelper#available_status` from spree_backend instead.
+      DEPRECATION
+
+      return Spree.t(:archived) if product.discontinued?
       return Spree.t(:deleted) if product.deleted?
 
       if product.available?
-        Spree.t(:available)
-      elsif product.available_on&.future?
+        Spree.t(:active)
+      elsif product.make_active_at&.future?
         Spree.t(:pending_sale)
       else
-        Spree.t(:no_available_date_set)
+        Spree.t(:draft)
       end
     end
 

data/app/jobs/spree/variants/remove_from_incomplete_orders_job.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Variants
+    class RemoveFromIncompleteOrdersJob < Spree::BaseJob
+      def perform(variant)
+        Spree::Variants::RemoveLineItems.call(variant: variant)
+      end
+    end
+  end
+end

data/app/jobs/spree/variants/remove_line_item_job.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Variants
+    class RemoveLineItemJob < Spree::BaseJob
+      def perform(line_item:)
+        Spree::Dependencies.cart_remove_line_item_service.constantize.call(order: line_item.order, line_item: line_item)
+      end
+    end
+  end
+end

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

@@ -18,7 +18,7 @@ module Spree
 
       def calculator_type=(calculator_type)
         klass = calculator_type.constantize if calculator_type
-        self.calculator = klass.new if klass && !calculator.is_a?(klass)
+        self.calculator = klass.new if klass && !calculator.instance_of?(klass)
       end
 
       private

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

@@ -1,42 +1,30 @@
 module Spree
   module DisplayLink
-    def link
-      case linked_resource_type
-      when 'Spree::Taxon'
-        return if linked_resource&.permalink.blank?
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :linked_resource, polymorphic: true
+
+      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?
+        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?
+        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}"
+        when 'Spree::Linkable::Homepage'
+          '/'
+        when 'Spree::Linkable::Uri'
+          destination
         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/image_methods.rb

@@ -2,23 +2,35 @@ module Spree
   module ImageMethods
     extend ActiveSupport::Concern
 
-    def generate_url(size:, gravity: 'center', quality: 80, background: 'show')
+    def generate_url(size:, gravity: 'centre', quality: 80, background: [0, 0, 0])
       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)
+      width, height = size.split('x').map(&:to_i)
+      gravity = translate_gravity_for_mini_magick(gravity)
+
+      # FIXME: bring back support for background color
+
+      cdn_image_url(attachment.variant(resize_and_pad: [width, height, { gravity: gravity }], saver: { quality: quality }))
     end
 
     def original_url
-      polymorphic_path(attachment, only_path: true)
+      cdn_image_url(attachment)
+    end
+
+    private
+
+    def translate_gravity_for_mini_magick(gravity)
+      variant_processor = Rails.application.config.active_storage.variant_processor
+
+      if gravity.downcase == 'centre' && [:mini_magick, nil].include?(variant_processor)
+        'center'
+      else
+        gravity
+      end
     end
   end
 end

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

@@ -3,8 +3,8 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      attribute :public_metadata, default: {} if Rails.version.to_f >= 6.1
-      attribute :private_metadata, default: {} if Rails.version.to_f >= 6.1
+      attribute :public_metadata, default: {}
+      attribute :private_metadata, default: {}
       serialize :public_metadata, HashSerializer
       serialize :private_metadata, HashSerializer
     end

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

@@ -32,15 +32,16 @@ module Spree
       end
 
       def self.property_conditions(property)
-        properties = Property.table_name
+        properties_table = Property.table_name
+        property_translations_table = Property.translation_table_alias
         case property
-        when Property then { "#{properties}.id" => property.id }
-        when Integer  then { "#{properties}.id" => property }
+        when Property then { "#{properties_table}.id" => property.id }
+        when Integer  then { "#{properties_table}.id" => property }
         else
           if Property.column_for_attribute('id').type == :uuid
-            ["#{properties.name} = ? OR #{properties.id} = ?", property, property]
+            ["#{property_translations_table.name} = ? OR #{properties_table.id} = ?", property, property]
           else
-            { "#{properties}.name" => property }
+            { "#{property_translations_table}.name" => property }
           end
         end
       end
@@ -126,21 +127,25 @@ module Spree
 
       # 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))
+        joins(:properties).join_translation_table(Property).where(property_conditions(property))
       end
 
       # a simple test for product with a certain property-value pairing
       # note that it can test for properties with NULL values, but not for absent values
       add_search_scope :with_property_value do |property, value|
         joins(:properties).
-          where("#{ProductProperty.table_name}.value = ?", value).
+          join_translation_table(Property).
+          join_translation_table(ProductProperty).
+          where("#{ProductProperty.translation_table_alias}.value = ?", value).
           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) })
+          join_translation_table(Property).
+          join_translation_table(ProductProperty).
+          where(Property.translation_table_alias => { filter_param: property_filter_param }).
+          where(ProductProperty.translation_table_alias => { filter_param: property_values.map(&:parameterize) })
       end
 
       add_search_scope :with_option do |option|
@@ -151,7 +156,9 @@ module Spree
         elsif OptionType.column_for_attribute('id').type == :uuid
           joins(:option_types).where(spree_option_types: { name: option }).or(Product.joins(:option_types).where(spree_option_types: { id: option }))
         else
-          joins(:option_types).where(spree_option_types: { name: option })
+          joins(:option_types).
+            join_translation_table(OptionType).
+            where(OptionType.translation_table_alias => { name: option })
         end
       end
 
@@ -164,6 +171,7 @@ module Spree
                              OptionType.where(id: option).or(OptionType.where(name: option))&.first&.id
                            else
                              OptionType.where(name: option)&.first&.id
+                             OptionType.where(name: option)&.first&.id
                            end
                          end
 
@@ -171,7 +179,9 @@ module Spree
 
         group("#{Spree::Product.table_name}.id").
           joins(variants_including_master: :option_values).
-          where(Spree::OptionValue.table_name => { name: value, option_type_id: option_type_id })
+          join_translation_table(Spree::OptionValue).
+          where(Spree::OptionValue.translation_table_alias => { name: value },
+                Spree::OptionValue.table_name => { option_type_id: option_type_id })
       end
 
       # Finds all products which have either:
@@ -236,7 +246,7 @@ module Spree
 
       def self.not_discontinued(only_not_discontinued = true)
         if only_not_discontinued != '0' && only_not_discontinued
-          where("#{Product.quoted_table_name}.discontinue_on IS NULL or #{Product.quoted_table_name}.discontinue_on >= ?", Time.zone.now)
+          where.not(status: 'archived')
         else
           all
         end
@@ -253,9 +263,11 @@ module Spree
 
       # Can't use add_search_scope for this as it needs a default argument
       def self.available(available_on = nil, currency = nil)
-        available_on ||= Time.current
-
-        scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+        if available_on
+          scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+        else
+          scope = where(status: 'active')
+        end
 
         unless Spree::Config.show_products_without_price
           currency ||= Spree::Store.default.default_currency
@@ -282,7 +294,7 @@ module Spree
         if user.try(:has_spree_role?, 'admin')
           with_deleted
         else
-          not_deleted.not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", Time.current)
+          not_deleted.where(status: 'active')
         end
       end
 
@@ -293,19 +305,10 @@ module Spree
       # .search_by_name
       if defined?(PgSearch)
         include PgSearch::Model
-
-        if defined?(SpreeGlobalize)
-          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: :tsearch
-        else
-          pg_search_scope :search_by_name, against: :name, using: :tsearch
-        end
+        pg_search_scope :search_by_name, against: :name, using: { tsearch: { any_word: true, prefix: true } }
       else
         def self.search_by_name(query)
-          if defined?(SpreeGlobalize)
-            joins(:translations).order(:name).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%").distinct
-          else
-            where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%")
-          end
+          i18n { name.lower.matches("%#{query.downcase}%") }
         end
       end
       search_scopes << :search_by_name
@@ -337,7 +340,10 @@ module Spree
           case t
           when ApplicationRecord then t
           else
-            Taxon.where(name: t).or(Taxon.where(id: t)).or(Taxon.where("permalink LIKE ? OR permalink = ?", "%/#{t}/", "#{t}/")).first
+            Taxon.where(name: t).
+              or(Taxon.where(Taxon.arel_table[:id].eq(t))).
+              or(Taxon.where(Taxon.arel_table[:permalink].matches("%/#{t}/"))).
+              or(Taxon.where(Taxon.arel_table[:permalink].matches("#{t}/"))).first
           end
         end.compact.flatten.uniq
       end

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

@@ -0,0 +1,25 @@
+module Spree
+  module TranslatableResource
+    extend ActiveSupport::Concern
+
+    included do
+      extend Mobility
+      default_scope { i18n }
+
+      def get_field_with_locale(locale, field_name, fallback: false)
+        # method will return nil if no translation is present due to fallback: false setting
+        public_send(field_name, locale: locale, fallback: fallback)
+      end
+    end
+
+    class_methods do
+      def translatable_fields
+        const_get(:TRANSLATABLE_FIELDS)
+      end
+
+      def translation_table_alias
+        "#{self::Translation.table_name}_#{Mobility.locale}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Spree
+  module TranslatableResourceScopes
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # To be used when joining on the resource itself does not automatically join on its translations table
+      # This method is to be used when you've already joined on the translatable table itself
+      #
+      # If the resource table is aliased, pass the alias to `join_on_table_alias`, otherwise omit the param
+      def join_translation_table(translatable_class, join_on_table_alias = nil)
+        join_on_table_name = if join_on_table_alias.nil?
+                               translatable_class.table_name
+                             else
+                               join_on_table_alias
+                             end
+        translatable_class_foreign_key = "#{translatable_class.table_name.singularize}_id"
+
+        joins("LEFT OUTER JOIN #{translatable_class::Translation.table_name} #{translatable_class.translation_table_alias}
+             ON #{translatable_class.translation_table_alias}.#{translatable_class_foreign_key} = #{join_on_table_name}.id
+             AND #{translatable_class.translation_table_alias}.locale = '#{Mobility.locale}'")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Spree
+  module TranslatableResourceSlug
+    extend ActiveSupport::Concern
+
+    included do
+      def localized_slugs_for_store(store)
+        localized_slugs = Hash[translations.pluck(:locale, :slug)]
+        default_locale = store.default_locale
+        supported_locales = store.supported_locales_list
+
+        supported_locales.each_with_object({}) do |locale, hash|
+          hash[locale] = localized_slugs[locale] || localized_slugs[default_locale]
+        end
+      end
+    end
+  end
+end