Skip to content
This repository was archived by the owner on Sep 19, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ nbproject
*.swp
spec/dummy
Gemfile.lock
coverage
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.2
2.5.0
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ group :development, :test do
gem 'i18n-tasks', '~> 0.9' if branch == 'master'
end

gem 'simplecov', require: false, group: :test

gem 'mysql2'
gem 'sqlite3'
gem 'pg'
Expand Down
32 changes: 0 additions & 32 deletions app/controllers/spree/admin/orders_controller_decorator.rb

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions app/models/variant_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ def self.prepended(base)
serializer: SolidusShipwire::VariantSerializer
end

def update_stocks_from_shipwire
Shipwire::Stock.new.list( sku: self.sku)
end

Spree::Variant.prepend self
end
end
31 changes: 0 additions & 31 deletions app/views/spree/admin/orders/_shipwire_data.html.erb

This file was deleted.

18 changes: 0 additions & 18 deletions app/views/spree/admin/orders/_shipwire_error.html.erb

This file was deleted.

39 changes: 0 additions & 39 deletions app/views/spree/admin/orders/shipwire.html.erb

This file was deleted.

7 changes: 0 additions & 7 deletions app/views/spree/admin/orders/shipwire.js.erb

This file was deleted.

18 changes: 3 additions & 15 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
Spree::Core::Engine.routes.draw do
# Add your extension routes here

Spree::Core::Engine.routes.draw do
namespace :admin do
resources :orders, except: [:show] do
member do
get :shipwire
end
end
end

namespace :api, defaults: { format: 'json' } do
resources :shipments do
resources :rates, only: [:index], module: :shipwire
end
namespace :api, defaults: { format: 'json' } do
resources :shipments do
resources :rates, only: [:index], module: :shipwire
end
end

Expand Down
3 changes: 3 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Configure Rails Environment
ENV['RAILS_ENV'] = 'test'

require 'simplecov'
SimpleCov.start 'rails'

begin
require File.expand_path('../dummy/config/environment', __FILE__)
rescue LoadError
Expand Down