spree_core 5.3.4 → 5.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1ea480e8607e801d3c45d8decf522c829003eb3fa6c1f8f92b9185a4bfefec
-  data.tar.gz: 552fb0686b6da4a560dd47144d52079d1ab73c270a9e4c9093e62b9e556ef74f
+  metadata.gz: af6f55a25483bfb02dab0b15f67356a2732cbeb190074b9ddb75a1692594fb7a
+  data.tar.gz: 8f0b8f77983432ef1e1baa52def6ed2674f9e0794bc632dd91757551c4ee71c4
 SHA512:
-  metadata.gz: 1ed2cab50fb7c122df6565b931324ea7ba307c8580a98ac8f9e2e400140df75092ed417db47311a6d3ec01985a6696cfbce1d3e3fa7917c329646b13ef51b095
-  data.tar.gz: 34bd9929ed9e4a962696b2be41a5bb0da2c330fd12d1cbff89e34fa78cdceaa84d6b58cb7ae321d1868864c2888eccd752cd0bef7dbd9cd473aa68490619c2f6
+  metadata.gz: 46c6fc812dc90ba1ae3061b2e4066df5e9dd8ad530fde2db85095a7b5cb444fec2d51f4736a528c61ee4423e64d986478fdcf5478c40888e99818b849e444d60
+  data.tar.gz: aa2913c4e9882dd0e77d03ddcfae4f8277e4657b807080ce2d3549fd63f5c6da18448e2574b7742ad82b227a299dccfce3717a7df504be4442e3c7f0bf21629e

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

@@ -3,11 +3,13 @@ module Spree
     class FindComplete
       include Spree::Orders::FinderHelper
 
-      attr_reader :user, :number, :token, :store, :email
+      attr_reader :user, :number, :prefix_id, :param, :token, :store, :email
 
-      def initialize(user: nil, number: nil, token: nil, store: nil, email: nil)
+      def initialize(user: nil, number: nil, prefix_id: nil, param: nil, token: nil, store: nil, email: nil)
         @user = user
         @number = number
+        @prefix_id = prefix_id
+        @param = param
         @token = token
         @store = store
         @email = email
@@ -16,6 +18,8 @@ module Spree
       def execute
         orders = by_user(scope)
         orders = by_number(orders)
+        orders = by_prefix_id(orders)
+        orders = by_param(orders)
         orders = by_token(orders)
         orders = by_store(orders)
         orders = by_email(orders)
@@ -37,6 +41,14 @@ module Spree
         number.present?
       end
 
+      def prefix_id?
+        prefix_id.present?
+      end
+
+      def param?
+        param.present?
+      end
+
       def token?
         token.present?
       end
@@ -61,6 +73,25 @@ module Spree
         orders.where(number: number)
       end
 
+      def by_prefix_id(orders)
+        return orders unless prefix_id?
+
+        decoded = Spree::Order.decode_prefixed_id(prefix_id)
+        orders.where(id: decoded)
+      end
+
+      # Find by param - tries prefixed ID first, then number for backwards compatibility
+      def by_param(orders)
+        return orders unless param?
+
+        decoded = Spree::Order.decode_prefixed_id(param)
+        if decoded
+          orders.where(id: decoded)
+        else
+          orders.where(number: param)
+        end
+      end
+
       def by_token(orders)
         return orders unless token?
 

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

@@ -19,7 +19,6 @@ 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)
         @in_stock         = params.dig(:filter, :in_stock)
         @backorderable    = params.dig(:filter, :backorderable)
         @purchasable      = params.dig(:filter, :purchasable)
@@ -46,7 +45,6 @@ module Spree
         products = by_slug(products)
         products = by_options(products)
         products = by_option_value_ids(products)
-        products = by_properties(products)
         products = by_tags(products)
         products = include_deleted(products)
         products = show_only_stock(products)
@@ -63,7 +61,7 @@ module Spree
       private
 
       attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
