solidus_subscription_boxes 0.0.4 → 0.0.5

data/app/views/solidus_subscription_boxes/subscription_boxes/_manage.html.erb

@@ -1,40 +1,40 @@
-<% @user.subscriptions.where(state: 'active').each do |subscription| %>
-  <div class="manage-subscription">
-		<h2>My Next Order (<span class="actionable-date-update"><%= subscription.actionable_date.strftime("%B %d")  %></span>)</h2>
-		<div class="row">
-      <div class="col-xs-12 col-md-8">
-        <%= form_with url: "/api/v1/subscriptions/#{subscription.id}", method: 'put', class: 'menu meal-selector' do |form| %>
-          <%= hidden_field_tag(:token, @user.spree_api_key) %>
-          <%= render partial: 'solidus_subscription_boxes/subscription_boxes/box_variants',
-            locals: {
-              box_variants: SolidusSubscriptionBoxes::SubscriptionPeriod.period_for_date(subscription.actionable_date).variants,
-              preference_scope: "subscription[box_preference_attributes][preference][]",
-              preferable: subscription
-            }
-          %>
-          <div class="row">
-            <div class="col-xs-12 content text-center">
-              <%= form.submit 'Update My Order', class: "btn btn-primary btn-large purchase-link meal-update" %>
-            </div>
-          </div>
-        <% end %>
-      </div>
-      <div class="col-xs-12 col-md-4">
-        <div class="row">
-          <div class="col-xs-12 content text-center">
-            <%= form_with url: "/api/v1/subscriptions/#{subscription.id}/skip", class: 'menu' do |form| %>
-              <%= hidden_field_tag(:token, @user.spree_api_key) %>
-              <%= form.submit 'Skip My Next Order', class: "btn btn-primary btn-large purchase-link" %>
-            <% end %>
-          </div>
-          <div class="col-xs-12 content text-center">
-            <%= form_with url: "/api/v1/subscriptions/#{subscription.id}/cancel", class: 'menu' do |form| %>
-              <%= hidden_field_tag(:token, @user.spree_api_key) %>
-              <%= form.submit 'Cancel', class: "btn btn-primary btn-large purchase-link" %>
-            <% end %>
-          </div>
-        </div>
-      </div>
-    </div>
-	</div>
+<% @user.subscriptions.where(state: 'active').each do |subscription| %>
+  <div class="manage-subscription">
+		<h2>My Next Order (<span class="actionable-date-update"><%= subscription.actionable_date.strftime("%B %d")  %></span>)</h2>
+		<div class="row">
+      <div class="col-xs-12 col-md-8">
+        <%= form_with url: "/api/v1/subscriptions/#{subscription.id}", method: 'put', class: 'menu meal-selector' do |form| %>
+          <%= hidden_field_tag(:token, @user.spree_api_key) %>
+          <%= render partial: 'solidus_subscription_boxes/subscription_boxes/box_variants',
+            locals: {
+              box_variants: SolidusSubscriptionBoxes::SubscriptionPeriod.period_for_date(subscription.actionable_date).variants,
+              preference_scope: "subscription[box_preference_attributes][preference][]",
+              preferable: subscription
+            }
+          %>
+          <div class="row">
+            <div class="col-xs-12 content text-center">
+              <%= form.submit 'Update My Order', class: "btn btn-primary btn-large purchase-link meal-update" %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+      <div class="col-xs-12 col-md-4">
+        <div class="row">
+          <div class="col-xs-12 content text-center">
+            <%= form_with url: "/api/v1/subscriptions/#{subscription.id}/skip", class: 'menu' do |form| %>
+              <%= hidden_field_tag(:token, @user.spree_api_key) %>
+              <%= form.submit 'Skip My Next Order', class: "btn btn-primary btn-large purchase-link" %>
+            <% end %>
+          </div>
+          <div class="col-xs-12 content text-center">
+            <%= form_with url: "/api/v1/subscriptions/#{subscription.id}/cancel", class: 'menu' do |form| %>
+              <%= hidden_field_tag(:token, @user.spree_api_key) %>
+              <%= form.submit 'Cancel', class: "btn btn-primary btn-large purchase-link" %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+	</div>
 <% end %>

