solidus_volume_pricing 1.1.1 → 2.0.0

data/lib/solidus_volume_pricing.rb

@@ -1,11 +1,11 @@
 # 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'
+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,41 +1,40 @@
 # frozen_string_literal: true
 
-require_relative 'lib/solidus_volume_pricing/version'
+require_relative "lib/solidus_volume_pricing/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'solidus_volume_pricing'
+  spec.name = "solidus_volume_pricing"
   spec.version = SolidusVolumePricing::VERSION
-  spec.authors = ['Sean Schofield']
-  spec.email = 'sean@railsdog.com'
+  spec.authors = ["Sean Schofield"]
+  spec.email = "sean@railsdog.com"
 
-  spec.summary = 'Allow prices to be configured in quantity ranges for each variant'
-  spec.description = 'Allow prices to be configured in quantity ranges for each variant'
-  spec.homepage = 'https://github.com/solidusio-contrib/solidus_volume_pricing'
-  spec.license = 'BSD-3-Clause'
+  spec.summary = "Allow prices to be configured in quantity ranges for each variant"
+  spec.description = "Allow prices to be configured in quantity ranges for each variant"
+  spec.homepage = "https://github.com/solidusio-contrib/solidus_volume_pricing"
+  spec.license = "BSD-3-Clause"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_volume_pricing'
-  spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_volume_pricing/releases'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/solidusio-contrib/solidus_volume_pricing"
+  spec.metadata["changelog_uri"] = "https://github.com/solidusio-contrib/solidus_volume_pricing/releases"
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0", "< 4")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
 
   spec.files = files.grep_v(%r{^(test|spec|features)/})
-  spec.test_files = files.grep(%r{^(test|spec|features)/})
   spec.bindir = "exe"
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'solidus_backend', ['>= 2.4.0', '< 5']
-  spec.add_dependency 'coffee-rails'
-  spec.add_dependency 'deface'
-  spec.add_dependency 'sassc-rails'
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
-  spec.add_dependency 'solidus_support', '~> 0.8'
+  spec.add_dependency "solidus_backend", [">= 4.0", "< 5"]
+  spec.add_dependency "solidus_core", [">= 4.0", "< 5"]
+  spec.add_dependency "solidus_support", [">= 0.15.0", "< 1"]
+  spec.add_dependency "coffee-rails"
+  spec.add_dependency "deface"
+  spec.add_dependency "sassc-rails"
 
-  spec.add_development_dependency 'shoulda-matchers'
-  spec.add_development_dependency 'solidus_dev_support', '~> 2.6'
+  spec.add_development_dependency "shoulda-matchers"
+  spec.add_development_dependency "solidus_dev_support", "~> 2.6"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_volume_pricing
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Sean Schofield
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_backend
@@ -16,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -26,40 +25,52 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: sassc-rails
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,39 +84,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solidus_core
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: solidus_support
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -140,15 +145,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gem_release.yml"
+- ".git-blame-ignore-revs"
 - ".github/dependabot.yml"
 - ".github/stale.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -159,17 +165,17 @@ files:
 - app/assets/javascripts/spree/backend/solidus_volume_pricing.js
 - app/controllers/spree/admin/volume_price_models_controller.rb
 - app/controllers/spree/admin/volume_prices_controller.rb
-- app/decorators/controllers/solidus_volume_pricing/spree/admin/variants_controller_decorator.rb
-- app/decorators/helpers/solidus_volume_pricing/spree/base_helper_decorator.rb
-- app/decorators/models/solidus_volume_pricing/spree/line_item_decorator.rb
-- app/decorators/models/solidus_volume_pricing/spree/variant_decorator.rb
 - app/models/solidus_volume_pricing/price_display.rb
 - app/models/solidus_volume_pricing/pricer.rb
 - app/models/solidus_volume_pricing/pricing_options.rb
 - app/models/spree/volume_price.rb
 - app/models/spree/volume_price_model.rb
+- app/overrides/spree/admin/shared/_product_tabs/add_volume_pricing_admin_tab.html.erb.deface
 - app/overrides/spree/admin/shared/_settings_sub_menu/add_volume_price_model_admin_menu_links.html.erb.deface
-- app/overrides/views_decorator.rb
+- app/overrides/spree/admin/variants/edit/add_volume_pricing_field_to_variant.html.erb.deface
+- app/patches/helpers/solidus_volume_pricing/spree_base_helper_patch.rb
+- app/patches/models/solidus_volume_pricing/spree_line_item_patch.rb
+- app/patches/models/solidus_volume_pricing/spree_variant_patch.rb
 - app/views/spree/admin/shared/_vp_product_tab.html.erb
 - app/views/spree/admin/variants/_edit_fields.html.erb
 - app/views/spree/admin/variants/volume_prices.html.erb
@@ -203,25 +209,13 @@ files:
 - db/migrate/20150513200904_add_role_to_volume_price.rb
 - db/migrate/20150603143015_create_spree_volume_price_models.rb
 - lib/generators/solidus_volume_pricing/install/install_generator.rb
