Updated field names.

This commit is contained in:
Patrick Fic
2020-01-21 08:54:37 -08:00
parent 78772b847d
commit 57886dc276
9 changed files with 56 additions and 22 deletions

View File

@@ -13,14 +13,14 @@ export default function JobDetailCardsCustomerComponent({ loading, data }) {
extraLink={data?.owner ? `/manage/owners/${data?.owner?.id}` : null}>
{data ? (
<span>
<div>{`${data?.pit_owner_first_name ??
""} ${data.pit_owner_last_name ?? ""}`}</div>
<div>{`${data?.ownr_fn ??
""} ${data.ownr_ln ?? ""}`}</div>
<div>
<PhoneFormatter>{`${data?.pit_owner_phone ?? ""}`}</PhoneFormatter>
<PhoneFormatter>{`${data?.ownr_ph1 ?? ""}`}</PhoneFormatter>
</div>
{data?.pit_owner_email ? (
<a href={`mailto:${data.pit_owner_email}`}>
<div>{`${data?.pit_owner_email ?? ""}`}</div>
{data?.ownr_ea ? (
<a href={`mailto:${data.ownr_ea}`}>
<div>{`${data?.ownr_ea ?? ""}`}</div>
</a>
) : null}

View File

@@ -43,13 +43,13 @@ export default function JobsList({
dataIndex: "owner",
key: "owner",
ellipsis: true,
sorter: (a, b) => alphaSort(a.pit_owner_last_name, b.pit_owner_last_name),
sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
sortOrder:
state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
render: (text, record) => {
return record.owner ? (
<Link to={"/manage/owners/" + record.owner.id}>
{record.pit_owner_first_name} {record.pit_owner_last_name}
{record.ownr_fn} {record.ownr_ln}
</Link>
) : (
t("jobs.errors.noowner")
@@ -58,13 +58,13 @@ export default function JobsList({
},
{
title: t("jobs.fields.phone1"),
dataIndex: "pit_owner_phone",
key: "pit_owner_phone",
dataIndex: "ownr_ph1",
key: "ownr_ph1",
ellipsis: true,
render: (text, record) => {
return record.pit_owner_phone ? (
return record.ownr_ph1 ? (
<span>
<PhoneFormatter>{record.pit_owner_phone}</PhoneFormatter>
<PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
<Icon
style={{ margin: 4 }}
type='message'