solidus_subscriptions-alpha 0.0.3 → 0.0.4

data/app/models/solidus_subscriptions/subscription_line_item_builder.rb

@@ -1,21 +1,21 @@
-module SolidusSubscriptions
-  module SubscriptionLineItemBuilder
-    private
-
-    def create_subscription_line_item(line_item)
-      SolidusSubscriptions::LineItem.create!(
-        subscription_params.merge(spree_line_item: line_item)
-      )
-
-      # Rerun the promotion handler to pickup subscription promotions
-      Spree::PromotionHandler::Cart.new(line_item.order).activate
-      line_item.order.update!
-    end
-
-    def subscription_params
-      params.require(:subscription_line_item).permit(
-        SolidusSubscriptions::Config.subscription_line_item_attributes
-      )
-    end
-  end
-end
+module SolidusSubscriptions
+  module SubscriptionLineItemBuilder
+    private
+
+    def create_subscription_line_item(line_item)
+      SolidusSubscriptions::LineItem.create!(
+        subscription_params.merge(spree_line_item: line_item)
+      )
+
+      # Rerun the promotion handler to pickup subscription promotions
+      Spree::PromotionHandler::Cart.new(line_item.order).activate
+      line_item.order.update!
+    end
+
+    def subscription_params
+      params.require(:subscription_line_item).permit(
+        SolidusSubscriptions::Config.subscription_line_item_attributes
+      )
+    end
+  end
+end

data/app/models/solidus_subscriptions/subscription_order_promotion_rule.rb

@@ -1,25 +1,25 @@
-module SolidusSubscriptions
-  class SubscriptionOrderPromotionRule < Spree::PromotionRule
-    # Promotion can be applied to an entire order. Will only be true
-    # for Spree::Order
-    #
-    # @param promotable [Object] Any object which could have this
-    #   promotion rule applied to it.
-    #
-    # @return [Boolean]
-    def applicable?(promotable)
-      promotable.is_a? Spree::Order
-    end
-
-    # An order is eligible if it fulfills a subscription Installment. Will only
-    # return true if the order fulfills one or more Installments
-    #
-    # @param order [Spree::Order] The order which could have this rule applied
-    #   to it.
-    #
-    # @return [Boolean]
-    def eligible?(order, **_options)
-      order.subscription_order?
-    end
-  end
-end
+module SolidusSubscriptions
+  class SubscriptionOrderPromotionRule < Spree::PromotionRule
+    # Promotion can be applied to an entire order. Will only be true
+    # for Spree::Order
+    #
+    # @param promotable [Object] Any object which could have this
+    #   promotion rule applied to it.
+    #
+    # @return [Boolean]
+    def applicable?(promotable)
+      promotable.is_a? Spree::Order
+    end
+
+    # An order is eligible if it fulfills a subscription Installment. Will only
+    # return true if the order fulfills one or more Installments
+    #
+    # @param order [Spree::Order] The order which could have this rule applied
+    #   to it.
+    #
+    # @return [Boolean]
+    def eligible?(order, **_options)
+      order.subscription_order?
+    end
+  end
+end

data/app/models/solidus_subscriptions/subscription_promotion_rule.rb