-                  :sort_by, :deleted, :discontinued, :properties, :store, :in_stock, :backorderable, :purchasable, :tags,
+                  :sort_by, :deleted, :discontinued, :store, :in_stock, :backorderable, :purchasable, :tags,
                   :query, :vendor_ids, :out_of_stock, :slug, :taxonomies
 
       def query?
@@ -114,10 +112,6 @@ module Spree
         sort_by.present?
       end
 
-      def properties?
-        properties.present? && properties.values.reject(&:empty?).present?
-      end
-
       def vendor_ids?
         vendor_ids.present?
       end
@@ -224,27 +218,6 @@ 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 = scope.unscope(:order, :includes).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 by_tags(products)
         return products if tags.empty?
 

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

@@ -0,0 +1,17 @@
+module Spree
+  module Stores
+    class FindDefault
+      def initialize(scope: nil, url: nil)
+        @scope = scope || Spree::Store
+      end
+
+      def execute
+        store = @scope.where(default: true).first || @scope.first
+        return if store.nil?
+
+        Spree::Current.store = store
+        store
+      end
+    end
+  end
+end

data/app/finders/spree/variants/visible_finder.rb

@@ -2,6 +2,7 @@ module Spree
   module Variants
     class VisibleFinder
       def initialize(scope:, current_currency:)
+        Spree::Deprecation.warn('Spree::Variants::VisibleFinder is deprecated and will be removed in Spree 5.5.')
         @scope = scope
         @current_currency = current_currency
       end

data/app/helpers/spree/addresses_helper.rb

@@ -4,8 +4,7 @@ module Spree
     def address_form_countries_states_cache_key
       @address_form_countries_states_cache_key ||= [
         I18n.locale,
-        current_store.cache_key_with_version,
-        current_store.checkout_zone&.cache_key_with_version
+        current_store.cache_key_with_version
       ].compact
     end
 

data/app/helpers/spree/base_helper.rb

@@ -68,30 +68,10 @@ module Spree
       end
     end
 
-    def spree_favicon_path
-      Spree::Deprecation.warn('BaseHelper#spree_favicon_path is deprecated and will be removed in Spree 5.5. Please use Active Storage URL helpers instead.')
-
-      if current_store.favicon.present?
-        main_app.cdn_image_url(current_store.favicon)
-      else
-        url_for('favicon.ico')
-      end
-    end
-
     def object
       instance_variable_get('@' + controller_name.singularize)
     end
 
-    def method_missing(method_name, *args, &block)
-      if image_style = image_style_from_method_name(method_name)
-        Spree::Deprecation.warn("#{BaseHelper.name}##{method_name} is deprecated and will be removed in Spree 5.5. Please use spree_image_tag instead - https://spreecommerce.org/docs/developer/core-concepts/images-assets#preprocessed-named-variants")
-        define_image_method(image_style)
-        send(method_name, *args)
-      else
-        super
-      end
-    end
-
     def pretty_time(time)
       return '' if time.blank?
 
@@ -119,7 +99,7 @@ module Spree
     end
 
     # returns the URL of an object on the storefront
-    # @param resource [Spree::Product, Spree::Post, Spree::Taxon, Spree::Page] the resource to get the URL for
+    # @param resource [Spree::Product, Spree::Taxon, Spree::Page] the resource to get the URL for
     # @param options [Hash] the options for the URL
     # @option options [String] :locale the locale of the resource, defaults to I18n.locale
     # @option options [String] :store the store of the resource, defaults to current_store
@@ -134,10 +114,10 @@ module Spree
 
       base_url = if options[:relative]
                    ''
-                 elsif store.formatted_custom_domain.blank?
-                   store.formatted_url
-                 else
+                 elsif store.respond_to?(:formatted_custom_domain) && store.formatted_custom_domain.present?
                    store.formatted_custom_domain
+                 else
+                   store.formatted_url
                  end
 
       localize = if options[:locale].present?
@@ -155,9 +135,6 @@ module Spree
         params = "?#{params}" if params.present?
 
         "#{base_url + localize}/products/#{resource.slug}#{params}"
