spree_drop_ship 3.1.0.1

data/lib/spree_drop_ship/factories.rb

@@ -0,0 +1,93 @@
+FactoryGirl.define do
+
+  factory :order_for_drop_ship, parent: :order do
+    bill_address
+    ship_address
+
+    ignore do
+      line_items_count 5
+    end
+
+    after(:create) do |order, evaluator|
+      supplier = create(:supplier)
+      product = create(:product)
+      product.add_supplier! supplier
+      # product.stock_items.where(variant_id: product.master.id).first.adjust_count_on_hand(10)
+
+      product_2 = create(:product)
+      product_2.add_supplier! create(:supplier)
+
+      create_list(:line_item, evaluator.line_items_count,
+        order: order,
+        variant: product_2.master
+      )
+      order.line_items.reload
+
+      create(:shipment, order: order, stock_location: supplier.stock_locations.first)
+      order.shipments.reload
+
+      order.update!
+    end
+
+    factory :completed_order_for_drop_ship_with_totals do
+      state 'complete'
+
+      after(:create) do |order|
+        order.refresh_shipment_rates
+        order.update_column(:completed_at, Time.now)
+      end
+
+      factory :order_ready_for_drop_ship do
+        payment_state 'paid'
+        shipment_state 'ready'
+
+        after(:create) do |order|
+          create(:payment, amount: order.total, order: order, state: 'completed')
+          order.shipments.each do |shipment|
+            shipment.inventory_units.each { |u| u.update_column('state', 'on_hand') }
+            shipment.update_column('state', 'ready')
+          end
+          order.reload
+        end
+
+        factory :shipped_order_for_drop_ship do
+          after(:create) do |order|
+            order.shipments.each do |shipment|
+              shipment.inventory_units.each { |u| u.update_column('state', 'shipped') }
+              shipment.update_column('state', 'shipped')
+            end
+            order.reload
+          end
+        end
+      end
+    end
+  end
+
+  factory :supplier, :class => Spree::Supplier do
+    sequence(:name) { |i| "Big Store #{i}" }
+    email { FFaker::Internet.email }
+    url "http://example.com"
+    address
+    # Creating a stock location with a factory instead of letting the model handle it
+    # so that we can run tests with backorderable defaulting to true.
+    before :create do |supplier|
+      supplier.stock_locations << build(:stock_location, name: supplier.name, supplier: supplier)
+    end
+
+    factory :supplier_with_commission do
+      commission_flat_rate 0.5
+      commission_percentage 10
+    end
+  end
+
+  factory :supplier_user, parent: :user do
+    supplier
+  end
+
+  factory :variant_with_supplier, parent: :variant do
+    after :create do |variant|
+      variant.product.add_supplier! create(:supplier)
+    end
+  end
+
+end

data/lib/spree_drop_ship.rb

@@ -0,0 +1,6 @@
+require 'durable_decorator'
+require 'sass/rails'
+require 'spree_api'
+require 'spree_backend'
+require 'spree_core'
+require 'spree_drop_ship/engine'

data/lib/tasks/spree_sample.rake

@@ -0,0 +1,72 @@
+namespace :spree_sample do
+  desc "Create sample drop ship orders"
+  task :drop_ship_orders => :environment do
+    if Spree::Order.count == 0
+      puts "Please run `rake spree_sample:load` first to create products and orders"
+      exit
+    end
+
+    if Spree::Supplier.count == 0
+      puts "Please run `rake spree_sample:suppliers` first to create suppliers"
+      exit
+    end
+
+    count      = 0
+    @orders    = Spree::Order.complete.includes(:line_items).all
+    @suppliers = Spree::Supplier.all
+
+    puts "Linking existing line items to suppliers"
+    Spree::LineItem.all.each do |li|
+      print "*" if li.product.add_supplier! @suppliers.shuffle.first.id and li.save
+    end
+    puts
+
+    puts "Creating drop ship orders for existing orders"
+    Spree::Order.all.each do |order|
+      print "*" if order.finalize!
+    end
+    puts
+  end
+
+  desc "Create sample suppliers and randomly link to products"
+  task :suppliers => :environment do
+    old_send_value = SpreeDropShip::Config[:send_supplier_email]
+    SpreeDropShip::Config[:send_supplier_email] = false
+
+    @usa = Spree::Country.find_by_iso("US")
+    @ca  = @usa.states.find_by_abbr("CA")
+
+    count = Spree::Supplier.count
+    puts "Creating Suppliers..."
+    5.times{|i|
+      name = "Supplier #{count + i + 1}"
+      supplier = Spree::Supplier.new(:name => name,
+                                   :email => "#{name.parameterize}@example.com",
+                                   :url => "http://example.com")
+      supplier.build_address(:firstname => name, :lastname => name,
+                             :address1 => "100 State St",
+                             :city => "Santa Barbara", :zipcode => "93101",
+                             :state_id => @ca.id, :country_id => @usa.id,
+                             :phone => '1234567890')
+      print "*" if supplier.save
+    }
+    puts
+    puts "#{Spree::Supplier.count - count} suppliers created"
+
+    puts "Randomly linking Products & Suppliers..."
+
+    @supplier_ids = Spree::Supplier.pluck(:id).shuffle
+    @products     = Spree::Product.all
+    count         = 0
+
+    @products.each do |product|
+      product.add_supplier! Spree::Supplier.find(@supplier_ids[rand(@supplier_ids.length)])
+      product.save
+      count += 1
+      print "*"
+    end
+    puts
+    puts "#{count} products linked."
+    SpreeDropShip::Config[:send_supplier_email] = old_send_value
+  end
+end

