From 55b7715e1c81e35ad8fb1e5ce192d880bcf012f1 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 15 Nov 2021 17:14:12 -0800
Subject: [PATCH] IO-1529 Added gateway templates.
---
bodyshop_translations.babel | 21 ++++++++++++++
client/src/translations/en_us/common.json | 3 +-
client/src/translations/es/common.json | 3 +-
client/src/translations/fr/common.json | 3 +-
client/src/utils/TemplateConstants.js | 12 ++++++++
server/cdk/cdk-job-export.js | 35 ++++++++++++++++++-----
6 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f35958d2a..b4dfcbf2a 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -34239,6 +34239,27 @@
+
+ worksheet_sorted_by_operation_type
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 568497e8f..6a62aabc9 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2032,7 +2032,8 @@
"worksheet_by_line_number": "Worksheet by Line Number",
"worksheet_sorted_by_operation": "Worksheet by Operation",
"worksheet_sorted_by_operation_no_hours": "Worksheet by Operation (No Hours)",
- "worksheet_sorted_by_operation_part_type": "Worksheet by Operation & Part Type"
+ "worksheet_sorted_by_operation_part_type": "Worksheet by Operation & Part Type",
+ "worksheet_sorted_by_operation_type": "Worksheet by Operation Type"
},
"labels": {
"groups": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 34dfdccca..90540ba32 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2032,7 +2032,8 @@
"worksheet_by_line_number": "",
"worksheet_sorted_by_operation": "",
"worksheet_sorted_by_operation_no_hours": "",
- "worksheet_sorted_by_operation_part_type": ""
+ "worksheet_sorted_by_operation_part_type": "",
+ "worksheet_sorted_by_operation_type": ""
},
"labels": {
"groups": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index fb91b5d1a..01479d025 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2032,7 +2032,8 @@
"worksheet_by_line_number": "",
"worksheet_sorted_by_operation": "",
"worksheet_sorted_by_operation_no_hours": "",
- "worksheet_sorted_by_operation_part_type": ""
+ "worksheet_sorted_by_operation_part_type": "",
+ "worksheet_sorted_by_operation_type": ""
},
"labels": {
"groups": {
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index b34c01496..575de7869 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -182,6 +182,18 @@ export const TemplateList = (type, context) => {
disabled: false,
group: "worksheet",
},
+ worksheet_sorted_by_operation_type: {
+ title: i18n.t(
+ "printcenter.jobs.worksheet_sorted_by_operation_type"
+ ),
+ description: "All Jobs Notes",
+ subject: i18n.t(
+ "printcenter.jobs.worksheet_sorted_by_operation_type"
+ ),
+ key: "worksheet_sorted_by_operation_type",
+ disabled: false,
+ group: "worksheet",
+ },
worksheet_sorted_by_operation: {
title: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
description: "All Jobs Notes",
diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js
index 3d23f1c1d..4fa439191 100644
--- a/server/cdk/cdk-job-export.js
+++ b/server/cdk/cdk-job-export.js
@@ -607,7 +607,7 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
},
email: {
desc: socket.JobData.ownr_ea ? "Other" : "CustomerDeclined",
- value: socket.JobData.ownr_ea ? "Other" : null,
+ value: socket.JobData.ownr_ea ? socket.JobData.ownr_ea : null,
},
},
demographics: null,
@@ -700,6 +700,7 @@ async function InsertDmsVehicle(socket) {
manufacturer: {},
vehicle: {
deliveryDate: moment().format("YYYYMMDD"),
+ licensePlateNo: socket.JobData.plate_no,
make: socket.txEnvelope.dms_make,
modelAbrev: socket.txEnvelope.dms_model,
modelYear: socket.JobData.v_model_yr,
@@ -758,6 +759,31 @@ async function UpdateDmsVehicle(socket) {
CdkWsdl.VehicleInsertUpdate
);
+ let ids = [];
+
+ const existingOwnerinVeh = socket.DMSVeh.owners.filter(
+ (o) => o.id.value === socket.DMSCust.id.value
+ );
+
+ if (existingOwnerinVeh) {
+ ids = socket.DMSVeh.owners.filter(
+ (o) => o.id.value === socket.DMSCust.id.value
+ );
+ } else {
+ ids = [
+ {
+ assigningPartyId: "CURRENT",
+ value: socket.DMSCust.id.value,
+ },
+ ...socket.DMSVeh.owners.map((o) => {
+ return {
+ assigningPartyId: "PREVIOUS",
+ value: o.id.value,
+ };
+ }),
+ ];
+ }
+
const soapResponseVehicleInsertUpdate =
await soapClientVehicleInsertUpdate.updateAsync({
arg0: CDK_CREDENTIALS,
@@ -776,12 +802,7 @@ async function UpdateDmsVehicle(socket) {
socket.DMSVeh.vehicle.deliveryDate
).toISOString(),
},
- owners: {
- id: {
- assigningPartyId: "CURRENT",
- value: socket.DMSCust.id.value,
- },
- },
+ owners: { ids: ids },
},
arg3: "VEHICLES",
});