solidus_product_assembly 1.0.0 → 1.1.0

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: solidus_product_assembly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Roman Smirnov
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: solidus_backend
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,7 +33,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,23 +43,23 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
+        version: '0.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,63 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -148,11 +106,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".gem_release.yml"
+- ".github/dependabot.yml"
+- ".github/stale.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/images/spinner.gif
@@ -161,21 +125,26 @@ files:
 - app/assets/stylesheets/spree/backend/solidus_product_assembly.css
 - app/assets/stylesheets/spree/frontend/solidus_product_assembly.css
 - app/controllers/spree/admin/parts_controller.rb
-- app/controllers/spree/checkout_controller_decorator.rb
-- app/helpers/spree/admin/orders_helper_decorator.rb
+- app/decorators/controllers/solidus_product_assembly/spree/checkout_controller_decorator.rb
+- app/decorators/helpers/solidus_product_assembly/spree/admin/orders_helper_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/inventory_unit_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/line_item_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/product_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/return_item_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/shipment_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/stock/availability_validator_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/stock/inventory_unit_builder_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/stock/inventory_units_finalizer_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/stock/inventory_validator_decorator.rb
+- app/decorators/models/solidus_product_assembly/spree/variant_decorator.rb
 - app/models/spree/assemblies_part.rb
-- app/models/spree/inventory_unit_decorator.rb
-- app/models/spree/line_item_decorator.rb
+- app/models/spree/calculator/returns/assemblies_default_refund_amount.rb
 - app/models/spree/order_inventory_assembly.rb
-- app/models/spree/product_decorator.rb
-- app/models/spree/shipment_decorator.rb
-- app/models/spree/stock/availability_validator.rb
-- app/models/spree/stock/inventory_unit_builder_decorator.rb
-- app/models/spree/stock/inventory_validator_decorator.rb
-- app/models/spree/variant_decorator.rb
 - app/overrides/add_admin_product_form_fields.rb
 - app/overrides/add_admin_tabs.rb
 - app/overrides/add_line_item_description.rb
+- app/overrides/spree/admin/orders/_carton_manifest/_assembly_parts_price.html.erb.deface
+- app/overrides/spree/admin/orders/_carton_manifest/_assembly_parts_total_price.html.erb.deface
 - app/overrides/spree/admin/orders/_form/inject_product_assemblies.html.erb.deface
 - app/overrides/spree/admin/orders/_shipment/stock_contents.html.erb.deface
 - app/overrides/spree/checkout/_delivery/remove_unshippable_markup.html.erb.deface
@@ -185,6 +154,8 @@ files:
 - app/overrides/spree/shared/_order_details/part_description.html.erb.deface
 - app/views/spree/admin/orders/_assemblies.html.erb
 - app/views/spree/admin/orders/_stock_contents.html.erb
+- app/views/spree/admin/orders/_stock_contents_2_3.html.erb
+- app/views/spree/admin/orders/_stock_contents_2_4.html.erb
 - app/views/spree/admin/orders/_stock_item.html.erb
 - app/views/spree/admin/parts/_parts_table.html.erb
 - app/views/spree/admin/parts/available.html.erb
@@ -193,9 +164,12 @@ files:
 - app/views/spree/admin/parts/update_parts_table.js.erb
 - app/views/spree/admin/products/_product_assembly_fields.html.erb
 - app/views/spree/admin/shared/_product_assembly_product_tabs.html.erb
+- app/views/spree/api/line_items/show.v1.rabl
 - app/views/spree/checkout/_line_item_manifest.html.erb
 - app/views/spree/orders/_cart_description.html.erb
+- bin/console
 - bin/rails
+- bin/setup
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/ru.yml
@@ -208,11 +182,13 @@ files:
 - lib/generators/solidus_product_assembly/install/install_generator.rb
 - lib/solidus_product_assembly.rb
 - lib/solidus_product_assembly/engine.rb
+- lib/solidus_product_assembly/testing_support/factories.rb
 - lib/solidus_product_assembly/version.rb
 - lib/tasks/spree2_upgrade.rake
 - solidus_product_assembly.gemspec
 - spec/features/admin/orders_spec.rb
 - spec/features/admin/parts_spec.rb
