solidus_product_assembly 1.0.0 → 1.1.0

data/lib/tasks/spree2_upgrade.rake

@@ -1,27 +1,27 @@
+# frozen_string_literal: true
+
 namespace :solidus_product_assembly do
   desc 'Link legacy inventory units to an order line item'
-  task :upgrade => :environment do
+  task upgrade: :environment do
     shipments = Spree::Shipment.includes(:inventory_units).where("spree_inventory_units.line_item_id IS NULL")
 
     shipments.each do |shipment|
       shipment.inventory_units.includes(:variant).group_by(&:variant).each do |variant, units|
-
         line_item = shipment.order.line_items.detect { |line_item| line_item.variant_id == variant.id }
 
-        unless line_item
+        next if line_item
 
-          begin
-            master = shipment.order.products.detect { |p| variant.assemblies.include? p }.master
-            supposed_line_item = shipment.order.line_items.detect { |line_item| line_item.variant_id == master.id }
+        begin
+          master = shipment.order.products.detect { |p| variant.assemblies.include? p }.master
+          supposed_line_item = shipment.order.line_items.detect { |line_item| line_item.variant_id == master.id }
 
-            if supposed_line_item
-              Spree::InventoryUnit.where(id: units.map(&:id)).update_all "line_item_id = #{supposed_line_item.id}"
-            else
-              puts "Couldn't find a matching line item for #{variant.name}"
-            end
-          rescue
+          if supposed_line_item
+            Spree::InventoryUnit.where(id: units.map(&:id)).update_all "line_item_id = #{supposed_line_item.id}"
+          else
             puts "Couldn't find a matching line item for #{variant.name}"
           end
+        rescue StandardError
+          puts "Couldn't find a matching line item for #{variant.name}"
         end
       end
     end

data/solidus_product_assembly.gemspec

@@ -1,8 +1,6 @@
-# encoding: UTF-8
-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+# frozen_string_literal: true
 
+$:.push File.expand_path('lib', __dir__)
 require 'solidus_product_assembly/version'
 
 Gem::Specification.new do |s|
@@ -11,25 +9,32 @@ Gem::Specification.new do |s|
   s.version     = SolidusProductAssembly::VERSION
   s.summary     = 'Adds oportunity to make bundle of products to your Spree store'
   s.description = s.summary
-  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'BSD-3-Clause'
+
+  s.required_ruby_version = '>= 2.4'
 
   s.author            = 'Roman Smirnov'
   s.email             = 'roman@railsdog.com'
   s.homepage          = 'https://solidus.io'
 
-  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', [">= 1.0", "< 3"]
-
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'factory_girl', '~> 4.4'
-  s.add_development_dependency 'capybara', '~> 2.7'
-  s.add_development_dependency 'poltergeist', '~> 1.9'
-  s.add_development_dependency 'database_cleaner', '~> 1.3'
-  s.add_development_dependency 'simplecov'
+  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"] = "https://github.com/solidusio-contrib/solidus_product_assembly"
+  end
+
+  s.add_dependency 'deface'
+  s.add_dependency 'solidus_core', ['>= 1.0', '< 4']
+  s.add_dependency 'solidus_support', '~> 0.8'
+
+  s.add_development_dependency 'github_changelog_generator'
+  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'solidus_dev_support'
 end

data/spec/features/admin/orders_spec.rb

@@ -1,29 +1,127 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Orders", type: :feature, js: true do
   stub_authorization!
 
-  let(:order) { create(:order_with_line_items) }
-  let(:line_item) { order.line_items.first }
-  let(:bundle) { line_item.product }
-  let(:parts) { (1..3).map { create(:variant) } }
+  context 'when the order product is a bundle' do
+    let(:order) { create(:order_with_line_items) }
+    let(:line_item) { order.line_items.first }
+    let(:bundle) { line_item.product }
+    let(:parts) { (1..3).map { create(:variant) } }
+
+    before do
+      bundle.parts << [parts]
+      line_item.update!(quantity: 3)
+      order.reload.create_proposed_shipments
+      order.finalize!
+    end
+
+    if Spree.solidus_gem_version < Gem::Version.new('2.5')
+      context 'Adding tracking number' do
+        let(:tracking_number) { 'AA123' }
+
+        before { visit spree.edit_admin_order_path(order) }
+
+        it 'allows admin to edit tracking' do
+          expect(page).not_to have_content tracking_number
+          within '.show-tracking' do
+            find('.fa-edit').click
+          end
+          within '.edit-tracking' do
+            expect(page).to have_selector 'input[name="tracking"]'
+            fill_in :tracking, with: tracking_number
+            find('.fa-ok').click
+            expect(page).not_to have_selector 'input[name="tracking"]'
+          end
+          expect(page).to have_content tracking_number
+        end
+      end
+
+      context 'Changing carrier/shipping costs' do
+        before do
+          visit spree.edit_admin_order_path(order)
+        end
 
