spree_core 4.3.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b01cdb9b4fae7dbc504ec200b0ac4fad4c3d6f025879bfb8ff1204a39843cf
-  data.tar.gz: aef3c6e29b38409ad11305d669b56b5dabae08d0a653783dfab0230ce89bc5c6
+  metadata.gz: a62717cb37cb66c1ddeea15d4d67798f91a73e06be9c92da4281d6b7c2c80997
+  data.tar.gz: 43c64db30fc7cc5ff3bd982f4c4ff5b81eb775e652af94f0c34d27670ac7681d
 SHA512:
-  metadata.gz: a221ccc5207cd316ff2102787e55f22ff9ade341d0d882ae4a2a2b476c2b62d8fba6463ab71af894b28eb9edc0fa98ee63fac1b03610e419d25d2845568faf77
-  data.tar.gz: d1086b0e7216ff453df0197c6a9c7620cee71340cefed09aea7fccbcd2b5be679bb8e0d34656231209bb7dc587ab757594a64809670c898805280ee4a19567bf
+  metadata.gz: 20e7f63e9110ea867f8df477ebc1282ff68d710848a3c0a1f7523089488ac771b98f4b1ffd4cbfb733d6345b82e2fec5a43e52a3b0ff6e072a2fdc1870766867
+  data.tar.gz: c12cc069169ce732437940158061e4b4b9c4a7f26962eeb6a9a808eb58f93f84e9eea35e272ce906f089ec9c899067b68ae9bffe5423399f91ce362e298cdad2

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

@@ -9,12 +9,20 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope)
+        find_available(scope, products_scope).select(select_args).order(order_args)
       end
 
       private
 
       attr_reader :scope, :products_scope
+
+      def select_args
+        "#{OptionValue.table_name}.*, #{OptionType.table_name}.position AS option_type_position"
+      end
+
+      def order_args
+        "option_type_position, #{OptionValue.table_name}.position"
+      end
     end
   end
 end

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.
@@ -154,7 +152,7 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        products_ids = options.map { |key, value| products.with_option_value(key, value).ids }
+        products_ids = options.map { |key, value| products.with_option_value(key, value)&.ids }.compact.uniq
         products.where(id: products_ids.reduce(&:intersection))
       end
 
@@ -257,7 +255,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
 

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

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
-                       Spree::Config[:logo]
+                       '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
@@ -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")
@@ -269,9 +272,5 @@ 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/currency_helper.rb

@@ -1,7 +1,7 @@
 module Spree
   module CurrencyHelper
     def currency_options(selected_value = nil)
-      selected_value ||= Spree::Config[:currency]
+      selected_value ||= Spree::Store.default.default_currency
       currencies = ::Money::Currency.table.map do |_code, details|
         iso = details[:iso_code]
         [iso, "#{details[:name]} (#{iso})"]

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

@@ -44,20 +44,6 @@ 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] || product_wysiwyg_editor_enabled?
-                      product.description
-                    else
-                      product.description.to_s.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>')
-                    end
-      description.blank? ? Spree.t(:product_has_no_description) : description
-    end
-
     def line_item_description_text(description_text)
       if description_text.present?
         truncate(strip_tags(description_text.gsub('&nbsp;', ' ').squish), length: 100)
@@ -82,7 +68,7 @@ module Spree
       cache_key_elements.compact.join('/')
     end
 
-    def limit_descritpion(string)
+    def limit_description(string)
       return string if string.length <= 450
 
       string.slice(0..449) + '...'
@@ -90,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/base_job.rb

@@ -0,0 +1,4 @@
+module Spree
+  class BaseJob < ApplicationJob
+  end
+end

data/app/jobs/spree/stock_locations/stock_items/create_job.rb

@@ -0,0 +1,13 @@
+module Spree
+  module StockLocations
+    module StockItems
+      class CreateJob < Spree::BaseJob
+        queue_as :spree_stock_location_stock_items
+
+        def perform(stock_location)
+          Spree::StockLocations::StockItems::Create.call(stock_location: stock_location)
+        end
+      end
+    end
+  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/default_price.rb

@@ -4,7 +4,7 @@ module Spree
 
     included do
       has_one :default_price,
-              -> { with_deleted.where(currency: Spree::Config[:currency]) },
+              -> { with_deleted.where(currency: Spree::Store.default.default_currency) },
               class_name: 'Spree::Price',
               dependent: :destroy
 

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/display_money.rb

@@ -27,7 +27,9 @@ module Spree
           define_method("display_#{method_name}") do |**args_list|
             default_opts = respond_to?(:currency) ? { currency: currency } : {}
 
-            Spree::Money.new(send(method_name, **args_list), default_opts.merge(opts).merge(args_list.slice(:currency)))
+            amount = args_list.blank? ? send(method_name) : send(method_name, **args_list)
+
+            Spree::Money.new(amount, default_opts.merge(opts).merge(args_list.slice(:currency)))
           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/memoized_data.rb

@@ -3,7 +3,7 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      # reset cache on save inside trasaction and transaction commit
+      # reset cache on save inside transaction and transaction commit
       after_save :reset_memoized_data
       after_commit :reset_memoized_data
 

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