@@ -1,38 +1,38 @@
-module SolidusSubscriptions
-  class SubscriptionPromotionRule < Spree::PromotionRule
-    # Promotion can be applied to an entire order. Will only be true
-    # for Spree::Order
-    #
-    # @param promotable [Object] Any object which could have this
-    #   promotion rule applied to it.
-    #
-    # @return [Boolean]
-    def applicable?(promotable)
-      promotable.is_a? Spree::Order
-    end
-
-    # An order is eligible if it contains a line item with an associates
-    # subscription_line_item.  This rule applies to order and so its eligibility
-    # will always be considered against an order. Will only return true for
-    # orders containing Spree::Line item with associated subscription_line_items
-    #
-    # @param order [Spree::Order] The order which could have this rule applied
-    #   to it.
-    #
-    # @return [Boolean]
-    def eligible?(order, **_options)
-      order.subscription_line_items.any?
-    end
-
-    # Certain actions create adjustments on line items. In this case, only
-    # line items with associated subscription_line_itms are eligible to be
-    # adjusted. Will only return true # if :line_item has an associated
-    # subscription.
-    #
-    # @param line_item [Spree::LineItem] The line item which could be adjusted
-    #   by the promotion.
-    def actionable?(line_item)
-      line_item.subscription_line_items.present?
-    end
-  end
-end
+module SolidusSubscriptions
+  class SubscriptionPromotionRule < Spree::PromotionRule
+    # Promotion can be applied to an entire order. Will only be true
+    # for Spree::Order
+    #
+    # @param promotable [Object] Any object which could have this
+    #   promotion rule applied to it.
+    #
+    # @return [Boolean]
+    def applicable?(promotable)
+      promotable.is_a? Spree::Order
+    end
+
+    # An order is eligible if it contains a line item with an associates
+    # subscription_line_item.  This rule applies to order and so its eligibility
+    # will always be considered against an order. Will only return true for
+    # orders containing Spree::Line item with associated subscription_line_items
+    #
+    # @param order [Spree::Order] The order which could have this rule applied
+    #   to it.
+    #
+    # @return [Boolean]
+    def eligible?(order, **_options)
+      order.subscription_line_items.any?
+    end
+
+    # Certain actions create adjustments on line items. In this case, only
+    # line items with associated subscription_line_itms are eligible to be
+    # adjusted. Will only return true # if :line_item has an associated
+    # subscription.
+    #
+    # @param line_item [Spree::LineItem] The line item which could be adjusted
+    #   by the promotion.
+    def actionable?(line_item)
+      line_item.subscription_line_items.present?
+    end
+  end
+end

data/app/models/solidus_subscriptions/success_dispatcher.rb

@@ -1,16 +1,16 @@
-# This service class is intented to provide callback behaviour to handle
-# an installment successfully being processed
-module SolidusSubscriptions
-  class SuccessDispatcher < Dispatcher
-    def dispatch
-      installments.each { |i| i.success!(order) }
-      super
-    end
-
-    private
-
-    def message
-      "Successfully processed installments: #{installments.map(&:id).join(', ')}"
-    end
-  end
-end
+# This service class is intented to provide callback behaviour to handle
+# an installment successfully being processed
+module SolidusSubscriptions
+  class SuccessDispatcher < Dispatcher
+    def dispatch
+      installments.each { |i| i.success!(order) }
+      super
+    end
+
+    private
+
+    def message
+      "Successfully processed installments: #{installments.map(&:id).join(', ')}"
+    end
+  end
+end

data/app/models/solidus_subscriptions/unsubscribable_error.rb

@@ -1,17 +1,17 @@
-# This error should be raised if a user attempts to subscribe to a item which
-# is not subscribable
-module SolidusSubscriptions
-  class UnsubscribableError < StandardError
-    def initialize(subscribable)
-      @subscribable = subscribable
-      super
-    end
-
-    def to_s
-      <<-MSG.squish
-        #{@subscribable.class} with id: #{@subscribable.id} cannot be
-        subscribed to.
-      MSG
-    end
-  end
-end
+# This error should be raised if a user attempts to subscribe to a item which
+# is not subscribable
+module SolidusSubscriptions
+  class UnsubscribableError < StandardError
+    def initialize(subscribable)
+      @subscribable = subscribable
+      super
+    end
+
+    def to_s
+      <<-MSG.squish
+        #{@subscribable.class} with id: #{@subscribable.id} cannot be
+        subscribed to.
+      MSG
+    end
+  end
+end

data/app/models/solidus_subscriptions/user_mismatch_error.rb

@@ -1,15 +1,15 @@
-module SolidusSubscriptions
-  class UserMismatchError < StandardError
-    def initialize(installments)
-      @installments = installments
-    end
-
-    def to_s
-      <<-MSG.squish
-        Installments must have the same user to be processed as a consolidated
-        installment. Could not process installments:
-        #{@installments.map(&:id).join(', ')}
-      MSG
-    end
-  end
-end
+module SolidusSubscriptions
+  class UserMismatchError < StandardError
+    def initialize(installments)
+      @installments = installments
+    end
+
+    def to_s
+      <<-MSG.squish
+        Installments must have the same user to be processed as a consolidated
+        installment. Could not process installments:
+        #{@installments.map(&:id).join(', ')}
+      MSG
+    end
+  end
+end

data/app/overrides/views/admin_subscribable_checkbox.rb