-  before do
-    bundle.parts << [parts]
-    line_item.update_attributes!(quantity: 3)
-    order.reload.create_proposed_shipments
-    order.finalize! 
+        it 'allows admin to edit shipping costs' do
+          expect(page).not_to have_content 'UPS Ground $100.00'
+          within '.show-method' do
+            find('.fa-edit').click
+          end
+          within '.edit-method' do
+            find('.fa-ok').click
+          end
+          expect(page).to have_content 'UPS Ground $100.00'
+        end
+      end
+    else
+      context 'Adding tracking number' do
+        let(:tracking_number) { 'AA123' }
+
+        before { visit spree.edit_admin_order_path(order) }
+
+        it 'allows admin to edit tracking' do
+          within '.edit-tracking' do
+            expect(page).not_to have_content tracking_number
+            find('.js-edit').click
+            expect(page).to have_selector 'input[name="tracking"]'
+            fill_in :tracking, with: tracking_number
+            find('.js-save').click
+            expect(page).not_to have_selector 'input[name="tracking"]'
+            expect(page).to have_content tracking_number
+          end
+        end
+      end
+
+      context 'Changing carrier/shipping costs' do
+        let(:carrier_name) { 'Fedex' }
+        let(:select_name) { 'selected_shipping_method_id' }
+
+        before do
+          create :shipping_method, name: carrier_name
+          visit spree.edit_admin_order_path(order)
+        end
+
+        it 'allows admin to edit shipping costs' do
+          within '.edit-shipping-method' do
+            expect(page).not_to have_content carrier_name
+            find('.js-edit').click
+            expect(page).to have_selector "select[name='#{select_name}']"
+            select "#{carrier_name} $10.00", from: select_name
+            find('.js-save').click
+            expect(page).not_to have_selector "select[name='#{select_name}']"
+            expect(page).to have_content carrier_name
+          end
+        end
+      end
+    end
   end
 
-  it "allows admin to edit product bundle" do
-    visit spree.edit_admin_order_path(order)
+  context 'when the order product is not a bundle' do
+    let(:order) { create(:order_ready_to_ship, state: 'complete', line_items_count: 1) }
+    let(:product) { order.products.first }
+    let(:location_name) { 'Foobar warehouse' }
+
+    before { create :stock_location, name: location_name }
 
-    within("table.product-bundles") do
-      find(".edit-line-item").click
-      fill_in "quantity", :with => "2"
-      find(".save-line-item").click
+    context 'Splitting items' do
+      before { visit spree.edit_admin_order_path(order) }
 
-      sleep(1) # avoid odd "cannot rollback - no transaction is active: rollback transaction"
+      it 'allows admin to split items to another stock location' do
+        find('.split-item').click
+        within '.stock-item-split' do
+          expect(page).to have_content "Move #{product.name} to"
+          find('.save-split').click
+          alert_text = page.driver.browser.switch_to.alert.text
+          expect(alert_text).to include 'Please select the split destination'
+          page.driver.browser.switch_to.alert.accept
+          find('.select2-container').click
+          find(:xpath, '//body').all('.select2-drop li.select2-result', text: "#{location_name} (0 on hand)")[0].click
+          find('.save-split').click
+        end
+        expect(page).to have_content /Pending package from '#{location_name}'/i
+      end
     end
   end
 end

data/spec/features/admin/parts_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Parts", type: :feature, js: true do
   stub_authorization!
 
-  let!(:tshirt) { create(:product, :name => "T-Shirt") }
-  let!(:mug) { create(:product, :name => "Mug") }
+  let!(:tshirt) { create(:product, name: "T-Shirt") }
+  let!(:mug) { create(:product, name: "Mug") }
 
   before do
     visit spree.admin_product_path(mug)
@@ -19,7 +21,7 @@ describe "Parts", type: :feature, js: true do
     click_on "Search"
 
     within("#search_hits") { click_on "Select" }
-    page.should have_content(mug.sku)
+    expect(page).to have_content(mug.sku)
 
     within("#product_parts") do
       find(".remove_admin_product_part_link").click

