spree_my_favourites 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca15c424578e7cce907fead66f437544466cf821
-  data.tar.gz: 204a968c3deee63617596830e0bf08da6474e840
+  metadata.gz: 07274589e84a5a97d64f3289259ab9bb28a0a387
+  data.tar.gz: ba070ea4020e919008917dd5a5a76aad8c14dd96
 SHA512:
-  metadata.gz: 2f94190ef6e7ed0f5837952a004cc69820a31e92df789a873d274c52f284a00cd3ffe5c654bd53118fd15e530a78bba68defc690d549c1a862a525fe1bf19c86
-  data.tar.gz: 3a4092c53fb95329f20595d518fe9280d067354d0b72e178b5550e4d5742f6bd8690c4817441ef29dfb5fe261e10a1843ac9978755cedbc81f44ae17319e808b
+  metadata.gz: a179f9ea88f77d8eab90d26635623df094a84e0dfde1a9316d0cb36d6b88441c1e76a4123574f56b218bb1cf366701893a6729de3c52a10148080a63ef10800a
+  data.tar.gz: 6502a43856b29c3e3d9fcf52d41512fa603ae22ed8b7dbb9799635b1b88235891ea7d893f58a06fdb98377bf9910896508d77777be05adac5e26acaec98838b5

data/app/controllers/spree/account/favourites_controller.rb

@@ -16,7 +16,10 @@ module Spree
       private
 
       def check_logged_in_user
-        redirect_to spree_login_path unless try_spree_current_user
+        unless try_spree_current_user
+          session[:spree_user_return_to] = account_favourites_url 
+          redirect_to spree_login_path 
+        end
       end
 
     end

data/app/controllers/spree/account/orders_controller.rb

@@ -16,7 +16,10 @@ module Spree
       private
 
       def check_logged_in_user
-        redirect_to spree_login_path unless try_spree_current_user
+        unless try_spree_current_user
+          session[:spree_user_return_to] = account_orders_url 
+          redirect_to spree_login_path 
+        end
       end
 
     end

data/app/controllers/spree/store_controller_decorator.rb

@@ -0,0 +1,9 @@
+Spree::StoreController.class_eval do
+
+  before_filter :clear_stored_location_for_sign_in
+
+  def clear_stored_location_for_sign_in
+    session[:return_to] = nil
+  end
+
+end

data/spree_my_favourites.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_my_favourites'
-  s.version     = '2.2.6'
+  s.version     = '2.2.7'
   s.summary     = 'Adds My Favourites tab to My Account section of the website'
   s.required_ruby_version = '>= 2.0.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_my_favourites
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -239,6 +239,7 @@ files:
 - app/assets/stylesheets/spree/frontend/spree_my_favourites.css
 - app/controllers/spree/account/favourites_controller.rb
 - app/controllers/spree/account/orders_controller.rb
+- app/controllers/spree/store_controller_decorator.rb
 - app/models/spree/variant_decorator.rb
 - app/views/spree/account/favourites/index.haml
 - app/views/spree/account/orders/index.haml