Merge branch 'hotfix/2021-12-29' into release/2021-12/31

server/cdk/cdk-job-export.js

@@ -611,7 +611,9 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
             contactInfo: {
               mainTelephoneNumber: {
                 main: true,
-                value: socket.JobData.ownr_ph1.replace(replaceSpecialRegex, ""),
+                value:
+                  socket.JobData.ownr_ph1 &&
+                  socket.JobData.ownr_ph1.replace(replaceSpecialRegex, ""),
               },
               email: {
                 desc: socket.JobData.ownr_ea ? "Other" : "CustomerDeclined",
@@ -712,7 +714,11 @@ async function InsertDmsVehicle(socket) {
         arg2: {
           dealer: {
             dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
-            inServiceDate: moment().startOf("day").toISOString(),
+            ...(socket.txEnvelope.inservicedate && {
+              inServiceDate: moment(socket.txEnvelope.inservicedate)
+                .startOf("day")
+                .toISOString(),
+            }),
             vehicleId: socket.DMSVid.vehiclesVehId,
           },
           manufacturer: {},
@@ -839,9 +845,13 @@ async function UpdateDmsVehicle(socket) {
           ...socket.DMSVeh,
           dealer: {
             ...socket.DMSVeh.dealer,
-            inServiceDate: moment(
-              socket.DMSVeh.dealer.inServiceDate
-            ).toISOString(),
+            ...((socket.txEnvelope.inservicedate ||
+              socket.DMSVeh.dealer.inServiceDate) && {
+              inServiceDate: moment(
+                socket.DMSVeh.dealer.inServiceDate ||
+                  socket.txEnvelope.inservicedate
+              ).toISOString(),
+            }),
           },
           vehicle: {
             ...socket.DMSVeh.vehicle,