data/script/rails

@@ -0,0 +1,7 @@
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree_drop_ship/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

data/spec/features/admin/orders_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe 'Admin - Orders', js: true do
+
+  it 'Supplier should not be authorized' do
+    create(:user) # create extra user so admin role isnt assigned to the user we login as
+    login_user create(:supplier_user)
+    visit spree.admin_orders_path
+    page.should have_content('Authorization Failure')
+  end
+
+end

data/spec/features/admin/products_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'Admin - Products', js: true do
+
+  context 'as Admin' do
+
+    xit 'should be able to change supplier' do
+      s1 = create(:supplier)
+      s2 = create(:supplier)
+      product = create :product
+      product.add_supplier! s1
+
+      login_user create(:admin_user)
+      visit spree.admin_product_path(product)
+
+      select2 s2.name, from: 'Supplier'
+      click_button 'Update'
+
+      expect(page).to have_content("Product \"#{product.name}\" has been successfully updated!")
+      expect(product.reload.suppliers.first.id).to eql(s2.id)
+    end
+
+  end
+
+end

data/spec/features/admin/return_authorizations_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe "Admin - Return Authorizations" do
+
+  skip 'TODO: need to write, but should likely wait until after https://github.com/spree/spree/issues/4026'
+
+end

data/spec/features/admin/settings_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'Admin - DropShip Settings', js: true do
+
+  before do
+    login_user create(:admin_user)
+
+    visit spree.admin_path
+    within '[data-hook=admin_tabs]' do
+      click_link 'Configuration'
+    end
+    within 'ul[data-hook=admin_configurations_sidebar_menu]' do
+      click_link 'Drop Ship Settings'
+    end
+  end
+
+  it 'should be able to be updated' do
+    # Change settings
+    uncheck 'send_supplier_email'
+    fill_in 'default_commission_flat_rate', with: 0.30
+    fill_in 'default_commission_percentage', with: 10
+    click_button 'Update'
+    expect(page).to have_content('Drop ship settings successfully updated.')
+
+    # Verify update saved properly by reversing checkboxes or checking field values.
+    check 'send_supplier_email'
+    click_button 'Update'
+    find_field('default_commission_flat_rate').value.to_f.should eql(0.3)
+    find_field('default_commission_percentage').value.to_f.should eql(10.0)
+    expect(page).to have_content('Drop ship settings successfully updated.')
+  end
+
+end

