solidus_subscriptions-alpha 0.0.4 → 0.0.5

data/app/controllers/solidus_subscriptions/api/v1/subscriptions_controller.rb

@@ -1,44 +1,44 @@
-class SolidusSubscriptions::Api::V1::SubscriptionsController < Spree::Api::BaseController
-  before_action :load_subscription, only: [:cancel, :update, :skip]
-
-  def update
-    if @subscription.update(subscription_params)
-      render json: @subscription.to_json(include: [:line_items, :shipping_address])
-    else
-      render json: @subscription.errors.to_json, status: 422
-    end
-  end
-
-  def skip
-    if @subscription.skip
-      render json: @subscription.to_json
-    else
-      render json: @subscription.errors.to_json, status: 422
-    end
-  end
-
-  def cancel
-    if @subscription.cancel
-      render json: @subscription.to_json
-    else
-      render json: @subscription.errors.to_json, status: 422
-    end
-  end
-
-  private
-
-  def load_subscription
-    @subscription = current_api_user.subscriptions.find(params[:id])
-  end
-
-  def subscription_params
-    params.require(:subscription).permit(
-      line_items_attributes: line_item_attributes,
-      shipping_address_attributes: Spree::PermittedAttributes.address_attributes
-    )
-  end
-
-  def line_item_attributes
-    SolidusSubscriptions::Config.subscription_line_item_attributes - [:subscribable_id] + [:id]
-  end
-end
+class SolidusSubscriptions::Api::V1::SubscriptionsController < Spree::Api::BaseController
+  before_action :load_subscription, only: [:cancel, :update, :skip]
+
+  def update
+    if @subscription.update(subscription_params)
+      render json: @subscription.to_json(include: [:line_items, :shipping_address])
+    else
+      render json: @subscription.errors.to_json, status: 422
+    end
+  end
+
+  def skip
+    if @subscription.skip
+      render json: @subscription.to_json
+    else
+      render json: @subscription.errors.to_json, status: 422
+    end
+  end
+
+  def cancel
+    if @subscription.cancel
+      render json: @subscription.to_json
+    else
+      render json: @subscription.errors.to_json, status: 422
+    end
+  end
+
+  private
+
+  def load_subscription
+    @subscription = current_api_user.subscriptions.find(params[:id])
+  end
+
+  def subscription_params
+    params.require(:subscription).permit(
+      line_items_attributes: line_item_attributes,
+      shipping_address_attributes: Spree::PermittedAttributes.address_attributes
+    )
+  end
+
+  def line_item_attributes
+    SolidusSubscriptions::Config.subscription_line_item_attributes - [:subscribable_id] + [:id]
+  end
+end

data/app/controllers/spree/admin/subscriptions_controller.rb

@@ -1,66 +1,66 @@
-module Spree
-  module Admin
-    class SubscriptionsController < ResourceController
-      skip_before_action :load_resource, only: :index
-
-      def index
-        @search = SolidusSubscriptions::Subscription.
-          accessible_by(current_ability, :index).ransack(params[:q])
-
-        @subscriptions = @search.result(distinct: true).
-          includes(:line_items, :user).
-          joins(:line_items, :user).
-          page(params[:page]).
-          per(params[:per_page] || Spree::Config[:orders_per_page])
-      end
-
-      def new
-        @subscription.line_items.new
-      end
-
-      def cancel
-        @subscription.transaction do
-          @subscription.actionable_date = nil
-          @subscription.cancel
-        end
-
-        if @subscription.errors.none?
-          notice = I18n.t('spree.admin.subscriptions.successfully_canceled')
-        else
-          notice = @subscription.errors.full_messages.to_sentence
-        end
-
-        redirect_to spree.admin_subscriptions_path, notice: notice
-      end
-
-      def activate
-        @subscription.activate
-
-        if @subscription.errors.none?
-          notice = I18n.t('spree.admin.subscriptions.successfully_activated')
-        else
-          notice = @subscription.errors.full_messages.to_sentence
-        end
-
-        redirect_to spree.admin_subscriptions_path, notice: notice
-      end
-
-      def skip
-        @subscription.advance_actionable_date
-
-        notice = I18n.t(
-          'spree.admin.subscriptions.successfully_skipped',
-          date: @subscription.actionable_date
-        )
-
-        redirect_to spree.admin_subscriptions_path, notice: notice
-      end
-
-      private
-
-      def model_class
-        ::SolidusSubscriptions::Subscription
-      end
-    end
-  end
-end
+module Spree
+  module Admin
+    class SubscriptionsController < ResourceController
+      skip_before_action :load_resource, only: :index
+
+      def index
+        @search = SolidusSubscriptions::Subscription.
+          accessible_by(current_ability, :index).ransack(params[:q])
+
+        @subscriptions = @search.result(distinct: true).
+          includes(:line_items, :user).
+          joins(:line_items, :user).
+          page(params[:page]).
+          per(params[:per_page] || Spree::Config[:orders_per_page])
+      end
+
+      def new
+        @subscription.line_items.new
+      end
+
+      def cancel
+        @subscription.transaction do
+          @subscription.actionable_date = nil
+          @subscription.cancel
+        end
+
+        if @subscription.errors.none?
+          notice = I18n.t('spree.admin.subscriptions.successfully_canceled')
+        else
+          notice = @subscription.errors.full_messages.to_sentence
+        end
+
+        redirect_to spree.admin_subscriptions_path, notice: notice
+      end
+
+      def activate
+        @subscription.activate
+
+        if @subscription.errors.none?
+          notice = I18n.t('spree.admin.subscriptions.successfully_activated')
+        else
+          notice = @subscription.errors.full_messages.to_sentence
+        end
+
+        redirect_to spree.admin_subscriptions_path, notice: notice
+      end
+
+      def skip
+        @subscription.advance_actionable_date
+
+        notice = I18n.t(
+          'spree.admin.subscriptions.successfully_skipped',
+          date: @subscription.actionable_date
+        )
+
+        redirect_to spree.admin_subscriptions_path, notice: notice
+      end
+
+      private
+
+      def model_class
+        ::SolidusSubscriptions::Subscription
+      end
+    end
+  end
+end