+- lib/patches/backend/controllers/solidus_volume_pricing/spree_admin_variants_controller_patch.rb
 - lib/solidus_volume_pricing.rb
 - lib/solidus_volume_pricing/engine.rb
 - lib/solidus_volume_pricing/range_from_string.rb
 - lib/solidus_volume_pricing/testing_support/factories.rb
 - lib/solidus_volume_pricing/version.rb
 - solidus_volume_pricing.gemspec
-- spec/controllers/spree/admin/variants_controller_spec.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/lib/solidus_volume_pricing/range_from_string_spec.rb
-- spec/models/solidus_volume_pricing/pricer_spec.rb
-- spec/models/solidus_volume_pricing/pricing_options_spec.rb
-- spec/models/spree/line_item_spec.rb
-- spec/models/spree/order_spec.rb
-- spec/models/spree/variant_spec.rb
-- spec/models/spree/volume_price_spec.rb
-- spec/spec_helper.rb
-- spec/support/shoulda.rb
 homepage: https://github.com/solidusio-contrib/solidus_volume_pricing
 licenses:
 - BSD-3-Clause
@@ -229,7 +223,6 @@ metadata:
   homepage_uri: https://github.com/solidusio-contrib/solidus_volume_pricing
   source_code_uri: https://github.com/solidusio-contrib/solidus_volume_pricing
   changelog_uri: https://github.com/solidusio-contrib/solidus_volume_pricing/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -237,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -247,21 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Allow prices to be configured in quantity ranges for each variant
-test_files:
-- spec/controllers/spree/admin/variants_controller_spec.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/lib/solidus_volume_pricing/range_from_string_spec.rb
-- spec/models/solidus_volume_pricing/pricer_spec.rb
-- spec/models/solidus_volume_pricing/pricing_options_spec.rb
-- spec/models/spree/line_item_spec.rb
-- spec/models/spree/order_spec.rb
-- spec/models/spree/variant_spec.rb
-- spec/models/spree/volume_price_spec.rb
-- spec/spec_helper.rb
-- spec/support/shoulda.rb
+test_files: []

data/.circleci/config.yml

@@ -1,73 +0,0 @@
-version: 2.1
-
-orbs:
-  # Required for feature specs.
-  browser-tools: circleci/browser-tools@1.1
-
-  # Always take the latest version of the orb, this allows us to
-  # run specs against Solidus supported versions only without the need
-  # to change this configuration every time a Solidus version is released
-  # or goes EOL.
-  solidusio_extensions: solidusio/extensions@volatile
-
-jobs:
-  run-specs:
-    parameters:
-      solidus:
-        type: string
-        default: main
-      db:
-        type: string
-        default: "postgres"
-      ruby:
-        type: string
-        default: "3.2"
-    executor:
-      name: solidusio_extensions/<< parameters.db >>
-      ruby_version: << parameters.ruby >>
-    steps:
-      - checkout
-      - browser-tools/install-chrome
-      - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
-
-  lint-code:
-    executor:
-      name: solidusio_extensions/sqlite
-      ruby_version: "3.0"
-    steps:
-      - solidusio_extensions/lint-code
-
-workflows:
-  "Run specs on supported Solidus versions":
-    jobs:
-      - run-specs:
-          name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
-          matrix:
-            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
-      - run-specs:
-          name: *name
-          matrix:
-            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
-      - run-specs:
-          name: *name
-          matrix:
-            parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
-      - lint-code
-
-  "Weekly run specs against main":
-    triggers:
-      - schedule:
-          cron: "0 0 * * 4" # every Thursday
-          filters:
-            branches:
-              only:
-                - main
-    jobs:
-      - run-specs:
-          name: *name
-          matrix:
-            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
-      - run-specs:
-          name: *name
-          matrix:
-            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }

data/.rubocop_todo.yml

@@ -1,68 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2023-05-12 15:47:30 UTC using RuboCop version 1.50.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 42
-# Configuration parameters: Prefixes, AllowedPatterns.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/helpers/base_helper_spec.rb'
-    - 'spec/models/solidus_volume_pricing/pricer_spec.rb'
-    - 'spec/models/spree/order_spec.rb'
-    - 'spec/models/spree/volume_price_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Exclude:
-    - 'spec/helpers/base_helper_spec.rb'
-
-# Offense count: 29
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/helpers/base_helper_spec.rb'
-    - 'spec/models/spree/order_spec.rb'
-
-# Offense count: 5
-RSpec/MultipleExpectations:
-  Max: 3
-
-# Offense count: 82
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 8
-
-# Offense count: 57
-# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
-# SupportedStyles: always, named_only
-RSpec/NamedSubject:
-  Exclude:
-    - 'spec/lib/solidus_volume_pricing/range_from_string_spec.rb'
-    - 'spec/models/solidus_volume_pricing/pricer_spec.rb'
-    - 'spec/models/solidus_volume_pricing/pricing_options_spec.rb'
-    - 'spec/models/spree/volume_price_spec.rb'
-
-# Offense count: 74
-# Configuration parameters: AllowedGroups.
-RSpec/NestedGroups:
-  Max: 7
-
-# Offense count: 2
-RSpec/RepeatedExampleGroupDescription:
-  Exclude:
-    - 'spec/lib/solidus_volume_pricing/range_from_string_spec.rb'
-
-# Offense count: 2
-# Configuration parameters: IgnoreScopes, Include.
-# Include: app/models/**/*.rb
-Rails/InverseOf:
-  Exclude:
-    - 'app/models/spree/volume_price.rb'
-    - 'app/models/spree/volume_price_model.rb'

