Merge branch 'feature/payroll' into feature/america

server/accounting/pbs/pbs-job-export.js

@@ -249,10 +249,10 @@ async function QueryCustomersFromDms(socket) {
         SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
         //ContactId: "00000000000000000000000000000000",
         // ContactCode: socket.JobData.owner.accountingid,
-        FirstName: socket.JobData.ownr_co_nm
+        FirstName: socket.JobData.ownr_fn,
+        LastName: socket.JobData.ownr_co_nm
           ? socket.JobData.ownr_co_nm
-          : socket.JobData.ownr_fn,
-        LastName: socket.JobData.ownr_ln,
+          : socket.JobData.ownr_ln,
         PhoneNumber: socket.JobData.ownr_ph1,
         EmailAddress: socket.JobData.ownr_ea,
         // ModifiedSince: "0001-01-01T00:00:00.0000000Z",

server/cdk/cdk-job-export.js

@@ -224,6 +224,7 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
   } finally {
     //Ensure we always insert logEvents
     //GQL to insert logevents.
+  
     CdkBase.createLogEvent(
       socket,
       "DEBUG",
@@ -1213,6 +1214,7 @@ async function GenerateTransWips(socket) {
 
     wips.push(item);
   });
+  socket.transWips = wips;
   return wips;
 }
 
@@ -1388,6 +1390,7 @@ async function MarkJobExported(socket, jobid) {
         jobid: jobid,
         successful: true,
         useremail: socket.user.email,
+        metadata: socket.transWips,
       },
       bill: {
         exported: true,