From a6ea79d3a588f8189df5884194f534053898af90 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Wed, 13 May 2020 15:35:01 +0100 Subject: [PATCH] Add warning message to enterprise ship methods list and ship method edit page --- app/views/admin/enterprises/form/_shipping_methods.html.haml | 2 ++ app/views/spree/admin/shipping_methods/_form.html.haml | 2 ++ config/locales/en.yml | 1 + 3 files changed, 5 insertions(+) diff --git a/app/views/admin/enterprises/form/_shipping_methods.html.haml b/app/views/admin/enterprises/form/_shipping_methods.html.haml index 877b650c9e..68f7332ef3 100644 --- a/app/views/admin/enterprises/form/_shipping_methods.html.haml +++ b/app/views/admin/enterprises/form/_shipping_methods.html.haml @@ -1,4 +1,6 @@ - if @shipping_methods.count > 0 + .row + = t 'spree.admin.shipping_methods.form.deactivation_warning' %table %thead %tr diff --git a/app/views/spree/admin/shipping_methods/_form.html.haml b/app/views/spree/admin/shipping_methods/_form.html.haml index 923e7b205c..b95481cc04 100644 --- a/app/views/spree/admin/shipping_methods/_form.html.haml +++ b/app/views/spree/admin/shipping_methods/_form.html.haml @@ -1,6 +1,8 @@ = admin_inject_shipping_method .alpha.eleven.columns{ "ng-app" => "admin.shippingMethods", "ng-controller" => "shippingMethodCtrl" } + .row + = t '.deactivation_warning' .row .alpha.three.columns = f.label :name, t(:name) diff --git a/config/locales/en.yml b/config/locales/en.yml index c952f8fb30..14231b0233 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3246,6 +3246,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using zones: "Zones" both: "Both Checkout and Back office" back_end: "Back office only" + deactivation_warning: "De-activating a shipping method can make the shipping method disappear from your list. Alternatively, you can hide a shipping method from the checkout page by setting the option 'Display' to 'back office only'." payment_methods: new: new_payment_method: "New Payment Method"