solidus_volume_pricing 0.2.1 → 1.1.0

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

@@ -6,10 +6,10 @@
   <td>
     <%= error_message_on(f.object, :discount_type) %>
     <%= f.select :discount_type, [
-        ["#{Spree.t(:total_price)}", 'price'],
-        ["#{Spree.t(:percent_discount)}", 'percent'],
-        ["#{Spree.t(:price_discount)}", 'dollar']
-      ], { include_blank: true }, class: 'select2' %>
+        [t('spree.total_price'), 'price'],
+        [t('spree.percent_discount'), 'percent'],
+        [t('spree.price_discount'), 'dollar']
+      ], { include_blank: true }, class: 'custom-select' %>
   </td>
   <td>
     <%= error_message_on(f.object, :range) %>
@@ -25,9 +25,11 @@
   </td>
   <td>
     <%= error_message_on(f.object, :role_id) %>
-    <%= 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 %>
+    <%= f.collection_select(:role_id, Spree::Role.all, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' }) %>
   </td>
+  <% if f.object.persisted? %>
+    <td class="actions">
+      <%= link_to_delete f.object, url: admin_volume_price_url(f.object.id), no_text: true %>
+    </td>
+  <% end %>
 </tr>

data/app/views/spree/products/_volume_pricing.html.erb

@@ -1,15 +1,15 @@
 <% display_percent ||= false %>
 <% if product.price > 0 and product.master.volume_prices.present? %>
   <div id="bulk-discount">
-    <h6><%= Spree.t(:bulk_discount) %></h6>
+    <h6><%= t('spree.bulk_discount') %></h6>
     <table class="table">
-    	<% product.master.volume_prices.each do |v| %>
-      	<%= content_tag(:tr) do %>
-        	<%= content_tag :td, (v.open_ended? ? v.range : "#{v.range.to_range.begin}–#{v.range.to_range.end}") %>
-        	<%= content_tag :td, Spree::Money.new(v.amount).to_s %>
-        	<%= content_tag(:td, '%i%' % ((1.0 - v.amount / product.master.price) * 100.0).round) if display_percent %>
-      	<% end %>
-    	<% end %>
+      <% product.master.volume_prices.each do |v| %>
+        <%= content_tag(:tr) do %>
+          <%= content_tag :td, v.display_range %>
+          <%= content_tag :td, Spree::Money.new(v.amount).to_s %>
+          <%= content_tag(:td, '%i%' % ((1.0 - v.amount / product.master.price) * 100.0).round) if display_percent %>
+        <% end %>
+      <% end %>
     </table>
   </div>
 <% end %>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_volume_pricing"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_volume_pricing/engine', __FILE__)
+# frozen_string_literal: true
 
-require 'rails/all'
-require 'rails/engine/commands'
+app_root = 'spec/dummy'
+
+unless File.exist? "#{app_root}/bin/rails"
+  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
+    warn "Automatic creation of the dummy app failed"
+    exit 1
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bundle exec rake clobber

data/config/locales/de.yml

@@ -1,7 +1,7 @@
 ---
 de:
   spree:
-    add_volume_price: Neuen Staffelpreis
+    add_volume_price: Neuer Staffelpreis
     position: Position
     discount_type:
     range: Bereich
@@ -10,9 +10,23 @@ de:
     price_discount:
     percent_discount:
     bulk_discount:
+    admin:
+      tab:
+        volume_price_models: Staffelpreismodelle
   activerecord:
+    models:
+      spree/volume_price:
+        one: Staffelpreis
+        other: Staffelpreise
+      spree/volume_price_model:
+        one: Staffelpreismodell
+        other: Staffelpreismodelle
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} ist kein valider Staffelpreistyp'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/locales/en.yml

@@ -5,14 +5,33 @@ en:
     position: Position
     discount_type: Discount Type
     range: Range
+    role: Role
     volume_prices: Volume Prices
+    volume_price_model: Volume Price Model
+    new_volume_price_model: New Volume Price Model
+    volume_price_model_edit: Edit Volume Price Model
     volume_pricing: Volume Pricing
     price_discount: Price Discount
     percent_discount: Percent Discount
     bulk_discount: Bulk Discount
+    total_price: Total price
+    admin:
+      tab:
+        volume_price_models: Volume Price Models
   activerecord:
