Merge branch 'hotfix/2021-12-29' into release/2021-12/31

bodyshop_translations.babel

@@ -20558,6 +20558,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>inservicedate</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>journal</name>
                                                 <definition_loaded>false</definition_loaded>

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"),
         }}
       >
         <LayoutFormRow grow>
@@ -155,6 +158,12 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               >
                 <Input disabled />
               </Form.Item>
+              <Form.Item
+                name="inservicedate"
+                label={t("jobs.fields.dms.inservicedate")}
+              >
+                <DatePicker format="MM/DD/YYYY" />
+              </Form.Item>
             </LayoutFormRow>
             <Space>
               <DmsCdkMakes form={form} socket={socket} job={job} />

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": {

client/src/translations/es/common.json

@@ -1252,6 +1252,7 @@
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
+					"inservicedate": "",
 					"journal": "",
 					"name1": "",
 					"payer": {

client/src/translations/fr/common.json

@@ -1252,6 +1252,7 @@
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
+					"inservicedate": "",
 					"journal": "",
 					"name1": "",
 					"payer": {

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.txEnvelope.inservicedate ||
-              socket.DMSVeh.dealer.inServiceDate
+              socket.DMSVeh.dealer.inServiceDate) && {
-            ).toISOString(),
+              inServiceDate: moment(
+                socket.DMSVeh.dealer.inServiceDate ||
+                  socket.txEnvelope.inservicedate
+              ).toISOString(),
+            }),
           },
           vehicle: {
             ...socket.DMSVeh.vehicle,