-      elsif defined?(Spree::Post) && resource.is_a?(Spree::Post)
-        preview_id = options[:preview_id].present? ? "?preview_id=#{options[:preview_id]}" : ''
-        "#{base_url + localize}/posts/#{resource.slug}#{preview_id}"
       elsif resource.is_a?(Spree::Taxon)
         "#{base_url + localize}/t/#{resource.permalink}"
       elsif defined?(Spree::Page) && (resource.is_a?(Spree::Page) || resource.is_a?(Spree::Policy))
@@ -204,7 +181,8 @@ module Spree
     end
 
     def maximum_quantity
-      Spree::DatabaseTypeUtilities.maximum_value_for(:integer)
+      Spree::Deprecation.warn('BaseHelper#maximum_quantity is deprecated and will be removed in Spree 5.5')
+      Spree::DatabaseTypeUtilities::INTEGER_MAX
     end
 
     def payment_method_icon_tag(payment_method, opts = {})
@@ -220,36 +198,6 @@ module Spree
 
     private
 
-    def create_product_image_tag(image, product, options, style)
-      options[:alt] = image.alt.blank? ? product.name : image.alt
-      image_tag main_app.cdn_image_url(image.url(style)), options
-    end
-
-    def define_image_method(style)
-      self.class.send :define_method, "#{style}_image" do |product, *options|
-        options = options.first || {}
-        options[:alt] ||= product.name
-        image_path = default_image_for_product_or_variant(product)
-        img = if image_path.present?
-                create_product_image_tag image_path, product, options, style
-              else
-                width = style.to_s.split('x').first.to_i
-                height = style.to_s.split('x').last.to_i
-                content_tag(:div, width: width, height: height, style: "background-color: #f0f0f0;")
-              end
-
-        content_tag(:div, img, class: "admin-product-image-container #{style}-img")
-      end
-    end
-
-    # Returns style of image or nil
-    def image_style_from_method_name(method_name)
-      style = method_name.to_s.sub(/_image$/, '')
-      if method_name.to_s.match(/_image$/) && Spree::Image.styles.keys.map(&:to_s).include?(style)
-        style
-      end
-    end
-
     I18N_PLURAL_MANY_COUNT = 2.1
     def plural_resource_name(resource_class)
       resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)

data/app/mailers/spree/base_mailer.rb

@@ -1,7 +1,5 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-    helper Spree::MailHelper
-
     def current_store
       @current_store ||= @order&.store.presence || Spree::Store.current || Spree::Store.default
     end
@@ -47,8 +45,11 @@ module Spree
       ActionMailer::Base.default_url_options[:host] = host_url
     end
 
+    # Sets the I18n locale for the email.
+    # Prefers the order's locale (the language the customer used),
+    # falls back to the store's default locale.
     def set_email_locale
-      locale = @order&.store&.default_locale || current_store&.default_locale
+      locale = @order&.locale.presence || @order&.store&.default_locale || current_store&.default_locale
       I18n.locale = locale if locale.present?
     end
   end

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

@@ -5,7 +5,6 @@ module Spree
     included do
       has_many :adjustments, as: :source
       before_destroy :deals_with_adjustments_for_deleted_source
-      after_commit :clear_adjustment_source_cache
     end
 
     protected
@@ -55,12 +54,5 @@ module Spree
       # This would mean that the order's total is not altered at all.
       adjustments.for_complete_order.update_all(source_id: nil, updated_at: Time.current)
     end
-
-    def clear_adjustment_source_cache
-      # Use base_class.name to match the polymorphic_name stored in source_type
-      # For STI models like PromotionAction subclasses, this ensures cache key consistency
-      cache_class_name = self.class.polymorphic_name
-      Rails.cache.delete("spree/adjustment_source/#{cache_class_name}/#{id}")
-    end
   end
 end

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

@@ -2,8 +2,19 @@ module Spree
   module AdminUserMethods
     extend ActiveSupport::Concern
 
+    include Spree::PrefixedId
+    include Spree::UserRoles
+    include Spree::RansackableAttributes
+
     included do
