solidus_core 2.11.10 → 3.3.1

data/app/models/spree/order_updater.rb

@@ -3,7 +3,7 @@
 module Spree
   class OrderUpdater
     attr_reader :order
-    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :update_hooks, :quantity, to: :order
+    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :quantity, to: :order
 
     def initialize(order)
       @order = order
@@ -26,20 +26,11 @@ module Spree
           update_shipments
           update_shipment_state
         end
-        run_hooks if update_hooks.any?
-        Spree::Event.fire 'order_recalculated', order: order
+        Spree::Bus.publish :order_recalculated, order: order
         persist_totals
       end
     end
 
-    def run_hooks
-      Spree::Deprecation.warn \
-        "This method is deprecated. Please run your hooks by subscribing " \
-        "to `order_recalculated` and/or `order_finalized` events instead, depending " \
-        " on when OrderUpdater#run_hooks was called.", caller(1)
-      update_hooks.each { |hook| order.send hook }
-    end
-
     # Updates the +shipment_state+ attribute according to the following logic:
     #
     # shipped   when all Shipments are in the "shipped" state
@@ -119,8 +110,7 @@ module Spree
       # http://www.hmrc.gov.uk/vat/managing/charging/discounts-etc.htm#1
       # It also fits the criteria for sales tax as outlined here:
       # http://www.boe.ca.gov/formspubs/pub113/
-      update_item_promotions
-      update_order_promotions
+      update_promotions
       update_taxes
       update_cancellations
       update_item_totals
@@ -166,11 +156,13 @@ module Spree
       recalculate_adjustments
 
       all_items = line_items + shipments
+      order_tax_adjustments = adjustments.select(&:eligible?).select(&:tax?)
 
       order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.select(&:eligible?).sum(&:amount)
-      order.included_tax_total = all_items.sum(&:included_tax_total)
-      order.additional_tax_total = all_items.sum(&:additional_tax_total)
+      order.included_tax_total = all_items.sum(&:included_tax_total) + order_tax_adjustments.select(&:included?).sum(&:amount)
+      order.additional_tax_total = all_items.sum(&:additional_tax_total) + order_tax_adjustments.reject(&:included?).sum(&:amount)
 
+      # TODO: Delete this line in Solidus 4.0, when it is run in `update_promotions`.
       order.promo_total = all_items.sum(&:promo_total) + adjustments.select(&:eligible?).select(&:promotion?).sum(&:amount)
 
       update_order_total
@@ -186,7 +178,7 @@ module Spree
     end
 
     def persist_totals
-      order.save!(validate: Spree::Config.run_order_validations_on_order_updater)
+      order.save!
     end
 
     def log_state_change(name)
@@ -204,6 +196,11 @@ module Spree
       end
     end
 
+    def update_promotions
+      Spree::Config.promotion_adjuster_class.new(order).call
+    end
+
+    # DEPRECATED; this functionality is handled in #update_promotions
     def update_item_promotions
       [*line_items, *shipments].each do |item|
         promotion_adjustments = item.adjustments.select(&:promotion?)
@@ -214,16 +211,20 @@ module Spree
         item.promo_total = promotion_adjustments.select(&:eligible?).sum(&:amount)
       end
     end
+    deprecate update_item_promotions: :update_promotions, deprecator: Spree::Deprecation
 
     # Update and select the best promotion adjustment for the order.
     # We don't update the order.promo_total yet. Order totals are updated later
     # in #update_adjustment_total since they include the totals from the order's
     # line items and/or shipments.
+    #
+    # DEPRECATED; this functionality is handled in #update_promotions
     def update_order_promotions
       promotion_adjustments = order.adjustments.select(&:promotion?)
       promotion_adjustments.each(&:recalculate)
       Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
     end
+    deprecate update_order_promotions: :update_promotions, deprecator: Spree::Deprecation
 
     def update_taxes
       Spree::Config.tax_adjuster_class.new(order).adjust!

data/app/models/spree/payment/cancellation.rb

