solidus_core 2.11.1 → 3.0.0.rc2

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

@@ -70,7 +70,6 @@ module Spree
           add_search_scope :in_taxon do |taxon|
             includes(:classifications)
               .where('spree_products_taxons.taxon_id' => taxon.self_and_descendants.pluck(:id))
-              .select(Spree::Classification.arel_table[:position])
               .order(Spree::Classification.arel_table[:position].asc)
           end
 
@@ -202,33 +201,6 @@ module Spree
             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
-          end
-
           class << self
             private
 

data/app/models/spree/promotion.rb

@@ -38,11 +38,7 @@ module Spree
 
     scope :coupons, -> { joins(:codes).distinct }
     scope :advertised, -> { where(advertise: true) }
-    scope :active, -> do
-      return started_and_unexpired if Spree::Config.consider_actionless_promotion_active == true
-
-      has_actions.started_and_unexpired
-    end
+    scope :active, -> { has_actions.started_and_unexpired }
     scope :started_and_unexpired, -> do
       table = arel_table
       time = Time.current
@@ -93,7 +89,7 @@ module Spree
     end
 
     def active?
-      started? && not_expired? && (Spree::Config.consider_actionless_promotion_active || actions.present?)
+      started? && not_expired? && actions.present?
     end
 
     def inactive?

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -39,9 +39,6 @@ module Spree
         # item_total and ship_total
         def compute_amount(calculable)
           amount = calculator.compute(calculable)
-          if !amount.is_a?(BigDecimal)
-            Spree::Deprecation.warn "#{calculator.class.name}#compute returned #{amount.inspect}, it should return a BigDecimal"
-          end
           amount ||= BigDecimal(0)
           amount = amount.abs
           [(calculable.item_total + calculable.ship_total), amount].min * -1

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -33,9 +33,6 @@ module Spree
           order = adjustable.is_a?(Order) ? adjustable : adjustable.order
           return 0 unless promotion.line_item_actionable?(order, adjustable)
           promotion_amount = calculator.compute(adjustable)
-          if !promotion_amount.is_a?(BigDecimal)
-            Spree::Deprecation.warn "#{calculator.class.name}#compute returned #{promotion_amount.inspect}, it should return a BigDecimal"
-          end
           promotion_amount ||= BigDecimal(0)
           promotion_amount = promotion_amount.abs
           [adjustable.amount, promotion_amount].min * -1

data/app/models/spree/promotion/actions/create_quantity_adjustments.rb

@@ -57,9 +57,6 @@ module Spree
         #
         def compute_amount(line_item)
           adjustment_amount = calculator.compute(PartialLineItem.new(line_item))
-          if !adjustment_amount.is_a?(BigDecimal)
-            Spree::Deprecation.warn "#{calculator.class.name}#compute returned #{adjustment_amount.inspect}, it should return a BigDecimal"
-          end
           adjustment_amount ||= BigDecimal(0)
           adjustment_amount = adjustment_amount.abs
 

data/app/models/spree/promotion/rules/taxon.rb

@@ -38,11 +38,7 @@ module Spree
               eligibility_errors.add(:base, eligibility_error_message(:has_excluded_taxon), error_code: :has_excluded_taxon)
             end
           else
-            # Change this to an exception in a future version of Solidus
-            warn_invalid_match_policy(assume: 'any')
-            unless order_taxons.where(id: rule_taxon_ids_with_children).exists?
-              eligibility_errors.add(:base, eligibility_error_message(:no_matching_taxons), error_code: :no_matching_taxons)
-            end
+            raise "unexpected match policy: #{preferred_match_policy.inspect}"
           end
 
           eligibility_errors.empty?
@@ -60,9 +56,7 @@ module Spree
           when 'none'
             !found
           else
-            # Change this to an exception in a future version of Solidus
-            warn_invalid_match_policy(assume: 'any')
-            found
+            raise "unexpected match policy: #{preferred_match_policy.inspect}"
           end
         end
 
@@ -77,13 +71,6 @@ module Spree
 
         private
 
-        def warn_invalid_match_policy(assume:)
-          Spree::Deprecation.warn(
-            "#{self.class.name} id=#{id} has unexpected match policy #{preferred_match_policy.inspect}. "\
-            "Interpreting it as '#{assume}'."
-          )
-        end
-
         # All taxons in an order
         def taxons_in_order(order)
           Spree::Taxon.joins(products: { variants_including_master: :line_items })

