raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8483 from Matt-Yorkley/guest-token

Browse Source 
Remove dead code: session[:guest_token]
This commit is contained in:
Maikel
2021-11-17 17:07:00 +11:00
committed by GitHub
parent 917ca7b0cf d0f572b051
commit c5c09dbcf8
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/spree/users_controller.rb
View File

@@ -34,11 +34,6 @@ module Spree
def create
@user = Spree::User.new(user_params)
if @user.save
if current_order
session[:guest_token] = nil
end
redirect_back_or_default(main_app.root_url)
else
render :new

6
lib/spree/core/controller_helpers/order.rb
View File

@@ -59,11 +59,9 @@ module Spree
def associate_user
@order ||= current_order
if spree_current_user && @order && (@order.user.blank? || @order.email.blank?)
@order.associate_user!(spree_current_user)
end
return unless spree_current_user && @order && (@order.user.blank? || @order.email.blank?)
session[:guest_token] = nil
@order.associate_user!(spree_current_user)
end
# Recover incomplete orders from other sessions after logging in.