diff options
Diffstat (limited to 'app')
3 files changed, 2 insertions, 73 deletions
diff --git a/app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb b/app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb deleted file mode 100644 index 7872a2a..0000000 --- a/app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -# Create new subscription line items associated to the current order, when -# a line item is added to the cart which includes subscription_line_item -# params. -# -# The Subscriptions::LineItem acts as a line item place holder for a -# Subscription, indicating that it has been added to the order, but not -# yet purchased -module SolidusSubscriptions - module Spree - module Api - module LineItemsController - module CreateSubscriptionLineItems - include SolidusSubscriptions::SubscriptionLineItemBuilder - - def self.prepended(base) - base.after_action( - :handle_subscription_line_items, - only: [:create, :update], - if: ->{ params[:subscription_line_item] } - ) - end - - private - - def handle_subscription_line_items - create_subscription_line_item(@line_item) - end - end - end - end - end -end - -Spree::Api::LineItemsController.prepend(SolidusSubscriptions::Spree::Api::LineItemsController::CreateSubscriptionLineItems) diff --git a/app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb b/app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb deleted file mode 100644 index 6b39b4c..0000000 --- a/app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -# Create new subscription line items associated to the current order, when -# a line item is added to the cart which includes subscription_line_item -# params. -# -# The Subscriptions::LineItem acts as a line item place holder for a -# Subscription, indicating that it has been added to the order, but not -# yet purchased -module SolidusSubscriptions - module Spree - module OrdersController - module CreateSubscriptionLineItems - include SolidusSubscriptions::SubscriptionLineItemBuilder - - def self.prepended(base) - base.after_action( - :handle_subscription_line_items, - only: :populate, - if: ->{ params[:subscription_line_item] } - ) - end - - private - - def handle_subscription_line_items - line_item = @current_order.line_items.find_by(variant_id: params[:variant_id]) - create_subscription_line_item(line_item) - end - end - end - end -end - -Spree::OrdersController.prepend(SolidusSubscriptions::Spree::OrdersController::CreateSubscriptionLineItems) diff --git a/app/decorators/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/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) |