+      has_prefix_id :admin
+
+      has_person_name
+
+      normalizes :email, :first_name, :last_name, with: ->(value) { value&.to_s&.squish&.presence }
+
       # Associations
+      has_many :identities, class_name: 'Spree::UserIdentity', as: :user, dependent: :destroy
       has_many :canceled_orders, class_name: 'Spree::Order', foreign_key: :canceler_id
       has_many :created_orders, class_name: 'Spree::Order', foreign_key: :created_by_id
       has_many :approved_orders, class_name: 'Spree::Order', foreign_key: :approver_id
@@ -11,7 +22,6 @@ module Spree
       has_many :created_gift_card_batches, class_name: 'Spree::GiftCardBatch', foreign_key: :created_by_id
       has_many :refunded_refunds, class_name: 'Spree::Refund', foreign_key: :refunder_id
       has_many :performed_reimbursements, class_name: 'Spree::Reimbursement', foreign_key: :performed_by_id
-      has_many :authored_posts, class_name: 'Spree::Post', foreign_key: :author_id
       has_many :created_store_credits, class_name: 'Spree::StoreCredit', foreign_key: :created_by_id
       has_many :reports, class_name: 'Spree::Report', foreign_key: :user_id
       has_many :exports, class_name: 'Spree::Export', foreign_key: :user_id
@@ -19,6 +29,27 @@ module Spree
       # Callbacks
       after_destroy :nullify_approver_id_in_approved_orders
       after_destroy :cleanup_admin_user_resources
+
+      # Attachments
+      has_one_attached :avatar, service: Spree.public_storage_service_name
+
+      #
+      # Attributes
+      #
+      attr_accessor :confirm_email
+
+      self.whitelisted_ransackable_associations = %w[spree_roles]
+      self.whitelisted_ransackable_attributes = %w[id email first_name last_name]
+    end
+
+    def can_be_deleted?
+      Spree::Store.current.users.where.not(id: id).exists?
+    end
+
+    # Returns the full name of the user
+    # @return [String]
+    def full_name
+      name&.full
     end
 
     private
@@ -41,7 +72,6 @@ module Spree
       created_gift_card_batches.update_all(created_by_id: nil, updated_at: Time.current)
       refunded_refunds.update_all(refunder_id: nil, updated_at: Time.current)
       performed_reimbursements.update_all(performed_by_id: nil, updated_at: Time.current)
-      authored_posts.update_all(author_id: nil, updated_at: Time.current)
       created_store_credits.update_all(created_by_id: nil, updated_at: Time.current)
 
       # resources to destroy

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

@@ -3,6 +3,8 @@ module Spree
     extend ActiveSupport::Concern
 
     def generate_url(size:, gravity: 'centre', quality: 80, background: [0, 0, 0])
+      Spree::Deprecation.warn("ImageMethods#generate_url is deprecated and will be removed in Spree 6.0. Please use active storage variants with cdn_image_url")
+
       return if size.blank?
 
       size = size.gsub(/\s+/, '')
@@ -18,6 +20,8 @@ module Spree
     end
 
     def original_url
+      Spree::Deprecation.warn("ImageMethods#original_url is deprecated and will be removed in Spree 6.0. Please use active storage variants with cdn_image_url")
+
       cdn_image_url(attachment)
     end
 

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

@@ -12,6 +12,16 @@ module Spree
       serialize :private_metadata, coder: HashSerializer
     end
 
+    # `metadata` is the primary API-facing accessor.
+    # It maps to `private_metadata` under the hood (Stripe-style: write-only, never returned in Store API).
+    def metadata
+      private_metadata
+    end
+
+    def metadata=(value)
+      self.private_metadata = value
+    end
+
     # https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails
     class HashSerializer
       def self.dump(hash)

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