data/app/models/spree/promotion_action.rb

@@ -29,15 +29,8 @@ module Spree
     #
     # @param order [Spree::Order] the order to remove the action from
     # @return [void]
-    def remove_from(order)
-      Spree::Deprecation.warn("#{self.class.name.inspect} does not define #remove_from. The default behavior may be incorrect and will be removed in a future version of Solidus.", caller)
-      [order, *order.line_items, *order.shipments].each do |item|
-        item.adjustments.each do |adjustment|
-          if adjustment.source == self
-            item.adjustments.destroy(adjustment)
-          end
-        end
-      end
+    def remove_from(_order)
+      raise 'remove_from should be implemented in a sub-class of PromotionAction'
     end
 
     def to_partial_path

data/app/models/spree/promotion_code/batch_builder.rb

@@ -10,20 +10,6 @@ class ::Spree::PromotionCode::BatchBuilder
     sample_characters: ('a'..'z').to_a + (2..9).to_a.map(&:to_s)
   }
 
-  [:random_code_length, :batch_size, :sample_characters].each do |attr|
-    define_singleton_method(attr) do
-      Spree::Deprecation.warn "#{name}.#{attr} is deprecated. Use #{name}::DEFAULT_OPTIONS[:#{attr}] instead"
-      DEFAULT_OPTIONS[attr]
-    end
-
-    define_singleton_method(:"#{attr}=") do |val|
-      Spree::Deprecation.warn "#{name}.#{attr}= is deprecated. Use #{name}::DEFAULT_OPTIONS[:#{attr}]= instead"
-      DEFAULT_OPTIONS[attr] = val
-    end
-
-    delegate attr, to: self
-  end
-
   def initialize(promotion_code_batch, options = {})
     @promotion_code_batch = promotion_code_batch
     options.assert_valid_keys(*DEFAULT_OPTIONS.keys)

data/app/models/spree/refund.rb

@@ -15,11 +15,6 @@ module Spree
     validate :amount_is_less_than_or_equal_to_allowed_amount, on: :create
 
     attr_reader :perform_response
-    attr_accessor :perform_after_create
-
-    after_create :set_perform_after_create_default
-    after_create :perform!
-    after_create :clear_perform_after_create
 
     scope :non_reimbursement, -> { where(reimbursement_id: nil) }
 
@@ -45,60 +40,21 @@ module Spree
     # Attempts to perform the refund,
     # raises an error if the refund fails.
     def perform!
-      return true if perform_after_create == false
       return true if transaction_id.present?
 
       credit_cents = money.cents
 
       @perform_response = process!(credit_cents)
+      log_entries.build(details: perform_response.to_yaml)
 
-      @response = Spree::DeprecatedInstanceVariableProxy.new(
-        self,
-        :perform_response,
-        :@response,
-        Spree::Deprecation,
-        "Please, do not use Spree::Refund @response anymore, use Spree::Refund#perform_response"
-      )
+      self.transaction_id = perform_response.authorization
+      save!
 
-      log_entries.build(details: perform_response.to_yaml)
-      update!(transaction_id: perform_response.authorization)
       update_order
     end
 
     private
 
-    # This callback takes care of setting the behavior that determines if it is needed
-    # to execute the perform! callback after_create.
-    # Existing code that creates refund without explicitely passing
-    #
-    # perform_after_create: false
-    #
-    # as attribute will still call perform! but a deprecation warning is emitted in order
-    # to ask users to change their code with the new supported behavior.
-    def set_perform_after_create_default
-      return true if perform_after_create == false
-
-      Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
-        From Solidus v3.0 onwards, #perform! will need to be explicitly called when creating new
-        refunds. Please, change your code from:
-
-          Spree::Refund.create(your: attributes)
-
-        to:
-
-          Spree::Refund.create(your: attributes, perform_after_create: false).perform!
-      WARN
-
-      self.perform_after_create = true
-    end
-
-    # This is needed to avoid that when you create a refund with perform_after_create = false,
-    # it's not possibile to call perform! on that instance, since the value of this attribute
-    # will remain false until a reload of the instance.
-    def clear_perform_after_create
-      @perform_after_create = nil
-    end
-
     # return an activemerchant response object if successful or else raise an error
     def process!(credit_cents)
       response = if payment.payment_method.payment_profiles_supported?

