From b4d1e48693227cc22241d3f1fa7360626cce0dec Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 25 Jan 2019 17:17:52 +1100 Subject: [PATCH] Update soft-delete of variants Spree changed their way of soft-deleting variants from calling `delete` to calling `destroy`. We don't need our own implementation any more. --- app/models/spree/variant_decorator.rb | 8 -------- app/services/variant_deleter.rb | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/models/spree/variant_decorator.rb b/app/models/spree/variant_decorator.rb index 3c2076820c..5f67825537 100644 --- a/app/models/spree/variant_decorator.rb +++ b/app/models/spree/variant_decorator.rb @@ -105,14 +105,6 @@ Spree::Variant.class_eval do OpenFoodNetwork::EnterpriseFeeCalculator.new(distributor, order_cycle).fees_by_type_for self end - def delete - transaction do - self.update_column(:deleted_at, Time.zone.now) - ExchangeVariant.where(variant_id: self).destroy_all - self - end - end - def refresh_products_cache if is_master? product.refresh_products_cache diff --git a/app/services/variant_deleter.rb b/app/services/variant_deleter.rb index e76bb8d91a..f499f0c24d 100644 --- a/app/services/variant_deleter.rb +++ b/app/services/variant_deleter.rb @@ -6,7 +6,7 @@ class VariantDeleter return false end - variant.delete + variant.destroy end private