From 51f3b5927b4d5572b25f880491b2e72b52baa05d Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 7 Oct 2021 09:47:10 -0700
Subject: [PATCH] IO-1428 IO-1338 Add ownr_ph2.

---
 bodyshop_translations.babel                   | 44 ++++++++++++++++++-
 .../global-search/global-search.component.jsx |  3 ++
 .../schedule-event.component.jsx              |  6 +++
 .../jobs-create-owner-info.new.component.jsx  | 13 ++++++
 ...obs-create-owner-info.search.component.jsx | 12 +++++
 .../jobs-detail-header.component.jsx          |  3 ++
 .../jobs-find-modal.component.jsx             | 14 ++++++
 .../jobs-list-paginated.component.jsx         | 10 +++++
 .../jobs-list/jobs-list.component.jsx         | 10 +++++
 .../owner-detail-form.component.jsx           | 10 +++++
 .../owner-find-modal.component.jsx            |  8 ++++
 .../owner-tag-popover.component.jsx           |  9 ++++
 .../owners-list/owners-list.component.jsx     |  8 ++++
 .../production-list-columns.data.js           |  9 ++++
 .../production-list-detail.component.jsx      |  4 ++
 client/src/graphql/appointments.queries.js    |  2 +
 client/src/graphql/jobs.queries.js            |  9 ++++
 client/src/graphql/search.queries.js          |  1 +
 client/src/translations/en_us/common.json     |  2 +
 client/src/translations/es/common.json        |  2 +
 client/src/translations/fr/common.json        |  2 +
 server/graphql-client/queries.js              |  2 +
 22 files changed, 182 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 9bef52030..3686dcf30 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -21411,6 +21411,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ownr_ph2</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>paa</name>
                                         <definition_loaded>false</definition_loaded>
@@ -29931,6 +29952,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ownr_ph2</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>ownr_st</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx
index f16655678..6d2d138b0 100644
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -69,6 +69,9 @@ export default function GlobalSearch() {
                     <PhoneNumberFormatter>
                       {owner.ownr_ph1}
                     </PhoneNumberFormatter>
+                    <PhoneNumberFormatter>
+                      {owner.ownr_ph2}
+                    </PhoneNumberFormatter>
                   </Space>
                 </Link>
               ),
diff --git a/client/src/components/job-at-change/schedule-event.component.jsx b/client/src/components/job-at-change/schedule-event.component.jsx
index 026e5b56b..2c401778d 100644
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -106,6 +106,12 @@ export function ScheduleEventComponent({
               jobid={event.job.id}
             />
           </DataLabel>
+          <DataLabel label={t("jobs.fields.ownr_ph2")}>
+            <ChatOpenButton
+              phone={event.job && event.job.ownr_ph2}
+              jobid={event.job.id}
+            />
+          </DataLabel>
           <DataLabel label={t("jobs.fields.alt_transport")}>
             {(event.job && event.job.alt_transport) || ""}
             <ScheduleAtChange job={event && event.job} />
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
index 410d2e70e..2dea9a657 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -129,6 +129,19 @@ export default function JobsCreateOwnerInfoNewComponent() {
         >
           <FormItemPhone disabled={!state.owner.new} />
         </Form.Item>
+        <Form.Item
+          label={t("owners.fields.ownr_ph2")}
+          name={["owner", "data", "ownr_ph2"]}
+          rules={[
+            ({ getFieldValue }) =>
+              PhoneItemFormatterValidation(
+                getFieldValue,
+                "owner.data.ownr_ph2"
+              ),
+          ]}
+        >
+          <FormItemPhone disabled={!state.owner.new} />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
index 6ec9dca30..9a3e56558 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
@@ -84,6 +84,18 @@ export default function JobsCreateOwnerInfoSearchComponent({
         tableState.sortedInfo.columnKey === "ownr_ph1" &&
         tableState.sortedInfo.order,
     },
+    {
+      title: t("owners.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      render: (text, record) => (
+        <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      ),
+      sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
+      sortOrder:
+        tableState.sortedInfo.columnKey === "ownr_ph2" &&
+        tableState.sortedInfo.order,
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index bb9afbf51..030ffcf9b 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -141,6 +141,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
               <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
             </DataLabel>
+            <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
+              <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+            </DataLabel>
             <DataLabel key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
                 job.ownr_city || ""
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
index 48eedd45f..0ad3cae94 100644
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -69,6 +69,20 @@ export default function JobsFindModalComponent({
         );
       },
     },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.ownr_ph2 ? (
+          <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
+      },
+    },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index 18cd7b105..a751be3e2 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -73,6 +73,16 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
       ),
     },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => (
+        <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
+      ),
+    },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index fe9077ae9..5217b1fdc 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -145,6 +145,16 @@ export function JobsList({ bodyshop }) {
         <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
       ),
     },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      ),