@@ -29,7 +29,7 @@ module Spree
         if response = payment.payment_method.try_void(payment)
           payment.handle_void_response(response)
         else
-          payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason, perform_after_create: false).perform!
+          payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason).perform!
         end
       end
 

data/app/models/spree/payment/processing.rb

@@ -35,12 +35,36 @@ module Spree
       end
 
       def authorize!
-        handle_payment_preconditions { process_authorization }
+        return unless check_payment_preconditions!
+
+        started_processing!
+
+        protect_from_connection_error do
+          response = payment_method.authorize(
+            money.money.cents,
+            source,
+            gateway_options,
+          )
+          pend! if handle_response(response)
+        end
       end
 
       # Captures the entire amount of a payment.
       def purchase!
-        handle_payment_preconditions { process_purchase }
+        return unless check_payment_preconditions!
+
+        started_processing!
+
+        protect_from_connection_error do
+          response = payment_method.purchase(
+            money.money.cents,
+            source,
+            gateway_options,
+          )
+          complete! if handle_response(response)
+        end
+
+        capture_events.create!(amount: amount)
       end
 
       # Takes the amount in cents to capture.
@@ -62,7 +86,7 @@ module Spree
           money = ::Money.new(capture_amount, currency)
           capture_events.create!(amount: money.to_d)
           update!(amount: captured_amount)
-          handle_response(response, :complete, :failure)
+          complete! if handle_response(response)
         end
       end
 
@@ -139,67 +163,46 @@ module Spree
 
       private
 
-      def process_authorization
-        started_processing!
-        gateway_action(source, :authorize, :pend)
-      end
+      # @raises Spree::Core::GatewayError
+      def check_payment_preconditions!
+        return if processing?
+        return unless payment_method
+        return unless payment_method.source_required?
 
-      def process_purchase
-        started_processing!
-        gateway_action(source, :purchase, :complete)
-        # This won't be called if gateway_action raises a GatewayError
-        capture_events.create!(amount: amount)
-      end
-
-      def handle_payment_preconditions(&_block)
-        unless block_given?
-          raise ArgumentError.new("handle_payment_preconditions must be called with a block")
+        unless source
+          gateway_error(I18n.t('spree.payment_processing_failed'))
         end
 
-        return if payment_method.nil?
-        return if !payment_method.source_required?
-
-        if source
-          if !processing?
-            if payment_method.supports?(source)
-              yield
-            else
-              invalidate!
-              raise Core::GatewayError.new(I18n.t('spree.payment_method_not_supported'))
-            end
-          end
-        else
-          raise Core::GatewayError.new(I18n.t('spree.payment_processing_failed'))
+        unless payment_method.supports?(source)
+          invalidate!
+          gateway_error(I18n.t('spree.payment_method_not_supported'))
         end
-      end
 
-      def gateway_action(source, action, success_state)
-        protect_from_connection_error do
-          response = payment_method.send(action, money.money.cents,
-                                         source,
-                                         gateway_options)
-          handle_response(response, success_state, :failure)
-        end
+        true
       end
 
-      def handle_response(response, success_state, failure_state)
+      # @returns true if the response is successful
+      # @returns false (and calls #failure) if the response is not successful
+      def handle_response(response)
         record_response(response)
 
-        if response.success?
-          unless response.authorization.nil?
-            self.response_code = response.authorization
-            self.avs_response = response.avs_result['code']
-
-            if response.cvv_result
-              self.cvv_response_code = response.cvv_result['code']
-              self.cvv_response_message = response.cvv_result['message']
-            end
-          end
-          send("#{success_state}!")
-        else
-          send(failure_state)
+        unless response.success?
+          failure
           gateway_error(response)
+          return false
+        end
+
+        unless response.authorization.nil?
+          self.response_code = response.authorization
+          self.avs_response = response.avs_result['code']
+
+          if response.cvv_result
+            self.cvv_response_code = response.cvv_result['code']
+            self.cvv_response_message = response.cvv_result['message']
+          end
         end
+
+        true
       end
 
       def record_response(response)
