From bc3917ebc1a3e2633ea49283ae41b1c89c101745 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Sun, 16 Feb 2025 01:55:38 +0500 Subject: [PATCH] incorporate show_customer_names_to_suppliers setting --- app/helpers/spree/admin/orders_helper.rb | 5 +++++ app/views/spree/admin/orders/_table_row.html.haml | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/helpers/spree/admin/orders_helper.rb b/app/helpers/spree/admin/orders_helper.rb index 65ac3021fc..cd0afab2f7 100644 --- a/app/helpers/spree/admin/orders_helper.rb +++ b/app/helpers/spree/admin/orders_helper.rb @@ -159,6 +159,11 @@ module Spree spree_current_user.can_manage_line_items_in_orders_only? end + def display_value_for_producer(order, value) + return value unless distributor_allows_order_editing?(order) + + order.distributor&.show_customer_names_to_suppliers ? value : t("admin.reports.hidden") + end end end end diff --git a/app/views/spree/admin/orders/_table_row.html.haml b/app/views/spree/admin/orders/_table_row.html.haml index fa4916c729..405efb6857 100644 --- a/app/views/spree/admin/orders/_table_row.html.haml +++ b/app/views/spree/admin/orders/_table_row.html.haml @@ -34,10 +34,11 @@ %span.state{ class: order.shipment_state.to_s} = t('js.admin.orders.shipment_states.' + order.shipment_state.to_s) %td - %a{ href: "mailto:#{order.email}", target: "_blank" } - = order.email + - email_value = display_value_for_producer(order, order.email) + %a{ href: "mailto:#{email_value}", target: "_blank" } + = email_value %td - = order&.bill_address&.full_name_for_sorting + = display_value_for_producer(order, order.bill_address&.full_name_for_sorting) %td.align-left %span = order.display_total