From d0098e190f027f931b3fffb66de1c93d9764449c Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Wed, 2 Dec 2020 17:52:08 -0800 Subject: [PATCH] close #4175 --- app/views/spree/users/_authorised_shops.html.haml | 3 +++ app/views/spree/users/_cards.html.haml | 2 -- config/locales/en.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/spree/users/_authorised_shops.html.haml b/app/views/spree/users/_authorised_shops.html.haml index a1cdd58a91..1d033da72f 100644 --- a/app/views/spree/users/_authorised_shops.html.haml +++ b/app/views/spree/users/_authorised_shops.html.haml @@ -1,4 +1,7 @@ %table + %tr + %td{ colspan: 2 } + = t('spree.users.cards.authorised_shops_agreement') %tr %th= t(".shop_name") %th= t(".allow_charges?") diff --git a/app/views/spree/users/_cards.html.haml b/app/views/spree/users/_cards.html.haml index bf28336c83..ea93367405 100644 --- a/app/views/spree/users/_cards.html.haml +++ b/app/views/spree/users/_cards.html.haml @@ -21,6 +21,4 @@ .authorised_shops{ ng: { controller: 'AuthorisedShopsCtrl', hide: 'CreditCard.visible || savedCreditCards.length == 0' } } %h3 = t('.authorised_shops') - %button.button.secondary.tiny.help-btn.ng-scope{ "help-modal" => t('.authorised_shops_popover') } - %i.ofn-i_013-help = render 'authorised_shops' diff --git a/config/locales/en.yml b/config/locales/en.yml index d7e6f9bc8b..8b5a184821 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3701,7 +3701,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using delete?: Delete? cards: authorised_shops: Authorised Shops - authorised_shops_popover: This is the list of shops which are permitted to charge your default credit card for any subscriptions (ie. repeating orders) you may have. Your card details will be kept secure and will not be shared with shop owners. You will always be notified when you are charged. + authorised_shops_agreement: This is the list of shops which are permitted to charge your default credit card for any subscriptions (ie. repeating orders) you may have. Your card details will be kept secure and will not be shared with shop owners. You will always be notified when you are charged. By checking the box for a shop, you are agreeing to authorise that shop to send instructions to the financial institution that issued your card to take payments in accordance with the terms of any subscription you create with that shop. saved_cards_popover: This is the list of cards you have opted to save for later use. Your 'default' will be selected automatically when you checkout an order, and can be charged by any shops you have allowed to do so (see right). authorised_shops: shop_name: "Shop Name"