@@ -1,13 +1,13 @@
-Deface::Override.new(
-  virtual_path: "spree/admin/variants/_form",
-  name: "solidus_subscriptions_subscribable_checkbox",
-  insert_after: "[data-hook='track_inventory']",
-  partial: "spree/admin/variants/subscribable_checkbox"
-)
-
-Deface::Override.new(
-  virtual_path: "spree/admin/products/_form",
-  name: "solidus_subscriptions_product_subscribable_checkbox",
-  insert_after: "[data-hook='admin_product_form_meta']",
-  partial: "spree/admin/products/subscribable_checkbox"
-)
+Deface::Override.new(
+  virtual_path: "spree/admin/variants/_form",
+  name: "solidus_subscriptions_subscribable_checkbox",
+  insert_after: "[data-hook='track_inventory']",
+  partial: "spree/admin/variants/subscribable_checkbox"
+)
+
+Deface::Override.new(
+  virtual_path: "spree/admin/products/_form",
+  name: "solidus_subscriptions_product_subscribable_checkbox",
+  insert_after: "[data-hook='admin_product_form_meta']",
+  partial: "spree/admin/products/subscribable_checkbox"
+)

data/app/overrides/views/admin_subscriptions_menu_link.rb

@@ -1,8 +1,8 @@
-if !Spree::Backend::Config.respond_to?(:menu_items)
-  Deface::Override.new(
-    virtual_path: 'spree/admin/shared/_menu',
-    name: :add_subcriptions_admin_link,
-    insert_bottom: "[data-hook='admin_tabs']",
-    partial: 'spree/admin/shared/subscription_tab'
-  )
-end
+if !Spree::Backend::Config.respond_to?(:menu_items)
+  Deface::Override.new(
+    virtual_path: 'spree/admin/shared/_menu',
+    name: :add_subcriptions_admin_link,
+    insert_bottom: "[data-hook='admin_tabs']",
+    partial: 'spree/admin/shared/subscription_tab'
+  )
+end

data/app/overrides/views/subscription_line_item_fields.rb

@@ -1,6 +1,6 @@
-Deface::Override.new(
-  virtual_path: "spree/products/_cart_form",
-  name: "subscription_line_item_fields",
-  insert_after: "[data-hook='inside_product_cart_form']",
-  partial: "spree/frontend/products/subscription_line_item_fields"
-)
+Deface::Override.new(
+  virtual_path: "spree/products/_cart_form",
+  name: "subscription_line_item_fields",
+  insert_after: "[data-hook='inside_product_cart_form']",
+  partial: "spree/frontend/products/subscription_line_item_fields"
+)

data/app/views/spree/admin/products/_subscribable_checkbox.html.erb

@@ -1,8 +1,8 @@
-<% if !@product.has_variants? then %>
-  <div class="field four columns checkbox" data-hook="subscribable">
-    <%= f.label :subscribable do %>
-      <%= f.check_box :subscribable %>
-      <%= Spree::Product.human_attribute_name(:subscribable) %>
-    <% end %>
-  </div>
-<% end  %>
+<% if !@product.has_variants? then %>
+  <div class="field four columns checkbox" data-hook="subscribable">
+    <%= f.label :subscribable do %>
+      <%= f.check_box :subscribable %>
+      <%= Spree::Product.human_attribute_name(:subscribable) %>
+    <% end %>
+  </div>
+<% end  %>

data/app/views/spree/admin/shared/_no_objects_found.html.erb

@@ -1,4 +1,4 @@
-<%= Spree.t(:no_resource, resource: resource.model_name.human.pluralize) %>
-<% if can? :create, resource %>
-  <%= link_to Spree.t(:create_one), new_resource_url %>
-<% end %>
+<%= Spree.t(:no_resource, resource: resource.model_name.human.pluralize) %>
+<% if can? :create, resource %>
+  <%= link_to Spree.t(:create_one), new_resource_url %>
+<% end %>

data/app/views/spree/admin/shared/_subscription_tab.html.erb

@@ -1,3 +1,3 @@
-<% if can? :admin, SolidusSubscriptions::Subscription %>
-  <%= tab :subscriptions, icon: 'repeat' %>
-<% end %>
+<% if can? :admin, SolidusSubscriptions::Subscription %>
+  <%= tab :subscriptions, icon: 'repeat' %>
+<% end %>

data/app/views/spree/admin/solidus_subscriptions/subscriptions/_subscription.html.erb