@@ -207,9 +210,9 @@ module Spree
       end
 
       def protect_from_connection_error
-          yield
+        yield
       rescue ActiveMerchant::ConnectionError => error
-          gateway_error(error)
+        gateway_error(error)
       end
 
       def gateway_error(error)

data/app/models/spree/payment.rb

@@ -8,9 +8,6 @@ module Spree
   class Payment < Spree::Base
     include Spree::Payment::Processing
 
-    alias_attribute :identifier, :number
-    deprecate :identifier, :identifier=, deprecator: Spree::Deprecation
-
     IDENTIFIER_CHARS    = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
     NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
     RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze

data/app/models/spree/payment_create.rb

@@ -7,7 +7,6 @@ module Spree
     # @param attributes [Hash,ActionController::Parameters] attributes which are assigned to the new payment
     #   * :payment_method_id Id of payment method used for this payment
     #   * :source_attributes Attributes used to build the source of this payment. Usually a {CreditCard}
-    #     * :existing_card_id (Integer) Deprecated: The id of an existing {CreditCard} object to use
     #     * :wallet_payment_source_id (Integer): The id of a {WalletPaymentSource} to use
     # @param request_env [Hash] rack env of user creating the payment
     # @param payment [Payment] Internal use only. Instead of making a new payment, change the attributes for an existing one.
@@ -29,13 +28,7 @@ module Spree
       @payment.request_env = @request_env if @request_env
       @payment.attributes = @attributes
 
-      if source_attributes[:existing_card_id].present?
-        Spree::Deprecation.warn(
-          "Passing existing_card_id to PaymentCreate is deprecated. Use wallet_payment_source_id instead.",
-          caller,
-        )
-        build_existing_card
-      elsif source_attributes[:wallet_payment_source_id].present?
+      if source_attributes[:wallet_payment_source_id].present?
         build_from_wallet_payment_source
       else
         build_source
@@ -67,11 +60,6 @@ module Spree
       build_from_payment_source(wallet_payment_source.payment_source)
     end
 
-    def build_existing_card
-      credit_card = available_cards.find(source_attributes[:existing_card_id])
-      build_from_payment_source(credit_card)
-    end
-
     def build_from_payment_source(payment_source)
       # FIXME: does this work?
       if source_attributes[:verification_value]

data/app/models/spree/payment_method/bogus_credit_card.rb

@@ -57,13 +57,12 @@ module Spree
       end
     end
 
-    def void(_response_code, _credit_card, _options = {})
-      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
-    end
-
-    # @see Spree::PaymentMethod#try_void
-    def try_void(_payment)
-      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+    def void(_response_code, _credit_card, options = {})
+      if options[:originator].completed?
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+      else
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+      end
     end
 
     def test?

data/app/models/spree/payment_method/credit_card.rb

@@ -14,7 +14,7 @@ module Spree
     end
 
     def partial_name
-      deprecated_method_type_override || 'gateway'
+      'gateway'
     end
 
     def supports?(source)
@@ -27,8 +27,6 @@ module Spree
       source_ids = order.payments.where(payment_method_id: id).pluck(:source_id).uniq
       payment_source_class.where(id: source_ids).select(&:reusable?)
     end
-    alias_method :sources_by_order, :reusable_sources_by_order
-    deprecate sources_by_order: :reusable_sources_by_order, deprecator: Spree::Deprecation
 
     def reusable_sources(order)
       if order.completed?

data/app/models/spree/payment_method/simple_bogus_credit_card.rb

@@ -22,5 +22,13 @@ module Spree
         ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, message: FAILURE_MESSAGE, test: true)
       end
     end
+
+    def void(_response_code, options = {})
+      if options[:originator].completed?
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+      else
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+      end
+    end
   end
 end

data/app/models/spree/payment_method.rb

@@ -13,6 +13,7 @@ module Spree
   #
   class PaymentMethod < Spree::Base
     include Spree::Preferences::Persistable
+    class UnsupportedPaymentMethod < StandardError; end
 
     preference :server, :string, default: 'test'
     preference :test_mode, :boolean, default: true
