From f442d41b6c4c9c30d131b3a6e8fef55c76e37d4d Mon Sep 17 00:00:00 2001 From: Ruben Sierra Date: Tue, 30 Jun 2015 10:45:30 +0200 Subject: [PATCH 1/2] Fix the devise helper signed_in_root_path call signed_in_root_path is a helper from devise controller so it needs to be called from controller and not from routes. Fixes #280 --- lib/controllers/frontend/spree/user_confirmations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/controllers/frontend/spree/user_confirmations_controller.rb b/lib/controllers/frontend/spree/user_confirmations_controller.rb index 11e5ce9bd..2720a0cd8 100644 --- a/lib/controllers/frontend/spree/user_confirmations_controller.rb +++ b/lib/controllers/frontend/spree/user_confirmations_controller.rb @@ -16,6 +16,6 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController protected def after_confirmation_path_for(resource_name, resource) - signed_in?(resource_name) ? spree.signed_in_root_path(resource) : spree.login_path + signed_in?(resource_name) ? signed_in_root_path(resource) : spree.login_path end end From 85ad7e01095968f215670a306edba2c53555c70c Mon Sep 17 00:00:00 2001 From: Fernando Alvarez Junco Date: Fri, 11 Sep 2015 15:47:06 +0200 Subject: [PATCH 2/2] Removed html link from text/plain email template --- .../spree/user_mailer/confirmation_instructions.text.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb b/lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb index 39832a34c..b788ac622 100644 --- a/lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb +++ b/lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb @@ -1,5 +1,5 @@ Welcome <%= @email %>! -You can confirm your account email through the link below: +You can confirm your account email through the url below: -<%= link_to 'Confirm my account', @confirmation_url %> \ No newline at end of file +<%= @confirmation_url %> \ No newline at end of file