@@ -0,0 +1,23 @@
+module Spree
+  module Metadata
+    extend ActiveSupport::Concern
+
+    included do
+      attribute :public_metadata, default: {}
+      attribute :private_metadata, default: {}
+      serialize :public_metadata, HashSerializer
+      serialize :private_metadata, HashSerializer
+    end
+
+    # https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails
+    class HashSerializer
+      def self.dump(hash)
+        hash
+      end
+
+      def self.load(hash)
+        (hash || {}).with_indifferent_access
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Spree
       errors.add(:stores, Spree.t(:must_have_one_store))
     end
 
-    # this can be overriden on model basis
+    # this can be overridden on model basis
     def disable_store_presence_validation?
       Spree::Config[:disable_store_presence_validation]
     end

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

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false }
+      include UniqueName
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module Spree
+  module NumberIdentifier
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :uppercase_number
+
+      validates :number, presence: true, length: { maximum: 32, allow_blank: true },
+                         uniqueness: { allow_blank: true, case_sensitive: true, scope: spree_base_uniqueness_scope }
+    end
+
+    protected
+
+    def uppercase_number
+      number&.to_s&.upcase!
+    end
+  end
+end

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

@@ -27,16 +27,21 @@ module Spree
           next if name.to_s.include?('master_price')
 
           parts = name.to_s.match(/(.*)_by_(.*)/)
-          scope(name.to_s, -> { order(Arel.sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}")) })
+          scope(name.to_s, -> { order(Arel.sql(sanitize_sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}"))) })
         end
       end
 
       def self.property_conditions(property)
         properties = Property.table_name
         case property
-        when String   then { "#{properties}.name" => property }
         when Property then { "#{properties}.id" => property.id }
-        else { "#{properties}.id" => property.to_i }
+        when Integer  then { "#{properties}.id" => property }
+        else
+          if Property.column_for_attribute('id').type == :uuid
+            ["#{properties.name} = ? OR #{properties.id} = ?", property, property]
+          else
+            { "#{properties}.name" => property }
+          end
         end
       end
 
@@ -139,26 +144,34 @@ module Spree
       end
 
       add_search_scope :with_option do |option|
-        option_types = OptionType.table_name
-        conditions = case option
-                     when String     then { "#{option_types}.name" => option }
-                     when OptionType then { "#{option_types}.id" => option.id }
-                     else { "#{option_types}.id" => option.to_i }
-                     end
-
-        joins(:option_types).where(conditions)
+        if option.is_a?(OptionType)
+          joins(:option_types).where(spree_option_types: { id: option.id })
+        elsif option.is_a?(Integer)
+          joins(:option_types).where(spree_option_types: { id: option })
+        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 })
+        end
       end
 
       add_search_scope :with_option_value do |option, value|
-        option_values = OptionValue.table_name
         option_type_id = case option
-                         when String then OptionType.find_by(name: option) || option.to_i
                          when OptionType then option.id
-                         else option.to_i
+                         when Integer then option
+                         else
+                           if OptionType.column_for_attribute('id').type == :uuid
+                             OptionType.where(id: option).or(OptionType.where(name: option))&.first&.id
+                           else
+                             OptionType.where(name: option)&.first&.id
+                           end
                          end
 
-        conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
-        group('spree_products.id').joins(variants_including_master: :option_values).where(conditions)
+        return Product.group("#{Spree::Product.table_name}.id").none if option_type_id.blank?
+
+        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 })
       end
 
       # Finds all products which have either:
@@ -223,7 +236,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
@@ -240,12 +253,14 @@ 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::Config[:currency]
+          currency ||= Spree::Store.default.default_currency
           scope = scope.with_currency(currency)
         end
 
@@ -269,7 +284,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
 
@@ -277,6 +292,26 @@ module Spree
         group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
       end
 
+      # .search_by_name
+      if defined?(PgSearch)
+        include PgSearch::Model
+
+        if defined?(SpreeGlobalize)
+          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: { tsearch: { any_word: true, prefix: true } }
+        else
+          pg_search_scope :search_by_name, against: :name, using: { tsearch: { any_word: true, prefix: true } }
+        end
+      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
+        end
+      end
+      search_scopes << :search_by_name
+
       def self.price_table_name
         Price.quoted_table_name
       end
@@ -300,14 +335,11 @@ module Spree
       private_class_method :prepare_words
 
       def self.get_taxons(*ids_or_records_or_names)
-        taxons = Taxon.table_name
         ids_or_records_or_names.flatten.map do |t|
           case t
-          when Integer then Taxon.find_by(id: t)
           when ApplicationRecord then t
-          when String
-            Taxon.find_by(name: t) ||
-              Taxon.where("#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/").first
+          else
+            Taxon.where(Taxon.arel_table[:name].eq(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/unique_name.rb

@@ -0,0 +1,10 @@
+module Spree
+  module UniqueName
+    extend ActiveSupport::Concern
+
+    included do
+      validates :name, presence: true,
+                       uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
+    end
+  end
+end