@@ -21,19 +22,6 @@ module Spree
 
     acts_as_list
 
-    # @private
-    def self.const_missing(name)
-      if name == :DISPLAY
-        Spree::Deprecation.warn(
-          "#{self}::DISPLAY has been deprecated and will be removed in Solidus v3.",
-          caller
-        )
-        const_set(:DISPLAY, [:both, :front_end, :back_end])
-      else
-        super
-      end
-    end
-
     validates :name, :type, presence: true
 
     has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
@@ -70,50 +58,18 @@ module Spree
     end
 
     class << self
-      # @deprecated Use Spree::Config.environment.payment_methods instead
-      def providers
-        Spree::Deprecation.warn 'Spree::PaymentMethod.providers is deprecated and will be deleted in Solidus 3.0. ' \
-          'Please use Rails.application.config.spree.payment_methods instead'
-        Spree::Config.environment.payment_methods
-      end
-
-      # @deprecated Use {.active}, {.available_to_users}, and {.available_to_admin} scopes instead.
-      def available(display_on = nil, store: nil)
-        Spree::Deprecation.warn "Spree::PaymentMethod.available is deprecated."\
-          "Please use .active, .available_to_users, and .available_to_admin scopes instead."\
-          "For payment methods associated with a specific store, use Spree::PaymentMethod.available_to_store(your_store)"\
-          " as the base applying any further filtering"
-
-        display_on = display_on.to_s
-
-        available_payment_methods =
-          case display_on
-          when 'front_end'
-            active.available_to_users
-          when 'back_end'
-            active.available_to_admin
-          else
-            active.available_to_users.available_to_admin
-          end
-        available_payment_methods.select do |payment|
-          store.nil? || store.payment_methods.empty? || store.payment_methods.include?(payment)
-        end
-      end
-
       def model_name
         ModelName.new(self, Spree)
       end
 
-      # @deprecated Use .active.any? instead
-      def active?
-        Spree::Deprecation.warn "#{self}.active? is deprecated. Use #{self}.active.any? instead"
-        where(type: to_s, active: true).count > 0
-      end
-
-      # @deprecated Use .with_discarded.find instead
-      def find_with_destroyed(*args)
-        Spree::Deprecation.warn "#{self}.find_with_destroyed is deprecated. Use #{self}.with_discarded.find instead"
-        unscoped { find(*args) }
+      def find_sti_class(type_name)
+        super(type_name)
+      rescue ActiveRecord::SubclassNotFound
+        raise UnsupportedPaymentMethod, "Found invalid payment type '#{type_name}'.\n"\
+          "This may happen after switching payment service provider, when payment methods "\
+          "reference old types that are not supported any more.\n"\
+          "If that is the case, consider running 'rake payment_method:deprecate_unsupported_payment_methods' "\
+          "to fix the issue."
       end
     end
 
@@ -141,8 +97,6 @@ module Spree
 
       @gateway ||= gateway_class.new(gateway_options)
     end
-    alias_method :provider, :gateway
-    deprecate provider: :gateway, deprecator: Spree::Deprecation
 
     # Represents all preferences as a Hash
     #
@@ -162,29 +116,6 @@ module Spree
       raise ::NotImplementedError, "You must implement payment_source_class method for #{self.class}."
     end
 
-    # @deprecated Use {Spree::PaymentMethod#available_to_users=} and {Spree::PaymentMethod#available_to_admin=} instead
-    def display_on=(value)
-      Spree::Deprecation.warn "Spree::PaymentMethod#display_on= is deprecated."\
-        "Please use #available_to_users= and #available_to_admin= instead."
-      self.available_to_users = value.blank? || value == 'front_end'
-      self.available_to_admin = value.blank? || value == 'back_end'
-    end
-
-    # @deprecated Use {Spree::PaymentMethod#available_to_users} and {Spree::PaymentMethod#available_to_admin} instead
-    def display_on
-      Spree::Deprecation.warn "Spree::PaymentMethod#display_on is deprecated."\
-        "Please use #available_to_users and #available_to_admin instead."
-      if available_to_users? && available_to_admin?
-        ''
-      elsif available_to_users?
-        'front_end'
-      elsif available_to_admin?
-        'back_end'
-      else
-        'none'
-      end
-    end
-
     # Used as partial name for your payment method
     #
     # Currently your payment method needs to provide these partials:
