Cherrypick CDK Fixes.

server/cdk/cdk-job-export.js

@@ -96,6 +96,7 @@ exports.default = async function (socket, { txEnvelope, jobid }) {
 
 async function CdkSelectedCustomer(socket, selectedCustomerId) {
   try {
+    socket.selectedCustomerId = selectedCustomerId;
     if (selectedCustomerId) {
       CdkBase.createLogEvent(
         socket,
@@ -282,7 +283,12 @@ async function CalculateDmsVid(socket, JobData) {
       )}`
     );
     CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
-    return result && result.return && result.return[0];
+
+    //if (result && result.return && result.return.length > 1) {
+    return result.return.find((r) => r.vehiclesVehId);
+    //}
+
+    //return result && result.return && result.return[0];
   } catch (error) {
     CdkBase.createXmlEvent(
       socket,
@@ -605,7 +611,7 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
             contactInfo: {
               mainTelephoneNumber: {
                 main: true,
-                value: socket.JobData.ownr_ph1,
+                value: socket.JobData.ownr_ph1.replace(replaceSpecialRegex, ""),
               },
               email: {
                 desc: socket.JobData.ownr_ea ? "Other" : "CustomerDeclined",
@@ -773,10 +779,20 @@ async function UpdateDmsVehicle(socket) {
 
     let ids = [];
 
+    //if it's a generic customer, don't update the vehicle owners.
+
+    if (
+      socket.selectedCustomerId ===
+      socket.JobData.bodyshop.cdk_configuration.generic_customer_number
+    ) {
+      ids = socket.DMSVeh && socket.DMSVeh.owners && socket.DMSVeh.owners;
+    } else {
       const existingOwnerinVeh =
         socket.DMSVeh &&
         socket.DMSVeh.owners &&
-      socket.DMSVeh.owners.find((o) => o.id.value === socket.DMSCust.id.value);
+        socket.DMSVeh.owners.find(
+          (o) => o.id.value === socket.DMSCust.id.value
+        );
 
       if (existingOwnerinVeh) {
         ids = socket.DMSVeh.owners.map((o) => {
@@ -813,6 +829,7 @@ async function UpdateDmsVehicle(socket) {
             : []),
         ];
       }
+    }
 
     const soapResponseVehicleInsertUpdate =
       await soapClientVehicleInsertUpdate.updateAsync({