+- spec/features/admin/return_items_spec.rb
 - spec/features/checkout_spec.rb
 - spec/models/spree/assemblies_part_spec.rb
 - spec/models/spree/inventory_unit_spec.rb
@@ -229,9 +205,12 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_contexts/order_with_bundle.rb
 homepage: https://solidus.io
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://solidus.io
+  source_code_uri: https://github.com/solidusio-contrib/solidus_product_assembly
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,34 +218,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+requirements: []
+rubygems_version: 3.2.20
+signing_key:
 specification_version: 4
 summary: Adds oportunity to make bundle of products to your Spree store
 test_files:
-- spec/features/admin/orders_spec.rb
+- spec/spec_helper.rb
+- spec/features/admin/return_items_spec.rb
 - spec/features/admin/parts_spec.rb
+- spec/features/admin/orders_spec.rb
 - spec/features/checkout_spec.rb
-- spec/models/spree/assemblies_part_spec.rb
-- spec/models/spree/inventory_unit_spec.rb
-- spec/models/spree/line_item_spec.rb
-- spec/models/spree/order_contents_spec.rb
-- spec/models/spree/order_inventory_assembly_spec.rb
-- spec/models/spree/order_inventory_spec.rb
-- spec/models/spree/product_spec.rb
 - spec/models/spree/shipment_spec.rb
-- spec/models/spree/stock/availability_validator_spec.rb
+- spec/models/spree/product_spec.rb
+- spec/models/spree/variant_spec.rb
+- spec/models/spree/order_inventory_assembly_spec.rb
+- spec/models/spree/order_contents_spec.rb
+- spec/models/spree/line_item_spec.rb
+- spec/models/spree/inventory_unit_spec.rb
 - spec/models/spree/stock/coordinator_spec.rb
+- spec/models/spree/stock/availability_validator_spec.rb
 - spec/models/spree/stock/inventory_unit_builder_spec.rb
-- spec/models/spree/variant_spec.rb
-- spec/spec_helper.rb
+- spec/models/spree/order_inventory_spec.rb
+- spec/models/spree/assemblies_part_spec.rb
 - spec/support/shared_contexts/order_with_bundle.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-sudo: false
-cache: bundler
-language: ruby
-rvm:
-  - 2.3.1
-env:
-  matrix:
-    - SOLIDUS_BRANCH=v1.0 DB=postgres
-    - SOLIDUS_BRANCH=v1.1 DB=postgres
-    - SOLIDUS_BRANCH=v1.2 DB=postgres
-    - SOLIDUS_BRANCH=v1.3 DB=postgres
-    - SOLIDUS_BRANCH=v1.4 DB=postgres
-    - SOLIDUS_BRANCH=v2.0 DB=postgres
-    - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v1.0 DB=mysql
-    - SOLIDUS_BRANCH=v1.1 DB=mysql
-    - SOLIDUS_BRANCH=v1.2 DB=mysql
-    - SOLIDUS_BRANCH=v1.3 DB=mysql
-    - SOLIDUS_BRANCH=v1.4 DB=mysql
-    - SOLIDUS_BRANCH=v2.0 DB=mysql
-    - SOLIDUS_BRANCH=master DB=mysql

data/LICENSE.md

@@ -1,13 +0,0 @@
-Spree Product Assembly License
-==============================
-
-Copyright © 2007-2014, Spree Commerce Inc. and other contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of Spree Commerce Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-_This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner of contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage._

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -1,9 +0,0 @@
-module Spree
-  if defined? Spree::Frontend
-    CheckoutController.class_eval do
-      # Override because we don't want to remove unshippable items from the order
-      # A bundle itself is an unshippable item
-      def before_payment; end
-    end
-  end
-end

data/app/helpers/spree/admin/orders_helper_decorator.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Admin
-    OrdersHelper.module_eval do
-      def line_item_shipment_price(line_item, quantity)
-        Spree::Money.new(line_item.price * quantity, { currency: line_item.currency })
-      end
-    end
-  end
-end

data/app/models/spree/inventory_unit_decorator.rb