data/spec/features/admin/shipments_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe 'Admin - Shipments', js: true do
+
+  context 'as Supplier' do
+
+    let!(:order) { build(:order_ready_for_drop_ship, state: 'complete', completed_at: "2011-02-01 12:36:15", number: "R100") }
+    let!(:supplier) { create(:supplier) }
+
+    let!(:product) {
+      p = create(:product, name: 'spree t-shirt', price: 20.00)
+      p.add_supplier! supplier.id
+      p
+    }
+
+    let!(:shipment) { create(:shipment, order: order, stock_location: supplier.stock_locations.first) }
+    let!(:shipping_method) { create(:shipping_method, name: "Default") }
+
+    before do
+      # Adjust qoh so shipment will be ready
+      shipment.stock_location.stock_items.where(variant_id: product.master.id).first.adjust_count_on_hand(10)
+      # Add product and update shipment
+      order.contents.add(product.master, 2)
+      shipment.refresh_rates
+      shipment.update!(order)
+      shipment.update_amounts
+
+      # TODO this is a hack until capture_on_dispatch finished https://github.com/spree/spree/issues/4727
+      shipment.update_attribute :state, 'ready'
+
+      user = create(:user, supplier: supplier)
+      user.generate_spree_api_key!
+      login_user user
+
+      visit spree.edit_admin_shipment_path(shipment)
+    end
+
+    context 'edit page' do
+
+      it "can add tracking information" do
+        within '.table tr.show-tracking' do
+          click_icon :edit
+        end
+        within '.table tr.edit-tracking' do
+          fill_in "tracking", with: "FOOBAR"
+          click_icon :save
+        end
+        wait_for_ajax
+        within '.table tr.show-tracking' do
+          page.should have_content("Tracking: FOOBAR")
+        end
+      end
+
+      it "can change the shipping method" do
+        within(".table tr.show-method") do
+          click_icon :edit
+        end
+        select2 "Default", from: "Shipping Method"
+        click_icon :save
+        wait_for_ajax
+
+        page.should have_content("Default $0.00")
+      end
+
+      it "can ship a completed order" do
+        click_on "Ship"
+        wait_for_ajax
+
+        page.should have_content("shipped package")
+        order.reload.shipment_state.should == "shipped"
+      end
+    end
+
+    it 'should render unauthorized visiting another suppliers shipment' do
+      visit spree.edit_admin_shipment_path(create(:shipment))
+      page.should have_content('Authorization Failure')
+    end
+  end
+
+end

data/spec/features/admin/stock_management_spec.rb

@@ -0,0 +1,153 @@
+require 'spec_helper'
+
+describe "Stock Management", js: true do
+
+  before do
+    @user = create(:supplier_user)
+    login_user @user
+    visit spree.admin_shipments_path
+  end
+
+  context "as supplier user" do
+
+    context "given a product with a variant and a stock location" do
+      before do
+        @secondary = create(:stock_location, name: 'Secondary', supplier: @user.supplier)
+        @product = create(:product, name: 'apache baseball cap', price: 10)
+        @v = @product.variants.create!(sku: 'FOOBAR')
+        @user.supplier.reload.stock_locations.update_all backorderable_default: false # True database default is false.
+      end
+
+      context 'with single variant' do
+        before do
+          @product.add_supplier! @user.supplier
+          @v.stock_items.first.update_column(:count_on_hand, 10)
+          @secondary.stock_item(@v).destroy
+          click_link "Products"
+          within '#sidebar-product' do
+            click_link 'Products'
+          end
+          click_link @product.name
+          within '[data-hook=admin_product_tabs]' do
+            click_link "Stock"
+          end
+        end
+
+        it "should not show deleted stock_items" do
+          within(:css, '.stock_location_info') do
+            page.should have_content(@user.supplier.name)
+            page.should_not have_content('Secondary')
+          end
+        end
+
+        it "can toggle backorderable for a variant's stock item", js: true do
+          backorderable = find(".stock_item_backorderable")
+          backorderable.should_not be_checked
+
+          backorderable.set(true)
+
+          visit current_path
+
+          backorderable = find(".stock_item_backorderable")
+          backorderable.should be_checked
+        end
+
+        # Regression test for #2896
+        # The regression was that unchecking the last checkbox caused a redirect
+        # to happen. By ensuring that we're still on an /admin/products URL, we
+        # assert that the redirect is *not* happening.
+        it "can toggle backorderable for the second variant stock item", js: true do
+          new_location = create(:stock_location, name: "Another Location", supplier: @user.supplier)
+          visit page.current_path
+
+          new_location_backorderable = find "#stock_item_backorderable_#{new_location.id}"
+          new_location_backorderable.set(false)
+          # Wait for API request to complete.
+          sleep(1)
+
+          page.current_url.should include("/admin/products")
+        end
+
+        it "can create a new stock movement", js: true do
+          fill_in "stock_movement_quantity", with: 5
+          select2 @user.supplier.name, from: "Stock Location"
+          click_button "Add Stock"
+
+          page.should have_content('successfully created')
+          within(:css, '.stock_location_info table') do
+            column_text(2).should eq '15'
+          end
+        end
+
+        it "can create a new negative stock movement", js: true do
+          fill_in "stock_movement_quantity", with: -5
+          select2 @user.supplier.name, from: "Stock Location"
+          click_button "Add Stock"
+
+          page.should have_content('successfully created')
+
+          within(:css, '.stock_location_info table') do
+            column_text(2).should eq '5'
+          end
+        end
+
+        it "can create a new negative stock movement", js: true do
+          fill_in "stock_movement_quantity", with: -5
+          select2 @user.supplier.name, from: "Stock Location"
+          click_button "Add Stock"
+
+          page.should have_content('successfully created')
+
+          within(:css, '.stock_location_info table') do
+            column_text(2).should eq '5'
+          end
+        end
+      end
+
+      context "with multiple variants" do
+        before do
+          v = @product.variants.create!(sku: 'SPREEC')
+          @product.add_supplier! @user.supplier
+          v.stock_items.first.update_column(:count_on_hand, 30)
+
+          click_link "Products"
+          within '#sidebar-product' do
+            click_link 'Products'
+          end
+          click_link @product.name
+          within '[data-hook=admin_product_tabs]' do
+            click_link "Stock"
+          end
+        end
+
+        it "can create a new stock movement for the specified variant", js: true do
+          fill_in "stock_movement_quantity", with: 10
+          select2 "SPREEC", from: "Variant"
+          click_button "Add Stock"
+
+          page.should have_content('successfully created')
+        end
+      end
+    end
+
+    # Regression test for #3304
+    context "with no stock location" do
+      before do
+        @product = create(:product, name: 'apache baseball cap', price: 10)
+        @product.add_supplier! @user.supplier
+        @product.variants.create!(sku: 'FOOBAR')
+        Spree::StockLocation.delete_all
+        click_link "Products"
+        within '#sidebar-product' do
+          click_link 'Products'
+        end
+        click_link @product.name
+      end
+
+      it "redirects to stock locations page" do
+        page.should have_content(Spree.t(:stock_management_requires_a_stock_location))
+        page.current_url.should include("admin/stock_locations")
+      end
+    end
+  end
+end

