Remove Paranoia from Price model

Remove Paranoia and leave Discard as the only option for soft-deleting the records.
solidusio · Jan 24, 2020 · d2573bb · d2573bb
1 parent 85cccb5
commit d2573bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/app/models/concerns/spree/default_price.rb b/core/app/models/concerns/spree/default_price.rb
@@ -6,7 +6,7 @@ module DefaultPrice
 
  included do
  has_one :default_price,
- -> { with_deleted.currently_valid.with_default_attributes },
+ -> { with_discarded.currently_valid.with_default_attributes },
  class_name: 'Spree::Price',
  inverse_of: :variant,
  dependent: :destroy,

diff --git a/core/app/models/spree/price.rb b/core/app/models/spree/price.rb
@@ -4,12 +4,11 @@
 
 module Spree
  class Price < Spree::Base
- acts_as_paranoid
- include Spree::ParanoiaDeprecations
-
  include Discard::Model
  self.discard_column = :deleted_at
 
+ default_scope { kept }
+
  MAXIMUM_AMOUNT = BigDecimal('99_999_999.99')
 
  belongs_to :variant, -> { with_discarded }, class_name: 'Spree::Variant', touch: true, optional: true