@@ -3,9 +3,11 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      extend FriendlyId
-
-      friendly_id :number
+      Spree::Deprecation.warn(
+        'Spree::NumberAsParam is deprecated and will be removed in Spree 6.0. ' \
+        'Models now use Spree::PrefixedId with Sqids-based prefixed_id method instead. ' \
+        'This concern no longer provides any functionality and can be safely removed.'
+      )
     end
   end
 end

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'sqids'
+
+module Spree
+  # Adds Stripe-style prefixed IDs to Spree models using Sqids encoding.
+  # IDs are computed on the fly from integer primary keys -- no database column needed.
+  #
+  # e.g., Product with id=12345 -> "prod_86Rf07xd4z"
+  #
+  #   class Product < Spree.base_class
+  #     has_prefix_id :prod
+  #   end
+  module PrefixedId
+    extend ActiveSupport::Concern
+
+    SQIDS = Sqids.new(min_length: 10)
+
+    included do
+      class_attribute :_prefix_id_prefix, instance_writer: false
+    end
+
+    # Returns the Stripe-style prefixed ID, or nil for unsaved records.
+    def prefixed_id
+      return nil unless id.present?
+
+      "#{self.class._prefix_id_prefix}_#{Spree::PrefixedId::SQIDS.encode([id])}"
+    end
+
+    # Use prefixed_id for URL params when available.
+    # Skip if FriendlyId is used (it has its own to_param using slug).
+    def to_param
+      return super if self.class.respond_to?(:friendly_id_config)
+      return super unless self.class._prefix_id_prefix.present?
+
+      prefixed_id.presence || super
+    end
+
+    class_methods do
+      def has_prefix_id(prefix)
+        self._prefix_id_prefix = prefix.to_s
+      end
+
+      def find_by_prefix_id!(prefixed_id)
+        decoded = decode_prefixed_id(prefixed_id)
+        raise ActiveRecord::RecordNotFound.new("Couldn't find #{name} with prefixed id=#{prefixed_id}", name) unless decoded
+
+        find(decoded)
+      end
+
+      def find_by_prefix_id(prefixed_id)
+        decoded = decode_prefixed_id(prefixed_id)
+        return nil unless decoded
+
+        find_by(id: decoded)
+      end
+
+      # Decode a prefixed ID string (e.g., "prod_86Rf07xd4z") to the integer primary key.
+      def decode_prefixed_id(prefixed_id_string)
+        return nil if prefixed_id_string.blank?
+
+        parts = prefixed_id_string.to_s.split('_', 2)
+        return nil if parts.length != 2
+
+        _prefix, encoded = parts
+        ids = Spree::PrefixedId::SQIDS.decode(encoded)
+        ids.first
+      end
+
+      # Find by prefixed ID first, falling back to integer id for backwards compatibility.
+      def find_by_param(param)
+        return nil if param.blank?
+
+        find_by_prefix_id(param) || (find_by(id: param) if param.to_s.match?(/\A\d+\z/))
+      end
+
+      def find_by_param!(param)
+        find_by_param(param) || raise(ActiveRecord::RecordNotFound.new("Couldn't find #{name} with param=#{param}", name))
+      end
+    end
+  end
+end

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

@@ -31,21 +31,6 @@ module Spree
         end
       end
 
-      def self.property_conditions(property)
-        properties_table = Property.table_name
-
-        case 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_table}.name = ? OR #{properties_table}.id = ?", property, property]
-          else
-            { "#{properties_table}.name" => property }
-          end
-        end
-      end
-
       add_simple_scopes simple_scopes
 
       add_search_scope :ascend_by_master_price do
@@ -126,9 +111,8 @@ module Spree
       #
       #   SELECT COUNT(*) ...
       add_search_scope :in_taxon do |taxon|
-        includes(:classifications).
-          where('spree_products_taxons.taxon_id' => taxon.cached_self_and_descendants_ids).
-          order('spree_products_taxons.position ASC')
+        joins(:classifications).
+          where("#{Classification.table_name}.taxon_id" => taxon.cached_self_and_descendants_ids).distinct
       end
 
       # This scope selects products in all taxons AND all its descendants
