From b736560d630cfabe7abeacb7de1f5728b615d768 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 3 Aug 2018 14:59:27 +1000 Subject: [PATCH] Inform about inaccurate subscription totals https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038 --- app/assets/stylesheets/admin/index_panel_buttons.css.scss | 1 + app/views/admin/subscriptions/_review.html.haml | 2 ++ .../admin/subscriptions/_subscription_line_items.html.haml | 2 ++ config/locales/en.yml | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/app/assets/stylesheets/admin/index_panel_buttons.css.scss b/app/assets/stylesheets/admin/index_panel_buttons.css.scss index 50e174eb37..4ff84bac89 100644 --- a/app/assets/stylesheets/admin/index_panel_buttons.css.scss +++ b/app/assets/stylesheets/admin/index_panel_buttons.css.scss @@ -5,6 +5,7 @@ tbody.panel-ctrl { > td { a.update { cursor: pointer; + margin-top: 10px; margin-bottom: 10px; font-size: 1.3rem; background-color: $warning-red; diff --git a/app/views/admin/subscriptions/_review.html.haml b/app/views/admin/subscriptions/_review.html.haml index 38f597a36b..e1591e6210 100644 --- a/app/views/admin/subscriptions/_review.html.haml +++ b/app/views/admin/subscriptions/_review.html.haml @@ -91,3 +91,5 @@ \: %td.total.align-center %span#order_form_total {{ subscription.estimatedTotal() | currency }} + %p.notice + = t "this_is_an_estimate", scope: 'admin.subscriptions.subscription_line_items' diff --git a/app/views/admin/subscriptions/_subscription_line_items.html.haml b/app/views/admin/subscriptions/_subscription_line_items.html.haml index 0ef917dd3d..0be91f2c93 100644 --- a/app/views/admin/subscriptions/_subscription_line_items.html.haml +++ b/app/views/admin/subscriptions/_subscription_line_items.html.haml @@ -49,3 +49,5 @@ %td.total.align-center %span#order_form_total {{ subscription.estimatedTotal() | currency }} %td.actions +%p.notice + = t ".this_is_an_estimate" diff --git a/config/locales/en.yml b/config/locales/en.yml index bbd76162a0..7eee25742e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -999,6 +999,10 @@ en: address: 2. Address products: 3. Add Products review: 4. Review & Save + subscription_line_items: + this_is_an_estimate: | + The displayed prices are only an estimate and calculated at the time the subscription is changed. + If you change prices or fees, orders will be updated, but the subscription will still display the old values. details: details: Details invalid_error: Oops! Please fill in all of the required fields...