data/spec/features/admin/stock_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+feature 'Admin - Product Stock Management', js: true do
+
+  before do
+    @user = create(:supplier_user)
+    @supplier1 = @user.supplier
+    @supplier2 = create(:supplier)
+    @product = create :product
+    @product.add_supplier! @supplier1
+  end
+
+  context 'as Admin' do
+
+    scenario 'should display all existing stock item locations' do
+      login_user create(:admin_user)
+      visit spree.stock_admin_product_path(@product)
+
+      within '.stock_location_info' do
+        page.should have_content(@supplier1.name)
+        # Stock item doesn't exist
+        page.should_not have_content(@supplier2.name)
+      end
+    end
+
+  end
+
+  context 'as Supplier' do
+
+    before(:each) do
+      login_user @user
+      visit '/admin/products'
+      click_link "Stock Locations"
+    end
+
+    scenario 'should only display suppliers stock locations' do
+      visit spree.stock_admin_product_path(@product)
+
+      within '.stock_location_info' do
+        page.should have_content(@supplier1.name)
+        page.should_not have_content(@supplier2.name)
+      end
+    end
+
+    scenario "can create a new stock location" do
+      visit spree.new_admin_stock_location_path
+      fill_in "Name", with: "London"
+      check "Active"
+      click_button "Create"
+
+      page.should have_content("successfully created")
+      page.should have_content("London")
+    end
+
+    scenario "can delete an existing stock location", js: true do
+      create(:stock_location, supplier: @user.supplier)
+      visit current_path
+
+      find('#listing_stock_locations').should have_content("NY Warehouse")
+      within_row(2) { click_icon :delete }
+      page.driver.browser.switch_to.alert.accept
+      # Wait for API request to complete.
+      sleep(1)
+      visit current_path
+
+      find('#listing_stock_locations').should_not have_content("NY Warehouse")
+    end
+
+    scenario "can update an existing stock location" do
+      create(:stock_location, supplier: @user.supplier)
+      visit current_path
+
+      page.should have_content("Big Store")
+
+      within_row(1) { click_icon :edit }
+      fill_in "Name", with: "London"
+      click_button "Update"
+
+      page.should have_content("successfully updated")
+      page.should have_content("London")
+    end
+
+    scenario "can deactivate an existing stock location" do
+      create(:stock_location, supplier: @user.supplier)
+      visit current_path
+
+      page.should have_content("Big Store")
+
+      within_row(1) { click_icon :edit }
+      uncheck "Active"
+      click_button "Update"
+
+      find('#listing_stock_locations').should have_content("Inactive")
+    end
+
+  end
+
+end