data/app/views/solidus_subscription_boxes/subscription_boxes/get_started.html.erb

@@ -1,44 +1,52 @@
-<div class="container-fluid">
-  <section class="how-it-works">
-    <div class="row text-center how-it-works background-grey">
-      <h1>Here's How It Works</h1>
-      <div class="col-xs-12 col-sm-3">
-        <h2 class="statistic">3</h2>
-        <h4>Delicious vegetarian lunches delivered every week</h4>
-      </div>
-      <div class="col-xs-12 col-sm-3 border-right">
-        <h2 class="statistic">Sunday</h2>
-        <h4>Food shows up at your door</h4>
-      </div>
-      <div class="col-xs-12 col-sm-3 border-right">
-        <h2 class="statistic">$36</h2>
-        <h4>Paid Weekly<h4>
-      </div>
-      <div class="col-xs-12 col-sm-3 border-right">
-        <h2 class="statistic">20</h2>
-        <h4>Pounds of greenhouse emissions potentially saved every week</h4>
-      </div>
-    </div>
-  </section>
-</div>
-
-<div class="menu">
-  <h1 class="text-center">Select your first three meals</h1>
-  <div>
-    <%= form_for :order, url: '/orders/populate' do |f| %>
-      <%= render partial: 'box_variants', locals: {box_variants: @box_variants, preference_scope: "box_preference_attributes[preference][]", preferable: f.object} %>
-      <div class="row">
-        <div class="col-xs-12 content text-center">
-          <%= hidden_field_tag :variant_id,  @variant.id %>
-          <%= hidden_field_tag :quantity, 1 %>
-          <%= hidden_field_tag :'subscription_line_item[quantity]', 1 %>
-          <%= hidden_field_tag :'subscription_line_item[subscribable_id]', 1 %>
-          <%= hidden_field_tag :'subscription_line_item[interval_length]', 1 %>
-          <%= hidden_field_tag :'subscription_line_item[interval_units]', 'week' %>
-          <%= f.submit 'Choose 3 More', onclick: "window.dataLayer.push({event: 'click', clickAction:'selectorPurchase'})", class: "btn btn-primary btn-large purchase-link meal-update", disabled: 'disabled', :'data-disable-with' => 'Submitting...' %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
+<div class="container-fluid bg-jumbotron mb-5">
+  <section class="how-it-works">
+    <div class="row text-center how-it-works background-grey">
+      <div class="col-12 pt-4 pb-4">
+        <h1 class="font-weight-bold">Here's How It Works</h1>
+      </div>
+      <div class="col-12 col-sm">
+        <h2 class="statistic">3 meals</h2>
+        <h5>pick your meals each week</h4>
+      </div>
+      <span class="chevron right"></span>
+      <div class="col-12 col-sm">
+        <h2 class="statistic">$36</h2>
+        <h4>per week<h4>
+        <h5 class="font-weight-bold font-italic">Shipping is FREE</h4>
+      </div>
+      <span class="chevron right"></span>
+      <div class="col-12 col-sm">
+        <h2 class="statistic">Sunday</h2>
+        <h5>Delivered to your door</h4>
+      </div>
+      <span class="chevron right"></span>
+      <div class="col-12 col-sm">
+        <h2 class="statistic">NO</h2>
+        <h4 class="font-weight-bold">COMMITMENTS</h3>
+        <h5>cancel anytime, online</h4>
+      </div>
+    </div>
+  </section>
+</div>
+
+<div class="menu">
+  <h2 class="text-center">Choose Your First Three Meals</h2>
+  <h4 class="text-center">We update the menu seasonally to use the freshest ingredients</h4>
+  <div class="pt-5">
+    <%= form_for :order, url: '/orders/populate' do |f| %>
+      <%= render partial: 'box_variants', locals: {box_variants: @box_variants, preference_scope: "box_preference_attributes[preference][]", preferable: f.object} %>
+      <div class="row mt-5">
+        <div class="col-12 content text-center">
+          <%= hidden_field_tag :variant_id,  @variant.id %>
+          <%= hidden_field_tag :quantity, 1 %>
+          <%= hidden_field_tag :'subscription_line_item[quantity]', 1 %>
+          <%= hidden_field_tag :'subscription_line_item[subscribable_id]', 1 %>
+          <%= hidden_field_tag :'subscription_line_item[interval_length]', 1 %>
+          <%= hidden_field_tag :'subscription_line_item[interval_units]', 'week' %>
+          <%= f.submit 'Choose 3 More', onclick: "window.dataLayer.push({event: 'click', clickAction:'selectorPurchase'})", class: "btn btn-primary btn-lg purchase-link meal-update", disabled: 'disabled', :'data-disable-with' => 'Submitting...' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+

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

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

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

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

