admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-233 Add Vehicle History

Browse Source
This commit is contained in:
Patrick Fic
2021-08-30 12:54:43 -07:00
parent a7cf081ed5
commit 7a35dc9b38
8 changed files with 182 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
bodyshop_translations.babel
View File

@@ -7620,6 +7620,27 @@
</concept_node>
</children>
</folder_node>
<concept_node>
<name>emaillater</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>employees</name>
<definition_loaded>false</definition_loaded>
@@ -7851,6 +7872,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>printlater</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>rbac</name>
<definition_loaded>false</definition_loaded>
@@ -22990,6 +23032,32 @@
</translation>
</translations>
</concept_node>
<folder_node>
<name>dms</name>
<children>
<concept_node>
<name>kmoutnotgreaterthankmin</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>
</children>
</folder_node>
<concept_node>
<name>documents</name>
<definition_loaded>false</definition_loaded>
@@ -35822,6 +35890,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>flat_rate</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>memo</name>
<definition_loaded>false</definition_loaded>

6
client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
View File

@@ -97,6 +97,12 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
>
<Input />
</Form.Item>
<Form.Item
label={t("bodyshop.fields.dms.cashierid")}
name={["cdk_configuration", "cashierid"]}
>
<Input />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
<Form.List name={["cdk_configuration", "payers"]}>

5
client/src/pages/dms/dms.container.jsx
View File

@@ -101,7 +101,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
if (!jobId || !bodyshop.cdk_dealerid) return <Result status="404" />;
if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
return <Result status="404" />;
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
@@ -110,7 +111,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
<div>
<Row gutter={32}>
<Col span={18}>
{data && data.jobs_by_pk.ro_number}
{data && data.jobs_by_pk && data.jobs_by_pk.ro_number}
<DmsAllocationsSummary socket={socket} jobId={jobId} />
<DmsPostForm
socket={socket}

6
client/src/translations/en_us/common.json
View File