@@ -1,66 +1,66 @@
-<%= content_tag :tr, class: cycle('odd', 'even') do %>
-  <%= content_tag :td, l(subscription.created_at.to_date), class: 'align-center' %>
-
-  <%= content_tag :td, class: 'align-center' do %>
-    <%= link_to subscription.user.email, admin_user_path(subscription.user) %>
-  <% end %>
-
-  <%= content_tag :td, class: 'align-center' do %>
-    <%= subscription.actionable_date ? l(subscription.actionable_date) : '-' %>
-  <% end %>
-
-  <%= content_tag :td, class: 'align-center' do %>
-    <%= subscription.interval.inspect %>
-  <% end %>
-
-  <%= content_tag :td, class: 'align-center' do %>
-    <%= content_tag :span, subscription.human_state_name, class: "state #{ subscription.state }" %>
-  <% end %>
-
-  <%= content_tag :td, class: 'align-center' do %>
-    <%= content_tag :span,  class: "state #{ subscription.processing_state }" do %>
-      <%= subscription.class.human_attribute_name("processing_state.#{ subscription.processing_state }") %>
-    <% end %>
-  <% end %>
-
-  <td class="actions align-center">
-    <% if subscription.state_events.include?(:cancel) %>
-      <%=
-        link_to_with_icon(
-          :stop,
-          t('.cancel'),
-          spree.cancel_admin_subscription_path(subscription),
-          no_text: true,
-          method: :delete,
-          data: { confirm: t('.cancel_alert') }
-        )
-      %>
-    <% end %>
-
-    <% if subscription.state_events.include?(:activate) %>
-      <%=
-        link_to_with_icon(
-          :play,
-          t('.activate'),
-          spree.activate_admin_subscription_path(subscription),
-          no_text: true,
-          method: :post
-        )
-      %>
-    <% end %>
-
-    <% if subscription.active? %>
-      <%=
-        link_to_with_icon(
-          :'fast-forward',
-          t('.skip'),
-          spree.skip_admin_subscription_path(subscription),
-          no_text: true,
-          method: :post
-        )
-      %>
-    <% end %>
-
-    <%= link_to_edit(subscription, no_text: true) %>
-  </td>
-<% end %>
+<%= content_tag :tr, class: cycle('odd', 'even') do %>
+  <%= content_tag :td, l(subscription.created_at.to_date), class: 'align-center' %>
+
+  <%= content_tag :td, class: 'align-center' do %>
+    <%= link_to subscription.user.email, admin_user_path(subscription.user) %>
+  <% end %>
+
+  <%= content_tag :td, class: 'align-center' do %>
+    <%= subscription.actionable_date ? l(subscription.actionable_date) : '-' %>
+  <% end %>
+
+  <%= content_tag :td, class: 'align-center' do %>
+    <%= subscription.interval.inspect %>
+  <% end %>
+
+  <%= content_tag :td, class: 'align-center' do %>
+    <%= content_tag :span, subscription.human_state_name, class: "state #{ subscription.state }" %>
+  <% end %>
+
+  <%= content_tag :td, class: 'align-center' do %>
+    <%= content_tag :span,  class: "state #{ subscription.processing_state }" do %>
+      <%= subscription.class.human_attribute_name("processing_state.#{ subscription.processing_state }") %>
+    <% end %>
+  <% end %>
+
+  <td class="actions align-center">
+    <% if subscription.state_events.include?(:cancel) %>
+      <%=
+        link_to_with_icon(
+          :stop,
+          t('.cancel'),
+          spree.cancel_admin_subscription_path(subscription),
+          no_text: true,
+          method: :delete,
+          data: { confirm: t('.cancel_alert') }
+        )
+      %>
+    <% end %>
+
+    <% if subscription.state_events.include?(:activate) %>
+      <%=
+        link_to_with_icon(
+          :play,
+          t('.activate'),
+          spree.activate_admin_subscription_path(subscription),
+          no_text: true,
+          method: :post
+        )
+      %>
+    <% end %>
+
+    <% if subscription.active? %>
+      <%=
+        link_to_with_icon(
+          :'fast-forward',
+          t('.skip'),
+          spree.skip_admin_subscription_path(subscription),
+          no_text: true,
+          method: :post
+        )
+      %>
+    <% end %>
+
+    <%= link_to_edit(subscription, no_text: true) %>
+  </td>
+<% end %>