solidus_subscriptions-alpha 0.0.4 → 0.0.5

data/app/views/spree/admin/subscriptions/_legacy_sidebar.html.erb

@@ -1,28 +1,28 @@
-<dl>
-  <dt><%= t('.customer') %></dt>
-  <dd>
-    <%= link_to @subscription.user.email, spree.admin_user_path(@subscription.user) %>
-  </dd>
-
-  <dt><%= t('.status') %></dt>
-  <dd>
-    <%= content_tag :span, class: "state #{ @subscription.state }" do %>
-      <%= @subscription.human_state_name %>
-    <% end %>
-  </dd>
-
-  <dt><%= t('.fulfillment_status') %></dt>
-  <dd>
-    <%= content_tag :span,  class: "state #{ @subscription.processing_state }" do %>
-      <%= @subscription.class.human_attribute_name("processing_state.#{ @subscription.processing_state }") %>
-    <% end %>
-  </dd>
-
-  <dt><%= t('.revenue') %></dt>
-  <dd>
-    <%= @subscription.line_item.dummy_line_item.try(:display_price) %>
-  </dd>
-
-  <dt><%= t('.interval') %></dt>
-  <dd><%= @subscription.line_item.interval.inspect %></dd>
-</dl>
+<dl>
+  <dt><%= t('.customer') %></dt>
+  <dd>
+    <%= link_to @subscription.user.email, spree.admin_user_path(@subscription.user) %>
+  </dd>
+
+  <dt><%= t('.status') %></dt>
+  <dd>
+    <%= content_tag :span, class: "state #{ @subscription.state }" do %>
+      <%= @subscription.human_state_name %>
+    <% end %>
+  </dd>
+
+  <dt><%= t('.fulfillment_status') %></dt>
+  <dd>
+    <%= content_tag :span,  class: "state #{ @subscription.processing_state }" do %>
+      <%= @subscription.class.human_attribute_name("processing_state.#{ @subscription.processing_state }") %>
+    <% end %>
+  </dd>
+
+  <dt><%= t('.revenue') %></dt>
+  <dd>
+    <%= @subscription.line_item.dummy_line_item.try(:display_price) %>
+  </dd>
+
+  <dt><%= t('.interval') %></dt>
+  <dd><%= @subscription.line_item.interval.inspect %></dd>
+</dl>

data/app/views/spree/admin/subscriptions/edit.html.erb

@@ -1,21 +1,21 @@
-<% content_for(:page_title) { t('.title') } %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to t('.back'), admin_subscriptions_path %></li>
-<% end %>
-
-<% content_for :sidebar_title do %>
-  Details
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render 'spree/admin/subscriptions/legacy_sidebar' if @subscription.respond_to?(:line_item) %>
-<% end %>
-
-<%= form_for @subscription, url: spree.admin_subscription_path(@subscription) do |f| %>
-  <% if f.object.respond_to?(:line_items) %>
-    <%= render "form", f: f %>
-  <% else %>
-    <%= render "legacy_form",  f: f %>
-  <% end %>
-<% end %>
+<% content_for(:page_title) { t('.title') } %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t('.back'), admin_subscriptions_path %></li>
+<% end %>
+
+<% content_for :sidebar_title do %>
+  Details
+<% end %>
+
+<% content_for :sidebar do %>
+  <%= render 'spree/admin/subscriptions/legacy_sidebar' if @subscription.respond_to?(:line_item) %>
+<% end %>
+
+<%= form_for @subscription, url: spree.admin_subscription_path(@subscription) do |f| %>
+  <% if f.object.respond_to?(:line_items) %>
+    <%= render "form", f: f %>
+  <% else %>
+    <%= render "legacy_form",  f: f %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/subscriptions/index.html.erb

