From 91e5227d803141123c3c1fbaf1b4d15ef49bae91 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Mon, 27 Nov 2023 11:54:04 +1100 Subject: [PATCH] Move to simple UserReflex --- app/reflexes/enterprise/user_reflex.rb | 11 ----------- app/reflexes/user_reflex.rb | 9 +++++++++ app/views/admin/_terms_of_service_banner.html.haml | 2 +- spec/reflexes/{enterprise => }/user_reflex_spec.rb | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 app/reflexes/enterprise/user_reflex.rb create mode 100644 app/reflexes/user_reflex.rb rename spec/reflexes/{enterprise => }/user_reflex_spec.rb (93%) diff --git a/app/reflexes/enterprise/user_reflex.rb b/app/reflexes/enterprise/user_reflex.rb deleted file mode 100644 index 8996a2ab30..0000000000 --- a/app/reflexes/enterprise/user_reflex.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class Enterprise - class UserReflex < ApplicationReflex - def accept_terms_of_services - current_user.update(terms_of_service_accepted_at: DateTime.now) - - morph "#banner-container", "" - end - end -end diff --git a/app/reflexes/user_reflex.rb b/app/reflexes/user_reflex.rb new file mode 100644 index 0000000000..d4b5f59be5 --- /dev/null +++ b/app/reflexes/user_reflex.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class UserReflex < ApplicationReflex + def accept_terms_of_services + current_user.update(terms_of_service_accepted_at: DateTime.now) + + morph "#banner-container", "" + end +end diff --git a/app/views/admin/_terms_of_service_banner.html.haml b/app/views/admin/_terms_of_service_banner.html.haml index f661015a45..3adbba2f93 100644 --- a/app/views/admin/_terms_of_service_banner.html.haml +++ b/app/views/admin/_terms_of_service_banner.html.haml @@ -3,6 +3,6 @@ .column-left %p= t("admin.terms_of_service_have_been_updated_html", tos_link: link_to(t("admin.terms_of_service"), TermsOfServiceFile.current_url, target: "_blank")) .column-right - %button{ data: { reflex: "click->Enterprise::User#accept_terms_of_services" } } + %button{ data: { reflex: "click->user#accept_terms_of_services" } } = t("admin.accept_terms_of_service") diff --git a/spec/reflexes/enterprise/user_reflex_spec.rb b/spec/reflexes/user_reflex_spec.rb similarity index 93% rename from spec/reflexes/enterprise/user_reflex_spec.rb rename to spec/reflexes/user_reflex_spec.rb index 67a4cbb1ab..815557208f 100644 --- a/spec/reflexes/enterprise/user_reflex_spec.rb +++ b/spec/reflexes/user_reflex_spec.rb @@ -2,7 +2,7 @@ require "reflex_helper" -describe Enterprise::UserReflex, type: :reflex do +describe UserReflex, type: :reflex do let(:current_user) { create(:user) } let(:context) { { url: spree.admin_dashboard_url, connection: { current_user: } } }