data/spec/features/admin/return_items_spec.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "Return Items", type: :feature, js: true do
+  stub_authorization!
+
+  let(:line_item) { order.line_items.first }
+
+  before do
+    allow_any_instance_of(Spree::Admin::ReimbursementsController).to receive(:try_spree_current_user) { Spree.user_class.new }
+  end
+
+  context 'when the order product is a bundle' do
+    let(:bundle) { line_item.product }
+    let(:parts) { (1..3).map { create(:variant) } }
+
+    before do
+      create :refund_reason, name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false
+      bundle.parts << [parts]
+      bundle.set_part_count(parts.first, 2)
+      parts.each { |p| p.stock_items.first.set_count_on_hand 4 }
+      3.times { order.next }
+      create :payment, order: order, amount: order.amount
+      order.next
+      order.complete
+      order.payments.each(&:capture!)
+      order.shipments.each { |s| s.update state: :ready }
+      order.shipments.each(&:ship!)
+    end
+
+    context 'with a single item cart' do
+      let(:order) { create(:order_with_line_items) }
+
+      it 'successfully generates a RMA, a reimbursement and a refund' do
+        visit spree.edit_admin_order_path(order)
+
+        expect(page).to have_selector '.line-item-total', text: '$10.00'
+
+        click_link 'RMA'
+        click_link 'New RMA'
+
+        expect(page).to have_selector '.return-item-charged', text: '$2.50', count: 4
+
+        find('#select-all').click
+        select Spree::StockLocation.first.name, from: 'Stock Location'
+        click_button 'Create'
+
+        expect(page).to have_content 'Return Authorization has been successfully created!'
+
+        click_link 'Customer Returns'
+        click_link 'New Customer Return'
+        find('#select-all').click
+        page.execute_script %{$('option[value="receive"]').attr('selected', 'selected')}
+        select Spree::StockLocation.first.name, from: 'Stock Location'
+        click_button 'Create'
+
+        expect(page).to have_content 'Customer Return has been successfully created!'
+
+        click_button 'Create reimbursement'
+        click_button 'Reimburse'
+
+        within 'table.reimbursement-refunds' do
+          expect(page).to have_content '$10.00'
+        end
+      end
+    end
+
+    context 'with a multiple items cart' do
+      let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: 2 }]) }
+
+      it 'successfully generates a RMA, a reimbursement and a refund' do
+        visit spree.edit_admin_order_path(order)
+
+        expect(page).to have_selector '.line-item-total', text: '$20.00'
+
+        click_link 'RMA'
+        click_link 'New RMA'
+
+        expect(page).to have_selector '.return-item-charged', text: '$2.50', count: 8
+
+        find('#select-all').click
+        select Spree::StockLocation.first.name, from: 'Stock Location'
+        click_button 'Create'
+
+        expect(page).to have_content 'Return Authorization has been successfully created!'
+
+        click_link 'Customer Returns'
+        click_link 'New Customer Return'
+        find('#select-all').click
+        page.execute_script %{$('option[value="receive"]').attr('selected', 'selected')}
+        select Spree::StockLocation.first.name, from: 'Stock Location'
+        click_button 'Create'
+
+        expect(page).to have_content 'Customer Return has been successfully created!'
+
+        click_button 'Create reimbursement'
+        click_button 'Reimburse'
+
+        within 'table.reimbursement-refunds' do
+          expect(page).to have_content '$20.00'
+        end
+      end
+    end
+  end
+
+  context 'when the product is not a bundle' do
+    before do
+      order.reload.create_proposed_shipments
+      order.finalize!
+      order.update state: :complete
+      order.shipments.update_all state: :shipped
+    end
+
+    context 'with a single item cart' do
+      let(:order) { create(:order_with_line_items) }
+
+      it 'builds one return item for each product' do
+        visit spree.edit_admin_order_path(order)
+
+        expect(page).to have_selector '.item-total', text: '$10.00'
+
+        click_link 'RMA'
+        click_link 'New RMA'
+
+        within '.return-items-table tbody' do
+          expect(page).to have_selector 'tr', count: 1
+          expect(page).to have_selector '.return-item-pre-tax-refund-amount', text: '$10.00', count: 1
+        end
+      end
+    end
+
+    context 'with a multiple items cart' do
+      let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: 2 }]) }
+
+      it 'builds one return item for each product' do
+        visit spree.edit_admin_order_path(order)
+
+        expect(page).to have_selector '.item-total', text: '$20.00'
+
+        click_link 'RMA'
+        click_link 'New RMA'
+
+        within '.return-items-table tbody' do
+          expect(page).to have_selector 'tr', count: 2
+          expect(page).to have_selector '.return-item-pre-tax-refund-amount', text: '$10.00', count: 2
+        end
+      end
+    end
+  end
+end

