solidus_volume_pricing 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a603c2351c842b0e767b8bf7cb8a27043aa28e0
-  data.tar.gz: 88d8cef36d7438bbf0d92d2784c57b87d4da8e8a
+  metadata.gz: cc2065e7c371b9b0fdb810869dfe6110453d71cc
+  data.tar.gz: d04e9190e63cafe768e97125211af4feaed38c82
 SHA512:
-  metadata.gz: ba402358ed234e73ebc686aec2a111fb173643911a9e1b7b32949ef20dc8ea1f8b95972214e622d5df0d0ae4a727506786c4cd5d222e713df1bba26a5503c309
-  data.tar.gz: 8e636f41d105ffe1c043b9c19cec4c829f664c4626758e2e073440b76f31fc85e719fb105e9ff736ab70670e711b470dc9952d838ecb88c2ce8e846db6c79566
+  metadata.gz: bf2f072e4dcd0b14bdb04534d4008466a43fd53d0371653dfe2e23230a2d5a1117e797d4af456ffc78f0243f9f99be934cf7c8355d2b09563fcbe9f0b45ba824
+  data.tar.gz: 929c3db05f9bde8f69bd1f1c106d068656d3900461a253b692cb045d990d302b072c3c7b93573fc9498fc4f82d64e8c97a5595c881a9f526e89467306c2f8fe6

data/app/assets/stylesheets/spree/backend/solidus_volume_pricing.css

@@ -0,0 +1,3 @@
+/*
+ *= require spree/backend
+*/

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

@@ -3,11 +3,6 @@ module Spree
     class VolumePriceModelsController < ResourceController
 
       before_action :load_volume_prices, only: [:new, :edit]
-      respond_to :json, only: [:get_children]
-
-      def get_children
-        @volume_prices = VolumePrice.find(params[:parent_id]).children
-      end
 
       private
 

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

@@ -24,7 +24,7 @@
     </thead>
     <tbody id="volume_prices">
       <%= f.fields_for :volume_prices do |vp_form| %>
-      <%= render partial: 'spree/admin/volume_prices/volume_price_fields', locals: { f: vp_form } %>
+        <%= render partial: 'spree/admin/volume_prices/volume_price_fields', locals: { f: vp_form } %>
       <% end %>
     </tbody>
     <tbody id="volume_price_models">

data/app/views/spree/admin/volume_prices/_edit_fields.html.erb

@@ -19,7 +19,7 @@
       <th><%= Spree.t(:amount) %></th>
       <th><%= Spree.t(:position) %></th>
       <th><%= Spree.t(:role) %></th>
-      <th><%= Spree.t(:action) %></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody id="volume_prices">

data/app/views/spree/admin/volume_prices/_volume_price_fields.html.erb

@@ -9,7 +9,7 @@
         ["#{Spree.t(:total_price)}", 'price'],
         ["#{Spree.t(:percent_discount)}", 'percent'],
         ["#{Spree.t(:price_discount)}", 'dollar']
-      ], { inlcude_blank: true }, class: 'select2' %>
+      ], { include_blank: true }, class: 'select2' %>
   </td>
   <td>
     <%= error_message_on(f.object, :range) %>