data/app/decorators/controllers/solidus_volume_pricing/spree/admin/variants_controller_decorator.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusVolumePricing
-  module Spree
-    module Admin
-      module VariantsControllerDecorator
-        def edit
-          @variant.volume_prices.build if @variant.volume_prices.empty?
-          super
-        end
-
-        def volume_prices
-          @product = @variant.product
-          @variant.volume_prices.build if @variant.volume_prices.empty?
-        end
-
-        private
-
-        # this loads the variant for the master variant volume price editing
-        def load_resource_instance
-          parent
-
-          if new_actions.include?(params[:action].to_sym)
-            build_resource
-          elsif params[:id]
-            ::Spree::Variant.find(params[:id])
-          end
-        end
-
-        def location_after_save
-          if @product.master.id == @variant.id && params[:variant].key?(:volume_prices_attributes)
-            return volume_prices_admin_product_variant_url(@product, @variant)
-          end
-
-          super
-        end
-
-        ::Spree::Admin::VariantsController.prepend self
-      end
-    end
-  end
-end

data/app/decorators/helpers/solidus_volume_pricing/spree/base_helper_decorator.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusVolumePricing
-  module Spree
-    module BaseHelperDecorator
-      def self.prepended(base)
-        base.module_eval do
-          def display_volume_price(variant, quantity = 1, user = nil)
-            price_display(variant, quantity: quantity, user: user).price_string
-          end
-
-          def display_volume_price_earning_percent(variant, quantity = 1, user = nil)
-            price_display(variant, quantity: quantity, user: user).earning_percent_string
-          end
-
-          def display_volume_price_earning_amount(variant, quantity = 1, user = nil)
-            price_display(variant, quantity: quantity, user: user).earning_amount_string
-          end
-
-          private
-
-          def price_display(variant, quantity:, user:)
-            SolidusVolumePricing::PriceDisplay.new(variant, quantity: quantity, user: user)
-          end
-        end
-      end
-
-      ::Spree::BaseHelper.prepend self
-    end
-  end
-end

data/app/decorators/models/solidus_volume_pricing/spree/line_item_decorator.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusVolumePricing
-  module Spree
-    module LineItemDecorator
-      def set_pricing_attributes
-        if quantity_changed?
-          options = SolidusVolumePricing::PricingOptions.from_line_item(self)
-          self.money_price = SolidusVolumePricing::Pricer.new(variant).price_for(options)
-        end
-
-        super
-      end
-
-      ::Spree::LineItem.prepend self
-    end
-  end
-end

data/app/decorators/models/solidus_volume_pricing/spree/variant_decorator.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusVolumePricing
-  module Spree
-    module VariantDecorator
-      def self.prepended(base)
-        base.class_eval do
-          has_and_belongs_to_many :volume_price_models
-          has_many :volume_prices, -> { order(position: :asc) }, dependent: :destroy
-          has_many :model_volume_prices, -> {
-            order(position: :asc)
-          }, class_name: '::Spree::VolumePrice', through: :volume_price_models, source: :volume_prices
-          accepts_nested_attributes_for :volume_prices, allow_destroy: true,
-            reject_if: proc { |volume_price|
-                         volume_price[:amount].blank? && volume_price[:range].blank?
-                       }
-        end
-      end
-
-      ::Spree::Variant.prepend self
-    end
-  end
-end

data/app/overrides/views_decorator.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-Deface::Override.new(
-  virtual_path: 'spree/admin/shared/_product_tabs',
-  name: 'add_volume_pricing_admin_tab',
-  insert_bottom: '[data-hook="admin_product_tabs"]',
-  partial: 'spree/admin/shared/vp_product_tab'
-)
-
-Deface::Override.new(
-  virtual_path: 'spree/admin/variants/edit',
-  name: 'add_volume_pricing_field_to_variant',
-  insert_after: '[data-hook="admin_variant_edit_form"]',
-  partial: 'spree/admin/variants/edit_fields'
-)

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

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Spree::Admin::VariantsController, type: :controller do
-  stub_authorization!
-
-  describe 'PUT #update' do
-    it 'creates a volume price' do
-      variant = create :variant
-
-      expect do
-        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
-end

data/spec/features/manage_volume_price_models_feature_spec.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Managing volume price models', type: :system do
-  stub_authorization!
-
-  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')
-
-    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'
-
-    expect(page).to have_content('Discount')
-  end
-end