Merged in release/2023-07-07 (pull request #870)

IO-2340 CDK New Unsold Vehicle adjustments

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -187,8 +187,9 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               <Form.Item
                 name="dms_unsold"
                 label={t("jobs.fields.dms.dms_unsold")}
+                initialValue={false}
               >
-                <Switch defaultChecked={false} />
+                <Switch />
               </Form.Item>
             </Space>
           </div>

client/src/pages/dms/dms.container.jsx

@@ -45,7 +45,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 export const socket = SocketIO(
   process.env.NODE_ENV === "production"
     ? process.env.REACT_APP_AXIOS_BASE_API_URL
-    : window.location.origin,  //"http://localhost:4000" for dev testing,
+    : window.location.origin,
+    // "http://localhost:4000",  // for dev testing,
   {
     path: "/ws",
     withCredentials: true,

server/cdk/cdk-job-export.js

@@ -717,7 +717,8 @@ async function InsertDmsVehicle(socket) {
           dealer: {
             dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
             ...(socket.txEnvelope.inservicedate && {
-              inServiceDate: socket.txEnvelope.dms_unsold === true
+              inServiceDate:
+                socket.txEnvelope.dms_unsold === true
                   ? ""
                   : moment(socket.txEnvelope.inservicedate)
                       //.tz(socket.JobData.bodyshop.timezone)
@@ -728,7 +729,8 @@ async function InsertDmsVehicle(socket) {
           },
           manufacturer: {},
           vehicle: {
-            deliveryDate: socket.txEnvelope.dms_unsold === true
+            deliveryDate:
+              socket.txEnvelope.dms_unsold === true
                 ? ""
                 : moment()
                     // .tz(socket.JobData.bodyshop.timezone)
@@ -864,7 +866,10 @@ async function UpdateDmsVehicle(socket) {
             ...socket.DMSVeh.dealer,
             ...((socket.txEnvelope.inservicedate ||
               socket.DMSVeh.dealer.inServiceDate) && {
-              inServiceDate: moment(
+              inServiceDate:
+                socket.txEnvelope.dms_unsold === true
+                  ? ""
+                  : moment(
                       socket.DMSVeh.dealer.inServiceDate ||
                         socket.txEnvelope.inservicedate
                     )
@@ -874,7 +879,10 @@ async function UpdateDmsVehicle(socket) {
           },
           vehicle: {
             ...socket.DMSVeh.vehicle,
-            deliveryDate: moment(socket.DMSVeh.vehicle.deliveryDate)
+            deliveryDate:
+              socket.txEnvelope.dms_unsold === true
+                ? ""
+                : moment(socket.DMSVeh.vehicle.deliveryDate)
                     //.tz(socket.JobData.bodyshop.timezone)
                     .toISOString(),
           },