+    models:
+      spree/volume_price:
+        one: Volume Price
+        other: Volume Prices
+      spree/volume_price_model:
+        one: Volume Price Model
+        other: Volume Price Models
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range: "Couldn't convert to Range: %{number}"
-        is_not_a_valid_volume_price_type: '%{value} is not a valid Volume Price Type'
+        could_not_convert_to_range: "Couldn't convert to Range: %{range_string}"
         must_be_in_format: 'must be in one of the following formats: (a..b), (a...b), (a+)'

data/config/locales/pt.yml

@@ -12,7 +12,11 @@ pt:
     bulk_discount: Desconto por Quantidade
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/locales/ru.yml

@@ -12,7 +12,11 @@ ru:
     bulk_discount:
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/locales/sv.yml

@@ -12,7 +12,11 @@ sv:
     bulk_discount: Bulk rabatt
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} är inte en giltligt typ för volympris'
       messages:
-        could_not_conver_to_range: "Det gick inte att konvertera till omfång: %{number}"
-        is_not_a_valid_volume_price_type: '%{value} är inte en giltligt typ för volympris'
+        could_not_convert_to_range: "Det gick inte att konvertera till omfång: %{range_string}"
         must_be_in_format: 'måste vara i ett av följande format: (a..b), (a...b), (a+)'

data/config/locales/tr.yml

@@ -12,7 +12,11 @@ tr:
     bulk_discount:
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/routes.rb

@@ -1,4 +1,6 @@
-Spree::Core::Engine.add_routes do
+# frozen_string_literal: true
+
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :products do
       resources :variants do

data/db/migrate/20081119145604_create_volume_prices.rb

@@ -1,4 +1,6 @@
-class CreateVolumePrices < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class CreateVolumePrices < ActiveRecord::Migration[4.2]
   def self.up
     create_table :volume_prices do |t|
       t.references :variant

data/db/migrate/20110203174010_change_display_name_for_volume_prices.rb

@@ -1,4 +1,6 @@
-class ChangeDisplayNameForVolumePrices < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class ChangeDisplayNameForVolumePrices < ActiveRecord::Migration[4.2]
   def self.up
     rename_column :volume_prices, :display, :name
   end

data/db/migrate/20111206173307_prefix_volume_pricing_table_names.rb

@@ -1,4 +1,6 @@
-class PrefixVolumePricingTableNames < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class PrefixVolumePricingTableNames < ActiveRecord::Migration[4.2]
   def change
     rename_table :volume_prices, :spree_volume_prices unless Spree::VolumePrice.table_exists?
   end

data/db/migrate/20121115043422_add_discount_type_column.rb

@@ -1,4 +1,6 @@
-class AddDiscountTypeColumn < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddDiscountTypeColumn < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_volume_prices, :discount_type, :string
   end

data/db/migrate/20150513200904_add_role_to_volume_price.rb

@@ -1,4 +1,6 @@
-class AddRoleToVolumePrice < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddRoleToVolumePrice < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_volume_prices, :role_id, :integer
   end

data/db/migrate/20150603143015_create_spree_volume_price_models.rb

@@ -1,4 +1,6 @@
-class CreateSpreeVolumePriceModels < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class CreateSpreeVolumePriceModels < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_volume_price_models do |t|
       t.string :name

data/lib/generators/solidus_volume_pricing/install/install_generator.rb

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
+
 module SolidusVolumePricing
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
 
-      def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_volume_pricing\n"
-      end
-
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=solidus_volume_pricing'
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(
+          ask('Would you like to run the migrations now? [Y/n]')
+        )
         if run_migrations
           run 'bundle exec rake db:migrate'
         else

data/lib/solidus_volume_pricing/engine.rb

@@ -1,42 +1,34 @@
+# frozen_string_literal: true
+
+require 'spree/core'
+
 module SolidusVolumePricing
   class Engine < Rails::Engine
-    isolate_namespace Spree
+    include SolidusSupport::EngineExtensions
+
+    isolate_namespace ::Spree
+
     engine_name 'solidus_volume_pricing'
 
     initializer 'solidus_volume_pricing.preferences', before: 'spree.environment' do
-      Spree::AppConfiguration.class_eval do
+      ::Spree::AppConfiguration.class_eval do
         preference :use_master_variant_volume_pricing, :boolean, default: false
