From 05d9f20a66209643b171b6bbac51b1aac98e8291 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 26 Oct 2021 15:38:05 -0700
Subject: [PATCH 1/2] Mark Other RO field as Read Only

---
 .../jobs-detail-general/jobs-detail-general.component.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
index 2ebac1994..b251d2467 100644
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -135,7 +135,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           label={t("jobs.fields.referral_source_extra")}
           name="referral_source_extra"
         >
-          <Input />
+          <Input disabled={jobRO}/>
         </Form.Item>
         <Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport">
           <Select disabled={jobRO} allowClear>

From 331b2c517befc46b611628f985a806b1faab645a Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 27 Oct 2021 08:29:43 -0700
Subject: [PATCH 2/2] Update CDK Country Inclusion.

---
 server/cdk/cdk-job-export.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js
index 59692d156..561da622e 100644
--- a/server/cdk/cdk-job-export.js
+++ b/server/cdk/cdk-job-export.js
@@ -584,15 +584,21 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
               addressLine:
                 socket.JobData.ownr_addr1 &&
                 socket.JobData.ownr_addr1.replace(replaceSpecialRegex, ""),
-              city: socket.JobData.ownr_city&& socket.JobData.ownr_city.replace(replaceSpecialRegex, ""),
-              country: null,
+              city:
+                socket.JobData.ownr_city &&
+                socket.JobData.ownr_city.replace(replaceSpecialRegex, ""),
+              country:
+                socket.JobData.ownr_ctry &&
+                socket.JobData.ownr_ctry.replace(replaceSpecialRegex, ""),
               postalCode:
                 socket.JobData.ownr_zip &&
                 socket.JobData.ownr_zip //TODO Need to remove for US Based customers.
                   .toUpperCase()
                   .replace(/\W/g, "")
                   .replace(/(...)/, "$1 "),
-              stateOrProvince: socket.JobData.ownr_st&&socket.JobData.ownr_st.replace(replaceSpecialRegex, ""),
+              stateOrProvince:
+                socket.JobData.ownr_st &&
+                socket.JobData.ownr_st.replace(replaceSpecialRegex, ""),
             },
             contactInfo: {
               mainTelephoneNumber: {