data/app/models/spree/reimbursement.rb

@@ -51,14 +51,6 @@ module Spree
     class_attribute :reimbursement_performer
     self.reimbursement_performer = ReimbursementPerformer
 
-    # These are called if the call to "reimburse!" succeeds.
-    class_attribute :reimbursement_success_hooks
-    self.reimbursement_success_hooks = []
-
-    # These are called if the call to "reimburse!" fails.
-    class_attribute :reimbursement_failure_hooks
-    self.reimbursement_failure_hooks = []
-
     include ::Spree::Config.state_machines.reimbursement
 
     class << self
@@ -91,10 +83,7 @@ module Spree
       total - paid_amount
     end
 
-    def perform!(created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #perform on #{self} without created_by is deprecated")
-      end
+    def perform!(created_by:)
       reimbursement_tax_calculator.call(self)
       reload
       update!(total: calculated_total)
@@ -104,21 +93,9 @@ module Spree
       if unpaid_amount_within_tolerance?
         reimbursed!
         Spree::Event.fire 'reimbursement_reimbursed', reimbursement: self
-        if reimbursement_success_hooks.any?
-          Spree::Deprecation.warn \
-            "reimbursement_success_hooks are deprecated. Please remove them " \
-            "and subscribe to `reimbursement_reimbursed` event instead", caller(1)
-        end
-        reimbursement_success_hooks.each { |hook| hook.call self }
       else
         errored!
         Spree::Event.fire 'reimbursement_errored', reimbursement: self
-        if reimbursement_failure_hooks.any?
-          Spree::Deprecation.warn \
-            "reimbursement_failure_hooks are deprecated. Please remove them " \
-            "and subscribe to `reimbursement_errored` event instead", caller(1)
-        end
-        reimbursement_failure_hooks.each { |hook| hook.call self }
       end
 
       if errored?
@@ -126,10 +103,7 @@ module Spree
       end
     end
 
-    def simulate(created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #simulate on #{self} without created_by is deprecated")
-      end
+    def simulate(created_by:)
       reimbursement_simulator_tax_calculator.call(self)
       reload
       update!(total: calculated_total)
@@ -154,10 +128,7 @@ module Spree
     # @api public
     # @param [Spree.user_class] created_by the user that is performing this action
     # @return [void]
-    def return_all(created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #return_all on #{self} without created_by is deprecated")
-      end
+    def return_all(created_by:)
       return_items.each(&:accept!)
       save!
       perform!(created_by: created_by)
@@ -168,15 +139,6 @@ module Spree
     #
     # @return [Spree::StoreCreditCategory]
     def store_credit_category
-      if Spree::Config.use_legacy_store_credit_reimbursement_category_name
-        Spree::Deprecation.warn("Using the legacy reimbursement_category_name is deprecated. "\
-          "Set Spree::Config.use_legacy_store_credit_reimbursement_category_name to false to use "\
-          "the new version instead.", caller)
-
-        name = Spree::StoreCreditCategory.reimbursement_category_name
-        return Spree::StoreCreditCategory.find_by(name: name) || Spree::StoreCreditCategory.first
-      end
-
       Spree::StoreCreditCategory.find_by(name: Spree::StoreCreditCategory::REIMBURSEMENT)
     end
 

data/app/models/spree/reimbursement_performer.rb

@@ -11,18 +11,12 @@ module Spree
       # - #description
       # - #display_amount
       # so they can be displayed in the Admin UI appropriately.
-      def simulate(reimbursement, created_by: nil)
-        unless created_by
-          Spree::Deprecation.warn("Calling #simulate on #{self} without created_by is deprecated")
-        end
+      def simulate(reimbursement, created_by:)
         execute(reimbursement, true, created_by: created_by)
       end
 
       # Actually perform the reimbursement
-      def perform(reimbursement, created_by: nil)
-        unless created_by
-          Spree::Deprecation.warn("Calling #perform on #{self} without created_by is deprecated")
-        end
+      def perform(reimbursement, created_by:)
         execute(reimbursement, false, created_by: created_by)
       end
 

data/app/models/spree/reimbursement_type/credit.rb

@@ -5,10 +5,7 @@ module Spree
     extend Spree::ReimbursementType::ReimbursementHelpers
 
     class << self
-      def reimburse(reimbursement, return_items, simulate, created_by: nil)
-        unless created_by
-          Spree::Deprecation.warn("Calling #reimburse on #{self} without created_by is deprecated")
-        end
+      def reimburse(reimbursement, return_items, simulate, created_by:)
         unpaid_amount = return_items.sum(&:total).round(2, :down)
         reimbursement_list, _unpaid_amount = create_credits(reimbursement, unpaid_amount, simulate, created_by: created_by)
         reimbursement_list

data/app/models/spree/reimbursement_type/reimbursement_helpers.rb

@@ -34,8 +34,7 @@ module Spree
       refund = reimbursement.refunds.build({
         payment: payment,
         amount: amount,
-        reason: Spree::RefundReason.return_processing_reason,
-        perform_after_create: false
+        reason: Spree::RefundReason.return_processing_reason
       })
 
       if simulate

data/app/models/spree/reimbursement_type/store_credit.rb

@@ -4,10 +4,7 @@ class Spree::ReimbursementType::StoreCredit < Spree::ReimbursementType
   extend Spree::ReimbursementType::ReimbursementHelpers
 
   class << self
-    def reimburse(reimbursement, return_items, simulate, created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #reimburse on #{self} without created_by is deprecated")
-      end
+    def reimburse(reimbursement, return_items, simulate, created_by:)
       unpaid_amount = return_items.sum(&:total).to_d.round(2, :down)
       payments = store_credit_payments(reimbursement)
       reimbursement_list = []

data/app/models/spree/return_authorization.rb

@@ -25,16 +25,13 @@ module Spree
     include ::Spree::Config.state_machines.return_authorization
 
     extend DisplayMoney
-    money_methods :pre_tax_total, :amount, :total_excluding_vat
-    deprecate display_pre_tax_total: :display_total_excluding_vat, deprecator: Spree::Deprecation
+    money_methods :amount, :total_excluding_vat
 
     self.whitelisted_ransackable_attributes = ['memo']
 
     def total_excluding_vat
       return_items.sum(&:total_excluding_vat)
     end
-    alias pre_tax_total total_excluding_vat
-    deprecate pre_tax_total: :total_excluding_vat, deprecator: Spree::Deprecation
 
     def amount
       return_items.sum(:amount)

data/app/models/spree/return_item.rb

@@ -81,8 +81,7 @@ module Spree
     include ::Spree::Config.state_machines.return_item_acceptance
 
     extend DisplayMoney
-    money_methods :pre_tax_amount, :amount, :total, :total_excluding_vat
-    deprecate display_pre_tax_amount: :display_total_excluding_vat, deprecator: Spree::Deprecation
+    money_methods :amount, :total, :total_excluding_vat
 
     # @return [Boolean] true when this retur item is in a complete reception
     #   state
@@ -90,14 +89,6 @@ module Spree
       COMPLETED_RECEPTION_STATUSES.map(&:to_s).include?(reception_status.to_s)
     end
 
-    def skip_customer_return_processing=(value)
-      @skip_customer_return_processing = value
-      Deprecation.warn \
-        'From Solidus v2.11 onwards, #skip_customer_return_processing does ' \
-        'nothing, and #process_inventory_unit! will restore calling ' \
-        'customer_return#process_return!', caller(1)
-    end
-
     # @param inventory_unit [Spree::InventoryUnit] the inventory for which we
     #   want a return item
     # @return [Spree::ReturnItem] a valid return item for the given inventory
@@ -134,8 +125,6 @@ module Spree
     def total_excluding_vat
       amount - included_tax_total
     end
-    alias pre_tax_amount total_excluding_vat
-    deprecate pre_tax_amount: :total_excluding_vat, deprecator: Spree::Deprecation
 
     # @note This uses the exchange_variant_engine configured on the class.
     # @param stock_locations [Array<Spree::StockLocation>] the stock locations to check
@@ -206,13 +195,6 @@ module Spree
         customer_return.stock_location.restock(inventory_unit.variant, 1, customer_return)
       end
 
-      unless @skip_customer_return_processing.nil?
-        Deprecation.warn \
-          'From Solidus v2.11 onwards, #skip_customer_return_processing does ' \
-          'nothing, and #process_inventory_unit! will restore calling ' \
-          'customer_return#process_return!'
-      end
-
       customer_return&.process_return!
     end