@@ -205,21 +136,7 @@ module Spree
     #     The view that represents your payment method on orders through the api
     #
     def partial_name
-      deprecated_method_type_override || type.demodulize.underscore
-    end
-
-    # :nodoc:
-    # If method_type has been overridden, call it and return the value, otherwise return nil
-    def deprecated_method_type_override
-      if method(:method_type).owner != Spree::PaymentMethod
-        Spree::Deprecation.warn "#{method(:method_type).owner} is overriding PaymentMethod#method_type. This is deprecated and will be removed from Solidus 3.0 (override partial_name instead).", caller[1..-1]
-        method_type
-      end
-    end
-
-    def method_type
-      Spree::Deprecation.warn "method_type is deprecated and will be removed from Solidus 3.0 (use partial_name instead)", caller
-      partial_name
+      type.demodulize.underscore
     end
 
     def payment_profiles_supported?
@@ -256,16 +173,22 @@ module Spree
     # Return +false+ or +nil+ if the void is not possible anymore - because it was already processed by the bank.
     # Solidus will refund the amount of the payment in this case.
     #
-    # @return [ActiveMerchant::Billing::Response] with +true+ if the void succeeded
-    # @return [ActiveMerchant::Billing::Response] with +false+ if the void failed
-    # @return [false] if it can't be voided at this time
+    # This default implementation will void the payment if void succeeds,
+    # otherwise it returns false.
     #
-    def try_void(_payment)
-      raise ::NotImplementedError,
-        "You need to implement `try_void` for #{self.class.name}. In that " \
-        'return a ActiveMerchant::Billing::Response object if the void succeeds '\
-        'or `false|nil` if the void is not possible anymore. ' \
-        'Solidus will refund the amount of the payment then.'
+    # @api public
+    # @param payment [Spree::Payment] the payment to void
+    # @return [ActiveMerchant::Billing::Response|FalseClass]
+    def try_void(payment)
+      void_attempt = if payment.payment_method.payment_profiles_supported?
+        void(payment.transaction_id, payment.source, { originator: payment })
+      else
+        void(payment.transaction_id, { originator: payment })
+      end
+
+      return void_attempt if void_attempt.success?
+
+      false
     end
 
     def store_credit?
@@ -277,14 +200,7 @@ module Spree
     # Represents the gateway class of this payment method
     #
     def gateway_class
-      if respond_to? :provider_class
-        Spree::Deprecation.warn \
-          "provider_class is deprecated and will be removed from Solidus 3.0 " \
-          "(use gateway_class instead)"
-        public_send :provider_class
-      else
-        raise ::NotImplementedError, "You must implement gateway_class method for #{self.class}."
-      end
+      raise ::NotImplementedError, "You must implement gateway_class method for #{self.class}."
     end
   end
 end

data/app/models/spree/price.rb

@@ -13,7 +13,7 @@ module Spree
     delegate :tax_rates, to: :variant
 
     validate :check_price