data/spec/features/checkout_spec.rb

@@ -1,48 +1,51 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Checkout", type: :feature do
   let!(:store) { create :store, default: true }
-  let!(:country) { create(:country, :name => "United States", :states_required => true) }
-  let!(:state) { create(:state, :name => "Ohio", :country => country) }
+  let!(:country) { create(:country, name: "United States", states_required: true) }
+  let!(:state) { create(:state, name: "Ohio", country: country) }
   let!(:shipping_method) { create(:shipping_method) }
   let!(:stock_location) { create(:stock_location) }
   let!(:payment_method) { create(:check_payment_method) }
   let!(:zone) { create(:zone) }
 
-  let(:product) { create(:product, :name => "RoR Mug") }
+  let(:product) { create(:product, name: "RoR Mug") }
   let(:variant) { create(:variant) }
+  let(:other_variant) { create(:variant) }
 
   stub_authorization!
 
-  before { product.parts << variant << create(:variant) }
+  before { product.parts << variant << other_variant }
 
   shared_context "purchases product with part included" do
     before do
+      visit spree.root_path
       add_product_to_cart
       click_button "Checkout"
 
-      fill_in "order_email", :with => "ryan@spreecommerce.com"
+      fill_in "order_email", with: "ryan@spreecommerce.com"
       click_button "Continue"
       fill_in_address
 
       click_button "Save and Continue"
       expect(current_path).to eql(spree.checkout_state_path("delivery"))
-      page.should have_content(variant.product.name)
+      expect(page).to have_content(variant.product.name)
 
       click_button "Save and Continue"
       expect(current_path).to eql(spree.checkout_state_path("payment"))
 
       click_button "Save and Continue"
-      expect(current_path).to eq spree.checkout_state_path('confirm')
-      page.should have_content(variant.product.name)
+      expect(page).to have_current_path spree.checkout_state_path('confirm'), ignore_query: true
+      expect(page).to have_content(variant.product.name)
 
       click_button "Place Order"
-      page.should have_content('Your order has been processed successfully')
+      expect(page).to have_content('Your order has been processed successfully')
     end
   end
 
-  context "backend order shipments UI", js: true do
-
+  shared_examples 'purchasable assembly' do
     context "ordering only the product assembly" do
       include_context "purchases product with part included"
 
@@ -50,7 +53,7 @@ describe "Checkout", type: :feature do
         visit spree.admin_orders_path
         click_on Spree::Order.last.number
 
-        page.should have_content(variant.product.name)
+        expect(page).to have_content(variant.product.name)
       end
     end
 
@@ -60,28 +63,107 @@ describe "Checkout", type: :feature do
         click_link variant.product.name
         click_button "add-to-cart-button"
       end
+
       include_context "purchases product with part included"
 
       it "views parts bundled and not" do
         visit spree.admin_orders_path
         click_on Spree::Order.last.number
 
-        page.should have_content(variant.product.name)
+        expect(page).to have_content(variant.product.name)
       end
     end
-
   end
 