data/config/routes.rb

@@ -1,4 +1,4 @@
-SolidusSubscriptionBoxes::Engine.routes.draw do
-  mount SolidusSubscriptions::Engine, at: '/'
-  get '/get-started/:product_id' => 'subscription_boxes#get_started'
-end
+SolidusSubscriptionBoxes::Engine.routes.draw do
+  mount SolidusSubscriptions::Engine, at: '/'
+  get '/get-started/:product_id' => 'subscription_boxes#get_started'
+end

data/db/migrate/20170609065436_create_solidus_subscription_boxes_box_preferences.rb

@@ -1,10 +1,10 @@
-class CreateSolidusSubscriptionBoxesBoxPreferences < ActiveRecord::Migration[5.0]
-  def change
-    create_table :solidus_subscription_boxes_box_preferences do |t|
-      t.json :preference
-      t.references :preferable, polymorphic: true, index: { name: 'subscription_box_preferable' }
-
-      t.timestamps
-    end
-  end
-end
+class CreateSolidusSubscriptionBoxesBoxPreferences < ActiveRecord::Migration[5.0]
+  def change
+    create_table :solidus_subscription_boxes_box_preferences do |t|
+      t.json :preference
+      t.references :preferable, polymorphic: true, index: { name: 'subscription_box_preferable' }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170906015531_create_solidus_subscription_boxes_subscription_periods.rb

@@ -1,9 +1,9 @@
-class CreateSolidusSubscriptionBoxesSubscriptionPeriods < ActiveRecord::Migration[5.1]
-  def change
-    create_table :solidus_subscription_boxes_subscription_periods do |t|
-      t.date :start_date
-
-      t.timestamps
-    end
-  end
-end
+class CreateSolidusSubscriptionBoxesSubscriptionPeriods < ActiveRecord::Migration[5.1]
+  def change
+    create_table :solidus_subscription_boxes_subscription_periods do |t|
+      t.date :start_date
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170906021159_create_solidus_subscription_boxes_subscription_periods_variants.rb

@@ -1,10 +1,10 @@
-class CreateSolidusSubscriptionBoxesSubscriptionPeriodsVariants < ActiveRecord::Migration[5.1]
-  def change
-    create_table :solidus_subscription_boxes_subscription_periods_variants do |t|
-      t.references :spree_variant, foreign_key: true, index: {name: 'subscription_box_period_variant'}
-      t.references :solidus_subscription_boxes_subscription_period, foreign_key: true, index: {name: 'subscription_box_period_period'}
-
-      t.timestamps
-    end
-  end
-end
+class CreateSolidusSubscriptionBoxesSubscriptionPeriodsVariants < ActiveRecord::Migration[5.1]
+  def change
+    create_table :solidus_subscription_boxes_subscription_periods_variants do |t|
+      t.references :spree_variant, foreign_key: true, index: {name: 'subscription_box_period_variant'}
+      t.references :solidus_subscription_boxes_subscription_period, foreign_key: true, index: {name: 'subscription_box_period_period'}
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170919054537_add_boxable_to_spree_variants.rb

