diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 086682e27..4d9d20acf 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -20558,6 +20558,27 @@ + + inservicedate + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + journal false diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx index 10dc51566..a5f454d4c 100644 --- a/client/src/components/dms-post-form/dms-post-form.component.jsx +++ b/client/src/components/dms-post-form/dms-post-form.component.jsx @@ -2,6 +2,7 @@ import { DeleteFilled, DownOutlined } from "@ant-design/icons"; import { Button, Card, + DatePicker, Divider, Dropdown, Form, @@ -24,6 +25,7 @@ import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component"; import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component"; +import moment from "moment"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -83,6 +85,7 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) { area_of_damage: (job.area_of_damage && job.area_of_damage.impact1) || "UNKNOWN", }).substr(0, 239), + inservicedate: moment("2019-01-01"), }} > @@ -155,6 +158,12 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) { > + + + diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index ebaf048f6..82142b9cc 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1252,6 +1252,7 @@ "dms_model": "DMS Model", "dms_wip_acctnumber": "Cost WIP DMS Acct #", "id": "DMS ID", + "inservicedate": "In Service Date", "journal": "Journal #", "name1": "Customer Name", "payer": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 1aaa9bd47..27de12d04 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1252,6 +1252,7 @@ "dms_model": "", "dms_wip_acctnumber": "", "id": "", + "inservicedate": "", "journal": "", "name1": "", "payer": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 289fec0a9..eb8339b1f 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1252,6 +1252,7 @@ "dms_model": "", "dms_wip_acctnumber": "", "id": "", + "inservicedate": "", "journal": "", "name1": "", "payer": { diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index 9fe9ca92d..2a78af167 100644 --- a/server/cdk/cdk-job-export.js +++ b/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,