-        preference :volume_pricing_role, :string, default: 'wholesale'
       end
     end
 
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
+        Rails.autoloaders.main.ignore(c) if Rails.autoloaders.zeitwerk_enabled?
       end
-
-      String.class_eval do
-        def to_range
-          case count('.')
-          when 2
-            elements = split('..')
-            return Range.new(elements[0].delete('(').to_i, elements[1].to_i)
-          when 3
-            elements = split('...')
-            return Range.new(elements[0].delete('(').to_i, elements[1].to_i - 1)
-          else
-            raise ArgumentError.new(
-              I18n.t(
-                :'activerecord.errors.messages.could_not_conver_to_range',
-                number: self
-              )
-            )
-          end
-        end
-      end
+      ::Spree::BackendConfiguration::CONFIGURATION_TABS << :volume_price_models
     end
 
-    config.autoload_paths += %W(#{config.root}/lib)
     config.to_prepare(&method(:activate).to_proc)
+
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end

data/lib/solidus_volume_pricing/range_from_string.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module SolidusVolumePricing
+  class RangeFromString
+    attr_reader :range_string
+
+    RANGE_FORMAT = /\A\(?(\d+)(\.{2,3})(\d+)\)?\z/.freeze
+    OPEN_ENDED = /\(?[0-9]+\+\)?/.freeze
+
+    def initialize(range_string)
+      @range_string = range_string
+    end
+
+    def to_range
+      ::Range.new(*options_from_string)
+    end
+
+    private
+
+    def options_from_string
+      case range_string
+      when OPEN_ENDED
+        [range_string.tr("^0-9", '').to_i, Float::INFINITY]
+      when RANGE_FORMAT
+        [
+          Regexp.last_match[1].to_i,
+          Regexp.last_match[3].to_i,
+          Regexp.last_match[2].length == 3
+        ]
+      else
+        raise ArgumentError,
+          I18n.t(:could_not_convert_to_range, scope: 'activerecord.errors.messages', string: range_string)
+      end
+    end
+  end
+end

data/lib/solidus_volume_pricing/testing_support/factories.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :volume_price, class: 'Spree::VolumePrice' do
+    amount { 10 }
+    discount_type { 'price' }
+    range { '(1..5)' }
+    association :variant
+  end
+
+  factory :volume_price_model, class: 'Spree::VolumePriceModel' do
+    name { 'name' }
+  end
+end

data/lib/solidus_volume_pricing/version.rb

@@ -1,18 +1,5 @@
-module SolidusVolumePricing
-  module_function
-
-  # Returns the version of the currently loaded SolidusVolumePricing as a
-  # <tt>Gem::Version</tt>.
-  def version
-    Gem::Version.new VERSION::STRING
-  end
+# frozen_string_literal: true
 
-  module VERSION
-    MAJOR = 0
-    MINOR = 2
-    TINY  = 1
-    PRE   = nil
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
+module SolidusVolumePricing
+  VERSION = '1.1.0'
 end

data/lib/solidus_volume_pricing.rb

@@ -1,6 +1,11 @@
-require 'sass/rails'
+# frozen_string_literal: true
+
+require 'active_support/deprecation'
+require 'sassc/rails'
 require 'deface'
 require 'solidus_core'
+require 'solidus_support'
 require 'solidus_volume_pricing/engine'
 require 'solidus_volume_pricing/version'
+require 'solidus_volume_pricing/range_from_string'
 require 'coffee_script'

data/solidus_volume_pricing.gemspec

@@ -1,40 +1,43 @@
-lib = File.expand_path('../lib/', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+# frozen_string_literal: true
 
+$:.push File.expand_path('lib', __dir__)
 require 'solidus_volume_pricing/version'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_volume_pricing'
-  s.version     = SolidusVolumePricing.version
+  s.version     = SolidusVolumePricing::VERSION
   s.summary     = 'Allow prices to be configured in quantity ranges for each variant'
   s.description = s.summary
-  s.required_ruby_version = '>= 2.2.3'
+
+  s.required_ruby_version = '>= 2.5'
 
   s.author       = 'Sean Schofield'
   s.email        = 'sean@railsdog.com'
   s.homepage     = 'https://github.com/solidusio-contrib/solidus_volume_pricing'
-  s.license      = 'BSD-3'
+  s.license      = 'BSD-3-Clause'
+
+  s.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  s.test_files = Dir['spec/**/*']
+  s.bindir = "exe"
+  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  if s.respond_to?(:metadata)
+    s.metadata["homepage_uri"] = s.homepage if s.homepage
+    s.metadata["source_code_uri"] = s.homepage if s.homepage
+  end
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
+  s.add_runtime_dependency 'solidus_backend', ['>= 2.4.0', '< 4']
 
-  s.add_runtime_dependency 'solidus_core', '~> 1.3'
-  s.add_runtime_dependency 'deface', '~> 1.0'
+  s.add_dependency 'coffee-rails'
+  s.add_dependency 'deface'
+  s.add_dependency 'sassc-rails'
+  s.add_dependency 'solidus_core', ['>= 2.4.0', '< 4']
+  s.add_dependency 'solidus_support', '~> 0.8'
 
-  s.add_development_dependency 'sqlite3', '>= 1.3.10'
-  s.add_development_dependency 'capybara', '~> 2.4'
-  s.add_development_dependency 'ffaker', '>= 1.32.1'
   s.add_development_dependency 'shoulda-matchers'
-  s.add_development_dependency 'rspec-rails', '~> 3.2'
-  s.add_development_dependency 'simplecov', '~> 0.9'
-  s.add_development_dependency 'factory_girl', '~> 4.5'
-  s.add_development_dependency 'pry-rails', '>= 0.3'
-  s.add_development_dependency 'poltergeist', '~> 1.6'
-  s.add_development_dependency 'database_cleaner', '~> 1.4'
-  s.add_development_dependency 'coffee-rails', '~> 4.0'
-  s.add_development_dependency 'sass-rails', '~> 5.0'
-  s.add_development_dependency 'rubocop', '>= 0.24.1'
+  s.add_development_dependency 'solidus_dev_support'
 end

data/spec/controllers/spree/admin/variants_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Spree::Admin::VariantsController, type: :controller do
   stub_authorization!
 
@@ -6,21 +8,22 @@ RSpec.describe Spree::Admin::VariantsController, type: :controller do
       variant = create :variant
 
       expect do
-        spree_put :update,
-                  product_id: variant.product.slug,
-                  id: variant.id,
-                  variant: {
-                    'volume_prices_attributes' => {
-                      '1335830259720' => {
-                        'name' => '5-10',
-                        'discount_type' => 'price',
-                        'range' => '5..10',
-                        'amount' => '90',
-                        'position' => '1',
-                        '_destroy' => 'false'
-                      }
-                    }
-                  }
+        put :update, params: {
+          product_id: variant.product.slug,
+          id: variant.id,
+          variant: {
+            'volume_prices_attributes' => {
+              '1335830259720' => {
+                'name' => '5-10',
+                'discount_type' => 'price',
+                'range' => '5..10',
+                'amount' => '90',
+                'position' => '1',
+                '_destroy' => 'false'
+              }
+            }
+          }
+        }
       end.to change(variant.volume_prices, :count).by(1)
     end
   end

data/spec/features/manage_volume_price_models_feature_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-RSpec.feature 'Managing volume price models' do
+RSpec.describe 'Managing volume price models' do
   stub_authorization!
 
-  scenario 'a admin can create and remove volume price models', :js do
+  it 'an 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')
 
@@ -17,10 +19,6 @@ RSpec.feature 'Managing volume price models' do
     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
+    expect(page).to have_content('Discount')
   end
 end

data/spec/features/manage_volume_prices_feature_spec.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-RSpec.feature 'Managing volume prices' do
+RSpec.describe 'Managing volume prices' do
   stub_authorization!
 
   let(:variant) { create(:variant) }
 
-  scenario 'a admin can create and remove volume prices', :js do
+  it 'an 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')
@@ -16,14 +18,13 @@ RSpec.feature 'Managing volume prices' do
     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
+    expect(page).to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
+    accept_confirm { page.find('a[data-action="remove"]').click }
+
+    expect(page).not_to have_field('variant_volume_prices_attributes_0_name', with: '5 pieces discount')
   end
 
-  scenario 'a admin editing a variant has a new volume price already built for her' do
+  it 'an 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')

data/spec/helpers/base_helper_spec.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 RSpec.describe Spree::BaseHelper, type: :helper do
-  include Spree::BaseHelper
+  include described_class
 
   context 'volume pricing' do
     before do