inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-23 09:27:39 +00:00
Code Activity

[UI] Address display tweaks (#10648)

Browse Source 
* Display ReturnOrder address

* Display address for SalesOrder
This commit is contained in:
Oliver
2025-10-22 13:46:48 +11:00
committed by GitHub
parent 19dfb51969
commit e0b0e1d66c
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontend/src/components/render/Company.tsx
View File

@@ -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} />;
}
/**

9
src/frontend/src/pages/sales/ReturnOrderDetail.tsx
View File

@@ -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',

9
src/frontend/src/pages/sales/SalesOrderDetail.tsx
View File

@@ -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',