Compare commits
27 Commits
rrScratch2
...
feature/IO
| Author | SHA1 | Date | |
|---|---|---|---|
|
ca1a456312 | ||
|
|
c010665ea9 | ||
|
|
d6fba12cd9 | ||
|
|
6ea1c291e6 | ||
|
|
05d5c96491 | ||
|
|
35a566cbe5 | ||
|
|
f12e40e4c6 | ||
|
|
bb4e671c83 | ||
|
|
d1637d2432 | ||
|
|
1c79628613 | ||
|
|
521a7084b7 | ||
|
|
77268d5f5b | ||
|
|
1b3abf17ec | ||
|
|
3cfd445894 | ||
|
|
b510eec9aa | ||
|
|
e5eac0933f | ||
|
|
a3c71fdfc0 | ||
|
|
78750d3d96 | ||
|
|
90edf94fee | ||
|
|
065fb72677 | ||
|
|
ddc6141480 | ||
|
|
7bc137fa79 | ||
|
|
dafe9de753 | ||
|
|
78a8474a24 | ||
|
|
123066f1cd | ||
|
|
a153cca3c0 | ||
|
|
35c7c32c8e |
@@ -1,346 +0,0 @@
|
|||||||
Fortellis Notes
|
|
||||||
|
|
||||||
Subscription ID
|
|
||||||
|
|
||||||
- Appears to give us a list of all dealerships we have access to, and `apiDmsInfo` contains the integrations that are enabled for that dealership.
|
|
||||||
- Will likely need to filter based on the DMS ID or something?
|
|
||||||
- Should store the whole subscription object. Contains department information needed in subsequent calls.
|
|
||||||
|
|
||||||
Department ID
|
|
||||||
|
|
||||||
- May have multiple departments. Appears that financial stuff goes to Accounting, History will go to Service.
|
|
||||||
- TODO: How do we handle the multiple departments that may come up.
|
|
||||||
|
|
||||||
###Internal Questions
|
|
||||||
|
|
||||||
* Overview of the redis storing mechanism to cache this data.
|
|
||||||
*
|
|
||||||
|
|
||||||
# GL Wip Posting
|
|
||||||
|
|
||||||
## Org Helper Return Data
|
|
||||||
|
|
||||||
```json
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"acctgLgnID": "DEVWB-A",
|
|
||||||
"applCode": "V",
|
|
||||||
"coID": "77",
|
|
||||||
"companyName": "TEST SYS C187092 DEVWB",
|
|
||||||
"lgnDesc": "DEV WRITE BACK VMS",
|
|
||||||
"logon": "DEVWB-V"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"acctgLgnID": "DEVWB-A",
|
|
||||||
"applCode": "F",
|
|
||||||
"coID": "77",
|
|
||||||
"companyName": "TEST SYS C187092 DEVWB",
|
|
||||||
"lgnDesc": "DEV WRITE BACK F&I SALES",
|
|
||||||
"logon": "DEVWB-FI"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"acctgLgnID": "DEVWB-A",
|
|
||||||
"applCode": "CS",
|
|
||||||
"coID": "77",
|
|
||||||
"companyName": "TEST SYS C187092 DEVWB",
|
|
||||||
"lgnDesc": "DEV WRITE BACK SERVICE",
|
|
||||||
"logon": "DEVWB-S"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"acctgLgnID": "DEVWB-A",
|
|
||||||
"applCode": "A",
|
|
||||||
"coID": "77",
|
|
||||||
"companyName": "TEST SYS C187092 DEVWB",
|
|
||||||
"lgnDesc": "DEV WRITE BACK ACCTG",
|
|
||||||
"logon": "DEVWB-A"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"acctgLgnID": "DEVWB-A",
|
|
||||||
"applCode": "SL",
|
|
||||||
"coID": "77",
|
|
||||||
"companyName": "TEST SYS C187092 DEVWB",
|
|
||||||
"lgnDesc": "DEV WRTIE BACK SLS MGMT",
|
|
||||||
"logon": "DEVWB-SL"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"acctgLgnID": "DEVWB-A",
|
|
||||||
"applCode": "O",
|
|
||||||
"coID": "77",
|
|
||||||
"companyName": "TEST SYS C187092 DEVWB",
|
|
||||||
"lgnDesc": "DEV WRITE BACK PARTS",
|
|
||||||
"logon": "DEVWB-I"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Journal Helper Return Data
|
|
||||||
|
|
||||||
```json
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "32",
|
|
||||||
"jrnlName": "PARTS SALES",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "4",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "92",
|
|
||||||
"jrnlName": "YTD ADJUSTMENTS",
|
|
||||||
"jrnlType": "Y",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "3",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "12",
|
|
||||||
"jrnlName": "FLEET SALES",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "9",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "57",
|
|
||||||
"jrnlName": "CASH RECEIPTS (OPEN-ITEM)",
|
|
||||||
"jrnlType": "R",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "1",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "93",
|
|
||||||
"jrnlName": "SET UP HISTORY",
|
|
||||||
"jrnlType": "H",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "10",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "88",
|
|
||||||
"jrnlName": "F/S STATISCAL DATA",
|
|
||||||
"jrnlType": "F",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "10",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "58",
|
|
||||||
"jrnlName": "WARRANTY CREDITS",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "3",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "FC",
|
|
||||||
"jrnlName": "FINANCE CHARGE",
|
|
||||||
"jrnlType": "A",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "12",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "94",
|
|
||||||
"jrnlName": "SET UP SCHEDULES",
|
|
||||||
"jrnlType": "C",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "3",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "95",
|
|
||||||
"jrnlName": "SET UP GENERAL LEDGER",
|
|
||||||
"jrnlType": "B",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "3",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "20",
|
|
||||||
"jrnlName": "USED VEHICLE SALES",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "9",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "60",
|
|
||||||
"jrnlName": "CASH DISBURSEMENTS",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "2",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "30",
|
|
||||||
"jrnlName": "SERVICE SALES",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "7",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "40",
|
|
||||||
"jrnlName": "PAYROLL",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "11",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "15",
|
|
||||||
"jrnlName": "DEALER TRADES",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "9",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "70",
|
|
||||||
"jrnlName": "NEW VEHICLE PURCHASES",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "8",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "25",
|
|
||||||
"jrnlName": "USED WHOLESALE",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "9",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "75",
|
|
||||||
"jrnlName": "GENERAL PURCHASES",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "5",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "10",
|
|
||||||
"jrnlName": "NEW VEHICLE SALES",
|
|
||||||
"jrnlType": "S",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "9",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "80",
|
|
||||||
"jrnlName": "GENERAL JOURNAL",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "3",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "11",
|
|
||||||
"jrnlName": "WORK IN PROGRESS",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "10",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "56",
|
|
||||||
"jrnlName": "CASH RECEIPTS (BALANCE FWD)",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "1",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "81",
|
|
||||||
"jrnlName": "STANDARD ENTRIES",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "6",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "51",
|
|
||||||
"jrnlName": "CASH RECEIPTS JOURNAL - EFT",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "10",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "61",
|
|
||||||
"jrnlName": "CASH DISBURSMENTS -EFT",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "10",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"companyNo": "77",
|
|
||||||
"jrnlID": "71",
|
|
||||||
"jrnlName": "USED VEHICLE PURCHASES",
|
|
||||||
"jrnlType": "G",
|
|
||||||
"intercoFlag": "0",
|
|
||||||
"defaultDocType": "8",
|
|
||||||
"errCode": "",
|
|
||||||
"errMsg": ""
|
|
||||||
}
|
|
||||||
]
|
|
||||||
```
|
|
||||||
|
|
||||||
# Feedback
|
|
||||||
|
|
||||||
- Receiving bad request errors, with no details. API errors page doesn't indicate what's wrong for certain types of error codes.
|
|
||||||
- API Error page works on a several minute delay.
|
|
||||||
708
client/package-lock.json
generated
708
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -8,41 +8,41 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"proxy": "http://localhost:4000",
|
"proxy": "http://localhost:4000",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@amplitude/analytics-browser": "^2.30.1",
|
"@amplitude/analytics-browser": "^2.25.2",
|
||||||
"@ant-design/pro-layout": "^7.22.6",
|
"@ant-design/pro-layout": "^7.22.6",
|
||||||
"@apollo/client": "^3.13.9",
|
"@apollo/client": "^3.13.9",
|
||||||
"@emotion/is-prop-valid": "^1.4.0",
|
"@emotion/is-prop-valid": "^1.4.0",
|
||||||
"@fingerprintjs/fingerprintjs": "^4.6.1",
|
"@fingerprintjs/fingerprintjs": "^4.6.1",
|
||||||
"@firebase/analytics": "^0.10.19",
|
"@firebase/analytics": "^0.10.17",
|
||||||
"@firebase/app": "^0.14.6",
|
"@firebase/app": "^0.14.3",
|
||||||
"@firebase/auth": "^1.11.1",
|
"@firebase/auth": "^1.10.8",
|
||||||
"@firebase/firestore": "^4.9.2",
|
"@firebase/firestore": "^4.9.2",
|
||||||
"@firebase/messaging": "^0.12.22",
|
"@firebase/messaging": "^0.12.22",
|
||||||
"@jsreport/browser-client": "^3.1.0",
|
"@jsreport/browser-client": "^3.1.0",
|
||||||
"@reduxjs/toolkit": "^2.10.1",
|
"@reduxjs/toolkit": "^2.9.0",
|
||||||
"@sentry/cli": "^2.58.2",
|
"@sentry/cli": "^2.56.0",
|
||||||
"@sentry/react": "^9.43.0",
|
"@sentry/react": "^9.43.0",
|
||||||
"@sentry/vite-plugin": "^4.6.0",
|
"@sentry/vite-plugin": "^4.3.0",
|
||||||
"@splitsoftware/splitio-react": "^2.6.0",
|
"@splitsoftware/splitio-react": "^2.5.0",
|
||||||
"@tanem/react-nprogress": "^5.0.56",
|
"@tanem/react-nprogress": "^5.0.53",
|
||||||
"antd": "^5.28.1",
|
"antd": "^5.27.4",
|
||||||
"apollo-link-logger": "^2.0.1",
|
"apollo-link-logger": "^2.0.1",
|
||||||
"apollo-link-sentry": "^4.4.0",
|
"apollo-link-sentry": "^4.4.0",
|
||||||
"autosize": "^6.0.1",
|
"autosize": "^6.0.1",
|
||||||
"axios": "^1.13.2",
|
"axios": "^1.12.2",
|
||||||
"classnames": "^2.5.1",
|
"classnames": "^2.5.1",
|
||||||
"css-box-model": "^1.2.1",
|
"css-box-model": "^1.2.1",
|
||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.18",
|
||||||
"dayjs-business-days2": "^1.3.1",
|
"dayjs-business-days2": "^1.3.0",
|
||||||
"dinero.js": "^1.9.1",
|
"dinero.js": "^1.9.1",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"env-cmd": "^10.1.0",
|
"env-cmd": "^10.1.0",
|
||||||
"exifr": "^7.1.3",
|
"exifr": "^7.1.3",
|
||||||
"graphql": "^16.12.0",
|
"graphql": "^16.11.0",
|
||||||
"i18next": "^25.6.2",
|
"i18next": "^25.5.3",
|
||||||
"i18next-browser-languagedetector": "^8.2.0",
|
"i18next-browser-languagedetector": "^8.2.0",
|
||||||
"immutability-helper": "^3.1.1",
|
"immutability-helper": "^3.1.1",
|
||||||
"libphonenumber-js": "^1.12.26",
|
"libphonenumber-js": "^1.12.23",
|
||||||
"lightningcss": "^1.30.2",
|
"lightningcss": "^1.30.2",
|
||||||
"logrocket": "^9.0.2",
|
"logrocket": "^9.0.2",
|
||||||
"markerjs2": "^2.32.7",
|
"markerjs2": "^2.32.7",
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
"normalize-url": "^8.1.0",
|
"normalize-url": "^8.1.0",
|
||||||
"object-hash": "^3.0.0",
|
"object-hash": "^3.0.0",
|
||||||
"phone": "^3.1.67",
|
"phone": "^3.1.67",
|
||||||
"posthog-js": "^1.294.0",
|
"posthog-js": "^1.271.0",
|
||||||
"prop-types": "^15.8.1",
|
"prop-types": "^15.8.1",
|
||||||
"query-string": "^9.3.1",
|
"query-string": "^9.3.1",
|
||||||
"raf-schd": "^4.0.3",
|
"raf-schd": "^4.0.3",
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
"react-markdown": "^10.1.0",
|
"react-markdown": "^10.1.0",
|
||||||
"react-number-format": "^5.4.3",
|
"react-number-format": "^5.4.3",
|
||||||
"react-popopo": "^2.1.9",
|
"react-popopo": "^2.1.9",
|
||||||
"react-product-fruits": "^2.2.62",
|
"react-product-fruits": "^2.2.61",
|
||||||
"react-redux": "^9.2.0",
|
"react-redux": "^9.2.0",
|
||||||
"react-resizable": "^3.0.5",
|
"react-resizable": "^3.0.5",
|
||||||
"react-router-dom": "^6.30.0",
|
"react-router-dom": "^6.30.0",
|
||||||
@@ -78,10 +78,10 @@
|
|||||||
"redux": "^5.0.1",
|
"redux": "^5.0.1",
|
||||||
"redux-actions": "^3.0.3",
|
"redux-actions": "^3.0.3",
|
||||||
"redux-persist": "^6.0.0",
|
"redux-persist": "^6.0.0",
|
||||||
"redux-saga": "^1.4.2",
|
"redux-saga": "^1.3.0",
|
||||||
"redux-state-sync": "^3.1.4",
|
"redux-state-sync": "^3.1.4",
|
||||||
"reselect": "^5.1.1",
|
"reselect": "^5.1.1",
|
||||||
"sass": "^1.94.0",
|
"sass": "^1.93.2",
|
||||||
"socket.io-client": "^4.8.1",
|
"socket.io-client": "^4.8.1",
|
||||||
"styled-components": "^6.1.19",
|
"styled-components": "^6.1.19",
|
||||||
"subscriptions-transport-ws": "^0.11.0",
|
"subscriptions-transport-ws": "^0.11.0",
|
||||||
@@ -135,35 +135,35 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ant-design/icons": "^6.1.0",
|
"@ant-design/icons": "^6.1.0",
|
||||||
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
||||||
"@babel/preset-react": "^7.28.5",
|
"@babel/preset-react": "^7.27.1",
|
||||||
"@dotenvx/dotenvx": "^1.51.1",
|
"@dotenvx/dotenvx": "^1.51.0",
|
||||||
"@emotion/babel-plugin": "^11.13.5",
|
"@emotion/babel-plugin": "^11.13.5",
|
||||||
"@emotion/react": "^11.14.0",
|
"@emotion/react": "^11.14.0",
|
||||||
"@eslint/js": "^9.39.1",
|
"@eslint/js": "^9.37.0",
|
||||||
"@playwright/test": "^1.56.1",
|
"@playwright/test": "^1.56.0",
|
||||||
"@sentry/webpack-plugin": "^4.6.0",
|
"@sentry/webpack-plugin": "^4.3.0",
|
||||||
"@testing-library/dom": "^10.4.1",
|
"@testing-library/dom": "^10.4.1",
|
||||||
"@testing-library/jest-dom": "^6.9.1",
|
"@testing-library/jest-dom": "^6.9.1",
|
||||||
"@testing-library/react": "^16.3.0",
|
"@testing-library/react": "^16.3.0",
|
||||||
"@vitejs/plugin-react": "^4.6.0",
|
"@vitejs/plugin-react": "^4.6.0",
|
||||||
"browserslist": "^4.28.0",
|
"browserslist": "^4.26.3",
|
||||||
"browserslist-to-esbuild": "^2.1.1",
|
"browserslist-to-esbuild": "^2.1.1",
|
||||||
"chalk": "^5.6.2",
|
"chalk": "^5.6.2",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.37.0",
|
||||||
"eslint-plugin-react": "^7.37.5",
|
"eslint-plugin-react": "^7.37.5",
|
||||||
"globals": "^15.15.0",
|
"globals": "^15.15.0",
|
||||||
"jsdom": "^26.0.0",
|
"jsdom": "^26.0.0",
|
||||||
"memfs": "^4.51.0",
|
"memfs": "^4.48.1",
|
||||||
"os-browserify": "^0.3.0",
|
"os-browserify": "^0.3.0",
|
||||||
"playwright": "^1.56.1",
|
"playwright": "^1.56.0",
|
||||||
"react-error-overlay": "^6.1.0",
|
"react-error-overlay": "^6.1.0",
|
||||||
"redux-logger": "^3.0.6",
|
"redux-logger": "^3.0.6",
|
||||||
"source-map-explorer": "^2.5.3",
|
"source-map-explorer": "^2.5.3",
|
||||||
"vite": "^7.2.2",
|
"vite": "^7.1.9",
|
||||||
"vite-plugin-babel": "^1.3.2",
|
"vite-plugin-babel": "^1.3.2",
|
||||||
"vite-plugin-eslint": "^1.8.1",
|
"vite-plugin-eslint": "^1.8.1",
|
||||||
"vite-plugin-node-polyfills": "^0.24.0",
|
"vite-plugin-node-polyfills": "^0.24.0",
|
||||||
"vite-plugin-pwa": "^1.1.0",
|
"vite-plugin-pwa": "^1.0.3",
|
||||||
"vite-plugin-style-import": "^2.0.0",
|
"vite-plugin-style-import": "^2.0.0",
|
||||||
"vitest": "^3.2.4",
|
"vitest": "^3.2.4",
|
||||||
"workbox-window": "^7.3.0"
|
"workbox-window": "^7.3.0"
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ export function App({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentEula && !currentUser.eulaIsAccepted) {
|
if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
|
||||||
return <Eula />;
|
return <Eula />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@use "react-big-calendar/lib/sass/styles" as rbc;
|
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
--table-stripe-bg: #f4f4f4; /* Light mode table stripe */
|
--table-stripe-bg: #f4f4f4; /* Light mode table stripe */
|
||||||
--menu-divider-color: #74695c; /* Light mode menu divider */
|
--menu-divider-color: #74695c; /* Light mode menu divider */
|
||||||
@@ -213,6 +211,9 @@
|
|||||||
--svg-background: #FFF; /* Dark mode SVG background */
|
--svg-background: #FFF; /* Dark mode SVG background */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Global Styles
|
||||||
|
@import "react-big-calendar/lib/sass/styles";
|
||||||
|
|
||||||
.ant-menu-item-divider {
|
.ant-menu-item-divider {
|
||||||
border-bottom: 1px solid var(--menu-divider-color) !important;
|
border-bottom: 1px solid var(--menu-divider-color) !important;
|
||||||
}
|
}
|
||||||
@@ -425,24 +426,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.dms-equal-height-col {
|
|
||||||
display: flex; // make the Col a flex container
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If the direct child is an AntD Card, make it fill the column */
|
|
||||||
.dms-equal-height-col > .ant-card {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Optional: if you want the card body to fill vertically too */
|
|
||||||
.dms-equal-height-col > .ant-card .ant-card-body {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
//.rbc-time-header-gutter {
|
//.rbc-time-header-gutter {
|
||||||
// padding: 0;
|
// padding: 0;
|
||||||
//}
|
//}
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
|
|||||||
<Card
|
<Card
|
||||||
extra={
|
extra={
|
||||||
<Space wrap>
|
<Space wrap>
|
||||||
{!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && !bodyshop.rr_dealerid && (
|
{!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
|
||||||
<>
|
<>
|
||||||
<JobMarkSelectedExported
|
<JobMarkSelectedExported
|
||||||
jobIds={selectedJobs}
|
jobIds={selectedJobs}
|
||||||
@@ -198,7 +198,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
|
|||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{bodyshop.accountingconfig?.qbo && <QboAuthorizeComponent />}
|
{bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
|
||||||
<Input.Search
|
<Input.Search
|
||||||
value={state.search}
|
value={state.search}
|
||||||
onChange={handleSearch}
|
onChange={handleSearch}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import { createStructuredSelector } from "reselect";
|
|||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||||
import CiecaSelect from "../../utils/Ciecaselect";
|
import CiecaSelect from "../../utils/Ciecaselect";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
@@ -45,7 +44,7 @@ export function BillFormItemsExtendedFormItem({
|
|||||||
quantity: record.part_qty || 1,
|
quantity: record.part_qty || 1,
|
||||||
actual_price: record.act_price,
|
actual_price: record.act_price,
|
||||||
cost_center: record.part_type
|
cost_center: record.part_type
|
||||||
? bodyshopHasDmsKey(bodyshop)
|
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
|
||||||
? record.part_type
|
? record.part_type
|
||||||
: responsibilityCenters.defaults && (responsibilityCenters.defaults.costs[record.part_type] || null)
|
: responsibilityCenters.defaults && (responsibilityCenters.defaults.costs[record.part_type] || null)
|
||||||
: null
|
: null
|
||||||
@@ -101,7 +100,7 @@ export function BillFormItemsExtendedFormItem({
|
|||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("billlines.fields.cost_center")} name={["billlineskeys", record.id, "cost_center"]}>
|
<Form.Item label={t("billlines.fields.cost_center")} name={["billlineskeys", record.id, "cost_center"]}>
|
||||||
<Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
|
<Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
|
||||||
{bodyshopHasDmsKey(bodyshop)
|
{bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||||
? CiecaSelect(true, false)
|
? CiecaSelect(true, false)
|
||||||
: responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
|
: responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
|
||||||
</Select>
|
</Select>
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import VendorSearchSelect from "../vendor-search-select/vendor-search-select.com
|
|||||||
import BillFormLines from "./bill-form.lines.component";
|
import BillFormLines from "./bill-form.lines.component";
|
||||||
import { CalculateBillTotal } from "./bill-form.totals.utility";
|
import { CalculateBillTotal } from "./bill-form.totals.utility";
|
||||||
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
|
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
@@ -355,7 +354,7 @@ export function BillFormComponent({
|
|||||||
<Form.Item span={3} label={t("bills.fields.local_tax_rate")} name="local_tax_rate">
|
<Form.Item span={3} label={t("bills.fields.local_tax_rate")} name="local_tax_rate">
|
||||||
<CurrencyInput min={0} />
|
<CurrencyInput min={0} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
{bodyshopHasDmsKey(bodyshop) ? (
|
{bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
|
||||||
<Form.Item span={2} label={t("bills.labels.federal_tax_exempt")} name="federal_tax_exempt">
|
<Form.Item span={2} label={t("bills.labels.federal_tax_exempt")} name="federal_tax_exempt">
|
||||||
<Switch onChange={handleFederalTaxExemptSwitchToggle} />
|
<Switch onChange={handleFederalTaxExemptSwitchToggle} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
|||||||
import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
|
import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
|
||||||
import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
|
import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
|
||||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
//currentUser: selectCurrentUser
|
//currentUser: selectCurrentUser
|
||||||
@@ -91,7 +90,7 @@ export function BillEnterModalLinesComponent({
|
|||||||
actual_price: opt.cost,
|
actual_price: opt.cost,
|
||||||
original_actual_price: opt.cost,
|
original_actual_price: opt.cost,
|
||||||
cost_center: opt.part_type
|
cost_center: opt.part_type
|
||||||
? bodyshopHasDmsKey(bodyshop)
|
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
|
||||||
? opt.part_type !== "PAE"
|
? opt.part_type !== "PAE"
|
||||||
? opt.part_type
|
? opt.part_type
|
||||||
: null
|
: null
|
||||||
@@ -323,7 +322,7 @@ export function BillEnterModalLinesComponent({
|
|||||||
},
|
},
|
||||||
formInput: () => (
|
formInput: () => (
|
||||||
<Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
|
<Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
|
||||||
{bodyshopHasDmsKey(bodyshop)
|
{bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||||
? CiecaSelect(true, false)
|
? CiecaSelect(true, false)
|
||||||
: responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
|
: responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
|
||||||
</Select>
|
</Select>
|
||||||
|
|||||||
@@ -142,17 +142,37 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
|
|||||||
title={t("job_lifecycle.content.legend_title")}
|
title={t("job_lifecycle.content.legend_title")}
|
||||||
style={{ marginTop: "10px" }}
|
style={{ marginTop: "10px" }}
|
||||||
>
|
>
|
||||||
<div>
|
<div
|
||||||
|
style={{
|
||||||
|
display: "flex",
|
||||||
|
flexWrap: "wrap",
|
||||||
|
gap: 8
|
||||||
|
}}
|
||||||
|
>
|
||||||
{lifecycleData.summations.map((key) => (
|
{lifecycleData.summations.map((key) => (
|
||||||
<Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
|
<Tag
|
||||||
|
key={key.status}
|
||||||
|
color={key.color}
|
||||||
|
style={{
|
||||||
|
// IMPORTANT: let the tag grow with its content
|
||||||
|
width: "auto",
|
||||||
|
padding: 0,
|
||||||
|
margin: 0,
|
||||||
|
display: "inline-flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
boxSizing: "border-box"
|
||||||
|
}}
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
||||||
title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: "var(--tag-wrapper-bg)",
|
backgroundColor: "var(--tag-wrapper-bg)",
|
||||||
color: "var(--tag-wrapper-text)",
|
color: "var(--tag-wrapper-text)",
|
||||||
padding: "4px",
|
padding: "4px 8px",
|
||||||
textAlign: "center"
|
textAlign: "center",
|
||||||
|
whiteSpace: "nowrap" // keep it on one line while letting the pill expand
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
|
{key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [socket, socket.connected, billids]);
|
}, [socket, socket.connected, billids]);
|
||||||
|
console.log(allocationsSummary);
|
||||||
const columns = [
|
const columns = [
|
||||||
{
|
{
|
||||||
title: t("general.labels.status"),
|
title: t("general.labels.status"),
|
||||||
@@ -122,7 +122,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
|
|||||||
<Form.Item
|
<Form.Item
|
||||||
name="journal"
|
name="journal"
|
||||||
label={t("jobs.fields.dms.journal")}
|
label={t("jobs.fields.dms.journal")}
|
||||||
initialValue={bodyshop.cdk_configuration?.default_journal}
|
initialValue={bodyshop.cdk_configuration && bodyshop.cdk_configuration.default_journal}
|
||||||
rules={[
|
rules={[
|
||||||
{
|
{
|
||||||
required: true
|
required: true
|
||||||
|
|||||||
@@ -1,97 +1,72 @@
|
|||||||
import { Alert, Button, Card, Table, Typography } from "antd";
|
import { Alert, Button, Card, Table, Typography } from "antd";
|
||||||
import { SyncOutlined } from "@ant-design/icons";
|
import { useEffect, useState } from "react";
|
||||||
import { useCallback, useEffect, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import Dinero from "dinero.js";
|
|
||||||
import { DMS_MAP } from "../../utils/dmsUtils";
|
|
||||||
|
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
|
import Dinero from "dinero.js";
|
||||||
|
import { SyncOutlined } from "@ant-design/icons";
|
||||||
import { pageLimit } from "../../utils/config";
|
import { pageLimit } from "../../utils/config";
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
|
//currentUser: selectCurrentUser
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
});
|
});
|
||||||
const mapDispatchToProps = () => ({});
|
|
||||||
|
const mapDispatchToProps = () => ({
|
||||||
|
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
||||||
|
});
|
||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(DmsAllocationsSummary);
|
export default connect(mapStateToProps, mapDispatchToProps)(DmsAllocationsSummary);
|
||||||
|
|
||||||
/**
|
export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
|
||||||
* DMS Allocations Summary component
|
|
||||||
* @param mode
|
|
||||||
* @param socket
|
|
||||||
* @param bodyshop
|
|
||||||
* @param jobId
|
|
||||||
* @param title
|
|
||||||
* @returns {JSX.Element}
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title }) {
|
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [allocationsSummary, setAllocationsSummary] = useState([]);
|
const [allocationsSummary, setAllocationsSummary] = useState([]);
|
||||||
|
|
||||||
// Resolve event name by mode (PBS reuses the CDK event per existing behavior)
|
|
||||||
const allocationsEvent =
|
|
||||||
mode === DMS_MAP.reynolds
|
|
||||||
? "rr-calculate-allocations"
|
|
||||||
: mode === DMS_MAP.fortellis
|
|
||||||
? "fortellis-calculate-allocations"
|
|
||||||
: /* "cdk" | "pbs" (legacy) */ "cdk-calculate-allocations";
|
|
||||||
|
|
||||||
const fetchAllocations = useCallback(() => {
|
|
||||||
if (!socket || !jobId || !mode) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
socket.emit(allocationsEvent, jobId, (ack) => {
|
|
||||||
const list = Array.isArray(ack) ? ack : [];
|
|
||||||
setAllocationsSummary(list);
|
|
||||||
// Preserve side-channel used by the post form for discrepancy checks
|
|
||||||
socket.allocationsSummary = list;
|
|
||||||
});
|
|
||||||
} catch {
|
|
||||||
// Best-effort; leave table empty on error
|
|
||||||
setAllocationsSummary([]);
|
|
||||||
socket && (socket.allocationsSummary = []);
|
|
||||||
}
|
|
||||||
}, [socket, jobId, mode, allocationsEvent]);
|
|
||||||
|
|
||||||
// Initial + whenever mode/socket/jobId changes
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchAllocations();
|
if (socket.connected) {
|
||||||
}, [fetchAllocations]);
|
socket.emit("cdk-calculate-allocations", jobId, (ack) => {
|
||||||
|
setAllocationsSummary(ack);
|
||||||
|
socket.allocationsSummary = ack;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [socket, socket.connected, jobId]);
|
||||||
|
|
||||||
const columns = [
|
const columns = [
|
||||||
{ title: t("jobs.fields.dms.center"), dataIndex: "center", key: "center" },
|
{
|
||||||
|
title: t("jobs.fields.dms.center"),
|
||||||
|
dataIndex: "center",
|
||||||
|
key: "center"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: t("jobs.fields.dms.sale"),
|
title: t("jobs.fields.dms.sale"),
|
||||||
dataIndex: "sale",
|
dataIndex: "sale",
|
||||||
key: "sale",
|
key: "sale",
|
||||||
render: (_text, record) => Dinero(record.sale).toFormat()
|
render: (text, record) => Dinero(record.sale).toFormat()
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("jobs.fields.dms.cost"),
|
title: t("jobs.fields.dms.cost"),
|
||||||
dataIndex: "cost",
|
dataIndex: "cost",
|
||||||
key: "cost",
|
key: "cost",
|
||||||
render: (_text, record) => Dinero(record.cost).toFormat()
|
render: (text, record) => Dinero(record.cost).toFormat()
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("jobs.fields.dms.sale_dms_acctnumber"),
|
title: t("jobs.fields.dms.sale_dms_acctnumber"),
|
||||||
dataIndex: "sale_dms_acctnumber",
|
dataIndex: "sale_dms_acctnumber",
|
||||||
key: "sale_dms_acctnumber",
|
key: "sale_dms_acctnumber",
|
||||||
render: (_text, record) => record.profitCenter?.dms_acctnumber
|
render: (text, record) => record.profitCenter?.dms_acctnumber
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("jobs.fields.dms.cost_dms_acctnumber"),
|
title: t("jobs.fields.dms.cost_dms_acctnumber"),
|
||||||
dataIndex: "cost_dms_acctnumber",
|
dataIndex: "cost_dms_acctnumber",
|
||||||
key: "cost_dms_acctnumber",
|
key: "cost_dms_acctnumber",
|
||||||
render: (_text, record) => record.costCenter?.dms_acctnumber
|
render: (text, record) => record.costCenter?.dms_acctnumber
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("jobs.fields.dms.dms_wip_acctnumber"),
|
title: t("jobs.fields.dms.dms_wip_acctnumber"),
|
||||||
dataIndex: "dms_wip_acctnumber",
|
dataIndex: "dms_wip_acctnumber",
|
||||||
key: "dms_wip_acctnumber",
|
key: "dms_wip_acctnumber",
|
||||||
render: (_text, record) => record.costCenter?.dms_wip_acctnumber
|
render: (text, record) => record.costCenter?.dms_wip_acctnumber
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -99,7 +74,11 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title })
|
|||||||
<Card
|
<Card
|
||||||
title={title}
|
title={title}
|
||||||
extra={
|
extra={
|
||||||
<Button onClick={fetchAllocations} aria-label={t("general.actions.refresh")}>
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
socket.emit("cdk-calculate-allocations", jobId, (ack) => setAllocationsSummary(ack));
|
||||||
|
}}
|
||||||
|
>
|
||||||
<SyncOutlined />
|
<SyncOutlined />
|
||||||
</Button>
|
</Button>
|
||||||
}
|
}
|
||||||
@@ -107,7 +86,6 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title })
|
|||||||
{bodyshop.pbs_configuration?.disablebillwip && (
|
{bodyshop.pbs_configuration?.disablebillwip && (
|
||||||
<Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
|
<Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Table
|
<Table
|
||||||
pagination={{ position: "top", defaultPageSize: pageLimit }}
|
pagination={{ position: "top", defaultPageSize: pageLimit }}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
@@ -116,25 +94,34 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title })
|
|||||||
locale={{ emptyText: t("dms.labels.refreshallocations") }}
|
locale={{ emptyText: t("dms.labels.refreshallocations") }}
|
||||||
scroll={{ x: true }}
|
scroll={{ x: true }}
|
||||||
summary={() => {
|
summary={() => {
|
||||||
const totals = allocationsSummary?.reduce(
|
const totals =
|
||||||
(acc, val) => ({
|
allocationsSummary &&
|
||||||
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
allocationsSummary.reduce(
|
||||||
totalCost: acc.totalCost.add(Dinero(val.cost))
|
(acc, val) => {
|
||||||
}),
|
return {
|
||||||
{ totalSale: Dinero(), totalCost: Dinero() }
|
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
||||||
) || { totalSale: Dinero(), totalCost: Dinero() };
|
totalCost: acc.totalCost.add(Dinero(val.cost))
|
||||||
|
};
|
||||||
const hasNonZeroSaleTotal = totals.totalSale.getAmount() !== 0;
|
},
|
||||||
|
{
|
||||||
|
totalSale: Dinero(),
|
||||||
|
totalCost: Dinero()
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table.Summary.Row>
|
<Table.Summary.Row>
|
||||||
<Table.Summary.Cell>
|
<Table.Summary.Cell>
|
||||||
<Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
|
<Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
|
||||||
</Table.Summary.Cell>
|
</Table.Summary.Cell>
|
||||||
<Table.Summary.Cell>{hasNonZeroSaleTotal ? totals.totalSale.toFormat() : null}</Table.Summary.Cell>
|
<Table.Summary.Cell>{totals && totals.totalSale.toFormat()}</Table.Summary.Cell>
|
||||||
<Table.Summary.Cell />
|
<Table.Summary.Cell>
|
||||||
<Table.Summary.Cell />
|
{
|
||||||
<Table.Summary.Cell />
|
// totals.totalCost.toFormat()
|
||||||
|
}
|
||||||
|
</Table.Summary.Cell>
|
||||||
|
<Table.Summary.Cell></Table.Summary.Cell>
|
||||||
|
<Table.Summary.Cell></Table.Summary.Cell>
|
||||||
</Table.Summary.Row>
|
</Table.Summary.Row>
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -1,300 +0,0 @@
|
|||||||
import { Alert, Button, Card, Table, Tabs, Typography } from "antd";
|
|
||||||
import { SyncOutlined } from "@ant-design/icons";
|
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { connect } from "react-redux";
|
|
||||||
import { createStructuredSelector } from "reselect";
|
|
||||||
|
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
|
||||||
bodyshop: selectBodyshop
|
|
||||||
});
|
|
||||||
const mapDispatchToProps = () => ({});
|
|
||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(RrAllocationsSummary);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalize job allocations into a flat list for display / preview building.
|
|
||||||
* @param ack
|
|
||||||
* @returns {{center: *, sale, partsSale, laborTaxableSale, laborNonTaxableSale, extrasSale, cost, profitCenter, costCenter}[]|*[]}
|
|
||||||
*/
|
|
||||||
function normalizeJobAllocations(ack) {
|
|
||||||
if (!ack || !Array.isArray(ack.jobAllocations)) return [];
|
|
||||||
|
|
||||||
return ack.jobAllocations.map((row) => ({
|
|
||||||
center: row.center,
|
|
||||||
|
|
||||||
// legacy "sale" (total) if we ever want to show it again
|
|
||||||
sale: row.sale || row.totalSale || null,
|
|
||||||
|
|
||||||
// bucketed sales used to build split ROGOG/ROLABOR
|
|
||||||
partsSale: row.partsSale || null,
|
|
||||||
laborTaxableSale: row.laborTaxableSale || null,
|
|
||||||
laborNonTaxableSale: row.laborNonTaxableSale || null,
|
|
||||||
extrasSale: row.extrasSale || null,
|
|
||||||
|
|
||||||
cost: row.cost || null,
|
|
||||||
profitCenter: row.profitCenter || null,
|
|
||||||
costCenter: row.costCenter || null
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* RR-specific DMS Allocations Summary
|
|
||||||
* Focused on what we actually send to RR:
|
|
||||||
* - ROGOG (split by taxable / non-taxable segments)
|
|
||||||
* - ROLABOR shell
|
|
||||||
*
|
|
||||||
* The heavy lifting (ROGOG/ROLABOR split, cost allocation, tax flags)
|
|
||||||
* is now done on the backend via buildRogogFromAllocations/buildRolaborFromRogog.
|
|
||||||
* This component just renders the preview from `ack.rogg` / `ack.rolabor`.
|
|
||||||
*/
|
|
||||||
export function RrAllocationsSummary({ socket, bodyshop, jobId, title }) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [roggPreview, setRoggPreview] = useState(null);
|
|
||||||
const [rolaborPreview, setRolaborPreview] = useState(null);
|
|
||||||
const [error, setError] = useState(null);
|
|
||||||
|
|
||||||
const fetchAllocations = useCallback(() => {
|
|
||||||
if (!socket || !jobId) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
socket.emit("rr-calculate-allocations", jobId, (ack) => {
|
|
||||||
if (ack && ack.ok === false) {
|
|
||||||
setRoggPreview(null);
|
|
||||||
setRolaborPreview(null);
|
|
||||||
setError(ack.error || t("dms.labels.allocations_error"));
|
|
||||||
if (socket) {
|
|
||||||
socket.allocationsSummary = [];
|
|
||||||
socket.rrAllocationsRaw = ack;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const jobAllocRows = normalizeJobAllocations(ack);
|
|
||||||
|
|
||||||
setRoggPreview(ack?.rogg || null);
|
|
||||||
setRolaborPreview(ack?.rolabor || null);
|
|
||||||
setError(null);
|
|
||||||
|
|
||||||
if (socket) {
|
|
||||||
socket.allocationsSummary = jobAllocRows;
|
|
||||||
socket.rrAllocationsRaw = ack;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} catch {
|
|
||||||
setRoggPreview(null);
|
|
||||||
setRolaborPreview(null);
|
|
||||||
setError(t("dms.labels.allocations_error"));
|
|
||||||
if (socket) {
|
|
||||||
socket.allocationsSummary = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [socket, jobId, t]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetchAllocations();
|
|
||||||
}, [fetchAllocations]);
|
|
||||||
|
|
||||||
const opCode = bodyshop?.rr_configuration?.baseOpCode || "28TOZ";
|
|
||||||
|
|
||||||
const segmentLabelMap = {
|
|
||||||
partsExtras: "Parts/Extras",
|
|
||||||
laborTaxable: "Taxable Labor",
|
|
||||||
laborNonTaxable: "Non-Taxable Labor"
|
|
||||||
};
|
|
||||||
|
|
||||||
const roggRows = useMemo(() => {
|
|
||||||
if (!roggPreview || !Array.isArray(roggPreview.ops)) return [];
|
|
||||||
const rows = [];
|
|
||||||
roggPreview.ops.forEach((op) => {
|
|
||||||
(op.lines || []).forEach((line, idx) => {
|
|
||||||
const baseDesc = line.itemDesc;
|
|
||||||
const segmentKind = op.segmentKind;
|
|
||||||
const segmentCount = op.segmentCount || 0;
|
|
||||||
const segmentLabel = segmentLabelMap[segmentKind] || segmentKind;
|
|
||||||
const displayDesc = segmentCount > 1 && segmentLabel ? `${baseDesc} (${segmentLabel})` : baseDesc;
|
|
||||||
|
|
||||||
rows.push({
|
|
||||||
key: `${op.jobNo}-${idx}`,
|
|
||||||
opCode: op.opCode,
|
|
||||||
jobNo: op.jobNo,
|
|
||||||
breakOut: line.breakOut,
|
|
||||||
itemType: line.itemType,
|
|
||||||
itemDesc: displayDesc,
|
|
||||||
custQty: line.custQty,
|
|
||||||
custPayTypeFlag: line.custPayTypeFlag,
|
|
||||||
custTxblNtxblFlag: line.custTxblNtxblFlag,
|
|
||||||
custPrice: line.amount?.custPrice,
|
|
||||||
dlrCost: line.amount?.dlrCost,
|
|
||||||
// segment metadata for visual styling
|
|
||||||
segmentKind,
|
|
||||||
segmentCount
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
return rows;
|
|
||||||
}, [roggPreview]);
|
|
||||||
|
|
||||||
const rolaborRows = useMemo(() => {
|
|
||||||
if (!rolaborPreview || !Array.isArray(rolaborPreview.ops)) return [];
|
|
||||||
return rolaborPreview.ops.map((op, idx) => ({
|
|
||||||
key: `${op.jobNo}-${idx}`,
|
|
||||||
opCode: op.opCode,
|
|
||||||
jobNo: op.jobNo,
|
|
||||||
custPayTypeFlag: op.custPayTypeFlag,
|
|
||||||
custTxblNtxblFlag: op.custTxblNtxblFlag,
|
|
||||||
payType: op.bill?.payType,
|
|
||||||
amtType: op.amount?.amtType,
|
|
||||||
custPrice: op.amount?.custPrice,
|
|
||||||
totalAmt: op.amount?.totalAmt
|
|
||||||
}));
|
|
||||||
}, [rolaborPreview]);
|
|
||||||
|
|
||||||
// Totals for ROGOG (sum custPrice + dlrCost over all lines)
|
|
||||||
const roggTotals = useMemo(() => {
|
|
||||||
if (!roggPreview || !Array.isArray(roggPreview.ops)) {
|
|
||||||
return { totalCustPrice: "0.00", totalDlrCost: "0.00" };
|
|
||||||
}
|
|
||||||
|
|
||||||
let totalCustCents = 0;
|
|
||||||
let totalCostCents = 0;
|
|
||||||
|
|
||||||
roggPreview.ops.forEach((op) => {
|
|
||||||
(op.lines || []).forEach((line) => {
|
|
||||||
const cp = parseFloat(line.amount?.custPrice || "0");
|
|
||||||
if (!Number.isNaN(cp)) {
|
|
||||||
totalCustCents += Math.round(cp * 100);
|
|
||||||
}
|
|
||||||
|
|
||||||
const dc = parseFloat(line.amount?.dlrCost || "0");
|
|
||||||
if (!Number.isNaN(dc)) {
|
|
||||||
totalCostCents += Math.round(dc * 100);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
totalCustPrice: (totalCustCents / 100).toFixed(2),
|
|
||||||
totalDlrCost: (totalCostCents / 100).toFixed(2)
|
|
||||||
};
|
|
||||||
}, [roggPreview]);
|
|
||||||
|
|
||||||
const roggColumns = [
|
|
||||||
{ title: "JobNo", dataIndex: "jobNo", key: "jobNo" },
|
|
||||||
{ title: "OpCode", dataIndex: "opCode", key: "opCode" },
|
|
||||||
{ title: "BreakOut", dataIndex: "breakOut", key: "breakOut" },
|
|
||||||
{ title: "ItemType", dataIndex: "itemType", key: "itemType" },
|
|
||||||
{ title: "ItemDesc", dataIndex: "itemDesc", key: "itemDesc" },
|
|
||||||
{ title: "CustQty", dataIndex: "custQty", key: "custQty" },
|
|
||||||
{ title: "CustTxblFlag", dataIndex: "custTxblNtxblFlag", key: "custTxblNtxblFlag" },
|
|
||||||
{ title: "CustPrice", dataIndex: "custPrice", key: "custPrice" },
|
|
||||||
{ title: "DlrCost", dataIndex: "dlrCost", key: "dlrCost" }
|
|
||||||
];
|
|
||||||
|
|
||||||
const rolaborColumns = [
|
|
||||||
{ title: "JobNo", dataIndex: "jobNo", key: "jobNo" },
|
|
||||||
{ title: "OpCode", dataIndex: "opCode", key: "opCode" },
|
|
||||||
{ title: "CustPayType", dataIndex: "custPayTypeFlag", key: "custPayTypeFlag" },
|
|
||||||
{ title: "CustTxblFlag", dataIndex: "custTxblNtxblFlag", key: "custTxblNtxblFlag" },
|
|
||||||
{ title: "PayType", dataIndex: "payType", key: "payType" },
|
|
||||||
{ title: "AmtType", dataIndex: "amtType", key: "amtType" },
|
|
||||||
{ title: "CustPrice", dataIndex: "custPrice", key: "custPrice" },
|
|
||||||
{ title: "TotalAmt", dataIndex: "totalAmt", key: "totalAmt" }
|
|
||||||
];
|
|
||||||
|
|
||||||
const tabItems = [
|
|
||||||
{
|
|
||||||
key: "rogog",
|
|
||||||
label: "ROGOG Preview",
|
|
||||||
children: (
|
|
||||||
<>
|
|
||||||
<Typography.Paragraph type="secondary" style={{ marginBottom: 8 }}>
|
|
||||||
OpCode: <strong>{opCode}</strong>. Only centers with RR GOG mapping (rr_gogcode & rr_item_type) are
|
|
||||||
included. Totals below reflect exactly what will be sent in ROGOG.
|
|
||||||
</Typography.Paragraph>
|
|
||||||
<Table
|
|
||||||
pagination={false}
|
|
||||||
columns={roggColumns}
|
|
||||||
rowKey="key"
|
|
||||||
dataSource={roggRows}
|
|
||||||
locale={{ emptyText: "No ROGOG lines would be generated." }}
|
|
||||||
scroll={{ x: true }}
|
|
||||||
// 👇 visually highlight splits; especially taxable/non-taxable labor segments
|
|
||||||
rowClassName={(record) => {
|
|
||||||
if (
|
|
||||||
record.segmentCount > 1 &&
|
|
||||||
(record.segmentKind === "laborTaxable" || record.segmentKind === "laborNonTaxable")
|
|
||||||
) {
|
|
||||||
return "rr-allocations-tax-split-row";
|
|
||||||
}
|
|
||||||
if (record.segmentCount > 1) {
|
|
||||||
return "rr-allocations-split-row";
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}}
|
|
||||||
summary={() => {
|
|
||||||
const hasCustTotal = Number(roggTotals.totalCustPrice) !== 0;
|
|
||||||
const hasCostTotal = Number(roggTotals.totalDlrCost) !== 0;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Table.Summary.Row>
|
|
||||||
<Table.Summary.Cell index={0}>
|
|
||||||
<Typography.Title level={5}>{t("general.labels.totals")}</Typography.Title>
|
|
||||||
</Table.Summary.Cell>
|
|
||||||
<Table.Summary.Cell index={1} />
|
|
||||||
<Table.Summary.Cell index={2} />
|
|
||||||
<Table.Summary.Cell index={3} />
|
|
||||||
<Table.Summary.Cell index={4} />
|
|
||||||
<Table.Summary.Cell index={5} />
|
|
||||||
<Table.Summary.Cell index={6} />
|
|
||||||
<Table.Summary.Cell index={7}>{hasCustTotal ? roggTotals.totalCustPrice : null}</Table.Summary.Cell>
|
|
||||||
<Table.Summary.Cell index={8}>{hasCostTotal ? roggTotals.totalDlrCost : null}</Table.Summary.Cell>
|
|
||||||
</Table.Summary.Row>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "rolabor",
|
|
||||||
label: "ROLABOR Preview",
|
|
||||||
children: (
|
|
||||||
<>
|
|
||||||
<Typography.Paragraph type="secondary" style={{ marginBottom: 8 }}>
|
|
||||||
This mirrors the shell that would be sent for ROLABOR when all financials are carried in GOG.
|
|
||||||
</Typography.Paragraph>
|
|
||||||
<Table
|
|
||||||
pagination={false}
|
|
||||||
columns={rolaborColumns}
|
|
||||||
rowKey="key"
|
|
||||||
dataSource={rolaborRows}
|
|
||||||
locale={{ emptyText: "No ROLABOR lines would be generated." }}
|
|
||||||
scroll={{ x: true }}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card
|
|
||||||
title={title}
|
|
||||||
extra={
|
|
||||||
<Button onClick={fetchAllocations} aria-label={t("general.actions.refresh")}>
|
|
||||||
<SyncOutlined />
|
|
||||||
</Button>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{bodyshop.pbs_configuration?.disablebillwip && (
|
|
||||||
<Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
|
|
||||||
)}
|
|
||||||
|
|
||||||
{error && <Alert type="error" style={{ marginTop: 8, marginBottom: 8 }} message={error} />}
|
|
||||||
|
|
||||||
<Tabs defaultActiveKey="rogog" items={tabItems} />
|
|
||||||
</Card>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
|
|||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
||||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
currentUser: selectCurrentUser,
|
currentUser: selectCurrentUser,
|
||||||
@@ -19,26 +18,15 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
|
|||||||
export function DmsCdkMakesRefetch({ currentUser, bodyshop }) {
|
export function DmsCdkMakesRefetch({ currentUser, bodyshop }) {
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const {
|
|
||||||
treatments: { Fortellis }
|
|
||||||
} = useSplitTreatments({
|
|
||||||
attributes: {},
|
|
||||||
names: ["Fortellis"],
|
|
||||||
splitKey: bodyshop.imexshopid
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!currentUser.email.includes("@imex.")) return null;
|
if (!currentUser.email.includes("@imex.")) return null;
|
||||||
|
|
||||||
const handleRefetch = async () => {
|
const handleRefetch = async () => {
|
||||||
try {
|
setLoading(true);
|
||||||
setLoading(true);
|
await axios.post("/cdk/getvehicles", {
|
||||||
await axios.post(`cdk${Fortellis.treatment === "on" ? "/fortellis" : ""}/getvehicles`, {
|
cdk_dealerid: bodyshop.cdk_dealerid,
|
||||||
cdk_dealerid: bodyshop.cdk_dealerid,
|
bodyshopid: bodyshop.id
|
||||||
bodyshopid: bodyshop.id
|
});
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,102 +0,0 @@
|
|||||||
import { Button, Checkbox, Col, Table } from "antd";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { alphaSort } from "../../utils/sorters";
|
|
||||||
|
|
||||||
export default function CDKCustomerSelector({ bodyshop, socket }) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
const [customerList, setCustomerList] = useState([]);
|
|
||||||
const [selectedCustomer, setSelectedCustomer] = useState(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!socket) return;
|
|
||||||
const handleCdkSelectCustomer = (list) => {
|
|
||||||
setOpen(true);
|
|
||||||
setCustomerList(Array.isArray(list) ? list : []);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
socket.on("cdk-select-customer", handleCdkSelectCustomer);
|
|
||||||
return () => {
|
|
||||||
socket.off("cdk-select-customer", handleCdkSelectCustomer);
|
|
||||||
};
|
|
||||||
}, [socket]);
|
|
||||||
|
|
||||||
const onUseSelected = () => {
|
|
||||||
if (!selectedCustomer) return;
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("cdk-selected-customer", selectedCustomer);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onUseGeneric = () => {
|
|
||||||
const generic = bodyshop.cdk_configuration?.generic_customer_number || null;
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("cdk-selected-customer", generic);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onCreateNew = () => {
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("cdk-selected-customer", null);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!open) return null;
|
|
||||||
|
|
||||||
const columns = [
|
|
||||||
{ title: t("jobs.fields.dms.id"), dataIndex: ["id", "value"], key: "id" },
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.vinowner"),
|
|
||||||
dataIndex: "vinOwner",
|
|
||||||
key: "vinOwner",
|
|
||||||
render: (_t, r) => <Checkbox disabled checked={r.vinOwner} />
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.name1"),
|
|
||||||
dataIndex: ["name1", "fullName"],
|
|
||||||
key: "name1",
|
|
||||||
sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName)
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.address"),
|
|
||||||
key: "address",
|
|
||||||
render: (record) =>
|
|
||||||
`${record.address?.addressLine && record.address.addressLine[0]}, ${record.address?.city} ${
|
|
||||||
record.address?.stateOrProvince
|
|
||||||
} ${record.address?.postalCode}`
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
const rowKey = (r) => r.id?.value || r.customerId;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Col span={24}>
|
|
||||||
<Table
|
|
||||||
title={() => (
|
|
||||||
<div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
|
|
||||||
<Button onClick={onUseSelected} disabled={!selectedCustomer}>
|
|
||||||
{t("jobs.actions.dms.useselected")}
|
|
||||||
</Button>
|
|
||||||
<Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
|
|
||||||
{t("jobs.actions.dms.usegeneric")}
|
|
||||||
</Button>
|
|
||||||
<Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
pagination={{ position: "top" }}
|
|
||||||
columns={columns}
|
|
||||||
rowKey={rowKey}
|
|
||||||
dataSource={customerList}
|
|
||||||
rowSelection={{
|
|
||||||
onSelect: (r) => {
|
|
||||||
const key = r.id?.value || r.customerId;
|
|
||||||
setSelectedCustomer(key ? String(key) : null);
|
|
||||||
},
|
|
||||||
type: "radio",
|
|
||||||
selectedRowKeys: selectedCustomer ? [selectedCustomer] : []
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,54 +1,134 @@
|
|||||||
import { useMemo } from "react";
|
import { Button, Checkbox, Col, Table } from "antd";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
|
import { socket } from "../../pages/dms/dms.container";
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
|
import { alphaSort } from "../../utils/sorters";
|
||||||
import RRCustomerSelector from "./rr-customer-selector";
|
|
||||||
import FortellisCustomerSelector from "./fortellis-customer-selector";
|
|
||||||
import CDKCustomerSelector from "./cdk-customer-selector";
|
|
||||||
import PBSCustomerSelector from "./pbs-customer-selector";
|
|
||||||
import { DMS_MAP } from "../../utils/dmsUtils";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
});
|
});
|
||||||
const mapDispatchToProps = () => ({});
|
const mapDispatchToProps = () => ({
|
||||||
|
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
||||||
|
});
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);
|
export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);
|
||||||
|
|
||||||
/**
|
export function DmsCustomerSelector({ bodyshop }) {
|
||||||
* DMS Customer Selector component that renders the appropriate customer selector
|
const { t } = useTranslation();
|
||||||
* @param props
|
const [customerList, setcustomerList] = useState([]);
|
||||||
* @returns {JSX.Element|null}
|
const [open, setOpen] = useState(false);
|
||||||
* @constructor
|
const [selectedCustomer, setSelectedCustomer] = useState(null);
|
||||||
*/
|
const [dmsType, setDmsType] = useState("cdk");
|
||||||
export function DmsCustomerSelector(props) {
|
|
||||||
const { bodyshop, jobid, socket, rrOptions = {} } = props;
|
|
||||||
|
|
||||||
// Centralized "mode" (provider + transport)
|
socket.on("cdk-select-customer", (customerList) => {
|
||||||
const mode = props.mode;
|
setOpen(true);
|
||||||
|
setDmsType("cdk");
|
||||||
|
setcustomerList(customerList);
|
||||||
|
});
|
||||||
|
socket.on("pbs-select-customer", (customerList) => {
|
||||||
|
setOpen(true);
|
||||||
|
setDmsType("pbs");
|
||||||
|
setcustomerList(customerList);
|
||||||
|
});
|
||||||
|
|
||||||
// Stable base props for children
|
const onUseSelected = () => {
|
||||||
const base = useMemo(() => ({ bodyshop, jobid, socket }), [bodyshop, jobid, socket]);
|
setOpen(false);
|
||||||
|
socket.emit(`${dmsType}-selected-customer`, selectedCustomer);
|
||||||
|
setSelectedCustomer(null);
|
||||||
|
};
|
||||||
|
|
||||||
switch (mode) {
|
const onUseGeneric = () => {
|
||||||
case DMS_MAP.reynolds: {
|
setOpen(false);
|
||||||
// Map rrOptions to current RR prop shape (you can also just pass rrOptions through and unpack in RR)
|
socket.emit(`${dmsType}-selected-customer`, bodyshop.cdk_configuration.generic_customer_number);
|
||||||
const rrProps = {
|
setSelectedCustomer(null);
|
||||||
rrOpenRoLimit: rrOptions.openRoLimit,
|
};
|
||||||
onRrOpenRoFinished: rrOptions.onOpenRoFinished,
|
|
||||||
rrValidationPending: rrOptions.validationPending,
|
const onCreateNew = () => {
|
||||||
onValidationFinished: rrOptions.onValidationFinished
|
setOpen(false);
|
||||||
};
|
socket.emit(`${dmsType}-selected-customer`, null);
|
||||||
return <RRCustomerSelector {...base} {...rrProps} />;
|
setSelectedCustomer(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const cdkColumns = [
|
||||||
|
{
|
||||||
|
title: t("jobs.fields.dms.id"),
|
||||||
|
dataIndex: ["id", "value"],
|
||||||
|
key: "id"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t("jobs.fields.dms.vinowner"),
|
||||||
|
dataIndex: "vinOwner",
|
||||||
|
key: "vinOwner",
|
||||||
|
render: (text, record) => <Checkbox disabled checked={record.vinOwner} />
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t("jobs.fields.dms.name1"),
|
||||||
|
dataIndex: ["name1", "fullName"],
|
||||||
|
key: "name1",
|
||||||
|
sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName)
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
title: t("jobs.fields.dms.address"),
|
||||||
|
//dataIndex: ["name2", "fullName"],
|
||||||
|
key: "address",
|
||||||
|
render: (record) =>
|
||||||
|
`${record.address?.addressLine && record.address.addressLine[0]}, ${record.address?.city} ${
|
||||||
|
record.address?.stateOrProvince
|
||||||
|
} ${record.address?.postalCode}`
|
||||||
}
|
}
|
||||||
case DMS_MAP.fortellis:
|
];
|
||||||
return <FortellisCustomerSelector {...base} />;
|
|
||||||
case DMS_MAP.cdk:
|
const pbsColumns = [
|
||||||
return <CDKCustomerSelector {...base} />;
|
{
|
||||||
case DMS_MAP.pbs:
|
title: t("jobs.fields.dms.id"),
|
||||||
return <PBSCustomerSelector {...base} />;
|
dataIndex: "ContactId",
|
||||||
default:
|
key: "ContactId"
|
||||||
return null;
|
},
|
||||||
}
|
{
|
||||||
|
title: t("jobs.fields.dms.name1"),
|
||||||
|
key: "name1",
|
||||||
|
sorter: (a, b) => alphaSort(a.LastName, b.LastName),
|
||||||
|
render: (text, record) => `${record.FirstName || ""} ${record.LastName || ""}`
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
title: t("jobs.fields.dms.address"),
|
||||||
|
key: "address",
|
||||||
|
render: (record) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
if (!open) return null;
|
||||||
|
return (
|
||||||
|
<Col span={24}>
|
||||||
|
<Table
|
||||||
|
title={() => (
|
||||||
|
<div>
|
||||||
|
<Button onClick={onUseSelected} disabled={!selectedCustomer}>
|
||||||
|
{t("jobs.actions.dms.useselected")}
|
||||||
|
</Button>
|
||||||
|
<Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
|
||||||
|
{t("jobs.actions.dms.usegeneric")}
|
||||||
|
</Button>
|
||||||
|
<Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
pagination={{ position: "top" }}
|
||||||
|
columns={dmsType === "cdk" ? cdkColumns : pbsColumns}
|
||||||
|
rowKey={(record) => (dmsType === "cdk" ? record.id.value : record.ContactId)}
|
||||||
|
dataSource={customerList}
|
||||||
|
//onChange={handleTableChange}
|
||||||
|
rowSelection={{
|
||||||
|
onSelect: (record) => {
|
||||||
|
setSelectedCustomer(dmsType === "cdk" ? record.id.value : record.ContactId);
|
||||||
|
},
|
||||||
|
type: "radio",
|
||||||
|
selectedRowKeys: [selectedCustomer]
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,105 +0,0 @@
|
|||||||
import { Button, Checkbox, Col, Table } from "antd";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { alphaSort } from "../../utils/sorters";
|
|
||||||
|
|
||||||
export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
const [customerList, setCustomerList] = useState([]);
|
|
||||||
const [selectedCustomer, setSelectedCustomer] = useState(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!socket) return;
|
|
||||||
const handleFortellisSelectCustomer = (list) => {
|
|
||||||
setOpen(true);
|
|
||||||
setCustomerList(Array.isArray(list) ? list : []);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
socket.on("fortellis-select-customer", handleFortellisSelectCustomer);
|
|
||||||
return () => {
|
|
||||||
socket.off("fortellis-select-customer", handleFortellisSelectCustomer);
|
|
||||||
};
|
|
||||||
}, [socket]);
|
|
||||||
|
|
||||||
const onUseSelected = () => {
|
|
||||||
if (!selectedCustomer) return;
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("fortellis-selected-customer", { selectedCustomerId: selectedCustomer, jobid });
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onUseGeneric = () => {
|
|
||||||
const generic = bodyshop.cdk_configuration?.generic_customer_number || null;
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("fortellis-selected-customer", { selectedCustomerId: generic, jobid });
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onCreateNew = () => {
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("fortellis-selected-customer", { selectedCustomerId: null, jobid });
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!open) return null;
|
|
||||||
|
|
||||||
const columns = [
|
|
||||||
{ title: t("jobs.fields.dms.id"), dataIndex: "customerId", key: "id" },
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.vinowner"),
|
|
||||||
dataIndex: "vinOwner",
|
|
||||||
key: "vinOwner",
|
|
||||||
render: (_t, r) => <Checkbox disabled checked={r.vinOwner} />
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.name1"),
|
|
||||||
dataIndex: ["customerName", "firstName"],
|
|
||||||
key: "firstName",
|
|
||||||
sorter: (a, b) => alphaSort(a.customerName?.firstName, b.customerName?.firstName)
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.name1"),
|
|
||||||
dataIndex: ["customerName", "lastName"],
|
|
||||||
key: "lastName",
|
|
||||||
sorter: (a, b) => alphaSort(a.customerName?.lastName, b.customerName?.lastName)
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.address"),
|
|
||||||
key: "address",
|
|
||||||
render: (record) =>
|
|
||||||
`${record.postalAddress?.addressLine1 || ""}${
|
|
||||||
record.postalAddress?.addressLine2 ? `, ${record.postalAddress.addressLine2}` : ""
|
|
||||||
}, ${record.postalAddress?.city || ""} ${record.postalAddress?.state || ""} ${
|
|
||||||
record.postalAddress?.postalCode || ""
|
|
||||||
} ${record.postalAddress?.country || ""}`
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Col span={24}>
|
|
||||||
<Table
|
|
||||||
title={() => (
|
|
||||||
<div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
|
|
||||||
<Button onClick={onUseSelected} disabled={!selectedCustomer}>
|
|
||||||
{t("jobs.actions.dms.useselected")}
|
|
||||||
</Button>
|
|
||||||
<Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
|
|
||||||
{t("jobs.actions.dms.usegeneric")}
|
|
||||||
</Button>
|
|
||||||
<Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
pagination={{ position: "top" }}
|
|
||||||
columns={columns}
|
|
||||||
rowKey={(r) => r.customerId}
|
|
||||||
dataSource={customerList}
|
|
||||||
rowSelection={{
|
|
||||||
onSelect: (r) => setSelectedCustomer(r?.customerId ? String(r.customerId) : null),
|
|
||||||
type: "radio",
|
|
||||||
selectedRowKeys: selectedCustomer ? [selectedCustomer] : []
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
import { Button, Col, Table } from "antd";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { alphaSort } from "../../utils/sorters";
|
|
||||||
|
|
||||||
export default function PBSCustomerSelector({ bodyshop, socket }) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
const [customerList, setCustomerList] = useState([]);
|
|
||||||
const [selectedCustomer, setSelectedCustomer] = useState(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!socket) return;
|
|
||||||
const handlePbsSelectCustomer = (list) => {
|
|
||||||
setOpen(true);
|
|
||||||
setCustomerList(Array.isArray(list) ? list : []);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
socket.on("pbs-select-customer", handlePbsSelectCustomer);
|
|
||||||
return () => {
|
|
||||||
socket.off("pbs-select-customer", handlePbsSelectCustomer);
|
|
||||||
};
|
|
||||||
}, [socket]);
|
|
||||||
|
|
||||||
const onUseSelected = () => {
|
|
||||||
if (!selectedCustomer) return;
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("pbs-selected-customer", selectedCustomer);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Restores old behavior: reuse the CDK-named generic number for PBS too,
|
|
||||||
// matching the previous single-component implementation.
|
|
||||||
const onUseGeneric = () => {
|
|
||||||
const generic = bodyshop?.cdk_configuration?.generic_customer_number || null;
|
|
||||||
if (!generic) return;
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("pbs-selected-customer", generic);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onCreateNew = () => {
|
|
||||||
setOpen(false);
|
|
||||||
socket.emit("pbs-selected-customer", null);
|
|
||||||
setSelectedCustomer(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!open) return null;
|
|
||||||
|
|
||||||
const columns = [
|
|
||||||
{ title: t("jobs.fields.dms.id"), dataIndex: "ContactId", key: "ContactId" },
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.name1"),
|
|
||||||
key: "name1",
|
|
||||||
sorter: (a, b) => alphaSort(a.LastName, b.LastName),
|
|
||||||
render: (_t, r) => `${r.FirstName || ""} ${r.LastName || ""}`
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.address"),
|
|
||||||
key: "address",
|
|
||||||
render: (r) => `${r.Address}, ${r.City} ${r.State} ${r.ZipCode}`
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
const hasGeneric = !!bodyshop?.cdk_configuration?.generic_customer_number;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Col span={24}>
|
|
||||||
<Table
|
|
||||||
title={() => (
|
|
||||||
<div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
|
|
||||||
<Button onClick={onUseSelected} disabled={!selectedCustomer}>
|
|
||||||
{t("jobs.actions.dms.useselected")}
|
|
||||||
</Button>
|
|
||||||
<Button onClick={onUseGeneric} disabled={!hasGeneric}>
|
|
||||||
{t("jobs.actions.dms.usegeneric")}
|
|
||||||
</Button>
|
|
||||||
<Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
pagination={{ position: "top" }}
|
|
||||||
columns={columns}
|
|
||||||
rowKey={(r) => r.ContactId}
|
|
||||||
dataSource={customerList}
|
|
||||||
rowSelection={{
|
|
||||||
onSelect: (r) => setSelectedCustomer(r?.ContactId ? String(r.ContactId) : null),
|
|
||||||
type: "radio",
|
|
||||||
selectedRowKeys: selectedCustomer ? [selectedCustomer] : []
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,267 +0,0 @@
|
|||||||
import { Alert, Button, Checkbox, Col, message, Space, Table } from "antd";
|
|
||||||
import { useEffect, useMemo, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { alphaSort } from "../../utils/sorters";
|
|
||||||
|
|
||||||
const normalizeRrList = (list) => {
|
|
||||||
if (!Array.isArray(list)) return [];
|
|
||||||
return list
|
|
||||||
.map((row) => {
|
|
||||||
const custNo = row.custNo || row.CustomerId || row.customerId || null;
|
|
||||||
const name =
|
|
||||||
row.name ||
|
|
||||||
[row.CustomerName?.FirstName, row.CustomerName?.LastName].filter(Boolean).join(" ").trim() ||
|
|
||||||
(custNo ? String(custNo) : "");
|
|
||||||
if (!custNo) return null;
|
|
||||||
const vinOwner = !!(row.vinOwner ?? row.isVehicleOwner);
|
|
||||||
|
|
||||||
const address =
|
|
||||||
row.address && typeof row.address === "object"
|
|
||||||
? {
|
|
||||||
line1: row.address.line1 ?? row.address.addr1 ?? row.address.Address1 ?? undefined,
|
|
||||||
line2: row.address.line2 ?? row.address.addr2 ?? row.address.Address2 ?? undefined,
|
|
||||||
city: row.address.city ?? undefined,
|
|
||||||
state: row.address.state ?? row.address.stateOrProvince ?? undefined,
|
|
||||||
postalCode: row.address.postalCode ?? row.address.zip ?? undefined,
|
|
||||||
country: row.address.country ?? row.address.countryCode ?? undefined
|
|
||||||
}
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
return { custNo: String(custNo), name, vinOwner, address };
|
|
||||||
})
|
|
||||||
.filter(Boolean);
|
|
||||||
};
|
|
||||||
|
|
||||||
const rrAddressToString = (addr) => {
|
|
||||||
if (!addr) return "";
|
|
||||||
const parts = [
|
|
||||||
addr.line1,
|
|
||||||
addr.line2,
|
|
||||||
[addr.city, addr.state].filter(Boolean).join(" "),
|
|
||||||
addr.postalCode,
|
|
||||||
addr.country
|
|
||||||
].filter(Boolean);
|
|
||||||
return parts.join(", ");
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function RRCustomerSelector({
|
|
||||||
jobid,
|
|
||||||
socket,
|
|
||||||
rrOpenRoLimit = false,
|
|
||||||
onRrOpenRoFinished,
|
|
||||||
rrValidationPending = false,
|
|
||||||
onValidationFinished
|
|
||||||
}) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
const [customerList, setCustomerList] = useState([]);
|
|
||||||
const [selectedCustomer, setSelectedCustomer] = useState(null);
|
|
||||||
const [refreshing, setRefreshing] = useState(false);
|
|
||||||
|
|
||||||
// Show dialog automatically when validation is pending
|
|
||||||
useEffect(() => {
|
|
||||||
if (rrValidationPending) setOpen(true);
|
|
||||||
}, [rrValidationPending]);
|
|
||||||
|
|
||||||
// Listen for RR customer selection list
|
|
||||||
useEffect(() => {
|
|
||||||
if (!socket) return;
|
|
||||||
const handleRrSelectCustomer = (list) => {
|
|
||||||
const normalized = normalizeRrList(list);
|
|
||||||
setOpen(true);
|
|
||||||
setCustomerList(normalized);
|
|
||||||
const firstOwner = normalized.find((r) => r.vinOwner)?.custNo;
|
|
||||||
setSelectedCustomer(firstOwner ? String(firstOwner) : null);
|
|
||||||
setRefreshing(false);
|
|
||||||
};
|
|
||||||
socket.on("rr-select-customer", handleRrSelectCustomer);
|
|
||||||
return () => {
|
|
||||||
socket.off("rr-select-customer", handleRrSelectCustomer);
|
|
||||||
};
|
|
||||||
}, [socket]);
|
|
||||||
|
|
||||||
// VIN owner set
|
|
||||||
const rrOwnerSet = useMemo(() => {
|
|
||||||
return new Set(customerList.filter((c) => c?.vinOwner || c?.isVehicleOwner).map((c) => String(c.custNo)));
|
|
||||||
}, [customerList]);
|
|
||||||
const rrHasVinOwner = rrOwnerSet.size > 0;
|
|
||||||
|
|
||||||
// Enforce VIN owner stays selected if present
|
|
||||||
useEffect(() => {
|
|
||||||
if (!rrHasVinOwner) return;
|
|
||||||
const firstOwner = (customerList.find((c) => c.vinOwner) || {}).custNo;
|
|
||||||
if (firstOwner && String(selectedCustomer) !== String(firstOwner)) {
|
|
||||||
setSelectedCustomer(String(firstOwner));
|
|
||||||
}
|
|
||||||
}, [rrHasVinOwner, customerList, selectedCustomer]);
|
|
||||||
|
|
||||||
const onUseSelected = () => {
|
|
||||||
if (!selectedCustomer) {
|
|
||||||
message.warning(t("general.actions.select"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (rrHasVinOwner && !rrOwnerSet.has(String(selectedCustomer))) {
|
|
||||||
message.warning(
|
|
||||||
"This VIN is already assigned in Reynolds. Only the VIN owner can be selected. To choose a different customer, change ownership in Reynolds first."
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
socket.emit("rr-selected-customer", { jobId: jobid, custNo: String(selectedCustomer) }, (ack) => {
|
|
||||||
if (ack?.ok) {
|
|
||||||
message.success(t("dms.messages.customerSelected"));
|
|
||||||
} else if (ack?.error) {
|
|
||||||
message.error(ack.error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const onCreateNew = () => {
|
|
||||||
if (rrHasVinOwner) return;
|
|
||||||
socket.emit("rr-selected-customer", { jobId: jobid, create: true }, (ack) => {
|
|
||||||
if (ack?.ok) {
|
|
||||||
if (ack.custNo) setSelectedCustomer(String(ack.custNo));
|
|
||||||
message.success(t("dms.messages.customerCreated"));
|
|
||||||
} else if (ack?.error) {
|
|
||||||
message.error(ack.error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const refreshRrSearch = () => {
|
|
||||||
setRefreshing(true);
|
|
||||||
const to = setTimeout(() => setRefreshing(false), 12000);
|
|
||||||
const stop = () => {
|
|
||||||
clearTimeout(to);
|
|
||||||
setRefreshing(false);
|
|
||||||
socket.off("export-failed", stop);
|
|
||||||
socket.off("rr-select-customer", stop);
|
|
||||||
};
|
|
||||||
socket.once("rr-select-customer", stop);
|
|
||||||
socket.once("export-failed", stop);
|
|
||||||
socket.emit("rr-export-job", { jobId: jobid });
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!open) return null;
|
|
||||||
|
|
||||||
const columns = [
|
|
||||||
{ title: t("jobs.fields.dms.id"), dataIndex: "custNo", key: "custNo" },
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.vinowner"),
|
|
||||||
dataIndex: "vinOwner",
|
|
||||||
key: "vinOwner",
|
|
||||||
render: (_t, r) => <Checkbox disabled checked={!!(r.vinOwner ?? r.isVehicleOwner)} />
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.name1"),
|
|
||||||
dataIndex: "name",
|
|
||||||
key: "name",
|
|
||||||
sorter: (a, b) => alphaSort(a?.name, b?.name)
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: t("jobs.fields.dms.address"),
|
|
||||||
key: "address",
|
|
||||||
render: (record) => rrAddressToString(record.address)
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
const rrDisableRow = (record) => {
|
|
||||||
if (!rrHasVinOwner) return false;
|
|
||||||
return !rrOwnerSet.has(String(record.custNo));
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Col span={24}>
|
|
||||||
<Table
|
|
||||||
title={() => (
|
|
||||||
<div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
|
|
||||||
{/* Open RO limit banner */}
|
|
||||||
{rrOpenRoLimit && (
|
|
||||||
<Alert
|
|
||||||
type="error"
|
|
||||||
showIcon
|
|
||||||
message="Open RO limit reached in Reynolds"
|
|
||||||
description={
|
|
||||||
<div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
|
|
||||||
<div>
|
|
||||||
Reynolds has reached the maximum number of open Repair Orders for this Customer. Close or finalize
|
|
||||||
an RO in Reynolds, then click <strong>Finished</strong> to continue.
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Button type="primary" danger onClick={onRrOpenRoFinished}>
|
|
||||||
Finished
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Validation step banner */}
|
|
||||||
{rrValidationPending && (
|
|
||||||
<Alert
|
|
||||||
type="info"
|
|
||||||
showIcon
|
|
||||||
message="Complete Validation in Reynolds"
|
|
||||||
description={
|
|
||||||
<div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
|
|
||||||
<div>
|
|
||||||
We created the Repair Order. Please validate the totals and taxes in the DMS system. When done,
|
|
||||||
click <strong>Finished</strong> to finalize and mark this export as complete.
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Space>
|
|
||||||
<Button type="primary" onClick={onValidationFinished}>
|
|
||||||
Finished
|
|
||||||
</Button>
|
|
||||||
</Space>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
|
|
||||||
<Button onClick={onUseSelected} disabled={!selectedCustomer || rrOpenRoLimit}>
|
|
||||||
{t("jobs.actions.dms.useselected")}
|
|
||||||
</Button>
|
|
||||||
{/* No generic in RR */}
|
|
||||||
<Button onClick={onCreateNew} disabled={rrHasVinOwner}>
|
|
||||||
{t("jobs.actions.dms.createnewcustomer")}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{rrHasVinOwner && (
|
|
||||||
<Alert
|
|
||||||
type="warning"
|
|
||||||
showIcon
|
|
||||||
message="VIN ownership enforced"
|
|
||||||
description={
|
|
||||||
<div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", gap: 12 }}>
|
|
||||||
<div>
|
|
||||||
This VIN is already assigned in Reynolds. Only the VIN owner is selectable here. To use a
|
|
||||||
different customer, please change the vehicle ownership in Reynolds first, then return to complete
|
|
||||||
the export.
|
|
||||||
</div>
|
|
||||||
<Button onClick={refreshRrSearch} loading={refreshing}>
|
|
||||||
Refresh
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
pagination={{ position: "top" }}
|
|
||||||
columns={columns}
|
|
||||||
rowKey={(r) => r.custNo}
|
|
||||||
dataSource={customerList}
|
|
||||||
rowSelection={{
|
|
||||||
onSelect: (record) => setSelectedCustomer(record?.custNo ? String(record.custNo) : null),
|
|
||||||
type: "radio",
|
|
||||||
selectedRowKeys: selectedCustomer ? [selectedCustomer] : [],
|
|
||||||
getCheckboxProps: (record) => ({ disabled: rrDisableRow(record) })
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,234 +1,50 @@
|
|||||||
import { Divider, Space, Tag, Timeline } from "antd";
|
import { Divider, Space, Tag, Timeline } from "antd";
|
||||||
import { useEffect, useMemo, useState } from "react";
|
|
||||||
import dayjs from "../../utils/day";
|
import dayjs from "../../utils/day";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { selectDarkMode } from "../../redux/application/application.selectors.js";
|
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({});
|
||||||
isDarkMode: selectDarkMode
|
|
||||||
|
const mapDispatchToProps = (dispatch) => ({
|
||||||
|
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
|
||||||
|
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
|
||||||
});
|
});
|
||||||
|
|
||||||
const mapDispatchToProps = () => ({});
|
|
||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
|
export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
|
||||||
|
|
||||||
export function DmsLogEvents({
|
export function DmsLogEvents({ logs }) {
|
||||||
logs,
|
return (
|
||||||
detailsOpen,
|
<Timeline
|
||||||
detailsNonce,
|
pending
|
||||||
isDarkMode,
|
reverse={true}
|
||||||
colorizeJson = false,
|
items={logs.map((log, idx) => ({
|
||||||
showDetails = true
|
key: idx,
|
||||||
}) {
|
color: LogLevelHierarchy(log.level),
|
||||||
const [openSet, setOpenSet] = useState(() => new Set());
|
children: (
|
||||||
|
<Space wrap align="start" style={{}}>
|
||||||
// Inject JSON highlight styles once (only when colorize is enabled)
|
<Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
|
||||||
useEffect(() => {
|
<span>{dayjs(log.timestamp).format("MM/DD/YYYY HH:mm:ss")}</span>
|
||||||
if (!colorizeJson) return;
|
<Divider type="vertical" />
|
||||||
if (typeof document === "undefined") return;
|
<span>{log.message}</span>
|
||||||
if (document.getElementById("json-highlight-styles")) return;
|
</Space>
|
||||||
const style = document.createElement("style");
|
)
|
||||||
style.id = "json-highlight-styles";
|
}))}
|
||||||
style.textContent = `
|
/>
|
||||||
.json-key { color: #fa8c16; }
|
|
||||||
.json-string { color: #52c41a; }
|
|
||||||
.json-number { color: #722ed1; }
|
|
||||||
.json-boolean { color: #1890ff; }
|
|
||||||
.json-null { color: #faad14; }
|
|
||||||
`;
|
|
||||||
document.head.appendChild(style);
|
|
||||||
}, [colorizeJson]);
|
|
||||||
|
|
||||||
// Trim openSet if logs shrink
|
|
||||||
useEffect(() => {
|
|
||||||
const len = (logs || []).length;
|
|
||||||
setOpenSet((prev) => {
|
|
||||||
const next = new Set();
|
|
||||||
for (let i = 0; i < len; i++) if (prev.has(i)) next.add(i);
|
|
||||||
return next;
|
|
||||||
});
|
|
||||||
}, [logs?.length]);
|
|
||||||
|
|
||||||
// Respond to global toggle button
|
|
||||||
useEffect(() => {
|
|
||||||
if (detailsNonce == null) return;
|
|
||||||
const len = (logs || []).length;
|
|
||||||
setOpenSet(detailsOpen ? new Set(Array.from({ length: len }, (_, i) => i)) : new Set());
|
|
||||||
}, [detailsNonce, detailsOpen, logs?.length]);
|
|
||||||
|
|
||||||
const items = useMemo(
|
|
||||||
() =>
|
|
||||||
(logs || []).map((raw, idx) => {
|
|
||||||
const { level, message, timestamp, meta } = normalizeLog(raw);
|
|
||||||
|
|
||||||
// Only treat meta as "present" when we are allowed to show details
|
|
||||||
const hasMeta = !isEmpty(meta) && showDetails;
|
|
||||||
const isOpen = hasMeta && openSet.has(idx);
|
|
||||||
|
|
||||||
return {
|
|
||||||
key: idx,
|
|
||||||
color: logLevelColor(level),
|
|
||||||
children: (
|
|
||||||
<Space direction="vertical" size={4} style={{ display: "flex" }}>
|
|
||||||
{/* Row 1: summary + inline "Details" toggle */}
|
|
||||||
<Space wrap align="start">
|
|
||||||
<Tag color={logLevelColor(level)}>{level}</Tag>
|
|
||||||
<Divider type="vertical" />
|
|
||||||
<span>{dayjs(timestamp).format("MM/DD/YYYY HH:mm:ss")}</span>
|
|
||||||
<Divider type="vertical" />
|
|
||||||
<span>{message}</span>
|
|
||||||
{hasMeta && (
|
|
||||||
<>
|
|
||||||
<Divider type="vertical" />
|
|
||||||
<a
|
|
||||||
role="button"
|
|
||||||
aria-expanded={isOpen}
|
|
||||||
onClick={() =>
|
|
||||||
setOpenSet((prev) => {
|
|
||||||
const next = new Set(prev);
|
|
||||||
if (isOpen) next.delete(idx);
|
|
||||||
else next.add(idx);
|
|
||||||
return next;
|
|
||||||
})
|
|
||||||
}
|
|
||||||
style={{ cursor: "pointer", userSelect: "none" }}
|
|
||||||
>
|
|
||||||
{isOpen ? "Hide details" : "Details"}
|
|
||||||
</a>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</Space>
|
|
||||||
|
|
||||||
{/* Row 2: details body (only when open) */}
|
|
||||||
{hasMeta && isOpen && (
|
|
||||||
<div style={{ marginLeft: 6 }}>
|
|
||||||
<JsonBlock isDarkMode={isDarkMode} data={meta} colorize={colorizeJson} />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</Space>
|
|
||||||
)
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
[logs, openSet, colorizeJson, isDarkMode, showDetails]
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return <Timeline pending reverse items={items} />;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
function LogLevelHierarchy(level) {
|
||||||
* Normalize various log input formats into a standard structure.
|
switch (level) {
|
||||||
* @param input
|
|
||||||
* @returns {{level: string, message: *|string, timestamp: Date, meta: *}}
|
|
||||||
*/
|
|
||||||
const normalizeLog = (input) => {
|
|
||||||
const n = input?.normalized || input || {};
|
|
||||||
const level = (n.level || input?.level || "INFO").toString().toUpperCase();
|
|
||||||
const message = n.message ?? input?.message ?? "";
|
|
||||||
const meta = input?.meta != null ? input.meta : n.meta != null ? n.meta : undefined;
|
|
||||||
const tsRaw = input?.timestamp ?? n.timestamp ?? input?.ts ?? Date.now();
|
|
||||||
const timestamp = typeof tsRaw === "number" ? new Date(tsRaw) : new Date(tsRaw);
|
|
||||||
return { level, message, timestamp, meta };
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Map log level to tag color.
|
|
||||||
* @param level
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
const logLevelColor = (level) => {
|
|
||||||
switch ((level || "").toUpperCase()) {
|
|
||||||
case "SILLY":
|
|
||||||
return "purple";
|
|
||||||
case "DEBUG":
|
case "DEBUG":
|
||||||
return "orange";
|
return "orange";
|
||||||
case "INFO":
|
case "INFO":
|
||||||
return "blue";
|
return "blue";
|
||||||
case "WARN":
|
case "WARN":
|
||||||
case "WARNING":
|
|
||||||
return "yellow";
|
return "yellow";
|
||||||
case "ERROR":
|
case "ERROR":
|
||||||
return "red";
|
return "red";
|
||||||
default:
|
default:
|
||||||
return "default";
|
return 0;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if a value is "empty" (null/undefined, empty array, or empty object).
|
|
||||||
* @param v
|
|
||||||
*/
|
|
||||||
const isEmpty = (v) => {
|
|
||||||
if (v == null) return true;
|
|
||||||
if (Array.isArray(v)) return v.length === 0;
|
|
||||||
if (typeof v === "object") return Object.keys(v).length === 0;
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Safely stringify an object to JSON, falling back to String() on failure.
|
|
||||||
* @param obj
|
|
||||||
* @param spaces
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
const safeStringify = (obj, spaces = 2) => {
|
|
||||||
try {
|
|
||||||
return JSON.stringify(obj, null, spaces);
|
|
||||||
} catch {
|
|
||||||
return String(obj);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* JSON display block with optional syntax highlighting.
|
|
||||||
* @param data
|
|
||||||
* @param colorize
|
|
||||||
* @param isDarkMode
|
|
||||||
* @returns {JSX.Element}
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
const JsonBlock = ({ data, colorize, isDarkMode }) => {
|
|
||||||
const jsonText = safeStringify(data, 2);
|
|
||||||
const preStyle = {
|
|
||||||
margin: "6px 0 0",
|
|
||||||
maxWidth: 720,
|
|
||||||
overflowX: "auto",
|
|
||||||
fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
|
|
||||||
fontSize: 12,
|
|
||||||
lineHeight: 1.45,
|
|
||||||
padding: 8,
|
|
||||||
borderRadius: 6,
|
|
||||||
background: isDarkMode ? "rgba(255,255,255,0.1)" : "rgba(0,0,0,0.04)",
|
|
||||||
border: isDarkMode ? "1px solid rgba(255,255,255,0.12)" : "1px solid rgba(0,0,0,0.08)",
|
|
||||||
color: isDarkMode ? "var(--card-text-fallback)" : "#141414"
|
|
||||||
};
|
|
||||||
|
|
||||||
if (colorize) {
|
|
||||||
const html = syntaxHighlight(jsonText);
|
|
||||||
return <pre style={preStyle} dangerouslySetInnerHTML={{ __html: html }} />;
|
|
||||||
}
|
|
||||||
return <pre style={preStyle}>{jsonText}</pre>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Syntax highlight JSON text for HTML display.
|
|
||||||
* @param jsonText
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
const syntaxHighlight = (jsonText) => {
|
|
||||||
const esc = jsonText.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");
|
|
||||||
return esc.replace(
|
|
||||||
/("(?:\\u[\da-fA-F]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(?:true|false|null)\b|-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?)/g,
|
|
||||||
(match) => {
|
|
||||||
let cls = "json-number";
|
|
||||||
if (match.startsWith('"')) {
|
|
||||||
cls = match.endsWith(":") ? "json-key" : "json-string";
|
|
||||||
} else if (match === "true" || match === "false") {
|
|
||||||
cls = "json-boolean";
|
|
||||||
} else if (match === "null") {
|
|
||||||
cls = "json-null";
|
|
||||||
}
|
|
||||||
return `<span class="${cls}">${match}</span>`;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -1,403 +0,0 @@
|
|||||||
import { DeleteFilled, DownOutlined } from "@ant-design/icons";
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
Col,
|
|
||||||
Divider,
|
|
||||||
Dropdown,
|
|
||||||
Form,
|
|
||||||
Input,
|
|
||||||
InputNumber,
|
|
||||||
Row,
|
|
||||||
Select,
|
|
||||||
Space,
|
|
||||||
Statistic,
|
|
||||||
Switch,
|
|
||||||
Tooltip,
|
|
||||||
Typography
|
|
||||||
} from "antd";
|
|
||||||
import Dinero from "dinero.js";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { useMemo, useState } from "react";
|
|
||||||
import i18n from "../../translations/i18n";
|
|
||||||
import dayjs from "../../utils/day";
|
|
||||||
import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
|
|
||||||
import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
|
|
||||||
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
|
|
||||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
|
||||||
import { DMS_MAP } from "../../utils/dmsUtils";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* CDK-like DMS post form:
|
|
||||||
* - CDK / Fortellis / PBS
|
|
||||||
* - CDK vehicle details + make/model selection
|
|
||||||
* - Payer list with discrepancy gating
|
|
||||||
* - Submit: "{mode}-export-job"
|
|
||||||
* @param bodyshop
|
|
||||||
* @param socket
|
|
||||||
* @param job
|
|
||||||
* @param logsRef
|
|
||||||
* @param mode
|
|
||||||
* @returns {JSX.Element}
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
export default function CdkLikePostForm({ bodyshop, socket, job, logsRef, mode }) {
|
|
||||||
const [form] = Form.useForm();
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [, /*unused*/ setTick] = useState(0); // handy if you need a forceUpdate later
|
|
||||||
|
|
||||||
const initialValues = useMemo(
|
|
||||||
() => ({
|
|
||||||
story: `${t("jobs.labels.dms.defaultstory", {
|
|
||||||
ro_number: job.ro_number,
|
|
||||||
ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`.trim(),
|
|
||||||
ins_co_nm: job.ins_co_nm || "N/A",
|
|
||||||
clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${job.po_number || ""}`
|
|
||||||
}).trim()}.${
|
|
||||||
job.area_of_damage?.impact1
|
|
||||||
? " " +
|
|
||||||
t("jobs.labels.dms.damageto", {
|
|
||||||
area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
|
|
||||||
})
|
|
||||||
: ""
|
|
||||||
}`.slice(0, 239),
|
|
||||||
inservicedate: dayjs(
|
|
||||||
`${
|
|
||||||
(job.v_model_yr &&
|
|
||||||
(job.v_model_yr < 100
|
|
||||||
? job.v_model_yr >= (dayjs().year() + 1) % 100
|
|
||||||
? 1900 + parseInt(job.v_model_yr, 10)
|
|
||||||
: 2000 + parseInt(job.v_model_yr, 10)
|
|
||||||
: job.v_model_yr)) ||
|
|
||||||
2019
|
|
||||||
}-01-01`
|
|
||||||
),
|
|
||||||
journal: bodyshop.cdk_configuration?.default_journal
|
|
||||||
}),
|
|
||||||
[job, bodyshop, t]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Payers helpers
|
|
||||||
const handlePayerSelect = (value, index) => {
|
|
||||||
form.setFieldsValue({
|
|
||||||
payers: (form.getFieldValue("payers") || []).map((payer, mapIndex) => {
|
|
||||||
if (index !== mapIndex) return payer;
|
|
||||||
const cdkPayer =
|
|
||||||
bodyshop.cdk_configuration.payers && bodyshop.cdk_configuration.payers.find((i) => i.name === value);
|
|
||||||
if (!cdkPayer) return payer;
|
|
||||||
return {
|
|
||||||
...cdkPayer,
|
|
||||||
dms_acctnumber: cdkPayer.dms_acctnumber,
|
|
||||||
controlnumber: job?.[cdkPayer.control_type]
|
|
||||||
};
|
|
||||||
})
|
|
||||||
});
|
|
||||||
setTick((n) => n + 1);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleFinish = (values) => {
|
|
||||||
if (!socket) return;
|
|
||||||
|
|
||||||
if (mode === DMS_MAP.fortellis) {
|
|
||||||
socket.emit("fortellis-export-job", {
|
|
||||||
jobid: job.id,
|
|
||||||
txEnvelope: { ...values, SubscriptionID: bodyshop.cdk_dealerid }
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
socket.emit(`${mode}-export-job`, { jobid: job.id, txEnvelope: values });
|
|
||||||
}
|
|
||||||
|
|
||||||
logsRef?.current?.scrollIntoView({ behavior: "smooth" });
|
|
||||||
};
|
|
||||||
|
|
||||||
// Totals & discrepancy
|
|
||||||
const totals = socket?.allocationsSummary
|
|
||||||
? socket.allocationsSummary.reduce(
|
|
||||||
(acc, val) => ({
|
|
||||||
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
|
||||||
totalCost: acc.totalCost.add(Dinero(val.cost))
|
|
||||||
}),
|
|
||||||
{ totalSale: Dinero(), totalCost: Dinero() }
|
|
||||||
)
|
|
||||||
: { totalSale: Dinero(), totalCost: Dinero() };
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card title={t("jobs.labels.dms.postingform")}>
|
|
||||||
<Form
|
|
||||||
form={form}
|
|
||||||
layout="vertical"
|
|
||||||
onFinish={handleFinish}
|
|
||||||
style={{ width: "100%" }}
|
|
||||||
initialValues={initialValues}
|
|
||||||
>
|
|
||||||
{/* TOP ROW */}
|
|
||||||
<Row gutter={[16, 12]} align="bottom">
|
|
||||||
<Col xs={24} sm={12} md={8} lg={6}>
|
|
||||||
<Form.Item name="journal" label={t("jobs.fields.dms.journal")} rules={[{ required: true }]}>
|
|
||||||
<Input />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={12} sm={8} md={6} lg={4}>
|
|
||||||
<Form.Item name="kmin" label={t("jobs.fields.kmin")} initialValue={job?.kmin} rules={[{ required: true }]}>
|
|
||||||
<InputNumber style={{ width: "100%" }} disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={12} sm={8} md={6} lg={4}>
|
|
||||||
<Form.Item
|
|
||||||
name="kmout"
|
|
||||||
label={t("jobs.fields.kmout")}
|
|
||||||
initialValue={job?.kmout}
|
|
||||||
rules={[{ required: true }]}
|
|
||||||
>
|
|
||||||
<InputNumber style={{ width: "100%" }} disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
|
|
||||||
{/* CDK vehicle details (kept for CDK/Fortellis paths when dealer id exists) */}
|
|
||||||
{bodyshop.cdk_dealerid && (
|
|
||||||
<>
|
|
||||||
<Row gutter={[16, 12]}>
|
|
||||||
<Col xs={24} sm={12} md={8}>
|
|
||||||
<Form.Item name="dms_make" label={t("jobs.fields.dms.dms_make")} rules={[{ required: true }]}>
|
|
||||||
<Input disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
<Col xs={24} sm={12} md={8}>
|
|
||||||
<Form.Item name="dms_model" label={t("jobs.fields.dms.dms_model")} rules={[{ required: true }]}>
|
|
||||||
<Input disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
<Col xs={24} sm={12} md={8}>
|
|
||||||
<Form.Item name="inservicedate" label={t("jobs.fields.dms.inservicedate")}>
|
|
||||||
<DateTimePicker isDateOnly />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
|
|
||||||
<Row gutter={[16, 12]} align="middle">
|
|
||||||
<Col>
|
|
||||||
<DmsCdkMakes form={form} job={job} />
|
|
||||||
</Col>
|
|
||||||
<Col>
|
|
||||||
<DmsCdkMakesRefetch />
|
|
||||||
</Col>
|
|
||||||
<Col>
|
|
||||||
<Form.Item name="dms_unsold" label={t("jobs.fields.dms.dms_unsold")} initialValue={false}>
|
|
||||||
<Switch />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
<Col>
|
|
||||||
<Form.Item
|
|
||||||
name="dms_model_override"
|
|
||||||
label={t("jobs.fields.dms.dms_model_override")}
|
|
||||||
initialValue={false}
|
|
||||||
>
|
|
||||||
<Switch />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Row gutter={[16, 12]}>
|
|
||||||
<Col span={24}>
|
|
||||||
<Form.Item name="story" label={t("jobs.fields.dms.story")} rules={[{ required: true }]}>
|
|
||||||
<Input.TextArea maxLength={240} />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
|
|
||||||
<Divider />
|
|
||||||
|
|
||||||
{/* Totals */}
|
|
||||||
<Space size="large" wrap align="center" style={{ marginBottom: 16 }}>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.fields.ded_amt")}
|
|
||||||
value={Dinero(job.job_totals.totals.custPayable.deductible).toFormat()}
|
|
||||||
/>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.labels.total_cust_payable")}
|
|
||||||
value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
|
|
||||||
/>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.labels.net_repairs")}
|
|
||||||
value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
|
|
||||||
{/* Payers list */}
|
|
||||||
<Divider />
|
|
||||||
<Form.List name={["payers"]}>
|
|
||||||
{(fields, { add, remove }) => (
|
|
||||||
<div>
|
|
||||||
{fields.map((field, index) => (
|
|
||||||
<Card
|
|
||||||
key={field.key}
|
|
||||||
size="small"
|
|
||||||
style={{ marginBottom: 12 }}
|
|
||||||
title={`${t("jobs.fields.dms.payer.payer_type")} #${index + 1}`}
|
|
||||||
extra={
|
|
||||||
<Tooltip title={t("general.actions.remove", "Remove")}>
|
|
||||||
<Button
|
|
||||||
type="text"
|
|
||||||
danger
|
|
||||||
icon={<DeleteFilled />}
|
|
||||||
aria-label={t("general.actions.remove", "Remove")}
|
|
||||||
onClick={() => remove(field.name)}
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Row gutter={[16, 8]} align="middle">
|
|
||||||
<Col xs={24} sm={12} md={8} lg={6}>
|
|
||||||
<Form.Item
|
|
||||||
label={t("jobs.fields.dms.payer.name")}
|
|
||||||
name={[field.name, "name"]}
|
|
||||||
rules={[{ required: true }]}
|
|
||||||
>
|
|
||||||
<Select style={{ minWidth: "15rem" }} onSelect={(value) => handlePayerSelect(value, index)}>
|
|
||||||
{bodyshop.cdk_configuration?.payers?.map((payer) => (
|
|
||||||
<Select.Option key={payer.name}>{payer.name}</Select.Option>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} sm={12} md={8} lg={6}>
|
|
||||||
<Form.Item
|
|
||||||
label={t("jobs.fields.dms.payer.dms_acctnumber")}
|
|
||||||
name={[field.name, "dms_acctnumber"]}
|
|
||||||
rules={[{ required: true }]}
|
|
||||||
>
|
|
||||||
<Input disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} sm={12} md={8} lg={5}>
|
|
||||||
<Form.Item
|
|
||||||
label={t("jobs.fields.dms.payer.amount")}
|
|
||||||
name={[field.name, "amount"]}
|
|
||||||
rules={[{ required: true }]}
|
|
||||||
>
|
|
||||||
<CurrencyInput min={0} />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} sm={12} md={10} lg={7}>
|
|
||||||
<Form.Item
|
|
||||||
label={
|
|
||||||
<div>
|
|
||||||
{t("jobs.fields.dms.payer.controlnumber")}{" "}
|
|
||||||
<Dropdown
|
|
||||||
trigger={["click"]}
|
|
||||||
menu={{
|
|
||||||
items:
|
|
||||||
bodyshop.cdk_configuration.controllist?.map((key, idx) => ({
|
|
||||||
key: idx,
|
|
||||||
label: key.name,
|
|
||||||
onClick: () => {
|
|
||||||
form.setFieldsValue({
|
|
||||||
payers: (form.getFieldValue("payers") || []).map((row, mapIndex) => {
|
|
||||||
if (index !== mapIndex) return row;
|
|
||||||
return { ...row, controlnumber: key.controlnumber };
|
|
||||||
})
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})) ?? []
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<a href="#" onClick={(e) => e.preventDefault()}>
|
|
||||||
<DownOutlined />
|
|
||||||
</a>
|
|
||||||
</Dropdown>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
name={[field.name, "controlnumber"]}
|
|
||||||
rules={[{ required: true }]}
|
|
||||||
>
|
|
||||||
<Input />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24}>
|
|
||||||
<Form.Item shouldUpdate noStyle>
|
|
||||||
{() => {
|
|
||||||
const payers = form.getFieldValue("payers");
|
|
||||||
const row = payers?.[index];
|
|
||||||
const cdkPayer =
|
|
||||||
bodyshop.cdk_configuration.payers &&
|
|
||||||
bodyshop.cdk_configuration.payers.find((i) => i && row && i.name === row.name);
|
|
||||||
if (i18n.exists(`jobs.fields.${cdkPayer?.control_type}`))
|
|
||||||
return <div>{cdkPayer && t(`jobs.fields.${cdkPayer?.control_type}`)}</div>;
|
|
||||||
else if (i18n.exists(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)) {
|
|
||||||
return <div>{cdkPayer && t(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)}</div>;
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
))}
|
|
||||||
<Form.Item>
|
|
||||||
<Button
|
|
||||||
disabled={!(fields.length < 3)}
|
|
||||||
onClick={() => {
|
|
||||||
if (fields.length < 3) add();
|
|
||||||
}}
|
|
||||||
style={{ width: "100%" }}
|
|
||||||
>
|
|
||||||
{t("jobs.actions.dms.addpayer")}
|
|
||||||
</Button>
|
|
||||||
</Form.Item>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</Form.List>
|
|
||||||
|
|
||||||
{/* Validation gates & summary */}
|
|
||||||
<Form.Item shouldUpdate>
|
|
||||||
{() => {
|
|
||||||
let totalAllocated = Dinero();
|
|
||||||
const payers = form.getFieldValue("payers") || [];
|
|
||||||
payers.forEach((payer) => {
|
|
||||||
totalAllocated = totalAllocated.add(Dinero({ amount: Math.round((payer?.amount || 0) * 100) }));
|
|
||||||
});
|
|
||||||
|
|
||||||
const discrep = totals ? totals.totalSale.subtract(totalAllocated) : Dinero();
|
|
||||||
|
|
||||||
// gate: must have payers filled + zero discrepancy when we have a summary
|
|
||||||
const payersOk =
|
|
||||||
payers.length > 0 &&
|
|
||||||
payers.every((p) => p?.name && p.dms_acctnumber && (p.amount ?? "") !== "" && p.controlnumber);
|
|
||||||
const nonRrDiscrepancyGate = socket?.allocationsSummary ? discrep.getAmount() !== 0 : true;
|
|
||||||
const disablePost = !payersOk || nonRrDiscrepancyGate;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Space size="large" wrap align="center">
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.labels.subtotal")}
|
|
||||||
value={(totals ? totals.totalSale : Dinero()).toFormat()}
|
|
||||||
/>
|
|
||||||
<Typography.Title>-</Typography.Title>
|
|
||||||
<Statistic title={t("jobs.labels.dms.totalallocated")} value={totalAllocated.toFormat()} />
|
|
||||||
<Typography.Title>=</Typography.Title>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.labels.dms.notallocated")}
|
|
||||||
valueStyle={{ color: discrep.getAmount() === 0 ? "green" : "red" }}
|
|
||||||
value={discrep.toFormat()}
|
|
||||||
/>
|
|
||||||
<Button disabled={disablePost} htmlType="submit">
|
|
||||||
{t("jobs.actions.dms.post")}
|
|
||||||
</Button>
|
|
||||||
</Space>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</Form.Item>
|
|
||||||
</Form>
|
|
||||||
</Card>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,40 +1,396 @@
|
|||||||
|
import { DeleteFilled, DownOutlined } from "@ant-design/icons";
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
Card,
|
||||||
|
Divider,
|
||||||
|
Dropdown,
|
||||||
|
Form,
|
||||||
|
Input,
|
||||||
|
InputNumber,
|
||||||
|
Select,
|
||||||
|
Space,
|
||||||
|
Statistic,
|
||||||
|
Switch,
|
||||||
|
Typography
|
||||||
|
} from "antd";
|
||||||
|
import Dinero from "dinero.js";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
|
import { determineDmsType } from "../../pages/dms/dms.container";
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
import { DMS_MAP } from "../../utils/dmsUtils";
|
import i18n from "../../translations/i18n";
|
||||||
import RRPostForm from "./rr-dms-post-form";
|
import dayjs from "../../utils/day";
|
||||||
import CdkLikePostForm from "./cdklike-dms-post-form";
|
import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
|
||||||
|
import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
|
||||||
|
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
|
||||||
|
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||||
|
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
});
|
});
|
||||||
const mapDispatchToProps = () => ({});
|
const mapDispatchToProps = () => ({
|
||||||
|
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
||||||
|
});
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
|
export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
|
||||||
|
|
||||||
/**
|
export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
|
||||||
* DMS Post Form component that renders the appropriate post form
|
const [form] = Form.useForm();
|
||||||
* @param mode
|
const { t } = useTranslation();
|
||||||
* @param bodyshop
|
|
||||||
* @param socket
|
|
||||||
* @param job
|
|
||||||
* @param logsRef
|
|
||||||
* @returns {JSX.Element|null}
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
export function DmsPostForm({ mode, bodyshop, socket, job, logsRef }) {
|
|
||||||
switch (mode) {
|
|
||||||
case DMS_MAP.reynolds:
|
|
||||||
return <RRPostForm bodyshop={bodyshop} socket={socket} job={job} logsRef={logsRef} />;
|
|
||||||
|
|
||||||
// CDK (legacy /ws), Fortellis (CDK-over-WSS), and PBS share the same UI;
|
const handlePayerSelect = (value, index) => {
|
||||||
// we pass mode down so the child can choose the correct event name.
|
form.setFieldsValue({
|
||||||
case DMS_MAP.fortellis:
|
payers: form.getFieldValue("payers").map((payer, mapIndex) => {
|
||||||
case DMS_MAP.cdk:
|
if (index !== mapIndex) return payer;
|
||||||
case DMS_MAP.pbs:
|
const cdkPayer =
|
||||||
return <CdkLikePostForm mode={mode} bodyshop={bodyshop} socket={socket} job={job} logsRef={logsRef} />;
|
bodyshop.cdk_configuration.payers && bodyshop.cdk_configuration.payers.find((i) => i.name === value);
|
||||||
|
|
||||||
default:
|
if (!cdkPayer) return payer;
|
||||||
return null;
|
|
||||||
}
|
return {
|
||||||
|
...cdkPayer,
|
||||||
|
dms_acctnumber: cdkPayer.dms_acctnumber,
|
||||||
|
controlnumber: job && job[cdkPayer.control_type]
|
||||||
|
};
|
||||||
|
})
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleFinish = (values) => {
|
||||||
|
socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
|
||||||
|
jobid: job.id,
|
||||||
|
txEnvelope: values
|
||||||
|
});
|
||||||
|
console.log(logsRef);
|
||||||
|
if (logsRef) {
|
||||||
|
console.log("executing", logsRef);
|
||||||
|
logsRef.curent &&
|
||||||
|
logsRef.current.scrollIntoView({
|
||||||
|
behavior: "smooth"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card title={t("jobs.labels.dms.postingform")}>
|
||||||
|
<Form
|
||||||
|
form={form}
|
||||||
|
layout="vertical"
|
||||||
|
onFinish={handleFinish}
|
||||||
|
initialValues={{
|
||||||
|
story: `${t("jobs.labels.dms.defaultstory", {
|
||||||
|
ro_number: job.ro_number,
|
||||||
|
ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`.trim(),
|
||||||
|
ins_co_nm: job.ins_co_nm || "N/A",
|
||||||
|
clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${job.po_number || ""}`
|
||||||
|
}).trim()}.${
|
||||||
|
job.area_of_damage && job.area_of_damage.impact1
|
||||||
|
? " " +
|
||||||
|
t("jobs.labels.dms.damageto", {
|
||||||
|
area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
|
||||||
|
})
|
||||||
|
: ""
|
||||||
|
}`.slice(0, 239),
|
||||||
|
inservicedate: dayjs(
|
||||||
|
`${(job.v_model_yr && (job.v_model_yr < 100 ? (job.v_model_yr >= (dayjs().year() + 1) % 100 ? 1900 + parseInt(job.v_model_yr) : 2000 + parseInt(job.v_model_yr)) : job.v_model_yr)) || 2019}-01-01`
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<LayoutFormRow grow>
|
||||||
|
<Form.Item
|
||||||
|
name="journal"
|
||||||
|
label={t("jobs.fields.dms.journal")}
|
||||||
|
initialValue={bodyshop.cdk_configuration && bodyshop.cdk_configuration.default_journal}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
//message: t("general.validation.required"),
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Input />
|
||||||
|
</Form.Item>
|
||||||
|
<Form.Item
|
||||||
|
name="kmin"
|
||||||
|
label={t("jobs.fields.kmin")}
|
||||||
|
initialValue={job && job.kmin}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
//message: t("general.validation.required"),
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<InputNumber disabled />
|
||||||
|
</Form.Item>
|
||||||
|
<Form.Item
|
||||||
|
name="kmout"
|
||||||
|
label={t("jobs.fields.kmout")}
|
||||||
|
initialValue={job && job.kmout}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
//message: t("general.validation.required"),
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<InputNumber disabled />
|
||||||
|
</Form.Item>
|
||||||
|
</LayoutFormRow>
|
||||||
|
|
||||||
|
{bodyshop.cdk_dealerid && (
|
||||||
|
<div>
|
||||||
|
<LayoutFormRow style={{ justifyContent: "center" }} grow>
|
||||||
|
<Form.Item
|
||||||
|
name="dms_make"
|
||||||
|
label={t("jobs.fields.dms.dms_make")}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Input disabled />
|
||||||
|
</Form.Item>
|
||||||
|
<Form.Item
|
||||||
|
name="dms_model"
|
||||||
|
label={t("jobs.fields.dms.dms_model")}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Input disabled />
|
||||||
|
</Form.Item>
|
||||||
|
<Form.Item name="inservicedate" label={t("jobs.fields.dms.inservicedate")}>
|
||||||
|
<DateTimePicker isDateOnly />
|
||||||
|
</Form.Item>
|
||||||
|
</LayoutFormRow>
|
||||||
|
<Space>
|
||||||
|
<DmsCdkMakes form={form} socket={socket} job={job} />
|
||||||
|
<DmsCdkMakesRefetch />
|
||||||
|
<Form.Item name="dms_unsold" label={t("jobs.fields.dms.dms_unsold")} initialValue={false}>
|
||||||
|
<Switch />
|
||||||
|
</Form.Item>
|
||||||
|
<Form.Item name="dms_model_override" label={t("jobs.fields.dms.dms_model_override")} initialValue={false}>
|
||||||
|
<Switch />
|
||||||
|
</Form.Item>
|
||||||
|
</Space>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<Form.Item
|
||||||
|
name="story"
|
||||||
|
label={t("jobs.fields.dms.story")}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Input.TextArea maxLength={240} />
|
||||||
|
</Form.Item>
|
||||||
|
|
||||||
|
<Divider />
|
||||||
|
<Space size="large" wrap align="center">
|
||||||
|
<Statistic
|
||||||
|
title={t("jobs.fields.ded_amt")}
|
||||||
|
value={Dinero(job.job_totals.totals.custPayable.deductible).toFormat()}
|
||||||
|
/>
|
||||||
|
<Statistic
|
||||||
|
title={t("jobs.labels.total_cust_payable")}
|
||||||
|
value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
|
||||||
|
/>
|
||||||
|
<Statistic
|
||||||
|
title={t("jobs.labels.net_repairs")}
|
||||||
|
value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
|
||||||
|
/>
|
||||||
|
</Space>
|
||||||
|
<Form.List name={["payers"]}>
|
||||||
|
{(fields, { add, remove }) => {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
{fields.map((field, index) => (
|
||||||
|
<Form.Item key={field.key}>
|
||||||
|
<Space wrap>
|
||||||
|
<Form.Item
|
||||||
|
label={t("jobs.fields.dms.payer.name")}
|
||||||
|
key={`${index}name`}
|
||||||
|
name={[field.name, "name"]}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Select style={{ minWidth: "15rem" }} onSelect={(value) => handlePayerSelect(value, index)}>
|
||||||
|
{bodyshop.cdk_configuration &&
|
||||||
|
bodyshop.cdk_configuration.payers &&
|
||||||
|
bodyshop.cdk_configuration.payers.map((payer) => (
|
||||||
|
<Select.Option key={payer.name}>{payer.name}</Select.Option>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
</Form.Item>
|
||||||
|
|
||||||
|
<Form.Item
|
||||||
|
label={t("jobs.fields.dms.payer.dms_acctnumber")}
|
||||||
|
key={`${index}dms_acctnumber`}
|
||||||
|
name={[field.name, "dms_acctnumber"]}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Input disabled />
|
||||||
|
</Form.Item>
|
||||||
|
|
||||||
|
<Form.Item
|
||||||
|
label={t("jobs.fields.dms.payer.amount")}
|
||||||
|
key={`${index}amount`}
|
||||||
|
name={[field.name, "amount"]}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<CurrencyInput min={0} />
|
||||||
|
</Form.Item>
|
||||||
|
|
||||||
|
<Form.Item
|
||||||
|
label={
|
||||||
|
<div>
|
||||||
|
{t("jobs.fields.dms.payer.controlnumber")}{" "}
|
||||||
|
<Dropdown
|
||||||
|
menu={{
|
||||||
|
items: bodyshop.cdk_configuration.controllist?.map((key, idx) => ({
|
||||||
|
key: idx,
|
||||||
|
label: key.name,
|
||||||
|
onClick: () => {
|
||||||
|
form.setFieldsValue({
|
||||||
|
payers: form.getFieldValue("payers").map((row, mapIndex) => {
|
||||||
|
if (index !== mapIndex) return row;
|
||||||
|
return {
|
||||||
|
...row,
|
||||||
|
controlnumber: key.controlnumber
|
||||||
|
};
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<a href=" #" onClick={(e) => e.preventDefault()}>
|
||||||
|
<DownOutlined />
|
||||||
|
</a>
|
||||||
|
</Dropdown>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
key={`${index}controlnumber`}
|
||||||
|
name={[field.name, "controlnumber"]}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Input />
|
||||||
|
</Form.Item>
|
||||||
|
|
||||||
|
<Form.Item shouldUpdate>
|
||||||
|
{() => {
|
||||||
|
const payers = form.getFieldValue("payers");
|
||||||
|
|
||||||
|
const row = payers && payers[index];
|
||||||
|
|
||||||
|
const cdkPayer =
|
||||||
|
bodyshop.cdk_configuration.payers &&
|
||||||
|
bodyshop.cdk_configuration.payers.find((i) => i && row && i.name === row.name);
|
||||||
|
if (i18n.exists(`jobs.fields.${cdkPayer?.control_type}`))
|
||||||
|
return <div>{cdkPayer && t(`jobs.fields.${cdkPayer?.control_type}`)}</div>;
|
||||||
|
else if (i18n.exists(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)) {
|
||||||
|
return <div>{cdkPayer && t(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)}</div>;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
</Form.Item>
|
||||||
|
|
||||||
|
<DeleteFilled
|
||||||
|
onClick={() => {
|
||||||
|
remove(field.name);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Space>
|
||||||
|
</Form.Item>
|
||||||
|
))}
|
||||||
|
<Form.Item>
|
||||||
|
<Button
|
||||||
|
disabled={!(fields.length < 3)}
|
||||||
|
onClick={() => {
|
||||||
|
if (fields.length < 3) add();
|
||||||
|
}}
|
||||||
|
style={{ width: "100%" }}
|
||||||
|
>
|
||||||
|
{t("jobs.actions.dms.addpayer")}
|
||||||
|
</Button>
|
||||||
|
</Form.Item>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Form.List>
|
||||||
|
<Form.Item shouldUpdate>
|
||||||
|
{() => {
|
||||||
|
//Perform Calculation to determine discrepancy.
|
||||||
|
let totalAllocated = Dinero();
|
||||||
|
|
||||||
|
const payers = form.getFieldValue("payers");
|
||||||
|
payers &&
|
||||||
|
payers.forEach((payer) => {
|
||||||
|
totalAllocated = totalAllocated.add(Dinero({ amount: Math.round((payer?.amount || 0) * 100) }));
|
||||||
|
});
|
||||||
|
|
||||||
|
const totals =
|
||||||
|
socket.allocationsSummary &&
|
||||||
|
socket.allocationsSummary.reduce(
|
||||||
|
(acc, val) => {
|
||||||
|
return {
|
||||||
|
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
||||||
|
totalCost: acc.totalCost.add(Dinero(val.cost))
|
||||||
|
};
|
||||||
|
},
|
||||||
|
{
|
||||||
|
totalSale: Dinero(),
|
||||||
|
totalCost: Dinero()
|
||||||
|
}
|
||||||
|
);
|
||||||
|
const discrep = totals ? totals.totalSale.subtract(totalAllocated) : Dinero();
|
||||||
|
return (
|
||||||
|
<Space size="large" wrap align="center">
|
||||||
|
<Statistic
|
||||||
|
title={t("jobs.labels.subtotal")}
|
||||||
|
value={(totals ? totals.totalSale : Dinero()).toFormat()}
|
||||||
|
/>
|
||||||
|
<Typography.Title>-</Typography.Title>
|
||||||
|
<Statistic title={t("jobs.labels.dms.totalallocated")} value={totalAllocated.toFormat()} />
|
||||||
|
<Typography.Title>=</Typography.Title>
|
||||||
|
<Statistic
|
||||||
|
title={t("jobs.labels.dms.notallocated")}
|
||||||
|
valueStyle={{
|
||||||
|
color: discrep.getAmount() === 0 ? "green" : "red"
|
||||||
|
}}
|
||||||
|
value={discrep.toFormat()}
|
||||||
|
/>
|
||||||
|
<Button disabled={!socket.allocationsSummary || discrep.getAmount() !== 0} htmlType="submit">
|
||||||
|
{t("jobs.actions.dms.post")}
|
||||||
|
</Button>
|
||||||
|
</Space>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Form.Item>
|
||||||
|
</Form>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,242 +0,0 @@
|
|||||||
import { ReloadOutlined } from "@ant-design/icons";
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
Col,
|
|
||||||
Divider,
|
|
||||||
Form,
|
|
||||||
Input,
|
|
||||||
InputNumber,
|
|
||||||
Row,
|
|
||||||
Select,
|
|
||||||
Space,
|
|
||||||
Statistic,
|
|
||||||
Tooltip,
|
|
||||||
Typography
|
|
||||||
} from "antd";
|
|
||||||
import Dinero from "dinero.js";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { useEffect, useMemo, useState } from "react";
|
|
||||||
import dayjs from "../../utils/day";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* RR DMS Post Form component
|
|
||||||
* Submit: "rr-export-job"
|
|
||||||
* @param bodyshop
|
|
||||||
* @param socket
|
|
||||||
* @param job
|
|
||||||
* @param logsRef
|
|
||||||
* @returns {JSX.Element}
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
export default function RRPostForm({ bodyshop, socket, job, logsRef }) {
|
|
||||||
const [form] = Form.useForm();
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
// Advisors
|
|
||||||
const [advisors, setAdvisors] = useState([]);
|
|
||||||
const [advLoading, setAdvLoading] = useState(false);
|
|
||||||
|
|
||||||
const getAdvisorNumber = (a) => a?.advisorId;
|
|
||||||
|
|
||||||
const getAdvisorLabel = (a) => `${a?.firstName || ""} ${a?.lastName || ""}`.trim();
|
|
||||||
|
|
||||||
const fetchRrAdvisors = (refresh = false) => {
|
|
||||||
if (!socket) return;
|
|
||||||
setAdvLoading(true);
|
|
||||||
|
|
||||||
const onResult = (payload) => {
|
|
||||||
try {
|
|
||||||
const list = payload?.result ?? payload ?? [];
|
|
||||||
setAdvisors(Array.isArray(list) ? list : []);
|
|
||||||
} finally {
|
|
||||||
setAdvLoading(false);
|
|
||||||
socket.off("rr-get-advisors:result", onResult);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
socket.once("rr-get-advisors:result", onResult);
|
|
||||||
socket.emit("rr-get-advisors", { departmentType: "B", refresh }, (ack) => {
|
|
||||||
if (ack?.ok) {
|
|
||||||
const list = ack.result ?? [];
|
|
||||||
setAdvisors(Array.isArray(list) ? list : []);
|
|
||||||
} else if (ack) {
|
|
||||||
console.error("Something went wrong fetching DMS Advisors");
|
|
||||||
}
|
|
||||||
setAdvLoading(false);
|
|
||||||
socket.off("rr-get-advisors:result", onResult);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetchRrAdvisors(false);
|
|
||||||
}, [bodyshop?.id, socket]);
|
|
||||||
|
|
||||||
const initialValues = useMemo(
|
|
||||||
() => ({
|
|
||||||
story: `${t("jobs.labels.dms.defaultstory", {
|
|
||||||
ro_number: job.ro_number,
|
|
||||||
ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`.trim(),
|
|
||||||
ins_co_nm: job.ins_co_nm || "N/A",
|
|
||||||
clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${job.po_number || ""}`
|
|
||||||
}).trim()}.${
|
|
||||||
job.area_of_damage?.impact1
|
|
||||||
? " " +
|
|
||||||
t("jobs.labels.dms.damageto", {
|
|
||||||
area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
|
|
||||||
})
|
|
||||||
: ""
|
|
||||||
}`.slice(0, 239),
|
|
||||||
inservicedate: dayjs(
|
|
||||||
`${
|
|
||||||
(job.v_model_yr &&
|
|
||||||
(job.v_model_yr < 100
|
|
||||||
? job.v_model_yr >= (dayjs().year() + 1) % 100
|
|
||||||
? 1900 + parseInt(job.v_model_yr, 10)
|
|
||||||
: 2000 + parseInt(job.v_model_yr, 10)
|
|
||||||
: job.v_model_yr)) ||
|
|
||||||
2019
|
|
||||||
}-01-01`
|
|
||||||
)
|
|
||||||
}),
|
|
||||||
[job, t]
|
|
||||||
);
|
|
||||||
|
|
||||||
const handleFinish = (values) => {
|
|
||||||
if (!socket) return;
|
|
||||||
socket.emit("rr-export-job", {
|
|
||||||
bodyshopId: bodyshop?.id,
|
|
||||||
jobId: job.id,
|
|
||||||
job,
|
|
||||||
txEnvelope: values
|
|
||||||
});
|
|
||||||
logsRef?.current?.scrollIntoView({ behavior: "smooth" });
|
|
||||||
};
|
|
||||||
|
|
||||||
// Discrepancy is ignored for RR; we still show totals for operator context
|
|
||||||
const totals = socket?.allocationsSummary
|
|
||||||
? socket.allocationsSummary.reduce(
|
|
||||||
(acc, val) => ({
|
|
||||||
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
|
||||||
totalCost: acc.totalCost.add(Dinero(val.cost))
|
|
||||||
}),
|
|
||||||
{ totalSale: Dinero(), totalCost: Dinero() }
|
|
||||||
)
|
|
||||||
: { totalSale: Dinero(), totalCost: Dinero() };
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card title={t("jobs.labels.dms.postingform")}>
|
|
||||||
<Form
|
|
||||||
form={form}
|
|
||||||
layout="vertical"
|
|
||||||
onFinish={handleFinish}
|
|
||||||
style={{ width: "100%" }}
|
|
||||||
initialValues={initialValues}
|
|
||||||
>
|
|
||||||
<Row gutter={[16, 12]} align="bottom">
|
|
||||||
{/* Advisor + inline Refresh */}
|
|
||||||
<Col xs={24} sm={24} md={12} lg={8}>
|
|
||||||
<Form.Item label={t("jobs.fields.dms.advisor")} required>
|
|
||||||
<Space.Compact block>
|
|
||||||
<Form.Item
|
|
||||||
name="advisorNo"
|
|
||||||
noStyle
|
|
||||||
rules={[{ required: true, message: t("general.validation.required") }]}
|
|
||||||
>
|
|
||||||
<Select
|
|
||||||
style={{ flex: 1 }}
|
|
||||||
loading={advLoading}
|
|
||||||
allowClear
|
|
||||||
placeholder={t("general.actions.select", "Select...")}
|
|
||||||
popupMatchSelectWidth
|
|
||||||
options={advisors
|
|
||||||
.map((a) => {
|
|
||||||
const value = getAdvisorNumber(a);
|
|
||||||
if (value == null) return null;
|
|
||||||
return { value: String(value), label: getAdvisorLabel(a) || String(value) };
|
|
||||||
})
|
|
||||||
.filter(Boolean)}
|
|
||||||
notFoundContent={advLoading ? t("general.labels.loading") : t("general.labels.none")}
|
|
||||||
/>
|
|
||||||
</Form.Item>
|
|
||||||
<Tooltip title={t("general.actions.refresh")}>
|
|
||||||
<Button
|
|
||||||
aria-label={t("general.actions.refresh")}
|
|
||||||
icon={<ReloadOutlined />}
|
|
||||||
onClick={() => fetchRrAdvisors(true)}
|
|
||||||
loading={advLoading}
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
</Space.Compact>
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
{/* Make Override */}
|
|
||||||
<Col xs={24} sm={12} md={12} lg={8}>
|
|
||||||
<Form.Item name="makeOverride" label={t("jobs.fields.dms.make_override")}>
|
|
||||||
<Input allowClear placeholder={t("general.actions.optional")} />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={12} sm={8} md={6} lg={4}>
|
|
||||||
<Form.Item name="kmin" label={t("jobs.fields.kmin")} initialValue={job?.kmin} rules={[{ required: true }]}>
|
|
||||||
<InputNumber style={{ width: "100%" }} disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={12} sm={8} md={6} lg={4}>
|
|
||||||
<Form.Item
|
|
||||||
name="kmout"
|
|
||||||
label={t("jobs.fields.kmout")}
|
|
||||||
initialValue={job?.kmout}
|
|
||||||
rules={[{ required: true }]}
|
|
||||||
>
|
|
||||||
<InputNumber style={{ width: "100%" }} disabled />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
|
|
||||||
<Row gutter={[16, 12]}>
|
|
||||||
<Col span={24}>
|
|
||||||
<Form.Item name="story" label={t("jobs.fields.dms.story")} rules={[{ required: true }]}>
|
|
||||||
<Input.TextArea maxLength={240} />
|
|
||||||
</Form.Item>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
|
|
||||||
<Divider />
|
|
||||||
|
|
||||||
<Space size="large" wrap align="center" style={{ marginBottom: 16 }}>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.fields.ded_amt")}
|
|
||||||
value={Dinero(job.job_totals.totals.custPayable.deductible).toFormat()}
|
|
||||||
/>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.labels.total_cust_payable")}
|
|
||||||
value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
|
|
||||||
/>
|
|
||||||
<Statistic
|
|
||||||
title={t("jobs.labels.net_repairs")}
|
|
||||||
value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
|
|
||||||
{/* Validation */}
|
|
||||||
<Form.Item shouldUpdate>
|
|
||||||
{() => {
|
|
||||||
const advisorOk = !!form.getFieldValue("advisorNo");
|
|
||||||
return (
|
|
||||||
<Space size="large" wrap align="center">
|
|
||||||
<Statistic title={t("jobs.labels.subtotal")} value={totals.totalSale.toFormat()} />
|
|
||||||
<Typography.Title>=</Typography.Title>
|
|
||||||
<Button disabled={!advisorOk} htmlType="submit">
|
|
||||||
{t("jobs.actions.dms.post")}
|
|
||||||
</Button>
|
|
||||||
</Space>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</Form.Item>
|
|
||||||
</Form>
|
|
||||||
</Card>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -55,7 +55,8 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
|
|||||||
const useremail = currentUser.email;
|
const useremail = currentUser.email;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { ...otherFormValues } = formValues;
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
const { accepted_terms, ...otherFormValues } = formValues;
|
||||||
|
|
||||||
// Trim the values of the fields before submitting
|
// Trim the values of the fields before submitting
|
||||||
const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {
|
const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ const buildAccountingChildren = ({
|
|||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
...(!(bodyshop?.cdk_dealerid || bodyshop?.pbs_serialnumber || bodyshop?.rr_dealerid) || DmsAp.treatment === "on"
|
...(!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber)) || DmsAp.treatment === "on"
|
||||||
? [
|
? [
|
||||||
{
|
{
|
||||||
key: "payables",
|
key: "payables",
|
||||||
@@ -156,7 +156,7 @@ const buildAccountingChildren = ({
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
: []),
|
: []),
|
||||||
...(!(bodyshop?.cdk_dealerid || bodyshop?.pbs_serialnumber || bodyshop?.rr_dealerid) || DmsAp.treatment === "on"
|
...(!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber))
|
||||||
? [
|
? [
|
||||||
{
|
{
|
||||||
key: "payments",
|
key: "payments",
|
||||||
|
|||||||
@@ -222,17 +222,37 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
|
|||||||
</div>
|
</div>
|
||||||
</BlurWrapperComponent>
|
</BlurWrapperComponent>
|
||||||
<Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
|
<Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
|
||||||
<div>
|
<div
|
||||||
|
style={{
|
||||||
|
display: "flex",
|
||||||
|
flexWrap: "wrap",
|
||||||
|
gap: 8
|
||||||
|
}}
|
||||||
|
>
|
||||||
{lifecycleData.durations.summations.map((key) => (
|
{lifecycleData.durations.summations.map((key) => (
|
||||||
<Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
|
<Tag
|
||||||
|
key={key.status}
|
||||||
|
color={key.color}
|
||||||
|
style={{
|
||||||
|
// let the tag grow with its content
|
||||||
|
width: "auto",
|
||||||
|
padding: 0,
|
||||||
|
margin: 0,
|
||||||
|
display: "inline-flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
boxSizing: "border-box"
|
||||||
|
}}
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
||||||
title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: "var(--tag-wrapper-bg)",
|
backgroundColor: "var(--tag-wrapper-bg)",
|
||||||
color: "var(--tag-wrapper-text)",
|
color: "var(--tag-wrapper-text)",
|
||||||
padding: "4px",
|
padding: "4px 8px",
|
||||||
textAlign: "center"
|
textAlign: "center",
|
||||||
|
whiteSpace: "nowrap" // single line; tag gets wider instead of text escaping
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{key.status} (
|
{key.status} (
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { createStructuredSelector } from "reselect";
|
|||||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
@@ -15,8 +14,6 @@ const mapStateToProps = createStructuredSelector({
|
|||||||
export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
|
export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
const hasDmsKey = bodyshopHasDmsKey(bodyshop);
|
|
||||||
|
|
||||||
const handleAllocate = (defaults) => {
|
const handleAllocate = (defaults) => {
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
joblines: joblines.map((jl) => {
|
joblines: joblines.map((jl) => {
|
||||||
@@ -67,20 +64,21 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
|
|||||||
handleAllocate(bodyshop.md_responsibility_centers.dms_defaults.find((x) => x.name === key));
|
handleAllocate(bodyshop.md_responsibility_centers.dms_defaults.find((x) => x.name === key));
|
||||||
};
|
};
|
||||||
|
|
||||||
const menu = hasDmsKey
|
const menu =
|
||||||
? {
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||||
items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
|
? {
|
||||||
key: mapping.name,
|
items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
|
||||||
label: mapping.name,
|
key: mapping.name,
|
||||||
disabled: disabled
|
label: mapping.name,
|
||||||
})),
|
disabled: disabled
|
||||||
onClick: handleMenuClick
|
})),
|
||||||
}
|
onClick: handleMenuClick
|
||||||
: {
|
}
|
||||||
items: []
|
: {
|
||||||
};
|
items: []
|
||||||
|
};
|
||||||
|
|
||||||
return hasDmsKey ? (
|
return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
|
||||||
<Dropdown menu={menu}>
|
<Dropdown menu={menu}>
|
||||||
<Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
|
<Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import { auth, logImEXEvent } from "../../firebase/firebase.utils";
|
|||||||
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
|
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
|
||||||
import { UPDATE_JOB } from "../../graphql/jobs.queries";
|
import { UPDATE_JOB } from "../../graphql/jobs.queries";
|
||||||
import { insertAuditTrail } from "../../redux/application/application.actions";
|
import { insertAuditTrail } from "../../redux/application/application.actions";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
||||||
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
||||||
import client from "../../utils/GraphQLClient";
|
import client from "../../utils/GraphQLClient";
|
||||||
@@ -46,7 +45,7 @@ export function JobsCloseExportButton({ bodyshop, currentUser, jobId, disabled,
|
|||||||
|
|
||||||
const handleQbxml = async () => {
|
const handleQbxml = async () => {
|
||||||
//Check if it's a CDK setup.
|
//Check if it's a CDK setup.
|
||||||
if (bodyshopHasDmsKey(bodyshop)) {
|
if (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) {
|
||||||
history(`/manage/dms?jobId=${jobId}`);
|
history(`/manage/dms?jobId=${jobId}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ import ProductionListColumnProductionNote from "../production-list-columns/produ
|
|||||||
import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
|
import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
|
||||||
import "./jobs-detail-header.styles.scss";
|
import "./jobs-detail-header.styles.scss";
|
||||||
import getPartsBasePath from "../../utils/getPartsBasePath.js";
|
import getPartsBasePath from "../../utils/getPartsBasePath.js";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
jobRO: selectJobReadOnly,
|
jobRO: selectJobReadOnly,
|
||||||
@@ -310,7 +309,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
|
|||||||
</DataLabel>
|
</DataLabel>
|
||||||
<DataLabel key="4" label={t("vehicles.fields.v_vin")}>
|
<DataLabel key="4" label={t("vehicles.fields.v_vin")}>
|
||||||
<VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
|
<VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
|
||||||
{bodyshopHasDmsKey(bodyshop) ? (
|
{bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
|
||||||
job.v_vin?.length !== 17 ? (
|
job.v_vin?.length !== 17 ? (
|
||||||
<WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
|
<WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
|
||||||
) : null
|
) : null
|
||||||
|
|||||||
@@ -35,16 +35,14 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
|
|||||||
...galleryImages.other.filter((image) => image.isSelected)
|
...galleryImages.other.filter((image) => image.isSelected)
|
||||||
];
|
];
|
||||||
|
|
||||||
function downloadProgress(progressEvent) {
|
const downloadProgress = ({ loaded }) => {
|
||||||
setDownload((currentDownloadState) => {
|
setDownload((currentDownloadState) => ({
|
||||||
return {
|
downloaded: loaded ?? 0,
|
||||||
downloaded: progressEvent.loaded || 0,
|
speed: (loaded ?? 0) - (currentDownloadState?.downloaded ?? 0)
|
||||||
speed: (progressEvent.loaded || 0) - ((currentDownloadState && currentDownloadState.downloaded) || 0)
|
}));
|
||||||
};
|
};
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function standardMediaDownload(bufferData) {
|
const standardMediaDownload = (bufferData) => {
|
||||||
try {
|
try {
|
||||||
const a = document.createElement("a");
|
const a = document.createElement("a");
|
||||||
const url = window.URL.createObjectURL(new Blob([bufferData]));
|
const url = window.URL.createObjectURL(new Blob([bufferData]));
|
||||||
@@ -55,29 +53,26 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
|
|||||||
setLoading(false);
|
setLoading(false);
|
||||||
setDownload(null);
|
setDownload(null);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
const handleDownload = async () => {
|
const handleDownload = async () => {
|
||||||
logImEXEvent("jobs_documents_download");
|
logImEXEvent("jobs_documents_download");
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
try {
|
try {
|
||||||
const response = await axios({
|
const { data } = await axios({
|
||||||
url: "/media/imgproxy/download",
|
url: "/media/imgproxy/download",
|
||||||
method: "POST",
|
method: "POST",
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
|
data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
|
||||||
onDownloadProgress: downloadProgress
|
onDownloadProgress: downloadProgress
|
||||||
});
|
});
|
||||||
|
|
||||||
setLoading(false);
|
|
||||||
setDownload(null);
|
|
||||||
|
|
||||||
// Use the response data (Blob) to trigger download
|
// Use the response data (Blob) to trigger download
|
||||||
standardMediaDownload(response.data);
|
standardMediaDownload(data);
|
||||||
} catch {
|
} catch {
|
||||||
|
// handle error (optional)
|
||||||
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
setDownload(null);
|
setDownload(null);
|
||||||
// handle error (optional)
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -76,14 +76,14 @@ function JobsDocumentsImgproxyComponent({
|
|||||||
<SyncOutlined />
|
<SyncOutlined />
|
||||||
</Button>
|
</Button>
|
||||||
<JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
|
<JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
|
||||||
|
{!billId && (
|
||||||
|
<JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
|
||||||
|
)}
|
||||||
<JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
|
<JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
|
||||||
<JobsDocumentsDeleteButton
|
<JobsDocumentsDeleteButton
|
||||||
galleryImages={galleryImages}
|
galleryImages={galleryImages}
|
||||||
deletionCallback={billsCallback || fetchThumbnails || refetch}
|
deletionCallback={billsCallback || fetchThumbnails || refetch}
|
||||||
/>
|
/>
|
||||||
{!billId && (
|
|
||||||
<JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
|
|
||||||
)}
|
|
||||||
</Space>
|
</Space>
|
||||||
</Col>
|
</Col>
|
||||||
{!hasMediaAccess && (
|
{!hasMediaAccess && (
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ export default function JobsDocumentsImgproxyDeleteButton({ galleryImages, delet
|
|||||||
okButtonProps={{ danger: true }}
|
okButtonProps={{ danger: true }}
|
||||||
cancelText={t("general.actions.cancel")}
|
cancelText={t("general.actions.cancel")}
|
||||||
>
|
>
|
||||||
<Button disabled={imagesToDelete.length < 1} loading={loading}>
|
<Button danger disabled={imagesToDelete.length < 1} loading={loading}>
|
||||||
{t("documents.actions.delete")}
|
{t("documents.actions.delete")}
|
||||||
</Button>
|
</Button>
|
||||||
</Popconfirm>
|
</Popconfirm>
|
||||||
|
|||||||
@@ -107,8 +107,8 @@ export function JobsDocumentsLocalGallery({
|
|||||||
<a href={CreateExplorerLinkForJob({ jobid: job.id })}>
|
<a href={CreateExplorerLinkForJob({ jobid: job.id })}>
|
||||||
<Button>{t("documents.labels.openinexplorer")}</Button>
|
<Button>{t("documents.labels.openinexplorer")}</Button>
|
||||||
</a>
|
</a>
|
||||||
<JobsDocumentsLocalGalleryReassign jobid={job.id} />
|
|
||||||
<JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
|
<JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
|
||||||
|
<JobsDocumentsLocalGalleryReassign jobid={job.id} />
|
||||||
<JobsLocalGalleryDownloadButton job={job} />
|
<JobsLocalGalleryDownloadButton job={job} />
|
||||||
<JobsDocumentsLocalDeleteButton jobid={job.id} />
|
<JobsDocumentsLocalDeleteButton jobid={job.id} />
|
||||||
</Space>
|
</Space>
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
|
|||||||
|
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
|
const imagesToDelete = (allMedia?.[jobid] || []).filter((i) => i.isSelected);
|
||||||
|
|
||||||
const handleDelete = async () => {
|
const handleDelete = async () => {
|
||||||
logImEXEvent("job_documents_delete");
|
logImEXEvent("job_documents_delete");
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -36,7 +38,7 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
|
|||||||
`${bodyshop.localmediaserverhttp}/jobs/delete`,
|
`${bodyshop.localmediaserverhttp}/jobs/delete`,
|
||||||
{
|
{
|
||||||
jobid: jobid,
|
jobid: jobid,
|
||||||
files: (allMedia?.[jobid] || []).filter((i) => i.isSelected).map((i) => i.filename)
|
files: imagesToDelete.map((i) => i.filename)
|
||||||
},
|
},
|
||||||
{ headers: { ims_token: bodyshop.localmediatoken } }
|
{ headers: { ims_token: bodyshop.localmediatoken } }
|
||||||
);
|
);
|
||||||
@@ -60,14 +62,17 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Popconfirm
|
<Popconfirm
|
||||||
|
disabled={imagesToDelete.length < 1}
|
||||||
icon={<QuestionCircleOutlined style={{ color: "red" }} />}
|
icon={<QuestionCircleOutlined style={{ color: "red" }} />}
|
||||||
onConfirm={handleDelete}
|
onConfirm={handleDelete}
|
||||||
title={t("documents.labels.confirmdelete")}
|
title={t("documents.labels.confirmdelete")}
|
||||||
okText={t("general.actions.delete")}
|
okText={t("general.actions.delete")}
|
||||||
okButtonProps={{ type: "danger" }}
|
okButtonProps={{ danger: true }}
|
||||||
cancelText={t("general.actions.cancel")}
|
cancelText={t("general.actions.cancel")}
|
||||||
>
|
>
|
||||||
<Button loading={loading}>{t("documents.actions.delete")}</Button>
|
<Button danger disabled={imagesToDelete.length < 1} loading={loading}>
|
||||||
|
{t("documents.actions.delete")}
|
||||||
|
</Button>
|
||||||
</Popconfirm>
|
</Popconfirm>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { Button } from "antd";
|
import { Button, Space } from "antd";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import cleanAxios from "../../utils/CleanAxios";
|
import cleanAxios from "../../utils/CleanAxios";
|
||||||
|
import formatBytes from "../../utils/formatbytes";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { selectAllMedia } from "../../redux/media/media.selectors";
|
import { selectAllMedia } from "../../redux/media/media.selectors";
|
||||||
@@ -19,45 +19,63 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsLocalGalleryDown
|
|||||||
|
|
||||||
export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
|
export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [download, setDownload] = useState(null);
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [download, setDownload] = useState(false);
|
||||||
|
|
||||||
function downloadProgress(progressEvent) {
|
const imagesToDownload = (allMedia?.[job.id] || []).filter((i) => i.isSelected);
|
||||||
setDownload((currentDownloadState) => {
|
|
||||||
return {
|
const downloadProgress = ({ loaded }) => {
|
||||||
downloaded: progressEvent.loaded || 0,
|
setDownload((currentDownloadState) => ({
|
||||||
speed: (progressEvent.loaded || 0) - (currentDownloadState?.downloaded || 0)
|
downloaded: loaded || 0,
|
||||||
};
|
speed: (loaded || 0) - (currentDownloadState?.downloaded || 0)
|
||||||
});
|
}));
|
||||||
}
|
};
|
||||||
|
|
||||||
|
const standardMediaDownload = (bufferData, filename) => {
|
||||||
|
try {
|
||||||
|
const a = document.createElement("a");
|
||||||
|
const url = window.URL.createObjectURL(new Blob([bufferData]));
|
||||||
|
a.href = url;
|
||||||
|
a.download = `${filename}.zip`;
|
||||||
|
a.click();
|
||||||
|
} catch {
|
||||||
|
setLoading(false);
|
||||||
|
setDownload(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleDownload = async () => {
|
const handleDownload = async () => {
|
||||||
const theDownloadedZip = await cleanAxios.post(
|
const { localmediaserverhttp, localmediatoken } = bodyshop;
|
||||||
`${bodyshop.localmediaserverhttp}/jobs/download`,
|
const { id, ro_number } = job;
|
||||||
{
|
setLoading(true);
|
||||||
jobid: job.id,
|
try {
|
||||||
files: (allMedia?.[job.id] || []).filter((i) => i.isSelected).map((i) => i.filename)
|
const response = await cleanAxios.post(
|
||||||
},
|
`${localmediaserverhttp}/jobs/download`,
|
||||||
{
|
{
|
||||||
headers: { ims_token: bodyshop.localmediatoken },
|
jobid: id,
|
||||||
responseType: "arraybuffer",
|
files: imagesToDownload.map((i) => i.filename)
|
||||||
onDownloadProgress: downloadProgress
|
},
|
||||||
}
|
{
|
||||||
);
|
headers: { ims_token: localmediatoken },
|
||||||
setDownload(null);
|
responseType: "arraybuffer",
|
||||||
standardMediaDownload(theDownloadedZip.data, job.ro_number);
|
onDownloadProgress: downloadProgress
|
||||||
|
}
|
||||||
|
);
|
||||||
|
standardMediaDownload(response.data, ro_number);
|
||||||
|
} catch {
|
||||||
|
// handle error (optional)
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
setDownload(null);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button loading={!!download} onClick={handleDownload}>
|
<Button disabled={imagesToDownload < 1} loading={download || loading} onClick={handleDownload}>
|
||||||
{t("documents.actions.download")}
|
<Space>
|
||||||
|
<span>{t("documents.actions.download")}</span>
|
||||||
|
{download && <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(download.speed)} / second)`}</span>}
|
||||||
|
</Space>
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function standardMediaDownload(bufferData, filename) {
|
|
||||||
const a = document.createElement("a");
|
|
||||||
const url = window.URL.createObjectURL(new Blob([bufferData]));
|
|
||||||
a.href = url;
|
|
||||||
a.download = `${filename}.zip`;
|
|
||||||
a.click();
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
export const CalculateAllocationsTotals = (bodyshop, joblines, timetickets, adjustments = []) => {
|
export const CalculateAllocationsTotals = (bodyshop, joblines, timetickets, adjustments = []) => {
|
||||||
const responsibilitycenters = bodyshop.md_responsibility_centers;
|
const responsibilitycenters = bodyshop.md_responsibility_centers;
|
||||||
@@ -15,9 +14,10 @@ export const CalculateAllocationsTotals = (bodyshop, joblines, timetickets, adju
|
|||||||
const r = allCodes.reduce((acc, value) => {
|
const r = allCodes.reduce((acc, value) => {
|
||||||
const r = {
|
const r = {
|
||||||
opcode: value,
|
opcode: value,
|
||||||
cost_center: bodyshopHasDmsKey(bodyshop)
|
cost_center:
|
||||||
? i18next.t(`joblines.fields.lbr_types.${value && value.toUpperCase()}`)
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||||
: responsibilitycenters.defaults.costs[value],
|
? i18next.t(`joblines.fields.lbr_types.${value && value.toUpperCase()}`)
|
||||||
|
: responsibilitycenters.defaults.costs[value],
|
||||||
mod_lbr_ty: value,
|
mod_lbr_ty: value,
|
||||||
total: joblines.reduce((acc2, val2) => {
|
total: joblines.reduce((acc2, val2) => {
|
||||||
return val2.mod_lbr_ty === value ? acc2 + val2.mod_lb_hrs : acc2;
|
return val2.mod_lbr_ty === value ? acc2 + val2.mod_lb_hrs : acc2;
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ export async function checkPartnerStatus(bodyshop) {
|
|||||||
// bodyshop &&
|
// bodyshop &&
|
||||||
// (bodyshop.cdk_dealerid ||
|
// (bodyshop.cdk_dealerid ||
|
||||||
// bodyshop.pbs_serialnumber ||
|
// bodyshop.pbs_serialnumber ||
|
||||||
// bodyshop.rr_dealerid ||
|
|
||||||
// bodyshop.accountingconfig.qbo)
|
// bodyshop.accountingconfig.qbo)
|
||||||
// )
|
// )
|
||||||
// ) {
|
// ) {
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-
|
|||||||
import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
|
import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
|
||||||
import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
|
import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
|
||||||
import PrintWrapper from "../print-wrapper/print-wrapper.component";
|
import PrintWrapper from "../print-wrapper/print-wrapper.component";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
jobRO: selectJobReadOnly,
|
jobRO: selectJobReadOnly,
|
||||||
@@ -197,7 +196,7 @@ export function PartsOrderListTableDrawerComponent({
|
|||||||
quantity: pol.quantity,
|
quantity: pol.quantity,
|
||||||
actual_price: pol.act_price,
|
actual_price: pol.act_price,
|
||||||
cost_center: pol.jobline?.part_type
|
cost_center: pol.jobline?.part_type
|
||||||
? bodyshopHasDmsKey(bodyshop)
|
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
|
||||||
? pol.jobline.part_type !== "PAE"
|
? pol.jobline.part_type !== "PAE"
|
||||||
? pol.jobline.part_type
|
? pol.jobline.part_type
|
||||||
: null
|
: null
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-mod
|
|||||||
import PrintWrapper from "../print-wrapper/print-wrapper.component";
|
import PrintWrapper from "../print-wrapper/print-wrapper.component";
|
||||||
import PartsOrderDrawer from "./parts-order-list-table-drawer.component";
|
import PartsOrderDrawer from "./parts-order-list-table-drawer.component";
|
||||||
import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
|
import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
jobRO: selectJobReadOnly,
|
jobRO: selectJobReadOnly,
|
||||||
@@ -70,7 +69,6 @@ export function PartsOrderListTableComponent({
|
|||||||
|
|
||||||
const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
|
const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
|
||||||
const { refetch } = billsQuery;
|
const { refetch } = billsQuery;
|
||||||
|
|
||||||
const recordActions = (record, showView = false) => (
|
const recordActions = (record, showView = false) => (
|
||||||
<Space direction="horizontal" wrap>
|
<Space direction="horizontal" wrap>
|
||||||
<ShareToTeamsButton
|
<ShareToTeamsButton
|
||||||
@@ -174,7 +172,7 @@ export function PartsOrderListTableComponent({
|
|||||||
actual_price: pol.act_price,
|
actual_price: pol.act_price,
|
||||||
|
|
||||||
cost_center: pol.jobline?.part_type
|
cost_center: pol.jobline?.part_type
|
||||||
? bodyshopHasDmsKey(bodyshop)
|
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
|
||||||
? pol.jobline.part_type !== "PAE"
|
? pol.jobline.part_type !== "PAE"
|
||||||
? pol.jobline.part_type
|
? pol.jobline.part_type
|
||||||
: null
|
: null
|
||||||
|
|||||||
@@ -331,10 +331,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
|
|||||||
{t("timetickets.labels.shift")}
|
{t("timetickets.labels.shift")}
|
||||||
</Select.Option>
|
</Select.Option>
|
||||||
|
|
||||||
{bodyshop.cdk_dealerid ||
|
{bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
|
||||||
bodyshop.pbs_serialnumber ||
|
|
||||||
bodyshop.rr_dealerid ||
|
|
||||||
Enhanced_Payroll.treatment === "on"
|
|
||||||
? CiecaSelect(false, true)
|
? CiecaSelect(false, true)
|
||||||
: bodyshop.md_responsibility_centers.costs.map((c) => (
|
: bodyshop.md_responsibility_centers.costs.map((c) => (
|
||||||
<Select.Option key={c.name} value={c.name}>
|
<Select.Option key={c.name} value={c.name}>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
|
|||||||
<Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
|
<Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
|
||||||
{employeeOptions.length > 0 ? (
|
{employeeOptions.length > 0 ? (
|
||||||
<Form.Item
|
<Form.Item
|
||||||
|
normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
|
||||||
name="notification_followers"
|
name="notification_followers"
|
||||||
rules={[
|
rules={[
|
||||||
{
|
{
|
||||||
@@ -42,11 +43,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
|
|||||||
options={employeeOptions}
|
options={employeeOptions}
|
||||||
placeholder={t("bodyshop.fields.notifications.placeholder")}
|
placeholder={t("bodyshop.fields.notifications.placeholder")}
|
||||||
showEmail={true}
|
showEmail={true}
|
||||||
onChange={(value) => {
|
|
||||||
// Filter out null or invalid values before passing to Form
|
|
||||||
const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
|
|
||||||
return cleanedValue;
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,6 @@ import { createStructuredSelector } from "reselect";
|
|||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
//currentUser: selectCurrentUser
|
//currentUser: selectCurrentUser
|
||||||
@@ -2127,7 +2126,7 @@ function TaxFormItems({ typeNum, typeNumIterator, rootElements, bodyshop }) {
|
|||||||
>
|
>
|
||||||
<Input />
|
<Input />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
{bodyshopHasDmsKey(bodyshop) && (
|
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("bodyshop.fields.dms.dms_acctnumber")}
|
label={t("bodyshop.fields.dms.dms_acctnumber")}
|
||||||
rules={[
|
rules={[
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ const mapDispatchToProps = () => ({
|
|||||||
export function TechHeader({ technician }) {
|
export function TechHeader({ technician }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
return (
|
return (
|
||||||
<Header style={{ textAlign: "center" }}>
|
<Header style={{ textAlign: "center", height: "auto", overflow: "visible" }}>
|
||||||
<Typography.Title style={{ color: "#fff" }}>
|
<Typography.Title style={{ color: "#fff" }}>
|
||||||
{technician
|
{technician
|
||||||
? t("tech.labels.loggedin", {
|
? t("tech.labels.loggedin", {
|
||||||
|
|||||||
@@ -63,10 +63,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
|
|||||||
<Select.Option key={item.cost_center} value={item.cost_center}>
|
<Select.Option key={item.cost_center} value={item.cost_center}>
|
||||||
{item.cost_center === "timetickets.labels.shift"
|
{item.cost_center === "timetickets.labels.shift"
|
||||||
? t(item.cost_center)
|
? t(item.cost_center)
|
||||||
: bodyshop.cdk_dealerid ||
|
: bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
|
||||||
bodyshop.pbs_serialnumber ||
|
|
||||||
bodyshop.rr_dealerid ||
|
|
||||||
Enhanced_Payroll.treatment === "on"
|
|
||||||
? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
|
? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
|
||||||
: item.cost_center}
|
: item.cost_center}
|
||||||
</Select.Option>
|
</Select.Option>
|
||||||
|
|||||||
@@ -75,10 +75,7 @@ export function TechClockInContainer({ setTimeTicketContext, technician, bodysho
|
|||||||
jobid: values.jobid,
|
jobid: values.jobid,
|
||||||
cost_center: values.cost_center,
|
cost_center: values.cost_center,
|
||||||
ciecacode:
|
ciecacode:
|
||||||
bodyshop.cdk_dealerid ||
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
|
||||||
bodyshop.pbs_serialnumber ||
|
|
||||||
bodyshop.rr_dealerid ||
|
|
||||||
Enhanced_Payroll.treatment === "on"
|
|
||||||
? values.cost_center
|
? values.cost_center
|
||||||
: Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find((key) => {
|
: Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find((key) => {
|
||||||
return bodyshop.md_responsibility_centers.defaults.costs[key] === values.cost_center;
|
return bodyshop.md_responsibility_centers.defaults.costs[key] === values.cost_center;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useMutation, useQuery } from "@apollo/client";
|
import { useMutation, useQuery } from "@apollo/client";
|
||||||
import { Button, Card, Col, Form, InputNumber, Popover, Row, Select } from "antd";
|
import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@@ -16,7 +16,6 @@ import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-o
|
|||||||
import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
|
import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
|
||||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
||||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
@@ -54,9 +53,7 @@ export function TechClockOffButton({
|
|||||||
nextFetchPolicy: "network-only"
|
nextFetchPolicy: "network-only"
|
||||||
});
|
});
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const emps = bodyshop.employees.filter((e) => e.id === (technician && technician.id))[0];
|
||||||
const emps = bodyshop.employees.filter((e) => e.id === technician?.id)[0];
|
|
||||||
const hasDmsKey = bodyshopHasDmsKey(bodyshop);
|
|
||||||
|
|
||||||
const handleFinish = async (values) => {
|
const handleFinish = async (values) => {
|
||||||
logImEXEvent("tech_clock_out_job");
|
logImEXEvent("tech_clock_out_job");
|
||||||
@@ -72,10 +69,7 @@ export function TechClockOffButton({
|
|||||||
rate: emps && emps.rates.filter((r) => r.cost_center === values.cost_center)[0]?.rate,
|
rate: emps && emps.rates.filter((r) => r.cost_center === values.cost_center)[0]?.rate,
|
||||||
flat_rate: emps && emps.flat_rate,
|
flat_rate: emps && emps.flat_rate,
|
||||||
ciecacode:
|
ciecacode:
|
||||||
bodyshop.cdk_dealerid ||
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
|
||||||
bodyshop.pbs_serialnumber ||
|
|
||||||
bodyshop.rr_dealerid ||
|
|
||||||
Enhanced_Payroll.treatment === "on"
|
|
||||||
? values.cost_center
|
? values.cost_center
|
||||||
: Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find((key) => {
|
: Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find((key) => {
|
||||||
return bodyshop.md_responsibility_centers.defaults.costs[key] === values.cost_center;
|
return bodyshop.md_responsibility_centers.defaults.costs[key] === values.cost_center;
|
||||||
@@ -130,102 +124,12 @@ export function TechClockOffButton({
|
|||||||
cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
|
cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Row gutter={[16, 16]}>
|
<Space direction="vertical">
|
||||||
<Col span={!isShiftTicket ? 8 : 24}>
|
{!isShiftTicket ? (
|
||||||
{!isShiftTicket ? (
|
<div>
|
||||||
<div>
|
|
||||||
<Form.Item
|
|
||||||
label={t("timetickets.fields.actualhrs")}
|
|
||||||
name="actualhrs"
|
|
||||||
rules={[
|
|
||||||
{
|
|
||||||
required: true
|
|
||||||
//message: t("general.validation.required"),
|
|
||||||
}
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<InputNumber min={0} precision={1} />
|
|
||||||
</Form.Item>
|
|
||||||
<Form.Item
|
|
||||||
label={t("timetickets.fields.productivehrs")}
|
|
||||||
name="productivehrs"
|
|
||||||
rules={[
|
|
||||||
{
|
|
||||||
required: true
|
|
||||||
//message: t("general.validation.required"),
|
|
||||||
},
|
|
||||||
({ getFieldValue }) => ({
|
|
||||||
validator(rule, value) {
|
|
||||||
if (!bodyshop.tt_enforce_hours_for_tech_console) {
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
if (!value || getFieldValue("cost_center") === null || !lineTicketData)
|
|
||||||
return Promise.resolve();
|
|
||||||
|
|
||||||
//Check the cost center,
|
|
||||||
const totals = CalculateAllocationsTotals(
|
|
||||||
bodyshop,
|
|
||||||
lineTicketData.joblines,
|
|
||||||
lineTicketData.timetickets,
|
|
||||||
lineTicketData.jobs_by_pk.lbr_adjustments
|
|
||||||
);
|
|
||||||
|
|
||||||
const fieldTypeToCheck = hasDmsKey ? "mod_lbr_ty" : "cost_center";
|
|
||||||
|
|
||||||
const costCenterDiff =
|
|
||||||
Math.round(
|
|
||||||
totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
|
|
||||||
?.difference * 10
|
|
||||||
) / 10;
|
|
||||||
|
|
||||||
if (value > costCenterDiff)
|
|
||||||
return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
|
|
||||||
else {
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<InputNumber min={0} precision={1} />
|
|
||||||
</Form.Item>
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
<Form.Item
|
|
||||||
name="cost_center"
|
|
||||||
label={t("timetickets.fields.cost_center")}
|
|
||||||
rules={[
|
|
||||||
{
|
|
||||||
required: true
|
|
||||||
//message: t("general.validation.required"),
|
|
||||||
}
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<Select disabled={isShiftTicket}>
|
|
||||||
{isShiftTicket ? (
|
|
||||||
<Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
|
|
||||||
) : (
|
|
||||||
emps &&
|
|
||||||
emps.rates.map((item) => (
|
|
||||||
<Select.Option key={item.cost_center}>
|
|
||||||
{item.cost_center === "timetickets.labels.shift"
|
|
||||||
? t(item.cost_center)
|
|
||||||
: hasDmsKey
|
|
||||||
? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
|
|
||||||
: item.cost_center}
|
|
||||||
</Select.Option>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</Select>
|
|
||||||
</Form.Item>
|
|
||||||
|
|
||||||
{isShiftTicket ? (
|
|
||||||
<div></div>
|
|
||||||
) : (
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="status"
|
label={t("timetickets.fields.actualhrs")}
|
||||||
label={t("jobs.fields.status")}
|
name="actualhrs"
|
||||||
initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
|
|
||||||
rules={[
|
rules={[
|
||||||
{
|
{
|
||||||
required: true
|
required: true
|
||||||
@@ -233,35 +137,117 @@ export function TechClockOffButton({
|
|||||||
}
|
}
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<Select>
|
<InputNumber min={0} precision={1} />
|
||||||
{bodyshop.md_ro_statuses.production_statuses.map((item) => (
|
|
||||||
<Select.Option key={item}></Select.Option>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
)}
|
<Form.Item
|
||||||
<Button type="primary" htmlType="submit" loading={loading}>
|
label={t("timetickets.fields.productivehrs")}
|
||||||
{t("general.actions.save")}
|
name="productivehrs"
|
||||||
</Button>
|
rules={[
|
||||||
<TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
|
{
|
||||||
</Col>
|
required: true
|
||||||
{!isShiftTicket && (
|
//message: t("general.validation.required"),
|
||||||
<Col span={16}>
|
},
|
||||||
<LaborAllocationContainer
|
({ getFieldValue }) => ({
|
||||||
jobid={jobId || null}
|
validator(rule, value) {
|
||||||
loading={queryLoading}
|
if (!bodyshop.tt_enforce_hours_for_tech_console) {
|
||||||
lineTicketData={lineTicketData}
|
return Promise.resolve();
|
||||||
/>
|
}
|
||||||
</Col>
|
if (!value || getFieldValue("cost_center") === null || !lineTicketData)
|
||||||
|
return Promise.resolve();
|
||||||
|
//Check the cost center,
|
||||||
|
const totals = CalculateAllocationsTotals(
|
||||||
|
bodyshop,
|
||||||
|
lineTicketData.joblines,
|
||||||
|
lineTicketData.timetickets,
|
||||||
|
lineTicketData.jobs_by_pk.lbr_adjustments
|
||||||
|
);
|
||||||
|
const fieldTypeToCheck =
|
||||||
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
|
||||||
|
const costCenterDiff =
|
||||||
|
Math.round(
|
||||||
|
totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
|
||||||
|
?.difference * 10
|
||||||
|
) / 10;
|
||||||
|
if (value > costCenterDiff)
|
||||||
|
return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
|
||||||
|
else {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<InputNumber min={0} precision={1} />
|
||||||
|
</Form.Item>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
<Form.Item
|
||||||
|
name="cost_center"
|
||||||
|
label={t("timetickets.fields.cost_center")}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
//message: t("general.validation.required"),
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Select disabled={isShiftTicket}>
|
||||||
|
{isShiftTicket ? (
|
||||||
|
<Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
|
||||||
|
) : (
|
||||||
|
emps &&
|
||||||
|
emps.rates.map((item) => (
|
||||||
|
<Select.Option key={item.cost_center}>
|
||||||
|
{item.cost_center === "timetickets.labels.shift"
|
||||||
|
? t(item.cost_center)
|
||||||
|
: bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||||
|
? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
|
||||||
|
: item.cost_center}
|
||||||
|
</Select.Option>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</Select>
|
||||||
|
</Form.Item>
|
||||||
|
{isShiftTicket ? (
|
||||||
|
<div></div>
|
||||||
|
) : (
|
||||||
|
<Form.Item
|
||||||
|
name="status"
|
||||||
|
label={t("jobs.fields.status")}
|
||||||
|
initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true
|
||||||
|
//message: t("general.validation.required"),
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<Select>
|
||||||
|
{bodyshop.md_ro_statuses.production_statuses.map((item) => (
|
||||||
|
<Select.Option key={item}></Select.Option>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
</Form.Item>
|
||||||
)}
|
)}
|
||||||
</Row>
|
<Button type="primary" htmlType="submit" loading={loading}>
|
||||||
|
{t("general.actions.save")}
|
||||||
|
</Button>
|
||||||
|
<TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
|
||||||
|
{!isShiftTicket && (
|
||||||
|
<LaborAllocationContainer jobid={jobId || null} loading={queryLoading} lineTicketData={lineTicketData} />
|
||||||
|
)}
|
||||||
|
</Space>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Popover content={overlay} trigger="click">
|
<Popover
|
||||||
|
content={<div style={{ maxHeight: "75vh", overflowY: "auto" }}>{overlay}</div>}
|
||||||
|
trigger="click"
|
||||||
|
getPopupContainer={() => document.querySelector('#time-ticket-modal')}
|
||||||
|
>
|
||||||
<Button loading={loading} {...otherBtnProps}>
|
<Button loading={loading} {...otherBtnProps}>
|
||||||
{t("timetickets.actions.clockout")}
|
{t("timetickets.actions.clockout")}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import {
|
|||||||
import JobSearchSelect from "../job-search-select/job-search-select.component";
|
import JobSearchSelect from "../job-search-select/job-search-select.component";
|
||||||
import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
|
import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
|
||||||
import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
|
import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
||||||
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
|
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
|
||||||
import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
|
import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
|
||||||
@@ -61,10 +60,7 @@ export function TimeTicketModalComponent({
|
|||||||
<Select.Option key={item.cost_center} value={item.cost_center}>
|
<Select.Option key={item.cost_center} value={item.cost_center}>
|
||||||
{item.cost_center === "timetickets.labels.shift"
|
{item.cost_center === "timetickets.labels.shift"
|
||||||
? t(item.cost_center)
|
? t(item.cost_center)
|
||||||
: bodyshop.cdk_dealerid ||
|
: bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
|
||||||
bodyshop.pbs_serialnumber ||
|
|
||||||
bodyshop.rr_dealerid ||
|
|
||||||
Enhanced_Payroll.treatment === "on"
|
|
||||||
? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
|
? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
|
||||||
: item.cost_center}
|
: item.cost_center}
|
||||||
</Select.Option>
|
</Select.Option>
|
||||||
@@ -128,7 +124,7 @@ export function TimeTicketModalComponent({
|
|||||||
onSelect={(value) => {
|
onSelect={(value) => {
|
||||||
const emps = employeeAutoCompleteOptions && employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
|
const emps = employeeAutoCompleteOptions && employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
|
||||||
|
|
||||||
form.setFieldsValue({ flat_rate: emps?.flat_rate });
|
form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
@@ -190,7 +186,8 @@ export function TimeTicketModalComponent({
|
|||||||
lineTicketData.jobs_by_pk.lbr_adjustments
|
lineTicketData.jobs_by_pk.lbr_adjustments
|
||||||
);
|
);
|
||||||
|
|
||||||
const fieldTypeToCheck = bodyshopHasDmsKey(bodyshop) ? "mod_lbr_ty" : "cost_center";
|
const fieldTypeToCheck =
|
||||||
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
|
||||||
|
|
||||||
const costCenterDiff =
|
const costCenterDiff =
|
||||||
Math.round(
|
Math.round(
|
||||||
@@ -264,7 +261,7 @@ export function TimeTicketModalComponent({
|
|||||||
if (!value) return Promise.resolve();
|
if (!value) return Promise.resolve();
|
||||||
if (!clockon && value) return Promise.reject(t("timetickets.validation.clockoffwithoutclockon"));
|
if (!clockon && value) return Promise.reject(t("timetickets.validation.clockoffwithoutclockon"));
|
||||||
// TODO - Verify this exists
|
// TODO - Verify this exists
|
||||||
if (value?.isSameOrAfter && !value.isSameOrAfter(clockon))
|
if (value && value.isSameOrAfter && !value.isSameOrAfter(clockon))
|
||||||
return Promise.reject(t("timetickets.validation.clockoffmustbeafterclockon"));
|
return Promise.reject(t("timetickets.validation.clockoffmustbeafterclockon"));
|
||||||
|
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
|
|||||||
@@ -137,10 +137,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
|
|||||||
if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) {
|
if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) {
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
ciecacode:
|
ciecacode:
|
||||||
bodyshop.cdk_dealerid ||
|
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
|
||||||
bodyshop.pbs_serialnumber ||
|
|
||||||
bodyshop.rr_dealerid ||
|
|
||||||
Enhanced_Payroll.treatment === "on"
|
|
||||||
? changedFields.cost_center
|
? changedFields.cost_center
|
||||||
: Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find(
|
: Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find(
|
||||||
(key) => bodyshop.md_responsibility_centers.defaults.costs[key] === changedFields.cost_center
|
(key) => bodyshop.md_responsibility_centers.defaults.costs[key] === changedFields.cost_center
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const initializeSocket = async (token) => {
|
const initializeSocket = async (token) => {
|
||||||
if (!bodyshop?.id || socketRef.current) return;
|
if (!bodyshop || !bodyshop.id || socketRef.current) return;
|
||||||
|
|
||||||
const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
|
const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
|
||||||
const socketInstance = SocketIO(endpoint, {
|
const socketInstance = SocketIO(endpoint, {
|
||||||
|
|||||||
@@ -111,7 +111,6 @@ export const QUERY_BODYSHOP = gql`
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
md_jobline_presets
|
md_jobline_presets
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
rr_dealerid
|
|
||||||
features
|
features
|
||||||
attach_pdf_to_email
|
attach_pdf_to_email
|
||||||
tt_allow_post_to_invoiced
|
tt_allow_post_to_invoiced
|
||||||
@@ -124,7 +123,6 @@ export const QUERY_BODYSHOP = gql`
|
|||||||
md_email_cc
|
md_email_cc
|
||||||
timezone
|
timezone
|
||||||
ss_configuration
|
ss_configuration
|
||||||
rr_configuration
|
|
||||||
md_from_emails
|
md_from_emails
|
||||||
last_name_first
|
last_name_first
|
||||||
md_parts_order_comment
|
md_parts_order_comment
|
||||||
@@ -247,7 +245,6 @@ export const UPDATE_SHOP = gql`
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
md_jobline_presets
|
md_jobline_presets
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
rr_dealerid
|
|
||||||
attach_pdf_to_email
|
attach_pdf_to_email
|
||||||
tt_allow_post_to_invoiced
|
tt_allow_post_to_invoiced
|
||||||
cdk_configuration
|
cdk_configuration
|
||||||
@@ -259,7 +256,6 @@ export const UPDATE_SHOP = gql`
|
|||||||
md_email_cc
|
md_email_cc
|
||||||
timezone
|
timezone
|
||||||
ss_configuration
|
ss_configuration
|
||||||
rr_configuration
|
|
||||||
md_from_emails
|
md_from_emails
|
||||||
last_name_first
|
last_name_first
|
||||||
md_parts_order_comment
|
md_parts_order_comment
|
||||||
|
|||||||
@@ -714,7 +714,7 @@ export const GET_JOB_BY_PK = gql`
|
|||||||
v_model_yr
|
v_model_yr
|
||||||
v_model_desc
|
v_model_desc
|
||||||
v_vin
|
v_vin
|
||||||
notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
|
notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
|
||||||
created_at
|
created_at
|
||||||
created_by
|
created_by
|
||||||
critical
|
critical
|
||||||
@@ -1000,6 +1000,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
|
|||||||
key
|
key
|
||||||
type
|
type
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -2171,8 +2172,6 @@ export const QUERY_JOB_EXPORT_DMS = gql`
|
|||||||
ownr_fn
|
ownr_fn
|
||||||
ownr_ln
|
ownr_ln
|
||||||
ownr_co_nm
|
ownr_co_nm
|
||||||
ownr_ph1
|
|
||||||
ownr_ph2
|
|
||||||
ins_co_nm
|
ins_co_nm
|
||||||
kmin
|
kmin
|
||||||
kmout
|
kmout
|
||||||
@@ -2181,10 +2180,6 @@ export const QUERY_JOB_EXPORT_DMS = gql`
|
|||||||
v_model_desc
|
v_model_desc
|
||||||
area_of_damage
|
area_of_damage
|
||||||
date_exported
|
date_exported
|
||||||
v_vin
|
|
||||||
plate_no
|
|
||||||
plate_st
|
|
||||||
ownr_co_nm
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -2420,7 +2415,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
|
|||||||
start
|
start
|
||||||
status
|
status
|
||||||
}
|
}
|
||||||
notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
|
notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
|
||||||
created_at
|
created_at
|
||||||
created_by
|
created_by
|
||||||
critical
|
critical
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wr
|
|||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
|
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
|
||||||
import { Card } from "antd";
|
import { Card } from "antd";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
@@ -55,7 +54,8 @@ export function AccountingPayablesContainer({ bodyshop, setBreadcrumbs, setSelec
|
|||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||||
|
|
||||||
const noPath =
|
const noPath =
|
||||||
!partnerVersion?.qbpath && !(bodyshop && (bodyshopHasDmsKey(bodyshop) || bodyshop?.accountingconfig?.qbo));
|
!partnerVersion?.qbpath &&
|
||||||
|
!(bodyshop && (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.accountingconfig.qbo));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wr
|
|||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
|
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
|
||||||
import { Card } from "antd";
|
import { Card } from "antd";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
@@ -53,10 +52,9 @@ export function AccountingPaymentsContainer({ bodyshop, setBreadcrumbs, setSelec
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||||
|
|
||||||
const noPath =
|
const noPath =
|
||||||
!partnerVersion?.qbpath && !(bodyshop && (bodyshopHasDmsKey(bodyshop) || bodyshop?.accountingconfig?.qbo));
|
!partnerVersion?.qbpath &&
|
||||||
|
!(bodyshop && (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.accountingconfig.qbo));
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<FeatureWrapperComponent
|
<FeatureWrapperComponent
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wr
|
|||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
import { Card } from "antd";
|
import { Card } from "antd";
|
||||||
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
|
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
@@ -58,7 +57,8 @@ export function AccountingReceivablesContainer({ bodyshop, setBreadcrumbs, setSe
|
|||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||||
|
|
||||||
const noPath =
|
const noPath =
|
||||||
!partnerVersion?.qbpath && !(bodyshop && (bodyshopHasDmsKey(bodyshop) || bodyshop?.accountingconfig?.qbo));
|
!partnerVersion?.qbpath &&
|
||||||
|
!(bodyshop && (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.accountingconfig.qbo));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (socket.disconnected) socket.connect();
|
if (socket.disconnected) socket.connect();
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
socket.removeAllListeners();
|
socket.removeAllListeners();
|
||||||
socket.disconnect();
|
socket.disconnect();
|
||||||
@@ -140,10 +139,17 @@ export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
|
|||||||
</Space>
|
</Space>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<DmsLogEvents logs={logs} />
|
<DmsLogEvents socket={socket} logs={logs} />
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const determineDmsType = (bodyshop) => {
|
||||||
|
if (bodyshop.cdk_dealerid) return "cdk";
|
||||||
|
else {
|
||||||
|
return "pbs";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,32 +1,26 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
|
||||||
import { Link, useLocation, useNavigate } from "react-router-dom";
|
|
||||||
import { connect } from "react-redux";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { createStructuredSelector } from "reselect";
|
|
||||||
import queryString from "query-string";
|
|
||||||
import { useQuery } from "@apollo/client";
|
import { useQuery } from "@apollo/client";
|
||||||
import { Button, Card, Col, Result, Row, Select, Space, Switch } from "antd";
|
import { Button, Card, Col, Result, Row, Select, Space } from "antd";
|
||||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
import queryString from "query-string";
|
||||||
import { useSocket } from "../../contexts/SocketIO/useSocket.js";
|
import { useEffect, useRef, useState } from "react";
|
||||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { connect } from "react-redux";
|
||||||
|
import { Link, useLocation, useNavigate } from "react-router-dom";
|
||||||
|
import { createStructuredSelector } from "reselect";
|
||||||
|
import SocketIO from "socket.io-client";
|
||||||
|
import AlertComponent from "../../components/alert/alert.component";
|
||||||
|
import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
|
||||||
|
import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
|
||||||
|
import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
|
||||||
|
import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
|
||||||
|
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
|
||||||
|
import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
|
||||||
|
import { auth } from "../../firebase/firebase.utils";
|
||||||
import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
|
import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
|
||||||
import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
|
import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
|
||||||
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
||||||
import { bodyshopHasDmsKey, DMS_MAP, getDmsMode, isWssMode } from "../../utils/dmsUtils.js";
|
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||||
import legacySocket from "../../utils/legacySocket";
|
|
||||||
|
|
||||||
import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
|
|
||||||
import AlertComponent from "../../components/alert/alert.component";
|
|
||||||
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
|
|
||||||
import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
|
|
||||||
import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
|
|
||||||
import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
|
|
||||||
import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
|
|
||||||
import RrAllocationsSummary from "../../components/dms-allocations-summary/rr-dms-allocations-summary.component";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
@@ -40,413 +34,130 @@ const mapDispatchToProps = (dispatch) => ({
|
|||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
|
export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
|
||||||
|
|
||||||
const DMS_SOCKET_EVENTS = {
|
export const socket = SocketIO(
|
||||||
[DMS_MAP.reynolds]: {
|
import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", // for dev testing,
|
||||||
log: "rr-log-event",
|
{
|
||||||
partialResult: "rr-export-job:result",
|
path: "/ws",
|
||||||
validationNeeded: "rr-validation-required",
|
withCredentials: true,
|
||||||
exportSuccess: "export-success",
|
auth: async (callback) => {
|
||||||
exportFailed: "export-failed"
|
const token = auth.currentUser && (await auth.currentUser.getIdToken());
|
||||||
},
|
callback({ token });
|
||||||
[DMS_MAP.fortellis]: {
|
}
|
||||||
log: "fortellis-log-event",
|
|
||||||
exportSuccess: "export-success",
|
|
||||||
exportFailed: "export-failed"
|
|
||||||
},
|
|
||||||
[DMS_MAP.cdk]: {
|
|
||||||
log: "log-event",
|
|
||||||
exportSuccess: "export-success",
|
|
||||||
exportFailed: "export-failed"
|
|
||||||
},
|
|
||||||
[DMS_MAP.pbs]: {
|
|
||||||
log: "log-event",
|
|
||||||
exportSuccess: "export-success",
|
|
||||||
exportFailed: "export-failed"
|
|
||||||
}
|
}
|
||||||
};
|
);
|
||||||
|
|
||||||
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
|
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [resetAfterReconnect, setResetAfterReconnect] = useState(false);
|
const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
|
||||||
|
|
||||||
const history = useNavigate();
|
const history = useNavigate();
|
||||||
|
const [logs, setLogs] = useState([]);
|
||||||
const search = queryString.parse(useLocation().search);
|
const search = queryString.parse(useLocation().search);
|
||||||
const { jobId } = search;
|
const { jobId } = search;
|
||||||
|
|
||||||
const notification = useNotification();
|
const notification = useNotification();
|
||||||
|
|
||||||
const {
|
|
||||||
treatments: { Fortellis }
|
|
||||||
} = useSplitTreatments({
|
|
||||||
attributes: {},
|
|
||||||
names: ["Fortellis"],
|
|
||||||
splitKey: bodyshop.imexshopid
|
|
||||||
});
|
|
||||||
|
|
||||||
// Compute a single normalized mode and pick the proper socket
|
|
||||||
const mode = getDmsMode(bodyshop, Fortellis.treatment); // "rr" | "fortellis" | "cdk" | "pbs" | "none"
|
|
||||||
const isRrMode = mode === DMS_MAP.reynolds;
|
|
||||||
|
|
||||||
const { socket: wsssocket } = useSocket();
|
|
||||||
const activeSocket = useMemo(() => (isWssMode(mode) ? wsssocket : legacySocket), [mode, wsssocket]);
|
|
||||||
|
|
||||||
const [isConnected, setIsConnected] = useState(!!activeSocket?.connected);
|
|
||||||
|
|
||||||
// One place to set log level
|
|
||||||
const [logLevel, setLogLevel] = useState(mode === DMS_MAP.pbs ? "INFO" : "DEBUG");
|
|
||||||
|
|
||||||
const setActiveLogLevel = (level) => {
|
|
||||||
if (!activeSocket) return;
|
|
||||||
activeSocket.emit("set-log-level", level);
|
|
||||||
};
|
|
||||||
|
|
||||||
const [logs, setLogs] = useState([]);
|
|
||||||
const [detailsOpen, setDetailsOpen] = useState(false);
|
|
||||||
const [detailsNonce, setDetailsNonce] = useState(0);
|
|
||||||
const [colorizeJson, setColorizeJson] = useState(false);
|
|
||||||
|
|
||||||
const [rrOpenRoLimit, setRrOpenRoLimit] = useState(false);
|
|
||||||
const clearRrOpenRoLimit = () => setRrOpenRoLimit(false);
|
|
||||||
|
|
||||||
const [rrValidationPending, setrrValidationPending] = useState(false);
|
|
||||||
|
|
||||||
const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
|
const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
|
||||||
variables: { id: jobId },
|
variables: { id: jobId },
|
||||||
skip: !jobId,
|
skip: !jobId,
|
||||||
fetchPolicy: "network-only",
|
fetchPolicy: "network-only",
|
||||||
nextFetchPolicy: "network-only"
|
nextFetchPolicy: "network-only"
|
||||||
});
|
});
|
||||||
|
|
||||||
const logsRef = useRef(null);
|
const logsRef = useRef(null);
|
||||||
|
|
||||||
const toggleDetailsAll = () => {
|
|
||||||
setDetailsOpen((v) => !v);
|
|
||||||
setDetailsNonce((n) => n + 1);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Channel names per mode to avoid branching everywhere
|
|
||||||
const channels = useMemo(() => DMS_SOCKET_EVENTS[mode] || {}, [mode]);
|
|
||||||
|
|
||||||
const providerLabel = useMemo(
|
|
||||||
() =>
|
|
||||||
({
|
|
||||||
[DMS_MAP.reynolds]: "Reynolds",
|
|
||||||
[DMS_MAP.fortellis]: "Fortellis",
|
|
||||||
[DMS_MAP.cdk]: "CDK",
|
|
||||||
[DMS_MAP.pbs]: "PBS"
|
|
||||||
})[mode] || "DMS",
|
|
||||||
[mode]
|
|
||||||
);
|
|
||||||
|
|
||||||
const transportLabel = isWssMode(mode) ? "(WSS)" : "(WS)";
|
|
||||||
|
|
||||||
const bannerMessage = `Posting to ${providerLabel} | ${transportLabel} | ${
|
|
||||||
isConnected ? "Connected" : "Disconnected"
|
|
||||||
}`;
|
|
||||||
|
|
||||||
const resetKey = useMemo(() => `${mode || "none"}-${jobId || "none"}`, [mode, jobId]);
|
|
||||||
|
|
||||||
// 🔄 Hard reset of local + server-side DMS context when the page/job loads
|
|
||||||
useEffect(() => {
|
|
||||||
// Clear any local ephemeral state that might be stale
|
|
||||||
setLogs([]);
|
|
||||||
setRrOpenRoLimit(false);
|
|
||||||
setrrValidationPending(false);
|
|
||||||
|
|
||||||
if (!activeSocket) return;
|
|
||||||
|
|
||||||
const emitReset = () => {
|
|
||||||
// Generic reset; server can branch on `mode` if needed
|
|
||||||
activeSocket.emit("dms-reset-context", { jobId, mode });
|
|
||||||
};
|
|
||||||
|
|
||||||
if (activeSocket.connected) {
|
|
||||||
// WSS usually lands here
|
|
||||||
emitReset();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Legacy WS: wait for the connect before emitting reset
|
|
||||||
const handleConnectOnce = () => {
|
|
||||||
emitReset();
|
|
||||||
activeSocket.off("connect", handleConnectOnce);
|
|
||||||
};
|
|
||||||
|
|
||||||
activeSocket.on("connect", handleConnectOnce);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
activeSocket.off("connect", handleConnectOnce);
|
|
||||||
};
|
|
||||||
}, [jobId, mode, activeSocket]);
|
|
||||||
|
|
||||||
const handleExportFailed = (payload = {}) => {
|
|
||||||
const { title, friendlyMessage, error: errText, severity, errorCode, vendorStatusCode } = payload;
|
|
||||||
|
|
||||||
const msg =
|
|
||||||
friendlyMessage ||
|
|
||||||
errText ||
|
|
||||||
t("dms.errors.exportfailedgeneric", "We couldn't complete the export. Please try again.");
|
|
||||||
|
|
||||||
const vendorTitle = title || (isRrMode ? "Reynolds" : "DMS");
|
|
||||||
|
|
||||||
const isRrOpenRoLimit =
|
|
||||||
isRrMode &&
|
|
||||||
(vendorStatusCode === 507 ||
|
|
||||||
/MAX_OPEN_ROS/i.test(String(errorCode || "")) ||
|
|
||||||
/maximum number of open repair orders/i.test(String(msg || "").toLowerCase()));
|
|
||||||
|
|
||||||
const sev = severity || (isRrOpenRoLimit ? "warning" : "error");
|
|
||||||
|
|
||||||
if (!isRrOpenRoLimit) {
|
|
||||||
const notifyKind = sev === "warning" && typeof notification.warning === "function" ? "warning" : "error";
|
|
||||||
notification[notifyKind]({ message: vendorTitle, description: msg, duration: 10 });
|
|
||||||
} else {
|
|
||||||
setRrOpenRoLimit(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
setLogs((prev) => [
|
|
||||||
...prev,
|
|
||||||
{
|
|
||||||
timestamp: new Date(),
|
|
||||||
level: (sev || "error").toUpperCase(),
|
|
||||||
message: `${vendorTitle}: ${msg}`,
|
|
||||||
meta: { errorCode, vendorStatusCode, raw: payload, blockedByOpenRoLimit: !!isRrOpenRoLimit }
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
// keep this in sync if mode/socket flips
|
|
||||||
useEffect(() => {
|
|
||||||
setIsConnected(!!activeSocket?.connected);
|
|
||||||
}, [activeSocket]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
document.title = t("titles.dms", {
|
document.title = t("titles.dms", {
|
||||||
app: InstanceRenderManager({ imex: "$t(titles.imexonline)", rome: "$t(titles.romeonline)" })
|
app: InstanceRenderManager({
|
||||||
|
imex: "$t(titles.imexonline)",
|
||||||
|
rome: "$t(titles.romeonline)"
|
||||||
|
})
|
||||||
});
|
});
|
||||||
setSelectedHeader("dms");
|
setSelectedHeader("dms");
|
||||||
setBreadcrumbs([
|
setBreadcrumbs([
|
||||||
{ link: "/manage/accounting/receivables", label: t("titles.bc.accounting-receivables") }
|
{
|
||||||
// { link: "/manage/dms", label: t("titles.bc.dms") }
|
link: "/manage/accounting/receivables",
|
||||||
|
label: t("titles.bc.accounting-receivables")
|
||||||
|
},
|
||||||
|
{
|
||||||
|
link: "/manage/dms",
|
||||||
|
label: t("titles.bc.dms")
|
||||||
|
}
|
||||||
]);
|
]);
|
||||||
}, [t, setBreadcrumbs, setSelectedHeader]);
|
}, [t, setBreadcrumbs, setSelectedHeader]);
|
||||||
|
|
||||||
// Socket wiring (mode-aware)
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!activeSocket) return;
|
socket.on("connect", () => socket.emit("set-log-level", logLevel));
|
||||||
|
socket.on("reconnect", () => {
|
||||||
// Connect legacy socket if needed
|
setLogs((logs) => {
|
||||||
if (!isWssMode(mode)) {
|
return [
|
||||||
if (activeSocket.disconnected) activeSocket.connect();
|
...logs,
|
||||||
}
|
{
|
||||||
|
timestamp: new Date(),
|
||||||
// Set log level now and on connect/reconnect
|
level: "warn",
|
||||||
setActiveLogLevel(logLevel);
|
message: "Reconnected to CDK Export Service"
|
||||||
|
}
|
||||||
const onConnect = () => {
|
];
|
||||||
setIsConnected(true);
|
});
|
||||||
setActiveLogLevel(logLevel);
|
});
|
||||||
|
socket.on("connect_error", (err) => {
|
||||||
if (resetAfterReconnect) {
|
|
||||||
activeSocket.emit("dms-reset-context", { jobId, mode });
|
|
||||||
setResetAfterReconnect(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onDisconnect = () => setIsConnected(false);
|
|
||||||
|
|
||||||
const onReconnect = () => {
|
|
||||||
setIsConnected(true);
|
|
||||||
setLogs((prev) => [
|
|
||||||
...prev,
|
|
||||||
{
|
|
||||||
timestamp: new Date(),
|
|
||||||
level: "warn",
|
|
||||||
message: `Reconnected to ${isRrMode ? "RR" : mode === DMS_MAP.fortellis ? "Fortellis" : "DMS"} Export Service`
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onConnectError = (err) => {
|
|
||||||
// Legacy and WSS both emit this
|
|
||||||
console.log(`connect_error due to ${err}`, err);
|
console.log(`connect_error due to ${err}`, err);
|
||||||
notification.error({ message: err.message });
|
notification.error({ message: err.message });
|
||||||
};
|
});
|
||||||
|
socket.on("log-event", (payload) => {
|
||||||
activeSocket.on("disconnect", onDisconnect);
|
setLogs((logs) => {
|
||||||
activeSocket.on("connect", onConnect);
|
return [...logs, payload];
|
||||||
activeSocket.on("reconnect", onReconnect);
|
});
|
||||||
activeSocket.on("connect_error", onConnectError);
|
});
|
||||||
|
socket.on("export-success", (payload) => {
|
||||||
// Logs
|
notification.success({
|
||||||
const onLog = isRrMode
|
message: t("jobs.successes.exported")
|
||||||
? (payload = {}) => {
|
});
|
||||||
const normalized = {
|
|
||||||
timestamp: payload.timestamp ? new Date(payload.timestamp) : payload.ts ? new Date(payload.ts) : new Date(),
|
|
||||||
level: (payload.level || "INFO").toUpperCase(),
|
|
||||||
message: payload.message || payload.msg || "",
|
|
||||||
meta: payload.meta ?? payload.ctx ?? payload.details ?? null
|
|
||||||
};
|
|
||||||
setLogs((prev) => [...prev, normalized]);
|
|
||||||
}
|
|
||||||
: (payload) => setLogs((prev) => [...prev, payload]);
|
|
||||||
|
|
||||||
if (channels.log) activeSocket.on(channels.log, onLog);
|
|
||||||
|
|
||||||
// Success / Failed
|
|
||||||
const onExportSuccess = (payload) => {
|
|
||||||
const jobIdResolved = payload?.jobId ?? payload;
|
|
||||||
notification.success({ message: t("jobs.successes.exported") });
|
|
||||||
|
|
||||||
// Clear RR Validation flag if any
|
|
||||||
setrrValidationPending(false);
|
|
||||||
|
|
||||||
insertAuditTrail({
|
insertAuditTrail({
|
||||||
jobid: jobIdResolved,
|
jobid: payload,
|
||||||
operation: AuditTrailMapping.jobexported(),
|
operation: AuditTrailMapping.jobexported(),
|
||||||
type: "jobexported"
|
type: "jobexported"
|
||||||
});
|
});
|
||||||
history("/manage/accounting/receivables");
|
history("/manage/accounting/receivables");
|
||||||
};
|
|
||||||
|
|
||||||
if (channels.exportSuccess) activeSocket.on(channels.exportSuccess, onExportSuccess);
|
|
||||||
if (channels.exportFailed) activeSocket.on(channels.exportFailed, handleExportFailed);
|
|
||||||
|
|
||||||
// RR-only extras
|
|
||||||
|
|
||||||
const onPartialResult = () => {
|
|
||||||
setrrValidationPending(true);
|
|
||||||
setLogs((prev) => [
|
|
||||||
...prev,
|
|
||||||
{
|
|
||||||
timestamp: new Date(),
|
|
||||||
level: "INFO",
|
|
||||||
message:
|
|
||||||
"Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize."
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
notification.info({
|
|
||||||
message: "Reynolds RO created",
|
|
||||||
description:
|
|
||||||
"Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
|
|
||||||
duration: 8
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const onValidationRequired = (payload) => {
|
|
||||||
setrrValidationPending(true);
|
|
||||||
setLogs((prev) => [
|
|
||||||
...prev,
|
|
||||||
{
|
|
||||||
timestamp: new Date(),
|
|
||||||
level: "INFO",
|
|
||||||
message:
|
|
||||||
"Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize.",
|
|
||||||
meta: { payload }
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isRrMode && channels.partialResult) activeSocket.on(channels.partialResult, onPartialResult);
|
|
||||||
if (isRrMode && channels.validationNeeded) activeSocket.on(channels.validationNeeded, onValidationRequired);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
activeSocket.off("connect", onConnect);
|
|
||||||
activeSocket.off("reconnect", onReconnect);
|
|
||||||
activeSocket.off("connect_error", onConnectError);
|
|
||||||
activeSocket.off("disconnect", onDisconnect);
|
|
||||||
|
|
||||||
if (channels.log) activeSocket.off(channels.log, onLog);
|
|
||||||
if (channels.exportSuccess) activeSocket.off(channels.exportSuccess, onExportSuccess);
|
|
||||||
if (channels.exportFailed) activeSocket.off(channels.exportFailed, handleExportFailed);
|
|
||||||
|
|
||||||
if (isRrMode && channels.partialResult) activeSocket.off(channels.partialResult, onPartialResult);
|
|
||||||
if (isRrMode && channels.validationNeeded) activeSocket.off(channels.validationNeeded, onValidationRequired);
|
|
||||||
|
|
||||||
// Only tear down legacy socket listeners; don't disconnect WSS from here
|
|
||||||
if (!isWssMode(mode)) {
|
|
||||||
activeSocket.removeAllListeners();
|
|
||||||
activeSocket.disconnect();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}, [mode, activeSocket, channels, logLevel, notification, t, insertAuditTrail, history]);
|
|
||||||
|
|
||||||
// RR finalize callback (unchanged public behavior)
|
|
||||||
const handleRrValidationFinished = () => {
|
|
||||||
if (!jobId) return;
|
|
||||||
if (!isWssMode(mode)) return; // RR is WSS-only
|
|
||||||
activeSocket.emit("rr-finalize-repair-order", { jobId }, (ack) => {
|
|
||||||
if (ack?.ok) return;
|
|
||||||
if (ack?.error) notification.error({ message: ack.error });
|
|
||||||
});
|
});
|
||||||
};
|
|
||||||
|
if (socket.disconnected) socket.connect();
|
||||||
|
return () => {
|
||||||
|
socket.removeAllListeners();
|
||||||
|
socket.disconnect();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
if (loading) return <LoadingSpinner />;
|
if (loading) return <LoadingSpinner />;
|
||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||||
|
|
||||||
if (!jobId || !bodyshopHasDmsKey(bodyshop) || !data?.jobs_by_pk)
|
if (!jobId || !(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) || !(data && data.jobs_by_pk))
|
||||||
return <Result status="404" title={t("general.errors.notfound")} />;
|
return <Result status="404" title={t("general.errors.notfound")} />;
|
||||||
|
|
||||||
if (data.jobs_by_pk?.date_exported) return <Result status="warning" title={t("dms.errors.alreadyexported")} />;
|
if (data.jobs_by_pk && data.jobs_by_pk.date_exported)
|
||||||
|
return <Result status="warning" title={t("dms.errors.alreadyexported")} />;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<AlertComponent style={{ marginBottom: 10 }} message={bannerMessage} type="warning" showIcon closable />
|
|
||||||
|
|
||||||
<Row gutter={[16, 16]}>
|
<Row gutter={[16, 16]}>
|
||||||
<Col md={24} lg={10} className="dms-equal-height-col">
|
<Col md={24} lg={10}>
|
||||||
{!isRrMode ? (
|
<DmsAllocationsSummary
|
||||||
<DmsAllocationsSummary
|
title={
|
||||||
key={resetKey}
|
<span>
|
||||||
title={
|
<Link to={`/manage/jobs/${data && data.jobs_by_pk.id}`}>{`${
|
||||||
<span>
|
data && data.jobs_by_pk && data.jobs_by_pk.ro_number
|
||||||
<Link
|
}`}</Link>
|
||||||
to={`/manage/jobs/${data && data.jobs_by_pk.id}`}
|
{` | ${OwnerNameDisplayFunction(data.jobs_by_pk)} | ${
|
||||||
>{`${data?.jobs_by_pk && data.jobs_by_pk.ro_number}`}</Link>
|
data.jobs_by_pk.v_model_yr || ""
|
||||||
{` | ${OwnerNameDisplayFunction(data.jobs_by_pk)} | ${data.jobs_by_pk.v_model_yr || ""} ${
|
} ${data.jobs_by_pk.v_make_desc || ""} ${data.jobs_by_pk.v_model_desc || ""}`}
|
||||||
data.jobs_by_pk.v_make_desc || ""
|
</span>
|
||||||
} ${data.jobs_by_pk.v_model_desc || ""}`}
|
}
|
||||||
</span>
|
socket={socket}
|
||||||
}
|
jobId={jobId}
|
||||||
socket={activeSocket}
|
/>
|
||||||
jobId={jobId}
|
</Col>
|
||||||
mode={mode}
|
<Col md={24} lg={14}>
|
||||||
/>
|
<DmsPostForm socket={socket} jobId={jobId} job={data && data.jobs_by_pk} logsRef={logsRef} />
|
||||||
) : (
|
|
||||||
<RrAllocationsSummary
|
|
||||||
key={resetKey}
|
|
||||||
title={
|
|
||||||
<span>
|
|
||||||
<Link to={`/manage/jobs/${data && data.jobs_by_pk.id}`}>
|
|
||||||
{data?.jobs_by_pk && data.jobs_by_pk.ro_number}
|
|
||||||
</Link>
|
|
||||||
{` | ${OwnerNameDisplayFunction(data.jobs_by_pk)} | ${
|
|
||||||
data.jobs_by_pk.v_model_yr || ""
|
|
||||||
} ${data.jobs_by_pk.v_make_desc || ""} ${data.jobs_by_pk.v_model_desc || ""}`}
|
|
||||||
</span>
|
|
||||||
}
|
|
||||||
socket={activeSocket}
|
|
||||||
jobId={jobId}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</Col>
|
</Col>
|
||||||
|
|
||||||
<Col md={24} lg={14} className="dms-equal-height-col">
|
<DmsCustomerSelector />
|
||||||
<DmsPostForm key={resetKey} socket={activeSocket} job={data?.jobs_by_pk} logsRef={logsRef} mode={mode} />
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<DmsCustomerSelector
|
|
||||||
jobid={jobId}
|
|
||||||
bodyshop={bodyshop}
|
|
||||||
socket={activeSocket}
|
|
||||||
mode={mode}
|
|
||||||
rrOptions={{
|
|
||||||
openRoLimit: rrOpenRoLimit,
|
|
||||||
onOpenRoFinished: clearRrOpenRoLimit,
|
|
||||||
validationPending: rrValidationPending,
|
|
||||||
onValidationFinished: handleRrValidationFinished
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Col span={24}>
|
<Col span={24}>
|
||||||
<div ref={logsRef}>
|
<div ref={logsRef}>
|
||||||
@@ -454,27 +165,14 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
|||||||
title={t("jobs.labels.dms.logs")}
|
title={t("jobs.labels.dms.logs")}
|
||||||
extra={
|
extra={
|
||||||
<Space wrap>
|
<Space wrap>
|
||||||
{isRrMode && (
|
|
||||||
<>
|
|
||||||
<Switch
|
|
||||||
checked={colorizeJson}
|
|
||||||
onChange={setColorizeJson}
|
|
||||||
checkedChildren="Color JSON"
|
|
||||||
unCheckedChildren="Plain JSON"
|
|
||||||
/>
|
|
||||||
<Button onClick={toggleDetailsAll}>{detailsOpen ? "Collapse All" : "Expand All"}</Button>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Select
|
<Select
|
||||||
placeholder="Log Level"
|
placeholder="Log Level"
|
||||||
value={logLevel}
|
value={logLevel}
|
||||||
onChange={(value) => {
|
onChange={(value) => {
|
||||||
setLogLevel(value);
|
setLogLevel(value);
|
||||||
setActiveLogLevel(value);
|
socket.emit("set-log-level", value);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Select.Option key="SILLY">SILLY</Select.Option>
|
|
||||||
<Select.Option key="DEBUG">DEBUG</Select.Option>
|
<Select.Option key="DEBUG">DEBUG</Select.Option>
|
||||||
<Select.Option key="INFO">INFO</Select.Option>
|
<Select.Option key="INFO">INFO</Select.Option>
|
||||||
<Select.Option key="WARN">WARN</Select.Option>
|
<Select.Option key="WARN">WARN</Select.Option>
|
||||||
@@ -484,14 +182,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
|||||||
<Button
|
<Button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setLogs([]);
|
setLogs([]);
|
||||||
setResetAfterReconnect(true);
|
socket.disconnect();
|
||||||
if (isWssMode(mode)) {
|
socket.connect();
|
||||||
setActiveLogLevel(logLevel);
|
|
||||||
}
|
|
||||||
if (activeSocket) {
|
|
||||||
activeSocket.disconnect();
|
|
||||||
setTimeout(() => activeSocket.connect(), 100);
|
|
||||||
}
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Reconnect
|
Reconnect
|
||||||
@@ -499,15 +191,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
|||||||
</Space>
|
</Space>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<DmsLogEvents
|
<DmsLogEvents socket={socket} logs={logs} />
|
||||||
logs={logs}
|
|
||||||
// Only honour details/colorized JSON in RR mode;
|
|
||||||
// in other modes DmsLogEvents can render a simple, flat list.
|
|
||||||
detailsOpen={isRrMode ? detailsOpen : false}
|
|
||||||
detailsNonce={detailsNonce}
|
|
||||||
colorizeJson={isRrMode ? colorizeJson : false}
|
|
||||||
showDetails={isRrMode}
|
|
||||||
/>
|
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
@@ -515,3 +199,10 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const determineDmsType = (bodyshop) => {
|
||||||
|
if (bodyshop.cdk_dealerid) return "cdk";
|
||||||
|
else {
|
||||||
|
return "pbs";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ import { setModalContext } from "../../redux/modals/modals.actions.js";
|
|||||||
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
||||||
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
||||||
import dayjs from "../../utils/day";
|
import dayjs from "../../utils/day";
|
||||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
@@ -70,8 +69,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
|
|||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const notification = useNotification();
|
const notification = useNotification();
|
||||||
|
|
||||||
const hasDMSKey = bodyshopHasDmsKey(bodyshop);
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
treatments: { Qb_Multi_Ar, ClosingPeriod }
|
treatments: { Qb_Multi_Ar, ClosingPeriod }
|
||||||
} = useSplitTreatments({
|
} = useSplitTreatments({
|
||||||
@@ -194,7 +191,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
|
|||||||
{t("general.actions.close")}
|
{t("general.actions.close")}
|
||||||
</Button>
|
</Button>
|
||||||
</Popconfirm>
|
</Popconfirm>
|
||||||
{bodyshopHasDmsKey(bodyshop) && (
|
{(bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid) && (
|
||||||
<Link to={`/manage/dms?jobId=${job.id}`}>
|
<Link to={`/manage/dms?jobId=${job.id}`}>
|
||||||
<Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
|
<Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
|
||||||
</Link>
|
</Link>
|
||||||
@@ -314,7 +311,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
|
|||||||
<Switch />
|
<Switch />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
)}
|
)}
|
||||||
{hasDMSKey && (
|
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.kmin")}
|
label={t("jobs.fields.kmin")}
|
||||||
name="kmin"
|
name="kmin"
|
||||||
@@ -327,7 +324,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
|
|||||||
<InputNumber precision={0} disabled={jobRO} />
|
<InputNumber precision={0} disabled={jobRO} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
)}
|
)}
|
||||||
{hasDMSKey && (
|
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.kmout")}
|
label={t("jobs.fields.kmout")}
|
||||||
name="kmout"
|
name="kmout"
|
||||||
@@ -351,7 +348,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
|
|||||||
<InputNumber precision={0} disabled={jobRO} />
|
<InputNumber precision={0} disabled={jobRO} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
)}
|
)}
|
||||||
{hasDMSKey && (
|
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.dms_allocation")}
|
label={t("jobs.fields.dms_allocation")}
|
||||||
name="dms_allocation"
|
name="dms_allocation"
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ import {
|
|||||||
} from "./user.actions";
|
} from "./user.actions";
|
||||||
import UserActionTypes from "./user.types";
|
import UserActionTypes from "./user.types";
|
||||||
//import * as amplitude from '@amplitude/analytics-browser';
|
//import * as amplitude from '@amplitude/analytics-browser';
|
||||||
import posthog from 'posthog-js';
|
import posthog from "posthog-js";
|
||||||
|
|
||||||
const fpPromise = FingerprintJS.load();
|
const fpPromise = FingerprintJS.load();
|
||||||
|
|
||||||
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
|
|||||||
instanceSeg,
|
instanceSeg,
|
||||||
...(isParts
|
...(isParts
|
||||||
? [
|
? [
|
||||||
InstanceRenderManager({
|
InstanceRenderManager({
|
||||||
imex: "ImexPartsManagement",
|
imex: "ImexPartsManagement",
|
||||||
rome: "RomePartsManagement"
|
rome: "RomePartsManagement"
|
||||||
})
|
})
|
||||||
]
|
]
|
||||||
: [])
|
: [])
|
||||||
];
|
];
|
||||||
window.$crisp.push(["set", "session:segments", [segs]]);
|
window.$crisp.push(["set", "session:segments", [segs]]);
|
||||||
@@ -375,17 +375,31 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
|
|||||||
const isParts = yield select((state) => state.application.isPartsEntry === true);
|
const isParts = yield select((state) => state.application.isPartsEntry === true);
|
||||||
const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
|
const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
|
||||||
|
|
||||||
let featureSegments;
|
const featureSegments =
|
||||||
if (payload.features?.allAccess === true) {
|
payload.features?.allAccess === true
|
||||||
featureSegments = ["allAccess"];
|
? ["allAccess"]
|
||||||
} else {
|
: [
|
||||||
const featureKeys = Object.keys(payload.features).filter(
|
"basic",
|
||||||
(key) =>
|
...Object.keys(payload.features).filter(
|
||||||
payload.features[key] === true ||
|
(key) =>
|
||||||
(typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
|
payload.features[key] === true ||
|
||||||
);
|
(typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
|
||||||
featureSegments = ["basic", ...featureKeys];
|
)
|
||||||
}
|
];
|
||||||
|
|
||||||
|
const additionalSegments = [
|
||||||
|
payload.cdk_dealerid && "CDK",
|
||||||
|
payload.pbs_serialnumber && "PBS",
|
||||||
|
// payload.rr_dealerid && "Reynolds",
|
||||||
|
payload.accountingconfig.qbo === true && "QBO",
|
||||||
|
payload.accountingconfig.qbo === false &&
|
||||||
|
!payload.cdk_dealerid &&
|
||||||
|
!payload.pbs_serialnumber &&
|
||||||
|
// !payload.rr_dealerid &&
|
||||||
|
"QBD"
|
||||||
|
].filter(Boolean);
|
||||||
|
|
||||||
|
featureSegments.push(...additionalSegments);
|
||||||
|
|
||||||
const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
|
const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
|
||||||
const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
|
const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
|
||||||
|
|||||||
@@ -558,14 +558,6 @@
|
|||||||
"responsibilitycenter_tax_tier": "Tax {{typeNum}} Tier {{typeNumIterator}}",
|
"responsibilitycenter_tax_tier": "Tax {{typeNum}} Tier {{typeNumIterator}}",
|
||||||
"responsibilitycenter_tax_type": "Tax {{typeNum}} Type",
|
"responsibilitycenter_tax_type": "Tax {{typeNum}} Type",
|
||||||
"responsibilitycenters": {
|
"responsibilitycenters": {
|
||||||
"gogcode": "GOG Code (BreakOut)",
|
|
||||||
"item_type": "Item Type",
|
|
||||||
"item_type_gog": "GOG",
|
|
||||||
"item_type_paint": "Paint Materials",
|
|
||||||
"item_type_freight": "Freight",
|
|
||||||
"taxable_flag": "Taxable?",
|
|
||||||
"taxable": "Taxable",
|
|
||||||
"nontaxable": "Non-taxable",
|
|
||||||
"ap": "Accounts Payable",
|
"ap": "Accounts Payable",
|
||||||
"ar": "Accounts Receivable",
|
"ar": "Accounts Receivable",
|
||||||
"ats": "ATS",
|
"ats": "ATS",
|
||||||
@@ -696,7 +688,6 @@
|
|||||||
"payers": "Payers"
|
"payers": "Payers"
|
||||||
},
|
},
|
||||||
"cdk_dealerid": "CDK Dealer ID",
|
"cdk_dealerid": "CDK Dealer ID",
|
||||||
"rr_dealerid": "Reynolds Store Number",
|
|
||||||
"costsmapping": "Costs Mapping",
|
"costsmapping": "Costs Mapping",
|
||||||
"dms_allocations": "DMS Allocations",
|
"dms_allocations": "DMS Allocations",
|
||||||
"pbs_serialnumber": "PBS Serial Number",
|
"pbs_serialnumber": "PBS Serial Number",
|
||||||
@@ -1044,7 +1035,7 @@
|
|||||||
"alreadyexported": "This job has already been sent to the DMS. If you need to resend it, please use admin permissions to mark the job for re-export."
|
"alreadyexported": "This job has already been sent to the DMS. If you need to resend it, please use admin permissions to mark the job for re-export."
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
"refreshallocations": "Refresh to see DMS Allocations."
|
"refreshallocations": "Refresh to see DMS Allocataions."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"documents": {
|
"documents": {
|
||||||
@@ -1221,8 +1212,6 @@
|
|||||||
},
|
},
|
||||||
"general": {
|
"general": {
|
||||||
"actions": {
|
"actions": {
|
||||||
"select": "Select",
|
|
||||||
"optional": "Optional",
|
|
||||||
"add": "Add",
|
"add": "Add",
|
||||||
"autoupdate": "{{app}} will automatically update in {{time}} seconds. Please save all changes.",
|
"autoupdate": "{{app}} will automatically update in {{time}} seconds. Please save all changes.",
|
||||||
"calculate": "Calculate",
|
"calculate": "Calculate",
|
||||||
@@ -1788,8 +1777,6 @@
|
|||||||
"id": "DMS ID",
|
"id": "DMS ID",
|
||||||
"inservicedate": "In Service Date",
|
"inservicedate": "In Service Date",
|
||||||
"journal": "Journal #",
|
"journal": "Journal #",
|
||||||
"make_override": "Make Override",
|
|
||||||
"advisor": "Advisor #",
|
|
||||||
"lines": "Posting Lines",
|
"lines": "Posting Lines",
|
||||||
"name1": "Customer Name",
|
"name1": "Customer Name",
|
||||||
"payer": {
|
"payer": {
|
||||||
@@ -1797,8 +1784,7 @@
|
|||||||
"control_type": "Control Type",
|
"control_type": "Control Type",
|
||||||
"controlnumber": "Control Number",
|
"controlnumber": "Control Number",
|
||||||
"dms_acctnumber": "DMS Account #",
|
"dms_acctnumber": "DMS Account #",
|
||||||
"name": "Payer Name",
|
"name": "Payer Name"
|
||||||
"payer_type": "Payer"
|
|
||||||
},
|
},
|
||||||
"sale": "Sale",
|
"sale": "Sale",
|
||||||
"sale_dms_acctnumber": "Sale DMS Acct #",
|
"sale_dms_acctnumber": "Sale DMS Acct #",
|
||||||
@@ -1865,7 +1851,7 @@
|
|||||||
"loss_of_use": "Loss of Use",
|
"loss_of_use": "Loss of Use",
|
||||||
"lost_sale_reason": "Lost Sale Reason",
|
"lost_sale_reason": "Lost Sale Reason",
|
||||||
"ma2s": "2 Stage Paint",
|
"ma2s": "2 Stage Paint",
|
||||||
"ma3s": "3 Stage Paint",
|
"ma3s": "3 Stage Pain",
|
||||||
"mabl": "MABL?",
|
"mabl": "MABL?",
|
||||||
"macs": "MACS?",
|
"macs": "MACS?",
|
||||||
"mahw": "Hazardous Waste",
|
"mahw": "Hazardous Waste",
|
||||||
|
|||||||
@@ -558,14 +558,6 @@
|
|||||||
"responsibilitycenter_tax_tier": "",
|
"responsibilitycenter_tax_tier": "",
|
||||||
"responsibilitycenter_tax_type": "",
|
"responsibilitycenter_tax_type": "",
|
||||||
"responsibilitycenters": {
|
"responsibilitycenters": {
|
||||||
"gogcode": "",
|
|
||||||
"item_type": "Item Type",
|
|
||||||
"item_type_gog": "",
|
|
||||||
"item_type_paint": "",
|
|
||||||
"item_type_freight": "",
|
|
||||||
"taxable_flag": "",
|
|
||||||
"taxable": "",
|
|
||||||
"nontaxable": "",
|
|
||||||
"ap": "",
|
"ap": "",
|
||||||
"ar": "",
|
"ar": "",
|
||||||
"ats": "",
|
"ats": "",
|
||||||
@@ -696,7 +688,6 @@
|
|||||||
"payers": ""
|
"payers": ""
|
||||||
},
|
},
|
||||||
"cdk_dealerid": "",
|
"cdk_dealerid": "",
|
||||||
"rr_dealerid": "",
|
|
||||||
"costsmapping": "",
|
"costsmapping": "",
|
||||||
"dms_allocations": "",
|
"dms_allocations": "",
|
||||||
"pbs_serialnumber": "",
|
"pbs_serialnumber": "",
|
||||||
@@ -1781,8 +1772,6 @@
|
|||||||
"dms_make": "",
|
"dms_make": "",
|
||||||
"dms_model": "",
|
"dms_model": "",
|
||||||
"dms_model_override": "",
|
"dms_model_override": "",
|
||||||
"make_override": "",
|
|
||||||
"advisor": "",
|
|
||||||
"dms_unsold": "",
|
"dms_unsold": "",
|
||||||
"dms_wip_acctnumber": "",
|
"dms_wip_acctnumber": "",
|
||||||
"id": "",
|
"id": "",
|
||||||
|
|||||||
@@ -558,14 +558,6 @@
|
|||||||
"responsibilitycenter_tax_tier": "",
|
"responsibilitycenter_tax_tier": "",
|
||||||
"responsibilitycenter_tax_type": "",
|
"responsibilitycenter_tax_type": "",
|
||||||
"responsibilitycenters": {
|
"responsibilitycenters": {
|
||||||
"gogcode": "",
|
|
||||||
"item_type": "Item Type",
|
|
||||||
"item_type_gog": "",
|
|
||||||
"item_type_paint": "",
|
|
||||||
"item_type_freight": "",
|
|
||||||
"taxable_flag": "",
|
|
||||||
"taxable": "",
|
|
||||||
"nontaxable": "",
|
|
||||||
"ap": "",
|
"ap": "",
|
||||||
"ar": "",
|
"ar": "",
|
||||||
"ats": "",
|
"ats": "",
|
||||||
@@ -696,7 +688,6 @@
|
|||||||
"payers": ""
|
"payers": ""
|
||||||
},
|
},
|
||||||
"cdk_dealerid": "",
|
"cdk_dealerid": "",
|
||||||
"rr_dealerid": "",
|
|
||||||
"costsmapping": "",
|
"costsmapping": "",
|
||||||
"dms_allocations": "",
|
"dms_allocations": "",
|
||||||
"pbs_serialnumber": "",
|
"pbs_serialnumber": "",
|
||||||
@@ -1781,8 +1772,6 @@
|
|||||||
"dms_make": "",
|
"dms_make": "",
|
||||||
"dms_model": "",
|
"dms_model": "",
|
||||||
"dms_model_override": "",
|
"dms_model_override": "",
|
||||||
"make_override": "",
|
|
||||||
"advisor": "",
|
|
||||||
"dms_unsold": "",
|
"dms_unsold": "",
|
||||||
"dms_wip_acctnumber": "",
|
"dms_wip_acctnumber": "",
|
||||||
"id": "",
|
"id": "",
|
||||||
|
|||||||
@@ -1221,7 +1221,7 @@ export const TemplateList = (type, context) => {
|
|||||||
payments_by_date_excel: {
|
payments_by_date_excel: {
|
||||||
title: i18n.t("reportcenter.templates.payments_by_date_excel"),
|
title: i18n.t("reportcenter.templates.payments_by_date_excel"),
|
||||||
subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
|
subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
|
||||||
key: "payments_by_date",
|
key: "payments_by_date_excel",
|
||||||
reporttype: "excel",
|
reporttype: "excel",
|
||||||
disabled: false,
|
disabled: false,
|
||||||
rangeFilter: {
|
rangeFilter: {
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
/**
|
|
||||||
* DMS type mapping constants.
|
|
||||||
* CAREFUL: the values here are used as canonical "mode" strings elsewhere in the app.
|
|
||||||
* @type {{reynolds: string, cdk: string, pbs: string, fortellis: string}}
|
|
||||||
*/
|
|
||||||
export const DMS_MAP = {
|
|
||||||
reynolds: "rr",
|
|
||||||
cdk: "cdk",
|
|
||||||
pbs: "pbs",
|
|
||||||
fortellis: "fortellis"
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determines the DMS type for a given bodyshop object.
|
|
||||||
* @param bodyshop
|
|
||||||
* @returns {*|string}
|
|
||||||
*/
|
|
||||||
export const determineDMSTypeByBodyshop = (bodyshop) => {
|
|
||||||
const dmsMapping = {
|
|
||||||
cdk_dealerid: DMS_MAP.cdk,
|
|
||||||
pbs_serialnumber: DMS_MAP.pbs,
|
|
||||||
rr_dealerid: DMS_MAP.reynolds
|
|
||||||
};
|
|
||||||
|
|
||||||
return Object.keys(dmsMapping).find((key) => bodyshop[key])
|
|
||||||
? dmsMapping[Object.keys(dmsMapping).find((key) => bodyshop[key])]
|
|
||||||
: DMS_MAP.pbs;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determines the translation key for a given DMS type.
|
|
||||||
* @param dmsType
|
|
||||||
* @returns {*|string}
|
|
||||||
*/
|
|
||||||
export const determineDmsTypeTranslationKey = (dmsType) => {
|
|
||||||
const dmsTypeMapping = {
|
|
||||||
[DMS_MAP.cdk]: "bodyshop.labels.dms.cdk",
|
|
||||||
[DMS_MAP.pbs]: "bodyshop.labels.dms.pbs",
|
|
||||||
[DMS_MAP.reynolds]: "bodyshop.labels.dms.rr"
|
|
||||||
};
|
|
||||||
|
|
||||||
return dmsTypeMapping[dmsType] || dmsTypeMapping[DMS_MAP.pbs];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a normalized "mode" we can switch on:
|
|
||||||
* @param bodyshop
|
|
||||||
* @param fortellisTreatment
|
|
||||||
* @returns {*|string|string}
|
|
||||||
*/
|
|
||||||
export const getDmsMode = (bodyshop, fortellisTreatment) => {
|
|
||||||
const base = determineDMSTypeByBodyshop(bodyshop); // "rr" | "cdk" | "pbs" | undefined
|
|
||||||
if (base === DMS_MAP.cdk && fortellisTreatment === "on") return DMS_MAP.fortellis;
|
|
||||||
return base ?? "none";
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the DMS mode uses WSS.
|
|
||||||
* @param mode
|
|
||||||
* @returns {boolean}
|
|
||||||
*/
|
|
||||||
export const isWssMode = (mode) => {
|
|
||||||
return mode === DMS_MAP.reynolds || mode === DMS_MAP.fortellis;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the bodyshop has any DMS key configured.
|
|
||||||
* @param bodyshop
|
|
||||||
* @returns {*|string}
|
|
||||||
*/
|
|
||||||
export const bodyshopHasDmsKey = (bodyshop) =>
|
|
||||||
bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.rr_dealerid;
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
// client/src/utils/legacySocket.js
|
|
||||||
import SocketIO from "socket.io-client";
|
|
||||||
import { auth } from "../firebase/firebase.utils";
|
|
||||||
|
|
||||||
// Create once, reuse everywhere.
|
|
||||||
const legacySocket = SocketIO(import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", {
|
|
||||||
path: "/ws",
|
|
||||||
withCredentials: true,
|
|
||||||
autoConnect: false,
|
|
||||||
auth: async (callback) => {
|
|
||||||
const token = auth.currentUser && (await auth.currentUser.getIdToken());
|
|
||||||
callback({ token });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default legacySocket;
|
|
||||||
@@ -1156,7 +1156,11 @@
|
|||||||
enable_manual: false
|
enable_manual: false
|
||||||
update:
|
update:
|
||||||
columns:
|
columns:
|
||||||
|
- imexshopid
|
||||||
|
- timezone
|
||||||
- shopname
|
- shopname
|
||||||
|
- notification_followers
|
||||||
|
- state
|
||||||
- md_order_statuses
|
- md_order_statuses
|
||||||
retry_conf:
|
retry_conf:
|
||||||
interval_sec: 10
|
interval_sec: 10
|
||||||
@@ -3698,6 +3702,7 @@
|
|||||||
- deliverchecklist
|
- deliverchecklist
|
||||||
- depreciation_taxes
|
- depreciation_taxes
|
||||||
- dms_allocation
|
- dms_allocation
|
||||||
|
- dms_id
|
||||||
- driveable
|
- driveable
|
||||||
- employee_body
|
- employee_body
|
||||||
- employee_csr
|
- employee_csr
|
||||||
@@ -3975,6 +3980,7 @@
|
|||||||
- deliverchecklist
|
- deliverchecklist
|
||||||
- depreciation_taxes
|
- depreciation_taxes
|
||||||
- dms_allocation
|
- dms_allocation
|
||||||
|
- dms_id
|
||||||
- driveable
|
- driveable
|
||||||
- employee_body
|
- employee_body
|
||||||
- employee_csr
|
- employee_csr
|
||||||
@@ -4264,6 +4270,7 @@
|
|||||||
- deliverchecklist
|
- deliverchecklist
|
||||||
- depreciation_taxes
|
- depreciation_taxes
|
||||||
- dms_allocation
|
- dms_allocation
|
||||||
|
- dms_id
|
||||||
- driveable
|
- driveable
|
||||||
- employee_body
|
- employee_body
|
||||||
- employee_csr
|
- employee_csr
|
||||||
|
|||||||
2813
package-lock.json
generated
2813
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
52
package.json
52
package.json
@@ -18,25 +18,24 @@
|
|||||||
"job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
|
"job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-sdk/client-cloudwatch-logs": "^3.932.0",
|
"@aws-sdk/client-cloudwatch-logs": "^3.901.0",
|
||||||
"@aws-sdk/client-elasticache": "^3.932.0",
|
"@aws-sdk/client-elasticache": "^3.901.0",
|
||||||
"@aws-sdk/client-s3": "^3.932.0",
|
"@aws-sdk/client-s3": "^3.901.0",
|
||||||
"@aws-sdk/client-secrets-manager": "^3.932.0",
|
"@aws-sdk/client-secrets-manager": "^3.901.0",
|
||||||
"@aws-sdk/client-ses": "^3.932.0",
|
"@aws-sdk/client-ses": "^3.901.0",
|
||||||
"@aws-sdk/credential-provider-node": "^3.932.0",
|
"@aws-sdk/credential-provider-node": "^3.901.0",
|
||||||
"@aws-sdk/lib-storage": "^3.932.0",
|
"@aws-sdk/lib-storage": "^3.903.0",
|
||||||
"@aws-sdk/s3-request-presigner": "^3.932.0",
|
"@aws-sdk/s3-request-presigner": "^3.901.0",
|
||||||
"@opensearch-project/opensearch": "^2.13.0",
|
"@opensearch-project/opensearch": "^2.13.0",
|
||||||
"@socket.io/admin-ui": "^0.5.1",
|
"@socket.io/admin-ui": "^0.5.1",
|
||||||
"@socket.io/redis-adapter": "^8.3.0",
|
"@socket.io/redis-adapter": "^8.3.0",
|
||||||
"archiver": "^7.0.1",
|
"archiver": "^7.0.1",
|
||||||
"aws4": "^1.13.2",
|
"aws4": "^1.13.2",
|
||||||
"axios": "^1.13.2",
|
"axios": "^1.12.2",
|
||||||
"axios-curlirize": "^2.0.0",
|
|
||||||
"better-queue": "^3.8.12",
|
"better-queue": "^3.8.12",
|
||||||
"bullmq": "^5.63.2",
|
"bullmq": "^5.61.0",
|
||||||
"chart.js": "^4.5.1",
|
"chart.js": "^4.5.0",
|
||||||
"cloudinary": "^2.8.0",
|
"cloudinary": "^2.7.0",
|
||||||
"compression": "^1.8.1",
|
"compression": "^1.8.1",
|
||||||
"cookie-parser": "^1.4.7",
|
"cookie-parser": "^1.4.7",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
@@ -44,43 +43,40 @@
|
|||||||
"dinero.js": "^1.9.1",
|
"dinero.js": "^1.9.1",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"fast-xml-parser": "^5.3.2",
|
"firebase-admin": "^13.5.0",
|
||||||
"firebase-admin": "^13.6.0",
|
"graphql": "^16.11.0",
|
||||||
"graphql": "^16.12.0",
|
|
||||||
"graphql-request": "^6.1.0",
|
"graphql-request": "^6.1.0",
|
||||||
"intuit-oauth": "^4.2.2",
|
"intuit-oauth": "^4.2.0",
|
||||||
"ioredis": "^5.8.2",
|
"ioredis": "^5.8.1",
|
||||||
"json-2-csv": "^5.5.10",
|
"json-2-csv": "^5.5.9",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"juice": "^11.0.3",
|
"juice": "^11.0.3",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"moment-timezone": "^0.6.0",
|
"moment-timezone": "^0.6.0",
|
||||||
"multer": "^2.0.2",
|
"multer": "^1.4.5-lts.1",
|
||||||
"mustache": "^4.2.0",
|
|
||||||
"node-persist": "^4.0.4",
|
"node-persist": "^4.0.4",
|
||||||
"nodemailer": "^6.10.0",
|
"nodemailer": "^6.10.0",
|
||||||
"phone": "^3.1.67",
|
"phone": "^3.1.67",
|
||||||
"query-string": "7.1.3",
|
"query-string": "7.1.3",
|
||||||
"recursive-diff": "^1.0.9",
|
"recursive-diff": "^1.0.9",
|
||||||
"rimraf": "^6.1.0",
|
"rimraf": "^6.0.1",
|
||||||
"skia-canvas": "^3.0.8",
|
"skia-canvas": "^3.0.8",
|
||||||
"soap": "^1.6.0",
|
"soap": "^1.5.0",
|
||||||
"socket.io": "^4.8.1",
|
"socket.io": "^4.8.1",
|
||||||
"socket.io-adapter": "^2.5.5",
|
"socket.io-adapter": "^2.5.5",
|
||||||
"ssh2-sftp-client": "^11.0.0",
|
"ssh2-sftp-client": "^11.0.0",
|
||||||
"twilio": "^5.10.5",
|
"twilio": "^5.10.2",
|
||||||
"uuid": "^11.1.0",
|
"uuid": "^11.1.0",
|
||||||
"winston": "^3.18.3",
|
"winston": "^3.18.3",
|
||||||
"winston-cloudwatch": "^6.3.0",
|
"winston-cloudwatch": "^6.3.0",
|
||||||
"xml-formatter": "^3.6.7",
|
|
||||||
"xml2js": "^0.6.2",
|
"xml2js": "^0.6.2",
|
||||||
"xmlbuilder2": "^4.0.0",
|
"xmlbuilder2": "^3.1.1",
|
||||||
"yazl": "^3.3.1"
|
"yazl": "^3.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.39.1",
|
"@eslint/js": "^9.37.0",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.37.0",
|
||||||
"eslint-plugin-react": "^7.37.5",
|
"eslint-plugin-react": "^7.37.5",
|
||||||
"globals": "^15.15.0",
|
"globals": "^15.15.0",
|
||||||
"mock-require": "^3.0.3",
|
"mock-require": "^3.0.3",
|
||||||
|
|||||||
31
server.js
31
server.js
@@ -38,7 +38,7 @@ const { registerCleanupTask, initializeCleanupManager } = require("./server/util
|
|||||||
|
|
||||||
const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
|
const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
|
||||||
const { loadAppQueue } = require("./server/notifications/queues/appQueue");
|
const { loadAppQueue } = require("./server/notifications/queues/appQueue");
|
||||||
const { SetLegacyWebsocketHandlers } = require("./server/web-sockets/web-socket");
|
|
||||||
const CLUSTER_RETRY_BASE_DELAY = 100;
|
const CLUSTER_RETRY_BASE_DELAY = 100;
|
||||||
const CLUSTER_RETRY_MAX_DELAY = 5000;
|
const CLUSTER_RETRY_MAX_DELAY = 5000;
|
||||||
const CLUSTER_RETRY_JITTER = 100;
|
const CLUSTER_RETRY_JITTER = 100;
|
||||||
@@ -247,29 +247,6 @@ const connectToRedisCluster = async () => {
|
|||||||
});
|
});
|
||||||
reject(err);
|
reject(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
redisCluster.on("+node", (node) => {
|
|
||||||
logger.log(`Redis cluster node added`, "INFO", "redis", "api", {
|
|
||||||
host: node.options.host,
|
|
||||||
port: node.options.port
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
redisCluster.on("-node", (node) => {
|
|
||||||
logger.log(`Redis cluster node removed`, "WARN", "redis", "api", {
|
|
||||||
host: node.options.host,
|
|
||||||
port: node.options.port
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
redisCluster.on("node error", (error, node) => {
|
|
||||||
console.dir(error);
|
|
||||||
logger.log(`Redis node error`, "ERROR", "redis", "api", {
|
|
||||||
host: node.options.host,
|
|
||||||
port: node.options.port,
|
|
||||||
message: error.message
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -347,9 +324,6 @@ const applySocketIO = async ({ server, app }) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Legacy Socket Events
|
|
||||||
SetLegacyWebsocketHandlers(io);
|
|
||||||
|
|
||||||
const api = {
|
const api = {
|
||||||
pubClient,
|
pubClient,
|
||||||
io,
|
io,
|
||||||
@@ -413,6 +387,9 @@ const main = async () => {
|
|||||||
const redisHelpers = applyRedisHelpers({ pubClient, app, logger });
|
const redisHelpers = applyRedisHelpers({ pubClient, app, logger });
|
||||||
const ioHelpers = applyIOHelpers({ app, redisHelpers, ioRedis, logger });
|
const ioHelpers = applyIOHelpers({ app, redisHelpers, ioRedis, logger });
|
||||||
|
|
||||||
|
// Legacy Socket Events
|
||||||
|
require("./server/web-sockets/web-socket");
|
||||||
|
|
||||||
// Initialize Queues
|
// Initialize Queues
|
||||||
await loadQueues({ pubClient: pubClient, logger, redisHelpers, ioRedis });
|
await loadQueues({ pubClient: pubClient, logger, redisHelpers, ioRedis });
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
const GraphQLClient = require("graphql-request").GraphQLClient;
|
const GraphQLClient = require("graphql-request").GraphQLClient;
|
||||||
|
|
||||||
const queries = require("../../graphql-client/queries");
|
const queries = require("../../graphql-client/queries");
|
||||||
const WsLogger = require("../../web-sockets/createLogEvent");
|
const CdkBase = require("../../web-sockets/web-socket");
|
||||||
const moment = require("moment");
|
const moment = require("moment");
|
||||||
const Dinero = require("dinero.js");
|
const Dinero = require("dinero.js");
|
||||||
const AxiosLib = require("axios").default;
|
const AxiosLib = require("axios").default;
|
||||||
@@ -23,7 +23,7 @@ axios.interceptors.request.use((x) => {
|
|||||||
} | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
|
} | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
|
||||||
//console.log(printable);
|
//console.log(printable);
|
||||||
|
|
||||||
WsLogger.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
|
CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
|
||||||
|
|
||||||
return x;
|
return x;
|
||||||
});
|
});
|
||||||
@@ -33,14 +33,14 @@ axios.interceptors.response.use((x) => {
|
|||||||
|
|
||||||
const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
|
const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
|
||||||
//console.log(printable);
|
//console.log(printable);
|
||||||
WsLogger.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
|
CdkBase.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
|
||||||
|
|
||||||
return x;
|
return x;
|
||||||
});
|
});
|
||||||
|
|
||||||
async function PbsCalculateAllocationsAp(socket, billids) {
|
async function PbsCalculateAllocationsAp(socket, billids) {
|
||||||
try {
|
try {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Received request to calculate allocations for ${billids}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Received request to calculate allocations for ${billids}`);
|
||||||
const { bills, bodyshops } = await QueryBillData(socket, billids);
|
const { bills, bodyshops } = await QueryBillData(socket, billids);
|
||||||
const bodyshop = bodyshops[0];
|
const bodyshop = bodyshops[0];
|
||||||
socket.bodyshop = bodyshop;
|
socket.bodyshop = bodyshop;
|
||||||
@@ -50,7 +50,7 @@ async function PbsCalculateAllocationsAp(socket, billids) {
|
|||||||
|
|
||||||
const transactionlist = [];
|
const transactionlist = [];
|
||||||
if (bills.length === 0) {
|
if (bills.length === 0) {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"ERROR",
|
"ERROR",
|
||||||
`No bills found for export. Ensure they have not already been exported and try again.`
|
`No bills found for export. Ensure they have not already been exported and try again.`
|
||||||
@@ -147,9 +147,7 @@ async function PbsCalculateAllocationsAp(socket, billids) {
|
|||||||
...billHash[key],
|
...billHash[key],
|
||||||
Amount: billHash[key].Amount.toFormat("0.00")
|
Amount: billHash[key].Amount.toFormat("0.00")
|
||||||
});
|
});
|
||||||
//Calculate the total expense for the bill iteratively to
|
APAmount = APAmount.add(billHash[key].Amount); //Calculate the total expense for the bill iteratively to create the corresponding credit to AP.
|
||||||
// create the corresponding credit to AP.
|
|
||||||
APAmount = APAmount.add(billHash[key].Amount);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -168,21 +166,19 @@ async function PbsCalculateAllocationsAp(socket, billids) {
|
|||||||
|
|
||||||
return transactionlist;
|
return transactionlist;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error encountered in PbsCalculateAllocationsAp. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsCalculateAllocationsAp. ${error}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.PbsCalculateAllocationsAp = PbsCalculateAllocationsAp;
|
exports.PbsCalculateAllocationsAp = PbsCalculateAllocationsAp;
|
||||||
|
|
||||||
async function QueryBillData(socket, billids) {
|
async function QueryBillData(socket, billids) {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Querying bill data for id(s) ${billids}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Querying bill data for id(s) ${billids}`);
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.GET_PBS_AP_ALLOCATIONS, { billids: billids });
|
.request(queries.GET_PBS_AP_ALLOCATIONS, { billids: billids });
|
||||||
|
CdkBase.createLogEvent(socket, "SILLY", `Bill data query result ${JSON.stringify(result, null, 2)}`);
|
||||||
WsLogger.createLogEvent(socket, "SILLY", `Bill data query result ${JSON.stringify(result, null, 2)}`);
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -196,10 +192,40 @@ function getCostAccount(billline, respcenters) {
|
|||||||
return respcenters.costs.find((c) => c.name === acctName);
|
return respcenters.costs.find((c) => c.name === acctName);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function MarkApExported(socket, billids) {
|
exports.PbsExportAp = async function (socket, { billids, txEnvelope }) {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Marking bills as exported for id ${billids}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Exporting selected AP.`);
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
|
||||||
|
|
||||||
|
//apAllocations has the same shap as the lines key for the accounting posting to PBS.
|
||||||
|
socket.apAllocations = await PbsCalculateAllocationsAp(socket, billids);
|
||||||
|
socket.txEnvelope = txEnvelope;
|
||||||
|
for (const allocation of socket.apAllocations) {
|
||||||
|
const { billid, ...restAllocation } = allocation;
|
||||||
|
const { data: AccountPostingChange } = await axios.post(PBS_ENDPOINTS.AccountingPostingChange, restAllocation, {
|
||||||
|
auth: PBS_CREDENTIALS,
|
||||||
|
socket
|
||||||
|
});
|
||||||
|
|
||||||
|
CheckForErrors(socket, AccountPostingChange);
|
||||||
|
|
||||||
|
if (AccountPostingChange.WasSuccessful) {
|
||||||
|
CdkBase.createLogEvent(socket, "DEBUG", `Marking bill as exported.`);
|
||||||
|
await MarkApExported(socket, [billid]);
|
||||||
|
|
||||||
|
socket.emit("ap-export-success", billid);
|
||||||
|
} else {
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
|
||||||
|
socket.emit("ap-export-failure", {
|
||||||
|
billid,
|
||||||
|
error: AccountPostingChange.Message
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
socket.emit("ap-export-complete");
|
||||||
|
};
|
||||||
|
|
||||||
|
async function MarkApExported(socket, billids) {
|
||||||
|
CdkBase.createLogEvent(socket, "DEBUG", `Marking bills as exported for id ${billids}`);
|
||||||
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.MARK_BILLS_EXPORTED, {
|
.request(queries.MARK_BILLS_EXPORTED, {
|
||||||
@@ -218,36 +244,3 @@ async function MarkApExported(socket, billids) {
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultHandler = async (socket, { billids, txEnvelope }) => {
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Exporting selected AP.`);
|
|
||||||
|
|
||||||
//apAllocations has the same shap as the lines key for the accounting posting to PBS.
|
|
||||||
socket.apAllocations = await PbsCalculateAllocationsAp(socket, billids);
|
|
||||||
socket.txEnvelope = txEnvelope;
|
|
||||||
for (const allocation of socket.apAllocations) {
|
|
||||||
const { billid, ...restAllocation } = allocation;
|
|
||||||
const { data: AccountPostingChange } = await axios.post(PBS_ENDPOINTS.AccountingPostingChange, restAllocation, {
|
|
||||||
auth: PBS_CREDENTIALS,
|
|
||||||
socket
|
|
||||||
});
|
|
||||||
|
|
||||||
CheckForErrors(socket, AccountPostingChange);
|
|
||||||
|
|
||||||
if (AccountPostingChange.WasSuccessful) {
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Marking bill as exported.`);
|
|
||||||
await MarkApExported(socket, [billid]);
|
|
||||||
|
|
||||||
socket.emit("ap-export-success", billid);
|
|
||||||
} else {
|
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Export was not successful.`);
|
|
||||||
socket.emit("ap-export-failure", {
|
|
||||||
billid,
|
|
||||||
error: AccountPostingChange.Message
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
socket.emit("ap-export-complete");
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.PbsExportAp = defaultHandler;
|
|
||||||
|
|||||||
@@ -2,12 +2,10 @@ const GraphQLClient = require("graphql-request").GraphQLClient;
|
|||||||
const AxiosLib = require("axios").default;
|
const AxiosLib = require("axios").default;
|
||||||
const queries = require("../../graphql-client/queries");
|
const queries = require("../../graphql-client/queries");
|
||||||
const { PBS_ENDPOINTS, PBS_CREDENTIALS } = require("./pbs-constants");
|
const { PBS_ENDPOINTS, PBS_CREDENTIALS } = require("./pbs-constants");
|
||||||
const WsLogger = require("../../web-sockets/createLogEvent");
|
|
||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
//const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
|
//const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
|
||||||
const CalculateAllocations = require("../../cdk/cdk-calculate-allocations").default;
|
const CalculateAllocations = require("../../cdk/cdk-calculate-allocations").default;
|
||||||
|
const CdkBase = require("../../web-sockets/web-socket");
|
||||||
const moment = require("moment-timezone");
|
const moment = require("moment-timezone");
|
||||||
const Dinero = require("dinero.js");
|
const Dinero = require("dinero.js");
|
||||||
const InstanceManager = require("../../utils/instanceMgr").default;
|
const InstanceManager = require("../../utils/instanceMgr").default;
|
||||||
@@ -21,12 +19,11 @@ axios.interceptors.request.use((x) => {
|
|||||||
...x.headers[x.method],
|
...x.headers[x.method],
|
||||||
...x.headers
|
...x.headers
|
||||||
};
|
};
|
||||||
const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
|
const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${x.url
|
||||||
x.url
|
} | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
|
||||||
} | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
|
|
||||||
//logRequestToFile(printable);
|
//logRequestToFile(printable);
|
||||||
|
|
||||||
WsLogger.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
|
CdkBase.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
|
||||||
|
|
||||||
return x;
|
return x;
|
||||||
});
|
});
|
||||||
@@ -36,11 +33,13 @@ axios.interceptors.response.use((x) => {
|
|||||||
|
|
||||||
const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
|
const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
|
||||||
//logRequestToFile(printable);
|
//logRequestToFile(printable);
|
||||||
WsLogger.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);
|
CdkBase.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);
|
||||||
|
|
||||||
return x;
|
return x;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require("path");
|
||||||
function logRequestToFile(printable) {
|
function logRequestToFile(printable) {
|
||||||
try {
|
try {
|
||||||
const logDir = path.join(process.cwd(), "logs");
|
const logDir = path.join(process.cwd(), "logs");
|
||||||
@@ -54,20 +53,21 @@ function logRequestToFile(printable) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultHandler = async (socket, { txEnvelope, jobid }) => {
|
|
||||||
|
exports.default = async function (socket, { txEnvelope, jobid }) {
|
||||||
socket.logEvents = [];
|
socket.logEvents = [];
|
||||||
socket.recordid = jobid;
|
socket.recordid = jobid;
|
||||||
socket.txEnvelope = txEnvelope;
|
socket.txEnvelope = txEnvelope;
|
||||||
try {
|
try {
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);
|
CdkBase.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);
|
||||||
|
|
||||||
const JobData = await QueryJobData(socket, jobid);
|
const JobData = await QueryJobData(socket, jobid);
|
||||||
socket.JobData = JobData;
|
socket.JobData = JobData;
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
|
CdkBase.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
|
||||||
//Query for the Vehicle record to get the associated customer.
|
//Query for the Vehicle record to get the associated customer.
|
||||||
socket.DmsVeh = await QueryVehicleFromDms(socket);
|
socket.DmsVeh = await QueryVehicleFromDms(socket);
|
||||||
//Todo: Need to validate the lines and methods below.
|
//Todo: Need to validate the lines and methods below.
|
||||||
if (socket.DmsVeh?.CustomerRef) {
|
if (socket.DmsVeh && socket.DmsVeh.CustomerRef) {
|
||||||
//Get the associated customer from the Vehicle Record.
|
//Get the associated customer from the Vehicle Record.
|
||||||
socket.DMSVehCustomer = await QueryCustomerBycodeFromDms(socket, socket.DmsVeh.CustomerRef);
|
socket.DMSVehCustomer = await QueryCustomerBycodeFromDms(socket, socket.DmsVeh.CustomerRef);
|
||||||
}
|
}
|
||||||
@@ -78,39 +78,35 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
|
|||||||
...socket.DMSCustList
|
...socket.DMSCustList
|
||||||
]);
|
]);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error encountered in PbsJobExport. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsJobExport. ${error}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.default = defaultHandler;
|
|
||||||
|
|
||||||
exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
|
exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
|
||||||
try {
|
try {
|
||||||
socket.selectedCustomerId = selectedCustomerId;
|
socket.selectedCustomerId = selectedCustomerId;
|
||||||
if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
|
if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
|
||||||
WsLogger.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);
|
CdkBase.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);
|
||||||
|
|
||||||
//Upsert the contact information as per Wafaa's Email.
|
//Upsert the contact information as per Wafaa's Email.
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"INFO",
|
"INFO",
|
||||||
`Upserting contact information to DMS for ${
|
`Upserting contact information to DMS for ${socket.JobData.ownr_fn || ""
|
||||||
socket.JobData.ownr_fn || ""
|
|
||||||
} ${socket.JobData.ownr_ln || ""} ${socket.JobData.ownr_co_nm || ""}`
|
} ${socket.JobData.ownr_ln || ""} ${socket.JobData.ownr_co_nm || ""}`
|
||||||
);
|
);
|
||||||
const ownerRef = await UpsertContactData(socket, selectedCustomerId);
|
const ownerRef = await UpsertContactData(socket, selectedCustomerId);
|
||||||
socket.ownerRef = ownerRef;
|
socket.ownerRef = ownerRef;
|
||||||
|
CdkBase.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
|
|
||||||
const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
|
const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
|
||||||
socket.vehicleRef = vehicleRef;
|
socket.vehicleRef = vehicleRef;
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"INFO",
|
"INFO",
|
||||||
`Contact and Vehicle updates disabled. Querying data and skipping to accounting data insert.`
|
`Contact and Vehicle updates disabled. Querying data and skipping to accounting data insert.`
|
||||||
);
|
);
|
||||||
//Must query for records to insert $0 RO.
|
//Must query for records to insert $0 RO.
|
||||||
if (!socket.ownerRef) {
|
if (!socket.ownerRef) {
|
||||||
const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
|
const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
|
||||||
socket.ownerRef = ownerRef;
|
socket.ownerRef = ownerRef;
|
||||||
@@ -118,21 +114,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
|
|||||||
const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
|
const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
|
||||||
socket.vehicleRef = vehicleRef;
|
socket.vehicleRef = vehicleRef;
|
||||||
}
|
}
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Inserting account posting data...`);
|
CdkBase.createLogEvent(socket, "INFO", `Inserting accounting posting data..`);
|
||||||
const insertResponse = await InsertAccountPostingData(socket);
|
const insertResponse = await InsertAccountPostingData(socket);
|
||||||
|
|
||||||
if (insertResponse.WasSuccessful) {
|
if (insertResponse.WasSuccessful) {
|
||||||
if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {
|
if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {
|
||||||
await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef);
|
|
||||||
|
await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef)
|
||||||
}
|
}
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Marking job as exported.`);
|
CdkBase.createLogEvent(socket, "INFO", `Marking job as exported.`);
|
||||||
await MarkJobExported(socket, socket.JobData.id);
|
await MarkJobExported(socket, socket.JobData.id);
|
||||||
socket.emit("export-success", socket.JobData.id);
|
socket.emit("export-success", socket.JobData.id);
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Export was not successful.`);
|
CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
|
||||||
await InsertFailedExportLog(socket, error);
|
await InsertFailedExportLog(socket, error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -140,24 +137,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
|
|||||||
// Was Successful
|
// Was Successful
|
||||||
async function CheckForErrors(socket, response) {
|
async function CheckForErrors(socket, response) {
|
||||||
if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
|
if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
|
CdkBase.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.CheckForErrors = CheckForErrors;
|
exports.CheckForErrors = CheckForErrors;
|
||||||
|
|
||||||
async function QueryJobData(socket, jobid) {
|
async function QueryJobData(socket, jobid) {
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
|
CdkBase.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
|
.request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
|
||||||
|
CdkBase.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
||||||
//WsLogger.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
|
||||||
return result.jobs_by_pk;
|
return result.jobs_by_pk;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,7 +191,7 @@ async function QueryVehicleFromDms(socket) {
|
|||||||
CheckForErrors(socket, VehicleGetResponse);
|
CheckForErrors(socket, VehicleGetResponse);
|
||||||
return VehicleGetResponse;
|
return VehicleGetResponse;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryVehicleFromDms - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryVehicleFromDms - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -225,9 +220,9 @@ async function QueryCustomersFromDms(socket) {
|
|||||||
{ auth: PBS_CREDENTIALS, socket }
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
);
|
);
|
||||||
CheckForErrors(socket, CustomerGetResponse);
|
CheckForErrors(socket, CustomerGetResponse);
|
||||||
return CustomerGetResponse?.Contacts;
|
return CustomerGetResponse && CustomerGetResponse.Contacts;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -258,9 +253,9 @@ async function QueryCustomerBycodeFromDms(socket, CustomerRef) {
|
|||||||
{ auth: PBS_CREDENTIALS, socket }
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
);
|
);
|
||||||
CheckForErrors(socket, CustomerGetResponse);
|
CheckForErrors(socket, CustomerGetResponse);
|
||||||
return CustomerGetResponse?.Contacts;
|
return CustomerGetResponse && CustomerGetResponse.Contacts;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -277,15 +272,15 @@ async function UpsertContactData(socket, selectedCustomerId) {
|
|||||||
Code: socket.JobData.owner.accountingid,
|
Code: socket.JobData.owner.accountingid,
|
||||||
...(socket.JobData.ownr_co_nm
|
...(socket.JobData.ownr_co_nm
|
||||||
? {
|
? {
|
||||||
//LastName: socket.JobData.ownr_ln,
|
//LastName: socket.JobData.ownr_ln,
|
||||||
FirstName: socket.JobData.ownr_co_nm,
|
FirstName: socket.JobData.ownr_co_nm,
|
||||||
IsBusiness: true
|
IsBusiness: true
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
LastName: socket.JobData.ownr_ln,
|
LastName: socket.JobData.ownr_ln,
|
||||||
FirstName: socket.JobData.ownr_fn,
|
FirstName: socket.JobData.ownr_fn,
|
||||||
IsBusiness: false
|
IsBusiness: false
|
||||||
}),
|
}),
|
||||||
|
|
||||||
//Salutation: "String",
|
//Salutation: "String",
|
||||||
//MiddleName: "String",
|
//MiddleName: "String",
|
||||||
@@ -342,7 +337,7 @@ async function UpsertContactData(socket, selectedCustomerId) {
|
|||||||
CheckForErrors(socket, ContactChangeResponse);
|
CheckForErrors(socket, ContactChangeResponse);
|
||||||
return ContactChangeResponse;
|
return ContactChangeResponse;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in UpsertContactData - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertContactData - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -362,10 +357,10 @@ async function UpsertVehicleData(socket, ownerRef) {
|
|||||||
//FleetNumber: "String",
|
//FleetNumber: "String",
|
||||||
//Status: "String",
|
//Status: "String",
|
||||||
OwnerRef: ownerRef, // "00000000000000000000000000000000",
|
OwnerRef: ownerRef, // "00000000000000000000000000000000",
|
||||||
// ModelNumber: socket.JobData.vehicle?.v_makecode,
|
// ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
|
||||||
Make: socket.JobData.v_make_desc,
|
Make: socket.JobData.v_make_desc,
|
||||||
Model: socket.JobData.v_model_desc,
|
Model: socket.JobData.v_model_desc,
|
||||||
Trim: socket.JobData.vehicle?.v_trimcode,
|
Trim: socket.JobData.vehicle && socket.JobData.vehicle.v_trimcode,
|
||||||
//VehicleType: "String",
|
//VehicleType: "String",
|
||||||
Year: socket.JobData.v_model_yr,
|
Year: socket.JobData.v_model_yr,
|
||||||
Odometer: socket.JobData.kmout,
|
Odometer: socket.JobData.kmout,
|
||||||
@@ -495,16 +490,14 @@ async function UpsertVehicleData(socket, ownerRef) {
|
|||||||
CheckForErrors(socket, VehicleChangeResponse);
|
CheckForErrors(socket, VehicleChangeResponse);
|
||||||
return VehicleChangeResponse;
|
return VehicleChangeResponse;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function GetVehicleData(socket, ownerRef) {
|
async function GetVehicleData(socket, ownerRef) {
|
||||||
try {
|
try {
|
||||||
const {
|
const { data: { Vehicles } } = await axios.post(
|
||||||
data: { Vehicles }
|
|
||||||
} = await axios.post(
|
|
||||||
PBS_ENDPOINTS.VehicleGet,
|
PBS_ENDPOINTS.VehicleGet,
|
||||||
{
|
{
|
||||||
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
||||||
@@ -517,7 +510,7 @@ async function GetVehicleData(socket, ownerRef) {
|
|||||||
// "Trim": "String",
|
// "Trim": "String",
|
||||||
// "ModelNumber": "String",
|
// "ModelNumber": "String",
|
||||||
// "StockNumber": "String",
|
// "StockNumber": "String",
|
||||||
VIN: socket.JobData.v_vin
|
VIN: socket.JobData.v_vin,
|
||||||
// "LicenseNumber": "String",
|
// "LicenseNumber": "String",
|
||||||
// "Lot": "String",
|
// "Lot": "String",
|
||||||
// "Status": "String",
|
// "Status": "String",
|
||||||
@@ -535,21 +528,24 @@ async function GetVehicleData(socket, ownerRef) {
|
|||||||
// "LotAccessDivisions": [0],
|
// "LotAccessDivisions": [0],
|
||||||
// "OdometerTo": 0,
|
// "OdometerTo": 0,
|
||||||
// "OdometerFrom": 0
|
// "OdometerFrom": 0
|
||||||
},
|
}
|
||||||
|
,
|
||||||
{ auth: PBS_CREDENTIALS, socket }
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
);
|
);
|
||||||
CheckForErrors(socket, Vehicles);
|
CheckForErrors(socket, Vehicles);
|
||||||
if (Vehicles.length === 1) {
|
if (Vehicles.length === 1) {
|
||||||
return Vehicles[0];
|
return Vehicles[0];
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async function InsertAccountPostingData(socket) {
|
async function InsertAccountPostingData(socket) {
|
||||||
try {
|
try {
|
||||||
const allocations = await CalculateAllocations(socket, socket.JobData.id);
|
const allocations = await CalculateAllocations(socket, socket.JobData.id);
|
||||||
@@ -633,8 +629,7 @@ async function InsertAccountPostingData(socket) {
|
|||||||
Posting: {
|
Posting: {
|
||||||
Reference: socket.JobData.ro_number,
|
Reference: socket.JobData.ro_number,
|
||||||
JournalCode: socket.txEnvelope.journal,
|
JournalCode: socket.txEnvelope.journal,
|
||||||
//Sample TransactionDate: "0001-01-01T00:00:00.0000000Z",
|
TransactionDate: moment(socket.JobData.date_invoiced).tz(socket.JobData.bodyshop.timezone).toISOString(), //"0001-01-01T00:00:00.0000000Z",
|
||||||
TransactionDate: moment(socket.JobData.date_invoiced).tz(socket.JobData.bodyshop.timezone).toISOString(),
|
|
||||||
Description: socket.txEnvelope.story,
|
Description: socket.txEnvelope.story,
|
||||||
//AdditionalInfo: "String",
|
//AdditionalInfo: "String",
|
||||||
Source: InstanceManager({ imex: "ImEX Online", rome: "Rome Online" }),
|
Source: InstanceManager({ imex: "ImEX Online", rome: "Rome Online" }),
|
||||||
@@ -647,15 +642,14 @@ async function InsertAccountPostingData(socket) {
|
|||||||
CheckForErrors(socket, AccountPostingChange);
|
CheckForErrors(socket, AccountPostingChange);
|
||||||
return AccountPostingChange;
|
return AccountPostingChange;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertAccountPostingData - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertAccountPostingData - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function MarkJobExported(socket, jobid) {
|
async function MarkJobExported(socket, jobid) {
|
||||||
WsLogger.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
|
CdkBase.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.MARK_JOB_EXPORTED, {
|
.request(queries.MARK_JOB_EXPORTED, {
|
||||||
@@ -683,52 +677,47 @@ async function MarkJobExported(socket, jobid) {
|
|||||||
async function InsertFailedExportLog(socket, error) {
|
async function InsertFailedExportLog(socket, error) {
|
||||||
try {
|
try {
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.INSERT_EXPORT_LOG, {
|
.request(queries.INSERT_EXPORT_LOG, {
|
||||||
logs: [{
|
log: {
|
||||||
bodyshopid: socket.JobData.bodyshop.id,
|
bodyshopid: socket.JobData.bodyshop.id,
|
||||||
jobid: socket.JobData.id,
|
jobid: socket.JobData.id,
|
||||||
successful: false,
|
successful: false,
|
||||||
message: JSON.stringify(error),
|
message: JSON.stringify(error),
|
||||||
useremail: socket.user.email
|
useremail: socket.user.email
|
||||||
}]
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
} catch (error2) {
|
} catch (error2) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async function CreateRepairOrderInPBS(socket) {
|
async function CreateRepairOrderInPBS(socket) {
|
||||||
try {
|
try {
|
||||||
const { RepairOrders } = await RepairOrderGet(socket);
|
const { RepairOrders } = await RepairOrderGet(socket);
|
||||||
if (RepairOrders.length === 0) {
|
if (RepairOrders.length === 0) {
|
||||||
const InsertedRepairOrder = await RepairOrderChange(socket);
|
const InsertedRepairOrder = await RepairOrderChange(socket)
|
||||||
socket.InsertedRepairOrder = InsertedRepairOrder;
|
socket.InsertedRepairOrder = InsertedRepairOrder;
|
||||||
WsLogger.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
|
CdkBase.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
|
||||||
|
|
||||||
} else if (RepairOrders.length > 0) {
|
} else if (RepairOrders.length > 0) {
|
||||||
//Find out if it's a matching RO.
|
//Find out if it's a matching RO.
|
||||||
//This logic is used because the integration will simply add another line to an open RO if it exists.
|
//This logic is used because the integration will simply add another line to an open RO if it exists.
|
||||||
const matchingRo = RepairOrders.find((ro) =>
|
const matchingRo = RepairOrders.find(ro => ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase()))
|
||||||
ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase())
|
|
||||||
);
|
|
||||||
if (!matchingRo) {
|
if (!matchingRo) {
|
||||||
WsLogger.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
|
CdkBase.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
|
||||||
const InsertedRepairOrder = await RepairOrderChange(socket);
|
const InsertedRepairOrder = await RepairOrderChange(socket)
|
||||||
socket.InsertedRepairOrder = InsertedRepairOrder;
|
socket.InsertedRepairOrder = InsertedRepairOrder;
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(socket, "WARN", `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`);
|
||||||
socket,
|
|
||||||
"WARN",
|
|
||||||
`Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -744,7 +733,7 @@ async function RepairOrderGet(socket) {
|
|||||||
// "Tag": "String",
|
// "Tag": "String",
|
||||||
//"ContactRef": socket.contactRef,
|
//"ContactRef": socket.contactRef,
|
||||||
// "ContactRefList": ["00000000000000000000000000000000"],
|
// "ContactRefList": ["00000000000000000000000000000000"],
|
||||||
VehicleRef: socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId
|
"VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
|
||||||
// "VehicleRefList": ["00000000000000000000000000000000"],
|
// "VehicleRefList": ["00000000000000000000000000000000"],
|
||||||
// "Status": "String",
|
// "Status": "String",
|
||||||
// "CashieredSince": "0001-01-01T00:00:00.0000000Z",
|
// "CashieredSince": "0001-01-01T00:00:00.0000000Z",
|
||||||
@@ -760,7 +749,7 @@ async function RepairOrderGet(socket) {
|
|||||||
CheckForErrors(socket, RepairOrderGet);
|
CheckForErrors(socket, RepairOrderGet);
|
||||||
return RepairOrderGet;
|
return RepairOrderGet;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -769,32 +758,31 @@ async function RepairOrderChange(socket) {
|
|||||||
try {
|
try {
|
||||||
const { data: RepairOrderChangeResponse } = await axios.post(
|
const { data: RepairOrderChangeResponse } = await axios.post(
|
||||||
PBS_ENDPOINTS.RepairOrderChange,
|
PBS_ENDPOINTS.RepairOrderChange,
|
||||||
{
|
{ //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
|
||||||
//Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
|
"RepairOrderInfo": {
|
||||||
RepairOrderInfo: {
|
|
||||||
//"Id": "string/00000000-0000-0000-0000-000000000000",
|
//"Id": "string/00000000-0000-0000-0000-000000000000",
|
||||||
//"RepairOrderId": "00000000000000000000000000000000",
|
//"RepairOrderId": "00000000000000000000000000000000",
|
||||||
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
||||||
RepairOrderNumber: "00000000000000000000000000000000", //This helps force a new RO.
|
"RepairOrderNumber": "00000000000000000000000000000000", //This helps force a new RO.
|
||||||
RawRepairOrderNumber: "00000000000000000000000000000000",
|
"RawRepairOrderNumber": "00000000000000000000000000000000",
|
||||||
// "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
|
// "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
|
||||||
// "RawRepairOrderNumber": socket.JobData.ro_number,
|
// "RawRepairOrderNumber": socket.JobData.ro_number,
|
||||||
DateOpened: moment(),
|
"DateOpened": moment(),
|
||||||
// "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
|
// "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
|
||||||
// "DateCashiered": "0001-01-01T00:00:00.0000000Z",
|
// "DateCashiered": "0001-01-01T00:00:00.0000000Z",
|
||||||
// "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
|
// "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
|
||||||
DatePromised: socket.JobData.scheduled_completion,
|
"DatePromised": socket.JobData.scheduled_completion,
|
||||||
// "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
|
// "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
|
||||||
DateVehicleCompleted: socket.JobData.actual_completion,
|
"DateVehicleCompleted": socket.JobData.actual_completion,
|
||||||
// "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
|
// "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
|
||||||
// "CSR": "String",
|
// "CSR": "String",
|
||||||
// "CSRRef": "00000000000000000000000000000000",
|
// "CSRRef": "00000000000000000000000000000000",
|
||||||
// "BookingUser": "String",
|
// "BookingUser": "String",
|
||||||
// "BookingUserRef": "00000000000000000000000000000000",
|
// "BookingUserRef": "00000000000000000000000000000000",
|
||||||
ContactRef: socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
|
"ContactRef": socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
|
||||||
VehicleRef: socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
|
"VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
|
||||||
MileageIn: socket.JobData.km_in,
|
"MileageIn": socket.JobData.km_in,
|
||||||
Tag: "BODYSHOP",
|
"Tag": "BODYSHOP",
|
||||||
//"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
|
//"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
|
||||||
Requests: [
|
Requests: [
|
||||||
{
|
{
|
||||||
@@ -803,59 +791,61 @@ async function RepairOrderChange(socket) {
|
|||||||
// "CSR": "PBS",
|
// "CSR": "PBS",
|
||||||
// "CSRRef": "1ce12ac692564e94bda955d529ee911a",
|
// "CSRRef": "1ce12ac692564e94bda955d529ee911a",
|
||||||
// "Skill": "GEN",
|
// "Skill": "GEN",
|
||||||
RequestCode: "MISC",
|
"RequestCode": "MISC",
|
||||||
RequestDescription: `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
|
"RequestDescription": `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
|
||||||
Status: "Completed",
|
"Status": "Completed",
|
||||||
// "TechRef": "00000000000000000000000000000000",
|
// "TechRef": "00000000000000000000000000000000",
|
||||||
AllowedHours: 0,
|
"AllowedHours": 0,
|
||||||
EstimateLabour: 0,
|
"EstimateLabour": 0,
|
||||||
EstimateParts: 0,
|
"EstimateParts": 0,
|
||||||
ComeBack: false,
|
"ComeBack": false,
|
||||||
AddedOperation: true,
|
"AddedOperation": true,
|
||||||
PartLines: [],
|
"PartLines": [],
|
||||||
PartRequestLines: [],
|
"PartRequestLines": [],
|
||||||
LabourLines: [],
|
"LabourLines": [],
|
||||||
SubletLines: [],
|
"SubletLines": [],
|
||||||
TimePunches: [],
|
"TimePunches": [],
|
||||||
Summary: {
|
"Summary": {
|
||||||
Labour: 0,
|
"Labour": 0,
|
||||||
Parts: 0,
|
"Parts": 0,
|
||||||
OilGas: 0,
|
"OilGas": 0,
|
||||||
SubletTow: 0,
|
"SubletTow": 0,
|
||||||
Misc: 0,
|
"Misc": 0,
|
||||||
Environment: 0,
|
"Environment": 0,
|
||||||
ShopSupplies: 0,
|
"ShopSupplies": 0,
|
||||||
Freight: 0,
|
"Freight": 0,
|
||||||
WarrantyDeductible: 0,
|
"WarrantyDeductible": 0,
|
||||||
Discount: 0,
|
"Discount": 0,
|
||||||
SubTotal: 0,
|
"SubTotal": 0,
|
||||||
Tax1: 0,
|
"Tax1": 0,
|
||||||
Tax2: 0,
|
"Tax2": 0,
|
||||||
InvoiceTotal: 0,
|
"InvoiceTotal": 0,
|
||||||
CustomerDeductible: 0,
|
"CustomerDeductible": 0,
|
||||||
GrandTotal: 0,
|
"GrandTotal": 0,
|
||||||
LabourDiscount: 0,
|
"LabourDiscount": 0,
|
||||||
PartDiscount: 0,
|
"PartDiscount": 0,
|
||||||
ServiceFeeTotal: 0,
|
"ServiceFeeTotal": 0,
|
||||||
OEMDiscount: 0
|
"OEMDiscount": 0
|
||||||
},
|
},
|
||||||
LineType: "RequestLine"
|
"LineType": "RequestLine",
|
||||||
}
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
Memo: socket.txEnvelope.story
|
"Memo": socket.txEnvelope.story,
|
||||||
|
|
||||||
},
|
},
|
||||||
IsAsynchronous: false
|
"IsAsynchronous": false,
|
||||||
// "UserRequest": "String",
|
// "UserRequest": "String",
|
||||||
// "UserRef": "00000000000000000000000000000000"
|
// "UserRef": "00000000000000000000000000000000"
|
||||||
},
|
}
|
||||||
|
|
||||||
|
,
|
||||||
{ auth: PBS_CREDENTIALS, socket }
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
);
|
);
|
||||||
CheckForErrors(socket, RepairOrderChangeResponse);
|
CheckForErrors(socket, RepairOrderChangeResponse);
|
||||||
return RepairOrderChangeResponse;
|
return RepairOrderChangeResponse;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
const GraphQLClient = require("graphql-request").GraphQLClient;
|
const GraphQLClient = require("graphql-request").GraphQLClient;
|
||||||
|
|
||||||
const queries = require("../graphql-client/queries");
|
const queries = require("../graphql-client/queries");
|
||||||
const CreateFortellisLogEvent = require("../fortellis/fortellis-logger");
|
const CdkBase = require("../web-sockets/web-socket");
|
||||||
|
|
||||||
const Dinero = require("dinero.js");
|
const Dinero = require("dinero.js");
|
||||||
const _ = require("lodash");
|
const _ = require("lodash");
|
||||||
const WsLogger = require("../web-sockets/createLogEvent");
|
|
||||||
|
|
||||||
const InstanceManager = require("../utils/instanceMgr").default;
|
const InstanceManager = require("../utils/instanceMgr").default;
|
||||||
const { DiscountNotAlreadyCounted } = InstanceManager({
|
const { DiscountNotAlreadyCounted } = InstanceManager({
|
||||||
imex: require("../job/job-totals"),
|
imex: require("../job/job-totals"),
|
||||||
@@ -14,40 +13,37 @@ const { DiscountNotAlreadyCounted } = InstanceManager({
|
|||||||
|
|
||||||
exports.defaultRoute = async function (req, res) {
|
exports.defaultRoute = async function (req, res) {
|
||||||
try {
|
try {
|
||||||
WsLogger.createLogEvent(req, "DEBUG", `Received request to calculate allocations for ${req.body.jobid}`);
|
CdkBase.createLogEvent(req, "DEBUG", `Received request to calculate allocations for ${req.body.jobid}`);
|
||||||
const jobData = await QueryJobData(req, req.BearerToken, req.body.jobid);
|
const jobData = await QueryJobData(req, req.BearerToken, req.body.jobid);
|
||||||
return res.status(200).json({ data: calculateAllocations(req, jobData) });
|
return res.status(200).json({ data: calculateAllocations(req, jobData) });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
|
////console.log(error);
|
||||||
WsLogger.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error.stack}`);
|
CdkBase.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
|
||||||
res.status(500).json({ error: `Error encountered in CdkCalculateAllocations. ${error}` });
|
res.status(500).json({ error: `Error encountered in CdkCalculateAllocations. ${error}` });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.default = async function (socket, jobid, isFortellis = false) {
|
exports.default = async function (socket, jobid) {
|
||||||
try {
|
try {
|
||||||
const jobData = await QueryJobData(socket, "Bearer " + socket.handshake.auth.token, jobid, isFortellis);
|
const jobData = await QueryJobData(socket, "Bearer " + socket.handshake.auth.token, jobid);
|
||||||
return calculateAllocations(socket, jobData, isFortellis);
|
return calculateAllocations(socket, jobData);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const loggingFunction = isFortellis ? CreateFortellisLogEvent : WsLogger.createLogEvent;
|
////console.log(error);
|
||||||
loggingFunction(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
|
||||||
loggingFunction(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error.stack}`);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
async function QueryJobData(connectionData, token, jobid, isFortellis) {
|
async function QueryJobData(connectionData, token, jobid) {
|
||||||
const loggingFunction = isFortellis ? CreateFortellisLogEvent : WsLogger.createLogEvent;
|
CdkBase.createLogEvent(connectionData, "DEBUG", `Querying job data for id ${jobid}`);
|
||||||
|
|
||||||
loggingFunction(connectionData, "DEBUG", `Querying job data for id ${jobid}`);
|
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
const result = await client.setHeaders({ Authorization: token }).request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
|
const result = await client.setHeaders({ Authorization: token }).request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
|
||||||
//loggingFunction(connectionData, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
CdkBase.createLogEvent(connectionData, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
||||||
return result.jobs_by_pk;
|
return result.jobs_by_pk;
|
||||||
}
|
}
|
||||||
|
|
||||||
function calculateAllocations(connectionData, job, isFortellis) {
|
function calculateAllocations(connectionData, job) {
|
||||||
const { bodyshop } = job;
|
const { bodyshop } = job;
|
||||||
const loggingFunction = isFortellis ? CreateFortellisLogEvent : WsLogger.createLogEvent;
|
|
||||||
const taxAllocations = InstanceManager({
|
const taxAllocations = InstanceManager({
|
||||||
executeFunction: true,
|
executeFunction: true,
|
||||||
deubg: true,
|
deubg: true,
|
||||||
@@ -163,7 +159,7 @@ function calculateAllocations(connectionData, job, isFortellis) {
|
|||||||
const selectedDmsAllocationConfig = bodyshop.md_responsibility_centers.dms_defaults.find(
|
const selectedDmsAllocationConfig = bodyshop.md_responsibility_centers.dms_defaults.find(
|
||||||
(d) => d.name === job.dms_allocation
|
(d) => d.name === job.dms_allocation
|
||||||
);
|
);
|
||||||
loggingFunction(
|
CdkBase.createLogEvent(
|
||||||
connectionData,
|
connectionData,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`Using DMS Allocation ${selectedDmsAllocationConfig && selectedDmsAllocationConfig.name} for cost export.`
|
`Using DMS Allocation ${selectedDmsAllocationConfig && selectedDmsAllocationConfig.name} for cost export.`
|
||||||
@@ -364,10 +360,10 @@ function calculateAllocations(connectionData, job, isFortellis) {
|
|||||||
Dinero(job.job_totals.parts.adjustments[key])
|
Dinero(job.job_totals.parts.adjustments[key])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
loggingFunction(
|
CdkBase.createLogEvent(
|
||||||
connectionData,
|
connectionData,
|
||||||
"ERROR",
|
"ERROR",
|
||||||
`Error encountered in CdkCalculateAllocations. Unable to find adjustment account: ${accountName}`
|
`Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -387,10 +383,10 @@ function calculateAllocations(connectionData, job, isFortellis) {
|
|||||||
Dinero(job.job_totals.rates[key].adjustments)
|
Dinero(job.job_totals.rates[key].adjustments)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
loggingFunction(
|
CdkBase.createLogEvent(
|
||||||
connectionData,
|
connectionData,
|
||||||
"ERROR",
|
"ERROR",
|
||||||
`Error encountered in CdkCalculateAllocations. Unable to find adjustment account: ${accountName}`
|
`Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,12 +5,6 @@ const CdkWsdl = require("./cdk-wsdl").default;
|
|||||||
const logger = require("../utils/logger");
|
const logger = require("../utils/logger");
|
||||||
|
|
||||||
const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
|
const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
|
||||||
const {
|
|
||||||
MakeFortellisCall,
|
|
||||||
FortellisActions,
|
|
||||||
GetAuthToken,
|
|
||||||
GetDepartmentId
|
|
||||||
} = require("../fortellis/fortellis-helpers");
|
|
||||||
|
|
||||||
// exports.default = async function (socket, cdk_dealerid) {
|
// exports.default = async function (socket, cdk_dealerid) {
|
||||||
// try {
|
// try {
|
||||||
@@ -111,85 +105,3 @@ async function GetCdkMakes(req, cdk_dealerid) {
|
|||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function GetFortellisMakes(req, cdk_dealerid) {
|
|
||||||
logger.log("fortellis-replace-makes-models", "DEBUG", req.user.email, null, {
|
|
||||||
cdk_dealerid
|
|
||||||
});
|
|
||||||
try {
|
|
||||||
const result = await MakeFortellisCall({
|
|
||||||
...FortellisActions.GetMakeModel,
|
|
||||||
headers: {},
|
|
||||||
redisHelpers: {
|
|
||||||
setSessionTransactionData: () => {
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
getSessionTransactionData: () => {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
socket: { emit: () => null },
|
|
||||||
jobid: null,
|
|
||||||
body: {},
|
|
||||||
SubscriptionObject: {
|
|
||||||
SubscriptionID: cdk_dealerid
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.log("fortellis-replace-makes-models-response", "ERROR", req.user.email, null, {
|
|
||||||
cdk_dealerid,
|
|
||||||
xml: result
|
|
||||||
});
|
|
||||||
return result.data;
|
|
||||||
} catch (error) {
|
|
||||||
logger.log("fortellis-replace-makes-models-error", "ERROR", req.user.email, null, {
|
|
||||||
cdk_dealerid,
|
|
||||||
error
|
|
||||||
});
|
|
||||||
|
|
||||||
throw new Error(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
exports.fortellis = async function ReloadFortellisMakes(req, res) {
|
|
||||||
const { bodyshopid, cdk_dealerid } = req.body;
|
|
||||||
try {
|
|
||||||
//Query all CDK Models
|
|
||||||
const newList = await GetFortellisMakes(req, cdk_dealerid);
|
|
||||||
|
|
||||||
const BearerToken = req.BearerToken;
|
|
||||||
const client = req.userGraphQLClient;
|
|
||||||
|
|
||||||
const deleteResult = await client
|
|
||||||
.setHeaders({ Authorization: BearerToken })
|
|
||||||
.request(queries.DELETE_ALL_DMS_VEHICLES, {});
|
|
||||||
|
|
||||||
//Insert the new ones.
|
|
||||||
|
|
||||||
const insertResult = await client.setHeaders({ Authorization: BearerToken }).request(queries.INSERT_DMS_VEHICLES, {
|
|
||||||
vehicles: newList.map((i) => {
|
|
||||||
return {
|
|
||||||
bodyshopid,
|
|
||||||
makecode: i.makeCode,
|
|
||||||
modelcode: i.modelCode,
|
|
||||||
make: i.makeFullName,
|
|
||||||
model: i.modelFullName
|
|
||||||
};
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.log("fortellis-replace-makes-models-success", "DEBUG", req.user.email, null, {
|
|
||||||
cdk_dealerid,
|
|
||||||
count: newList.length
|
|
||||||
});
|
|
||||||
|
|
||||||
res.sendStatus(200);
|
|
||||||
} catch (error) {
|
|
||||||
logger.log("fortellis-replace-makes-models-error", "ERROR", req.user.email, null, {
|
|
||||||
cdk_dealerid,
|
|
||||||
error: error.message,
|
|
||||||
stack: error.stack
|
|
||||||
});
|
|
||||||
res.status(500).json(error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -1,36 +1,33 @@
|
|||||||
const GraphQLClient = require("graphql-request").GraphQLClient;
|
const GraphQLClient = require("graphql-request").GraphQLClient;
|
||||||
const soap = require("soap");
|
const soap = require("soap");
|
||||||
const queries = require("../graphql-client/queries");
|
const queries = require("../graphql-client/queries");
|
||||||
|
const CdkBase = require("../web-sockets/web-socket");
|
||||||
const CdkWsdl = require("./cdk-wsdl").default;
|
const CdkWsdl = require("./cdk-wsdl").default;
|
||||||
const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
|
const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
|
||||||
const CalcualteAllocations = require("./cdk-calculate-allocations").default;
|
const CalcualteAllocations = require("./cdk-calculate-allocations").default;
|
||||||
const InstanceMgr = require("../utils/instanceMgr").default;
|
const InstanceMgr = require("../utils/instanceMgr").default;
|
||||||
const WsLogger = require("../web-sockets/createLogEvent");
|
|
||||||
|
|
||||||
const moment = require("moment-timezone");
|
const moment = require("moment-timezone");
|
||||||
|
|
||||||
const replaceSpecialRegex = /[^a-zA-Z0-9 .,\n #]+/g;
|
const replaceSpecialRegex = /[^a-zA-Z0-9 .,\n #]+/g;
|
||||||
|
|
||||||
const defaultHandler = async (socket, { txEnvelope, jobid }) => {
|
exports.default = async function (socket, { txEnvelope, jobid }) {
|
||||||
////Store the following information into the redis store for this transaction.
|
|
||||||
socket.logEvents = [];
|
socket.logEvents = [];
|
||||||
socket.recordid = jobid;
|
socket.recordid = jobid;
|
||||||
socket.txEnvelope = txEnvelope;
|
socket.txEnvelope = txEnvelope;
|
||||||
////
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);
|
||||||
|
|
||||||
const JobData = await QueryJobData(socket, jobid);
|
const JobData = await QueryJobData(socket, jobid);
|
||||||
socket.JobData = JobData;
|
socket.JobData = JobData;
|
||||||
const DealerId = JobData.bodyshop.cdk_dealerid;
|
const DealerId = JobData.bodyshop.cdk_dealerid;
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Dealer ID detected: ${JSON.stringify(DealerId)}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Dealer ID detected: ${JSON.stringify(DealerId)}`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{1} Begin Calculate DMS Vehicle ID using VIN: ${JobData.v_vin}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{1} Begin Calculate DMS Vehicle ID using VIN: ${JobData.v_vin}`);
|
||||||
socket.DMSVid = await CalculateDmsVid(socket, JobData);
|
socket.DMSVid = await CalculateDmsVid(socket, JobData);
|
||||||
|
|
||||||
if (socket.DMSVid.newId === "N") {
|
if (socket.DMSVid.newId === "N") {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`{2.1} Querying the Vehicle using the DMSVid: ${socket.DMSVid.vehiclesVehId}`
|
`{2.1} Querying the Vehicle using the DMSVid: ${socket.DMSVid.vehiclesVehId}`
|
||||||
@@ -38,10 +35,10 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
|
|||||||
socket.DMSVeh = await QueryDmsVehicleById(socket, JobData, socket.DMSVid);
|
socket.DMSVeh = await QueryDmsVehicleById(socket, JobData, socket.DMSVid);
|
||||||
|
|
||||||
const DMSVehCustomer =
|
const DMSVehCustomer =
|
||||||
socket.DMSVeh?.owners && socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
|
socket.DMSVeh && socket.DMSVeh.owners && socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
|
||||||
|
|
||||||
if (DMSVehCustomer?.id && DMSVehCustomer.id.value) {
|
if (DMSVehCustomer && DMSVehCustomer.id && DMSVehCustomer.id.value) {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`{2.2} Querying the Customer using the ID from DMSVeh: ${DMSVehCustomer.id.value}`
|
`{2.2} Querying the Customer using the ID from DMSVeh: ${DMSVehCustomer.id.value}`
|
||||||
@@ -50,7 +47,7 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{2.3} Querying the Customer using the name.`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{2.3} Querying the Customer using the name.`);
|
||||||
|
|
||||||
socket.DMSCustList = await QueryDmsCustomerByName(socket, JobData);
|
socket.DMSCustList = await QueryDmsCustomerByName(socket, JobData);
|
||||||
|
|
||||||
@@ -59,48 +56,43 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
|
|||||||
...socket.DMSCustList
|
...socket.DMSCustList
|
||||||
]);
|
]);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error encountered in CdkJobExport. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkJobExport. ${error}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
exports.default = defaultHandler;
|
|
||||||
|
|
||||||
async function CdkSelectedCustomer(socket, selectedCustomerId) {
|
async function CdkSelectedCustomer(socket, selectedCustomerId) {
|
||||||
try {
|
try {
|
||||||
socket.selectedCustomerId = selectedCustomerId;
|
socket.selectedCustomerId = selectedCustomerId;
|
||||||
if (selectedCustomerId) {
|
if (selectedCustomerId) {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
|
||||||
socket.DMSCust = await QueryDmsCustomerById(socket, socket.JobData, selectedCustomerId);
|
socket.DMSCust = await QueryDmsCustomerById(socket, socket.JobData, selectedCustomerId);
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{3.2} Generating a new customer ID.`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{3.2} Generating a new customer ID.`);
|
||||||
const newCustomerId = await GenerateDmsCustomerNumber(socket);
|
const newCustomerId = await GenerateDmsCustomerNumber(socket);
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{3.3} Inserting new customer with ID: ${newCustomerId}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{3.3} Inserting new customer with ID: ${newCustomerId}`);
|
||||||
socket.DMSCust = await InsertDmsCustomer(socket, newCustomerId);
|
socket.DMSCust = await InsertDmsCustomer(socket, newCustomerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (socket.DMSVid.newId === "Y") {
|
if (socket.DMSVid.newId === "Y") {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(socket, "DEBUG", `{4.1} Inserting new vehicle with ID: ID ${socket.DMSVid.vehiclesVehId}`);
|
||||||
socket,
|
|
||||||
"DEBUG",
|
|
||||||
`{4.1} Inserting new vehicle with ID: ID ${socket.DMSVid.vehiclesVehId}`
|
|
||||||
);
|
|
||||||
socket.DMSVeh = await InsertDmsVehicle(socket);
|
socket.DMSVeh = await InsertDmsVehicle(socket);
|
||||||
} else {
|
} else {
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`{4.2} Querying Existing Vehicle using ID ${socket.DMSVid.vehiclesVehId}`
|
`{4.2} Querying Existing Vehicle using ID ${socket.DMSVid.vehiclesVehId}`
|
||||||
);
|
);
|
||||||
socket.DMSVeh = await QueryDmsVehicleById(socket, socket.JobData, socket.DMSVid);
|
socket.DMSVeh = await QueryDmsVehicleById(socket, socket.JobData, socket.DMSVid);
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{4.3} Updating Existing Vehicle to associate to owner.`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{4.3} Updating Existing Vehicle to associate to owner.`);
|
||||||
socket.DMSVeh = await UpdateDmsVehicle(socket);
|
socket.DMSVeh = await UpdateDmsVehicle(socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{5} Creating Transaction header with Dms Start WIP`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{5} Creating Transaction header with Dms Start WIP`);
|
||||||
socket.DMSTransHeader = await InsertDmsStartWip(socket);
|
socket.DMSTransHeader = await InsertDmsStartWip(socket);
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{5.1} Creating Transaction with ID ${socket.DMSTransHeader.transID}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{5.1} Creating Transaction with ID ${socket.DMSTransHeader.transID}`);
|
||||||
|
|
||||||
socket.DMSBatchTxn = await InsertDmsBatchWip(socket);
|
socket.DMSBatchTxn = await InsertDmsBatchWip(socket);
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`{6} Attempting to post Transaction with ID ${socket.DMSTransHeader.transID}`
|
`{6} Attempting to post Transaction with ID ${socket.DMSTransHeader.transID}`
|
||||||
@@ -108,23 +100,23 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
|
|||||||
socket.DmsBatchTxnPost = await PostDmsBatchWip(socket);
|
socket.DmsBatchTxnPost = await PostDmsBatchWip(socket);
|
||||||
if (socket.DmsBatchTxnPost.code === "success") {
|
if (socket.DmsBatchTxnPost.code === "success") {
|
||||||
//something
|
//something
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{6} Successfully posted sransaction to DMS.`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{6} Successfully posted sransaction to DMS.`);
|
||||||
|
|
||||||
await MarkJobExported(socket, socket.JobData.id);
|
await MarkJobExported(socket, socket.JobData.id);
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{5} Updating Service Vehicle History.`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{5} Updating Service Vehicle History.`);
|
||||||
socket.DMSVehHistory = await InsertServiceVehicleHistory(socket);
|
socket.DMSVehHistory = await InsertServiceVehicleHistory(socket);
|
||||||
socket.emit("export-success", socket.JobData.id);
|
socket.emit("export-success", socket.JobData.id);
|
||||||
} else {
|
} else {
|
||||||
//Get the error code
|
//Get the error code
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`{6.1} Getting errors for Transaction ID ${socket.DMSTransHeader.transID}`
|
`{6.1} Getting errors for Transaction ID ${socket.DMSTransHeader.transID}`
|
||||||
);
|
);
|
||||||
socket.DmsError = await QueryDmsErrWip(socket);
|
socket.DmsError = await QueryDmsErrWip(socket);
|
||||||
//Delete the transaction
|
//Delete the transaction
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `{6.2} Deleting Transaction ID ${socket.DMSTransHeader.transID}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `{6.2} Deleting Transaction ID ${socket.DMSTransHeader.transID}`);
|
||||||
socket.DmsBatchTxnPost = await DeleteDmsWip(socket);
|
socket.DmsBatchTxnPost = await DeleteDmsWip(socket);
|
||||||
|
|
||||||
socket.DmsError.errMsg
|
socket.DmsError.errMsg
|
||||||
@@ -133,33 +125,29 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
|
|||||||
(e) =>
|
(e) =>
|
||||||
e !== null &&
|
e !== null &&
|
||||||
e !== "" &&
|
e !== "" &&
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error(s) encountered in posting transaction. ${e}`)
|
CdkBase.createLogEvent(socket, "ERROR", `Error(s) encountered in posting transaction. ${e}`)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
|
||||||
await InsertFailedExportLog(socket, error);
|
await InsertFailedExportLog(socket, error);
|
||||||
} finally {
|
} finally {
|
||||||
//Ensure we always insert logEvents
|
//Ensure we always insert logEvents
|
||||||
//GQL to insert logevents.
|
//GQL to insert logevents.
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Capturing log events to database.`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Capturing log events to database.`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.CdkSelectedCustomer = CdkSelectedCustomer;
|
exports.CdkSelectedCustomer = CdkSelectedCustomer;
|
||||||
|
|
||||||
async function QueryJobData(socket, jobid) {
|
async function QueryJobData(socket, jobid) {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
const currentToken =
|
|
||||||
(socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
|
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${currentToken}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.QUERY_JOBS_FOR_CDK_EXPORT, { id: jobid });
|
.request(queries.QUERY_JOBS_FOR_CDK_EXPORT, { id: jobid });
|
||||||
|
CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
||||||
//WsLogger.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
|
||||||
return result.jobs_by_pk;
|
return result.jobs_by_pk;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,11 +161,11 @@ async function CalculateDmsVid(socket, JobData) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.getVehIdsAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.getVehIdsAsync response.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientVehicleInsertUpdate.getVehIdsAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientVehicleInsertUpdate.getVehIdsAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
@@ -190,15 +178,15 @@ async function CalculateDmsVid(socket, JobData) {
|
|||||||
|
|
||||||
//return result && result.return && result.return[0];
|
//return result && result.return && result.return[0];
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createXmlEvent(socket, error.request, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`, true);
|
CdkBase.createXmlEvent(socket, error.request, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`, true);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(
|
CdkBase.createXmlEvent(
|
||||||
socket,
|
socket,
|
||||||
error.response?.data,
|
error.response && error.response.data,
|
||||||
`soapClientVehicleInsertUpdate.getVehIdsAsync response.`,
|
`soapClientVehicleInsertUpdate.getVehIdsAsync response.`,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `{1} Error in CalculateDmsVid - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `{1} Error in CalculateDmsVid - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -218,19 +206,19 @@ async function QueryDmsVehicleById(socket, JobData, DMSVid) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.readAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.readAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientVehicleInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientVehicleInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.readAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.readAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
|
||||||
const VehicleFromDMS = result?.return && result.return.vehicle;
|
const VehicleFromDMS = result && result.return && result.return.vehicle;
|
||||||
return VehicleFromDMS;
|
return VehicleFromDMS;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsVehicleById - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsVehicleById - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -249,23 +237,28 @@ async function QueryDmsCustomerById(socket, JobData, CustomerId) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.readAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.readAsync request.`);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.readAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.readAsync response.`);
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientCustomerInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientCustomerInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
|
||||||
const CustomersFromDms = result?.return && result.return.customerParty;
|
const CustomersFromDms = result && result.return && result.return.customerParty;
|
||||||
return CustomersFromDms;
|
return CustomersFromDms;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.readAsync request.`, true);
|
CdkBase.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.readAsync request.`, true);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, error.response?.data, `soapClientCustomerInsertUpdate.readAsync response.`, true);
|
CdkBase.createXmlEvent(
|
||||||
|
socket,
|
||||||
|
error.response && error.response.data,
|
||||||
|
`soapClientCustomerInsertUpdate.readAsync response.`,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerById - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerById - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -277,7 +270,7 @@ async function QueryDmsCustomerByName(socket, JobData) {
|
|||||||
: `${JobData.ownr_ln},${JobData.ownr_fn}`
|
: `${JobData.ownr_ln},${JobData.ownr_fn}`
|
||||||
).replace(replaceSpecialRegex, "");
|
).replace(replaceSpecialRegex, "");
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Begin Query DMS Customer by Name using: ${ownerName}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Begin Query DMS Customer by Name using: ${ownerName}`);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const soapClientCustomerSearch = await soap.createClientAsync(CdkWsdl.CustomerSearch);
|
const soapClientCustomerSearch = await soap.createClientAsync(CdkWsdl.CustomerSearch);
|
||||||
@@ -292,29 +285,29 @@ async function QueryDmsCustomerByName(socket, JobData) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseCustomerSearch;
|
const [result, rawResponse, , rawRequest] = soapResponseCustomerSearch;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerSearch.executeSearchBulkAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerSearch.executeSearchBulkAsync request.`);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerSearch.executeSearchBulkAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerSearch.executeSearchBulkAsync response.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientCustomerSearch.executeSearchBulkAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientCustomerSearch.executeSearchBulkAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
CheckCdkResponseForError(socket, soapResponseCustomerSearch);
|
CheckCdkResponseForError(socket, soapResponseCustomerSearch);
|
||||||
const CustomersFromDms = result?.return || [];
|
const CustomersFromDms = (result && result.return) || [];
|
||||||
return CustomersFromDms;
|
return CustomersFromDms;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createXmlEvent(socket, error.request, `soapClientCustomerSearch.executeSearchBulkAsync request.`, true);
|
CdkBase.createXmlEvent(socket, error.request, `soapClientCustomerSearch.executeSearchBulkAsync request.`, true);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(
|
CdkBase.createXmlEvent(
|
||||||
socket,
|
socket,
|
||||||
error.response?.data,
|
error.response && error.response.data,
|
||||||
`soapClientCustomerSearch.executeSearchBulkAsync response.`,
|
`soapClientCustomerSearch.executeSearchBulkAsync response.`,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerByName - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerByName - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -325,8 +318,7 @@ async function GenerateDmsCustomerNumber(socket) {
|
|||||||
const soapResponseCustomerInsertUpdate = await soapClientCustomerInsertUpdate.getCustomerNumberAsync(
|
const soapResponseCustomerInsertUpdate = await soapClientCustomerInsertUpdate.getCustomerNumberAsync(
|
||||||
{
|
{
|
||||||
arg0: CDK_CREDENTIALS,
|
arg0: CDK_CREDENTIALS,
|
||||||
//TODO: Verify why this does not follow the other standards.
|
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid }, //TODO: Verify why this does not follow the other standards.
|
||||||
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
|
|
||||||
arg2: { userId: null }
|
arg2: { userId: null }
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -335,33 +327,33 @@ async function GenerateDmsCustomerNumber(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientCustomerInsertUpdate.getCustomerNumberAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientCustomerInsertUpdate.getCustomerNumberAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
|
||||||
const customerNumber = result?.return && result.return.customerNumber;
|
const customerNumber = result && result.return && result.return.customerNumber;
|
||||||
return customerNumber;
|
return customerNumber;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createXmlEvent(
|
CdkBase.createXmlEvent(
|
||||||
socket,
|
socket,
|
||||||
error.request,
|
error.request,
|
||||||
`soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`,
|
`soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(
|
CdkBase.createXmlEvent(
|
||||||
socket,
|
socket,
|
||||||
error.response?.data,
|
error.response && error.response.data,
|
||||||
`soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`,
|
`soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in GenerateDmsCustomerNumber - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in GenerateDmsCustomerNumber - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -424,22 +416,27 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.insertAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.insertAsync request.`);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.insertAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.insertAsync response.`);
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientCustomerInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientCustomerInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
|
||||||
const customer = result?.return && result.return.customerParty;
|
const customer = result && result.return && result.return.customerParty;
|
||||||
return customer;
|
return customer;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.insertAsync request.`, true);
|
CdkBase.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.insertAsync request.`, true);
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, error.response?.data, `soapClientCustomerInsertUpdate.insertAsync response.`, true);
|
CdkBase.createXmlEvent(
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsCustomer - ${error}`);
|
socket,
|
||||||
|
error.response && error.response.data,
|
||||||
|
`soapClientCustomerInsertUpdate.insertAsync response.`,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsCustomer - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -500,19 +497,19 @@ async function InsertDmsVehicle(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.insertAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.insertAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientVehicleInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientVehicleInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.insertAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.insertAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
|
||||||
const VehicleFromDMS = result?.return && result.return.vehicle;
|
const VehicleFromDMS = result && result.return && result.return.vehicle;
|
||||||
return VehicleFromDMS;
|
return VehicleFromDMS;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsVehicle - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsVehicle - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -526,10 +523,12 @@ async function UpdateDmsVehicle(socket) {
|
|||||||
//if it's a generic customer, don't update the vehicle owners.
|
//if it's a generic customer, don't update the vehicle owners.
|
||||||
|
|
||||||
if (socket.selectedCustomerId === socket.JobData.bodyshop.cdk_configuration.generic_customer_number) {
|
if (socket.selectedCustomerId === socket.JobData.bodyshop.cdk_configuration.generic_customer_number) {
|
||||||
ids = socket.DMSVeh?.owners && socket.DMSVeh.owners;
|
ids = socket.DMSVeh && socket.DMSVeh.owners && socket.DMSVeh.owners;
|
||||||
} else {
|
} else {
|
||||||
const existingOwnerinVeh =
|
const existingOwnerinVeh =
|
||||||
socket.DMSVeh?.owners && socket.DMSVeh.owners.find((o) => o.id.value === socket.DMSCust.id.value);
|
socket.DMSVeh &&
|
||||||
|
socket.DMSVeh.owners &&
|
||||||
|
socket.DMSVeh.owners.find((o) => o.id.value === socket.DMSCust.id.value);
|
||||||
|
|
||||||
if (existingOwnerinVeh) {
|
if (existingOwnerinVeh) {
|
||||||
ids = socket.DMSVeh.owners.map((o) => {
|
ids = socket.DMSVeh.owners.map((o) => {
|
||||||
@@ -541,7 +540,10 @@ async function UpdateDmsVehicle(socket) {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const oldOwner = socket.DMSVeh?.owners && socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
|
const oldOwner =
|
||||||
|
socket.DMSVeh &&
|
||||||
|
socket.DMSVeh.owners &&
|
||||||
|
socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
|
||||||
|
|
||||||
ids = [
|
ids = [
|
||||||
{
|
{
|
||||||
@@ -601,19 +603,19 @@ async function UpdateDmsVehicle(socket) {
|
|||||||
});
|
});
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.updateAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.updateAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`soapClientVehicleInsertUpdate.updateAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientVehicleInsertUpdate.updateAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.updateAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.updateAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
|
||||||
const VehicleFromDMS = result?.return && result.return.vehicle;
|
const VehicleFromDMS = result && result.return && result.return.vehicle;
|
||||||
return VehicleFromDMS;
|
return VehicleFromDMS;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in UpdateDmsVehicle - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in UpdateDmsVehicle - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -640,18 +642,18 @@ async function InsertServiceVehicleHistory(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseServiceHistoryInsert;
|
const [result, rawResponse, , rawRequest] = soapResponseServiceHistoryInsert;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientServiceHistoryInsert.serviceHistoryHeaderInsert Result ${JSON.stringify(result, null, 2)}`
|
`soapClientServiceHistoryInsert.serviceHistoryHeaderInsert Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseServiceHistoryInsert);
|
CheckCdkResponseForError(socket, soapResponseServiceHistoryInsert);
|
||||||
return result?.return;
|
return result && result.return;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertServiceVehicleHistory - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertServiceVehicleHistory - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -667,10 +669,8 @@ async function InsertDmsStartWip(socket) {
|
|||||||
acctgDate: moment().tz(socket.JobData.bodyshop.timezone).format("YYYY-MM-DD"),
|
acctgDate: moment().tz(socket.JobData.bodyshop.timezone).format("YYYY-MM-DD"),
|
||||||
//socket.JobData.invoice_date
|
//socket.JobData.invoice_date
|
||||||
desc: socket.txEnvelope.story && socket.txEnvelope.story.replace(replaceSpecialRegex, ""),
|
desc: socket.txEnvelope.story && socket.txEnvelope.story.replace(replaceSpecialRegex, ""),
|
||||||
docType: 10, // Need to check what this usually would be? Apparently it is almost always 10 or 7.
|
docType: 10 || 7, //Need to check what this usually would be? Apparently it is almost always 10 or 7.
|
||||||
//1 Cash Receipt , 2 Check, 3 Journal Voucher, 4 Parts invoice, 5 Payable Invoice, 6 Recurring Entry, 7 Repair
|
//1 Cash Receipt , 2 Check, 3 Journal Voucher, 4 Parts invoice, 5 Payable Invoice, 6 Recurring Entry, 7 Repair Order Invoice, 8 Vehicle Purchase Invoice, 9 Vehicle Sale Invoice, 10 Other, 11 Payroll, 12 Finance Charge, 13 FMLR Invoice, 14 Parts Credit Memo, 15 Manufacturer Document, 16 FMLR Credit Memo
|
||||||
// Order Invoice, 8 Vehicle Purchase Invoice, 9 Vehicle Sale Invoice, 10 Other, 11 Payroll, 12 Finance Charge,
|
|
||||||
// 13 FMLR Invoice, 14 Parts Credit Memo, 15 Manufacturer Document, 16 FMLR Credit Memo
|
|
||||||
m13Flag: 0,
|
m13Flag: 0,
|
||||||
refer: socket.JobData.ro_number,
|
refer: socket.JobData.ro_number,
|
||||||
srcCo: socket.JobData.bodyshop.cdk_configuration.srcco,
|
srcCo: socket.JobData.bodyshop.cdk_configuration.srcco,
|
||||||
@@ -682,19 +682,19 @@ async function InsertDmsStartWip(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doStartWIPAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doStartWIPAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientAccountingGLInsertUpdate.doStartWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientAccountingGLInsertUpdate.doStartWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doStartWIPAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doStartWIPAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
||||||
const TransactionHeader = result?.return;
|
const TransactionHeader = result && result.return;
|
||||||
return TransactionHeader;
|
return TransactionHeader;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsStartWip - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsStartWip - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -713,19 +713,19 @@ async function InsertDmsBatchWip(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
||||||
const BatchWipResult = result?.return;
|
const BatchWipResult = result && result.return;
|
||||||
return BatchWipResult;
|
return BatchWipResult;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsBatchWip - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsBatchWip - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -877,19 +877,19 @@ async function PostDmsBatchWip(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
|
||||||
// CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
// CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
||||||
const PostResult = result?.return;
|
const PostResult = result && result.return;
|
||||||
return PostResult;
|
return PostResult;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -906,19 +906,19 @@ async function QueryDmsErrWip(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doErrWIPAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doErrWIPAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
`soapClientAccountingGLInsertUpdate.doErrWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientAccountingGLInsertUpdate.doErrWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doErrWIPAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doErrWIPAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
||||||
const PostResult = result?.return;
|
const PostResult = result && result.return;
|
||||||
return PostResult;
|
return PostResult;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsErrWip - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsErrWip - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -937,31 +937,28 @@ async function DeleteDmsWip(socket) {
|
|||||||
|
|
||||||
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
|
||||||
|
|
||||||
WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
|
CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
|
||||||
|
|
||||||
WsLogger.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"SILLY",
|
"SILLY",
|
||||||
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
|
||||||
);
|
);
|
||||||
WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
|
CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
|
||||||
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
|
||||||
const PostResult = result?.return;
|
const PostResult = result && result.return;
|
||||||
return PostResult;
|
return PostResult;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function MarkJobExported(socket, jobid) {
|
async function MarkJobExported(socket, jobid) {
|
||||||
WsLogger.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
const currentToken =
|
|
||||||
(socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
|
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${currentToken}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.MARK_JOB_EXPORTED, {
|
.request(queries.MARK_JOB_EXPORTED, {
|
||||||
jobId: jobid,
|
jobId: jobid,
|
||||||
job: {
|
job: {
|
||||||
@@ -987,23 +984,20 @@ async function MarkJobExported(socket, jobid) {
|
|||||||
async function InsertFailedExportLog(socket, error) {
|
async function InsertFailedExportLog(socket, error) {
|
||||||
try {
|
try {
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
||||||
const currentToken =
|
|
||||||
(socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
|
|
||||||
|
|
||||||
const result = await client
|
const result = await client
|
||||||
.setHeaders({ Authorization: `Bearer ${currentToken}` })
|
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
|
||||||
.request(queries.INSERT_EXPORT_LOG, {
|
.request(queries.INSERT_EXPORT_LOG, {
|
||||||
logs: [{
|
log: {
|
||||||
bodyshopid: socket.JobData.bodyshop.id,
|
bodyshopid: socket.JobData.bodyshop.id,
|
||||||
jobid: socket.JobData.id,
|
jobid: socket.JobData.id,
|
||||||
successful: false,
|
successful: false,
|
||||||
message: JSON.stringify(error),
|
message: JSON.stringify(error),
|
||||||
useremail: socket.user.email
|
useremail: socket.user.email
|
||||||
}]
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
} catch (error2) {
|
} catch (error2) {
|
||||||
WsLogger.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -736,7 +736,7 @@ const CreateCosts = (job) => {
|
|||||||
PASL: "PASL"
|
PASL: "PASL"
|
||||||
};
|
};
|
||||||
const defaultCosts =
|
const defaultCosts =
|
||||||
job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber || job.bodyshop.rr_dealerid
|
job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber
|
||||||
? ciecaObj
|
? ciecaObj
|
||||||
: job.bodyshop.md_responsibility_centers.defaults.costs;
|
: job.bodyshop.md_responsibility_centers.defaults.costs;
|
||||||
|
|
||||||
|
|||||||
@@ -117,44 +117,46 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
json: JSON.stringify(carfaxObject, null, 2),
|
json: JSON.stringify(carfaxObject, null, 2),
|
||||||
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
||||||
count: carfaxObject.job.length
|
count: carfaxObject?.job?.length || 0
|
||||||
};
|
};
|
||||||
|
|
||||||
if (skipUpload) {
|
if (skipUpload) {
|
||||||
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
||||||
uploadToS3(jsonObj, S3_BUCKET_NAME);
|
uploadToS3(jsonObj, S3_BUCKET_NAME);
|
||||||
} else {
|
} else {
|
||||||
await uploadViaSFTP(jsonObj);
|
if (jsonObj.count > 0) {
|
||||||
|
await uploadViaSFTP(jsonObj);
|
||||||
|
|
||||||
await sendMexicoBillingEmail({
|
await sendMexicoBillingEmail({
|
||||||
subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
||||||
text: `Errors:\n${JSON.stringify(
|
text: `Errors:\n${JSON.stringify(
|
||||||
erroredJobs.map((ej) => ({
|
erroredJobs.map((ej) => ({
|
||||||
jobid: ej.job?.id,
|
jobid: ej.job?.id,
|
||||||
error: ej.error
|
error: ej.error
|
||||||
})),
|
})),
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}\n\nUploaded:\n${JSON.stringify(
|
)}\n\nUploaded:\n${JSON.stringify(
|
||||||
{
|
{
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}`
|
)}`
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allJSONResults.push({
|
jsonObj.count > 0 && allJSONResults.push({
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result || "No Upload Result Available"
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
||||||
@@ -234,11 +236,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
|
|||||||
const ret = {
|
const ret = {
|
||||||
ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
|
ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
|
||||||
v_vin: job.v_vin || "",
|
v_vin: job.v_vin || "",
|
||||||
v_year: job.v_model_yr
|
v_year: (() => {
|
||||||
? parseInt(job.v_model_yr.match(/\d/g))
|
const y = parseInt(job.v_model_yr);
|
||||||
? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
|
return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
|
||||||
: ""
|
})(),
|
||||||
: "",
|
|
||||||
v_make: job.v_makedesc || "",
|
v_make: job.v_makedesc || "",
|
||||||
v_model: job.v_model || "",
|
v_model: job.v_model || "",
|
||||||
|
|
||||||
|
|||||||
@@ -160,40 +160,42 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
json: JSON.stringify(carfaxObject, null, 2),
|
json: JSON.stringify(carfaxObject, null, 2),
|
||||||
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
||||||
count: carfaxObject.job.length
|
count: carfaxObject?.job?.length || 0
|
||||||
};
|
};
|
||||||
|
|
||||||
if (skipUpload) {
|
if (skipUpload) {
|
||||||
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
||||||
uploadToS3(jsonObj);
|
uploadToS3(jsonObj);
|
||||||
} else {
|
} else {
|
||||||
await uploadViaSFTP(jsonObj);
|
if (jsonObj.count > 0) {
|
||||||
|
await uploadViaSFTP(jsonObj);
|
||||||
|
|
||||||
await sendMexicoBillingEmail({
|
await sendMexicoBillingEmail({
|
||||||
subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
|
subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
|
||||||
imex: "IO",
|
imex: "IO",
|
||||||
rome: "RO"
|
rome: "RO"
|
||||||
})}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
})}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
||||||
text: `Errors:\n${JSON.stringify(
|
text: `Errors:\n${JSON.stringify(
|
||||||
erroredJobs.map((ej) => ({
|
erroredJobs.map((ej) => ({
|
||||||
ro_number: ej.job?.ro_number,
|
ro_number: ej.job?.ro_number,
|
||||||
jobid: ej.job?.id,
|
jobid: ej.job?.id,
|
||||||
error: ej.error
|
error: ej.error
|
||||||
})),
|
})),
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}\n\nUploaded:\n${JSON.stringify(
|
)}\n\nUploaded:\n${JSON.stringify(
|
||||||
{
|
{
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}`
|
)}`
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allJSONResults.push({
|
allJSONResults.push({
|
||||||
@@ -201,7 +203,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result || "No Upload Result Available"
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
||||||
@@ -286,11 +288,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
|
|||||||
const ret = {
|
const ret = {
|
||||||
ro_number: crypto.createHash("md5").update(job.ro_number, "utf8").digest("hex"),
|
ro_number: crypto.createHash("md5").update(job.ro_number, "utf8").digest("hex"),
|
||||||
v_vin: job.v_vin || "",
|
v_vin: job.v_vin || "",
|
||||||
v_year: job.v_model_yr
|
v_year: (() => {
|
||||||
? parseInt(job.v_model_yr.match(/\d/g))
|
const y = parseInt(job.v_model_yr);
|
||||||
? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
|
return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
|
||||||
: ""
|
})(),
|
||||||
: "",
|
|
||||||
v_make: job.v_make_desc || "",
|
v_make: job.v_make_desc || "",
|
||||||
v_model: job.v_model_desc || "",
|
v_model: job.v_model_desc || "",
|
||||||
|
|
||||||
|
|||||||
@@ -591,7 +591,7 @@ const CreateCosts = (job) => {
|
|||||||
PASL: "PASL"
|
PASL: "PASL"
|
||||||
};
|
};
|
||||||
const defaultCosts =
|
const defaultCosts =
|
||||||
job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber || job.bodyshop.rr_dealerid
|
job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber
|
||||||
? ciecaObj
|
? ciecaObj
|
||||||
: job.bodyshop.md_responsibility_centers.defaults.costs;
|
: job.bodyshop.md_responsibility_centers.defaults.costs;
|
||||||
|
|
||||||
|
|||||||
@@ -647,7 +647,7 @@ const CreateCosts = (job) => {
|
|||||||
PASL: "PASL"
|
PASL: "PASL"
|
||||||
};
|
};
|
||||||
const defaultCosts =
|
const defaultCosts =
|
||||||
job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber || job.bodyshop.rr_dealerid
|
job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber
|
||||||
? ciecaObj
|
? ciecaObj
|
||||||
: job.bodyshop.md_responsibility_centers.defaults.costs;
|
: job.bodyshop.md_responsibility_centers.defaults.costs;
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,9 @@ exports.default = async (req, res) => {
|
|||||||
"patrick.fic@convenient-brands.com",
|
"patrick.fic@convenient-brands.com",
|
||||||
"bradley.rhoades@convenient-brands.com",
|
"bradley.rhoades@convenient-brands.com",
|
||||||
"jrome@rometech.com",
|
"jrome@rometech.com",
|
||||||
"ivana@imexsystems.ca"
|
"ivana@imexsystems.ca",
|
||||||
|
"support@imexsystems.ca",
|
||||||
|
"sarah@rometech.com"
|
||||||
],
|
],
|
||||||
subject: `RO Usage Report - ${moment().format("MM/DD/YYYY")}`,
|
subject: `RO Usage Report - ${moment().format("MM/DD/YYYY")}`,
|
||||||
text: `
|
text: `
|
||||||
|
|||||||
@@ -1,460 +0,0 @@
|
|||||||
const path = require("path");
|
|
||||||
require("dotenv").config({
|
|
||||||
path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
|
|
||||||
});
|
|
||||||
|
|
||||||
// const CalcualteAllocations = require("../cdk/cdk-calculate-allocations").default;
|
|
||||||
const CreateFortellisLogEvent = require("./fortellis-logger");
|
|
||||||
const logger = require("../utils/logger");
|
|
||||||
const uuid = require("uuid").v4;
|
|
||||||
const AxiosLib = require("axios").default;
|
|
||||||
const axios = AxiosLib.create();
|
|
||||||
const axiosCurlirize = require("axios-curlirize").default;
|
|
||||||
|
|
||||||
// Custom error class for Fortellis API errors
|
|
||||||
class FortellisApiError extends Error {
|
|
||||||
constructor(message, details) {
|
|
||||||
super(message);
|
|
||||||
this.name = "FortellisApiError";
|
|
||||||
this.reqId = details.reqId;
|
|
||||||
this.url = details.url;
|
|
||||||
this.apiName = details.apiName;
|
|
||||||
this.errorData = details.errorData;
|
|
||||||
this.errorStatus = details.errorStatus;
|
|
||||||
this.errorStatusText = details.errorStatusText;
|
|
||||||
this.originalError = details.originalError;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
axiosCurlirize(axios, (_result, _err) => {
|
|
||||||
//Left intentionally blank. We don't want to console.log. We handle logging the cURL in MakeFortellisCall once completed.
|
|
||||||
});
|
|
||||||
|
|
||||||
const getTransactionType = (jobid) => `fortellis:${jobid}`;
|
|
||||||
const defaultFortellisTTL = 60 * 60;
|
|
||||||
|
|
||||||
async function GetAuthToken() {
|
|
||||||
//Done with Authorization Code Flow
|
|
||||||
//https://docs.fortellis.io/docs/tutorials/solution-integration/authorization-code-flow/
|
|
||||||
|
|
||||||
//TODO: This should get stored in the redis cache and only be refreshed when it expires.
|
|
||||||
const {
|
|
||||||
data: { access_token, expires_in, token_type }
|
|
||||||
} = await axios.post(
|
|
||||||
process.env.FORTELLIS_AUTH_URL,
|
|
||||||
{},
|
|
||||||
{
|
|
||||||
auth: {
|
|
||||||
username: process.env.FORTELLIS_KEY,
|
|
||||||
password: process.env.FORTELLIS_SECRET
|
|
||||||
},
|
|
||||||
params: {
|
|
||||||
grant_type: "client_credentials",
|
|
||||||
scope: "anonymous"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return access_token;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function FetchSubscriptions({ redisHelpers, socket, jobid, SubscriptionObject }) {
|
|
||||||
try {
|
|
||||||
const { setSessionTransactionData, getSessionTransactionData } = redisHelpers;
|
|
||||||
|
|
||||||
//Get Subscription ID from Transaction Envelope
|
|
||||||
const { SubscriptionID } = SubscriptionObject
|
|
||||||
? SubscriptionObject
|
|
||||||
: await getSessionTransactionData(socket.id, getTransactionType(jobid), `txEnvelope`);
|
|
||||||
if (!SubscriptionID) {
|
|
||||||
throw new Error("Subscription ID not found in transaction envelope.");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check to See if the subscription meta is in the Redis Cache.
|
|
||||||
const SubscriptionMetaFromCache = await getSessionTransactionData(
|
|
||||||
socket.id,
|
|
||||||
getTransactionType(jobid),
|
|
||||||
FortellisCacheEnums.SubscriptionMeta
|
|
||||||
);
|
|
||||||
|
|
||||||
// If it is, return it.
|
|
||||||
if (SubscriptionMetaFromCache) {
|
|
||||||
return SubscriptionMetaFromCache;
|
|
||||||
} else {
|
|
||||||
const access_token = await GetAuthToken();
|
|
||||||
const subscriptions = await axios.get(FortellisActions.GetSubscription.url, {
|
|
||||||
headers: { Authorization: `Bearer ${access_token}` },
|
|
||||||
logRequest: false
|
|
||||||
});
|
|
||||||
const SubscriptionMeta = subscriptions.data.subscriptions.find((s) => s.subscriptionId === SubscriptionID);
|
|
||||||
if (setSessionTransactionData) {
|
|
||||||
await setSessionTransactionData(
|
|
||||||
socket.id,
|
|
||||||
getTransactionType(jobid),
|
|
||||||
FortellisCacheEnums.SubscriptionMeta,
|
|
||||||
SubscriptionMeta,
|
|
||||||
defaultFortellisTTL
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return SubscriptionMeta;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
CreateFortellisLogEvent(socket, "ERROR", `Error fetching subscription metadata.`, {
|
|
||||||
error: error.message,
|
|
||||||
stack: error.stack
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function GetDepartmentId({ apiName, debug = false, SubscriptionMeta, overrideDepartmentId }) {
|
|
||||||
if (!apiName) throw new Error("apiName not provided. Unable to get department without apiName.");
|
|
||||||
if (debug) {
|
|
||||||
console.log("API Names & Departments ");
|
|
||||||
console.log("===========");
|
|
||||||
console.log(JSON.stringify(SubscriptionMeta.apiDmsInfo, null, 4));
|
|
||||||
console.log("===========");
|
|
||||||
}
|
|
||||||
|
|
||||||
const departmentIds = SubscriptionMeta.apiDmsInfo //Get the subscription object.
|
|
||||||
.find((info) => info.name === apiName)?.departments; //Departments are categorized by API name and have an array of departments.
|
|
||||||
|
|
||||||
if (overrideDepartmentId) {
|
|
||||||
return departmentIds && departmentIds.find(d => d.id === overrideDepartmentId)?.id
|
|
||||||
} else {
|
|
||||||
|
|
||||||
return departmentIds && departmentIds[0] && departmentIds[0].id; //TODO: This makes the assumption that there is only 1 department.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Highest level function call to make a call to fortellis. This should be the only call required, and it will handle all the logic for making the call.
|
|
||||||
async function MakeFortellisCall({
|
|
||||||
apiName,
|
|
||||||
url,
|
|
||||||
headers = {},
|
|
||||||
body = {},
|
|
||||||
type = "post",
|
|
||||||
debug = false,
|
|
||||||
requestPathParams,
|
|
||||||
requestSearchParams = [], //Array of key/value strings like [["key", "value"]]
|
|
||||||
jobid,
|
|
||||||
redisHelpers,
|
|
||||||
socket,
|
|
||||||
SubscriptionObject, //This is used because of the get make models to bypass all of the redis calls.
|
|
||||||
overrideDepartmentId
|
|
||||||
}) {
|
|
||||||
//const { setSessionTransactionData, getSessionTransactionData } = redisHelpers;
|
|
||||||
|
|
||||||
const fullUrl = constructFullUrl({ url, pathParams: requestPathParams, requestSearchParams });
|
|
||||||
if (debug) console.log(`Executing ${type} to ${fullUrl}`);
|
|
||||||
const ReqId = uuid();
|
|
||||||
const access_token = await GetAuthToken();
|
|
||||||
const SubscriptionMeta = await FetchSubscriptions({ redisHelpers, socket, jobid, SubscriptionObject });
|
|
||||||
const DepartmentId = await GetDepartmentId({ apiName, debug, SubscriptionMeta, overrideDepartmentId });
|
|
||||||
|
|
||||||
if (debug) {
|
|
||||||
console.log(
|
|
||||||
`ReqID: ${ReqId} | SubscriptionID: ${SubscriptionMeta.subscriptionId} | DepartmentId: ${DepartmentId}`
|
|
||||||
);
|
|
||||||
console.log(`Body Contents: ${JSON.stringify(body, null, 4)}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
let result;
|
|
||||||
switch (type) {
|
|
||||||
case "post":
|
|
||||||
default:
|
|
||||||
result = await axios.post(fullUrl, body, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${access_token}`,
|
|
||||||
"Subscription-Id": SubscriptionMeta.subscriptionId,
|
|
||||||
"Request-Id": ReqId,
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
Accept: "application/json",
|
|
||||||
...(DepartmentId && { "Department-Id": DepartmentId }),
|
|
||||||
...headers
|
|
||||||
}
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case "get":
|
|
||||||
result = await axios.get(fullUrl, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${access_token}`,
|
|
||||||
"Subscription-Id": SubscriptionMeta.subscriptionId,
|
|
||||||
"Request-Id": ReqId,
|
|
||||||
Accept: "application/json",
|
|
||||||
"Department-Id": DepartmentId,
|
|
||||||
...headers
|
|
||||||
}
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case "put":
|
|
||||||
result = await axios.put(fullUrl, body, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${access_token}`,
|
|
||||||
"Subscription-Id": SubscriptionMeta.subscriptionId,
|
|
||||||
"Request-Id": ReqId,
|
|
||||||
Accept: "application/json",
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
"Department-Id": DepartmentId,
|
|
||||||
...headers
|
|
||||||
}
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debug) {
|
|
||||||
console.log(`ReqID: ${ReqId} Data`);
|
|
||||||
console.log(JSON.stringify(result.data, null, 4));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.data.checkStatusAfterSeconds) {
|
|
||||||
return DelayedCallback({
|
|
||||||
delayMeta: result.data,
|
|
||||||
access_token,
|
|
||||||
SubscriptionID: SubscriptionMeta.subscriptionId,
|
|
||||||
ReqId,
|
|
||||||
departmentIds: DepartmentId
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.log(
|
|
||||||
"fortellis-log-event-json",
|
|
||||||
"DEBUG",
|
|
||||||
socket?.user?.email,
|
|
||||||
jobid,
|
|
||||||
{
|
|
||||||
requestcurl: result.config.curlCommand,
|
|
||||||
reqid: result.config.headers["Request-Id"] || null,
|
|
||||||
subscriptionId: result.config.headers["Subscription-Id"] || null,
|
|
||||||
resultdata: result.data,
|
|
||||||
resultStatus: result.status
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.data;
|
|
||||||
} catch (error) {
|
|
||||||
const errorDetails = {
|
|
||||||
reqId: ReqId,
|
|
||||||
url: fullUrl,
|
|
||||||
apiName,
|
|
||||||
errorData: error.response?.data,
|
|
||||||
errorStatus: error.response?.status,
|
|
||||||
errorStatusText: error.response?.statusText,
|
|
||||||
originalError: error
|
|
||||||
};
|
|
||||||
|
|
||||||
logger.log(
|
|
||||||
"fortellis-log-event-error",
|
|
||||||
"ERROR",
|
|
||||||
socket?.user?.email,
|
|
||||||
socket?.recordid,
|
|
||||||
{
|
|
||||||
wsmessage: "",//message,
|
|
||||||
curl: error.config.curl.curlCommand,
|
|
||||||
reqid: error.request.headers["Request-Id"] || null,
|
|
||||||
subscriptionId: error.request.headers["Subscription-Id"] || null,
|
|
||||||
},
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
throw new FortellisApiError(`Fortellis API call failed for ${apiName}: ${error.message}`, errorDetails);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Some Fortellis calls return a batch result that isn't ready immediately.
|
|
||||||
//This function will check the status of the call and wait until it is ready.
|
|
||||||
//It will try 5 times before giving up.
|
|
||||||
async function DelayedCallback({ delayMeta, access_token, SubscriptionID, ReqId, departmentIds }) {
|
|
||||||
for (let index = 0; index < 5; index++) {
|
|
||||||
await sleep(delayMeta.checkStatusAfterSeconds * 1000);
|
|
||||||
//Check to see if the call is ready.
|
|
||||||
const statusResult = await axios.get(delayMeta._links.status.href, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${access_token}`,
|
|
||||||
"Subscription-Id": SubscriptionID,
|
|
||||||
"Request-Id": ReqId,
|
|
||||||
"Department-Id": departmentIds[0].id
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//TODO: Add a check if the status result is not ready, to try again.
|
|
||||||
if (statusResult.data.status === "complete") {
|
|
||||||
//This may have to check again if it isn't ready.
|
|
||||||
const batchResult = await axios.get(statusResult.data._links.result.href, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${access_token}`,
|
|
||||||
"Subscription-Id": SubscriptionID,
|
|
||||||
"Request-Id": ReqId
|
|
||||||
//"Department-Id": departmentIds[0].id
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return batchResult;
|
|
||||||
} else {
|
|
||||||
return "Error!!! Still need to implement batch waiting.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function sleep(ms) {
|
|
||||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
||||||
}
|
|
||||||
|
|
||||||
const isProduction = process.env.NODE_ENV === "production";
|
|
||||||
|
|
||||||
//Get requests should have the trailing slash as they are used that way in the calls.
|
|
||||||
const FortellisActions = {
|
|
||||||
GetSubscription: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://subscriptions.fortellis.io/v1/solution/subscriptions"
|
|
||||||
: "https://subscriptions.fortellis.io/v1/solution/subscriptions",
|
|
||||||
type: "get",
|
|
||||||
apiName: "Fortellis Get Subscriptions"
|
|
||||||
},
|
|
||||||
QueryVehicles: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdkdrive/service/v1/vehicles/"
|
|
||||||
: "https://api.fortellis.io/cdk-test/cdkdrive/service/v1/vehicles/",
|
|
||||||
type: "get",
|
|
||||||
apiName: "Service Vehicle - Query Vehicles"
|
|
||||||
},
|
|
||||||
GetMakeModel: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/makemodel/v2/bulk"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/makemodel/v2",
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Get Make Model Lite"
|
|
||||||
},
|
|
||||||
GetVehicleId: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/service-vehicle-mgmt/v2/vehicle-ids/" //Request path params of vins
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/service-vehicle-mgmt/v2/vehicle-ids/",
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Post Service Vehicle"
|
|
||||||
},
|
|
||||||
GetVehicleById: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/service-vehicle-mgmt/v2/" //Request path params of vehicleId
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/service-vehicle-mgmt/v2/",
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Post Service Vehicle"
|
|
||||||
},
|
|
||||||
QueryCustomerByName: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/customerpost/v1/search"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/customerpost/v1/search",
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Post Customer"
|
|
||||||
},
|
|
||||||
ReadCustomer: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/customerpost/v1/" //Customer ID is request param.
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/customerpost/v1/",
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Post Customer"
|
|
||||||
},
|
|
||||||
CreateCustomer: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/customerpost/v1/"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/customerpost/v1/",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Customer"
|
|
||||||
},
|
|
||||||
InsertVehicle: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/service-vehicle-mgmt/v2/"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/service-vehicle-mgmt/v2/",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Service Vehicle"
|
|
||||||
},
|
|
||||||
UpdateVehicle: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/service-vehicle-mgmt/v2/"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/service-vehicle-mgmt/v2/",
|
|
||||||
type: "put",
|
|
||||||
apiName: "CDK Drive Post Service Vehicle"
|
|
||||||
},
|
|
||||||
GetCOA: {
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Post Accounts GL WIP",
|
|
||||||
url: `https://api.fortellis.io/cdk-test/drive/chartofaccounts/v2/bulk/`,
|
|
||||||
waitForResult: true
|
|
||||||
},
|
|
||||||
StartWip: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/glpost/startWIP"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/glpost/startWIP",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Accounts GL"
|
|
||||||
},
|
|
||||||
TranBatchWip: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/glpost/transBatchWIP"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/glpost/transBatchWIP",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Accounts GL"
|
|
||||||
},
|
|
||||||
PostBatchWip: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/glpost/postBatchWIP"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/glpost/postBatchWIP",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Accounts GL"
|
|
||||||
},
|
|
||||||
DeleteTranWip: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/glpost/postWIP"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/glpost/postWIP",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Accounts GL"
|
|
||||||
},
|
|
||||||
QueryErrorWip: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/glpost/errWIP/"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/glpost/errWIP/",
|
|
||||||
type: "get",
|
|
||||||
apiName: "CDK Drive Post Accounts GL"
|
|
||||||
},
|
|
||||||
ServiceHistoryInsert: {
|
|
||||||
url: isProduction
|
|
||||||
? "https://api.fortellis.io/cdk/drive/post/service-vehicle-history-mgmt/v2/"
|
|
||||||
: "https://api.fortellis.io/cdk-test/drive/post/service-vehicle-history-mgmt/v2/",
|
|
||||||
type: "post",
|
|
||||||
apiName: "CDK Drive Post Service Vehicle History"
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const FortellisCacheEnums = {
|
|
||||||
txEnvelope: "txEnvelope",
|
|
||||||
DMSBatchTxn: "DMSBatchTxn",
|
|
||||||
SubscriptionMeta: "SubscriptionMeta",
|
|
||||||
DepartmentId: "DepartmentId",
|
|
||||||
JobData: "JobData",
|
|
||||||
DMSVid: "DMSVid",
|
|
||||||
DMSVeh: "DMSVeh",
|
|
||||||
DMSVehCustomer: "DMSVehCustomer",
|
|
||||||
DMSCustList: "DMSCustList",
|
|
||||||
DMSCust: "DMSCust",
|
|
||||||
selectedCustomerId: "selectedCustomerId",
|
|
||||||
DMSTransHeader: "DMSTransHeader",
|
|
||||||
transWips: "transWips",
|
|
||||||
DmsBatchTxnPost: "DmsBatchTxnPost",
|
|
||||||
DMSVehHistory: "DMSVehHistory"
|
|
||||||
};
|
|
||||||
|
|
||||||
function constructFullUrl({ url, pathParams = "", requestSearchParams = [] }) {
|
|
||||||
// Ensure the base URL ends with a single "/"
|
|
||||||
url = url.replace(/\/+$/, "/");
|
|
||||||
const fullPath = pathParams ? `${url}${pathParams}` : url;
|
|
||||||
const searchParams = new URLSearchParams(requestSearchParams).toString();
|
|
||||||
const fullUrl = searchParams ? `${fullPath}?${searchParams}` : fullPath;
|
|
||||||
return fullUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
GetAuthToken,
|
|
||||||
FortellisCacheEnums,
|
|
||||||
MakeFortellisCall,
|
|
||||||
FortellisActions,
|
|
||||||
getTransactionType,
|
|
||||||
defaultFortellisTTL,
|
|
||||||
FortellisApiError,
|
|
||||||
GetDepartmentId
|
|
||||||
};
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
const logger = require("../utils/logger");
|
|
||||||
|
|
||||||
const CreateFortellisLogEvent = (socket, level, message, txnDetails) => {
|
|
||||||
logger.log("fortellis-log-event", level, socket?.user?.email, null, { wsmessage: message, txnDetails });
|
|
||||||
socket.emit("fortellis-log-event", { level, message, txnDetails });
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = CreateFortellisLogEvent;
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -697,7 +697,6 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
pbs_serialnumber
|
pbs_serialnumber
|
||||||
rr_dealerid
|
|
||||||
use_paint_scale_data
|
use_paint_scale_data
|
||||||
timezone
|
timezone
|
||||||
}
|
}
|
||||||
@@ -975,7 +974,6 @@ exports.CLAIMSCORP_QUERY = `query CLAIMSCORP_EXPORT($start: timestamptz, $bodysh
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
pbs_serialnumber
|
pbs_serialnumber
|
||||||
rr_dealerid
|
|
||||||
use_paint_scale_data
|
use_paint_scale_data
|
||||||
timezone
|
timezone
|
||||||
}
|
}
|
||||||
@@ -1237,7 +1235,6 @@ exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uu
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
pbs_serialnumber
|
pbs_serialnumber
|
||||||
rr_dealerid
|
|
||||||
use_paint_scale_data
|
use_paint_scale_data
|
||||||
timezone
|
timezone
|
||||||
}
|
}
|
||||||
@@ -1757,7 +1754,6 @@ query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
pbs_serialnumber
|
pbs_serialnumber
|
||||||
rr_dealerid
|
|
||||||
use_paint_scale_data
|
use_paint_scale_data
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1874,7 +1870,6 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
|
|||||||
jc_hourly_rates
|
jc_hourly_rates
|
||||||
cdk_dealerid
|
cdk_dealerid
|
||||||
pbs_serialnumber
|
pbs_serialnumber
|
||||||
rr_dealerid
|
|
||||||
use_paint_scale_data
|
use_paint_scale_data
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2195,7 +2190,19 @@ mutation UPDATE_BILLS($billids: [uuid!]!, $bill: bills_set_input!, $logs: [expor
|
|||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
|
exports.INSERT_EXPORT_LOG = `
|
||||||
|
mutation INSERT_EXPORT_LOG($log: exportlog_insert_input!) {
|
||||||
|
insert_exportlog_one(object: $log) {
|
||||||
|
id
|
||||||
|
}
|
||||||
|
}`;
|
||||||
|
|
||||||
|
exports.QUERY_EXISTING_TRANSITION = `
|
||||||
|
mutation INSERT_EXPORT_LOG($log: exportlog_insert_input!) {
|
||||||
|
insert_exportlog_one(object: $log) {
|
||||||
|
id
|
||||||
|
}
|
||||||
|
}`;
|
||||||
|
|
||||||
exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $existingTransition: transitions_set_input!){
|
exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $existingTransition: transitions_set_input!){
|
||||||
update_transitions(where:{jobid:{_eq:$jobid}, end:{_is_null:true
|
update_transitions(where:{jobid:{_eq:$jobid}, end:{_is_null:true
|
||||||
@@ -2915,8 +2922,15 @@ exports.GET_BODYSHOP_BY_ID = `
|
|||||||
state
|
state
|
||||||
notification_followers
|
notification_followers
|
||||||
timezone
|
timezone
|
||||||
rr_dealerid
|
}
|
||||||
rr_configuration
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports.GET_BODYSHOP_WATCHERS_BY_ID = `
|
||||||
|
query GET_BODYSHOP_BY_ID($id: uuid!) {
|
||||||
|
bodyshops_by_pk(id: $id) {
|
||||||
|
id
|
||||||
|
notification_followers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|||||||
@@ -1224,7 +1224,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"cdk_dealerid": null,
|
"cdk_dealerid": null,
|
||||||
"rr_dealerid": null,
|
|
||||||
"features": {
|
"features": {
|
||||||
"allAccess": true,
|
"allAccess": true,
|
||||||
"singleDeviceOnly": false
|
"singleDeviceOnly": false
|
||||||
|
|||||||
@@ -134,13 +134,16 @@ const insertUserAssociation = async (uid, email, shopId) => {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* PATCH handler for updating bodyshop fields.
|
* PATCH handler for updating bodyshop fields.
|
||||||
* Allows patching: shopname, address1, address2, city, state, zip_post, country, email, timezone, phone, logo_img_path
|
* Allows patching: shopname, address1, address2, city, state, zip_post, country, email, timezone, phone
|
||||||
|
* Also allows updating logo_img_path via a simple logoUrl string, which is expanded to the full object.
|
||||||
* @param req
|
* @param req
|
||||||
* @param res
|
* @param res
|
||||||
* @returns {Promise<void>}
|
* @returns {Promise<void>}
|
||||||
*/
|
*/
|
||||||
const patchPartsManagementProvisioning = async (req, res) => {
|
const patchPartsManagementProvisioning = async (req, res) => {
|
||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
|
|
||||||
|
// Fields that can be directly patched 1:1
|
||||||
const allowedFields = [
|
const allowedFields = [
|
||||||
"shopname",
|
"shopname",
|
||||||
"address1",
|
"address1",
|
||||||
@@ -151,31 +154,58 @@ const patchPartsManagementProvisioning = async (req, res) => {
|
|||||||
"country",
|
"country",
|
||||||
"email",
|
"email",
|
||||||
"timezone",
|
"timezone",
|
||||||
"phone",
|
"phone"
|
||||||
"logo_img_path"
|
// NOTE: logo_img_path is handled separately via logoUrl
|
||||||
];
|
];
|
||||||
|
|
||||||
const updateFields = {};
|
const updateFields = {};
|
||||||
|
|
||||||
|
// Copy over simple scalar fields if present
|
||||||
for (const field of allowedFields) {
|
for (const field of allowedFields) {
|
||||||
if (req.body[field] !== undefined) {
|
if (req.body[field] !== undefined) {
|
||||||
updateFields[field] = req.body[field];
|
updateFields[field] = req.body[field];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle logo update via a simple href string, same behavior as provision route
|
||||||
|
if (typeof req.body.logo_img_path === "string") {
|
||||||
|
const trimmed = req.body.logo_img_path.trim();
|
||||||
|
if (trimmed) {
|
||||||
|
updateFields.logo_img_path = {
|
||||||
|
src: trimmed,
|
||||||
|
width: "",
|
||||||
|
height: "",
|
||||||
|
headerMargin: DefaultNewShop.logo_img_path.headerMargin
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (Object.keys(updateFields).length === 0) {
|
if (Object.keys(updateFields).length === 0) {
|
||||||
return res.status(400).json({ error: "No valid fields provided for update." });
|
return res.status(400).json({ error: "No valid fields provided for update." });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check that the bodyshop has an external_shop_id before allowing patch
|
// Check that the bodyshop has an external_shop_id before allowing patch
|
||||||
try {
|
try {
|
||||||
// Fetch the bodyshop by id
|
|
||||||
const shopResp = await client.request(
|
const shopResp = await client.request(
|
||||||
`query GetBodyshop($id: uuid!) { bodyshops_by_pk(id: $id) { id external_shop_id } }`,
|
`query GetBodyshop($id: uuid!) {
|
||||||
|
bodyshops_by_pk(id: $id) {
|
||||||
|
id
|
||||||
|
external_shop_id
|
||||||
|
}
|
||||||
|
}`,
|
||||||
{ id }
|
{ id }
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!shopResp.bodyshops_by_pk?.external_shop_id) {
|
if (!shopResp.bodyshops_by_pk?.external_shop_id) {
|
||||||
return res.status(400).json({ error: "Cannot patch: bodyshop does not have an external_shop_id." });
|
return res.status(400).json({ error: "Cannot patch: bodyshop does not have an external_shop_id." });
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return res.status(500).json({ error: "Failed to validate bodyshop external_shop_id.", detail: err });
|
return res.status(500).json({
|
||||||
|
error: "Failed to validate bodyshop external_shop_id.",
|
||||||
|
detail: err
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const resp = await client.request(UPDATE_BODYSHOP_BY_ID, { id, fields: updateFields });
|
const resp = await client.request(UPDATE_BODYSHOP_BY_ID, { id, fields: updateFields });
|
||||||
if (!resp.update_bodyshops_by_pk) {
|
if (!resp.update_bodyshops_by_pk) {
|
||||||
@@ -211,6 +241,8 @@ const partsManagementProvisioning = async (req, res) => {
|
|||||||
"phone",
|
"phone",
|
||||||
"userEmail"
|
"userEmail"
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// TODO add in check for early access
|
||||||
await ensureExternalIdUnique(body.external_shop_id);
|
await ensureExternalIdUnique(body.external_shop_id);
|
||||||
|
|
||||||
logger.log("admin-create-shop-user", "debug", body.userEmail, null, {
|
logger.log("admin-create-shop-user", "debug", body.userEmail, null, {
|
||||||
|
|||||||
@@ -601,7 +601,7 @@ function GenerateCostingData(job) {
|
|||||||
//At the bill level.
|
//At the bill level.
|
||||||
bill_val.billlines.map((line_val) => {
|
bill_val.billlines.map((line_val) => {
|
||||||
//At the bill line level.
|
//At the bill line level.
|
||||||
if (job.bodyshop.pbs_serialnumber || job.bodyshop.cdk_dealerid || job.bodyshop.rr_dealerid) {
|
if (job.bodyshop.pbs_serialnumber || job.bodyshop.cdk_dealerid) {
|
||||||
if (!bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]])
|
if (!bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]])
|
||||||
bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]] = Dinero();
|
bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]] = Dinero();
|
||||||
|
|
||||||
@@ -716,7 +716,7 @@ function GenerateCostingData(job) {
|
|||||||
const ticketTotalsByCostCenter = job.timetickets.reduce((ticket_acc, ticket_val) => {
|
const ticketTotalsByCostCenter = job.timetickets.reduce((ticket_acc, ticket_val) => {
|
||||||
//At the invoice level.
|
//At the invoice level.
|
||||||
|
|
||||||
if (job.bodyshop.pbs_serialnumber || job.bodyshop.cdk_dealerid || job.bodyshop.rr_dealerid) {
|
if (job.bodyshop.pbs_serialnumber || job.bodyshop.cdk_dealerid) {
|
||||||
if (!ticket_acc[selectedDmsAllocationConfig.costs[ticket_val.ciecacode]])
|
if (!ticket_acc[selectedDmsAllocationConfig.costs[ticket_val.ciecacode]])
|
||||||
ticket_acc[selectedDmsAllocationConfig.costs[ticket_val.ciecacode]] = Dinero();
|
ticket_acc[selectedDmsAllocationConfig.costs[ticket_val.ciecacode]] = Dinero();
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,14 @@
|
|||||||
* This module handles automatically adding watchers to new jobs based on the notifications_autoadd
|
* This module handles automatically adding watchers to new jobs based on the notifications_autoadd
|
||||||
* boolean field in the associations table and the notification_followers JSON field in the bodyshops table.
|
* boolean field in the associations table and the notification_followers JSON field in the bodyshops table.
|
||||||
* It ensures users are not added twice and logs the process.
|
* It ensures users are not added twice and logs the process.
|
||||||
|
*
|
||||||
|
* NOTE: Bodyshop notification_followers is fetched directly from the DB (Hasura) to avoid stale Redis cache.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const { client: gqlClient } = require("../graphql-client/graphql-client");
|
const { client: gqlClient } = require("../graphql-client/graphql-client");
|
||||||
const { isEmpty } = require("lodash");
|
const { isEmpty } = require("lodash");
|
||||||
const {
|
const {
|
||||||
|
GET_BODYSHOP_WATCHERS_BY_ID,
|
||||||
GET_JOB_WATCHERS_MINIMAL,
|
GET_JOB_WATCHERS_MINIMAL,
|
||||||
GET_NOTIFICATION_WATCHERS,
|
GET_NOTIFICATION_WATCHERS,
|
||||||
INSERT_JOB_WATCHERS
|
INSERT_JOB_WATCHERS
|
||||||
@@ -26,10 +29,7 @@ const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "fa
|
|||||||
*/
|
*/
|
||||||
const autoAddWatchers = async (req) => {
|
const autoAddWatchers = async (req) => {
|
||||||
const { event, trigger } = req.body;
|
const { event, trigger } = req.body;
|
||||||
const {
|
const { logger } = req;
|
||||||
logger,
|
|
||||||
sessionUtils: { getBodyshopFromRedis }
|
|
||||||
} = req;
|
|
||||||
|
|
||||||
// Validate that this is an INSERT event, bail
|
// Validate that this is an INSERT event, bail
|
||||||
if (trigger?.name !== "notifications_jobs_autoadd" || event.op !== "INSERT" || event.data.old) {
|
if (trigger?.name !== "notifications_jobs_autoadd" || event.op !== "INSERT" || event.data.old) {
|
||||||
@@ -48,20 +48,20 @@ const autoAddWatchers = async (req) => {
|
|||||||
const hasuraUserId = event?.session_variables?.["x-hasura-user-id"];
|
const hasuraUserId = event?.session_variables?.["x-hasura-user-id"];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Fetch bodyshop data from Redis
|
// Fetch bodyshop data directly from DB (avoid Redis staleness)
|
||||||
const bodyshopData = await getBodyshopFromRedis(shopId);
|
const bodyshopResponse = await gqlClient.request(GET_BODYSHOP_WATCHERS_BY_ID, { id: shopId });
|
||||||
let notificationFollowers = bodyshopData?.notification_followers;
|
const bodyshopData = bodyshopResponse?.bodyshops_by_pk;
|
||||||
|
|
||||||
// Bail if notification_followers is missing or not an array
|
const notificationFollowersRaw = bodyshopData?.notification_followers;
|
||||||
if (!notificationFollowers || !Array.isArray(notificationFollowers)) {
|
const notificationFollowers = Array.isArray(notificationFollowersRaw)
|
||||||
return;
|
? [...new Set(notificationFollowersRaw.filter((id) => id))] // de-dupe + remove falsy
|
||||||
}
|
: [];
|
||||||
|
|
||||||
// Execute queries in parallel
|
// Execute queries in parallel
|
||||||
const [notificationData, existingWatchersData] = await Promise.all([
|
const [notificationData, existingWatchersData] = await Promise.all([
|
||||||
gqlClient.request(GET_NOTIFICATION_WATCHERS, {
|
gqlClient.request(GET_NOTIFICATION_WATCHERS, {
|
||||||
shopId,
|
shopId,
|
||||||
employeeIds: notificationFollowers.filter((id) => id)
|
employeeIds: notificationFollowers
|
||||||
}),
|
}),
|
||||||
gqlClient.request(GET_JOB_WATCHERS_MINIMAL, { jobid: jobId })
|
gqlClient.request(GET_JOB_WATCHERS_MINIMAL, { jobid: jobId })
|
||||||
]);
|
]);
|
||||||
@@ -73,7 +73,7 @@ const autoAddWatchers = async (req) => {
|
|||||||
associationId: assoc.id
|
associationId: assoc.id
|
||||||
})) || [];
|
})) || [];
|
||||||
|
|
||||||
// Get users from notification_followers
|
// Get users from notification_followers (employee IDs -> employee emails)
|
||||||
const followerEmails =
|
const followerEmails =
|
||||||
notificationData?.employees
|
notificationData?.employees
|
||||||
?.filter((e) => e.user_email)
|
?.filter((e) => e.user_email)
|
||||||
@@ -84,7 +84,7 @@ const autoAddWatchers = async (req) => {
|
|||||||
|
|
||||||
// Combine and deduplicate emails (use email as the unique key)
|
// Combine and deduplicate emails (use email as the unique key)
|
||||||
const usersToAdd = [...autoAddUsers, ...followerEmails].reduce((acc, user) => {
|
const usersToAdd = [...autoAddUsers, ...followerEmails].reduce((acc, user) => {
|
||||||
if (!acc.some((u) => u.email === user.email)) {
|
if (user?.email && !acc.some((u) => u.email === user.email)) {
|
||||||
acc.push(user);
|
acc.push(user);
|
||||||
}
|
}
|
||||||
return acc;
|
return acc;
|
||||||
@@ -123,6 +123,7 @@ const autoAddWatchers = async (req) => {
|
|||||||
message: error?.message,
|
message: error?.message,
|
||||||
stack: error?.stack,
|
stack: error?.stack,
|
||||||
jobId,
|
jobId,
|
||||||
|
shopId,
|
||||||
roNumber
|
roNumber
|
||||||
});
|
});
|
||||||
throw error; // Re-throw to ensure the error is logged in the handler
|
throw error; // Re-throw to ensure the error is logged in the handler
|
||||||
|
|||||||
@@ -81,8 +81,8 @@ const alternateTransportChangedBuilder = (data) => {
|
|||||||
* @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
|
* @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
|
||||||
*/
|
*/
|
||||||
const billPostedBuilder = (data) => {
|
const billPostedBuilder = (data) => {
|
||||||
const facing = data?.data?.isinhouse ? "in-house" : "vendor";
|
const facing = data?.data?.isinhouse ? "An In House" : "A Vendor";
|
||||||
const body = `An ${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
|
const body = `${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
|
||||||
|
|
||||||
return buildNotification(data, "notifications.job.billPosted", body, {
|
return buildNotification(data, "notifications.job.billPosted", body, {
|
||||||
isInHouse: data?.data?.isinhouse,
|
isInHouse: data?.data?.isinhouse,
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ const withUserGraphQLClientMiddleware = require("../middleware/withUserGraphQLCl
|
|||||||
router.use(validateFirebaseIdTokenMiddleware);
|
router.use(validateFirebaseIdTokenMiddleware);
|
||||||
|
|
||||||
router.post("/getvehicles", withUserGraphQLClientMiddleware, cdkGetMake.default);
|
router.post("/getvehicles", withUserGraphQLClientMiddleware, cdkGetMake.default);
|
||||||
router.post("/fortellis/getvehicles", withUserGraphQLClientMiddleware, cdkGetMake.fortellis);
|
|
||||||
router.post("/calculate-allocations", withUserGraphQLClientMiddleware, cdkCalculateAllocations.defaultRoute);
|
router.post("/calculate-allocations", withUserGraphQLClientMiddleware, cdkCalculateAllocations.defaultRoute);
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|||||||
@@ -1,658 +0,0 @@
|
|||||||
# rr-rome-client
|
|
||||||
|
|
||||||
A minimal Node.js wrapper for Reynolds & Reynolds (Rome/RIH) STAR `ProcessMessage` over SOAP, with WS-Security UsernameToken.
|
|
||||||
|
|
||||||
## Contents
|
|
||||||
- Overview
|
|
||||||
- Install
|
|
||||||
- Supported Node Version
|
|
||||||
- Peer / External Dependencies
|
|
||||||
- Quick Start
|
|
||||||
- Configuration & Environment Variables
|
|
||||||
- Client API Methods
|
|
||||||
- RRResult Structure
|
|
||||||
- Types & IntelliSense
|
|
||||||
- Errors & Validation
|
|
||||||
- Retry Strategy
|
|
||||||
- Debug / Dump Flags
|
|
||||||
- Live Test Runner (`scripts/run-live.mjs`)
|
|
||||||
- Bundling & Upload Helper (`scripts/bundle-for-upload.mjs`)
|
|
||||||
- XML Templates & XSDs
|
|
||||||
- Logging
|
|
||||||
- Build & Development
|
|
||||||
- Design Notes / Non-goals
|
|
||||||
- License
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
`rr-rome-client` builds and sends STAR XML payloads (Customer, Service Vehicle, Combined Search, Advisors, Parts, BSM Repair Orders) inside a SOAP envelope using the STAR Transport `ProcessMessage` operation. It applies a WS-Security UsernameToken header and provides:
|
|
||||||
- High-level `RRClient` methods for each supported Rome operation.
|
|
||||||
- JSDoc typedefs for all payloads and response shapes (usable in JS and TS).
|
|
||||||
- Structured parsing of response status blocks and operation-specific data.
|
|
||||||
- Automatic BODId & CreationDateTime generation, with ability to override.
|
|
||||||
- Basic input validation and error classification.
|
|
||||||
- Exponential backoff + jitter for retryable transport/vendor lock scenarios.
|
|
||||||
|
|
||||||
## Install
|
|
||||||
```bash
|
|
||||||
npm i rr-rome-client
|
|
||||||
```
|
|
||||||
(You may also need peer dependencies; see below.)
|
|
||||||
|
|
||||||
## Supported Node Version
|
|
||||||
`package.json` declares `"engines": { "node": ">=22.0.0" }`. The build targets modern Node 22 features (native ESM, improved performance). Earlier Node versions are not officially supported/tested.
|
|
||||||
|
|
||||||
## Peer / External Dependencies
|
|
||||||
Rollup externalizes runtime libraries (they are listed in `dependencies` but not bundled). Ensure these are available in your environment:
|
|
||||||
Required:
|
|
||||||
- axios – HTTP transport
|
|
||||||
- fast-xml-parser – STAR XML parsing
|
|
||||||
- mustache – XML templating
|
|
||||||
- uuid – BODId generation
|
|
||||||
Optional (only if you use env loader helpers or live scripts):
|
|
||||||
- dotenv
|
|
||||||
- dotenv-expand
|
|
||||||
|
|
||||||
Install (versions per `package.json`):
|
|
||||||
```bash
|
|
||||||
npm install axios@^1.7.7 fast-xml-parser@^4.5.0 mustache@^4.2.0 uuid@^9.0.1
|
|
||||||
# Optional env loader
|
|
||||||
npm install dotenv@^17.2.3 dotenv-expand@^12.0.3
|
|
||||||
```
|
|
||||||
TypeScript users (optional):
|
|
||||||
```bash
|
|
||||||
npm install -D @types/node
|
|
||||||
```
|
|
||||||
Browser bundling is not officially supported; you would need polyfills for core modules if attempting.
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
```js
|
|
||||||
import { RRClient } from 'rr-rome-client';
|
|
||||||
import { loadEnv } from 'rr-rome-client/src/util/config.js'; // optional helper
|
|
||||||
|
|
||||||
// Load routing & credentials from environment variables (see below)
|
|
||||||
const { baseUrl, username, password, routing } = loadEnv();
|
|
||||||
|
|
||||||
const client = new RRClient({ baseUrl, username, password });
|
|
||||||
|
|
||||||
// Minimal createRepairOrder example
|
|
||||||
const result = await client.createRepairOrder({
|
|
||||||
customerNo: '12345',
|
|
||||||
departmentType: 'S', // DeptType
|
|
||||||
vin: '1ABCDEF2GHIJ34567',
|
|
||||||
outsdRoNo: 'EXT-RO-99'
|
|
||||||
}, { routing });
|
|
||||||
|
|
||||||
if (result.success) {
|
|
||||||
console.log('RO status:', result.data); // {status, date, time, outsdRoNo, dmsRoNo, errorMessage}
|
|
||||||
} else {
|
|
||||||
console.error('Failure:', result.statusBlocks?.transaction);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Configuration & Environment Variables
|
|
||||||
You can manually provide configuration or use the helper `loadEnv(env)` in `src/util/config.js`.
|
|
||||||
|
|
||||||
Recognized environment variables:
|
|
||||||
- RR_BASE_URL – SOAP endpoint URL (required)
|
|
||||||
- RR_USERNAME – WS-Security UsernameToken username (required)
|
|
||||||
- RR_PASSWORD – WS-Security UsernameToken password (required)
|
|
||||||
- RR_DEALER_NUMBER – DealerNumber for Destination (required per call)
|
|
||||||
- RR_STORE_NUMBER – StoreNumber (optional)
|
|
||||||
- RR_AREANUMBER – AreaNumber (optional)
|
|
||||||
|
|
||||||
Example `.env`:
|
|
||||||
```
|
|
||||||
RR_BASE_URL=https://rome.example.com/soap
|
|
||||||
RR_USERNAME=integratorUser
|
|
||||||
RR_PASSWORD=superSecret
|
|
||||||
RR_DEALER_NUMBER=1234
|
|
||||||
RR_STORE_NUMBER=01
|
|
||||||
RR_AREANUMBER=1
|
|
||||||
```
|
|
||||||
`loadEnv()` returns `{ baseUrl, username, password, routing: { dealerNumber, storeNumber, areaNumber } }`.
|
|
||||||
|
|
||||||
Per-call options object shape (`CallOptions`):
|
|
||||||
```js
|
|
||||||
{
|
|
||||||
routing: { dealerNumber: '1234', storeNumber?: '01', areaNumber?: '1' },
|
|
||||||
envelope?: { bodId?, creationDateTime?, sender?: { component?, task?, referenceId? } }
|
|
||||||
}
|
|
||||||
```
|
|
||||||
If omitted, `RRClient` auto-generates `bodId` (UUID) and `creationDateTime` when sending.
|
|
||||||
|
|
||||||
## Client API Methods
|
|
||||||
Each method returns a `Promise<RRResult<T>>` where `T` is operation-specific data (or array). `success` is true for vendor SUCCESS and NO_MATCH results; FAIL triggers an `RRVendorStatusError` exception before a `RRResult` is returned.
|
|
||||||
|
|
||||||
All methods require `opts.routing.dealerNumber`.
|
|
||||||
|
|
||||||
### combinedSearch(payload: CombinedSearchQuery, opts)
|
|
||||||
Search customer + service vehicle combinations by exactly one criterion: `phone | license | vin | name | nameRecId | stkNo` plus optional `make`, `model`, `year`, `maxResults` (capped at 50).
|
|
||||||
Minimal:
|
|
||||||
```js
|
|
||||||
const res = await client.combinedSearch({ kind: 'vin', vin: '12345' }, { routing });
|
|
||||||
res.data; // Array<CombinedSearchBlock>
|
|
||||||
```
|
|
||||||
Errors: Throws `RRValidationError` if missing or multiple criteria.
|
|
||||||
|
|
||||||
### insertCustomer(payload: InsertCustomerPayload, opts)
|
|
||||||
Insert a customer record. Required: `lastName` (or `customerName`). If individual (`ibFlag='I'` or inferred by presence of `firstName`), then `firstName` required.
|
|
||||||
```js
|
|
||||||
const res = await client.insertCustomer({ firstName: 'Jane', lastName: 'Doe', phones:[{number:'5551234567'}] }, { routing });
|
|
||||||
res.data; // { dmsRecKey, status, statusCode }
|
|
||||||
```
|
|
||||||
|
|
||||||
### updateCustomer(payload: UpdateCustomerPayload, opts)
|
|
||||||
Update existing customer by `nameRecId` plus required `ibFlag`. Other fields optional.
|
|
||||||
```js
|
|
||||||
const res = await client.updateCustomer({ nameRecId:'998877', ibFlag:'I', lastName:'Doe' }, { routing });
|
|
||||||
```
|
|
||||||
|
|
||||||
### insertServiceVehicle(payload: InsertServiceVehiclePayload, opts)
|
|
||||||
Insert a service vehicle linked to a customer. Required: `vin`, `vehicleServInfo.customerNo`.
|
|
||||||
```js
|
|
||||||
const res = await client.insertServiceVehicle({
|
|
||||||
vin:'1HGCM82633A004352',
|
|
||||||
vehicleServInfo:{ customerNo:'12345' }
|
|
||||||
}, { routing });
|
|
||||||
res.data; // { status, statusCode }
|
|
||||||
```
|
|
||||||
|
|
||||||
### getAdvisors(payload: GetAdvisorsParams, opts)
|
|
||||||
Fetch advisors for a department. Department values normalized: S/P/B or long names.
|
|
||||||
```js
|
|
||||||
const res = await client.getAdvisors({ department:'SERVICE' }, { routing });
|
|
||||||
res.data; // AdvisorRow[]
|
|
||||||
```
|
|
||||||
|
|
||||||
### createRepairOrder(payload: CreateRepairOrderPayload, opts)
|
|
||||||
Required: `customerNo`, `departmentType`, `vin`, `outsdRoNo`. Advisor optional. Complex nested labor/parts/misc blocks supported via payload.
|
|
||||||
```js
|
|
||||||
const res = await client.createRepairOrder({
|
|
||||||
customerNo:'12345', departmentType:'S', vin:'1ABCDEF2GHIJ34567', outsdRoNo:'EXT-RO-99'
|
|
||||||
}, { routing });
|
|
||||||
res.data; // { status, date, time, outsdRoNo, dmsRoNo, errorMessage }
|
|
||||||
```
|
|
||||||
|
|
||||||
### updateRepairOrder(payload: UpdateRepairOrderPayload, opts)
|
|
||||||
Required: `finalUpdate ('Y'|'N')`, `outsdRoNo`. May include `roNo` and nested sections.
|
|
||||||
```js
|
|
||||||
const res = await client.updateRepairOrder({ finalUpdate:'N', outsdRoNo:'EXT-RO-99' }, { routing });
|
|
||||||
```
|
|
||||||
|
|
||||||
### getParts(payload: GetPartsParams, opts)
|
|
||||||
Required: `roNumber` (internal ERA RO number).
|
|
||||||
```js
|
|
||||||
const res = await client.getParts({ roNumber:'938275' }, { routing });
|
|
||||||
res.data; // PartRow[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Payload Schema Reference
|
|
||||||
Comprehensive field-level summary sourced from `src/types.js`, operation builders, and validation logic. Types reflect accepted JS types (string|number where applicable). Constraints list enumerations, inference rules, and validation notes. Required = must be supplied by caller (or inferred automatically). Optional fields omitted become absent in generated XML.
|
|
||||||
|
|
||||||
### CombinedSearchQuery
|
|
||||||
Only one criterion permitted; `maxResults` capped at 50.
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| kind | 'phone'|'license'|'vin'|'name'|'nameRecId'|'stkNo' | Yes | Determines which single criterion block is emitted |
|
|
||||||
| phone | string\|number\|{phone:string} | Conditionally (if kind==='phone') | Value mapped to `<Phone Num="..."/>` |
|
|
||||||
| license | string\|number\|{license:string} | Conditionally (kind==='license') | Value mapped to `<LicenseNum LicNo="..."/>` |
|
|
||||||
| vin | string\|number\|{vin:string} | Conditionally (kind==='vin') | Value mapped to `<PartVIN Vin="..."/>` (partial VIN allowed) |
|
|
||||||
| name | {fname,lname,mname} or {name} | Conditionally (kind==='name') | Either FullName triple or LName only; must supply all three for FullName |
|
|
||||||
| nameRecId | string\|number\|{custId:string}|{nameRecId:string} | Conditionally (kind==='nameRecId') | Emits `<NameRecId CustIdStart="..."/>` |
|
|
||||||
| stkNo | string\|number\|{stkNo:string} | Conditionally (kind==='stkNo') | Emits `<StkNo VehId="..."/>` |
|
|
||||||
| maxResults | number | No | Capped at 50 (default 50) -> `MaxRecs` attribute |
|
|
||||||
| make | string | No | Defaults 'ANY' -> `VehData MakePfx` |
|
|
||||||
| model | string\|number | No | Defaults 'ANY' -> `VehData Model` |
|
|
||||||
| year | string\|number | No | Defaults 'ANY' -> `VehData Year` |
|
|
||||||
|
|
||||||
### InsertCustomerPayload
|
|
||||||
`ibFlag` inferred as 'I' if `firstName` present, else 'B'. Business requires `lastName` / `customerName`; individual requires `firstName` + last name.
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| ibFlag | 'I'|'B' | Auto / For update must supply | Inferred if omitted (firstName present => 'I') |
|
|
||||||
| customerType | 'R'|'W'|'I'|'Retail'|'Wholesale'|'Internal' | No | Normalized to 'R','W','I'; must be one of listed |
|
|
||||||
| createdBy | string | No | Optional CreatedBy attribute |
|
|
||||||
| customerName | string | Conditional | Alias for `lastName` when business |
|
|
||||||
| lastName | string | Yes (unless `customerName` provided) | Required base name; sanitized to A-Z0-9 space |
|
|
||||||
| firstName | string | Required when ibFlag='I' | Sanitized; required for individuals |
|
|
||||||
| midName | string | No | Sanitized |
|
|
||||||
| salut | string | No | Sanitized |
|
|
||||||
| suffix | string | No | Sanitized |
|
|
||||||
| addresses | CustomerAddress[] | No | Each entry requires `line1`; Type defaults 'P' |
|
|
||||||
| phones | CustomerPhone[] | No | Each entry requires `number`; Type defaults 'H' |
|
|
||||||
| emails | CustomerEmail[] | No | First entry used -> `<Email MailTo="..."/>` |
|
|
||||||
| personal.gender | 'M'|'F'|'U' | No | Optional |
|
|
||||||
| personal.otherName | string | No | Sanitized alnum/space |
|
|
||||||
| personal.anniversaryDate | string | No | Included if non-empty |
|
|
||||||
| personal.employerName | string | No | Sanitized |
|
|
||||||
| personal.employerPhone | string | No | Raw string |
|
|
||||||
| personal.occupation | string | No | Sanitized |
|
|
||||||
| personal.optOut | string | No | Pass-through |
|
|
||||||
| personal.optOutUse | string | No | Pass-through |
|
|
||||||
| personal.birthDates[].type | 'P'|'S' | No | Defaults 'P'; entry must have `date` |
|
|
||||||
| personal.birthDates[].date | string | Conditional | Included only if non-empty |
|
|
||||||
| personal.ssns[].type | 'P'|'S' | No | Defaults 'P'; entry must have `ssn` |
|
|
||||||
| personal.ssns[].ssn | string | Conditional | Included only if non-empty |
|
|
||||||
| personal.driver.type | 'P'|'S' | No | Defaults 'P' |
|
|
||||||
| personal.driver.licenseNumber | string | Conditional | Required to emit DriverInfo |
|
|
||||||
| personal.driver.licenseState | string | No | Optional |
|
|
||||||
| personal.driver.licenseExpDate | string | No | Optional |
|
|
||||||
| personal.children[].name | string | No | Sanitized; optional list |
|
|
||||||
| dms.taxExemptNum | string | No | Optional |
|
|
||||||
| dms.salesTerritory | string | No | Optional |
|
|
||||||
| dms.deliveryRoute | string | No | Optional |
|
|
||||||
| dms.salesmanNum | string | No | Optional |
|
|
||||||
| dms.lastContactMethod | string | No | Optional |
|
|
||||||
| dms.followups[].type | string | Conditional | Must have both type & value |
|
|
||||||
| dms.followups[].value | string | Conditional | Must have both type & value |
|
|
||||||
|
|
||||||
### UpdateCustomerPayload
|
|
||||||
Extends InsertCustomerPayload plus:
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints |
|
|
||||||
|-------|------|----------|-------------|
|
|
||||||
| nameRecId | string\|number | Yes | Required identifier |
|
|
||||||
| ibFlag | 'I'|'B' | Yes | Must be explicitly provided on update |
|
|
||||||
|
|
||||||
### InsertServiceVehiclePayload
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| vin | string | Yes | Must be provided |
|
|
||||||
| modelDesc | string | No | Optional attribute |
|
|
||||||
| carline | string | No | Optional attribute |
|
|
||||||
| extClrDesc | string | No | Optional attribute |
|
|
||||||
| intClrDesc | string | No | Optional attribute |
|
|
||||||
| trimDesc | string | No | Optional attribute |
|
|
||||||
| bodyStyle | string | No | Optional attribute |
|
|
||||||
| engineDesc | string | No | Optional attribute |
|
|
||||||
| transDesc | string | No | Optional attribute |
|
|
||||||
| year | string\|number | No | Emits `<Year>` element if present |
|
|
||||||
| odometer | string\|number | No | Emits `<Odometer>` |
|
|
||||||
| odometerUnits | string | No | Emits `<OdometerUnits>` |
|
|
||||||
| vehicleDetail.licNo | string | No | Emits `<VehicleDetail LicNo="..."/>` |
|
|
||||||
| vehicleServInfo.customerNo | string\|number | Yes | Required; becomes `CustomerNo` attribute |
|
|
||||||
| vehicleServInfo.salesmanNo | string\|number | No | Optional element |
|
|
||||||
| vehicleServInfo.inServiceDate | string\|number | No | Optional element |
|
|
||||||
| vehicleServInfo.mileage | string\|number | No | Optional element |
|
|
||||||
| vehicleServInfo.teamCode | string | No | Optional element |
|
|
||||||
| vehicleServInfo.vehExtWarranty.contractNumber | string | Conditional | Included if any warranty field present |
|
|
||||||
| vehicleServInfo.vehExtWarranty.expirationDate | string | Conditional | "" excluded |
|
|
||||||
| vehicleServInfo.vehExtWarranty.expirationMileage | string\|number | Conditional | "" excluded |
|
|
||||||
| vehicleServInfo.advisor.contactInfo.nameRecId | string\|number | No | Advisor block included only if provided |
|
|
||||||
|
|
||||||
### CreateRepairOrderPayload
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| customerNo | string\|number | Yes | CustNo |
|
|
||||||
| departmentType | string\|number | Yes | DeptType |
|
|
||||||
| vin | string | Yes | Vin |
|
|
||||||
| outsdRoNo | string\|number | Yes | External RO identifier |
|
|
||||||
| advisorNo | string\|number | No | AdvNo |
|
|
||||||
| tagNo | string\|number | No | TagNo |
|
|
||||||
| mileageIn | string\|number | No | MileageIn |
|
|
||||||
| roComment | string | No | `<RoCommentInfo RoComment="..."/>` |
|
|
||||||
| estimate.parts | string\|number | No | EstPartsAmt |
|
|
||||||
| estimate.labor | string\|number | No | EstLaborAmt |
|
|
||||||
| estimate.total | string\|number | No | EstTotalAmt |
|
|
||||||
| tax.payType | 'All'|'Cust'|'Intr'|'Warr' | No | Enumeration validated |
|
|
||||||
| tax.taxCode | string | No | TaxCode |
|
|
||||||
| tax.txblGrossAmt | string\|number | No | TxblGrossAmt |
|
|
||||||
| tax.grossTaxAmt | string\|number | No | GrossTaxAmt |
|
|
||||||
| rolabor.ops[].opCode | string | No | Optional |
|
|
||||||
| rolabor.ops[].jobNo | string\|number | No | Optional |
|
|
||||||
| rolabor.ops[].custPayTypeFlag | string | No | Freeform (not validated) |
|
|
||||||
| rolabor.ops[].warrPayTypeFlag | string | No | Freeform |
|
|
||||||
| rolabor.ops[].intrPayTypeFlag | string | No | Freeform |
|
|
||||||
| rolabor.ops[].custTxblNtxblFlag | 'T'|'N' | No | Enumerated & validated |
|
|
||||||
| rolabor.ops[].warrTxblNtxblFlag | 'T'|'N' | No | Enumerated & validated |
|
|
||||||
| rolabor.ops[].intrTxblNtxblFlag | 'T'|'N' | No | Enumerated & validated |
|
|
||||||
| rolabor.ops[].vlrCode | string | No | Optional |
|
|
||||||
| rolabor.ops[].bill.payType | 'All'|'Cust'|'Intr'|'Warr' | No | Enumeration |
|
|
||||||
| rolabor.ops[].bill.jobTotalHrs | string\|number | No | Optional |
|
|
||||||
| rolabor.ops[].bill.billTime | string\|number | No | Optional |
|
|
||||||
| rolabor.ops[].bill.billRate | string\|number | No | Optional |
|
|
||||||
| rolabor.ops[].ccc.cause | string | No | Optional |
|
|
||||||
| rolabor.ops[].ccc.complaint | string | No | Optional |
|
|
||||||
| rolabor.ops[].ccc.correction | string | No | Optional |
|
|
||||||
| rolabor.ops[].amount.payType | 'All'|'Cust'|'Intr'|'Warr' | No | Enumeration |
|
|
||||||
| rolabor.ops[].amount.amtType | string | No | Optional |
|
|
||||||
| rolabor.ops[].amount.custPrice | string\|number | No | Optional |
|
|
||||||
| rolabor.ops[].amount.totalAmt | string\|number | No | Optional |
|
|
||||||
| ropart.jobs[].opCode | string | No | Optional |
|
|
||||||
| ropart.jobs[].jobNo | string\|number | No | Optional |
|
|
||||||
| ropart.jobs[].lines[].partNo | string | No | Optional |
|
|
||||||
| ropart.jobs[].lines[].partNoDesc | string | No | Optional |
|
|
||||||
| ropart.jobs[].lines[].partQty | string\|number | No | Emits QtyOrd |
|
|
||||||
| ropart.jobs[].lines[].sale | string\|number | No | Sale |
|
|
||||||
| ropart.jobs[].lines[].cost | string\|number | No | Cost |
|
|
||||||
| ropart.jobs[].lines[].addDeleteFlag | string | No | AddDeleteFlag |
|
|
||||||
| rogg.ops[].lines[].breakOut | string | No | Optional |
|
|
||||||
| rogg.ops[].lines[].itemType | 'G'|'P'|'S'|'F' | No | Enumerated & validated |
|
|
||||||
| rogg.ops[].lines[].itemDesc | string | No | Optional |
|
|
||||||
| rogg.ops[].lines[].custQty | string\|number | No | Optional |
|
|
||||||
| rogg.ops[].lines[].warrQty | string\|number | No | Optional |
|
|
||||||
| rogg.ops[].lines[].intrQty | string\|number | No | Optional |
|
|
||||||
| rogg.ops[].lines[].custPayTypeFlag | string | No | Optional |
|
|
||||||
| rogg.ops[].lines[].warrPayTypeFlag | string | No | Optional |
|
|
||||||
| rogg.ops[].lines[].intrPayTypeFlag | string | No | Optional |
|
|
||||||
| rogg.ops[].lines[].custTxblNtxblFlag | 'T'|'N' | No | Enumerated |
|
|
||||||
| rogg.ops[].lines[].warrTxblNtxblFlag | 'T'|'N' | No | Enumerated |
|
|
||||||
| rogg.ops[].lines[].intrTxblNtxblFlag | 'T'|'N' | No | Enumerated |
|
|
||||||
| rogg.ops[].lines[].amount.payType | 'All'|'Cust'|'Intr'|'Warr' | No | Enumeration |
|
|
||||||
| rogg.ops[].lines[].amount.amtType | string | No | Optional |
|
|
||||||
| rogg.ops[].lines[].amount.custPrice | string\|number | No | Optional |
|
|
||||||
| rogg.ops[].lines[].amount.dlrCost | string\|number | No | Optional |
|
|
||||||
| romisc.ops[].lines[].miscCode | string | No | Optional |
|
|
||||||
| romisc.ops[].lines[].custPayTypeFlag | string | No | Optional |
|
|
||||||
| romisc.ops[].lines[].warrPayTypeFlag | string | No | Optional |
|
|
||||||
| romisc.ops[].lines[].intrPayTypeFlag | string | No | Optional |
|
|
||||||
| romisc.ops[].lines[].custTxblNtxblFlag | 'T'|'N' | No | Enumerated |
|
|
||||||
| romisc.ops[].lines[].warrTxblNtxblFlag | 'T'|'N' | No | Enumerated |
|
|
||||||
| romisc.ops[].lines[].intrTxblNtxblFlag | 'T'|'N' | No | Enumerated |
|
|
||||||
| romisc.ops[].lines[].codeAmt | string\|number | No | Optional |
|
|
||||||
|
|
||||||
### UpdateRepairOrderPayload
|
|
||||||
Adds required `finalUpdate` and supports most Create fields + mileageOut.
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| finalUpdate | 'Y'|'N' | Yes | Must be 'Y' or 'N' (validated) |
|
|
||||||
| outsdRoNo | string\|number | Yes | External RO identifier (validation requires present) |
|
|
||||||
| roNo | string\|number | No | Optional internal RoNo |
|
|
||||||
| mileageOut | string\|number | No | MileageOut |
|
|
||||||
| (other fields) | see CreateRepairOrderPayload | Conditional | Same validations apply |
|
|
||||||
|
|
||||||
### GetAdvisorsParams
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| department | 'S'|'P'|'B'|'SERVICE'|'PARTS'|'BODY'|'BODYSHOP'|'BODY SHOP' | Yes | Normalized to S/P/B |
|
|
||||||
| advisorNumber | string\|number | No | Optional filter |
|
|
||||||
| maxResults | number | Ignored | Not in XSD (builder ignores) |
|
|
||||||
|
|
||||||
### GetPartsParams
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| roNumber | string\|number | Yes | Required; becomes `<RoInfo RoNumber="..."/>` |
|
|
||||||
|
|
||||||
### Common Routing & Envelope Fields
|
|
||||||
|
|
||||||
| Field | Type | Required | Constraints / Notes |
|
|
||||||
|-------|------|----------|----------------------|
|
|
||||||
| routing.dealerNumber | string | Yes | Required for all requests (Destination) |
|
|
||||||
| routing.storeNumber | string | No | Optional Destination StoreNumber |
|
|
||||||
| routing.areaNumber | string | No | Optional Destination AreaNumber |
|
|
||||||
| envelope.bodId | string | Auto | UUID generated if omitted |
|
|
||||||
| envelope.creationDateTime | Date\|string | Auto | Uses current time; formatted without milliseconds |
|
|
||||||
| envelope.sender.component | string | No | Defaults 'Rome' if omitted |
|
|
||||||
| envelope.sender.task | string | No | Op-specific defaults (e.g. 'CU','SV','BSMRO','CVC','RCT') |
|
|
||||||
| envelope.sender.referenceId | string | No | Op-specific defaults ('Insert','Update','Query') |
|
|
||||||
|
|
||||||
### AdvisorRow (response convenience)
|
|
||||||
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| advisorId | string\|number\|undefined | AdvisorNumber attribute |
|
|
||||||
| firstName | string\|undefined | FirstName attribute |
|
|
||||||
| lastName | string\|undefined | LastName attribute |
|
|
||||||
| department | 'S'|'P'|'B'|undefined | Normalized department passed through |
|
|
||||||
|
|
||||||
### PartRow (response convenience)
|
|
||||||
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| partNumber | string\|undefined | PartNumber |
|
|
||||||
| partDescription | string\|undefined | PartDescription |
|
|
||||||
| quantityOrdered | string\|number\|undefined | QuantityOrdered |
|
|
||||||
| quantityShipped | string\|number\|undefined | QuantityShipped |
|
|
||||||
| price | string\|number\|undefined | Price |
|
|
||||||
| cost | string\|number\|undefined | Cost |
|
|
||||||
| processedFlag | string\|undefined | ProcessedFlag |
|
|
||||||
| addOrDelete | string\|undefined | AddOrDelete |
|
|
||||||
|
|
||||||
### CombinedSearch Response Shapes
|
|
||||||
Hierarchical breakdown of the parsed array returned under `RRResult.data` for `combinedSearch` (each entry is a `CombinedSearchBlock`). Attribute-centric; absent fields are simply omitted.
|
|
||||||
|
|
||||||
#### CombinedSearchBlock
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| NameContactId | CombinedSearchNameContactId | Customer name/contact composite |
|
|
||||||
| ServVehicle | CombinedSearchServVehicle[] | Zero or more service vehicle blocks |
|
|
||||||
| Message | CombinedSearchMessage[] | Optional informational messages |
|
|
||||||
|
|
||||||
#### NameContactId
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| NameId | CombinedSearchNameId | Includes identifiers & individual/business name choice |
|
|
||||||
| Address | Object[] | Each has address-related attributes (lines, city, state, zip, etc.) |
|
|
||||||
| ContactOptions | Object[] | Arbitrary contact option attributes as present |
|
|
||||||
| Phone | Object[] | Each phone entry carries attributes like Type, Num, Ext |
|
|
||||||
| Email | Object[] | Each email entry carries attributes (MailTo, etc.) |
|
|
||||||
|
|
||||||
#### NameId
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| NameRecId | string\|number | Identifier used for subsequent operations |
|
|
||||||
| IBFlag | 'I'|'B' | Individual or Business flag |
|
|
||||||
| IndName | Object | Present for individual: attributes like FName, LName, MName |
|
|
||||||
| BusName | Object | Present for business: attributes like Name (business name) |
|
|
||||||
|
|
||||||
#### ServVehicle (CombinedSearchServVehicle)
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| Vehicle | CombinedSearchVehicle | VIN + descriptive attributes |
|
|
||||||
| VehicleServInfo | CombinedSearchVehicleServInfo | Service info attributes & nested warranty/advisor/comments |
|
|
||||||
|
|
||||||
#### Vehicle (CombinedSearchVehicle)
|
|
||||||
| Attribute | Type | Notes |
|
|
||||||
|-----------|------|-------|
|
|
||||||
| Vin | string | Vehicle identification number (may be partial in search results) |
|
|
||||||
| VehicleMake | string | Make code / description |
|
|
||||||
| VehicleYr | string\|number | Year |
|
|
||||||
| MdlNo | string | Model code |
|
|
||||||
| ModelDesc | string | Model description |
|
|
||||||
| Carline | string | Carline description |
|
|
||||||
| ExtClrDesc | string | Exterior color |
|
|
||||||
| IntClrDesc | string | Interior color |
|
|
||||||
| MakeName | string | Full make name |
|
|
||||||
| VehicleDetail.LicNo | string | License plate (if present) |
|
|
||||||
|
|
||||||
#### VehicleServInfo (CombinedSearchVehicleServInfo)
|
|
||||||
| Attribute | Type | Notes |
|
|
||||||
|-----------|------|-------|
|
|
||||||
| CustomerNo | string\|number | Linked customer number |
|
|
||||||
| SalesmanNo | string\|number | Optional salesman number |
|
|
||||||
| InServiceDate | string\|number | Date vehicle placed in service |
|
|
||||||
| Mileage | string\|number | Current mileage |
|
|
||||||
| TeamCode | string | Team/department code |
|
|
||||||
| VehExtWarranty.ContractNumber | string | Extended warranty contract number |
|
|
||||||
| VehExtWarranty.ExpirationDate | string | Warranty expiration date |
|
|
||||||
| VehExtWarranty.ExpirationMileage | string\|number | Warranty mileage limit |
|
|
||||||
| Advisor.ContactInfo.NameRecId | string\|number | Advisor reference (if present) |
|
|
||||||
| VehServComments[] | string[] | Freeform service comments (array of raw text) |
|
|
||||||
|
|
||||||
#### Message (CombinedSearchMessage)
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| MessageNo | string\|number | Optional message number (if provided) |
|
|
||||||
| Text | string | Message text content |
|
|
||||||
|
|
||||||
### CustomerResponseData
|
|
||||||
Returned as `result.data` for `insertCustomer` / `updateCustomer`.
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| dmsRecKey | string\|undefined | DMS record key identifier (if provided in TransStatus) |
|
|
||||||
| status | string\|undefined | Vendor status string |
|
|
||||||
| statusCode | string\|undefined | Vendor status code |
|
|
||||||
|
|
||||||
### ServiceVehicleResponseData
|
|
||||||
Returned as `result.data` for `insertServiceVehicle`.
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| status | string\|undefined | GenTransStatus Status |
|
|
||||||
| statusCode | string\|undefined | GenTransStatus StatusCode |
|
|
||||||
|
|
||||||
### RepairOrderData
|
|
||||||
Returned as `result.data` for `createRepairOrder` / `updateRepairOrder` (parsed from RoRecordStatus).
|
|
||||||
| Field | Type | Notes |
|
|
||||||
|-------|------|-------|
|
|
||||||
| status | string\|undefined | RoRecordStatus Status |
|
|
||||||
| date | string\|undefined | Date attribute/text |
|
|
||||||
| time | string\|undefined | Time attribute/text |
|
|
||||||
| outsdRoNo | string\|undefined | External RO number (OutsdRoNo) |
|
|
||||||
| dmsRoNo | string\|undefined | Internal DMS RO number (DMSRoNo) |
|
|
||||||
| errorMessage | string\|undefined | ErrorMessage if provided |
|
|
||||||
|
|
||||||
## RRResult Structure
|
|
||||||
Each successful call resolves to:
|
|
||||||
```ts
|
|
||||||
interface RRResult<T> {
|
|
||||||
success: boolean; // SUCCESS or NO_MATCH
|
|
||||||
data?: T; // op-specific parsed convenience data
|
|
||||||
parsed: any; // entire parsed STAR payload root
|
|
||||||
xml: { request: string; response: string }; // raw SOAP envelopes
|
|
||||||
statusBlocks?: { transaction?: {status,statusCode,message}; roRecord?: {status,date,time,outsdRoNo,dmsRoNo,errorMessage} };
|
|
||||||
applicationArea?: any; // raw ApplicationArea node
|
|
||||||
}
|
|
||||||
```
|
|
||||||
Use `statusBlocks.transaction` for generic status; `data` for normalized op output.
|
|
||||||
|
|
||||||
`Convenience data` refers to the distilled, operation-specific subset placed on `RRResult.data` by a dedicated `postParse` function (e.g., extracting only RoRecordStatus identifiers or customer DMS keys). It is intentionally smaller and flatter than `RRResult.parsed`, which contains the entire parsed STAR payload tree. Use `data` for common identifiers/status checks; fall back to `parsed` when you need full raw XML-derived detail.
|
|
||||||
|
|
||||||
## Types & IntelliSense
|
|
||||||
Rich JSDoc typedefs ship with the package.
|
|
||||||
- ESM: `import { RRClient } from 'rr-rome-client';` optionally import `'rr-rome-client/types'` to prompt editor indexing.
|
|
||||||
- CJS: `const { RRClient } = require('rr-rome-client'); require('rr-rome-client/types');`
|
|
||||||
|
|
||||||
Selected typedef categories (see `src/types.js`):
|
|
||||||
- Routing / Envelope / CallOptions
|
|
||||||
- Customer / Service Vehicle / Repair Order payload blocks
|
|
||||||
- Combined Search structures
|
|
||||||
- Advisor and Parts row shapes
|
|
||||||
- `RRResult<T>` generic helper
|
|
||||||
|
|
||||||
The build also emits a TypeScript declaration bundle (`dist/types/index.d.ts`) generated via `tsconfig.types.json` (processing only `src/types.js`).
|
|
||||||
|
|
||||||
## Errors & Validation
|
|
||||||
Three custom error classes (`src/errors.js`):
|
|
||||||
- `RRTransportError` – Non-2xx HTTP status or network failure; `meta.status` / `meta.body` may be attached.
|
|
||||||
- `RRVendorStatusError` – Vendor FAIL status (non-success & not NO_MATCH). Includes `meta.status` (raw status object) and full response XML. `retryable` may be set (currently determined by vendor message lock wording or explicit flag).
|
|
||||||
- `RRValidationError` – Input validation failures (missing required fields, invalid enumeration values, etc.).
|
|
||||||
|
|
||||||
Enumerated validations (examples):
|
|
||||||
- Customer: `ibFlag`, required `firstName` if individual, allowed `customerType` values.
|
|
||||||
- Service Vehicle: mandatory `vin` and `vehicleServInfo.customerNo`.
|
|
||||||
- Repair Orders: required header fields; enumerations for tax pay type (`All|Cust|Intr|Warr`), taxable flags (`T|N`), item types (`G|P|S|F`).
|
|
||||||
|
|
||||||
Error Handling Example:
|
|
||||||
```js
|
|
||||||
try {
|
|
||||||
await client.createRepairOrder(/* ... */);
|
|
||||||
} catch (e) {
|
|
||||||
if (e instanceof RRVendorStatusError) {
|
|
||||||
console.error('Vendor fail', e.meta.status);
|
|
||||||
} else if (e instanceof RRValidationError) {
|
|
||||||
console.error('Bad input', e.message);
|
|
||||||
} else if (e instanceof RRTransportError) {
|
|
||||||
console.error('HTTP/Network', e.message, e.meta.status);
|
|
||||||
} else {
|
|
||||||
console.error('Unexpected', e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Retry Strategy
|
|
||||||
`withBackoff(fn, {max, logger})` (used internally) retries on:
|
|
||||||
- Transport/network errors (`RRTransportError`).
|
|
||||||
- Vendor status errors indicating record lock/in use (message matching `/lock|in use|record.*busy/i`) or explicit `retryable` flag.
|
|
||||||
Backoff: exponential starting at 400ms, capped at 10s, plus up to 250ms jitter.
|
|
||||||
Configure via `new RRClient({ retries: { max: 5 }, ... })`.
|
|
||||||
|
|
||||||
## Debug / Dump Flags
|
|
||||||
Set these environment variables to inspect request/response internals:
|
|
||||||
- `RR_DEBUG` – Enables debug logging (`defaultLogger.debug`).
|
|
||||||
- `RR_DUMP_ENVELOPE=1` – Prints outgoing SOAP envelope.
|
|
||||||
- `RR_DUMP_XML=1` – Prints full response XML.
|
|
||||||
- `RR_DUMP_STATUS=1` – Logs parsed status blocks.
|
|
||||||
- `RR_DUMP_APPLICATION=1` – Logs raw ApplicationArea block.
|
|
||||||
- `RR_DUMP_DATA=1` – Logs `result.data` (postParse convenience output).
|
|
||||||
|
|
||||||
## Live Test Runner (`scripts/run-live.mjs`)
|
|
||||||
Provides curated integration tests against a live Rome system using Vitest. Loads `.env` then `.env.local` (override). Usage:
|
|
||||||
```
|
|
||||||
node scripts/run-live.mjs <test> [flags] [-- ...vitestArgs]
|
|
||||||
```
|
|
||||||
Available tests (see script for full list & flags):
|
|
||||||
- `combinedSearch` – VIN or phone search.
|
|
||||||
- `insertCustomer`, `updateCustomer` – Customer record operations (use `--write` to enable live writes).
|
|
||||||
- `insertServiceVehicle` – Add vehicle (requires or discovers customer).
|
|
||||||
- `getAdvisors` – Advisor listing by department.
|
|
||||||
- `createRepairOrder`, `updateRepairOrder` – BSM RO operations.
|
|
||||||
- `getParts` – Retrieve RO parts lines.
|
|
||||||
- `all` – Run all sequentially.
|
|
||||||
|
|
||||||
Common flags:
|
|
||||||
- `--dump` → `RR_DUMP_ENVELOPE`
|
|
||||||
- `--write` → `RR_LIVE_WRITES` (enables writes)
|
|
||||||
- Operation-specific flags map to `RR_TEST_*` env variables (see script comments for details).
|
|
||||||
- Arbitrary env: `--set=KEY=VALUE`.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
```
|
|
||||||
node scripts/run-live.mjs createRepairOrder --write --dump --customerNo=1134485 --vin=1ABCDEF2GHIJ34567 --ro=BSM123
|
|
||||||
```
|
|
||||||
|
|
||||||
## Bundling & Upload Helper (`scripts/bundle-for-upload.mjs`)
|
|
||||||
Creates text bundles of project files for transport/support purposes.
|
|
||||||
- Includes key directories (`src/`, `test/`, `schemas/`) and specific root files.
|
|
||||||
- Excludes large/irrelevant directories (`node_modules`, `dist`, etc.).
|
|
||||||
- Options: `--max-bytes`, `--pattern=globish`, `--with-env` (include `.env` – caution), `--list-only`.
|
|
||||||
Generates `bundles/bundle-<uuid>-N.txt` with file boundary markers.
|
|
||||||
|
|
||||||
## XML Templates & XSDs
|
|
||||||
Templates reside in `src/templates/templateMap.js` using Mustache. Each operation builder renders a STAR root element plus `ApplicationArea`. XSD files (under `schemas/`) accompany operations:
|
|
||||||
- Customer Insert/Update: `rey_RomeCustomerInsertReq.xsd`, `rey_RomeCustomerUpdateReq.xsd`
|
|
||||||
- Service Vehicle Insert: `rey_RomeServVehicleInsertReq.xsd`
|
|
||||||
- Combined Search: `rey_RomeCustServVehCombReq.xsd`
|
|
||||||
- Advisors: `rey_RomeGetAdvisorsReq.xsd`
|
|
||||||
- Parts: `rey_RomeGetPartsReq.xsd`
|
|
||||||
- Repair Orders Create/Update: `rey_RomeCreateBSMRepairOrderReq.xsd`, `rey_RomeUpdateBSMRepairOrderReq.xsd`
|
|
||||||
Response XSDs also present for repair orders and others.
|
|
||||||
|
|
||||||
Builders attach an `xsdFilename` hint and `elementName`; no runtime XSD validation is performed (the project does not contain a validation module beyond these references).
|
|
||||||
|
|
||||||
## Logging
|
|
||||||
Default logger (`src/logger.js`): logs to console via `info`, `warn`, `error`; `debug` gated by `RR_DEBUG`.
|
|
||||||
Provide a custom logger with matching method names in `RRClientConfig`:
|
|
||||||
```js
|
|
||||||
const logger = { info:()=>{}, warn:()=>{}, error:console.error, debug:()=>{} };
|
|
||||||
const client = new RRClient({ baseUrl, username, password, logger });
|
|
||||||
```
|
|
||||||
|
|
||||||
## Build & Development
|
|
||||||
Scripts:
|
|
||||||
- `npm run build` – Rollup builds `dist/index.cjs` & `dist/index.mjs`, copies JSDoc types (`scripts/postbuild-copy-types.mjs`), emits `.d.ts` (via `tsc -p tsconfig.types.json`).
|
|
||||||
- `npm test` – Runs unit tests (`vitest` with `vitest.config.unit.mjs`).
|
|
||||||
- `npm run bundle` – Invoke bundle creation (see above).
|
|
||||||
- `npm run live:<op>` – Convenience commands mapping to `scripts/run-live.mjs` (e.g. `npm run live:getParts`).
|
|
||||||
|
|
||||||
Rollup configuration (`rollup.config.mjs`):
|
|
||||||
- Externalizes Node core modules and listed dependencies.
|
|
||||||
- Applies terser minification (2 passes, hoisting) for compact output.
|
|
||||||
- Generates both CJS and ESM entrypoints.
|
|
||||||
|
|
||||||
Tree-shaking is enabled (`treeshake.moduleSideEffects = false`). `sideEffects: false` in `package.json` allows downstream bundlers to drop unused exports.
|
|
||||||
|
|
||||||
## Design Notes / Non-goals
|
|
||||||
- WS-Security: Implements only UsernameToken with password type Text or Digest (configurable via `wssePasswordType`). No nonce or timestamp included.
|
|
||||||
- Idempotency: `bodId` generated per request unless provided; `ensureBodAndDates` centralizes creation.
|
|
||||||
- Parsing: Focused on extracting status and op-specific identifiers; raw parsed STAR tree still accessible via `result.parsed`.
|
|
||||||
- Status Handling: Treats `NO_MATCH` (codes like 2 or 213) as non-error with `success=true` so callers can differentiate empty results from failures.
|
|
||||||
- Validation: Enforces only practical minimum & enumerations; does not attempt full schema compliance.
|
|
||||||
- No automatic `fetch` transport fallback yet (axios chosen for reliability). You can replace `postSoap` if providing a compatible function returning raw response text and error semantics.
|
|
||||||
- No built-in XSD validator; XSDs present for reference only.
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,3 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
// CJS access point for JSDoc typedefs
|
|
||||||
module.exports = require('./types.js');
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
/**
|
|
||||||
* @typedef {Object} RRClientConfig
|
|
||||||
* @property {string} baseUrl Base URL of the Rome endpoint
|
|
||||||
* @property {string} username WS-Security username
|
|
||||||
* @property {string} password WS-Security password
|
|
||||||
* @property {'Text'|'Digest'} [wssePasswordType] Password type (defaults to Text)
|
|
||||||
* @property {number} [timeoutMs] Request timeout in milliseconds
|
|
||||||
* @property {{max?: number}} [retries] Retry configuration
|
|
||||||
* @property {{ info:Function, warn:Function, error:Function, debug:Function }} [logger] Custom logger implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Dealer/store routing (required each call). */
|
|
||||||
export const _routingDoc = null;
|
|
||||||
/**
|
|
||||||
* @typedef {Object} Routing
|
|
||||||
* @property {string} dealerNumber
|
|
||||||
* @property {string} [storeNumber]
|
|
||||||
* @property {string} [areaNumber]
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Optional envelope overrides; BODId/CreationDateTime auto-generated if omitted. */
|
|
||||||
export const _envelopeDoc = null;
|
|
||||||
/**
|
|
||||||
* @typedef {Object} EnvelopeOptions
|
|
||||||
* @property {string} [bodId]
|
|
||||||
* @property {string|Date} [creationDateTime]
|
|
||||||
* @property {{ component?: string, task?: string, referenceId?: string }} [sender]
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Per-call options */
|
|
||||||
export const _callOptionsDoc = null;
|
|
||||||
/**
|
|
||||||
* @typedef {Object} CallOptions
|
|
||||||
* @property {Routing} routing
|
|
||||||
* @property {EnvelopeOptions} [envelope]
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @template T @typedef {Object} RRResult { @property {boolean} success @property {T} [data] @property {any} parsed @property {{request:string,response:string}} xml @property {{transaction?:any,roRecord?:any}} [statusBlocks] @property {any} [applicationArea] } */
|
|
||||||
|
|
||||||
/** @typedef {Object} CombinedSearchName { @property {string} [fname] @property {string} [lname] @property {string} [mname] @property {string} [name] } */
|
|
||||||
/** @typedef {Object} CombinedSearchQuery
|
|
||||||
* @property {'phone'|'license'|'vin'|'name'|'nameRecId'|'stkNo'} kind Search kind (only one criterion allowed)
|
|
||||||
* @property {string|number|{phone:string}} [phone] Phone number criterion
|
|
||||||
* @property {string|number|{license:string}} [license] License plate criterion
|
|
||||||
* @property {string|number|{vin:string}} [vin] VIN criterion
|
|
||||||
* @property {CombinedSearchName} [name] Customer name criterion
|
|
||||||
* @property {string|number|{custId:string}|{nameRecId:string}} [nameRecId] Name record ID criterion
|
|
||||||
* @property {string|number|{stkNo:string}} [stkNo] Stock number criterion
|
|
||||||
* @property {number} [maxResults] Max results (capped at 50)
|
|
||||||
* @property {string} [make] Vehicle make filter
|
|
||||||
* @property {string|number} [model] Vehicle model filter
|
|
||||||
* @property {string|number} [year] Vehicle year filter
|
|
||||||
} */
|
|
||||||
/** @typedef {Object} CombinedSearchVehicleDetail { @property {string} [LicNo] } */
|
|
||||||
/** @typedef {Object} CombinedSearchVehicle { @property {string} [Vin] @property {string} [VehicleMake] @property {string|number} [VehicleYr] @property {string} [MdlNo] @property {string} [ModelDesc] @property {string} [Carline] @property {string} [ExtClrDesc] @property {string} [IntClrDesc] @property {string} [MakeName] @property {CombinedSearchVehicleDetail} [VehicleDetail] } */
|
|
||||||
/** @typedef {Object} CombinedSearchVehicleWarranty { @property {string} [ContractNumber] @property {string} [ExpirationDate] @property {string|number} [ExpirationMileage] } */
|
|
||||||
/** @typedef {Object} CombinedSearchAdvisorContactInfo { @property {string|number} [NameRecId] } */
|
|
||||||
/** @typedef {Object} CombinedSearchAdvisor { @property {CombinedSearchAdvisorContactInfo} [ContactInfo] } */
|
|
||||||
/** @typedef {Object} CombinedSearchVehicleServInfo { @property {string|number} [CustomerNo] @property {string|number} [SalesmanNo] @property {string|number} [InServiceDate] @property {string|number} [Mileage] @property {string} [TeamCode] @property {CombinedSearchVehicleWarranty} [VehExtWarranty] @property {CombinedSearchAdvisor} [Advisor] @property {string[]} [VehServComments] } */
|
|
||||||
/** @typedef {Object} CombinedSearchServVehicle { @property {CombinedSearchVehicle} [Vehicle] @property {CombinedSearchVehicleServInfo} [VehicleServInfo] } */
|
|
||||||
/** @typedef {Object} CombinedSearchNameId { @property {string|number} [NameRecId] @property {'I'|'B'} [IBFlag] @property {Object} [IndName] @property {Object} [BusName] } */
|
|
||||||
/** @typedef {Object} CombinedSearchNameContactId { @property {CombinedSearchNameId} [NameId] @property {Object[]} [Address] @property {Object[]} [ContactOptions] @property {Object[]} [Phone] @property {Object[]} [Email] } */
|
|
||||||
/** @typedef {Object} CombinedSearchMessage { @property {string|number} [MessageNo] @property {string} [Text] } */
|
|
||||||
/** @typedef {Object} CombinedSearchBlock { @property {CombinedSearchNameContactId} [NameContactId] @property {CombinedSearchServVehicle[]} [ServVehicle] @property {CombinedSearchMessage[]} [Message] } */
|
|
||||||
|
|
||||||
/** @typedef {Object} CustomerAddress { @property {'P'|'B'|'M'|'S'|'D'} [type] @property {string} line1 @property {string} [line2] @property {string} [city] @property {string} [state] @property {string} [postalCode] @property {string} [county] @property {string} [country] } */
|
|
||||||
/** @typedef {Object} CustomerPhone { @property {'H'|'W'|'M'|'C'|'F'} [type] @property {string|number} number @property {string|number} [extension] } */
|
|
||||||
/** @typedef {Object} CustomerEmail { @property {string} address } */
|
|
||||||
/** @typedef {Object} CustomerBirthDate { @property {'P'|'S'} [type] @property {string} date } */
|
|
||||||
/** @typedef {Object} CustomerSSN { @property {'P'|'S'} [type] @property {string} ssn } */
|
|
||||||
/** @typedef {Object} CustomerDriver { @property {'P'|'S'} [type] @property {string} licenseNumber @property {string} [licenseState] @property {string} [licenseExpDate] } */
|
|
||||||
/** @typedef {Object} CustomerChild { @property {string} name } */
|
|
||||||
/** @typedef {Object} CustomerPersonal { @property {'M'|'F'|'U'} [gender] @property {string} [otherName] @property {string} [anniversaryDate] @property {string} [employerName] @property {string} [employerPhone] @property {string} [occupation] @property {string} [optOut] @property {string} [optOutUse] @property {CustomerBirthDate[]} [birthDates] @property {CustomerSSN[]} [ssns] @property {CustomerDriver} [driver] @property {CustomerChild[]} [children] } */
|
|
||||||
/** @typedef {Object} CustomerDmsFollowup { @property {string} type @property {string} value } */
|
|
||||||
/** @typedef {Object} CustomerDmsInfo { @property {string} [taxExemptNum] @property {string} [salesTerritory] @property {string} [deliveryRoute] @property {string} [salesmanNum] @property {string} [lastContactMethod] @property {CustomerDmsFollowup[]} [followups] } */
|
|
||||||
/** @typedef {Object} InsertCustomerPayload
|
|
||||||
* @property {'I'|'B'} [ibFlag] Individual/Business flag (auto-inferred if omitted)
|
|
||||||
* @property {'R'|'W'|'I'|'Retail'|'Wholesale'|'Internal'} [customerType] Customer type
|
|
||||||
* @property {string} [createdBy] Username or identifier creating the record
|
|
||||||
* @property {string} [customerName] Business name (alias for lastName when business)
|
|
||||||
* @property {string} [lastName] Last name or business name
|
|
||||||
* @property {string} [firstName] First name (required for individuals)
|
|
||||||
* @property {string} [midName] Middle name
|
|
||||||
* @property {string} [salut] Salutation
|
|
||||||
* @property {string} [suffix] Suffix
|
|
||||||
* @property {CustomerAddress[]} [addresses] Addresses list (line1 required per address)
|
|
||||||
* @property {CustomerPhone[]} [phones] Phone numbers list (number required per phone)
|
|
||||||
* @property {CustomerEmail[]} [emails] Email list (first entry used)
|
|
||||||
* @property {CustomerPersonal} [personal] Personal details
|
|
||||||
* @property {CustomerDmsInfo} [dms] DMS-specific supplemental info
|
|
||||||
*/
|
|
||||||
/** @typedef {InsertCustomerPayload & { nameRecId: string|number }} UpdateCustomerPayload */
|
|
||||||
/** @typedef {Object} CustomerResponseData { @property {string|undefined} dmsRecKey @property {string|undefined} status @property {string|undefined} statusCode } */
|
|
||||||
|
|
||||||
/** @typedef {Object} ServiceVehicleDetail { @property {string} [licNo] } */
|
|
||||||
/** @typedef {Object} ServiceVehicleWarranty { @property {string} [contractNumber] @property {string} [expirationDate] @property {string|number} [expirationMileage] } */
|
|
||||||
/** @typedef {Object} ServiceVehicleAdvisorContactInfo { @property {string|number} nameRecId } */
|
|
||||||
/** @typedef {Object} ServiceVehicleServInfo { @property {string|number} customerNo @property {string|number} [salesmanNo] @property {string|number} [inServiceDate] @property {string|number} [mileage] @property {string} [teamCode] @property {ServiceVehicleWarranty} [vehExtWarranty] @property {{contactInfo?: ServiceVehicleAdvisorContactInfo}} [advisor] } */
|
|
||||||
/** @typedef {Object} InsertServiceVehiclePayload { @property {string} vin @property {string} [modelDesc] @property {string} [carline] @property {string} [extClrDesc] @property {string} [intClrDesc] @property {string} [trimDesc] @property {string} [bodyStyle] @property {string} [engineDesc] @property {string} [transDesc] @property {string|number} [year] @property {string|number} [odometer] @property {string} [odometerUnits] @property {ServiceVehicleDetail} [vehicleDetail] @property {ServiceVehicleServInfo} vehicleServInfo } */
|
|
||||||
/** @typedef {Object} ServiceVehicleResponseData { @property {string|undefined} status @property {string|undefined} statusCode } */
|
|
||||||
|
|
||||||
/** @typedef {Object} RepairOrderEstimate { @property {string|number} [parts] @property {string|number} [labor] @property {string|number} [total] @property {string} [estimateType] } */
|
|
||||||
/** @typedef {Object} RepairOrderTax { @property {'All'|'Cust'|'Intr'|'Warr'} [payType] @property {string} [taxCode] @property {string|number} [txblGrossAmt] @property {string|number} [grossTaxAmt] } */
|
|
||||||
/** @typedef {Object} RepairOrderLaborBill { @property {'All'|'Cust'|'Intr'|'Warr'} [payType] @property {string|number} [jobTotalHrs] @property {string|number} [billTime] @property {string|number} [billRate] } */
|
|
||||||
/** @typedef {Object} RepairOrderLaborCCC { @property {string} [cause] @property {string} [complaint] @property {string} [correction] } */
|
|
||||||
/** @typedef {Object} RepairOrderLaborAmount { @property {'All'|'Cust'|'Intr'|'Warr'} [payType] @property {string} [amtType] @property {string|number} [custPrice] @property {string|number} [totalAmt] } */
|
|
||||||
/** @typedef {Object} RepairOrderLaborOp { @property {string} [opCode] @property {string|number} [jobNo] @property {'T'|'N'} [custTxblNtxblFlag] @property {'T'|'N'} [warrTxblNtxblFlag] @property {'T'|'N'} [intrTxblNtxblFlag] @property {string} [custPayTypeFlag] @property {string} [warrPayTypeFlag] @property {string} [intrPayTypeFlag] @property {string} [vlrCode] @property {RepairOrderLaborBill} [bill] @property {RepairOrderLaborCCC} [ccc] @property {RepairOrderLaborAmount} [amount] } */
|
|
||||||
/** @typedef {Object} RepairOrderLabor { @property {RepairOrderLaborOp[]} [ops] } */
|
|
||||||
/** @typedef {Object} RepairOrderPartLine { @property {string} [partNo] @property {string} [partNoDesc] @property {string|number} [partQty] @property {string|number} [sale] @property {string|number} [cost] @property {string} [addDeleteFlag] } */
|
|
||||||
/** @typedef {Object} RepairOrderPartJob { @property {string} [opCode] @property {string|number} [jobNo] @property {RepairOrderPartLine[]} [lines] } */
|
|
||||||
/** @typedef {Object} RepairOrderPart { @property {RepairOrderPartJob[]} [jobs] } */
|
|
||||||
/** @typedef {Object} RepairOrderGGLineAmount { @property {'All'|'Cust'|'Intr'|'Warr'} [payType] @property {string} [amtType] @property {string|number} [custPrice] @property {string|number} [dlrCost] } */
|
|
||||||
/** @typedef {Object} RepairOrderGGLine { @property {string} [breakOut] @property {'G'|'P'|'S'|'F'} [itemType] @property {string} [itemDesc] @property {string|number} [custQty] @property {string|number} [warrQty] @property {string|number} [intrQty] @property {'T'|'N'} [custTxblNtxblFlag] @property {'T'|'N'} [warrTxblNtxblFlag] @property {'T'|'N'} [intrTxblNtxblFlag] @property {string} [custPayTypeFlag] @property {string} [warrPayTypeFlag] @property {string} [intrPayTypeFlag] @property {RepairOrderGGLineAmount} [amount] } */
|
|
||||||
/** @typedef {Object} RepairOrderGGOp { @property {string} [opCode] @property {string|number} [jobNo] @property {RepairOrderGGLine[]} [lines] } */
|
|
||||||
/** @typedef {Object} RepairOrderGG { @property {string|number} [roNo] @property {RepairOrderGGOp[]} [ops] } */
|
|
||||||
/** @typedef {Object} RepairOrderMiscLine { @property {string} [miscCode] @property {'T'|'N'} [custTxblNtxblFlag] @property {'T'|'N'} [warrTxblNtxblFlag] @property {'T'|'N'} [intrTxblNtxblFlag] @property {string} [custPayTypeFlag] @property {string} [warrPayTypeFlag] @property {string} [intrPayTypeFlag] @property {string|number} [codeAmt] } */
|
|
||||||
/** @typedef {Object} RepairOrderMiscOp { @property {string} [opCode] @property {string|number} [jobNo] @property {RepairOrderMiscLine[]} [lines] } */
|
|
||||||
/** @typedef {Object} RepairOrderMisc { @property {string|number} [roNo] @property {RepairOrderMiscOp[]} [ops] } */
|
|
||||||
/** @typedef {Object} CreateRepairOrderPayload
|
|
||||||
* @property {string|number} customerNo Customer number (CustNo)
|
|
||||||
* @property {string|number} departmentType Department type (DeptType)
|
|
||||||
* @property {string} vin Vehicle VIN (Vin)
|
|
||||||
* @property {string|number} outsdRoNo External RO identifier
|
|
||||||
* @property {string|number} [advisorNo] Advisor number
|
|
||||||
* @property {string|number} [tagNo] Tag number
|
|
||||||
* @property {string|number} [mileageIn] Mileage in value
|
|
||||||
* @property {string} [roComment] Repair order comment
|
|
||||||
* @property {RepairOrderEstimate} [estimate] Repair order estimate block
|
|
||||||
* @property {RepairOrderTax} [tax] Tax block
|
|
||||||
* @property {RepairOrderLabor} [rolabor] Labor operations
|
|
||||||
* @property {RepairOrderPart} [ropart] Parts jobs/lines
|
|
||||||
* @property {RepairOrderGG} [rogg] General goods lines
|
|
||||||
* @property {RepairOrderMisc} [romisc] Miscellaneous charges
|
|
||||||
*/
|
|
||||||
/** @typedef {Object} UpdateRepairOrderPayload { @property {'Y'|'N'} finalUpdate @property {string|number} outsdRoNo @property {string|number} [roNo] @property {string|number} [customerNo] @property {string|number} [tagNo] @property {string|number} [departmentType] @property {string} [vin] @property {string|number} [mileageIn] @property {string|number} [mileageOut] @property {string} [roComment] @property {RepairOrderEstimate} [estimate] @property {RepairOrderTax} [tax] @property {RepairOrderLabor} [rolabor] @property {RepairOrderPart} [ropart] @property {RepairOrderGG} [rogg] @property {RepairOrderMisc} [romisc] } */
|
|
||||||
/** @typedef {Object} RepairOrderData { @property {string|undefined} status @property {string|undefined} date @property {string|undefined} time @property {string|undefined} outsdRoNo @property {string|undefined} dmsRoNo @property {string|undefined} errorMessage } */
|
|
||||||
|
|
||||||
/** @typedef {Object} GetAdvisorsParams { @property {'S'|'P'|'B'|'SERVICE'|'PARTS'|'BODY'|'BODYSHOP'|'BODY SHOP'} department @property {string|number} [advisorNumber] @property {number} [maxResults] } */
|
|
||||||
/** @typedef {Object} AdvisorRow { @property {string|number|undefined} advisorId @property {string|undefined} firstName @property {string|undefined} lastName @property {'S'|'P'|'B'|undefined} department } */
|
|
||||||
/** @typedef {Object} GetPartsParams { @property {string|number} roNumber } */
|
|
||||||
/** @typedef {Object} PartRow { @property {string|undefined} partNumber @property {string|undefined} partDescription @property {string|number|undefined} quantityOrdered @property {string|number|undefined} quantityShipped @property {string|number|undefined} price @property {string|number|undefined} cost @property {string|undefined} processedFlag @property {string|undefined} addOrDelete } */
|
|
||||||
|
|
||||||
// Marker exports (no runtime impact)
|
|
||||||
export const _extendedTypesDoc = null;
|
|
||||||
1035
server/rr/lib/types/types.d.ts
vendored
1035
server/rr/lib/types/types.d.ts
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,923 +0,0 @@
|
|||||||
/**
|
|
||||||
* THIS IS A COPY of CDKCalculateAllocations, modified to:
|
|
||||||
* - Only calculate allocations needed for Reynolds & RR exports
|
|
||||||
* - Keep sales broken down into buckets (parts, taxable labor, non-taxable labor, extras)
|
|
||||||
* - Add extra logging for easier debugging
|
|
||||||
*
|
|
||||||
* Original comments follow.
|
|
||||||
*/
|
|
||||||
|
|
||||||
const { GraphQLClient } = require("graphql-request");
|
|
||||||
const Dinero = require("dinero.js");
|
|
||||||
const _ = require("lodash");
|
|
||||||
|
|
||||||
const queries = require("../graphql-client/queries");
|
|
||||||
const CreateRRLogEvent = require("./rr-logger-event");
|
|
||||||
const InstanceManager = require("../utils/instanceMgr").default;
|
|
||||||
|
|
||||||
const { DiscountNotAlreadyCounted } = InstanceManager({
|
|
||||||
imex: require("../job/job-totals"),
|
|
||||||
rome: require("../job/job-totals-USA")
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ============================
|
|
||||||
* Helpers / Summarizers
|
|
||||||
* ============================
|
|
||||||
*/
|
|
||||||
|
|
||||||
const summarizeMoney = (dinero) => {
|
|
||||||
if (!dinero || typeof dinero.getAmount !== "function") return { cents: null };
|
|
||||||
return { cents: dinero.getAmount() };
|
|
||||||
};
|
|
||||||
|
|
||||||
const summarizeTaxAllocations = (tax) =>
|
|
||||||
Object.entries(tax || {}).map(([key, entry]) => ({
|
|
||||||
key,
|
|
||||||
sale: summarizeMoney(entry?.sale),
|
|
||||||
cost: summarizeMoney(entry?.cost)
|
|
||||||
}));
|
|
||||||
|
|
||||||
const summarizeAllocationsArray = (arr) =>
|
|
||||||
(arr || []).map((a) => ({
|
|
||||||
center: a.center || a.tax || null,
|
|
||||||
tax: a.tax || null,
|
|
||||||
sale: summarizeMoney(a.sale || a.totalSale || Dinero()),
|
|
||||||
cost: summarizeMoney(a.cost)
|
|
||||||
}));
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal per-center bucket shape for *sales*.
|
|
||||||
* We keep separate buckets for RR so we can split
|
|
||||||
* taxable vs non-taxable labor lines later.
|
|
||||||
*/
|
|
||||||
function emptyCenterBucket() {
|
|
||||||
const zero = Dinero();
|
|
||||||
return {
|
|
||||||
partsSale: zero, // parts sale
|
|
||||||
laborTaxableSale: zero, // labor that should be taxed in RR
|
|
||||||
laborNonTaxableSale: zero, // labor that should NOT be taxed in RR
|
|
||||||
extrasSale: zero // MAPA/MASH/towing/storage/PAO/etc
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function ensureCenterBucket(hash, center) {
|
|
||||||
if (!hash[center]) hash[center] = emptyCenterBucket();
|
|
||||||
return hash[center];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thin logger wrapper: always uses CreateRRLogEvent,
|
|
||||||
* with structured data passed via meta arg.
|
|
||||||
*/
|
|
||||||
function createDebugLogger(connectionData) {
|
|
||||||
return (msg, meta, level = "DEBUG") => {
|
|
||||||
const baseMsg = "rr-calculate-allocations " + msg;
|
|
||||||
CreateRRLogEvent(connectionData, level, baseMsg, meta !== undefined ? meta : undefined);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Query job data for allocations.
|
|
||||||
*/
|
|
||||||
async function QueryJobData(connectionData, token, jobid) {
|
|
||||||
CreateRRLogEvent(connectionData, "DEBUG", "Querying job data for allocations", { jobid });
|
|
||||||
|
|
||||||
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
|
|
||||||
const result = await client.setHeaders({ Authorization: token }).request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
|
|
||||||
|
|
||||||
return result.jobs_by_pk;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build tax allocation object depending on environment (imex vs rome).
|
|
||||||
* This matches the original logic, just split into its own helper.
|
|
||||||
*/
|
|
||||||
function buildTaxAllocations(bodyshop, job) {
|
|
||||||
return InstanceManager({
|
|
||||||
executeFunction: true,
|
|
||||||
deubg: true,
|
|
||||||
args: [],
|
|
||||||
imex: () => ({
|
|
||||||
state: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.state.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.state_tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.state,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.state
|
|
||||||
},
|
|
||||||
federal: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.federal.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.federal_tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.federal,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.federal
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
rome: () => ({
|
|
||||||
tax_ty1: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.tax_ty1.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty1Tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.tax_ty1,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.tax_ty1
|
|
||||||
},
|
|
||||||
tax_ty2: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.tax_ty2.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty2Tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.tax_ty2,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.tax_ty2
|
|
||||||
},
|
|
||||||
tax_ty3: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.tax_ty3.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty3Tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.tax_ty3,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.tax_ty3
|
|
||||||
},
|
|
||||||
tax_ty4: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.tax_ty4.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty4Tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.tax_ty4,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.tax_ty4
|
|
||||||
},
|
|
||||||
tax_ty5: {
|
|
||||||
center: bodyshop.md_responsibility_centers.taxes.tax_ty5.name,
|
|
||||||
sale: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty5Tax),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: bodyshop.md_responsibility_centers.taxes.tax_ty5,
|
|
||||||
costCenter: bodyshop.md_responsibility_centers.taxes.tax_ty5
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decide if a labor line is taxable vs non-taxable for RR.
|
|
||||||
*/
|
|
||||||
function isLaborTaxable(line) {
|
|
||||||
return line.tax_part;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build profitCenterHash from joblines (parts + labor) and detect MAPA/MASH presence.
|
|
||||||
* Now stores *buckets* instead of a single Dinero per center.
|
|
||||||
*/
|
|
||||||
function buildProfitCenterHash(job, debugLog) {
|
|
||||||
let hasMapaLine = false;
|
|
||||||
let hasMashLine = false;
|
|
||||||
|
|
||||||
const profitCenterHash = job.joblines.reduce((acc, val) => {
|
|
||||||
// MAPA line?
|
|
||||||
if (val.db_ref === "936008") {
|
|
||||||
if (!hasMapaLine) {
|
|
||||||
debugLog("Detected existing MAPA line in joblines", {
|
|
||||||
joblineId: val.id,
|
|
||||||
db_ref: val.db_ref
|
|
||||||
});
|
|
||||||
}
|
|
||||||
hasMapaLine = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// MASH line?
|
|
||||||
if (val.db_ref === "936007") {
|
|
||||||
if (!hasMashLine) {
|
|
||||||
debugLog("Detected existing MASH line in joblines", {
|
|
||||||
joblineId: val.id,
|
|
||||||
db_ref: val.db_ref
|
|
||||||
});
|
|
||||||
}
|
|
||||||
hasMashLine = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parts
|
|
||||||
if (val.profitcenter_part) {
|
|
||||||
const bucket = ensureCenterBucket(acc, val.profitcenter_part);
|
|
||||||
|
|
||||||
let amount = Dinero({
|
|
||||||
amount: Math.round(val.act_price * 100)
|
|
||||||
}).multiply(val.part_qty || 1);
|
|
||||||
|
|
||||||
const hasDiscount = (val.prt_dsmk_m && val.prt_dsmk_m !== 0) || (val.prt_dsmk_p && val.prt_dsmk_p !== 0);
|
|
||||||
|
|
||||||
if (hasDiscount && DiscountNotAlreadyCounted(val, job.joblines)) {
|
|
||||||
const discount = val.prt_dsmk_m
|
|
||||||
? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
|
|
||||||
: Dinero({
|
|
||||||
amount: Math.round(val.act_price * 100)
|
|
||||||
})
|
|
||||||
.multiply(val.part_qty || 0)
|
|
||||||
.percentage(Math.abs(val.prt_dsmk_p || 0))
|
|
||||||
.multiply(val.prt_dsmk_p > 0 ? 1 : -1);
|
|
||||||
|
|
||||||
amount = amount.add(discount);
|
|
||||||
}
|
|
||||||
|
|
||||||
bucket.partsSale = bucket.partsSale.add(amount);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Labor
|
|
||||||
if (val.profitcenter_labor && val.mod_lbr_ty) {
|
|
||||||
const bucket = ensureCenterBucket(acc, val.profitcenter_labor);
|
|
||||||
|
|
||||||
const rateKey = `rate_${val.mod_lbr_ty.toLowerCase()}`;
|
|
||||||
const rate = job[rateKey];
|
|
||||||
|
|
||||||
const laborAmount = Dinero({
|
|
||||||
amount: Math.round(rate * 100)
|
|
||||||
}).multiply(val.mod_lb_hrs);
|
|
||||||
|
|
||||||
if (isLaborTaxable(val)) {
|
|
||||||
bucket.laborTaxableSale = bucket.laborTaxableSale.add(laborAmount);
|
|
||||||
} else {
|
|
||||||
bucket.laborNonTaxableSale = bucket.laborNonTaxableSale.add(laborAmount);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return acc;
|
|
||||||
}, {});
|
|
||||||
|
|
||||||
debugLog("profitCenterHash after joblines", {
|
|
||||||
hasMapaLine,
|
|
||||||
hasMashLine,
|
|
||||||
centers: Object.entries(profitCenterHash).map(([center, b]) => ({
|
|
||||||
center,
|
|
||||||
parts: summarizeMoney(b.partsSale),
|
|
||||||
laborTaxable: summarizeMoney(b.laborTaxableSale),
|
|
||||||
laborNonTaxable: summarizeMoney(b.laborNonTaxableSale),
|
|
||||||
extras: summarizeMoney(b.extrasSale)
|
|
||||||
}))
|
|
||||||
});
|
|
||||||
|
|
||||||
return { profitCenterHash, hasMapaLine, hasMashLine };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build costCenterHash from bills and timetickets.
|
|
||||||
*/
|
|
||||||
function buildCostCenterHash(job, selectedDmsAllocationConfig, disablebillwip, debugLog) {
|
|
||||||
let costCenterHash = {};
|
|
||||||
|
|
||||||
// 1) Bills -> costs
|
|
||||||
debugLog("disablebillwip flag", { disablebillwip });
|
|
||||||
|
|
||||||
if (!disablebillwip) {
|
|
||||||
costCenterHash = job.bills.reduce((billAcc, bill) => {
|
|
||||||
bill.billlines.forEach((line) => {
|
|
||||||
const targetCenter = selectedDmsAllocationConfig.costs[line.cost_center];
|
|
||||||
if (!targetCenter) return;
|
|
||||||
|
|
||||||
if (!billAcc[targetCenter]) billAcc[targetCenter] = Dinero();
|
|
||||||
|
|
||||||
const lineDinero = Dinero({
|
|
||||||
amount: Math.round((line.actual_cost || 0) * 100)
|
|
||||||
})
|
|
||||||
.multiply(line.quantity)
|
|
||||||
.multiply(bill.is_credit_memo ? -1 : 1);
|
|
||||||
|
|
||||||
billAcc[targetCenter] = billAcc[targetCenter].add(lineDinero);
|
|
||||||
});
|
|
||||||
return billAcc;
|
|
||||||
}, {});
|
|
||||||
}
|
|
||||||
|
|
||||||
debugLog("costCenterHash after bills (pre-timetickets)", {
|
|
||||||
centers: Object.entries(costCenterHash || {}).map(([center, dinero]) => ({
|
|
||||||
center,
|
|
||||||
...summarizeMoney(dinero)
|
|
||||||
}))
|
|
||||||
});
|
|
||||||
|
|
||||||
// 2) Timetickets -> costs
|
|
||||||
job.timetickets.forEach((ticket) => {
|
|
||||||
const effectiveHours =
|
|
||||||
ticket.employee && ticket.employee.flat_rate ? ticket.productivehrs || 0 : ticket.actualhrs || 0;
|
|
||||||
|
|
||||||
const ticketTotal = Dinero({
|
|
||||||
amount: Math.round(ticket.rate * effectiveHours * 100)
|
|
||||||
});
|
|
||||||
|
|
||||||
const targetCenter = selectedDmsAllocationConfig.costs[ticket.ciecacode];
|
|
||||||
if (!targetCenter) return;
|
|
||||||
|
|
||||||
if (!costCenterHash[targetCenter]) costCenterHash[targetCenter] = Dinero();
|
|
||||||
costCenterHash[targetCenter] = costCenterHash[targetCenter].add(ticketTotal);
|
|
||||||
});
|
|
||||||
|
|
||||||
debugLog("costCenterHash after timetickets", {
|
|
||||||
centers: Object.entries(costCenterHash || {}).map(([center, dinero]) => ({
|
|
||||||
center,
|
|
||||||
...summarizeMoney(dinero)
|
|
||||||
}))
|
|
||||||
});
|
|
||||||
|
|
||||||
return costCenterHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add manual MAPA / MASH sales where needed (into extrasSale bucket).
|
|
||||||
*/
|
|
||||||
function applyMapaMashManualLines({
|
|
||||||
job,
|
|
||||||
selectedDmsAllocationConfig,
|
|
||||||
bodyshop,
|
|
||||||
profitCenterHash,
|
|
||||||
hasMapaLine,
|
|
||||||
hasMashLine,
|
|
||||||
debugLog
|
|
||||||
}) {
|
|
||||||
// MAPA
|
|
||||||
if (!hasMapaLine && job.job_totals.rates.mapa.total.amount > 0) {
|
|
||||||
const mapaAccountName = selectedDmsAllocationConfig.profits.MAPA;
|
|
||||||
const mapaAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === mapaAccountName);
|
|
||||||
|
|
||||||
if (mapaAccount) {
|
|
||||||
debugLog("Adding MAPA Line Manually", {
|
|
||||||
mapaAccountName,
|
|
||||||
amount: summarizeMoney(Dinero(job.job_totals.rates.mapa.total))
|
|
||||||
});
|
|
||||||
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, mapaAccountName);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(Dinero(job.job_totals.rates.mapa.total));
|
|
||||||
} else {
|
|
||||||
debugLog("NO MAPA ACCOUNT FOUND!!", { mapaAccountName });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MASH
|
|
||||||
if (!hasMashLine && job.job_totals.rates.mash.total.amount > 0) {
|
|
||||||
const mashAccountName = selectedDmsAllocationConfig.profits.MASH;
|
|
||||||
const mashAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === mashAccountName);
|
|
||||||
|
|
||||||
if (mashAccount) {
|
|
||||||
debugLog("Adding MASH Line Manually", {
|
|
||||||
mashAccountName,
|
|
||||||
amount: summarizeMoney(Dinero(job.job_totals.rates.mash.total))
|
|
||||||
});
|
|
||||||
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, mashAccountName);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(Dinero(job.job_totals.rates.mash.total));
|
|
||||||
} else {
|
|
||||||
debugLog("NO MASH ACCOUNT FOUND!!", { mashAccountName });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return profitCenterHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Apply materials costing (MAPA/MASH cost side) when configured.
|
|
||||||
*/
|
|
||||||
function applyMaterialsCosting({ job, bodyshop, selectedDmsAllocationConfig, costCenterHash, debugLog }) {
|
|
||||||
const { cdk_configuration } = bodyshop || {};
|
|
||||||
|
|
||||||
if (!cdk_configuration?.sendmaterialscosting) return costCenterHash;
|
|
||||||
|
|
||||||
debugLog("sendmaterialscosting enabled", {
|
|
||||||
sendmaterialscosting: cdk_configuration.sendmaterialscosting,
|
|
||||||
use_paint_scale_data: job.bodyshop.use_paint_scale_data,
|
|
||||||
mixdataLength: job.mixdata?.length || 0
|
|
||||||
});
|
|
||||||
|
|
||||||
const percent = cdk_configuration.sendmaterialscosting;
|
|
||||||
|
|
||||||
// Paint Mat (MAPA)
|
|
||||||
const mapaAccountName = selectedDmsAllocationConfig.costs.MAPA;
|
|
||||||
const mapaAccount = bodyshop.md_responsibility_centers.costs.find((c) => c.name === mapaAccountName);
|
|
||||||
|
|
||||||
if (mapaAccount) {
|
|
||||||
if (!costCenterHash[mapaAccountName]) costCenterHash[mapaAccountName] = Dinero();
|
|
||||||
|
|
||||||
if (job.bodyshop.use_paint_scale_data === true) {
|
|
||||||
if (job.mixdata && job.mixdata.length > 0) {
|
|
||||||
debugLog("Using mixdata for MAPA cost", {
|
|
||||||
mapaAccountName,
|
|
||||||
totalliquidcost: job.mixdata[0] && job.mixdata[0].totalliquidcost
|
|
||||||
});
|
|
||||||
|
|
||||||
costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
|
|
||||||
Dinero({
|
|
||||||
amount: Math.round(((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100)
|
|
||||||
})
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
debugLog("Using percentage of MAPA total (no mixdata)", { mapaAccountName });
|
|
||||||
|
|
||||||
costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
|
|
||||||
Dinero(job.job_totals.rates.mapa.total).percentage(percent)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
debugLog("Using percentage of MAPA total (no paint scale data)", { mapaAccountName });
|
|
||||||
|
|
||||||
costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
|
|
||||||
Dinero(job.job_totals.rates.mapa.total).percentage(percent)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
debugLog("NO MAPA ACCOUNT FOUND (costs)!!", { mapaAccountName });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shop Mat (MASH)
|
|
||||||
const mashAccountName = selectedDmsAllocationConfig.costs.MASH;
|
|
||||||
const mashAccount = bodyshop.md_responsibility_centers.costs.find((c) => c.name === mashAccountName);
|
|
||||||
|
|
||||||
if (mashAccount) {
|
|
||||||
debugLog("Adding MASH material costing", { mashAccountName });
|
|
||||||
|
|
||||||
if (!costCenterHash[mashAccountName]) costCenterHash[mashAccountName] = Dinero();
|
|
||||||
costCenterHash[mashAccountName] = costCenterHash[mashAccountName].add(
|
|
||||||
Dinero(job.job_totals.rates.mash.total).percentage(percent)
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
debugLog("NO MASH ACCOUNT FOUND (costs)!!", { mashAccountName });
|
|
||||||
}
|
|
||||||
|
|
||||||
return costCenterHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Apply non-tax extras (PVRT, towing, storage, PAO).
|
|
||||||
* Extras go into the extrasSale bucket.
|
|
||||||
*/
|
|
||||||
function applyExtras({ job, bodyshop, selectedDmsAllocationConfig, profitCenterHash, taxAllocations, debugLog }) {
|
|
||||||
const { ca_bc_pvrt } = job;
|
|
||||||
|
|
||||||
// BC PVRT -> state tax
|
|
||||||
if (ca_bc_pvrt) {
|
|
||||||
debugLog("Adding PVRT to state tax allocation", { ca_bc_pvrt });
|
|
||||||
|
|
||||||
taxAllocations.state.sale = taxAllocations.state.sale.add(Dinero({ amount: Math.round((ca_bc_pvrt || 0) * 100) }));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Towing
|
|
||||||
if (job.towing_payable && job.towing_payable !== 0) {
|
|
||||||
const towAccountName = selectedDmsAllocationConfig.profits.TOW;
|
|
||||||
const towAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === towAccountName);
|
|
||||||
|
|
||||||
if (towAccount) {
|
|
||||||
debugLog("Adding towing_payable to TOW account", {
|
|
||||||
towAccountName,
|
|
||||||
towing_payable: job.towing_payable
|
|
||||||
});
|
|
||||||
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, towAccountName);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(
|
|
||||||
Dinero({
|
|
||||||
amount: Math.round((job.towing_payable || 0) * 100)
|
|
||||||
})
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
debugLog("NO TOW ACCOUNT FOUND!!", { towAccountName });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Storage (shares TOW account)
|
|
||||||
if (job.storage_payable && job.storage_payable !== 0) {
|
|
||||||
const storageAccountName = selectedDmsAllocationConfig.profits.TOW;
|
|
||||||
const towAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === storageAccountName);
|
|
||||||
|
|
||||||
if (towAccount) {
|
|
||||||
debugLog("Adding storage_payable to TOW account", {
|
|
||||||
storageAccountName,
|
|
||||||
storage_payable: job.storage_payable
|
|
||||||
});
|
|
||||||
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, storageAccountName);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(
|
|
||||||
Dinero({
|
|
||||||
amount: Math.round((job.storage_payable || 0) * 100)
|
|
||||||
})
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
debugLog("NO STORAGE/TOW ACCOUNT FOUND!!", { storageAccountName });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bottom line adjustment -> PAO
|
|
||||||
if (job.adjustment_bottom_line && job.adjustment_bottom_line !== 0) {
|
|
||||||
const otherAccountName = selectedDmsAllocationConfig.profits.PAO;
|
|
||||||
const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === otherAccountName);
|
|
||||||
|
|
||||||
if (otherAccount) {
|
|
||||||
debugLog("Adding adjustment_bottom_line to PAO", {
|
|
||||||
otherAccountName,
|
|
||||||
adjustment_bottom_line: job.adjustment_bottom_line
|
|
||||||
});
|
|
||||||
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, otherAccountName);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(
|
|
||||||
Dinero({
|
|
||||||
amount: Math.round((job.adjustment_bottom_line || 0) * 100)
|
|
||||||
})
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
debugLog("NO PAO ACCOUNT FOUND!!", { otherAccountName });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { profitCenterHash, taxAllocations };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Apply Rome-specific profile adjustments (parts + rates).
|
|
||||||
* These also feed into the *sales* buckets.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* Apply Rome-specific profile adjustments (parts + rates).
|
|
||||||
* These also feed into the *sales* buckets.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* Apply Rome-specific profile adjustments (parts + rates).
|
|
||||||
* These also feed into the *sales* buckets.
|
|
||||||
*/
|
|
||||||
function applyRomeProfileAdjustments({
|
|
||||||
job,
|
|
||||||
bodyshop,
|
|
||||||
selectedDmsAllocationConfig,
|
|
||||||
profitCenterHash,
|
|
||||||
debugLog,
|
|
||||||
connectionData
|
|
||||||
}) {
|
|
||||||
// Only relevant for Rome instances
|
|
||||||
if (!InstanceManager({ rome: true })) return profitCenterHash;
|
|
||||||
|
|
||||||
if (!selectedDmsAllocationConfig || !selectedDmsAllocationConfig.profits) {
|
|
||||||
debugLog("ROME profile adjustments skipped (no selectedDmsAllocationConfig.profits)");
|
|
||||||
return profitCenterHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
const partsAdjustments = job?.job_totals?.parts?.adjustments || {};
|
|
||||||
const rateMap = job?.job_totals?.rates || {};
|
|
||||||
|
|
||||||
debugLog("ROME profile adjustments block entered", {
|
|
||||||
partAdjustmentKeys: Object.keys(partsAdjustments),
|
|
||||||
rateKeys: Object.keys(rateMap)
|
|
||||||
});
|
|
||||||
|
|
||||||
// Parts adjustments
|
|
||||||
Object.keys(partsAdjustments).forEach((key) => {
|
|
||||||
const accountName = selectedDmsAllocationConfig.profits[key];
|
|
||||||
const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
|
|
||||||
|
|
||||||
if (otherAccount) {
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, accountName);
|
|
||||||
|
|
||||||
const adjMoney = Dinero(partsAdjustments[key]);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(adjMoney);
|
|
||||||
|
|
||||||
debugLog("Added parts adjustment", {
|
|
||||||
key,
|
|
||||||
accountName,
|
|
||||||
adjustment: summarizeMoney(adjMoney)
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
CreateRRLogEvent(
|
|
||||||
connectionData,
|
|
||||||
"ERROR",
|
|
||||||
"Error encountered in rr-calculate-allocations. Unable to find parts adjustment account.",
|
|
||||||
{ accountName, key }
|
|
||||||
);
|
|
||||||
debugLog("Missing parts adjustment account", { key, accountName });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Labor / materials adjustments (match CDK semantics: check `adjustment`, add `adjustments`)
|
|
||||||
Object.keys(rateMap).forEach((key) => {
|
|
||||||
const rate = rateMap[key];
|
|
||||||
if (!rate || !rate.adjustment) return;
|
|
||||||
|
|
||||||
const checkMoney = Dinero(rate.adjustment);
|
|
||||||
if (checkMoney.isZero()) return;
|
|
||||||
|
|
||||||
const accountName = selectedDmsAllocationConfig.profits[key.toUpperCase()];
|
|
||||||
const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
|
|
||||||
|
|
||||||
if (otherAccount) {
|
|
||||||
const bucket = ensureCenterBucket(profitCenterHash, accountName);
|
|
||||||
|
|
||||||
// Note: we intentionally use `rate.adjustments` here to mirror CDK behaviour
|
|
||||||
const adjMoney = Dinero(rate.adjustments);
|
|
||||||
bucket.extrasSale = bucket.extrasSale.add(adjMoney);
|
|
||||||
|
|
||||||
debugLog("Added rate adjustment", {
|
|
||||||
key,
|
|
||||||
accountName,
|
|
||||||
adjustment: summarizeMoney(adjMoney)
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
CreateRRLogEvent(
|
|
||||||
connectionData,
|
|
||||||
"ERROR",
|
|
||||||
"Error encountered in rr-calculate-allocations. Unable to find rate adjustment account.",
|
|
||||||
{ accountName, key }
|
|
||||||
);
|
|
||||||
debugLog("Missing rate adjustment account", { key, accountName });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return profitCenterHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build job-level profit/cost allocations for each center.
|
|
||||||
* PUBLIC SHAPE (for RR):
|
|
||||||
* {
|
|
||||||
* center,
|
|
||||||
* partsSale,
|
|
||||||
* laborTaxableSale,
|
|
||||||
* laborNonTaxableSale,
|
|
||||||
* extrasSale,
|
|
||||||
* totalSale,
|
|
||||||
* cost,
|
|
||||||
* profitCenter,
|
|
||||||
* costCenter
|
|
||||||
* }
|
|
||||||
*/
|
|
||||||
function buildJobAllocations(bodyshop, profitCenterHash, costCenterHash, debugLog) {
|
|
||||||
const centers = _.union(Object.keys(profitCenterHash), Object.keys(costCenterHash));
|
|
||||||
|
|
||||||
const jobAllocations = centers.map((center) => {
|
|
||||||
const bucket = profitCenterHash[center] || emptyCenterBucket();
|
|
||||||
|
|
||||||
const totalSale = bucket.partsSale
|
|
||||||
.add(bucket.laborTaxableSale)
|
|
||||||
.add(bucket.laborNonTaxableSale)
|
|
||||||
.add(bucket.extrasSale);
|
|
||||||
|
|
||||||
const profitCenter = bodyshop.md_responsibility_centers.profits.find((c) => c.name === center);
|
|
||||||
const costCenter = bodyshop.md_responsibility_centers.costs.find((c) => c.name === center);
|
|
||||||
|
|
||||||
return {
|
|
||||||
center,
|
|
||||||
|
|
||||||
partsSale: bucket.partsSale,
|
|
||||||
laborTaxableSale: bucket.laborTaxableSale,
|
|
||||||
laborNonTaxableSale: bucket.laborNonTaxableSale,
|
|
||||||
extrasSale: bucket.extrasSale,
|
|
||||||
totalSale,
|
|
||||||
|
|
||||||
cost: costCenterHash[center] || Dinero(),
|
|
||||||
|
|
||||||
profitCenter,
|
|
||||||
costCenter
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
debugLog(
|
|
||||||
"jobAllocations built",
|
|
||||||
jobAllocations.map((row) => ({
|
|
||||||
center: row.center,
|
|
||||||
parts: summarizeMoney(row.partsSale),
|
|
||||||
laborTaxable: summarizeMoney(row.laborTaxableSale),
|
|
||||||
laborNonTaxable: summarizeMoney(row.laborNonTaxableSale),
|
|
||||||
extras: summarizeMoney(row.extrasSale),
|
|
||||||
totalSale: summarizeMoney(row.totalSale),
|
|
||||||
cost: summarizeMoney(row.cost)
|
|
||||||
}))
|
|
||||||
);
|
|
||||||
|
|
||||||
return jobAllocations;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build tax allocations array from taxAllocations hash.
|
|
||||||
* Shape is unchanged from original (except extra logging).
|
|
||||||
*/
|
|
||||||
function buildTaxAllocArray(taxAllocations, selectedDmsAllocationConfig, debugLog) {
|
|
||||||
const taxAllocArray = Object.keys(taxAllocations)
|
|
||||||
.filter((key) => taxAllocations[key].sale.getAmount() > 0 || taxAllocations[key].cost.getAmount() > 0)
|
|
||||||
.map((key) => {
|
|
||||||
if (
|
|
||||||
key === "federal" &&
|
|
||||||
selectedDmsAllocationConfig.gst_override &&
|
|
||||||
selectedDmsAllocationConfig.gst_override !== ""
|
|
||||||
) {
|
|
||||||
const ret = { ...taxAllocations[key], tax: key };
|
|
||||||
ret.costCenter.dms_acctnumber = selectedDmsAllocationConfig.gst_override;
|
|
||||||
ret.profitCenter.dms_acctnumber = selectedDmsAllocationConfig.gst_override;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
return { ...taxAllocations[key], tax: key };
|
|
||||||
});
|
|
||||||
|
|
||||||
debugLog("taxAllocArray built", summarizeAllocationsArray(taxAllocArray));
|
|
||||||
return taxAllocArray;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build adjustment allocations (ttl_adjustment + ttl_tax_adjustment).
|
|
||||||
*/
|
|
||||||
function buildAdjustmentAllocations(job, bodyshop, debugLog) {
|
|
||||||
const ttlAdjArray = job.job_totals.totals.ttl_adjustment
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
center: "SUB ADJ",
|
|
||||||
sale: Dinero(job.job_totals.totals.ttl_adjustment),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: {
|
|
||||||
name: "SUB ADJ",
|
|
||||||
accountdesc: "SUB ADJ",
|
|
||||||
accountitem: "SUB ADJ",
|
|
||||||
accountname: "SUB ADJ",
|
|
||||||
dms_acctnumber: bodyshop.md_responsibility_centers.ttl_adjustment.dms_acctnumber
|
|
||||||
},
|
|
||||||
costCenter: {}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const ttlTaxAdjArray = job.job_totals.totals.ttl_tax_adjustment
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
center: "TAX ADJ",
|
|
||||||
sale: Dinero(job.job_totals.totals.ttl_tax_adjustment),
|
|
||||||
cost: Dinero(),
|
|
||||||
profitCenter: {
|
|
||||||
name: "TAX ADJ",
|
|
||||||
accountdesc: "TAX ADJ",
|
|
||||||
accountitem: "TAX ADJ",
|
|
||||||
accountname: "TAX ADJ",
|
|
||||||
dms_acctnumber: bodyshop.md_responsibility_centers.ttl_tax_adjustment.dms_acctnumber
|
|
||||||
},
|
|
||||||
costCenter: {}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
: [];
|
|
||||||
|
|
||||||
if (ttlAdjArray.length) {
|
|
||||||
debugLog("ttl_adjustment allocation added", summarizeAllocationsArray(ttlAdjArray));
|
|
||||||
}
|
|
||||||
if (ttlTaxAdjArray.length) {
|
|
||||||
debugLog("ttl_tax_adjustment allocation added", summarizeAllocationsArray(ttlTaxAdjArray));
|
|
||||||
}
|
|
||||||
|
|
||||||
return { ttlAdjArray, ttlTaxAdjArray };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Core allocation calculation – RR-only, with bucketed sales.
|
|
||||||
*
|
|
||||||
* RETURN SHAPE:
|
|
||||||
* {
|
|
||||||
* jobAllocations, // per-center buckets (see buildJobAllocations)
|
|
||||||
* taxAllocArray, // tax allocations
|
|
||||||
* ttlAdjArray, // ttl_adjustment allocations
|
|
||||||
* ttlTaxAdjArray // ttl_tax_adjustment allocations
|
|
||||||
* }
|
|
||||||
*/
|
|
||||||
function calculateAllocations(connectionData, job) {
|
|
||||||
const { bodyshop } = job;
|
|
||||||
const debugLog = createDebugLogger(connectionData);
|
|
||||||
|
|
||||||
debugLog("ENTER", {
|
|
||||||
bodyshopId: bodyshop?.id,
|
|
||||||
bodyshopName: bodyshop?.name,
|
|
||||||
dms_allocation: job.dms_allocation,
|
|
||||||
hasBills: Array.isArray(job.bills) ? job.bills.length : 0,
|
|
||||||
joblines: Array.isArray(job.joblines) ? job.joblines.length : 0,
|
|
||||||
timetickets: Array.isArray(job.timetickets) ? job.timetickets.length : 0
|
|
||||||
});
|
|
||||||
|
|
||||||
// 1) Tax allocations
|
|
||||||
let taxAllocations = buildTaxAllocations(bodyshop, job);
|
|
||||||
debugLog("Initial taxAllocations", summarizeTaxAllocations(taxAllocations));
|
|
||||||
|
|
||||||
// 2) Profit centers from job lines + MAPA/MASH detection
|
|
||||||
const { profitCenterHash: initialProfitHash, hasMapaLine, hasMashLine } = buildProfitCenterHash(job, debugLog);
|
|
||||||
|
|
||||||
// 3) DMS allocation config
|
|
||||||
const selectedDmsAllocationConfig =
|
|
||||||
bodyshop.md_responsibility_centers.dms_defaults.find((d) => d.name === job.dms_allocation) || null;
|
|
||||||
|
|
||||||
CreateRRLogEvent(connectionData, "DEBUG", "Using DMS Allocation for cost export", {
|
|
||||||
allocationName: selectedDmsAllocationConfig && selectedDmsAllocationConfig.name
|
|
||||||
});
|
|
||||||
debugLog("Selected DMS allocation config", {
|
|
||||||
name: selectedDmsAllocationConfig && selectedDmsAllocationConfig.name
|
|
||||||
});
|
|
||||||
|
|
||||||
// 4) Cost centers from bills and timetickets
|
|
||||||
const disablebillwip = !!bodyshop?.pbs_configuration?.disablebillwip;
|
|
||||||
let costCenterHash = buildCostCenterHash(job, selectedDmsAllocationConfig, disablebillwip, debugLog);
|
|
||||||
|
|
||||||
// 5) Manual MAPA/MASH sales (when needed)
|
|
||||||
let profitCenterHash = applyMapaMashManualLines({
|
|
||||||
job,
|
|
||||||
selectedDmsAllocationConfig,
|
|
||||||
bodyshop,
|
|
||||||
profitCenterHash: initialProfitHash,
|
|
||||||
hasMapaLine,
|
|
||||||
hasMashLine,
|
|
||||||
debugLog
|
|
||||||
});
|
|
||||||
|
|
||||||
// 6) Materials costing (MAPA/MASH cost side)
|
|
||||||
costCenterHash = applyMaterialsCosting({
|
|
||||||
job,
|
|
||||||
bodyshop,
|
|
||||||
selectedDmsAllocationConfig,
|
|
||||||
costCenterHash,
|
|
||||||
debugLog
|
|
||||||
});
|
|
||||||
|
|
||||||
// 7) PVRT / towing / storage / PAO extras
|
|
||||||
({ profitCenterHash, taxAllocations } = applyExtras({
|
|
||||||
job,
|
|
||||||
bodyshop,
|
|
||||||
selectedDmsAllocationConfig,
|
|
||||||
profitCenterHash,
|
|
||||||
taxAllocations,
|
|
||||||
debugLog
|
|
||||||
}));
|
|
||||||
|
|
||||||
// 8) Rome-only profile-level adjustments
|
|
||||||
profitCenterHash = applyRomeProfileAdjustments({
|
|
||||||
job,
|
|
||||||
bodyshop,
|
|
||||||
selectedDmsAllocationConfig,
|
|
||||||
profitCenterHash,
|
|
||||||
debugLog,
|
|
||||||
connectionData
|
|
||||||
});
|
|
||||||
|
|
||||||
debugLog("profitCenterHash before jobAllocations build", {
|
|
||||||
centers: Object.entries(profitCenterHash || {}).map(([center, b]) => ({
|
|
||||||
center,
|
|
||||||
parts: summarizeMoney(b.partsSale),
|
|
||||||
laborTaxable: summarizeMoney(b.laborTaxableSale),
|
|
||||||
laborNonTaxable: summarizeMoney(b.laborNonTaxableSale),
|
|
||||||
extras: summarizeMoney(b.extrasSale)
|
|
||||||
}))
|
|
||||||
});
|
|
||||||
debugLog("costCenterHash before jobAllocations build", {
|
|
||||||
centers: Object.entries(costCenterHash || {}).map(([center, dinero]) => ({
|
|
||||||
center,
|
|
||||||
...summarizeMoney(dinero)
|
|
||||||
}))
|
|
||||||
});
|
|
||||||
|
|
||||||
// 9) Build job-level allocations & tax allocations
|
|
||||||
const jobAllocations = buildJobAllocations(bodyshop, profitCenterHash, costCenterHash, debugLog);
|
|
||||||
const taxAllocArray = buildTaxAllocArray(taxAllocations, selectedDmsAllocationConfig, debugLog);
|
|
||||||
const { ttlAdjArray, ttlTaxAdjArray } = buildAdjustmentAllocations(job, bodyshop, debugLog);
|
|
||||||
|
|
||||||
const result = {
|
|
||||||
jobAllocations,
|
|
||||||
taxAllocArray,
|
|
||||||
ttlAdjArray,
|
|
||||||
ttlTaxAdjArray
|
|
||||||
};
|
|
||||||
|
|
||||||
debugLog("FINAL allocations summary", {
|
|
||||||
jobAllocationsCount: jobAllocations.length,
|
|
||||||
taxAllocCount: taxAllocArray.length,
|
|
||||||
ttlAdjCount: ttlAdjArray.length,
|
|
||||||
ttlTaxAdjCount: ttlTaxAdjArray.length
|
|
||||||
});
|
|
||||||
debugLog("EXIT");
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* HTTP route wrapper (kept for compatibility; still logs via RR logger).
|
|
||||||
* Responds with { data: { jobAllocations, taxAllocArray, ttlAdjArray, ttlTaxAdjArray } }
|
|
||||||
*/
|
|
||||||
exports.defaultRoute = async function (req, res) {
|
|
||||||
try {
|
|
||||||
CreateRRLogEvent(req, "DEBUG", "Received request to calculate allocations", { jobid: req.body.jobid });
|
|
||||||
|
|
||||||
const jobData = await QueryJobData(req, req.BearerToken, req.body.jobid);
|
|
||||||
const data = calculateAllocations(req, jobData);
|
|
||||||
return res.status(200).json({ data });
|
|
||||||
} catch (error) {
|
|
||||||
CreateRRLogEvent(req, "ERROR", "Error encountered in rr-calculate-allocations.", {
|
|
||||||
message: error?.message || String(error),
|
|
||||||
stack: error?.stack
|
|
||||||
});
|
|
||||||
res.status(500).json({ error: `Error encountered in rr-calculate-allocations. ${error}` });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Socket entry point (what rr-job-export & rr-register-socket-events call).
|
|
||||||
* Reynolds-only: WSS + RR logger.
|
|
||||||
*
|
|
||||||
* Returns the same object as calculateAllocations().
|
|
||||||
*/
|
|
||||||
exports.default = async function (socket, jobid) {
|
|
||||||
try {
|
|
||||||
const token = `Bearer ${socket.handshake.auth.token}`;
|
|
||||||
const jobData = await QueryJobData(socket, token, jobid);
|
|
||||||
return calculateAllocations(socket, jobData);
|
|
||||||
} catch (error) {
|
|
||||||
CreateRRLogEvent(socket, "ERROR", "Error encountered in rr-calculate-allocations.", {
|
|
||||||
message: error?.message || String(error),
|
|
||||||
stack: error?.stack
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
/**
|
|
||||||
* Ensure a value is a non-empty string, else throw
|
|
||||||
* @param v
|
|
||||||
* @param name
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
const requireString = (v, name) => {
|
|
||||||
const s = (v ?? "").toString().trim();
|
|
||||||
if (!s || s.toLowerCase() === "undefined" || s.toLowerCase() === "null") {
|
|
||||||
throw new Error(`RR config missing: ${name}`);
|
|
||||||
}
|
|
||||||
return s;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get RR config from bodyshop record, with env fallbacks
|
|
||||||
* @param bodyshop
|
|
||||||
* @returns {{baseUrl: string, username: string, password: string, routing: {dealerNumber: string, storeNumber: string, areaNumber: string}, timeoutMs: number, retries: {max: number}}}
|
|
||||||
*/
|
|
||||||
const getRRConfigFromBodyshop = (bodyshop) => {
|
|
||||||
const baseUrl = process.env.RR_BASE_URL;
|
|
||||||
const username = process.env.RR_USERNAME;
|
|
||||||
const password = process.env.RR_PASSWORD;
|
|
||||||
|
|
||||||
const dealerNumber = bodyshop?.rr_dealerid ?? process.env.RR_DEALER_NUMBER;
|
|
||||||
|
|
||||||
const bsCfg = bodyshop?.rr_configuration || {};
|
|
||||||
|
|
||||||
const storeNumber = bsCfg?.storeNumber;
|
|
||||||
const areaNumber = bsCfg?.branchNumber ?? bsCfg?.areaNumber;
|
|
||||||
|
|
||||||
return {
|
|
||||||
baseUrl: requireString(baseUrl, "baseUrl"),
|
|
||||||
username: requireString(username, "username"),
|
|
||||||
password: requireString(password, "password"),
|
|
||||||
routing: {
|
|
||||||
dealerNumber: requireString(String(dealerNumber), "routing.dealerNumber"),
|
|
||||||
storeNumber: requireString(String(storeNumber), "routing.storeNumber"),
|
|
||||||
areaNumber: requireString(String(areaNumber), "routing.areaNumber")
|
|
||||||
},
|
|
||||||
// timeouts / retries can be adjusted here
|
|
||||||
timeoutMs: Number(process.env.RR_TIMEOUT_MS || 30000),
|
|
||||||
retries: { max: Number(process.env.RR_RETRIES_MAX || 2) }
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = { getRRConfigFromBodyshop };
|
|
||||||
@@ -1,262 +0,0 @@
|
|||||||
const { RRClient } = require("./lib/index.cjs");
|
|
||||||
const { getRRConfigFromBodyshop } = require("./rr-config");
|
|
||||||
const CreateRRLogEvent = require("./rr-logger-event");
|
|
||||||
const InstanceManager = require("../utils/instanceMgr").default;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Country code map for normalization
|
|
||||||
* @type {{US: string, USA: string, "UNITED STATES": string, CA: string, CAN: string, CANADA: string}}
|
|
||||||
*/
|
|
||||||
const COUNTRY_MAP = {
|
|
||||||
US: "US",
|
|
||||||
USA: "US",
|
|
||||||
"UNITED STATES": "US",
|
|
||||||
CA: "CA",
|
|
||||||
CAN: "CA",
|
|
||||||
CANADA: "CA"
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalize country input to 2-char code
|
|
||||||
* @param v
|
|
||||||
* @returns {*|string}
|
|
||||||
*/
|
|
||||||
const toCountry2 = (v) => {
|
|
||||||
const s = String(v || "")
|
|
||||||
.trim()
|
|
||||||
.toUpperCase();
|
|
||||||
if (!s) return "US"; // sane default
|
|
||||||
if (COUNTRY_MAP[s]) return COUNTRY_MAP[s];
|
|
||||||
// fallbacks: prefer 2-char; last resort: take first 2
|
|
||||||
return s.length === 2 ? s : s.slice(0, 2);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalize phone number to 10-digit string
|
|
||||||
* @param num
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
const normalizePhone = (num) => {
|
|
||||||
const d = String(num || "").replace(/\D/g, "");
|
|
||||||
const n = d.length === 11 && d.startsWith("1") ? d.slice(1) : d;
|
|
||||||
return n.slice(0, 10);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalize postal code based on country
|
|
||||||
* @param pc
|
|
||||||
* @param country
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
const normalizePostal = (pc, country) => {
|
|
||||||
const s = String(pc || "").trim();
|
|
||||||
if (country === "US") return s.replace(/[^0-9]/g, "").slice(0, 5);
|
|
||||||
if (country === "CA") return s.toUpperCase().replace(/\s+/g, "").slice(0, 6);
|
|
||||||
return s;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sanitize RR customer payload (addresses, phones, names)
|
|
||||||
* @param payload
|
|
||||||
* @returns {{}}
|
|
||||||
*/
|
|
||||||
const sanitizeRRCustomerPayload = (payload = {}) => {
|
|
||||||
const out = { ...payload };
|
|
||||||
|
|
||||||
out.addresses = (payload.addresses || []).map((a) => {
|
|
||||||
const country = toCountry2(a.country);
|
|
||||||
return {
|
|
||||||
...a,
|
|
||||||
country,
|
|
||||||
state: String(a.state || "")
|
|
||||||
.toUpperCase()
|
|
||||||
.slice(0, 2),
|
|
||||||
postalCode: normalizePostal(a.postalCode, country)
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
out.phones = (payload.phones || []).map((p) => ({
|
|
||||||
...p,
|
|
||||||
number: normalizePhone(p.number)
|
|
||||||
}));
|
|
||||||
|
|
||||||
// trim names defensively (RR has various max lengths by site config)
|
|
||||||
if (out.firstName) out.firstName = String(out.firstName).trim().slice(0, 30);
|
|
||||||
if (out.lastName) out.lastName = String(out.lastName).trim().slice(0, 30);
|
|
||||||
|
|
||||||
return out;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build an RR client + common opts from a bodyshop row
|
|
||||||
* @param bodyshop
|
|
||||||
* @returns {{client: *, opts: {routing: {dealerNumber: *, storeNumber: *, areaNumber: *}, envelope: {sender: {component: string, task: string, referenceId: string, creator: string, senderName: string}}}}}
|
|
||||||
*/
|
|
||||||
const buildClientAndOpts = (bodyshop) => {
|
|
||||||
const cfg = getRRConfigFromBodyshop(bodyshop);
|
|
||||||
const client = new RRClient({
|
|
||||||
baseUrl: cfg.baseUrl,
|
|
||||||
username: cfg.username,
|
|
||||||
password: cfg.password,
|
|
||||||
timeoutMs: cfg.timeoutMs,
|
|
||||||
retries: cfg.retries
|
|
||||||
});
|
|
||||||
|
|
||||||
const opts = {
|
|
||||||
routing: cfg.routing,
|
|
||||||
envelope: {
|
|
||||||
sender: {
|
|
||||||
component: "Rome",
|
|
||||||
task: "CU",
|
|
||||||
referenceId: "Insert",
|
|
||||||
creator: "RCI",
|
|
||||||
senderName: "RCI"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
return { client, opts };
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Strip all non-digit characters from a string
|
|
||||||
* @param s
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
const digitsOnly = (s) => {
|
|
||||||
return String(s || "").replace(/\D/g, "");
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build RR customer payload from job.ownr_* fields, with optional overrides.
|
|
||||||
* @param job
|
|
||||||
* @param overrides
|
|
||||||
* @returns {{ibFlag: string, firstName, lastName, customerName, createdBy, customerType, addresses: [{type, line1: *, line2, city, state, postalCode, country}], phones: {number: *}[], emails: [{address: string}]}}
|
|
||||||
*/
|
|
||||||
const buildCustomerPayloadFromJob = (job, overrides = {}) => {
|
|
||||||
// Pull ONLY from job.ownr_* fields (no job.customer.*)
|
|
||||||
const firstName = overrides.firstName ?? job?.ownr_fn ?? undefined;
|
|
||||||
const lastName = overrides.lastName ?? job?.ownr_ln ?? undefined;
|
|
||||||
const companyName = overrides.companyName ?? overrides.company ?? job?.ownr_co_nm ?? undefined;
|
|
||||||
|
|
||||||
// Decide Individual vs Business (caller can force via overrides.ibFlag)
|
|
||||||
const ibFlag = (overrides.ibFlag || (firstName ? "I" : companyName ? "B" : "I")).toUpperCase();
|
|
||||||
|
|
||||||
// Email(s)
|
|
||||||
const email = overrides.email ?? job?.ownr_ea ?? undefined;
|
|
||||||
const emails = email ? [{ address: String(email) }] : undefined;
|
|
||||||
|
|
||||||
// Phones
|
|
||||||
const phone1 = digitsOnly(job?.ownr_ph1);
|
|
||||||
const phone2 = digitsOnly(job?.ownr_ph2);
|
|
||||||
|
|
||||||
let primaryPhone = phone1 || phone2;
|
|
||||||
if (primaryPhone) {
|
|
||||||
primaryPhone = primaryPhone.slice(-10); // enforce 10 digits
|
|
||||||
}
|
|
||||||
|
|
||||||
const phones = primaryPhone ? [{ number: primaryPhone, type: "H" }] : [];
|
|
||||||
|
|
||||||
// Address (include only if line1 exists; template requires Addr1 if address is present)
|
|
||||||
const line1 = overrides.addressLine1 ?? job?.ownr_addr1 ?? undefined;
|
|
||||||
|
|
||||||
const addresses = line1
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
type: overrides.addressType || "P",
|
|
||||||
line1,
|
|
||||||
line2: overrides.addressLine2 ?? job?.ownr_addr2 ?? undefined,
|
|
||||||
city: overrides.city ?? job?.ownr_city ?? undefined,
|
|
||||||
state: overrides.state ?? job?.ownr_st ?? undefined,
|
|
||||||
postalCode: overrides.postalCode ?? job?.ownr_zip ?? undefined,
|
|
||||||
country: (overrides.country ?? job?.ownr_ctry ?? "CA") || undefined
|
|
||||||
}
|
|
||||||
]
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
// Enforce lib requirement: lastName OR customerName
|
|
||||||
if (!lastName && !companyName) {
|
|
||||||
throw new Error(
|
|
||||||
"Cannot build RR customer payload: lastName or companyName is required (no ownr_ln / ownr_co_nm on job)."
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const payload = {
|
|
||||||
ibFlag, // 'I' or 'B'
|
|
||||||
firstName: firstName || undefined,
|
|
||||||
lastName: lastName || undefined,
|
|
||||||
customerName: companyName || undefined,
|
|
||||||
createdBy: overrides.createdBy || InstanceManager({ imex: "ImEX Online", rome: "Rome Online" }),
|
|
||||||
customerType: overrides.customerType || "R", // Retail default
|
|
||||||
addresses,
|
|
||||||
phones,
|
|
||||||
emails
|
|
||||||
};
|
|
||||||
|
|
||||||
Object.keys(payload).forEach((k) => payload[k] === undefined && delete payload[k]);
|
|
||||||
return payload;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a customer in RR and return { customerNo, raw }.
|
|
||||||
* Maps data.dmsRecKey -> customerNo for compatibility with existing callers.
|
|
||||||
*/
|
|
||||||
const createRRCustomer = async ({ bodyshop, job, overrides = {}, socket }) => {
|
|
||||||
const { client, opts } = buildClientAndOpts(bodyshop);
|
|
||||||
const payload = buildCustomerPayloadFromJob(job, overrides);
|
|
||||||
const safePayload = sanitizeRRCustomerPayload(payload);
|
|
||||||
|
|
||||||
// Story step: clearly show we are about to hit Reynolds insertCustomer
|
|
||||||
CreateRRLogEvent(socket, "DEBUG", "{CU} insertCustomer: begin", {
|
|
||||||
ibFlag: safePayload.ibFlag,
|
|
||||||
hasAddress: Array.isArray(safePayload.addresses) && safePayload.addresses.length > 0,
|
|
||||||
hasPhones: Array.isArray(safePayload.phones) && safePayload.phones.length > 0,
|
|
||||||
hasEmails: Array.isArray(safePayload.emails) && safePayload.emails.length > 0
|
|
||||||
});
|
|
||||||
|
|
||||||
let response;
|
|
||||||
try {
|
|
||||||
response = await client.insertCustomer(safePayload, opts);
|
|
||||||
// Very noisy; only show when log level is cranked to SILLY
|
|
||||||
CreateRRLogEvent(socket, "SILLY", "{CU} insertCustomer: raw response", { response });
|
|
||||||
} catch (e) {
|
|
||||||
CreateRRLogEvent(socket, "ERROR", "RR insertCustomer transport error", {
|
|
||||||
message: e?.message,
|
|
||||||
code: e?.code,
|
|
||||||
status: e?.meta?.status || e?.status,
|
|
||||||
payload: safePayload
|
|
||||||
});
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = response?.data ?? response;
|
|
||||||
const trx = response?.statusBlocks?.transaction;
|
|
||||||
|
|
||||||
let customerNo = data?.dmsRecKey;
|
|
||||||
if (!customerNo) {
|
|
||||||
CreateRRLogEvent(socket, "ERROR", "RR insertCustomer returned no dmsRecKey/custNo", {
|
|
||||||
status: trx?.status,
|
|
||||||
statusCode: trx?.statusCode,
|
|
||||||
message: trx?.message,
|
|
||||||
data
|
|
||||||
});
|
|
||||||
|
|
||||||
throw new Error(
|
|
||||||
`RR insertCustomer returned no dmsRecKey (status=${trx?.status ?? "?"} code=${trx?.statusCode ?? "?"}${
|
|
||||||
trx?.message ? ` msg=${trx.message}` : ""
|
|
||||||
})`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const out = { customerNo: String(customerNo), raw: data };
|
|
||||||
|
|
||||||
CreateRRLogEvent(socket, "INFO", "{CU} insertCustomer: success", {
|
|
||||||
customerNo: out.customerNo,
|
|
||||||
status: trx || null
|
|
||||||
});
|
|
||||||
|
|
||||||
return out;
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
createRRCustomer
|
|
||||||
};
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
/**
|
|
||||||
* Parse vendor status code from various possible locations in the error object.
|
|
||||||
* @param err
|
|
||||||
* @returns {number|null}
|
|
||||||
*/
|
|
||||||
const parseVendorStatusCode = (err) => {
|
|
||||||
// Prefer explicit numeric props when available
|
|
||||||
const codeProp = err?.code ?? err?.statusCode ?? err?.meta?.status?.StatusCode ?? err?.status?.StatusCode;
|
|
||||||
const num = Number(codeProp);
|
|
||||||
if (!Number.isNaN(num) && num > 0) return num;
|
|
||||||
|
|
||||||
// Fallback: parse from message text (e.g., "... 507 CANNOT EXCEED ...")
|
|
||||||
const m = String(err?.message || "").match(/\b(\d{3})\b/);
|
|
||||||
return m ? Number(m[1]) : null;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Classify RR vendor errors into a small set of stable codes/messages for the FE.
|
|
||||||
* @param {any} err
|
|
||||||
* @returns {{vendorStatusCode:number|null, errorCode:string, title:string, friendlyMessage:string, severity:'info'|'warning'|'error', canRetry:boolean}}
|
|
||||||
*/
|
|
||||||
const classifyRRVendorError = (err) => {
|
|
||||||
const code = parseVendorStatusCode(err);
|
|
||||||
const rawMsg = String(err?.meta?.status?.Message || err?.status?.Message || err?.message || "").toUpperCase();
|
|
||||||
|
|
||||||
// Open RO cap exceeded
|
|
||||||
if (code === 507 || /MAXIMUM NUMBER OF ROS/.test(rawMsg)) {
|
|
||||||
return {
|
|
||||||
vendorStatusCode: 507,
|
|
||||||
errorCode: "RR_MAX_OPEN_ROS",
|
|
||||||
title: "Customer Open RO limit reached",
|
|
||||||
friendlyMessage:
|
|
||||||
"Reynolds has reached the maximum number of open Repair Orders for this Customer. Close or finalize an RO in Reynolds, then try again.",
|
|
||||||
severity: "warning",
|
|
||||||
canRetry: true
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default fallback
|
|
||||||
return {
|
|
||||||
vendorStatusCode: code ?? null,
|
|
||||||
errorCode: "RR_VENDOR_ERROR",
|
|
||||||
title: "Reynolds request failed",
|
|
||||||
friendlyMessage:
|
|
||||||
"We couldn’t complete the request with Reynolds. Please try again or contact support if this persists.",
|
|
||||||
severity: "error",
|
|
||||||
canRetry: true
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = { classifyRRVendorError };
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user