solidus_volume_pricing 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc2065e7c371b9b0fdb810869dfe6110453d71cc
-  data.tar.gz: d04e9190e63cafe768e97125211af4feaed38c82
+  metadata.gz: 1ab65d3e0219f88f5090273cae51341342455fbd
+  data.tar.gz: b410f7e09e809081651efa63c0815c0a386c3da9
 SHA512:
-  metadata.gz: bf2f072e4dcd0b14bdb04534d4008466a43fd53d0371653dfe2e23230a2d5a1117e797d4af456ffc78f0243f9f99be934cf7c8355d2b09563fcbe9f0b45ba824
-  data.tar.gz: 929c3db05f9bde8f69bd1f1c106d068656d3900461a253b692cb045d990d302b072c3c7b93573fc9498fc4f82d64e8c97a5595c881a9f526e89467306c2f8fe6
+  metadata.gz: eda5105921410138eb449b40605487fef91711b773b1b208349a7598bf48a662477c6ccb83baba53cd3d6853c580f5dec6204e113a0582ca2905c155f9fc0f47
+  data.tar.gz: 0dfdc9b4cbc45a51791ef82a09453b1acfc4a9ead09d0d16e91f2033315cd97d930fdeb320e3823f6eae6e55eca60d902d1ac19a74d309f0791477a185bad3f2

data/.travis.yml

@@ -6,9 +6,7 @@ cache: bundler
 only: master
 env:
   matrix:
-    - SOLIDUS_BRANCH=v1.0 DB=mysql
-    - SOLIDUS_BRANCH=v1.0 DB=postgresql
-    - SOLIDUS_BRANCH=v1.1 DB=mysql
-    - SOLIDUS_BRANCH=v1.1 DB=postgresql
-    - SOLIDUS_BRANCH=v1.2 DB=mysql
-    - SOLIDUS_BRANCH=v1.2 DB=postgresql
+    - SOLIDUS_BRANCH=v1.3 DB=mysql
+    - SOLIDUS_BRANCH=v1.3 DB=postgresql
+    - SOLIDUS_BRANCH=v1.4 DB=mysql
+    - SOLIDUS_BRANCH=v1.4 DB=postgresql

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'v1.2')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'v1.3')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
 case ENV['DB']

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

@@ -3,6 +3,11 @@ 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/models/spree/line_item_decorator.rb

@@ -1,27 +1,13 @@
-Spree::LineItem.class_eval do
-  # pattern grabbed from: http://stackoverflow.com/questions/4470108/
+module Spree
+  module LineItemPriceUpdater
+    def set_pricing_attributes
+      super
 
-  # the idea here is compatibility with spree_sale_products
-  # trying to create a 'calculation stack' wherein the best valid price is
-  # chosen for the product. This is mainly for compatibility with spree_sale_products
-  #
-  # Assumption here is that the volume price currency is the same as the product currency
-  old_copy_price = instance_method(:copy_price)
-  define_method(:copy_price) do
-    old_copy_price.bind(self).call
-    return unless variant
-
-    if variant
-      if changed? && changes.keys.include?('quantity')
-        vprice = variant.volume_price(quantity, order.user)
-        if price.present? && vprice <= variant.price
-          self.price = vprice and return
-        end
+      if quantity_changed?
+        self.price = variant.volume_price(quantity, order.user)
       end
-
-      self.price = variant.price if price.nil?
     end
-
-    self.price = variant.price if price.nil?
   end
 end
+
+Spree::LineItem.prepend(Spree::LineItemPriceUpdater)

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 class="actions"></th>
+      <th><%= Spree.t(:action) %></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']
-      ], { include_blank: true }, class: 'select2' %>
+      ], { inlcude_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_remove_fields Spree.t(:remove), f, no_text: true %>
+    <%= link_to_icon_remove_fields f %>
   </td>
 </tr>

data/lib/solidus_volume_pricing/version.rb

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

data/solidus_volume_pricing.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_runtime_dependency 'solidus_core', '~> 1.0', '< 1.3'
+  s.add_runtime_dependency 'solidus_core', '~> 1.3'
   s.add_runtime_dependency 'deface', '~> 1.0'
 
   s.add_development_dependency 'sqlite3', '>= 1.3.10'

data/spec/support/database_cleaner.rb

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

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: solidus_volume_pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -244,7 +238,6 @@ 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
@@ -288,8 +281,6 @@ 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
@@ -328,8 +319,6 @@ 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

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

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

data/spec/features/manage_volume_price_models_feature_spec.rb

@@ -1,26 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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