@@ -1,13 +0,0 @@
-module Spree
-  InventoryUnit.class_eval do
-    def percentage_of_line_item
-      product = line_item.product
-      if product.assembly?
-        total_value = line_item.quantity_by_variant.map { |part, quantity| part.price * quantity }.sum
-        variant.price / total_value
-      else
-        1 / BigDecimal.new(line_item.quantity)
-      end
-    end
-  end
-end

data/app/models/spree/line_item_decorator.rb

@@ -1,44 +0,0 @@
-module Spree
-  LineItem.class_eval do
-    scope :assemblies, -> { joins(:product => :parts).uniq }
-
-    def any_units_shipped?
-      inventory_units.any? { |unit| unit.shipped? }
-    end
-
-    # The parts that apply to this particular LineItem. Usually `product#parts`, but
-    # provided as a hook if you want to override and customize the parts for a specific
-    # LineItem.
-    def parts
-      product.parts
-    end
-
-    # The number of the specified variant that make up this LineItem. By default, calls
-    # `product#count_of`, but provided as a hook if you want to override and customize
-    # the parts available for a specific LineItem. Note that if you only customize whether
-    # a variant is included in the LineItem, and don't customize the quantity of that part
-    # per LineItem, you shouldn't need to override this method.
-    def count_of(variant)
-      product.count_of(variant)
-    end
-
-    def quantity_by_variant
-      if self.product.assembly?
-        {}.tap { |hash| self.product.assemblies_parts.each { |ap| hash[ap.part] = ap.count * self.quantity } }
-      else
-        { self.variant => self.quantity }
-      end
-    end
-
-    private
-      def update_inventory
-        if (changed? || target_shipment.present?) && self.order.has_checkout_step?("delivery")
-          if self.product.assembly?
-            OrderInventoryAssembly.new(self).verify(target_shipment)
-          else
-            OrderInventory.new(self.order, self).verify(target_shipment)
-          end
-        end
-      end
-  end
-end

data/app/models/spree/product_decorator.rb

@@ -1,56 +0,0 @@
-Spree::Product.class_eval do
-  has_and_belongs_to_many  :parts, :class_name => "Spree::Variant",
-        :join_table => "spree_assemblies_parts",
-        :foreign_key => "assembly_id", :association_foreign_key => "part_id"
-
-  has_many :assemblies_parts, :class_name => "Spree::AssembliesPart",
-    :foreign_key => "assembly_id"
-
-  scope :individual_saled, -> { where(individual_sale: true) }
-
-  scope :search_can_be_part, ->(query){ not_deleted.available.joins(:master)
-    .where(arel_table["name"].matches("%#{query}%").or(Spree::Variant.arel_table["sku"].matches("%#{query}%")))
-    .where(can_be_part: true)
-    .limit(30)
-  }
-
-  validate :assembly_cannot_be_part, :if => :assembly?
-
-  def add_part(variant, count = 1)
-    set_part_count(variant, count_of(variant) + count)
-  end
-
-  def remove_part(variant)
-    set_part_count(variant, 0)
-  end
-
-  def set_part_count(variant, count)
-    ap = assemblies_part(variant)
-    if count > 0
-      ap.count = count
-      ap.save
-    else
-      ap.destroy
-    end
-    reload
-  end
-
-  def assembly?
-    parts.present?
-  end
-
-  def count_of(variant)
-    ap = assemblies_part(variant)
-    # This checks persisted because the default count is 1
-    ap.persisted? ? ap.count : 0
-  end
-
-  def assembly_cannot_be_part
-    errors.add(:can_be_part, Spree.t(:assembly_cannot_be_part)) if can_be_part
-  end
-
-  private
-  def assemblies_part(variant)
-    Spree::AssembliesPart.get(self.id, variant.id)
-  end
-end

data/app/models/spree/shipment_decorator.rb