+  context "backend order shipments UI", js: true do
+    context 'when the product and parts are backorderable' do
+      it_behaves_like 'purchasable assembly'
+    end
+
+    context 'when the product and parts are not backorderable' do
+      context 'when there is enough quantity available' do
+        before do
+          Spree::StockItem.update_all backorderable: false
+          variant.stock_items.each { |stock_item| stock_item.set_count_on_hand 2 }
+          other_variant.stock_items.each { |stock_item| stock_item.set_count_on_hand 1 }
+          product.stock_items.each { |stock_item| stock_item.set_count_on_hand 1 }
+        end
+
+        it_behaves_like 'purchasable assembly'
+
+        context 'when the order can be processed' do
+          include_context "purchases product with part included"
+
+          before do
+            visit spree.admin_orders_path
+            click_on Spree::Order.last.number
+          end
+
+          it 'marks the order as paid and shipped showing proper parts information' do
+            within '#order_tab_summary' do
+              expect(page).to have_selector '#shipment_status', text: 'Pending'
+              expect(page).to have_selector '#payment_status', text: 'Balance due'
+            end
+
+            click_link 'Payments'
+            find('.fa-capture').click
+
+            within '#order_tab_summary' do
+              expect(page).to have_selector '#shipment_status', text: 'Ready'
+              expect(page).to have_selector '#payment_status', text: 'Paid'
+            end
+
+            click_link 'Shipments'
+
+            within '.stock-contents' do
+              expect(page).to have_selector '.item-price', text: '---'
+              expect(page).to have_selector '.item-total', text: '---'
+              expect(page).to have_selector '.item-qty-show', count: 2, text: '1 x on hand'
+            end
+
+            expect(page).not_to have_selector '.stock-contents.carton'
+
+            click_button 'Ship'
+
+            within '.stock-contents' do
+              expect(page).to have_selector '.item-qty-show', count: 2, text: '1 x Shipped'
+            end
+
+            within '.stock-contents.carton' do
+              expect(page).to have_selector '.item-qty-show', count: 2, text: '1 x Shipped'
+              expect(page).to have_selector '.item-price', text: '---'
+              expect(page).to have_selector '.item-total', text: '---'
+            end
+
+            within '#order_tab_summary' do
+              expect(page).to have_selector '#shipment_status', text: 'Shipped'
+              expect(page).to have_selector '#payment_status', text: 'Paid'
+            end
+          end
+        end
+      end
+    end
+  end
 
   def fill_in_address
     address = "order_bill_address_attributes"
-    fill_in "#{address}_firstname", :with => "Ryan"
-    fill_in "#{address}_lastname", :with => "Bigg"
-    fill_in "#{address}_address1", :with => "143 Swan Street"
-    fill_in "#{address}_city", :with => "Richmond"
-    select "Ohio", :from => "#{address}_state_id"
-    fill_in "#{address}_zipcode", :with => "12345"
-    fill_in "#{address}_phone", :with => "(555) 555-5555"
+
+    if use_address_full_name?
+      fill_in "#{address}_name", with: "Ryan Bigg"
+    else
+      fill_in "#{address}_firstname", with: "Ryan"
+      fill_in "#{address}_lastname", with: "Bigg"
+    end
+
+    fill_in "#{address}_address1", with: "143 Swan Street"
+    fill_in "#{address}_city", with: "Richmond"
+    select "Ohio", from: "#{address}_state_id"
+    fill_in "#{address}_zipcode", with: "12345"
+    fill_in "#{address}_phone", with: "(555) 555-5555"
+  end
+
+  def use_address_full_name?
+    SolidusSupport.combined_first_and_last_name_in_address? 
   end
 
   def add_product_to_cart

data/spec/models/spree/assemblies_part_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree
@@ -11,7 +13,7 @@ module Spree
 
     context "get" do
       it "brings part by product and variant id" do
-        subject.class.get(product.id, variant.id).part.should == variant
+        expect(subject.class.get(product.id, variant.id).part).to eq variant
       end
     end
   end

data/spec/models/spree/inventory_unit_spec.rb

@@ -1,16 +1,25 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree
   describe InventoryUnit do
+    subject { described_class.create!(attributes) }
+
     let!(:order) { create(:order_with_line_items) }
     let(:line_item) { order.line_items.first }
     let(:product) { line_item.product }
+    let(:shipment) { create(:shipment, order: order) }
 
-    subject { InventoryUnit.create(line_item: line_item, variant: line_item.variant, order: order) }
+    if Spree.solidus_gem_version < Gem::Version.new('2.5.x')
+      let(:attributes) { { shipment: shipment, line_item: line_item, variant: line_item.variant, order: order } }
+    else
+      let(:attributes) { { shipment: shipment, line_item: line_item, variant: line_item.variant } }
+    end
 
-    context 'if the unit is not part of an assembly' do      
-      it 'it will return the percentage of a line item' do
-        expect(subject.percentage_of_line_item).to eql(BigDecimal.new(1))
+    context 'if the unit is not part of an assembly' do
+      it 'will return the percentage of a line item' do
+        expect(subject.percentage_of_line_item).to eql(BigDecimal(1))
       end
     end
 
@@ -23,9 +32,9 @@ module Spree
         order.finalize!
       end
 
-      it 'it will return the percentage of a line item' do
+      it 'will return the percentage of a line item' do
         subject.line_item = line_item
-      	expect(subject.percentage_of_line_item).to eql(BigDecimal.new(0.5, 2))
+        expect(subject.percentage_of_line_item).to eql(BigDecimal(0.5, 2))
       end
     end
   end