data/app/decorators/spree/controllers/api/line_items/create_subscription_line_items.rb

@@ -1,28 +1,28 @@
-# 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 Spree
-  module Controllers::Api::LineItems::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
-
-Spree::Api::LineItemsController.prepend(Spree::Controllers::Api::LineItems::CreateSubscriptionLineItems)
+# 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 Spree
+  module Controllers::Api::LineItems::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
+
+Spree::Api::LineItemsController.prepend(Spree::Controllers::Api::LineItems::CreateSubscriptionLineItems)

data/app/decorators/spree/controllers/orders/create_subscription_line_items.rb

@@ -1,33 +1,33 @@
-# 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 Spree
-  module Controllers
-    module Orders
-      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) if line_item.present?
-        end
-      end
-    end
-  end
-end
-
-Spree::OrdersController.prepend(Spree::Controllers::Orders::CreateSubscriptionLineItems)
+# 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 Spree
+  module Controllers
+    module Orders
+      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) if line_item.present?
+        end
+      end
+    end
+  end
+end
+
+Spree::OrdersController.prepend(Spree::Controllers::Orders::CreateSubscriptionLineItems)

data/app/decorators/spree/line_items/subscription_line_items_association.rb

@@ -1,22 +1,22 @@
-# Each Spree::LineItem can have multiple subscription_line_items. This
-# allows a cart to represent multiple subscriptions to the same item in
-# the same order.
-module Spree
-  module LineItems
-    module SubscriptionLineItemsAssociation
-      def self.prepended(base)
-        base.has_many(
-          :subscription_line_items,
-          class_name: 'SolidusSubscriptions::LineItem',
-          foreign_key: :spree_line_item_id,
-          inverse_of: :spree_line_item,
-          dependent: :destroy
-        )
-
-        base.accepts_nested_attributes_for :subscription_line_items
-      end
-    end
-  end
-end
-
-Spree::LineItem.prepend Spree::LineItems::SubscriptionLineItemsAssociation
+# Each Spree::LineItem can have multiple subscription_line_items. This
+# allows a cart to represent multiple subscriptions to the same item in
+# the same order.
+module Spree
+  module LineItems
+    module SubscriptionLineItemsAssociation
+      def self.prepended(base)
+        base.has_many(
+          :subscription_line_items,
+          class_name: 'SolidusSubscriptions::LineItem',
+          foreign_key: :spree_line_item_id,
+          inverse_of: :spree_line_item,
+          dependent: :destroy
+        )
+
+        base.accepts_nested_attributes_for :subscription_line_items
+      end
+    end
+  end
+end
+
+Spree::LineItem.prepend Spree::LineItems::SubscriptionLineItemsAssociation

data/app/decorators/spree/orders/after_create.rb

@@ -1,15 +1,15 @@
-module Spree
-  module Orders
-    module AfterCreate
-      def ensure_line_items_present
-        super unless subscription_order?
-      end
-
-      def send_cancel_email
-        super unless subscription_order?
-      end
-    end
-
-    Order.prepend(AfterCreate)
-  end
-end
+module Spree
+  module Orders
+    module AfterCreate
+      def ensure_line_items_present
+        super unless subscription_order?
+      end
+
+      def send_cancel_email
+        super unless subscription_order?
+      end
+    end
+
+    Order.prepend(AfterCreate)
+  end
+end

data/app/decorators/spree/orders/finalize_creates_subscriptions.rb

@@ -1,19 +1,19 @@
-# Once an order is finalized its subscriptions line items should be converted
-# into active subscritptions. This hooks into Spree::Order#finalize! and
-# passes all subscription_line_items present on the order to the Subscription
-# generator which will build and persist the subscriptions
-module Spree
-  module Orders
-    module FinalizeCreatesSubscriptions
-      def finalize!
-        SolidusSubscriptions::SubscriptionGenerator.group(subscription_line_items).each do |line_items|
-          SolidusSubscriptions::SubscriptionGenerator.activate(line_items)
-        end
-
-        super
-      end
-    end
-  end
-end
-
-Spree::Order.prepend Spree::Orders::FinalizeCreatesSubscriptions
+# Once an order is finalized its subscriptions line items should be converted
+# into active subscritptions. This hooks into Spree::Order#finalize! and
+# passes all subscription_line_items present on the order to the Subscription
+# generator which will build and persist the subscriptions
+module Spree
+  module Orders
+    module FinalizeCreatesSubscriptions
+      def finalize!
+        SolidusSubscriptions::SubscriptionGenerator.group(subscription_line_items).each do |line_items|
+          SolidusSubscriptions::SubscriptionGenerator.activate(line_items)
+        end
+
+        super
+      end
+    end
+  end
+end
+
+Spree::Order.prepend Spree::Orders::FinalizeCreatesSubscriptions