WIP on several user stories. BOD-10 BOD-52

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -63,13 +63,20 @@ function JobsCreateContainer({ bodyshop }) {
     let ownerData;
     if (!!job.owner) {
       ownerData = job.owner.data;
+      ownerData.shopid = bodyshop.id;
       delete ownerData.allow_text_message;
       delete ownerData.preferred_contact;
+      delete job.ownerid;
     } else {
       ownerData = RemoteOwnerData.data.owners_by_pk;
       delete ownerData.id;
       delete ownerData.__typename;
     }
+    if (!!job.vehicle) {
+      delete job.vehicleid;
+      job.vehicle.data.shopid = bodyshop.id;
+    }
+
     job = { ...job, ...ownerData };
     runInsertJob(job);
   };