@@ -150,33 +134,6 @@ module Spree
           order(Arel.sql("#{min_position_sql} 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))
-      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|
-        if Spree.use_translations?
-          joins(:properties).
-            join_translation_table(Property).
-            join_translation_table(ProductProperty).
-            where(ProductProperty.translation_table_alias => { value: value }).
-            where(property_conditions(property))
-        else
-          joins(:properties).
-            where(ProductProperty.table_name => { value: value }).
-            where(property_conditions(property))
-        end
-      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|
         if option.is_a?(OptionType)
           joins(:option_types).where(spree_option_types: { id: option.id })
@@ -205,17 +162,32 @@ module Spree
         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).
+          joins(variants: :option_values).
           where(Spree::OptionValue.table_name => { name: value, option_type_id: option_type_id })
       end
 
-      # Finds all products which have either:
-      # 1) have an option value with the name matching the one given
-      # 2) have a product property with a value matching the one given
+      # Filters products by option value IDs (prefix IDs like 'optval_xxx')
+      # Accepts an array of option value IDs
+      add_search_scope :with_option_value_ids do |*ids|
+        ids = ids.flatten.compact
+        return none if ids.empty?
+
+        # Handle prefixed IDs (optval_xxx) by decoding to actual IDs
+        actual_ids = ids.map do |id|
+          id.to_s.include?('_') ? OptionValue.decode_prefixed_id(id) : id
+        end.compact
+
+        return none if actual_ids.empty?
+
+        group("#{Spree::Product.table_name}.id").
+          joins(variants: :option_values).
+          where(Spree::OptionValue.table_name => { id: actual_ids })
+      end
+
+      # Finds all products which have an option value with the name matching the one given
       add_search_scope :with do |value|
-        includes(variants_including_master: :option_values).
-          includes(:product_properties).
-          where("#{OptionValue.table_name}.name = ? OR #{ProductProperty.table_name}.value = ?", value, value)
+        includes(variants: :option_values).
+          where("#{OptionValue.table_name}.name = ?", value)
       end
 
       # Finds all products that have a name containing the given words.
@@ -288,11 +260,8 @@ module Spree
 
       # Can't use add_search_scope for this as it needs a default argument
       def self.available(available_on = nil, currency = nil)
-        scope = if available_on
-                  not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
-                else
-                  not_discontinued.where(status: 'active')
-                end
+        scope = not_discontinued.where(status: 'active')
+        scope = scope.where("#{Product.quoted_table_name}.available_on <= ?", available_on) if available_on
 
         unless Spree::Config.show_products_without_price
           currency ||= Spree::Store.default.default_currency
@@ -336,16 +305,17 @@ module Spree
       # @param order_direction [Symbol] :desc (default) or :asc
       # @return [ActiveRecord::Relation]
       add_search_scope :by_best_selling do |order_direction = :desc|
-        order_dir = order_direction == :desc ? 'DESC' : 'ASC'
         store_id = Spree::Current.store&.id
+        sp_table = StoreProduct.arel_table
+        products_table = Product.arel_table
+
+        conditions = sp_table[:product_id].eq(products_table[:id]).and(sp_table[:store_id].eq(store_id))
+
+        units_sold = Arel::Nodes::NamedFunction.new('COALESCE', [sp_table.project(sp_table[:units_sold_count]).where(conditions), 0])
+        revenue = Arel::Nodes::NamedFunction.new('COALESCE', [sp_table.project(sp_table[:revenue]).where(conditions), 0])
 
-        joins(:store_products)
-          .where(StoreProduct.table_name => { store_id: store_id })
-          .select("#{Product.table_name}.*",
-                  "#{StoreProduct.table_name}.units_sold_count",
-                  "#{StoreProduct.table_name}.revenue")
-          .order(Arel.sql("#{StoreProduct.table_name}.units_sold_count #{order_dir}"))
-          .order(Arel.sql("#{StoreProduct.table_name}.revenue #{order_dir}"))
+        order_dir = order_direction == :desc ? :desc : :asc
+        order(units_sold.send(order_dir)).order(revenue.send(order_dir))
       end
 
       # .search_by_name