@@ -1,119 +1,119 @@
-<% if respond_to?(:admin_breadcrumb) %>
-  <% admin_breadcrumb(SolidusSubscriptions::Subscription.model_name.human) %>
-<% else %>
-  <% content_for(:page_title, SolidusSubscriptions::Subscription.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to t('.new_subscription'), new_admin_subscription_path %></li>
-<% end %>
-
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <%= search_form_for [:admin, @search] do |f| %>
-    <div class='field-block alpha four columns'>
-      <div class="date-range-filter field">
-        <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
-        <div class="date-range-fields">
-          <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', placeholder: Spree.t(:start) %>
-
-          <span class="range-divider">
-            <i class="fa fa-arrow-right"></i>
-          </span>
-
-          <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', placeholder: Spree.t(:stop) %>
-        </div>
-      </div>
-
-      <div class="date-range-filter field">
-        <%= label_tag :q_actionable_date_gt, SolidusSubscriptions::Subscription.human_attribute_name(:actionable_date) %>
-        <div class="date-range-fields">
-          <%= f.text_field :actionable_date_gt, class: 'datepicker datepicker-from', placeholder: Spree.t(:start) %>
-
-          <span class="range-divider">
-            <i class="fa fa-arrow-right"></i>
-          </span>
-
-          <%= f.text_field :actionable_date_lt, class: 'datepicker datepicker-to', placeholder: Spree.t(:stop) %>
-        </div>
-      </div>
-    </div>
-
-    <div class="four columns">
-      <div class="field">
-        <%= label_tag :q_state_eq, Spree.t(:status) %>
-        <%= f.select :state_eq, SolidusSubscriptions::Subscription.state_machines[:state].states.map {|s| [s.human_name, s.value]}, {include_blank: true}, class: 'select2 fullwidth' %>
-      </div>
-    </div>
-
-    <div class="four columns">
-      <div class="field">
-        <%= label_tag :q_user_email_cont, Spree::User.human_attribute_name(:email) %>
-        <%= f.text_field :user_email_cont, size: 25 %>
-      </div>
-    </div>
-
-    <div class="omega four columns">
-      <div class="field">
-        <%= label_tag :q_processing_state_eq, SolidusSubscriptions::Subscription.human_attribute_name(:processing_state) %>
-
-        <%
-          processing_states = SolidusSubscriptions::Subscription.processing_states.map do |state|
-            [
-              SolidusSubscriptions::Subscription.human_attribute_name("processing_state.#{ state }"),
-              state
-            ]
-          end
-        %>
-
-        <%=
-          f.select(
-            :in_processing_state,
-            options_for_select(processing_states),
-            { include_blank: true },
-            class: 'select2 fullwidth'
-          )
-        %>
-      </div>
-    </div>
-
-    <div class="clearfix"></div>
-
-    <div class="actions filter-actions">
-      <div><%= button Spree.t(:filter_results) %></div>
-    </div>
-  <% end %>
-<% end %>
-
-<% if Spree.respond_to?(:solidus_version) && (Spree.solidus_gem_version <=> Gem::Version.new('1.3.0')) >= 0  %>
-  <%= paginate @subscriptions, theme: 'solidus_admin' %>
-<% else %>
-  <%= paginate @subscriptions %>
-<% end %>
-
-<% if @subscriptions.any? %>
-  <table id="listing_subscriptions" class="index">
-    <thead>
-      <tr>
-        <th><%= sort_link(@search, :created_at, SolidusSubscriptions::Subscription.human_attribute_name(:created_at)) %></th>
-        <th><%= sort_link(@search, :user_email, SolidusSubscriptions::Subscription.human_attribute_name(:user)) %></th>
-        <th><%= sort_link(@search, :actionable_date, SolidusSubscriptions::Subscription.human_attribute_name(:actionable_date)) %></th>
-        <th><%= sort_link(@search, :line_item_interval_length, SolidusSubscriptions::Subscription.human_attribute_name(:interval)) %></th>
-        <th><%= sort_link(@search, :state, SolidusSubscriptions::Subscription.human_attribute_name(:state)) %></th>
-        <th><%= sort_link(@search, :processing_state, SolidusSubscriptions::Subscription.human_attribute_name(:processing_state)) %></th>
-        <th class='actions'></th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <%= render @subscriptions %>
-    </tbody>
-  </table>
-<% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= render 'spree/admin/shared/no_objects_found', resource: SolidusSubscriptions::Subscription, new_resource_url: spree.new_admin_subscription_path %>
-  </div>
-<% end %>
+<% if respond_to?(:admin_breadcrumb) %>
+  <% admin_breadcrumb(SolidusSubscriptions::Subscription.model_name.human) %>
+<% else %>
+  <% content_for(:page_title, SolidusSubscriptions::Subscription.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t('.new_subscription'), new_admin_subscription_path %></li>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= search_form_for [:admin, @search] do |f| %>
+    <div class='field-block alpha four columns'>
+      <div class="date-range-filter field">
+        <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+        <div class="date-range-fields">
+          <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', placeholder: Spree.t(:start) %>
+
+          <span class="range-divider">
+            <i class="fa fa-arrow-right"></i>
+          </span>
+
+          <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', placeholder: Spree.t(:stop) %>
+        </div>
+      </div>
+
+      <div class="date-range-filter field">
+        <%= label_tag :q_actionable_date_gt, SolidusSubscriptions::Subscription.human_attribute_name(:actionable_date) %>
+        <div class="date-range-fields">
+          <%= f.text_field :actionable_date_gt, class: 'datepicker datepicker-from', placeholder: Spree.t(:start) %>
+
+          <span class="range-divider">
+            <i class="fa fa-arrow-right"></i>
+          </span>
+
+          <%= f.text_field :actionable_date_lt, class: 'datepicker datepicker-to', placeholder: Spree.t(:stop) %>
+        </div>
+      </div>
+    </div>
+
+    <div class="four columns">
+      <div class="field">
+        <%= label_tag :q_state_eq, Spree.t(:status) %>
+        <%= f.select :state_eq, SolidusSubscriptions::Subscription.state_machines[:state].states.map {|s| [s.human_name, s.value]}, {include_blank: true}, class: 'select2 fullwidth' %>
+      </div>
+    </div>
+
+    <div class="four columns">
+      <div class="field">
+        <%= label_tag :q_user_email_cont, Spree::User.human_attribute_name(:email) %>
+        <%= f.text_field :user_email_cont, size: 25 %>
+      </div>
+    </div>
+
+    <div class="omega four columns">
+      <div class="field">
+        <%= label_tag :q_processing_state_eq, SolidusSubscriptions::Subscription.human_attribute_name(:processing_state) %>
+
+        <%
+          processing_states = SolidusSubscriptions::Subscription.processing_states.map do |state|
+            [
+              SolidusSubscriptions::Subscription.human_attribute_name("processing_state.#{ state }"),
+              state
+            ]
+          end
+        %>
+
+        <%=
+          f.select(
+            :in_processing_state,
+            options_for_select(processing_states),
+            { include_blank: true },
+            class: 'select2 fullwidth'
+          )
+        %>
+      </div>
+    </div>
+
+    <div class="clearfix"></div>
+
+    <div class="actions filter-actions">
+      <div><%= button Spree.t(:filter_results) %></div>
+    </div>
+  <% end %>
+<% end %>
+
+<% if Spree.respond_to?(:solidus_version) && (Spree.solidus_gem_version <=> Gem::Version.new('1.3.0')) >= 0  %>
+  <%= paginate @subscriptions, theme: 'solidus_admin' %>
+<% else %>
+  <%= paginate @subscriptions %>
+<% end %>
+
+<% if @subscriptions.any? %>
+  <table id="listing_subscriptions" class="index">
+    <thead>
+      <tr>
+        <th><%= sort_link(@search, :created_at, SolidusSubscriptions::Subscription.human_attribute_name(:created_at)) %></th>
+        <th><%= sort_link(@search, :user_email, SolidusSubscriptions::Subscription.human_attribute_name(:user)) %></th>
+        <th><%= sort_link(@search, :actionable_date, SolidusSubscriptions::Subscription.human_attribute_name(:actionable_date)) %></th>
+        <th><%= sort_link(@search, :line_item_interval_length, SolidusSubscriptions::Subscription.human_attribute_name(:interval)) %></th>
+        <th><%= sort_link(@search, :state, SolidusSubscriptions::Subscription.human_attribute_name(:state)) %></th>
+        <th><%= sort_link(@search, :processing_state, SolidusSubscriptions::Subscription.human_attribute_name(:processing_state)) %></th>
+        <th class='actions'></th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <%= render @subscriptions %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found', resource: SolidusSubscriptions::Subscription, new_resource_url: spree.new_admin_subscription_path %>
+  </div>
+<% end %>

data/app/views/spree/admin/subscriptions/new.html.erb

@@ -1,9 +1,9 @@
-<% content_for(:page_title) { t('.title') } %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to t('.back'), admin_subscriptions_path %></li>
-<% end %>
-
-<%= form_for @subscription, url: spree.admin_subscriptions_url, class: "row" do |f| %>
-  <%= render "form", f: f, new: true %>
-<% end %>
+<% content_for(:page_title) { t('.title') } %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t('.back'), admin_subscriptions_path %></li>
+<% end %>
+
+<%= form_for @subscription, url: spree.admin_subscriptions_url, class: "row" do |f| %>
+  <%= render "form", f: f, new: true %>
+<% end %>

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

@@ -1,6 +1,6 @@
-<div class="field four columns checkbox" data-hook="subscribable">
-  <%= f.label :subscribable do %>
-    <%= f.check_box :subscribable %>
-    <%= Spree::Variant.human_attribute_name(:subscribable) %>
-  <% end %>
-</div>
+<div class="field four columns checkbox" data-hook="subscribable">
+  <%= f.label :subscribable do %>
+    <%= f.check_box :subscribable %>
+    <%= Spree::Variant.human_attribute_name(:subscribable) %>
+  <% end %>
+</div>

data/app/views/spree/frontend/products/_subscription_line_item_fields.html.erb

@@ -1,30 +1,30 @@
-<%= content_tag :h3, t('.subscription_fields') %>
-<%= fields_for :'subscription_line_item', SolidusSubscriptions::LineItem.new do |ff| %>
-  <div>
-    <%= ff.label :quantity, t('.quantity') %>
-    <%= ff.number_field :quantity %>
-    <%= ff.label :quantity, t('.quantity_suffix') %>
-  </div>
-
-  <div>
-    <%= ff.label :interval_length, t('.interval_length') %>
-    <%= ff.number_field :interval_length %>
-
-    <%= ff.collection_radio_buttons :interval_units, SolidusSubscriptions::LineItem.interval_units.to_a, :first, :first %>
-  </div>
-
-  <%= ff.hidden_field :subscribable_id %>
-<% end %>
-
-<script>
-  document.addEventListener("DOMContentLoaded", function(e) {
-    var cartForm = document.querySelector('#cart-form form');
-    cartForm.addEventListener('submit', function(e) {
-      var quantityInput = e.target.querySelector('[name*="quantity"]');
-      var subscriptionQuantityInput = e.target.querySelector('[name*="subscribable_id"]');
-
-      subscriptionQuantityInput.value = quantityInput.value;
-      return true;
-    });
-  });
-</script>
+<%= content_tag :h3, t('.subscription_fields') %>
+<%= fields_for :'subscription_line_item', SolidusSubscriptions::LineItem.new do |ff| %>
+  <div>
+    <%= ff.label :quantity, t('.quantity') %>
+    <%= ff.number_field :quantity %>
+    <%= ff.label :quantity, t('.quantity_suffix') %>
+  </div>
+
+  <div>
+    <%= ff.label :interval_length, t('.interval_length') %>
+    <%= ff.number_field :interval_length %>
+
+    <%= ff.collection_radio_buttons :interval_units, SolidusSubscriptions::LineItem.interval_units.to_a, :first, :first %>
+  </div>
+
+  <%= ff.hidden_field :subscribable_id %>
+<% end %>
+
+<script>
+  document.addEventListener("DOMContentLoaded", function(e) {
+    var cartForm = document.querySelector('#cart-form form');
+    cartForm.addEventListener('submit', function(e) {
+      var quantityInput = e.target.querySelector('[name*="quantity"]');
+      var subscriptionQuantityInput = e.target.querySelector('[name*="subscribable_id"]');
+
+      subscriptionQuantityInput.value = quantityInput.value;
+      return true;
+    });
+  });
+</script>

data/config/locales/en.yml

@@ -1,91 +1,91 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-en:
-  time:
-    formats:
-      human:
-  solidus_subscriptions:
-    subscription:
-      actionable_date: "Actionable Date"
-    installment_details:
-      out_of_stock: >
-        This installment could not be processed because of insufficient
-        stock.
-      success: This installment has been processed successfully!
-      failed: This installment could not be processed
-      payment_failed: The payment for this installment failed
-
-  spree:
-    new_subscription: New Subscription
-    admin:
-      solidus_subscriptions:
-        subscriptions:
-          subscription:
-            cancel: Cancel
-            cancel_alert: "Are you sure you want to cancel this subscription?"
-            activate: Activate
-            skip: Skip One
-
-      subscriptions:
-        successfully_canceled: Subsciption Canceled!
-        successfully_activated: Subsciption Activated!
-        successfully_skipped: Subsciption delayed until %{date}
-        index:
-          new_subscription: New Subscription
-        edit:
-          back: Back to Subscriptions List
-          title: Edit a Susbcription
-          customer: Customer
-          status: Status
-          fulfillment_status: Fulfillment Status
-          revenue: Revenue
-          interval: Interval
-        new:
-          back: Back to Subscriptions List
-          title: Create a Susbcription
-        form:
-          subscription: Subscription
-          subscription_line_item: Subscription Line Item
-      tab:
-        subscriptions: Subscriptions
-    promotion_rule_types:
-      subscription_promotion_rule:
-        name: Subscription
-        description: Order contains a subscription
-      subscription_order_promotion_rule:
-        name: Subscription Order
-        description: Order fulfills a subscription
-
-    products:
-      cart_form:
-        quantity: I want
-        quantity_suffix: items
-        interval_length: every
-        subscription_fields: Subscription Settings
-
-  activerecord:
-    attributes:
-      solidus_subscriptions/line_item/interval_units:
-        day: Days
-        week: Weeks
-        month: Months
-        year: Years
-      solidus_subscriptions/subscription/processing_state:
-        pending: new
-        success: success
-        failed: failure
-
-    errors:
-      models:
-        solidus_subscriptions/subscription:
-          attributes:
-            successive_skip_count:
-              exceeded: >
-                This subscription has exceeded the maximum configured successive
-                skip limit. It can be skipped again after the next time it is
-                processed.
-            skip_count:
-              exceeded: >
-                This subscription has exceeded the maximum configured skip
-                limit. It can no longer be skipped.
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  time:
+    formats:
+      human:
+  solidus_subscriptions:
+    subscription:
+      actionable_date: "Actionable Date"
+    installment_details:
+      out_of_stock: >
+        This installment could not be processed because of insufficient
+        stock.
+      success: This installment has been processed successfully!
+      failed: This installment could not be processed
+      payment_failed: The payment for this installment failed
+
+  spree:
+    new_subscription: New Subscription
+    admin:
+      solidus_subscriptions:
+        subscriptions:
+          subscription:
+            cancel: Cancel
+            cancel_alert: "Are you sure you want to cancel this subscription?"
+            activate: Activate
+            skip: Skip One
+
+      subscriptions:
+        successfully_canceled: Subsciption Canceled!
+        successfully_activated: Subsciption Activated!
+        successfully_skipped: Subsciption delayed until %{date}
+        index:
+          new_subscription: New Subscription
+        edit:
+          back: Back to Subscriptions List
+          title: Edit a Susbcription
+          customer: Customer
+          status: Status
+          fulfillment_status: Fulfillment Status
+          revenue: Revenue
+          interval: Interval
+        new:
+          back: Back to Subscriptions List
+          title: Create a Susbcription
+        form:
+          subscription: Subscription
+          subscription_line_item: Subscription Line Item
+      tab:
+        subscriptions: Subscriptions
+    promotion_rule_types:
+      subscription_promotion_rule:
+        name: Subscription
+        description: Order contains a subscription
+      subscription_order_promotion_rule:
+        name: Subscription Order
+        description: Order fulfills a subscription
+
+    products:
+      cart_form:
+        quantity: I want
+        quantity_suffix: items
+        interval_length: every
+        subscription_fields: Subscription Settings
+
+  activerecord:
+    attributes:
+      solidus_subscriptions/line_item/interval_units:
+        day: Days
+        week: Weeks
+        month: Months
+        year: Years
+      solidus_subscriptions/subscription/processing_state:
+        pending: new
+        success: success
+        failed: failure
+
+    errors:
+      models:
+        solidus_subscriptions/subscription:
+          attributes:
+            successive_skip_count:
+              exceeded: >
+                This subscription has exceeded the maximum configured successive
+                skip limit. It can be skipped again after the next time it is
+                processed.
+            skip_count:
+              exceeded: >
+                This subscription has exceeded the maximum configured skip
+                limit. It can no longer be skipped.