From f3ba0ebdbb05280032132cfa5a4ef916c3765490 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 22 Sep 2020 18:37:51 +0100 Subject: [PATCH] Move code to a new helper --- app/helpers/terms_and_conditions_helper.rb | 16 ++++++++++++++++ .../checkout/_terms_and_conditions.html.haml | 3 --- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 app/helpers/terms_and_conditions_helper.rb diff --git a/app/helpers/terms_and_conditions_helper.rb b/app/helpers/terms_and_conditions_helper.rb new file mode 100644 index 0000000000..70b497af61 --- /dev/null +++ b/app/helpers/terms_and_conditions_helper.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module TermsAndConditionsHelper + def terms_and_conditions_activated + current_order.distributor.terms_and_conditions.file? + end + + def terms_and_conditions_already_accepted + customer_terms_and_conditions_accepted_at = spree_current_user. + customer_of(current_order.distributor)&.terms_and_conditions_accepted_at + + customer_terms_and_conditions_accepted_at.present? && + (customer_terms_and_conditions_accepted_at > + current_order.distributor.terms_and_conditions_updated_at) + end +end diff --git a/app/views/checkout/_terms_and_conditions.html.haml b/app/views/checkout/_terms_and_conditions.html.haml index 0352ce804f..9ac1e1e3f4 100644 --- a/app/views/checkout/_terms_and_conditions.html.haml +++ b/app/views/checkout/_terms_and_conditions.html.haml @@ -1,6 +1,3 @@ -- terms_and_conditions_activated = current_order.distributor.terms_and_conditions.file? -- customer_terms_and_conditions_accepted_at = spree_current_user.customer_of(current_order.distributor).andand.terms_and_conditions_accepted_at -- terms_and_conditions_already_accepted = customer_terms_and_conditions_accepted_at.present? && (customer_terms_and_conditions_accepted_at > current_order.distributor.terms_and_conditions_updated_at) - if terms_and_conditions_activated %p %input{ type: 'checkbox', id: 'accept_terms', ng: { model: "terms_and_conditions_accepted", init: "terms_and_conditions_activated=#{terms_and_conditions_activated}; terms_and_conditions_accepted=#{terms_and_conditions_already_accepted}" } }