diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d8bc97fb..c9da4a76 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -196,7 +196,7 @@ def create_session(u = nil, action = '') handle_remember_cookie! new_cookie_flag # finally: reset all store-related session state UNLESS the login # was performed as part of a checkout flow - reset_shopping unless @gOrderInProgress + reset_shopping unless @gOrderInProgress session[:new_session] = true if action == 'reset_token' redirect_to change_password_for_customer_path(@user), :alert => I18n.t('login.change_password_now') diff --git a/app/views/layouts/_login_form.haml b/app/views/layouts/_login_form.haml index f4f27ae1..d11e087d 100644 --- a/app/views/layouts/_login_form.haml +++ b/app/views/layouts/_login_form.haml @@ -1,7 +1,7 @@ = form_tag session_path, :class => 'form' do .card .card-header.text-center - %h3 + %h3 = head .card-body .row