@@ -28,6 +28,6 @@
     <%= f.collection_select(:role_id, Spree::Role.all, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
   </td>
   <td class="actions">
-    <%= link_to_icon_remove_fields f %>
+    <%= link_to_remove_fields Spree.t(:remove), f, no_text: true %>
   </td>
 </tr>

data/lib/solidus_volume_pricing/version.rb

@@ -10,7 +10,7 @@ module SolidusVolumePricing
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/features/manage_volume_price_models_feature_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+RSpec.feature 'Managing volume price models' do
+  stub_authorization!
+
+  scenario 'a admin can create and remove volume price models', :js do
+    visit spree.admin_volume_price_models_path
+    expect(page).to have_content('Volume Price Models')
+
+    click_on 'New Volume Price Model'
+    fill_in 'Name', with: 'Discount'
+    within '#volume_prices' do
+      fill_in 'volume_price_model_volume_prices_attributes_0_name', with: '5 pieces discount'
+      select 'Total price', from: 'volume_price_model_volume_prices_attributes_0_discount_type'
+      fill_in 'volume_price_model_volume_prices_attributes_0_range', with: '1..5'
+      fill_in 'volume_price_model_volume_prices_attributes_0_amount', with: '1'
+    end
+    click_on 'Create'
+
+    within 'tr.volume_price.fields' do
+      expect(page).to have_field('volume_price_model_volume_prices_attributes_0_name', with: '5 pieces discount')
+      page.find('a[data-action="remove"]').click
+      expect(page).to_not have_field('volume_price_model_volume_prices_attributes_0_name', with: '5 pieces discount')
+    end
+  end
+end

data/spec/features/manage_volume_prices_feature_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.feature 'Managing volume prices' do
+  stub_authorization!
+
+  let(:variant) { create(:variant) }
+
+  scenario 'a admin can create and remove volume prices', :js do
+    visit spree.edit_admin_product_path(variant.product)
+    click_on 'Volume Pricing'
+    expect(page).to have_content('Volume Prices')
+
+    fill_in 'variant_volume_prices_attributes_0_name', with: '5 pieces discount'
+    select 'Total price', from: 'variant_volume_prices_attributes_0_discount_type'
+    fill_in 'variant_volume_prices_attributes_0_range', with: '1..5'
+    fill_in 'variant_volume_prices_attributes_0_amount', with: '1'
+    click_on 'Update'
+
+    within 'tr.volume_price.fields' do
+      expect(page).to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
+      page.find('a[data-action="remove"]').click
+      expect(page).to_not have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
+    end
+  end
+
+  scenario 'a admin editing a variant has a new volume price already built for her' do
+    visit spree.edit_admin_product_variant_path(product_id: variant.product, id: variant)
+    within '#volume_prices' do
+      expect(page).to have_field('variant_volume_prices_attributes_0_name')
+    end
+  end
+end

data/spec/support/database_cleaner.rb

@@ -2,23 +2,20 @@ require 'database_cleaner'
 
 RSpec.configure do |config|
 
-  config.before(:suite) do
+  config.before :suite do
     DatabaseCleaner.clean_with :truncation
   end
 
-  config.before do
-    DatabaseCleaner.strategy = :transaction
-  end
-
-  config.before(:each, :js) do
-    DatabaseCleaner.strategy = :truncation
-  end
-
-  config.before do
+  config.prepend_before(:each) do
+    if RSpec.current_example.metadata[:js]
+      DatabaseCleaner.strategy = :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
     DatabaseCleaner.start
   end
 
-  config.after do
+  config.append_after(:each) do
     DatabaseCleaner.clean
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_volume_pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -244,6 +244,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/backend/solidus_volume_pricing.js
+- app/assets/stylesheets/spree/backend/solidus_volume_pricing.css
 - app/controllers/spree/admin/variants_controller_decorator.rb
 - app/controllers/spree/admin/volume_price_models_controller.rb
 - app/controllers/spree/admin/volume_prices_controller.rb
@@ -287,6 +288,8 @@ files:
 - solidus_volume_pricing.gemspec
 - spec/controllers/spree/admin/variants_controller_spec.rb
 - spec/factories/volume_price_factory.rb
+- spec/features/manage_volume_price_models_feature_spec.rb
+- spec/features/manage_volume_prices_feature_spec.rb
 - spec/helpers/base_helper_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
@@ -325,6 +328,8 @@ summary: Allow prices to be configured in quantity ranges for each variant
 test_files:
 - spec/controllers/spree/admin/variants_controller_spec.rb
 - spec/factories/volume_price_factory.rb
+- spec/features/manage_volume_price_models_feature_spec.rb
+- spec/features/manage_volume_prices_feature_spec.rb
 - spec/helpers/base_helper_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb