Merge pull request #3 from deseretbook/solidus-2.0

Solidus 2.0

Author: dgra

Gemfile

@@ -2,11 +2,12 @@ source 'https://rubygems.org'
 
 gem 'therubyracer', group: :development
 
-gem 'solidus', '~> 1.4.0'
+gem 'solidus', '~> 2.0.0'
 gem 'solidus_auth_devise'
 gem 'solidus_backend'
 gem 'solidus_api'
-gem 'solidus_i18n'
+# Specify which solidus_i18n and master branch to allow us to use solidus 2.0
+gem 'solidus_i18n', github: 'solidusio-contrib/solidus_i18n', branch: 'master'
 
 group :development, :test do
   # Call `binding.pry` anywhere in the code to stop execution and get a debugger console.

app/controllers/spree/admin/notes_controller.rb

@@ -1,6 +1,6 @@
 class Spree::Admin::NotesController < Spree::Admin::BaseController
 
-  before_filter :load_noteable
+  before_action :load_noteable
 
   def create
     @note = Spree::Note.new(note_params)
@@ -9,7 +9,7 @@ def create
     @note.save
 
     flash[:success] = "Note Saved"
-    redirect_to :back
+    redirect_back(fallback_location: root_path)
   end
 
   protected

app/controllers/spree/admin/users_controller_decorator.rb

@@ -1,5 +1,5 @@
 Spree::Admin::UsersController.class_eval do
-  append_before_filter :load_user_orders, only: :edit
+  append_before_action :load_user_orders, only: :edit
 
   private
 

db/migrate/20140627182438_create_spree_notes.rb

@@ -1,4 +1,4 @@
-class CreateSpreeNotes < ActiveRecord::Migration
+class CreateSpreeNotes < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_notes do |t|
       t.references :noteable, polymorphic: true, index: true

solidus_notes.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_notes'
-  s.version     = '1.4.0'
+  s.version     = '2.0.0'
   s.summary     = 'Allows admins to add custom notes to orders and users'
   s.description = 'Allows admins to add custom notes to orders and users'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.2.2'
 
   s.author            = 'Chris Ewa;d'
   s.email             = '[email protected]'