From ad592785cf9b3f36c04801b3e0918317c5345a6a Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 22 Sep 2020 18:39:54 +0100 Subject: [PATCH] Rename methods to follwo ruby convention and improve readability --- app/helpers/terms_and_conditions_helper.rb | 4 ++-- app/views/checkout/_terms_and_conditions.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/terms_and_conditions_helper.rb b/app/helpers/terms_and_conditions_helper.rb index 70b497af61..e748b520ec 100644 --- a/app/helpers/terms_and_conditions_helper.rb +++ b/app/helpers/terms_and_conditions_helper.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true module TermsAndConditionsHelper - def terms_and_conditions_activated + def terms_and_conditions_activated? current_order.distributor.terms_and_conditions.file? end - def terms_and_conditions_already_accepted + 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 diff --git a/app/views/checkout/_terms_and_conditions.html.haml b/app/views/checkout/_terms_and_conditions.html.haml index 9ac1e1e3f4..05e0122ae7 100644 --- a/app/views/checkout/_terms_and_conditions.html.haml +++ b/app/views/checkout/_terms_and_conditions.html.haml @@ -1,4 +1,4 @@ -- if terms_and_conditions_activated +- 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}" } } + %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?}" } } %label.small{for: "accept_terms"}= t('.message_html', terms_and_conditions_link: link_to( t( '.link_text' ), current_order.distributor.terms_and_conditions.url, target: '_blank'))