mirror of
https://github.com/inventree/InvenTree.git
synced 2025-10-23 17:37:38 +00:00
[UI] Address display tweaks (#10648)
* Display ReturnOrder address * Display address for SalesOrder
This commit is contained in:
@@ -21,7 +21,10 @@ export function RenderAddress({
|
|||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
.join(', ');
|
.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} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -32,6 +32,7 @@ import AttachmentPanel from '../../components/panels/AttachmentPanel';
|
|||||||
import NotesPanel from '../../components/panels/NotesPanel';
|
import NotesPanel from '../../components/panels/NotesPanel';
|
||||||
import type { PanelType } from '../../components/panels/Panel';
|
import type { PanelType } from '../../components/panels/Panel';
|
||||||
import { PanelGroup } from '../../components/panels/PanelGroup';
|
import { PanelGroup } from '../../components/panels/PanelGroup';
|
||||||
|
import { RenderAddress } from '../../components/render/Company';
|
||||||
import { StatusRenderer } from '../../components/render/StatusRenderer';
|
import { StatusRenderer } from '../../components/render/StatusRenderer';
|
||||||
import { formatCurrency } from '../../defaults/formatters';
|
import { formatCurrency } from '../../defaults/formatters';
|
||||||
import { useReturnOrderFields } from '../../forms/ReturnOrderForms';
|
import { useReturnOrderFields } from '../../forms/ReturnOrderForms';
|
||||||
@@ -188,6 +189,14 @@ export default function ReturnOrderDetail() {
|
|||||||
copy: true,
|
copy: true,
|
||||||
hidden: !order.link
|
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',
|
type: 'text',
|
||||||
name: 'contact_detail.name',
|
name: 'contact_detail.name',
|
||||||
|
@@ -38,6 +38,7 @@ import AttachmentPanel from '../../components/panels/AttachmentPanel';
|
|||||||
import NotesPanel from '../../components/panels/NotesPanel';
|
import NotesPanel from '../../components/panels/NotesPanel';
|
||||||
import type { PanelType } from '../../components/panels/Panel';
|
import type { PanelType } from '../../components/panels/Panel';
|
||||||
import { PanelGroup } from '../../components/panels/PanelGroup';
|
import { PanelGroup } from '../../components/panels/PanelGroup';
|
||||||
|
import { RenderAddress } from '../../components/render/Company';
|
||||||
import { StatusRenderer } from '../../components/render/StatusRenderer';
|
import { StatusRenderer } from '../../components/render/StatusRenderer';
|
||||||
import { formatCurrency } from '../../defaults/formatters';
|
import { formatCurrency } from '../../defaults/formatters';
|
||||||
import { useSalesOrderFields } from '../../forms/SalesOrderForms';
|
import { useSalesOrderFields } from '../../forms/SalesOrderForms';
|
||||||
@@ -181,6 +182,14 @@ export default function SalesOrderDetail() {
|
|||||||
copy: true,
|
copy: true,
|
||||||
hidden: !order.link
|
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',
|
type: 'text',
|
||||||
name: 'contact_detail.name',
|
name: 'contact_detail.name',
|
||||||
|
Reference in New Issue
Block a user