From f5e6352181aaccbf530a660ba5bfa62155b4c9ef Mon Sep 17 00:00:00 2001 From: Jacob Felknor Date: Mon, 24 Mar 2025 04:19:04 -0600 Subject: [PATCH] fix contact copy, add email/phone if they exist (#9354) --- .../pages/purchasing/PurchaseOrderDetail.tsx | 22 +++++++++++++++---- .../src/pages/sales/ReturnOrderDetail.tsx | 22 +++++++++++++++---- .../src/pages/sales/SalesOrderDetail.tsx | 22 +++++++++++++++---- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx b/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx index d6007f40e3..bb58d9c844 100644 --- a/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx +++ b/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx @@ -207,15 +207,29 @@ export default function PurchaseOrderDetail() { hidden: !order.link }, { - type: 'link', - model: ModelType.contact, - link: false, - name: 'contact', + type: 'text', + name: 'contact_detail.name', label: t`Contact`, icon: 'user', copy: true, hidden: !order.contact }, + { + type: 'text', + name: 'contact_detail.email', + label: t`Contact Email`, + icon: 'email', + copy: true, + hidden: !order.contact_detail?.email + }, + { + type: 'text', + name: 'contact_detail.phone', + label: t`Contact Phone`, + icon: 'phone', + copy: true, + hidden: !order.contact_detail?.phone + }, { type: 'text', name: 'project_code_label', diff --git a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx index 9aec9db706..a26c0ef394 100644 --- a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx +++ b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx @@ -171,15 +171,29 @@ export default function ReturnOrderDetail() { hidden: !order.link }, { - type: 'link', - model: ModelType.contact, - link: false, - name: 'contact', + type: 'text', + name: 'contact_detail.name', label: t`Contact`, icon: 'user', copy: true, hidden: !order.contact }, + { + type: 'text', + name: 'contact_detail.email', + label: t`Contact Email`, + icon: 'email', + copy: true, + hidden: !order.contact_detail?.email + }, + { + type: 'text', + name: 'contact_detail.phone', + label: t`Contact Phone`, + icon: 'phone', + copy: true, + hidden: !order.contact_detail?.phone + }, { type: 'text', name: 'project_code_label', diff --git a/src/frontend/src/pages/sales/SalesOrderDetail.tsx b/src/frontend/src/pages/sales/SalesOrderDetail.tsx index ee465858c3..3ea05f256f 100644 --- a/src/frontend/src/pages/sales/SalesOrderDetail.tsx +++ b/src/frontend/src/pages/sales/SalesOrderDetail.tsx @@ -183,15 +183,29 @@ export default function SalesOrderDetail() { hidden: !order.link }, { - type: 'link', - model: ModelType.contact, - link: false, - name: 'contact', + type: 'text', + name: 'contact_detail.name', label: t`Contact`, icon: 'user', copy: true, hidden: !order.contact }, + { + type: 'text', + name: 'contact_detail.email', + label: t`Contact Email`, + icon: 'email', + copy: true, + hidden: !order.contact_detail?.email + }, + { + type: 'text', + name: 'contact_detail.phone', + label: t`Contact Phone`, + icon: 'phone', + copy: true, + hidden: !order.contact_detail?.phone + }, { type: 'text', name: 'project_code_label',