+    },
 
     {
       title: t("jobs.fields.status"),
diff --git a/client/src/components/owner-detail-form/owner-detail-form.component.jsx b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
index f8886f3ce..a41b050e9 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -81,6 +81,16 @@ export default function OwnerDetailFormComponent({ form, loading }) {
         >
           <FormItemPhone />
         </Form.Item>
+        <Form.Item
+          label={t("owners.fields.ownr_ph2")}
+          name="ownr_ph2"
+          rules={[
+            ({ getFieldValue }) =>
+              PhoneItemFormatterValidation(getFieldValue, "ownr_ph2"),
+          ]}
+        >
+          <FormItemPhone />
+        </Form.Item>
         <Form.Item
           label={t("owners.fields.preferred_contact")}
           name="preferred_contact"
diff --git a/client/src/components/owner-find-modal/owner-find-modal.component.jsx b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
index 9207a24d3..896995497 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.component.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
@@ -51,6 +51,14 @@ export default function OwnerFindModalComponent({
         <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
       ),
     },
+    {
+      title: t("owners.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      render: (text, record) => (
+        <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      ),
+    },
   ];
 
   const handleOnRowClick = (record) => {
diff --git a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
index ab1f2807c..4c5726b6f 100644
--- a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
+++ b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
@@ -16,6 +16,9 @@ export default function OwnerTagPopoverComponent({ job }) {
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
+            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
+            </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
                 job.ownr_city || ""
@@ -36,6 +39,12 @@ export default function OwnerTagPopoverComponent({ job }) {
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
+            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+            </Descriptions.Item>
+            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+            </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${
                 job.owner.ownr_city || ""
diff --git a/client/src/components/owners-list/owners-list.component.jsx b/client/src/components/owners-list/owners-list.component.jsx
index 0047b0451..f6e1c3401 100644
--- a/client/src/components/owners-list/owners-list.component.jsx
+++ b/client/src/components/owners-list/owners-list.component.jsx
@@ -47,6 +47,14 @@ export default function OwnersListComponent({
         return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
       },
     },
+    {
+      title: t("owners.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      render: (text, record) => {
+        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
+      },
+    },
     {
       title: t("owners.fields.ownr_ea"),
       dataIndex: "ownr_ea",
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index 59ea04c3e..031c49e32 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -174,6 +174,15 @@ const r = ({ technician, state }) => {
         <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
       ),
     },
+    {
+      title: i18n.t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      ellipsis: true,
+      render: (text, record) => (
+        <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      ),
+    },
     {
       title: i18n.t("jobs.fields.specialcoveragepolicy"),
       dataIndex: "special_coverage_policy",
diff --git a/client/src/components/production-list-detail/production-list-detail.component.jsx b/client/src/components/production-list-detail/production-list-detail.component.jsx
index bd88bbd9a..7968e9f3d 100644
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/client/src/components/production-list-detail/production-list-detail.component.jsx
@@ -77,6 +77,10 @@ export default function ProductionListDetail({ jobs }) {
                 phone={data.jobs_by_pk.ownr_ph1}
                 jobid={data.jobs_by_pk.id}
               />
+              <StartChatButton
+                phone={data.jobs_by_pk.ownr_ph2}
+                jobid={data.jobs_by_pk.id}
+              />
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.vehicle")}>
               {`${theJob.v_model_yr || ""} ${theJob.v_color || ""} ${
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index 6f5a67979..717e80143 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -28,6 +28,7 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         ownr_co_nm
         ownr_fn
         ownr_ph1
+        ownr_ph2
         ownr_ea
         clm_total
         id
@@ -126,6 +127,7 @@ export const QUERY_APPOINTMENT_BY_DATE = gql`
         ownr_ln
         ownr_fn
         ownr_ph1
+        ownr_ph2
         ownr_ea
         clm_total
         id
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index bb2839dfc..fb2a675d5 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -10,6 +10,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph2
       ownr_ea
       owner {
         id
@@ -79,6 +80,7 @@ export const QUERY_PARTS_QUEUE = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph2
       ownr_ea
       plate_no
       plate_st
@@ -126,6 +128,7 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
       ins_co_nm
       clm_total
       ownr_ph1
+      ownr_ph2
       special_coverage_policy
       owner_owing
       production_vars
@@ -456,6 +459,7 @@ export const GET_JOB_BY_PK = gql`
       ownr_zip
       ownr_ctry
       ownr_ph1
+      ownr_ph2
       production_vars
       ca_gst_registrant
       ownerid
@@ -472,6 +476,7 @@ export const GET_JOB_BY_PK = gql`
         ownr_zip
         ownr_ctry
         ownr_ph1
+        ownr_ph2
       }
       labor_rate_desc
       rate_la1
@@ -688,6 +693,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph2
       ownr_ea
       ca_gst_registrant
       owner_owing
@@ -1018,6 +1024,7 @@ export const GET_JOB_INFO_FOR_STRIPE = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph2
       ownr_ea
     }
   }
@@ -1654,6 +1661,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownerid
       ownr_ph1
+      ownr_ph2
       ownr_ea
       plate_no
       plate_st
@@ -1869,6 +1877,7 @@ export const GET_JOB_FOR_CC_CONTRACT = gql`
       ownr_city
       ownr_zip
       ownr_ph1
+      ownr_ph2
     }
   }
 `;
diff --git a/client/src/graphql/search.queries.js b/client/src/graphql/search.queries.js
index 1b3cd2914..beb1b1486 100644
--- a/client/src/graphql/search.queries.js
+++ b/client/src/graphql/search.queries.js
@@ -23,6 +23,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph2
     }
     search_vehicles(args: { search: $search }) {
       id
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d07ec4dd6..7a1590ba5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1290,6 +1290,7 @@
 				"owner_owing": "Cust. Owes",
 				"ownr_ea": "Email",
 				"ownr_ph1": "Phone 1",
+				"ownr_ph2": "Phone 2",
 				"paa": "Aftermarket",
 				"pac": "Rechromed",
 				"pae": "Existing",
@@ -1775,6 +1776,7 @@
 				"ownr_fn": "First Name",
 				"ownr_ln": "Last Name",
 				"ownr_ph1": "Phone 1",
+				"ownr_ph2": "Phone 2",
 				"ownr_st": "Province/State",
 				"ownr_title": "Title",
 				"ownr_zip": "Zip/Postal Code",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 11e0ca003..6ce6c9bc8 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1290,6 +1290,7 @@
 				"owner_owing": "Cust. Debe",
 				"ownr_ea": "Email",
 				"ownr_ph1": "Teléfono 1",
+				"ownr_ph2": "",
 				"paa": "",
 				"pac": "",
 				"pae": "",
@@ -1775,6 +1776,7 @@
 				"ownr_fn": "Nombre de pila",
 				"ownr_ln": "Apellido",
 				"ownr_ph1": "Teléfono 1",
+				"ownr_ph2": "",
 				"ownr_st": "Provincia del estado",
 				"ownr_title": "Título",
 				"ownr_zip": "código postal",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index f99dc4e90..7198486db 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1290,6 +1290,7 @@
 				"owner_owing": "Cust. Owes",
 				"ownr_ea": "Email",
 				"ownr_ph1": "Téléphone 1",
+				"ownr_ph2": "",
 				"paa": "",
 				"pac": "",
 				"pae": "",
@@ -1775,6 +1776,7 @@
 				"ownr_fn": "Prénom",
 				"ownr_ln": "Nom de famille",
 				"ownr_ph1": "Téléphone 1",
+				"ownr_ph2": "",
 				"ownr_st": "Etat / Province",
 				"ownr_title": "Titre",
 				"ownr_zip": "Zip / code postal",
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index d3e025b75..9b41d8b2c 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -149,6 +149,7 @@ query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
     ownr_addr1
     ownr_addr2
     ownr_ph1
+    ownr_ph2
     ownr_zip
     ownr_city
     ownr_st
@@ -629,6 +630,7 @@ exports.GET_JOB_BY_PK = ` query GET_JOB_BY_PK($id: uuid!) {
       ownr_zip
       ownr_ctry
       ownr_ph1
+      ownr_ph2
       production_vars
       ca_gst_registrant
       labor_rate_desc