@@ -1,5 +1,5 @@
-class AddBoxableToSpreeVariants < ActiveRecord::Migration[5.1]
-  def change
-    add_column :spree_variants, :boxable, :boolean
-  end
-end
+class AddBoxableToSpreeVariants < ActiveRecord::Migration[5.1]
+  def change
+    add_column :spree_variants, :boxable, :boolean
+  end
+end

data/db/migrate/20170919063437_add_boxable_variant_id_to_solidus_subscription_boxes_subscription_periods.rb

@@ -1,5 +1,5 @@
-class AddBoxableVariantIdToSolidusSubscriptionBoxesSubscriptionPeriods < ActiveRecord::Migration[5.1]
-  def change
-    add_column :solidus_subscription_boxes_subscription_periods, :boxable_variant_id, :integer
-  end
-end
+class AddBoxableVariantIdToSolidusSubscriptionBoxesSubscriptionPeriods < ActiveRecord::Migration[5.1]
+  def change
+    add_column :solidus_subscription_boxes_subscription_periods, :boxable_variant_id, :integer
+  end
+end

data/lib/solidus_subscription_boxes.rb

@@ -1,4 +1,4 @@
-require "solidus_subscription_boxes/engine"
-
-module SolidusSubscriptionBoxes
-end
+require "solidus_subscription_boxes/engine"
+
+module SolidusSubscriptionBoxes
+end

data/lib/solidus_subscription_boxes/engine.rb

@@ -1,13 +1,13 @@
-module SolidusSubscriptionBoxes
-  class Engine < ::Rails::Engine
-    isolate_namespace SolidusSubscriptionBoxes
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/decorators/**/*.rb')) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.to_prepare(&method(:activate).to_proc)
-  end
-end
+module SolidusSubscriptionBoxes
+  class Engine < ::Rails::Engine
+    isolate_namespace SolidusSubscriptionBoxes
+
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/decorators/**/*.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+    end
+
+    config.to_prepare(&method(:activate).to_proc)
+  end
+end

data/lib/solidus_subscription_boxes/version.rb

@@ -1,3 +1,3 @@
-module SolidusSubscriptionBoxes
-  VERSION = '0.0.4'
-end
+module SolidusSubscriptionBoxes
+  VERSION = '0.0.5'
+end

data/lib/tasks/solidus_subscription_boxes_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :solidus_subscription_boxes do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :solidus_subscription_boxes do
+#   # Task goes here
+# end

data/test/integration/navigation_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
-
-class NavigationTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
-end
-
+require 'test_helper'
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end
+

data/test/solidus_subscription_boxes_test.rb

@@ -1,7 +1,7 @@
-require 'test_helper'
-
-class SolidusSubscriptionBoxesTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, SolidusSubscriptionBoxes
-  end
-end
+require 'test_helper'
+
+class SolidusSubscriptionBoxesTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, SolidusSubscriptionBoxes
+  end
+end

data/test/test_helper.rb

@@ -1,21 +1,21 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
-require "rails/test_help"
-
-# Filter out Minitest backtrace while allowing backtrace from other libraries
-# to be shown.
-Minitest.backtrace_filter = Minitest::BacktraceFilter.new
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
-  ActiveSupport::TestCase.fixtures :all
-end
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
+ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
+require "rails/test_help"
+
+# Filter out Minitest backtrace while allowing backtrace from other libraries
+# to be shown.
+Minitest.backtrace_filter = Minitest::BacktraceFilter.new
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.respond_to?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+  ActiveSupport::TestCase.fixtures :all
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_subscription_boxes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joel Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Add subscription box support to Solidus