diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 1e1ff30314..fd01009036 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -46,7 +46,10 @@ module Admin # Initialize data params[:display_summary_row] = true if request.get? - params[:fields_to_show] = @report.columns.keys if request.get? + if OpenFoodNetwork::FeatureToggle.enabled?(:report_inverse_columns_logic, + spree_current_user) && request.get? + params[:fields_to_show] = @report.columns.keys + end @data = Reporting::FrontendData.new(spree_current_user) end diff --git a/app/views/admin/reports/_rendering_options.html.haml b/app/views/admin/reports/_rendering_options.html.haml index 2ab2856d92..32639d6e35 100644 --- a/app/views/admin/reports/_rendering_options.html.haml +++ b/app/views/admin/reports/_rendering_options.html.haml @@ -19,10 +19,16 @@ - if @report.available_headers.present? .row - .alpha.two.columns= label_tag nil, t(:report_columns) - .omega.fourteen.columns - = select_tag(:fields_to_show, options_for_select(@report.available_headers, params[:fields_to_show]), - class: "select2 fullwidth", multiple: true) + - if feature? :report_inverse_columns_logic, spree_current_user + .alpha.two.columns= label_tag nil, t(:report_columns) + .omega.fourteen.columns + = select_tag(:fields_to_show, options_for_select(@report.available_headers, params[:fields_to_show]), + class: "select2 fullwidth", multiple: true) + - else + .alpha.two.columns= label_tag nil, t(:report_hide_columns) + .omega.fourteen.columns + = select_tag(:fields_to_hide, options_for_select(@report.available_headers, params[:fields_to_hide]), + class: "select2 fullwidth", multiple: true) .row.rendering-options .alpha.two.columns diff --git a/config/locales/en.yml b/config/locales/en.yml index 1b843282e0..d6c9a622a9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2625,6 +2625,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using report_payment_totals: 'Payment Totals' report_all: 'all' report_order_cycle: "Order Cycle" + report_hide_columns: Columns to Hide report_columns: Columns report_enterprises: "Enterprises" report_enterprise_fee: "Fees Names"