@@ -1,50 +0,0 @@
-module Spree
-  Shipment.class_eval do
-    # Overriden from Spree core as a product bundle part should not be put
-    # together with an individual product purchased (even though they're the
-    # very same variant) That is so we can tell the store admin which units
-    # were purchased individually and which ones as parts of the bundle
-    #
-    # Account for situations where we can't track the line_item for a variant.
-    # This should avoid exceptions when users upgrade from spree 1.3
-    #
-    # TODO Can possibly be removed as well. We already override the manifest
-    # partial so we can get the product there
-    def manifest
-      items = []
-      inventory_units.joins(:variant).includes(:variant, :line_item).group_by(&:variant).each do |variant, units|
-
-        units.group_by(&:line_item).each do |line_item, units|
-          states = {}
-          units.group_by(&:state).each { |state, iu| states[state] = iu.count }
-          line_item ||= order.find_line_item_by_variant(variant)
-
-          part = line_item ? line_item.product.assembly? : false
-          items << OpenStruct.new(part: part,
-                                  product: line_item.try(:product),
-                                  line_item: line_item,
-                                  variant: variant,
-                                  quantity: units.length,
-                                  states: states)
-        end
-      end
-      items
-    end
-
-    # There might be scenarios where we don't want to display every single
-    # variant on the shipment. e.g. when ordering a product bundle that includes
-    # 5 other parts. Frontend users should only see the product bundle as a
-    # single item to ship
-    def line_item_manifest
-      inventory_units.includes(:line_item, :variant).group_by(&:line_item).map do |line_item, units|
-        states = {}
-        units.group_by(&:state).each { |state, iu| states[state] = iu.count }
-        OpenStruct.new(line_item: line_item, variant: line_item.variant, quantity: units.length, states: states)
-      end
-    end
-
-    def inventory_units_for_item(line_item, variant)
-      inventory_units.where(line_item_id: line_item.id, variant_id: variant.id)
-    end
-  end
-end

data/app/models/spree/stock/availability_validator.rb

@@ -1,28 +0,0 @@
-module Spree
-  module Stock
-    # Overridden from spree core to make it also check for assembly parts stock
-    class AvailabilityValidator < ActiveModel::Validator
-      def validate(line_item)
-        line_item.quantity_by_variant.each do |variant, variant_quantity|
-          inventory_units = line_item.inventory_units.where(variant: variant).count
-          quantity = variant_quantity - inventory_units
-
-          next if quantity <= 0
-          next unless variant
-
-          quantifier = Stock::Quantifier.new(variant)
-
-          unless quantifier.can_supply? quantity
-            display_name = %Q{#{variant.name}}
-            display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
-
-            line_item.errors[:quantity] << Spree.t(
-              :selected_quantity_not_available,
-              item: display_name.inspect
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/spree/stock/inventory_unit_builder_decorator.rb

@@ -1,30 +0,0 @@
-module Spree
-  module Stock
-    InventoryUnitBuilder.class_eval do
-      def units
-        @order.line_items.flat_map do |line_item|
-          line_item.quantity_by_variant.flat_map do |variant, quantity|
-            quantity.times.map { build_inventory_unit(variant, line_item) }
-          end
-        end
-      end
-
-      def build_inventory_unit(variant, line_item)
-        @order.inventory_units.includes(
-          variant: {
-            product: {
-              shipping_category: {
-                shipping_methods: [:calculator, { zones: :zone_members }]
-              }
-            }
-          }
-        ).build(
-          pending: true,
-          variant: variant,
-          line_item: line_item,
-          order: @order
-        )
-      end
-    end
-  end
-end

data/app/models/spree/stock/inventory_validator_decorator.rb

@@ -1,12 +0,0 @@
-Spree::Stock::InventoryValidator.class_eval do
-  def validate(line_item)
-    total_quantity = line_item.quantity_by_variant.values.sum
-
-    if line_item.inventory_units.count != total_quantity
-      line_item.errors[:inventory] << Spree.t(
-        :inventory_not_available,
-        item: line_item.variant.name
-      )
-    end
-  end
-end

data/app/models/spree/variant_decorator.rb

@@ -1,13 +0,0 @@
-Spree::Variant.class_eval do
-  has_and_belongs_to_many  :assemblies, :class_name => "Spree::Product",
-        :join_table => "spree_assemblies_parts",
-        :foreign_key => "part_id", :association_foreign_key => "assembly_id"
-
-  def assemblies_for(products)
-    assemblies.where(id: products)
-  end
-
-  def part?
-    assemblies.exists?
-  end
-end