-    validates :amount, allow_nil: true, numericality: {
+    validates :amount, numericality: {
       greater_than_or_equal_to: 0,
       less_than_or_equal_to: MAXIMUM_AMOUNT
     }
@@ -30,7 +30,7 @@ module Spree
     money_methods :amount, :price
     alias_method :money, :display_amount
 
-    self.whitelisted_ransackable_attributes = %w(amount variant_id currency country_iso)
+    self.allowed_ransackable_attributes = %w(amount variant_id currency country_iso)
 
     # An alias for #amount
     def price
@@ -55,7 +55,7 @@ module Spree
 
     def display_country
       if country_iso
-        "#{country_iso} (#{country.name})"
+        "#{country_iso} (#{I18n.t(country_iso, scope: [:spree, :country_names])})"
       else
         I18n.t(:any_country, scope: [:spree, :admin, :prices])
       end

data/app/models/spree/product/scopes.rb

@@ -29,25 +29,25 @@ module Spree
           scope :descend_by_name, -> { order(name: :desc) }
 
           add_search_scope :ascend_by_master_price do
-            joins(master: :default_price).select('spree_products.* , spree_prices.amount')
+            joins(master: :prices).select('spree_products.* , spree_prices.amount')
                                          .order(Spree::Price.arel_table[:amount].asc)
           end
 
           add_search_scope :descend_by_master_price do
-            joins(master: :default_price).select('spree_products.* , spree_prices.amount')
+            joins(master: :prices).select('spree_products.* , spree_prices.amount')
                                          .order(Spree::Price.arel_table[:amount].desc)
           end
 
           add_search_scope :price_between do |low, high|
-            joins(master: :default_price).where(Price.table_name => { amount: low..high })
+            joins(master: :prices).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)
+            joins(master: :prices).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)
+            joins(master: :prices).where("#{price_table_name}.amount >= ?", price)
           end
 
           # This scope selects products in taxon AND all its descendants
@@ -194,38 +194,29 @@ module Spree
             group("spree_products.id").joins(:taxons).where(Spree::Taxon.arel_table[:name].eq(name))
           end
 
-          def self.with_variant_sku_cont(sku)
-            sku_match = "%#{sku}%"
+          def self.with_all_variant_sku_cont(sku)
             variant_table = Spree::Variant.arel_table
-            subquery = Spree::Variant.where(variant_table[:sku].matches(sku_match).and(variant_table[:product_id].eq(arel_table[:id])))
+            subquery = Spree::Variant.with_discarded.where(
+              variant_table[:sku].matches("%#{sku}%").and(
+                variant_table[:product_id].eq(arel_table[:id])
+              )
+            )
             where(subquery.arel.exists)
           end
 
-          def self.distinct_by_product_ids(sort_order = nil)
-            Spree::Deprecation.warn "Product.distinct_by_product_ids is deprecated and should not be used"
-
-            sort_column = sort_order.split(" ").first
-
-            # Postgres will complain when using ordering by expressions not present in
-            # SELECT DISTINCT. e.g.
-            #
-            #   PG::InvalidColumnReference: ERROR:  for SELECT DISTINCT, ORDER BY
-            #   expressions must appear in select list. e.g.
-            #
-            #   SELECT  DISTINCT "spree_products".* FROM "spree_products" LEFT OUTER JOIN
-            #   "spree_variants" ON "spree_variants"."product_id" = "spree_products"."id" AND "spree_variants"."is_master" = 't'
-            #   AND "spree_variants"."deleted_at" IS NULL LEFT OUTER JOIN "spree_prices" ON
-            #   "spree_prices"."variant_id" = "spree_variants"."id" AND "spree_prices"."currency" = 'USD'
-            #   AND "spree_prices"."deleted_at" IS NULL WHERE "spree_products"."deleted_at" IS NULL AND ('t'='t')
-            #   ORDER BY "spree_prices"."amount" ASC LIMIT 10 OFFSET 0
-            #
-            # Don't allow sort_column, a variable coming from params,
-            # to be anything but a column in the database
-            if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' && !column_names.include?(sort_column)
-              all
-            else
-              distinct
-            end
+          def self.with_kept_variant_sku_cont(sku)
+            variant_table = Spree::Variant.arel_table
+            subquery = Spree::Variant.where(
+              variant_table[:sku].matches("%#{sku}%").and(
+                variant_table[:product_id].eq(arel_table[:id])
+              )
+            )
+            where(subquery.arel.exists)
+          end
+
+          def self.with_variant_sku_cont(sku)
+            Spree::Deprecation.warn("use .with_kept_variant_sku_cont instead")
+            with_kept_variant_sku_cont(sku)
           end
 
           class << self