@@ -480,6 +480,7 @@
"cdk_dealerid": "CDK Dealer ID",
"title": "DMS"
},
"emaillater": "",
"employees": "Employees",
"insurancecos": "Insurance Companies",
"intakechecklist": "Intake Checklist",
@@ -491,6 +492,7 @@
"notespresets": "Notes Presets",
"orderstatuses": "Order Statuses",
"partslocations": "Parts Locations",
"printlater": "",
"rbac": "Role Based Access Control",
"responsibilitycenters": {
"costs": "Cost Centers",
@@ -1374,6 +1376,9 @@
"deliverchecklist": "Deliver Checklist",
"difference": "Difference",
"diskscan": "Scan Disk for Estimates",
"dms": {
"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in."
},
"documents": "Documents",
"documents-images": "Images",
"documents-other": "Other Documents",
@@ -2163,6 +2168,7 @@
"date": "Ticket Date",
"efficiency": "Efficiency",
"employee": "Employee",
"flat_rate": "",
"memo": "Memo",
"productivehrs": "Productive Hours",
"ro_number": "Job to Post Against"

6
client/src/translations/es/common.json
View File

@@ -480,6 +480,7 @@
"cdk_dealerid": "",
"title": ""
},
"emaillater": "",
"employees": "",
"insurancecos": "",
"intakechecklist": "",
@@ -491,6 +492,7 @@
"notespresets": "",
"orderstatuses": "",
"partslocations": "",
"printlater": "",
"rbac": "",
"responsibilitycenters": {
"costs": "",
@@ -1374,6 +1376,9 @@
"deliverchecklist": "",
"difference": "",
"diskscan": "",
"dms": {
"kmoutnotgreaterthankmin": ""
},
"documents": "documentos",
"documents-images": "",
"documents-other": "",
@@ -2163,6 +2168,7 @@
"date": "",
"efficiency": "",
"employee": "",
"flat_rate": "",
"memo": "",
"productivehrs": "",
"ro_number": ""

6
client/src/translations/fr/common.json
View File

@@ -480,6 +480,7 @@
"cdk_dealerid": "",
"title": ""
},
"emaillater": "",
"employees": "",
"insurancecos": "",
"intakechecklist": "",
@@ -491,6 +492,7 @@
"notespresets": "",
"orderstatuses": "",
"partslocations": "",
"printlater": "",
"rbac": "",
"responsibilitycenters": {
"costs": "",
@@ -1374,6 +1376,9 @@
"deliverchecklist": "",
"difference": "",
"diskscan": "",
"dms": {
"kmoutnotgreaterthankmin": ""
},
"documents": "Les documents",
"documents-images": "",
"documents-other": "",
@@ -2163,6 +2168,7 @@
"date": "",
"efficiency": "",
"employee": "",
"flat_rate": "",
"memo": "",
"productivehrs": "",
"ro_number": ""

67
server/cdk/cdk-job-export.js
View File

@@ -101,7 +101,11 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
"DEBUG",
`{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`
);
socket.DMSCust = await QueryDmsCustomerById(socket, selectedCustomerId);
socket.DMSCust = await QueryDmsCustomerById(
socket,
socket.JobData,
selectedCustomerId
);
} else {
CdkBase.createLogEvent(
socket,
@@ -145,8 +149,9 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
CdkBase.createLogEvent(
socket,
"DEBUG",
`{5} **NOT DONE YET** Updating Service Vehicle History.`
`{5}Updating Service Vehicle History.`
);
await InsertServiceVehicleHistory(socket);
} catch (error) {
CdkBase.createLogEvent(
socket,
@@ -727,6 +732,64 @@ async function UpdateDmsVehicle(socket) {
}
}
async function InsertServiceVehicleHistory(socket) {
try {
const soapClientServiceHistoryInsert = await soap.createClientAsync(
CdkWsdl.ServiceHistoryInsert
);
const soapResponseServiceHistoryInsert =
await soapClientServiceHistoryInsert.serviceHistoryHeaderInsertAsync({
authToken: CDK_CREDENTIALS,
dealerId: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
serviceHistoryHeader: {
vehID: socket.DMSVid.vehiclesVehId,
roNumber: socket.JobData.ro_number.match(/\d+/g),
mileage: socket.txEnvelope.kmout,
openDate: moment(socket.JobData.actual_in).format("YYYY-MM-DD"),
openTime: moment(socket.JobData.actual_in).format("HH:MM:SS"),
closeDate: moment(socket.JobData.invoice_date).format("YYYY-MM-DD"),
closeTime: moment(socket.JobData.invoice_date).format("HH:MM:SS"),
comments: socket.txEnvelope.story,
cashierID: socket.JobData.bodyshop.cdk_configuration.cashierid, //NEEDS TO BE PROVIDED BY DEALER.
},
});
const [result, rawResponse, , rawRequest] =
soapResponseServiceHistoryInsert;
CdkBase.createXmlEvent(
socket,
rawRequest,
`soapClientServiceHistoryInsert.serviceHistoryHeaderInsert request.`
);
CdkBase.createLogEvent(
socket,
"TRACE",
`soapClientServiceHistoryInsert.serviceHistoryHeaderInsert Result ${JSON.stringify(
result,
null,
2
)}`
);
CdkBase.createXmlEvent(
socket,
rawResponse,
`soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`
);
CheckCdkResponseForError(socket, soapResponseServiceHistoryInsert);
const VehicleFromDMS = result && result.return && result.return.vehicle;
return VehicleFromDMS;
} catch (error) {
CdkBase.createLogEvent(
socket,
"ERROR",
`Error in InsertServiceVehicleHistory - ${error}`
);
throw new Error(error);
}
}
async function InsertDmsStartWip(socket) {
try {
const soapClientAccountingGLInsertUpdate = await soap.createClientAsync(

1
server/cdk/cdk-wsdl.js
View File

@@ -83,6 +83,7 @@ exports.default = {
CustomerInsertUpdate: `${cdkDomain}/pip-customer/services/CustomerInsertUpdate?wsdl`,
CustomerSearch: `${cdkDomain}/pip-customer/services/CustomerSearch?wsdl`,
VehicleSearch: `${cdkDomain}/pip-vehicle/services/VehicleSearch?wsdl`,
ServiceHistoryInsert: `${cdkDomain}/pip-service-history-insert/services/ServiceHistoryInsert?wsdl`,
};
// The following login credentials will be used for all PIPs and all environments (User Acceptance Testing and Production).