Move all decorators to that should be solidus-x dependent to the lib folder

14 files changed, 2 insertions, 3 deletions

diff --git a/app/decorators/core/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb b/app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb
index ccb483f..ccb483f 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/order/after_create.rb b/app/decorators/models/solidus_subscriptions/spree/order/after_create.rb
index c67cb96..c67cb96 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/order/after_create.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/order/after_create.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb b/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
index 3f83b82..3f83b82 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/order/installment_details_association.rb b/app/decorators/models/solidus_subscriptions/spree/order/installment_details_association.rb
index a1261d4..a1261d4 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/order/installment_details_association.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/order/installment_details_association.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_association.rb b/app/decorators/models/solidus_subscriptions/spree/order/subscription_association.rb
index 81284a3..81284a3 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_association.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/order/subscription_association.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb b/app/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb
index 3b48225..3b48225 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/product/delegate_subscribable.rb b/app/decorators/models/solidus_subscriptions/spree/product/delegate_subscribable.rb
index 740b9d8..740b9d8 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/product/delegate_subscribable.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/product/delegate_subscribable.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb b/app/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb
index 1fb4cdf..1fb4cdf 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb b/app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb
index bba173e..73bbc25 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb
@@ -12,9 +12,9 @@ module SolidusSubscriptions
         def remove_from_subscriptions
           SolidusSubscriptions::LineItem.where(subscribable: self).delete_all
         end
+
+        ::Spree::Variant.prepend self
       end
     end
   end
 end
-
-Spree::Variant.prepend(SolidusSubscriptions::Spree::Variant::AutoDeleteFromSubscriptions)
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb b/app/decorators/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb
index 671dcbe..671dcbe 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb
diff --git a/app/decorators/core/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb b/app/decorators/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb
index 6ee754e..6ee754e 100644
--- a/app/decorators/core/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb
diff --git a/app/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb b/lib/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb
index 7872a2a..7872a2a 100644
--- a/app/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb
+++ b/lib/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb
diff --git a/app/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb b/lib/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb
index 6b39b4c..6b39b4c 100644
--- a/app/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb
+++ b/lib/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb
diff --git a/lib/solidus_subscriptions/configuration.rb b/lib/solidus_subscriptions/configuration.rb
index 18c7889..2606272 100644
--- a/lib/solidus_subscriptions/configuration.rb
+++ b/lib/solidus_subscriptions/configuration.rb
@@ -58,7 +58,6 @@ module SolidusSubscriptions
         :interval_length,
         :interval_units,
         :end_date,
-        :_destroy
       ]
     end