From e0b0e1d66c5e8250b115dc4a1db5afddff722dbe Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Wed, 22 Oct 2025 13:46:48 +1100
Subject: [PATCH] [UI] Address display tweaks (#10648)

* Display ReturnOrder address

* Display address for SalesOrder
---
 src/frontend/src/components/render/Company.tsx     | 5 ++++-
 src/frontend/src/pages/sales/ReturnOrderDetail.tsx | 9 +++++++++
 src/frontend/src/pages/sales/SalesOrderDetail.tsx  | 9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/components/render/Company.tsx b/src/frontend/src/components/render/Company.tsx
index 01f3c816e5..66906befbd 100644
--- a/src/frontend/src/components/render/Company.tsx
+++ b/src/frontend/src/components/render/Company.tsx
@@ -21,7 +21,10 @@ export function RenderAddress({
     .filter(Boolean)
     .join(', ');
 
-  return <RenderInlineModel primary={instance.title} secondary={text} />;
+  const primary: string = instance.title || text;
+  const secondary: string = instance.title ? text : '';
+
+  return <RenderInlineModel primary={primary} secondary={secondary} />;
 }
 
 /**
diff --git a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
index e1116aed94..5d732af4c3 100644
--- a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
+++ b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
@@ -32,6 +32,7 @@ import AttachmentPanel from '../../components/panels/AttachmentPanel';
 import NotesPanel from '../../components/panels/NotesPanel';
 import type { PanelType } from '../../components/panels/Panel';
 import { PanelGroup } from '../../components/panels/PanelGroup';
+import { RenderAddress } from '../../components/render/Company';
 import { StatusRenderer } from '../../components/render/StatusRenderer';
 import { formatCurrency } from '../../defaults/formatters';
 import { useReturnOrderFields } from '../../forms/ReturnOrderForms';
@@ -188,6 +189,14 @@ export default function ReturnOrderDetail() {
         copy: true,
         hidden: !order.link
       },
+      {
+        type: 'text',
+        name: 'address',
+        label: t`Return Address`,
+        icon: 'address',
+        hidden: !order.address_detail,
+        value_formatter: () => <RenderAddress instance={order.address_detail} />
+      },
       {
         type: 'text',
         name: 'contact_detail.name',
diff --git a/src/frontend/src/pages/sales/SalesOrderDetail.tsx b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
index 06e3a18918..1a85f05dfd 100644
--- a/src/frontend/src/pages/sales/SalesOrderDetail.tsx
+++ b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
@@ -38,6 +38,7 @@ import AttachmentPanel from '../../components/panels/AttachmentPanel';
 import NotesPanel from '../../components/panels/NotesPanel';
 import type { PanelType } from '../../components/panels/Panel';
 import { PanelGroup } from '../../components/panels/PanelGroup';
+import { RenderAddress } from '../../components/render/Company';
 import { StatusRenderer } from '../../components/render/StatusRenderer';
 import { formatCurrency } from '../../defaults/formatters';
 import { useSalesOrderFields } from '../../forms/SalesOrderForms';
@@ -181,6 +182,14 @@ export default function SalesOrderDetail() {
         copy: true,
         hidden: !order.link
       },
+      {
+        type: 'text',
+        name: 'address',
+        label: t`Shipping Address`,
+        icon: 'address',
+        hidden: !order.address_detail,
+        value_formatter: () => <RenderAddress instance={order.address_detail} />
+      },
       {
         type: 'text',
         name: 'contact_detail.name',