diff --git a/app/models/spree/app_configuration_decorator.rb b/app/models/spree/app_configuration_decorator.rb index 2dfda8949c..4f8a80bf96 100644 --- a/app/models/spree/app_configuration_decorator.rb +++ b/app/models/spree/app_configuration_decorator.rb @@ -6,7 +6,6 @@ Spree::AppConfiguration.class_eval do # Terms of Service Preferences preference :enterprises_require_tos, :boolean, default: false - preference :enterprise_tos_link, :string, default: "/Terms-of-service.pdf" # Tax Preferences preference :products_require_tax_category, :boolean, default: false diff --git a/app/overrides/spree/admin/general_settings/edit/tos_settings.html.haml.deface b/app/overrides/spree/admin/general_settings/edit/tos_settings.html.haml.deface index 9d573c3ac1..e0a588d740 100644 --- a/app/overrides/spree/admin/general_settings/edit/tos_settings.html.haml.deface +++ b/app/overrides/spree/admin/general_settings/edit/tos_settings.html.haml.deface @@ -2,10 +2,6 @@ %fieldset.enterprise_toc.no-border-bottom %legend{:align => "center"}= t(:enterprise_terms_of_service) - - [:enterprise_tos_link, :enterprises_require_tos].each do |pref| - - type = Spree::Config.preference_type(pref) - .field - = label_tag(pref, t(pref) + ': ') + tag(:br) if type != :boolean - = preference_field_tag(pref, Spree::Config[pref], :type => type) - = label_tag(pref, t(pref)) + tag(:br) if type == :boolean - + .field + = preference_field_tag(:enterprises_require_tos, Spree::Config[:enterprises_require_tos], :type => Spree::Config.preference_type(:enterprises_require_tos)) + = label_tag(:enterprises_require_tos, t(:enterprises_require_tos)) + tag(:br) diff --git a/app/views/registration/steps/_introduction.html.haml b/app/views/registration/steps/_introduction.html.haml index c663886a03..57055bc2ea 100644 --- a/app/views/registration/steps/_introduction.html.haml +++ b/app/views/registration/steps/_introduction.html.haml @@ -37,7 +37,7 @@ .small-12.columns{'ng-hide' => '!tos_required' } %p.tos-message #{t(:enterprise_tos_message)} - %a{href: "#{Spree::Config.enterprise_tos_link}", target: "_blank" } #{t(:enterprise_tos_link_text)} + %a{href: ContentConfig.footer_tos_url, target: "_blank" } #{t(:enterprise_tos_link_text)} %p.tos-checkbox %input{ type: 'checkbox', name: 'accept_terms', id: 'accept_terms', ng: { model: "tos_accepted" } } %label{for: "accept_terms"} #{t(:enterprise_tos_agree)}