Merged in release/2025-10-17 (pull request #2621)
Release/2025 10 17 into master-AIO - IO-3330, IO-3356, IO-3365, IO-3368, IO-3373, IO-3386, IO-3388, IO-3389, IO-3390, IO-3395
This commit is contained in:
Dave Richer
@@ -0,0 +1,61 @@
|
|||||||
|
# PATCH /integrations/parts-management/job/:id/status
|
||||||
|
|
||||||
|
Update (patch) the status of a job created under parts management. This endpoint is only available
|
||||||
|
for jobs whose parent bodyshop has an `external_shop_id` (i.e., is provisioned for parts
|
||||||
|
management).
|
||||||
|
|
||||||
|
## Endpoint
|
||||||
|
|
||||||
|
```
|
||||||
|
PATCH /integrations/parts-management/job/:id/status
|
||||||
|
```
|
||||||
|
|
||||||
|
- `:id` is the UUID of the job to update.
|
||||||
|
|
||||||
|
## Request Headers
|
||||||
|
|
||||||
|
- `Authorization`: (if required by your integration middleware)
|
||||||
|
- `Content-Type: application/json`
|
||||||
|
|
||||||
|
## Request Body
|
||||||
|
|
||||||
|
Send a JSON object with the following field:
|
||||||
|
|
||||||
|
- `status` (string, required): The new status for the job.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
```
|
||||||
|
PATCH /integrations/parts-management/job/123e4567-e89b-12d3-a456-426614174000/status
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"status": "IN_PROGRESS"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Success Response
|
||||||
|
|
||||||
|
- **200 OK**
|
||||||
|
- Returns the updated job object with the new status.
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"id": "123e4567-e89b-12d3-a456-426614174000",
|
||||||
|
"status": "IN_PROGRESS",
|
||||||
|
...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Error Responses
|
||||||
|
|
||||||
|
- **400 Bad Request**: Missing status field, or parent bodyshop does not have an `external_shop_id`.
|
||||||
|
- **404 Not Found**: No job found with the given ID.
|
||||||
|
- **500 Internal Server Error**: Unexpected error.
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- Only jobs whose parent bodyshop has an `external_shop_id` can be patched via this route.
|
||||||
|
- Fields other than `status` will be ignored if included in the request body.
|
||||||
|
- The route is protected by the same middleware as other parts management endpoints.
|
||||||
|
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
# PATCH /integrations/parts-management/provision/:id
|
||||||
|
|
||||||
|
Update (patch) select fields for a parts management bodyshop. Only available for shops that have an
|
||||||
|
`external_shop_id` (i.e., are provisioned for parts management).
|
||||||
|
|
||||||
|
## Endpoint
|
||||||
|
|
||||||
|
```
|
||||||
|
PATCH /integrations/parts-management/provision/:id
|
||||||
|
```
|
||||||
|
|
||||||
|
- `:id` is the UUID of the bodyshop to update.
|
||||||
|
|
||||||
|
## Request Headers
|
||||||
|
|
||||||
|
- `Authorization`: (if required by your integration middleware)
|
||||||
|
- `Content-Type: application/json`
|
||||||
|
|
||||||
|
## Request Body
|
||||||
|
|
||||||
|
Send a JSON object with one or more of the following fields to update:
|
||||||
|
|
||||||
|
- `shopname` (string)
|
||||||
|
- `address1` (string)
|
||||||
|
- `address2` (string, optional)
|
||||||
|
- `city` (string)
|
||||||
|
- `state` (string)
|
||||||
|
- `zip_post` (string)
|
||||||
|
- `country` (string)
|
||||||
|
- `email` (string, shop's email, not user email)
|
||||||
|
- `timezone` (string)
|
||||||
|
- `phone` (string)
|
||||||
|
- `logo_img_path` (object, e.g. `{ src, width, height, headerMargin }`)
|
||||||
|
|
||||||
|
Any fields not included in the request body will remain unchanged.
|
||||||
|
|
||||||
|
## Example Request
|
||||||
|
|
||||||
|
```
|
||||||
|
PATCH /integrations/parts-management/provision/123e4567-e89b-12d3-a456-426614174000
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"shopname": "New Shop Name",
|
||||||
|
"address1": "123 Main St",
|
||||||
|
"city": "Springfield",
|
||||||
|
"state": "IL",
|
||||||
|
"zip_post": "62704",
|
||||||
|
"country": "USA",
|
||||||
|
"email": "shop@example.com",
|
||||||
|
"timezone": "America/Chicago",
|
||||||
|
"phone": "555-123-4567",
|
||||||
|
"logo_img_path": {
|
||||||
|
"src": "https://example.com/logo.png",
|
||||||
|
"width": "200",
|
||||||
|
"height": "100",
|
||||||
|
"headerMargin": 10
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Success Response
|
||||||
|
|
||||||
|
- **200 OK**
|
||||||
|
- Returns the updated shop object with the patched fields.
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"id": "123e4567-e89b-12d3-a456-426614174000",
|
||||||
|
"shopname": "New Shop Name",
|
||||||
|
...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Error Responses
|
||||||
|
|
||||||
|
- **400 Bad Request**: No valid fields provided, or shop does not have an `external_shop_id`.
|
||||||
|
- **404 Not Found**: No shop found with the given ID.
|
||||||
|
- **500 Internal Server Error**: Unexpected error.
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- Only shops with an `external_shop_id` can be patched via this route.
|
||||||
|
- Fields not listed above will be ignored if included in the request body.
|
||||||
|
- The route is protected by the same middleware as other parts management endpoints.
|
||||||
|
|
||||||
@@ -5305,6 +5305,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</concept_node>
|
||||||
|
<concept_node>
|
||||||
|
<name>ro_posting</name>
|
||||||
|
<definition_loaded>false</definition_loaded>
|
||||||
|
<description></description>
|
||||||
|
<comment></comment>
|
||||||
|
<default_text></default_text>
|
||||||
|
<translations>
|
||||||
|
<translation>
|
||||||
|
<language>en-US</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>es-MX</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>fr-CA</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
</translations>
|
||||||
|
</concept_node>
|
||||||
<concept_node>
|
<concept_node>
|
||||||
<name>sendmaterialscosting</name>
|
<name>sendmaterialscosting</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
|
|||||||
728
client/package-lock.json
generated
728
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -8,56 +8,56 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"proxy": "http://localhost:4000",
|
"proxy": "http://localhost:4000",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@amplitude/analytics-browser": "^2.23.5",
|
"@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.17",
|
"@firebase/analytics": "^0.10.17",
|
||||||
"@firebase/app": "^0.14.2",
|
"@firebase/app": "^0.14.3",
|
||||||
"@firebase/auth": "^1.10.8",
|
"@firebase/auth": "^1.10.8",
|
||||||
"@firebase/firestore": "^4.9.1",
|
"@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.9.0",
|
"@reduxjs/toolkit": "^2.9.0",
|
||||||
"@sentry/cli": "^2.53.0",
|
"@sentry/cli": "^2.56.0",
|
||||||
"@sentry/react": "^9.43.0",
|
"@sentry/react": "^9.43.0",
|
||||||
"@sentry/vite-plugin": "^4.3.0",
|
"@sentry/vite-plugin": "^4.3.0",
|
||||||
"@splitsoftware/splitio-react": "^2.3.1",
|
"@splitsoftware/splitio-react": "^2.5.0",
|
||||||
"@tanem/react-nprogress": "^5.0.53",
|
"@tanem/react-nprogress": "^5.0.53",
|
||||||
"antd": "^5.27.3",
|
"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.11.0",
|
"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.18",
|
"dayjs": "^1.11.18",
|
||||||
"dayjs-business-days2": "^1.3.0",
|
"dayjs-business-days2": "^1.3.0",
|
||||||
"dinero.js": "^1.9.1",
|
"dinero.js": "^1.9.1",
|
||||||
"dotenv": "^17.2.2",
|
"dotenv": "^17.2.3",
|
||||||
"env-cmd": "^10.1.0",
|
"env-cmd": "^10.1.0",
|
||||||
"exifr": "^7.1.3",
|
"exifr": "^7.1.3",
|
||||||
"graphql": "^16.11.0",
|
"graphql": "^16.11.0",
|
||||||
"i18next": "^25.5.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.15",
|
"libphonenumber-js": "^1.12.23",
|
||||||
|
"lightningcss": "^1.30.2",
|
||||||
"logrocket": "^9.0.2",
|
"logrocket": "^9.0.2",
|
||||||
"markerjs2": "^2.32.6",
|
"markerjs2": "^2.32.7",
|
||||||
"memoize-one": "^6.0.0",
|
"memoize-one": "^6.0.0",
|
||||||
"normalize-url": "^8.0.2",
|
"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.261.7",
|
"posthog-js": "^1.271.0",
|
||||||
"prop-types": "^15.8.1",
|
"prop-types": "^15.8.1",
|
||||||
"query-string": "^9.2.2",
|
"query-string": "^9.3.1",
|
||||||
"raf-schd": "^4.0.3",
|
"raf-schd": "^4.0.3",
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
"react-big-calendar": "^1.19.4",
|
"react-big-calendar": "^1.19.4",
|
||||||
"react-color": "^2.19.3",
|
"react-color": "^2.19.3",
|
||||||
"react-cookie": "^8.0.1",
|
"react-cookie": "^8.0.1",
|
||||||
"lightningcss": "^1.30.1",
|
|
||||||
"react-dom": "^18.3.1",
|
"react-dom": "^18.3.1",
|
||||||
"react-drag-listview": "^2.0.0",
|
"react-drag-listview": "^2.0.0",
|
||||||
"react-grid-gallery": "^1.0.1",
|
"react-grid-gallery": "^1.0.1",
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
"react-resizable": "^3.0.5",
|
"react-resizable": "^3.0.5",
|
||||||
"react-router-dom": "^6.30.0",
|
"react-router-dom": "^6.30.0",
|
||||||
"react-sticky": "^6.0.3",
|
"react-sticky": "^6.0.3",
|
||||||
"react-virtuoso": "^4.14.0",
|
"react-virtuoso": "^4.14.1",
|
||||||
"recharts": "^2.15.2",
|
"recharts": "^2.15.2",
|
||||||
"redux": "^5.0.1",
|
"redux": "^5.0.1",
|
||||||
"redux-actions": "^3.0.3",
|
"redux-actions": "^3.0.3",
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
"redux-saga": "^1.3.0",
|
"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.92.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",
|
||||||
@@ -133,33 +133,33 @@
|
|||||||
"@rollup/rollup-linux-x64-gnu": "4.6.1"
|
"@rollup/rollup-linux-x64-gnu": "4.6.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ant-design/icons": "^6.0.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.27.1",
|
"@babel/preset-react": "^7.27.1",
|
||||||
"@dotenvx/dotenvx": "^1.49.0",
|
"@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.33.0",
|
"@eslint/js": "^9.37.0",
|
||||||
"@playwright/test": "^1.55.0",
|
"@playwright/test": "^1.56.0",
|
||||||
"@sentry/webpack-plugin": "^4.1.1",
|
"@sentry/webpack-plugin": "^4.3.0",
|
||||||
"@testing-library/dom": "^10.4.1",
|
"@testing-library/dom": "^10.4.1",
|
||||||
"@testing-library/jest-dom": "^6.8.0",
|
"@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.25.3",
|
"browserslist": "^4.26.3",
|
||||||
"browserslist-to-esbuild": "^2.1.1",
|
"browserslist-to-esbuild": "^2.1.1",
|
||||||
"chalk": "^5.6.0",
|
"chalk": "^5.6.2",
|
||||||
"eslint": "^9.33.0",
|
"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.36.3",
|
"memfs": "^4.48.1",
|
||||||
"os-browserify": "^0.3.0",
|
"os-browserify": "^0.3.0",
|
||||||
"playwright": "^1.55.0",
|
"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.1.3",
|
"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",
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
import Icon, { SyncOutlined } from "@ant-design/icons";
|
import Icon, { SyncOutlined } from "@ant-design/icons";
|
||||||
import { cloneDeep } from "lodash";
|
|
||||||
import { useMutation, useQuery } from "@apollo/client";
|
import { useMutation, useQuery } from "@apollo/client";
|
||||||
import { Button, Dropdown, Space } from "antd";
|
import { Button, Dropdown, Space } from "antd";
|
||||||
import { PageHeader } from "@ant-design/pro-layout";
|
import { PageHeader } from "@ant-design/pro-layout";
|
||||||
import { useMemo, useState } from "react";
|
import { useMemo, useState, useEffect } from "react";
|
||||||
import { Responsive, WidthProvider } from "react-grid-layout";
|
import { Responsive, WidthProvider } from "react-grid-layout";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { MdClose } from "react-icons/md";
|
import { MdClose } from "react-icons/md";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||||
import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
|
import { UPDATE_DASHBOARD_LAYOUT, QUERY_USER_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
|
||||||
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
|
import { QUERY_DASHBOARD_BODYSHOP } from "../../graphql/bodyshop.queries";
|
||||||
|
import { selectCurrentUser } from "../../redux/user/user.selectors";
|
||||||
import AlertComponent from "../alert/alert.component";
|
import AlertComponent from "../alert/alert.component";
|
||||||
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
|
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
|
||||||
import { GenerateDashboardData } from "./dashboard-grid.utils";
|
import { GenerateDashboardData } from "./dashboard-grid.utils";
|
||||||
@@ -24,128 +24,179 @@ import "./dashboard-grid.styles.scss";
|
|||||||
const ResponsiveReactGridLayout = WidthProvider(Responsive);
|
const ResponsiveReactGridLayout = WidthProvider(Responsive);
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
currentUser: selectCurrentUser,
|
currentUser: selectCurrentUser
|
||||||
bodyshop: selectBodyshop
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const mapDispatchToProps = () => ({
|
const mapDispatchToProps = () => ({
|
||||||
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
||||||
});
|
});
|
||||||
|
|
||||||
export function DashboardGridComponent({ currentUser, bodyshop }) {
|
export function DashboardGridComponent({ currentUser }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [state, setState] = useState(() => {
|
|
||||||
const persisted = bodyshop.associations[0].user.dashboardlayout;
|
|
||||||
// Normalize persisted structure to avoid malformed shapes that can cause recursive layout recalculations
|
|
||||||
if (persisted) {
|
|
||||||
return {
|
|
||||||
items: Array.isArray(persisted.items) ? persisted.items : [],
|
|
||||||
layout: Array.isArray(persisted.layout) ? persisted.layout : [],
|
|
||||||
layouts: typeof persisted.layouts === "object" && !Array.isArray(persisted.layouts) ? persisted.layouts : {},
|
|
||||||
cols: persisted.cols
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return { items: [], layout: [], layouts: {}, cols: 12 };
|
|
||||||
});
|
|
||||||
const notification = useNotification();
|
const notification = useNotification();
|
||||||
|
|
||||||
// Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
|
// Constants for layout defaults
|
||||||
const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
|
const DEFAULT_COLS = 12;
|
||||||
|
const DEFAULT_Y_POSITION = 1000;
|
||||||
|
const GRID_BREAKPOINTS = { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 };
|
||||||
|
const GRID_COLS = { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 };
|
||||||
|
|
||||||
const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
|
// Fetch dashboard layout data
|
||||||
|
const { data: layoutData } = useQuery(QUERY_USER_DASHBOARD_LAYOUT, {
|
||||||
|
variables: { email: currentUser.email },
|
||||||
|
fetchPolicy: "network-only",
|
||||||
|
nextFetchPolicy: "network-only",
|
||||||
|
skip: !currentUser?.email
|
||||||
|
});
|
||||||
|
|
||||||
|
// Fetch minimal bodyshop data for components
|
||||||
|
const {
|
||||||
|
loading,
|
||||||
|
error,
|
||||||
|
data: bodyshopData
|
||||||
|
} = useQuery(QUERY_DASHBOARD_BODYSHOP, {
|
||||||
fetchPolicy: "network-only",
|
fetchPolicy: "network-only",
|
||||||
nextFetchPolicy: "network-only"
|
nextFetchPolicy: "network-only"
|
||||||
});
|
});
|
||||||
|
|
||||||
const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
|
const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
|
||||||
|
|
||||||
const handleLayoutChange = async (layout, layouts) => {
|
// Memoize layout state initialization
|
||||||
|
const initialState = useMemo(() => {
|
||||||
|
const persisted = layoutData?.users?.[0]?.dashboardlayout;
|
||||||
|
if (persisted) {
|
||||||
|
const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = persisted;
|
||||||
|
return {
|
||||||
|
items: Array.isArray(items) ? items : [],
|
||||||
|
layout: Array.isArray(layout) ? layout : [],
|
||||||
|
layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
|
||||||
|
cols
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return { items: [], layout: [], layouts: {}, cols: DEFAULT_COLS };
|
||||||
|
}, [layoutData]);
|
||||||
|
|
||||||
|
const [state, setState] = useState(initialState);
|
||||||
|
|
||||||
|
// Update state when layout data changes
|
||||||
|
useEffect(() => {
|
||||||
|
if (layoutData?.users?.[0]?.dashboardlayout) {
|
||||||
|
const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = layoutData.users[0].dashboardlayout;
|
||||||
|
setState({
|
||||||
|
items: Array.isArray(items) ? items : [],
|
||||||
|
layout: Array.isArray(layout) ? layout : [],
|
||||||
|
layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
|
||||||
|
cols
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [layoutData]);
|
||||||
|
|
||||||
|
// Get bodyshop data for components
|
||||||
|
const bodyshop = bodyshopData?.dashboard_bodyshops?.[0];
|
||||||
|
|
||||||
|
// DRY helper function to update layout in database and cache
|
||||||
|
const updateLayoutAndCache = async (updatedLayout, errorContext = "updating layout") => {
|
||||||
try {
|
try {
|
||||||
logImEXEvent("dashboard_change_layout");
|
const { data: result } = await updateLayout({
|
||||||
|
variables: { email: currentUser.email, layout: updatedLayout }
|
||||||
setState((prev) => ({ ...prev, layout, layouts }));
|
|
||||||
|
|
||||||
const result = await updateLayout({
|
|
||||||
variables: {
|
|
||||||
email: currentUser.email,
|
|
||||||
layout: { ...state, layout, layouts }
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (result?.errors && result.errors.length) {
|
const { errors = [] } = result?.update_users?.returning?.[0] || {};
|
||||||
const errorMessages = result.errors.map((e) => e?.message || String(e));
|
|
||||||
|
if (errors.length) {
|
||||||
|
const errorMessages = errors.map(({ message }) => message || String(error));
|
||||||
notification.error({
|
notification.error({
|
||||||
message: t("dashboard.errors.updatinglayout", {
|
message: t("dashboard.errors.updatinglayout", {
|
||||||
message: errorMessages.join("; ")
|
message: errorMessages.join("; ")
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// Catch any unexpected errors (including potential cyclic JSON issues) so the promise never rejects unhandled
|
console.error(`Dashboard ${errorContext} failed`, err);
|
||||||
console.error("Dashboard layout update failed", err);
|
|
||||||
notification.error({
|
notification.error({
|
||||||
message: t("dashboard.errors.updatinglayout", {
|
message: t("dashboard.errors.updatinglayout", {
|
||||||
message: err?.message || String(err)
|
message: err?.message || String(err)
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleRemoveComponent = (key) => {
|
// Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
|
||||||
|
const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
|
||||||
|
|
||||||
|
const {
|
||||||
|
loading: dashboardLoading,
|
||||||
|
error: dashboardError,
|
||||||
|
data: dashboardQueryData,
|
||||||
|
refetch
|
||||||
|
} = useQuery(dashboardQueryDoc, {
|
||||||
|
fetchPolicy: "network-only",
|
||||||
|
nextFetchPolicy: "network-only"
|
||||||
|
});
|
||||||
|
|
||||||
|
const dashboardData = useMemo(() => GenerateDashboardData(dashboardQueryData), [dashboardQueryData]);
|
||||||
|
|
||||||
|
// Memoize existing layout keys to prevent unnecessary recalculations
|
||||||
|
const existingLayoutKeys = useMemo(() => state.items.map(({ i }) => i), [state.items]);
|
||||||
|
|
||||||
|
// Memoize menu items to prevent unnecessary recalculations
|
||||||
|
const menuItems = useMemo(
|
||||||
|
() =>
|
||||||
|
Object.entries(componentList).map(([key, { label }]) => ({
|
||||||
|
key,
|
||||||
|
label,
|
||||||
|
value: key,
|
||||||
|
disabled: existingLayoutKeys.includes(key)
|
||||||
|
})),
|
||||||
|
[existingLayoutKeys]
|
||||||
|
);
|
||||||
|
|
||||||
|
if (loading || dashboardLoading) return <LoadingSkeleton message={t("general.labels.loading")} />;
|
||||||
|
if (error || dashboardError) return <AlertComponent message={(error || dashboardError).message} type="error" />;
|
||||||
|
|
||||||
|
const handleLayoutChange = async (layout, layouts) => {
|
||||||
|
logImEXEvent("dashboard_change_layout");
|
||||||
|
setState((prev) => ({ ...prev, layout, layouts }));
|
||||||
|
await updateLayoutAndCache({ ...state, layout, layouts }, "layout change");
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleRemoveComponent = async (key) => {
|
||||||
logImEXEvent("dashboard_remove_component", { name: key });
|
logImEXEvent("dashboard_remove_component", { name: key });
|
||||||
const idxToRemove = state.items.findIndex((i) => i.i === key);
|
const updatedState = { ...state, items: state.items.filter((item) => item.i !== key) };
|
||||||
|
setState(updatedState);
|
||||||
const items = cloneDeep(state.items);
|
await updateLayoutAndCache(updatedState, "component removal");
|
||||||
|
|
||||||
items.splice(idxToRemove, 1);
|
|
||||||
setState({ ...state, items });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleAddComponent = (e) => {
|
const handleAddComponent = async ({ key }) => {
|
||||||
// Avoid passing the full AntD menu click event (contains circular refs) to analytics
|
logImEXEvent("dashboard_add_component", { key });
|
||||||
logImEXEvent("dashboard_add_component", { key: e.key });
|
const { minW = 1, minH = 1, w: baseW = 2, h: baseH = 2 } = componentList[key] || {};
|
||||||
const compSpec = componentList[e.key] || {};
|
const nextItems = [
|
||||||
const minW = compSpec.minW || 1;
|
...state.items,
|
||||||
const minH = compSpec.minH || 1;
|
{
|
||||||
const baseW = compSpec.w || 2;
|
i: key,
|
||||||
const baseH = compSpec.h || 2;
|
x: (state.items.length * 2) % (state.cols || DEFAULT_COLS),
|
||||||
setState((prev) => {
|
y: DEFAULT_Y_POSITION,
|
||||||
const nextItems = [
|
w: Math.max(baseW, minW),
|
||||||
...prev.items,
|
h: Math.max(baseH, minH)
|
||||||
{
|
}
|
||||||
i: e.key,
|
];
|
||||||
// Position near bottom: use a large y so RGL places it last without triggering cascading relayout loops
|
const updatedState = { ...state, items: nextItems };
|
||||||
x: (prev.items.length * 2) % (prev.cols || 12),
|
setState(updatedState);
|
||||||
y: 1000,
|
await updateLayoutAndCache(updatedState, "component addition");
|
||||||
w: Math.max(baseW, minW),
|
|
||||||
h: Math.max(baseH, minH)
|
|
||||||
}
|
|
||||||
];
|
|
||||||
return { ...prev, items: nextItems };
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const dashboardData = useMemo(() => GenerateDashboardData(data), [data]);
|
|
||||||
|
|
||||||
const existingLayoutKeys = state.items.map((i) => i.i);
|
|
||||||
|
|
||||||
const menuItems = Object.keys(componentList).map((key) => ({
|
|
||||||
key: key,
|
|
||||||
label: componentList[key].label,
|
|
||||||
value: key,
|
|
||||||
disabled: existingLayoutKeys.includes(key)
|
|
||||||
}));
|
|
||||||
|
|
||||||
const menu = { items: menuItems, onClick: handleAddComponent };
|
const menu = { items: menuItems, onClick: handleAddComponent };
|
||||||
|
|
||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<PageHeader
|
<PageHeader
|
||||||
extra={
|
extra={
|
||||||
<Space>
|
<Space>
|
||||||
<Button onClick={() => refetch()}>
|
<Button onClick={refetch}>
|
||||||
<SyncOutlined />
|
<SyncOutlined />
|
||||||
</Button>
|
</Button>
|
||||||
<Dropdown menu={menu} trigger={["click"]}>
|
<Dropdown menu={menu} trigger={["click"]}>
|
||||||
@@ -157,22 +208,19 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
|
|||||||
|
|
||||||
<ResponsiveReactGridLayout
|
<ResponsiveReactGridLayout
|
||||||
className="layout"
|
className="layout"
|
||||||
breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
|
breakpoints={GRID_BREAKPOINTS}
|
||||||
cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
|
cols={GRID_COLS}
|
||||||
layouts={state.layouts}
|
layouts={state.layouts}
|
||||||
onLayoutChange={handleLayoutChange}
|
onLayoutChange={handleLayoutChange}
|
||||||
>
|
>
|
||||||
{state.items.map((item) => {
|
{state.items.map((item) => {
|
||||||
const spec = componentList[item.i] || {};
|
const { component: TheComponent, minW = 1, minH = 1, w: specW, h: specH } = componentList[item.i] || {};
|
||||||
const TheComponent = spec.component;
|
|
||||||
const minW = spec.minW || 1;
|
|
||||||
const minH = spec.minH || 1;
|
|
||||||
// Ensure current width/height respect minimums to avoid react-grid-layout prop warnings
|
|
||||||
const safeItem = {
|
const safeItem = {
|
||||||
...item,
|
...item,
|
||||||
w: Math.max(item.w || spec.w || minW, minW),
|
w: Math.max(item.w || specW || minW, minW),
|
||||||
h: Math.max(item.h || spec.h || minH, minH)
|
h: Math.max(item.h || specH || minH, minH)
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={safeItem.i}
|
key={safeItem.i}
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
|
|||||||
rowKey="center"
|
rowKey="center"
|
||||||
dataSource={allocationsSummary}
|
dataSource={allocationsSummary}
|
||||||
locale={{ emptyText: t("dms.labels.refreshallocations") }}
|
locale={{ emptyText: t("dms.labels.refreshallocations") }}
|
||||||
|
scroll={{ x: true }}
|
||||||
summary={() => {
|
summary={() => {
|
||||||
const totals =
|
const totals =
|
||||||
allocationsSummary &&
|
allocationsSummary &&
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})) ||
|
})) ||
|
||||||
@@ -103,7 +103,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
|
|||||||
<div>
|
<div>
|
||||||
<CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
|
<CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
|
||||||
<PartsStatusPie joblines_status={joblines_status} />
|
<PartsStatusPie joblines_status={joblines_status} />
|
||||||
<Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
|
<Table key="id" columns={columns} dataSource={filteredJobLines || []} />
|
||||||
</CardTemplate>
|
</CardTemplate>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ export function JobLinesComponent({
|
|||||||
filteredInfo: {
|
filteredInfo: {
|
||||||
...(isPartsEntry
|
...(isPartsEntry
|
||||||
? {
|
? {
|
||||||
part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
|
part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"] //"PAO" Removed by request
|
||||||
}
|
}
|
||||||
: {})
|
: {})
|
||||||
}
|
}
|
||||||
@@ -318,7 +318,7 @@ export function JobLinesComponent({
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})) ||
|
})) ||
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
import { Col, Row, Tag, Tooltip } from "antd";
|
import { Tag, Tooltip } from "antd";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop
|
bodyshop: selectBodyshop
|
||||||
@@ -11,65 +12,67 @@ const mapDispatchToProps = () => ({
|
|||||||
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
||||||
});
|
});
|
||||||
|
|
||||||
export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
|
|
||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
|
export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
|
||||||
|
|
||||||
export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
|
export function JobPartsQueueCount({ bodyshop, parts }) {
|
||||||
|
const { t } = useTranslation();
|
||||||
const partsStatus = useMemo(() => {
|
const partsStatus = useMemo(() => {
|
||||||
if (!parts) return null;
|
if (!parts) return null;
|
||||||
|
const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
|
||||||
return parts.reduce(
|
return parts.reduce(
|
||||||
(acc, val) => {
|
(acc, val) => {
|
||||||
if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
|
if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
|
||||||
acc.total = acc.total + val.count;
|
acc.total = acc.total + val.count;
|
||||||
acc[val.status] = acc[val.status] + val.count;
|
acc[val.status] = acc[val.status] + val.count;
|
||||||
|
|
||||||
return acc;
|
return acc;
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
total: 0,
|
total: 0,
|
||||||
null: 0,
|
null: 0,
|
||||||
[bodyshop.md_order_statuses.default_bo]: 0,
|
...Object.fromEntries(statusKeys.map((key) => [bodyshop.md_order_statuses[key], 0]))
|
||||||
[bodyshop.md_order_statuses.default_ordered]: 0,
|
|
||||||
[bodyshop.md_order_statuses.default_received]: 0,
|
|
||||||
[bodyshop.md_order_statuses.default_returned]: 0
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}, [bodyshop, parts]);
|
}, [bodyshop, parts]);
|
||||||
|
|
||||||
if (!parts) return null;
|
if (!parts) return null;
|
||||||
return (
|
return (
|
||||||
<Row>
|
<div
|
||||||
<Col {...defaultColLayout}>
|
style={{
|
||||||
<Tooltip title="Total">
|
display: "grid",
|
||||||
<Tag>{partsStatus.total}</Tag>
|
gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
|
||||||
</Tooltip>
|
gap: "8px",
|
||||||
</Col>
|
width: "100%",
|
||||||
<Col {...defaultColLayout}>
|
justifyItems: "start"
|
||||||
<Tooltip title="No Status">
|
}}
|
||||||
<Tag color="gold">{partsStatus["null"]}</Tag>
|
>
|
||||||
</Tooltip>
|
<Tooltip title="Total">
|
||||||
</Col>
|
<Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
|
||||||
<Col {...defaultColLayout}>
|
</Tooltip>
|
||||||
<Tooltip title={bodyshop.md_order_statuses.default_ordered}>
|
<Tooltip title={t("dashboard.errors.status_normal")}>
|
||||||
<Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
|
<Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
|
||||||
</Tooltip>
|
{partsStatus["null"]}
|
||||||
</Col>
|
</Tag>
|
||||||
<Col {...defaultColLayout}>
|
</Tooltip>
|
||||||
<Tooltip title={bodyshop.md_order_statuses.default_received}>
|
<Tooltip title={bodyshop.md_order_statuses.default_bo}>
|
||||||
<Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
|
<Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
|
||||||
</Tooltip>
|
{partsStatus[bodyshop.md_order_statuses.default_bo]}
|
||||||
</Col>
|
</Tag>
|
||||||
<Col {...defaultColLayout}>
|
</Tooltip>
|
||||||
<Tooltip title={bodyshop.md_order_statuses.default_returned}>
|
<Tooltip title={bodyshop.md_order_statuses.default_ordered}>
|
||||||
<Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
|
<Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
|
||||||
</Tooltip>
|
{partsStatus[bodyshop.md_order_statuses.default_ordered]}
|
||||||
</Col>
|
</Tag>
|
||||||
<Col {...defaultColLayout}>
|
</Tooltip>
|
||||||
<Tooltip title={bodyshop.md_order_statuses.default_bo}>
|
<Tooltip title={bodyshop.md_order_statuses.default_received}>
|
||||||
<Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
|
<Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
|
||||||
</Tooltip>
|
{partsStatus[bodyshop.md_order_statuses.default_received]}
|
||||||
</Col>
|
</Tag>
|
||||||
</Row>
|
</Tooltip>
|
||||||
|
<Tooltip title={bodyshop.md_order_statuses.default_returned}>
|
||||||
|
<Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
|
||||||
|
{partsStatus[bodyshop.md_order_statuses.default_returned]}
|
||||||
|
</Tag>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ export function JobsList({ bodyshop }) {
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ export function JobsReadyList({ bodyshop }) {
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})) ||
|
})) ||
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ export function PartsQueueListComponent({ bodyshop }) {
|
|||||||
filters:
|
filters:
|
||||||
bodyshop.md_ro_statuses.active_statuses.map((s) => {
|
bodyshop.md_ro_statuses.active_statuses.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
}) || [],
|
}) || [],
|
||||||
|
|||||||
@@ -34,8 +34,9 @@ const getEmployeeName = (employeeId, employees) => {
|
|||||||
return employee ? `${employee.first_name} ${employee.last_name}` : "";
|
return employee ? `${employee.first_name} ${employee.last_name}` : "";
|
||||||
};
|
};
|
||||||
|
|
||||||
const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
|
const productionListColumnsData = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
|
||||||
const { Enhanced_Payroll } = treatments;
|
const { Enhanced_Payroll } = treatments;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
title: i18n.t("jobs.actions.viewdetail"),
|
title: i18n.t("jobs.actions.viewdetail"),
|
||||||
@@ -313,7 +314,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
|
|||||||
activeStatuses
|
activeStatuses
|
||||||
?.map((s) => {
|
?.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || i18n.t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
@@ -584,4 +585,4 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
export default r;
|
export default productionListColumnsData;
|
||||||
|
|||||||
@@ -425,7 +425,15 @@ export function ShopInfoGeneral({ form, bodyshop }) {
|
|||||||
]
|
]
|
||||||
: [])
|
: [])
|
||||||
]
|
]
|
||||||
: [])
|
: []),
|
||||||
|
<Form.Item
|
||||||
|
key="accumulatePayableLines"
|
||||||
|
name={["accountingconfig", "accumulatePayableLines"]}
|
||||||
|
label={t("bodyshop.fields.accumulatePayableLines")}
|
||||||
|
valuePropName="checked"
|
||||||
|
>
|
||||||
|
<Switch />
|
||||||
|
</Form.Item>
|
||||||
]}
|
]}
|
||||||
</LayoutFormRow>
|
</LayoutFormRow>
|
||||||
<FeatureWrapper featureName="scoreboard" noauth={() => null}>
|
<FeatureWrapper featureName="scoreboard" noauth={() => null}>
|
||||||
|
|||||||
@@ -138,6 +138,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
|
|||||||
<Switch />
|
<Switch />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
)}
|
)}
|
||||||
|
{bodyshop.pbs_serialnumber && (
|
||||||
|
<Form.Item
|
||||||
|
label={t("bodyshop.fields.dms.ro_posting")}
|
||||||
|
valuePropName="checked"
|
||||||
|
name={["pbs_configuration", "ro_posting"]}
|
||||||
|
>
|
||||||
|
<Switch />
|
||||||
|
</Form.Item>
|
||||||
|
)}
|
||||||
{bodyshop.pbs_serialnumber && (
|
{bodyshop.pbs_serialnumber && (
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("bodyshop.fields.dms.appostingaccount")}
|
label={t("bodyshop.fields.dms.appostingaccount")}
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ export function SimplifiedPartsJobsListComponent({
|
|||||||
return record.status || t("general.labels.na");
|
return record.status || t("general.labels.na");
|
||||||
},
|
},
|
||||||
filteredValue: filter?.status || null,
|
filteredValue: filter?.status || null,
|
||||||
filters: bodyshop.md_ro_statuses?.parts_statuses.map((s) => {
|
filters: bodyshop?.md_ro_statuses?.parts_statuses?.map((s) => {
|
||||||
return { text: s, value: [s] };
|
return { text: s, value: [s] };
|
||||||
}),
|
}),
|
||||||
onFilter: (value, record) => value.includes(record.status)
|
onFilter: (value, record) => value.includes(record.status)
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ export function TechLookupJobsList({ bodyshop }) {
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})) ||
|
})) ||
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
|
|||||||
ro_number
|
ro_number
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bills_aggregate {
|
bills_aggregate(where: $where) {
|
||||||
aggregate {
|
aggregate {
|
||||||
count(distinct: true)
|
count(distinct: true)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -363,3 +363,25 @@ export const GET_ACTIVE_EMPLOYEES_IN_SHOP = gql`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
export const QUERY_MINIMAL_BODYSHOP = gql`
|
||||||
|
query QUERY_MINIMAL_BODYSHOP {
|
||||||
|
bodyshops(where: { associations: { active: { _eq: true } } }) {
|
||||||
|
id
|
||||||
|
shopname
|
||||||
|
associations(where: { active: { _eq: true } }) {
|
||||||
|
user {
|
||||||
|
email
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
export const QUERY_DASHBOARD_BODYSHOP = gql`
|
||||||
|
query QUERY_DASHBOARD_BODYSHOP {
|
||||||
|
dashboard_bodyshops: bodyshops(where: { associations: { active: { _eq: true } } }) {
|
||||||
|
id
|
||||||
|
prodtargethrs
|
||||||
|
md_ro_statuses
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|||||||
@@ -135,3 +135,12 @@ export const UPDATE_NOTIFICATIONS_AUTOADD = gql`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
export const QUERY_USER_DASHBOARD_LAYOUT = gql`
|
||||||
|
query QUERY_USER_DASHBOARD_LAYOUT($email: String!) {
|
||||||
|
users(where: { email: { _eq: $email } }) {
|
||||||
|
email
|
||||||
|
dashboardlayout
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import { DateFormatter } from "../../utils/DateFormatter";
|
|||||||
import { TemplateList } from "../../utils/TemplateConstants";
|
import { TemplateList } from "../../utils/TemplateConstants";
|
||||||
import { pageLimit } from "../../utils/config";
|
import { pageLimit } from "../../utils/config";
|
||||||
import { alphaSort, dateSort } from "../../utils/sorters";
|
import { alphaSort, dateSort } from "../../utils/sorters";
|
||||||
import useLocalStorage from "../../utils/useLocalStorage";
|
|
||||||
import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
|
import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
|
||||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||||
|
|
||||||
@@ -24,16 +23,12 @@ const mapDispatchToProps = (dispatch) => ({
|
|||||||
setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
|
setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
|
||||||
});
|
});
|
||||||
|
|
||||||
export function BillsListPage({ loading, data, refetch, total, setBillEnterContext }) {
|
export function BillsListPage({ loading, data, refetch, total, setBillEnterContext, handleTableChange, sortedInfo }) {
|
||||||
const search = queryString.parse(useLocation().search);
|
const search = queryString.parse(useLocation().search);
|
||||||
const [openSearchResults, setOpenSearchResults] = useState([]);
|
const [openSearchResults, setOpenSearchResults] = useState([]);
|
||||||
const [searchLoading, setSearchLoading] = useState(false);
|
const [searchLoading, setSearchLoading] = useState(false);
|
||||||
const { page } = search;
|
const { page } = search;
|
||||||
const history = useNavigate();
|
const history = useNavigate();
|
||||||
const [state, setState] = useLocalStorage("bills_list_sort", {
|
|
||||||
sortedInfo: {},
|
|
||||||
filteredInfo: { vendorname: [] }
|
|
||||||
});
|
|
||||||
const Templates = TemplateList("bill");
|
const Templates = TemplateList("bill");
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
@@ -50,7 +45,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
}),
|
}),
|
||||||
filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
|
filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
|
||||||
filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
|
filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
|
||||||
sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
|
sortOrder: sortedInfo.columnKey === "vendorname" && sortedInfo.order,
|
||||||
render: (text, record) => <span>{record.vendor.name}</span>
|
render: (text, record) => <span>{record.vendor.name}</span>
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -58,7 +53,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
dataIndex: "invoice_number",
|
dataIndex: "invoice_number",
|
||||||
key: "invoice_number",
|
key: "invoice_number",
|
||||||
sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
|
sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
|
||||||
sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
|
sortOrder: sortedInfo.columnKey === "invoice_number" && sortedInfo.order
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("jobs.fields.ro_number"),
|
title: t("jobs.fields.ro_number"),
|
||||||
@@ -68,7 +63,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
sortObject: (order) => ({
|
sortObject: (order) => ({
|
||||||
job: { ro_number: order === "descend" ? "desc" : "asc" }
|
job: { ro_number: order === "descend" ? "desc" : "asc" }
|
||||||
}),
|
}),
|
||||||
sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
|
sortOrder: sortedInfo.columnKey === "ro_number" && sortedInfo.order,
|
||||||
render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
|
render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -76,7 +71,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
dataIndex: "date",
|
dataIndex: "date",
|
||||||
key: "date",
|
key: "date",
|
||||||
sorter: (a, b) => dateSort(a.date, b.date),
|
sorter: (a, b) => dateSort(a.date, b.date),
|
||||||
sortOrder: state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
|
sortOrder: sortedInfo.columnKey === "date" && sortedInfo.order,
|
||||||
render: (text, record) => <DateFormatter>{record.date}</DateFormatter>
|
render: (text, record) => <DateFormatter>{record.date}</DateFormatter>
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -84,7 +79,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
dataIndex: "total",
|
dataIndex: "total",
|
||||||
key: "total",
|
key: "total",
|
||||||
sorter: (a, b) => a.total - b.total,
|
sorter: (a, b) => a.total - b.total,
|
||||||
sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
|
sortOrder: sortedInfo.columnKey === "total" && sortedInfo.order,
|
||||||
render: (text, record) => <CurrencyFormatter>{record.total}</CurrencyFormatter>
|
render: (text, record) => <CurrencyFormatter>{record.total}</CurrencyFormatter>
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -92,7 +87,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
dataIndex: "is_credit_memo",
|
dataIndex: "is_credit_memo",
|
||||||
key: "is_credit_memo",
|
key: "is_credit_memo",
|
||||||
sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
|
sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
|
||||||
sortOrder: state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.order,
|
sortOrder: sortedInfo.columnKey === "is_credit_memo" && sortedInfo.order,
|
||||||
render: (text, record) => <Checkbox checked={record.is_credit_memo} />
|
render: (text, record) => <Checkbox checked={record.is_credit_memo} />
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -100,7 +95,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
dataIndex: "exported",
|
dataIndex: "exported",
|
||||||
key: "exported",
|
key: "exported",
|
||||||
sorter: (a, b) => a.exported - b.exported,
|
sorter: (a, b) => a.exported - b.exported,
|
||||||
sortOrder: state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
|
sortOrder: sortedInfo.columnKey === "exported" && sortedInfo.order,
|
||||||
render: (text, record) => <Checkbox checked={record.exported} />
|
render: (text, record) => <Checkbox checked={record.exported} />
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -164,37 +159,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
const handleTableChange = (pagination, filters, sorter) => {
|
// (State & URL handling moved to container - Option C)
|
||||||
setState({
|
|
||||||
sortedInfo: sorter,
|
|
||||||
filteredInfo: { ...state.filteredInfo, vendorname: filters.vendorname || [] }
|
|
||||||
});
|
|
||||||
|
|
||||||
search.page = pagination.current;
|
|
||||||
if (filters.vendorname && filters.vendorname.length) {
|
|
||||||
search.vendorIds = filters.vendorname.join(",");
|
|
||||||
} else {
|
|
||||||
delete search.vendorIds;
|
|
||||||
}
|
|
||||||
if (sorter && sorter.column && sorter.column.sortObject) {
|
|
||||||
search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
|
|
||||||
delete search.sortcolumn;
|
|
||||||
delete search.sortorder;
|
|
||||||
} else {
|
|
||||||
delete search.searchObj;
|
|
||||||
search.sortcolumn = sorter.order ? sorter.columnKey : null;
|
|
||||||
search.sortorder = sorter.order;
|
|
||||||
}
|
|
||||||
history({ search: queryString.stringify(search) });
|
|
||||||
logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!search.vendorIds && state.filteredInfo.vendorname && state.filteredInfo.vendorname.length) {
|
|
||||||
search.vendorIds = state.filteredInfo.vendorname.join(",");
|
|
||||||
history({ search: queryString.stringify(search) });
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (search.search && search.search.trim() !== "") {
|
if (search.search && search.search.trim() !== "") {
|
||||||
|
|||||||
@@ -3,13 +3,14 @@ import queryString from "query-string";
|
|||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { useLocation } from "react-router-dom";
|
import { useLocation, useNavigate } from "react-router-dom";
|
||||||
import AlertComponent from "../../components/alert/alert.component";
|
import AlertComponent from "../../components/alert/alert.component";
|
||||||
import BillDetailEditContainer from "../../components/bill-detail-edit/bill-detail-edit.container";
|
import BillDetailEditContainer from "../../components/bill-detail-edit/bill-detail-edit.container";
|
||||||
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
|
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
|
||||||
import { QUERY_ALL_BILLS_PAGINATED } from "../../graphql/bills.queries";
|
import { QUERY_ALL_BILLS_PAGINATED } from "../../graphql/bills.queries";
|
||||||
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
|
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
|
||||||
import BillsPageComponent from "./bills.page.component";
|
import BillsPageComponent from "./bills.page.component";
|
||||||
|
import useLocalStorage from "../../utils/useLocalStorage";
|
||||||
import { pageLimit } from "../../utils/config";
|
import { pageLimit } from "../../utils/config";
|
||||||
import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
|
import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
|
||||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||||
@@ -23,7 +24,9 @@ const mapDispatchToProps = (dispatch) => ({
|
|||||||
|
|
||||||
export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
|
export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const searchParams = queryString.parse(useLocation().search);
|
const location = useLocation();
|
||||||
|
const history = useNavigate();
|
||||||
|
const searchParams = queryString.parse(location.search);
|
||||||
const { page, sortcolumn, sortorder, searchObj } = searchParams;
|
const { page, sortcolumn, sortorder, searchObj } = searchParams;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -37,6 +40,12 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
|
|||||||
setBreadcrumbs([{ link: "/manage/bills", label: t("titles.bc.bills-list") }]);
|
setBreadcrumbs([{ link: "/manage/bills", label: t("titles.bc.bills-list") }]);
|
||||||
}, [t, setBreadcrumbs, setSelectedHeader]);
|
}, [t, setBreadcrumbs, setSelectedHeader]);
|
||||||
|
|
||||||
|
// Persisted table state (sorting & filtering)
|
||||||
|
const [persistState, setPersistState] = useLocalStorage("bills_list_sort", {
|
||||||
|
sortedInfo: {},
|
||||||
|
filteredInfo: { vendorname: [] }
|
||||||
|
});
|
||||||
|
|
||||||
const { loading, error, data, refetch } = useQuery(QUERY_ALL_BILLS_PAGINATED, {
|
const { loading, error, data, refetch } = useQuery(QUERY_ALL_BILLS_PAGINATED, {
|
||||||
fetchPolicy: "network-only",
|
fetchPolicy: "network-only",
|
||||||
nextFetchPolicy: "network-only",
|
nextFetchPolicy: "network-only",
|
||||||
@@ -54,6 +63,90 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const handleTableChange = (pagination, filters, sorter) => {
|
||||||
|
const search = queryString.parse(location.search);
|
||||||
|
|
||||||
|
const vendorArr = filters?.vendorname ?? [];
|
||||||
|
const newVendorIds = vendorArr.length ? vendorArr.join(",") : undefined;
|
||||||
|
const vendorFilterChanged = search.vendorIds !== newVendorIds;
|
||||||
|
|
||||||
|
search.page = vendorFilterChanged || !search.page ? 1 : pagination.current;
|
||||||
|
newVendorIds ? (search.vendorIds = newVendorIds) : delete search.vendorIds;
|
||||||
|
|
||||||
|
const { columnKey, order, column } = sorter || {};
|
||||||
|
if (column?.sortObject) {
|
||||||
|
search.searchObj = JSON.stringify(column.sortObject(order));
|
||||||
|
delete search.sortcolumn;
|
||||||
|
delete search.sortorder;
|
||||||
|
} else {
|
||||||
|
delete search.searchObj;
|
||||||
|
search.sortcolumn = order ? columnKey : null;
|
||||||
|
search.sortorder = order ?? null; // keep explicit null to mirror prior behavior
|
||||||
|
}
|
||||||
|
|
||||||
|
setPersistState({
|
||||||
|
sortedInfo: sorter || {},
|
||||||
|
filteredInfo: { vendorname: vendorArr }
|
||||||
|
});
|
||||||
|
|
||||||
|
history({ search: queryString.stringify(search) });
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const search = queryString.parse(location.search);
|
||||||
|
let changed = false;
|
||||||
|
|
||||||
|
const vendorPersisted = persistState.filteredInfo.vendorname || [];
|
||||||
|
if (!search.vendorIds && vendorPersisted.length) {
|
||||||
|
search.vendorIds = vendorPersisted.join(",");
|
||||||
|
search.page = 1; // reset page when injecting filter
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { sortedInfo } = persistState;
|
||||||
|
if (!search.searchObj && !search.sortcolumn && sortedInfo?.order) {
|
||||||
|
const { columnKey, order } = sortedInfo;
|
||||||
|
if (columnKey) {
|
||||||
|
const dir = order === "descend" ? "desc" : "asc";
|
||||||
|
if (columnKey === "vendorname") {
|
||||||
|
search.searchObj = JSON.stringify({ vendor: { name: dir } });
|
||||||
|
} else if (columnKey === "ro_number") {
|
||||||
|
search.searchObj = JSON.stringify({ job: { ro_number: dir } });
|
||||||
|
} else {
|
||||||
|
search.sortcolumn = columnKey;
|
||||||
|
search.sortorder = order;
|
||||||
|
}
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (changed) {
|
||||||
|
history({ search: queryString.stringify(search) });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasPersistSort = !!sortedInfo?.order;
|
||||||
|
const hasUrlSort = !!(search.searchObj || (search.sortcolumn && search.sortorder));
|
||||||
|
if (!hasPersistSort && hasUrlSort) {
|
||||||
|
let derived = {};
|
||||||
|
if (search.searchObj) {
|
||||||
|
try {
|
||||||
|
const o = JSON.parse(search.searchObj);
|
||||||
|
if (o.vendor?.name) {
|
||||||
|
derived = { columnKey: "vendorname", order: o.vendor.name === "desc" ? "descend" : "ascend" };
|
||||||
|
} else if (o.job?.ro_number) {
|
||||||
|
derived = { columnKey: "ro_number", order: o.job.ro_number === "desc" ? "descend" : "ascend" };
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
/* ignore parse errors */
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
derived = { columnKey: search.sortcolumn, order: search.sortorder };
|
||||||
|
}
|
||||||
|
if (derived.order) setPersistState((prev) => ({ ...prev, sortedInfo: derived }));
|
||||||
|
}
|
||||||
|
}, [location.search]);
|
||||||
|
|
||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||||
return (
|
return (
|
||||||
<FeatureWrapperComponent
|
<FeatureWrapperComponent
|
||||||
@@ -71,6 +164,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
|
|||||||
loading={loading}
|
loading={loading}
|
||||||
refetch={refetch}
|
refetch={refetch}
|
||||||
total={data ? data.bills_aggregate.aggregate.count : 0}
|
total={data ? data.bills_aggregate.aggregate.count : 0}
|
||||||
|
handleTableChange={handleTableChange}
|
||||||
|
sortedInfo={persistState.sortedInfo || {}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<BillDetailEditContainer />
|
<BillDetailEditContainer />
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export const socket = SocketIO(
|
|||||||
|
|
||||||
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
|
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [logLevel, setLogLevel] = useState("DEBUG");
|
const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
|
||||||
const history = useNavigate();
|
const history = useNavigate();
|
||||||
const [logs, setLogs] = useState([]);
|
const [logs, setLogs] = useState([]);
|
||||||
const search = queryString.parse(useLocation().search);
|
const search = queryString.parse(useLocation().search);
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
|
|||||||
.filter(onlyUnique)
|
.filter(onlyUnique)
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
return {
|
return {
|
||||||
text: s || "No Status*",
|
text: s || t("dashboard.errors.status"),
|
||||||
value: [s]
|
value: [s]
|
||||||
};
|
};
|
||||||
})) ||
|
})) ||
|
||||||
|
|||||||
@@ -281,6 +281,7 @@
|
|||||||
},
|
},
|
||||||
"fields": {
|
"fields": {
|
||||||
"ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
|
"ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
|
||||||
|
"accumulatePayableLines": "Accumulate Payable Lines",
|
||||||
"address1": "Address 1",
|
"address1": "Address 1",
|
||||||
"address2": "Address 2",
|
"address2": "Address 2",
|
||||||
"appt_alt_transport": "Appointment Alternative Transportation Options",
|
"appt_alt_transport": "Appointment Alternative Transportation Options",
|
||||||
@@ -321,6 +322,7 @@
|
|||||||
"itc_local": "Local Tax is ITC?",
|
"itc_local": "Local Tax is ITC?",
|
||||||
"itc_state": "State Tax is ITC?",
|
"itc_state": "State Tax is ITC?",
|
||||||
"mappingname": "DMS Mapping Name",
|
"mappingname": "DMS Mapping Name",
|
||||||
|
"ro_posting": "Create $0 RO?",
|
||||||
"sendmaterialscosting": "Materials Cost as % of Sale",
|
"sendmaterialscosting": "Materials Cost as % of Sale",
|
||||||
"srcco": "Source Company #/Dealer #"
|
"srcco": "Source Company #/Dealer #"
|
||||||
},
|
},
|
||||||
@@ -996,6 +998,7 @@
|
|||||||
"insco": "No Ins. Co.*",
|
"insco": "No Ins. Co.*",
|
||||||
"refreshrequired": "You must refresh the dashboard data to see this component.",
|
"refreshrequired": "You must refresh the dashboard data to see this component.",
|
||||||
"status": "No Status*",
|
"status": "No Status*",
|
||||||
|
"status_normal": "No Status",
|
||||||
"updatinglayout": "Error saving updated layout {{message}}"
|
"updatinglayout": "Error saving updated layout {{message}}"
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
|
|||||||
@@ -281,6 +281,7 @@
|
|||||||
},
|
},
|
||||||
"fields": {
|
"fields": {
|
||||||
"ReceivableCustomField": "",
|
"ReceivableCustomField": "",
|
||||||
|
"accumulatePayableLines": "",
|
||||||
"address1": "",
|
"address1": "",
|
||||||
"address2": "",
|
"address2": "",
|
||||||
"appt_alt_transport": "",
|
"appt_alt_transport": "",
|
||||||
@@ -321,6 +322,7 @@
|
|||||||
"itc_local": "",
|
"itc_local": "",
|
||||||
"itc_state": "",
|
"itc_state": "",
|
||||||
"mappingname": "",
|
"mappingname": "",
|
||||||
|
"ro_posting": "",
|
||||||
"sendmaterialscosting": "",
|
"sendmaterialscosting": "",
|
||||||
"srcco": ""
|
"srcco": ""
|
||||||
},
|
},
|
||||||
@@ -996,6 +998,7 @@
|
|||||||
"insco": "",
|
"insco": "",
|
||||||
"refreshrequired": "",
|
"refreshrequired": "",
|
||||||
"status": "",
|
"status": "",
|
||||||
|
"status_normal": "",
|
||||||
"updatinglayout": ""
|
"updatinglayout": ""
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
|
|||||||
@@ -281,6 +281,7 @@
|
|||||||
},
|
},
|
||||||
"fields": {
|
"fields": {
|
||||||
"ReceivableCustomField": "",
|
"ReceivableCustomField": "",
|
||||||
|
"accumulatePayableLines": "",
|
||||||
"address1": "",
|
"address1": "",
|
||||||
"address2": "",
|
"address2": "",
|
||||||
"appt_alt_transport": "",
|
"appt_alt_transport": "",
|
||||||
@@ -321,6 +322,7 @@
|
|||||||
"itc_local": "",
|
"itc_local": "",
|
||||||
"itc_state": "",
|
"itc_state": "",
|
||||||
"mappingname": "",
|
"mappingname": "",
|
||||||
|
"ro_posting": "",
|
||||||
"sendmaterialscosting": "",
|
"sendmaterialscosting": "",
|
||||||
"srcco": ""
|
"srcco": ""
|
||||||
},
|
},
|
||||||
@@ -996,6 +998,7 @@
|
|||||||
"insco": "",
|
"insco": "",
|
||||||
"refreshrequired": "",
|
"refreshrequired": "",
|
||||||
"status": "",
|
"status": "",
|
||||||
|
"status_normal": "",
|
||||||
"updatinglayout": ""
|
"updatinglayout": ""
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
|
|||||||
@@ -207,6 +207,9 @@ services:
|
|||||||
aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
|
aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
|
||||||
aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
|
aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
|
||||||
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
"
|
"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -120,6 +120,8 @@ services:
|
|||||||
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-job-totals --create-bucket-configuration LocationConstraint=ca-central-1
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-job-totals --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket parts-estimates --create-bucket-configuration LocationConstraint=ca-central-1
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket parts-estimates --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
|
aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
|
||||||
"
|
"
|
||||||
# Node App: The Main IMEX API
|
# Node App: The Main IMEX API
|
||||||
node-app:
|
node-app:
|
||||||
|
|||||||
@@ -8,7 +8,16 @@
|
|||||||
value_from_env: DATAPUMP_AUTH
|
value_from_env: DATAPUMP_AUTH
|
||||||
- name: CARFAX Data Pump
|
- name: CARFAX Data Pump
|
||||||
webhook: '{{HASURA_API_URL}}/data/carfax'
|
webhook: '{{HASURA_API_URL}}/data/carfax'
|
||||||
schedule: 0 7 * * 6
|
schedule: 0 7 * * 0
|
||||||
|
include_in_metadata: true
|
||||||
|
payload: {}
|
||||||
|
headers:
|
||||||
|
- name: x-imex-auth
|
||||||
|
value_from_env: DATAPUMP_AUTH
|
||||||
|
comment: Project Mexico
|
||||||
|
- name: CARFAX RPS Data Pump
|
||||||
|
webhook: '{{HASURA_API_URL}}/data/carfaxrps'
|
||||||
|
schedule: 15 7 * * 0
|
||||||
include_in_metadata: true
|
include_in_metadata: true
|
||||||
payload: {}
|
payload: {}
|
||||||
headers:
|
headers:
|
||||||
|
|||||||
2155
package-lock.json
generated
2155
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
40
package.json
40
package.json
@@ -18,40 +18,40 @@
|
|||||||
"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.882.0",
|
"@aws-sdk/client-cloudwatch-logs": "^3.901.0",
|
||||||
"@aws-sdk/client-elasticache": "^3.882.0",
|
"@aws-sdk/client-elasticache": "^3.901.0",
|
||||||
"@aws-sdk/client-s3": "^3.882.0",
|
"@aws-sdk/client-s3": "^3.901.0",
|
||||||
"@aws-sdk/client-secrets-manager": "^3.882.0",
|
"@aws-sdk/client-secrets-manager": "^3.901.0",
|
||||||
"@aws-sdk/client-ses": "^3.882.0",
|
"@aws-sdk/client-ses": "^3.901.0",
|
||||||
"@aws-sdk/credential-provider-node": "^3.882.0",
|
"@aws-sdk/credential-provider-node": "^3.901.0",
|
||||||
"@aws-sdk/lib-storage": "^3.882.0",
|
"@aws-sdk/lib-storage": "^3.903.0",
|
||||||
"@aws-sdk/s3-request-presigner": "^3.882.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.11.0",
|
"axios": "^1.12.2",
|
||||||
"better-queue": "^3.8.12",
|
"better-queue": "^3.8.12",
|
||||||
"bullmq": "^5.58.5",
|
"bullmq": "^5.61.0",
|
||||||
"chart.js": "^4.5.0",
|
"chart.js": "^4.5.0",
|
||||||
"cloudinary": "^2.7.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",
|
||||||
"crisp-status-reporter": "^1.2.2",
|
"crisp-status-reporter": "^1.2.2",
|
||||||
"dd-trace": "^5.65.0",
|
"dd-trace": "^5.70.0",
|
||||||
"dinero.js": "^1.9.1",
|
"dinero.js": "^1.9.1",
|
||||||
"dotenv": "^17.2.2",
|
"dotenv": "^17.2.3",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"firebase-admin": "^13.5.0",
|
"firebase-admin": "^13.5.0",
|
||||||
"graphql": "^16.11.0",
|
"graphql": "^16.11.0",
|
||||||
"graphql-request": "^6.1.0",
|
"graphql-request": "^6.1.0",
|
||||||
"intuit-oauth": "^4.2.0",
|
"intuit-oauth": "^4.2.0",
|
||||||
"ioredis": "^5.7.0",
|
"ioredis": "^5.8.1",
|
||||||
"json-2-csv": "^5.5.9",
|
"json-2-csv": "^5.5.9",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"juice": "^11.0.1",
|
"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",
|
||||||
@@ -62,22 +62,22 @@
|
|||||||
"query-string": "7.1.3",
|
"query-string": "7.1.3",
|
||||||
"recursive-diff": "^1.0.9",
|
"recursive-diff": "^1.0.9",
|
||||||
"rimraf": "^6.0.1",
|
"rimraf": "^6.0.1",
|
||||||
"skia-canvas": "^3.0.6",
|
"skia-canvas": "^3.0.8",
|
||||||
"soap": "^1.3.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.9.0",
|
"twilio": "^5.10.2",
|
||||||
"uuid": "^11.1.0",
|
"uuid": "^11.1.0",
|
||||||
"winston": "^3.17.0",
|
"winston": "^3.18.3",
|
||||||
"winston-cloudwatch": "^6.3.0",
|
"winston-cloudwatch": "^6.3.0",
|
||||||
"xml2js": "^0.6.2",
|
"xml2js": "^0.6.2",
|
||||||
"xmlbuilder2": "^3.1.1",
|
"xmlbuilder2": "^3.1.1",
|
||||||
"yazl": "^3.3.1"
|
"yazl": "^3.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.35.0",
|
"@eslint/js": "^9.37.0",
|
||||||
"eslint": "^9.35.0",
|
"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",
|
||||||
|
|||||||
@@ -6,10 +6,6 @@ const PBS_CREDENTIALS = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
exports.PBS_CREDENTIALS = PBS_CREDENTIALS;
|
exports.PBS_CREDENTIALS = PBS_CREDENTIALS;
|
||||||
// const cdkDomain =
|
|
||||||
// process.env.NODE_ENV === "production"
|
|
||||||
// ? "https://3pa.dmotorworks.com"
|
|
||||||
// : "https://uat-3pa.dmotorworks.com";
|
|
||||||
|
|
||||||
const pbsDomain = `https://partnerhub.pbsdealers.com/json/reply`;
|
const pbsDomain = `https://partnerhub.pbsdealers.com/json/reply`;
|
||||||
exports.PBS_ENDPOINTS = {
|
exports.PBS_ENDPOINTS = {
|
||||||
@@ -18,5 +14,9 @@ exports.PBS_ENDPOINTS = {
|
|||||||
VehicleGet: `${pbsDomain}/VehicleGet`,
|
VehicleGet: `${pbsDomain}/VehicleGet`,
|
||||||
AccountingPostingChange: `${pbsDomain}/AccountingPostingChange`,
|
AccountingPostingChange: `${pbsDomain}/AccountingPostingChange`,
|
||||||
ContactChange: `${pbsDomain}/ContactChange`,
|
ContactChange: `${pbsDomain}/ContactChange`,
|
||||||
VehicleChange: `${pbsDomain}/VehicleChange`
|
VehicleChange: `${pbsDomain}/VehicleChange`,
|
||||||
|
RepairOrderChange: `${pbsDomain}/RepairOrderChange`, //TODO: Verify that this is correct. Docs have /reply/ in path.
|
||||||
|
RepairOrderGet: `${pbsDomain}/RepairOrderGet`,
|
||||||
|
RepairOrderContactVehicleGet: `${pbsDomain}/RepairOrderContactVehicleGet`,
|
||||||
|
RepairOrderContactVehicleChange: `${pbsDomain}/RepairOrderContactVehicleChange`,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,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);
|
||||||
//console.log(printable);
|
|
||||||
|
|
||||||
CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
|
CdkBase.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
|
||||||
|
|
||||||
return x;
|
return x;
|
||||||
});
|
});
|
||||||
@@ -32,23 +31,39 @@ axios.interceptors.request.use((x) => {
|
|||||||
axios.interceptors.response.use((x) => {
|
axios.interceptors.response.use((x) => {
|
||||||
const socket = x.config.socket;
|
const socket = x.config.socket;
|
||||||
|
|
||||||
const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
|
const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
|
||||||
//console.log(printable);
|
//logRequestToFile(printable);
|
||||||
CdkBase.createJsonEvent(socket, "SILLY", `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) {
|
||||||
|
try {
|
||||||
|
const logDir = path.join(process.cwd(), "logs");
|
||||||
|
if (!fs.existsSync(logDir)) {
|
||||||
|
fs.mkdirSync(logDir, { recursive: true });
|
||||||
|
}
|
||||||
|
const logFile = path.join(logDir, "pbs-http.log");
|
||||||
|
fs.appendFileSync(logFile, `${printable}\n`);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Unexpected error in logRequestToFile:", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
exports.default = async function (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 {
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `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;
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `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.
|
||||||
@@ -69,42 +84,52 @@ exports.default = async function (socket, { txEnvelope, jobid }) {
|
|||||||
|
|
||||||
exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
|
exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
|
||||||
try {
|
try {
|
||||||
if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle === false) {
|
socket.selectedCustomerId = selectedCustomerId;
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `User selected customer ${selectedCustomerId || "NEW"}`);
|
if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
|
||||||
|
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.
|
||||||
CdkBase.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"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;
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
|
CdkBase.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
|
||||||
await UpsertVehicleData(socket, ownerRef.ReferenceId);
|
const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
|
||||||
|
socket.vehicleRef = vehicleRef;
|
||||||
} else {
|
} else {
|
||||||
CdkBase.createLogEvent(
|
CdkBase.createLogEvent(
|
||||||
socket,
|
socket,
|
||||||
"DEBUG",
|
"INFO",
|
||||||
`Contact and Vehicle updates disabled. 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.
|
||||||
|
if (!socket.ownerRef) {
|
||||||
|
const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
|
||||||
|
socket.ownerRef = ownerRef;
|
||||||
|
}
|
||||||
|
const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
|
||||||
|
socket.vehicleRef = vehicleRef;
|
||||||
}
|
}
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `Inserting account data.`);
|
CdkBase.createLogEvent(socket, "INFO", `Inserting accounting posting data..`);
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `Inserting accounting posting data..`);
|
|
||||||
const insertResponse = await InsertAccountPostingData(socket);
|
const insertResponse = await InsertAccountPostingData(socket);
|
||||||
|
|
||||||
if (insertResponse.WasSuccessful) {
|
if (insertResponse.WasSuccessful) {
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported.`);
|
if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {
|
||||||
await MarkJobExported(socket, socket.JobData.id);
|
|
||||||
|
|
||||||
|
await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef)
|
||||||
|
}
|
||||||
|
CdkBase.createLogEvent(socket, "INFO", `Marking job as exported.`);
|
||||||
|
await MarkJobExported(socket, socket.JobData.id);
|
||||||
socket.emit("export-success", socket.JobData.id);
|
socket.emit("export-success", socket.JobData.id);
|
||||||
} else {
|
} else {
|
||||||
CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
|
CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
|
||||||
await InsertFailedExportLog(socket, error);
|
await InsertFailedExportLog(socket, error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -112,22 +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) {
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `Successful response from DMS. ${response.Message || ""}`);
|
CdkBase.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
|
||||||
} else {
|
} else {
|
||||||
CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
|
CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
|
||||||
CdkBase.createLogEvent(socket, "SILLY", `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) {
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `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, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
CdkBase.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
|
||||||
return result.jobs_by_pk;
|
return result.jobs_by_pk;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,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",
|
||||||
@@ -332,7 +357,7 @@ async function UpsertVehicleData(socket, ownerRef) {
|
|||||||
//FleetNumber: "String",
|
//FleetNumber: "String",
|
||||||
//Status: "String",
|
//Status: "String",
|
||||||
OwnerRef: ownerRef, // "00000000000000000000000000000000",
|
OwnerRef: ownerRef, // "00000000000000000000000000000000",
|
||||||
ModelNumber: socket.JobData.vehicle && 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 && socket.JobData.vehicle.v_trimcode,
|
Trim: socket.JobData.vehicle && socket.JobData.vehicle.v_trimcode,
|
||||||
@@ -340,7 +365,7 @@ async function UpsertVehicleData(socket, ownerRef) {
|
|||||||
Year: socket.JobData.v_model_yr,
|
Year: socket.JobData.v_model_yr,
|
||||||
Odometer: socket.JobData.kmout,
|
Odometer: socket.JobData.kmout,
|
||||||
ExteriorColor: {
|
ExteriorColor: {
|
||||||
Code: socket.JobData.v_color,
|
// Code: socket.JobData.v_color,
|
||||||
Description: socket.JobData.v_color
|
Description: socket.JobData.v_color
|
||||||
}
|
}
|
||||||
// InteriorColor: { Code: "String", Description: "String" },
|
// InteriorColor: { Code: "String", Description: "String" },
|
||||||
@@ -470,6 +495,57 @@ async function UpsertVehicleData(socket, ownerRef) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function GetVehicleData(socket, ownerRef) {
|
||||||
|
try {
|
||||||
|
const { data: { Vehicles } } = await axios.post(
|
||||||
|
PBS_ENDPOINTS.VehicleGet,
|
||||||
|
{
|
||||||
|
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
||||||
|
// "VehicleId": "00000000000000000000000000000000",
|
||||||
|
// "Year": "String",
|
||||||
|
// "YearFrom": "String",
|
||||||
|
// "YearTo": "String",
|
||||||
|
// "Make": "String",
|
||||||
|
// "Model": "String",
|
||||||
|
// "Trim": "String",
|
||||||
|
// "ModelNumber": "String",
|
||||||
|
// "StockNumber": "String",
|
||||||
|
VIN: socket.JobData.v_vin,
|
||||||
|
// "LicenseNumber": "String",
|
||||||
|
// "Lot": "String",
|
||||||
|
// "Status": "String",
|
||||||
|
// "StatusList": ["String"],
|
||||||
|
// "OwnerRef": "00000000000000000000000000000000",
|
||||||
|
// "ModifiedSince": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "LastSaleSince": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "VehicleIDList": ["00000000000000000000000000000000"],
|
||||||
|
// "IncludeInactive": false,
|
||||||
|
// "IncludeBuildVehicles": false,
|
||||||
|
// "IncludeBlankLot": false,
|
||||||
|
// "ShortVIN": "String",
|
||||||
|
// "ResultLimit": 0,
|
||||||
|
// "LotAccessDivisions": [0],
|
||||||
|
// "OdometerTo": 0,
|
||||||
|
// "OdometerFrom": 0
|
||||||
|
}
|
||||||
|
,
|
||||||
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
|
);
|
||||||
|
CheckForErrors(socket, Vehicles);
|
||||||
|
if (Vehicles.length === 1) {
|
||||||
|
return Vehicles[0];
|
||||||
|
|
||||||
|
} else {
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${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);
|
||||||
@@ -572,7 +648,7 @@ async function InsertAccountPostingData(socket) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function MarkJobExported(socket, jobid) {
|
async function MarkJobExported(socket, jobid) {
|
||||||
CdkBase.createLogEvent(socket, "DEBUG", `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}` })
|
||||||
@@ -618,3 +694,158 @@ async function InsertFailedExportLog(socket, error) {
|
|||||||
CdkBase.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) {
|
||||||
|
try {
|
||||||
|
const { RepairOrders } = await RepairOrderGet(socket);
|
||||||
|
if (RepairOrders.length === 0) {
|
||||||
|
const InsertedRepairOrder = await RepairOrderChange(socket)
|
||||||
|
socket.InsertedRepairOrder = InsertedRepairOrder;
|
||||||
|
CdkBase.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
|
||||||
|
|
||||||
|
} else if (RepairOrders.length > 0) {
|
||||||
|
//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.
|
||||||
|
const matchingRo = RepairOrders.find(ro => ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase()))
|
||||||
|
if (!matchingRo) {
|
||||||
|
CdkBase.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
|
||||||
|
const InsertedRepairOrder = await RepairOrderChange(socket)
|
||||||
|
socket.InsertedRepairOrder = InsertedRepairOrder;
|
||||||
|
} else {
|
||||||
|
CdkBase.createLogEvent(socket, "WARN", `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function RepairOrderGet(socket) {
|
||||||
|
try {
|
||||||
|
const { data: RepairOrderGet } = await axios.post(
|
||||||
|
PBS_ENDPOINTS.RepairOrderGet,
|
||||||
|
{
|
||||||
|
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
||||||
|
//"RepairOrderId": "374728766",
|
||||||
|
//"RepairOrderNumber": "4" || socket.JobData.ro_number,
|
||||||
|
//"RawRepairOrderNumber": socket.JobData.ro_number,
|
||||||
|
// "Tag": "String",
|
||||||
|
//"ContactRef": socket.contactRef,
|
||||||
|
// "ContactRefList": ["00000000000000000000000000000000"],
|
||||||
|
"VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
|
||||||
|
// "VehicleRefList": ["00000000000000000000000000000000"],
|
||||||
|
// "Status": "String",
|
||||||
|
// "CashieredSince": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "CashieredUntil": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "OpenDateSince": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "OpenDateUntil": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
//"ModifiedSince": "2025-01-01T00:00:00.0000000Z",
|
||||||
|
// "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "Shop": "String"
|
||||||
|
},
|
||||||
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
|
);
|
||||||
|
CheckForErrors(socket, RepairOrderGet);
|
||||||
|
return RepairOrderGet;
|
||||||
|
} catch (error) {
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
|
||||||
|
throw new Error(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function RepairOrderChange(socket) {
|
||||||
|
try {
|
||||||
|
const { data: RepairOrderChangeResponse } = await axios.post(
|
||||||
|
PBS_ENDPOINTS.RepairOrderChange,
|
||||||
|
{ //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
|
||||||
|
"RepairOrderInfo": {
|
||||||
|
//"Id": "string/00000000-0000-0000-0000-000000000000",
|
||||||
|
//"RepairOrderId": "00000000000000000000000000000000",
|
||||||
|
SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
|
||||||
|
"RepairOrderNumber": "00000000000000000000000000000000", //This helps force a new RO.
|
||||||
|
"RawRepairOrderNumber": "00000000000000000000000000000000",
|
||||||
|
// "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
|
||||||
|
// "RawRepairOrderNumber": socket.JobData.ro_number,
|
||||||
|
"DateOpened": moment(),
|
||||||
|
// "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "DateCashiered": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
"DatePromised": socket.JobData.scheduled_completion,
|
||||||
|
// "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
"DateVehicleCompleted": socket.JobData.actual_completion,
|
||||||
|
// "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
|
||||||
|
// "CSR": "String",
|
||||||
|
// "CSRRef": "00000000000000000000000000000000",
|
||||||
|
// "BookingUser": "String",
|
||||||
|
// "BookingUserRef": "00000000000000000000000000000000",
|
||||||
|
"ContactRef": socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
|
||||||
|
"VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
|
||||||
|
"MileageIn": socket.JobData.km_in,
|
||||||
|
"Tag": "BODYSHOP",
|
||||||
|
//"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
|
||||||
|
Requests: [
|
||||||
|
{
|
||||||
|
// "RepairOrderRequestRef": "b1842ecad62c4279bbc2fef4f6bf6cde",
|
||||||
|
// "RepairOrderRequestId": 1,
|
||||||
|
// "CSR": "PBS",
|
||||||
|
// "CSRRef": "1ce12ac692564e94bda955d529ee911a",
|
||||||
|
// "Skill": "GEN",
|
||||||
|
"RequestCode": "MISC",
|
||||||
|
"RequestDescription": `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
|
||||||
|
"Status": "Completed",
|
||||||
|
// "TechRef": "00000000000000000000000000000000",
|
||||||
|
"AllowedHours": 0,
|
||||||
|
"EstimateLabour": 0,
|
||||||
|
"EstimateParts": 0,
|
||||||
|
"ComeBack": false,
|
||||||
|
"AddedOperation": true,
|
||||||
|
"PartLines": [],
|
||||||
|
"PartRequestLines": [],
|
||||||
|
"LabourLines": [],
|
||||||
|
"SubletLines": [],
|
||||||
|
"TimePunches": [],
|
||||||
|
"Summary": {
|
||||||
|
"Labour": 0,
|
||||||
|
"Parts": 0,
|
||||||
|
"OilGas": 0,
|
||||||
|
"SubletTow": 0,
|
||||||
|
"Misc": 0,
|
||||||
|
"Environment": 0,
|
||||||
|
"ShopSupplies": 0,
|
||||||
|
"Freight": 0,
|
||||||
|
"WarrantyDeductible": 0,
|
||||||
|
"Discount": 0,
|
||||||
|
"SubTotal": 0,
|
||||||
|
"Tax1": 0,
|
||||||
|
"Tax2": 0,
|
||||||
|
"InvoiceTotal": 0,
|
||||||
|
"CustomerDeductible": 0,
|
||||||
|
"GrandTotal": 0,
|
||||||
|
"LabourDiscount": 0,
|
||||||
|
"PartDiscount": 0,
|
||||||
|
"ServiceFeeTotal": 0,
|
||||||
|
"OEMDiscount": 0
|
||||||
|
},
|
||||||
|
"LineType": "RequestLine",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
|
||||||
|
"Memo": socket.txEnvelope.story,
|
||||||
|
|
||||||
|
},
|
||||||
|
"IsAsynchronous": false,
|
||||||
|
// "UserRequest": "String",
|
||||||
|
// "UserRef": "00000000000000000000000000000000"
|
||||||
|
}
|
||||||
|
|
||||||
|
,
|
||||||
|
{ auth: PBS_CREDENTIALS, socket }
|
||||||
|
);
|
||||||
|
CheckForErrors(socket, RepairOrderChangeResponse);
|
||||||
|
return RepairOrderChangeResponse;
|
||||||
|
} catch (error) {
|
||||||
|
CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
|
||||||
|
throw new Error(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -205,21 +205,49 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
|
|||||||
|
|
||||||
async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) {
|
async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) {
|
||||||
const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, bill.job.shopid);
|
const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, bill.job.shopid);
|
||||||
|
let lines;
|
||||||
|
if (bodyshop.accountingconfig.accumulatePayableLines === true) {
|
||||||
|
lines = Object.values(
|
||||||
|
bill.billlines.reduce((acc, il) => {
|
||||||
|
const { cost_center, actual_cost, quantity = 1 } = il;
|
||||||
|
|
||||||
const lines = bill.billlines.map((il) =>
|
if (!acc[cost_center]) {
|
||||||
generateBillLine(
|
acc[cost_center] = { ...il, actual_cost: 0, quantity: 1 };
|
||||||
il,
|
}
|
||||||
accounts,
|
|
||||||
bill.job.class,
|
|
||||||
bodyshop.md_responsibility_centers.sales_tax_codes,
|
|
||||||
classes,
|
|
||||||
taxCodes,
|
|
||||||
bodyshop.md_responsibility_centers.costs,
|
|
||||||
bodyshop.accountingconfig,
|
|
||||||
bodyshop.region_config
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
|
acc[cost_center].actual_cost += Math.round(actual_cost * quantity * 100);
|
||||||
|
|
||||||
|
return acc;
|
||||||
|
}, {})
|
||||||
|
).map((il) => {
|
||||||
|
il.actual_cost /= 100;
|
||||||
|
return generateBillLine(
|
||||||
|
il,
|
||||||
|
accounts,
|
||||||
|
bill.job.class,
|
||||||
|
bodyshop.md_responsibility_centers.sales_tax_codes,
|
||||||
|
classes,
|
||||||
|
taxCodes,
|
||||||
|
bodyshop.md_responsibility_centers.costs,
|
||||||
|
bodyshop.accountingconfig,
|
||||||
|
bodyshop.region_config
|
||||||
|
);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
lines = bill.billlines.map((il) =>
|
||||||
|
generateBillLine(
|
||||||
|
il,
|
||||||
|
accounts,
|
||||||
|
bill.job.class,
|
||||||
|
bodyshop.md_responsibility_centers.sales_tax_codes,
|
||||||
|
classes,
|
||||||
|
taxCodes,
|
||||||
|
bodyshop.md_responsibility_centers.costs,
|
||||||
|
bodyshop.accountingconfig,
|
||||||
|
bodyshop.region_config
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
//QB USA with GST
|
//QB USA with GST
|
||||||
//This was required for the No. 1 Collision Group.
|
//This was required for the No. 1 Collision Group.
|
||||||
if (
|
if (
|
||||||
@@ -241,7 +269,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
|
|||||||
Amount: Dinero({
|
Amount: Dinero({
|
||||||
amount: Math.round(
|
amount: Math.round(
|
||||||
bill.billlines.reduce((acc, val) => {
|
bill.billlines.reduce((acc, val) => {
|
||||||
return acc + (val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0);
|
return acc + (val.applicable_taxes?.federal ? val.actual_cost * val.quantity || 0 : 0);
|
||||||
}, 0) * 100
|
}, 0) * 100
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -46,6 +46,28 @@ exports.default = async (req, res) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const generateBill = (bill, bodyshop) => {
|
const generateBill = (bill, bodyshop) => {
|
||||||
|
let lines;
|
||||||
|
if (bodyshop.accountingconfig.accumulatePayableLines === true) {
|
||||||
|
lines = Object.values(
|
||||||
|
bill.billlines.reduce((acc, il) => {
|
||||||
|
const { cost_center, actual_cost, quantity = 1 } = il;
|
||||||
|
|
||||||
|
if (!acc[cost_center]) {
|
||||||
|
acc[cost_center] = { ...il, actual_cost: 0, quantity: 1 };
|
||||||
|
}
|
||||||
|
|
||||||
|
acc[cost_center].actual_cost += Math.round(actual_cost * quantity * 100);
|
||||||
|
|
||||||
|
return acc;
|
||||||
|
}, {})
|
||||||
|
).map((il) => {
|
||||||
|
il.actual_cost /= 100;
|
||||||
|
return generateBillLine(il, bodyshop.md_responsibility_centers, bill.job.class);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
lines = bill.billlines.map((il) => generateBillLine(il, bodyshop.md_responsibility_centers, bill.job.class));
|
||||||
|
}
|
||||||
|
|
||||||
const billQbxmlObj = {
|
const billQbxmlObj = {
|
||||||
QBXML: {
|
QBXML: {
|
||||||
QBXMLMsgsRq: {
|
QBXMLMsgsRq: {
|
||||||
@@ -67,9 +89,7 @@ const generateBill = (bill, bodyshop) => {
|
|||||||
}),
|
}),
|
||||||
RefNumber: bill.invoice_number,
|
RefNumber: bill.invoice_number,
|
||||||
Memo: `RO ${bill.job.ro_number || ""}`,
|
Memo: `RO ${bill.job.ro_number || ""}`,
|
||||||
ExpenseLineAdd: bill.billlines.map((il) =>
|
ExpenseLineAdd: lines
|
||||||
generateBillLine(il, bodyshop.md_responsibility_centers, bill.job.class)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
441
server/data/carfax-rps.js
Normal file
441
server/data/carfax-rps.js
Normal file
@@ -0,0 +1,441 @@
|
|||||||
|
const queries = require("../graphql-client/queries");
|
||||||
|
const moment = require("moment-timezone");
|
||||||
|
const logger = require("../utils/logger");
|
||||||
|
const fs = require("fs");
|
||||||
|
const client = require("../graphql-client/graphql-client").rpsClient;
|
||||||
|
const { sendServerEmail, sendMexicoBillingEmail } = require("../email/sendemail");
|
||||||
|
const crypto = require("crypto");
|
||||||
|
const { ftpSetup, uploadToS3 } = require("./carfax");
|
||||||
|
let Client = require("ssh2-sftp-client");
|
||||||
|
|
||||||
|
const AHDateFormat = "YYYY-MM-DD";
|
||||||
|
|
||||||
|
const NON_ASCII_REGEX = /[^\x20-\x7E]/g;
|
||||||
|
|
||||||
|
const S3_BUCKET_NAME = "rps-carfax-uploads";
|
||||||
|
|
||||||
|
const carfaxExportRps = async (req, res) => {
|
||||||
|
// Only process if in production environment.
|
||||||
|
if (process.env.NODE_ENV !== "production") {
|
||||||
|
return res.sendStatus(403);
|
||||||
|
}
|
||||||
|
// Only process if the appropriate token is provided.
|
||||||
|
if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
|
||||||
|
return res.sendStatus(401);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send immediate response and continue processing.
|
||||||
|
res.status(202).json({
|
||||||
|
success: true,
|
||||||
|
message: "Processing request ...",
|
||||||
|
timestamp: new Date().toISOString()
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
logger.log("CARFAX-RPS-start", "DEBUG", "api", null, null);
|
||||||
|
const allJSONResults = [];
|
||||||
|
const allErrors = [];
|
||||||
|
|
||||||
|
const { bodyshops } = await client.request(queries.GET_CARFAX_RPS_SHOPS); //Query for the List of Bodyshop Clients.
|
||||||
|
const specificShopIds = req.body.bodyshopIds; // ['uuid];
|
||||||
|
const { start, end, skipUpload, ignoreDateFilter } = req.body; //YYYY-MM-DD
|
||||||
|
|
||||||
|
const shopsToProcess =
|
||||||
|
specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
|
||||||
|
logger.log("CARFAX-RPS-shopsToProcess-generated", "DEBUG", "api", null, null);
|
||||||
|
|
||||||
|
if (shopsToProcess.length === 0) {
|
||||||
|
logger.log("CARFAX-RPS-shopsToProcess-empty", "DEBUG", "api", null, null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allJSONResults, allErrors);
|
||||||
|
|
||||||
|
await sendServerEmail({
|
||||||
|
subject: `Project Mexico RPS Report ${moment().format("MM-DD-YY")}`,
|
||||||
|
text: `Total Count: ${allJSONResults.reduce((a, v) => a + v.count, 0)}\nErrors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
|
||||||
|
allJSONResults.map((x) => ({
|
||||||
|
imexshopid: x.imexshopid,
|
||||||
|
filename: x.filename,
|
||||||
|
count: x.count,
|
||||||
|
result: x.result
|
||||||
|
})),
|
||||||
|
null,
|
||||||
|
2
|
||||||
|
)}`,
|
||||||
|
to: ["bradley.rhoades@convenient-brands.com"]
|
||||||
|
});
|
||||||
|
|
||||||
|
logger.log("CARFAX-RPS-end", "DEBUG", "api", null, null);
|
||||||
|
} catch (error) {
|
||||||
|
logger.log("CARFAX-RPS-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allJSONResults, allErrors) {
|
||||||
|
for (const bodyshop of shopsToProcess) {
|
||||||
|
const shopid = bodyshop.shopname.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
|
||||||
|
const erroredJobs = [];
|
||||||
|
try {
|
||||||
|
logger.log("CARFAX-RPS-start-shop-extract", "DEBUG", "api", bodyshop.id, {
|
||||||
|
shopname: bodyshop.shopname
|
||||||
|
});
|
||||||
|
|
||||||
|
const { jobs, bodyshops_by_pk } = await client.request(queries.CARFAX_RPS_QUERY, {
|
||||||
|
bodyshopid: bodyshop.id,
|
||||||
|
...(ignoreDateFilter
|
||||||
|
? {}
|
||||||
|
: {
|
||||||
|
starttz: start ? moment(start).startOf("day") : moment().subtract(7, "days").startOf("day"),
|
||||||
|
...(end && { endtz: moment(end).endOf("day") }),
|
||||||
|
start: start
|
||||||
|
? moment(start).startOf("day").format(AHDateFormat)
|
||||||
|
: moment().subtract(7, "days").startOf("day").format(AHDateFormat),
|
||||||
|
...(end && { endtz: moment(end).endOf("day").format(AHDateFormat) })
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
const carfaxObject = {
|
||||||
|
shopid: shopid,
|
||||||
|
shop_name: bodyshop.shopname,
|
||||||
|
job: jobs.map((j) =>
|
||||||
|
CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
|
||||||
|
erroredJobs.push({ job: job, error: error.toString() });
|
||||||
|
})
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
if (erroredJobs.length > 0) {
|
||||||
|
logger.log("CARFAX-RPS-failed-jobs", "ERROR", "api", bodyshop.id, {
|
||||||
|
count: erroredJobs.length,
|
||||||
|
jobs: JSON.stringify(erroredJobs.map((j) => j.job.id))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const jsonObj = {
|
||||||
|
bodyshopid: bodyshop.id,
|
||||||
|
imexshopid: shopid,
|
||||||
|
json: JSON.stringify(carfaxObject, null, 2),
|
||||||
|
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
||||||
|
count: carfaxObject.job.length
|
||||||
|
};
|
||||||
|
|
||||||
|
if (skipUpload) {
|
||||||
|
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
||||||
|
uploadToS3(jsonObj, S3_BUCKET_NAME);
|
||||||
|
} else {
|
||||||
|
await uploadViaSFTP(jsonObj);
|
||||||
|
|
||||||
|
await sendMexicoBillingEmail({
|
||||||
|
subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
||||||
|
text: `Errors:\n${JSON.stringify(
|
||||||
|
erroredJobs.map((ej) => ({
|
||||||
|
jobid: ej.job?.id,
|
||||||
|
error: ej.error
|
||||||
|
})),
|
||||||
|
null,
|
||||||
|
2
|
||||||
|
)}\n\nUploaded:\n${JSON.stringify(
|
||||||
|
{
|
||||||
|
bodyshopid: bodyshop.id,
|
||||||
|
imexshopid: shopid,
|
||||||
|
count: jsonObj.count,
|
||||||
|
filename: jsonObj.filename,
|
||||||
|
result: jsonObj.result
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
2
|
||||||
|
)}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
allJSONResults.push({
|
||||||
|
bodyshopid: bodyshop.id,
|
||||||
|
imexshopid: shopid,
|
||||||
|
count: jsonObj.count,
|
||||||
|
filename: jsonObj.filename,
|
||||||
|
result: jsonObj.result
|
||||||
|
});
|
||||||
|
|
||||||
|
logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
||||||
|
shopname: bodyshop.shopname
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
//Error at the shop level.
|
||||||
|
logger.log("CARFAX-RPS-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
|
||||||
|
|
||||||
|
allErrors.push({
|
||||||
|
bodyshopid: bodyshop.id,
|
||||||
|
imexshopid: shopid,
|
||||||
|
CARFAXid: bodyshop.CARFAXid,
|
||||||
|
fatal: true,
|
||||||
|
errors: [error.toString()]
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
allErrors.push({
|
||||||
|
bodyshopid: bodyshop.id,
|
||||||
|
imexshopid: shopid,
|
||||||
|
CARFAXid: bodyshop.CARFAXid,
|
||||||
|
errors: erroredJobs.map((ej) => ({
|
||||||
|
jobid: ej.job?.id,
|
||||||
|
error: ej.error
|
||||||
|
}))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function uploadViaSFTP(jsonObj) {
|
||||||
|
const sftp = new Client();
|
||||||
|
sftp.on("error", (errors) =>
|
||||||
|
logger.log("CARFAX-RPS-sftp-connection-error", "ERROR", "api", jsonObj.bodyshopid, {
|
||||||
|
error: errors.message,
|
||||||
|
stack: errors.stack
|
||||||
|
})
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
// Upload to S3 first.
|
||||||
|
uploadToS3(jsonObj, S3_BUCKET_NAME);
|
||||||
|
|
||||||
|
//Connect to the FTP and upload all.
|
||||||
|
await sftp.connect(ftpSetup);
|
||||||
|
|
||||||
|
try {
|
||||||
|
jsonObj.result = await sftp.put(Buffer.from(jsonObj.json), `${jsonObj.filename}`);
|
||||||
|
logger.log("CARFAX-RPS-sftp-upload", "DEBUG", "api", jsonObj.bodyshopid, {
|
||||||
|
imexshopid: jsonObj.imexshopid,
|
||||||
|
filename: jsonObj.filename,
|
||||||
|
result: jsonObj.result
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
logger.log("CARFAX-RPS-sftp-upload-error", "ERROR", "api", jsonObj.bodyshopid, {
|
||||||
|
filename: jsonObj.filename,
|
||||||
|
error: error.message,
|
||||||
|
stack: error.stack
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.log("CARFAX-RPS-sftp-error", "ERROR", "api", jsonObj.bodyshopid, {
|
||||||
|
error: error.message,
|
||||||
|
stack: error.stack
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
sftp.end();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const CreateRepairOrderTag = (job, errorCallback) => {
|
||||||
|
try {
|
||||||
|
const subtotalEntry = job.totals.find((total) => total.TTL_TYPECD === "");
|
||||||
|
const subtotal = subtotalEntry ? subtotalEntry.T_AMT : 0;
|
||||||
|
|
||||||
|
const ret = {
|
||||||
|
ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
|
||||||
|
v_vin: job.v_vin || "",
|
||||||
|
v_year: job.v_model_yr
|
||||||
|
? parseInt(job.v_model_yr.match(/\d/g))
|
||||||
|
? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
|
||||||
|
: ""
|
||||||
|
: "",
|
||||||
|
v_make: job.v_makedesc || "",
|
||||||
|
v_model: job.v_model || "",
|
||||||
|
|
||||||
|
date_estimated: moment(job.created_at).tz("America/Winnipeg").format(AHDateFormat) || "",
|
||||||
|
data_opened: moment(job.created_at).tz("America/Winnipeg").format(AHDateFormat) || "",
|
||||||
|
date_invoiced: [job.close_date, job.created_at].find((date) => date)
|
||||||
|
? moment([job.close_date, job.created_at].find((date) => date))
|
||||||
|
.tz("America/Winnipeg")
|
||||||
|
.format(AHDateFormat)
|
||||||
|
: "",
|
||||||
|
loss_date: job.loss_date ? moment(job.loss_date).format(AHDateFormat) : "",
|
||||||
|
|
||||||
|
ins_co_nm: job.ins_co_nm || "",
|
||||||
|
loss_desc: job.loss_desc || "",
|
||||||
|
theft_ind: job.theft_ind,
|
||||||
|
tloss_ind: job.tlos_ind,
|
||||||
|
|
||||||
|
subtotal: subtotal,
|
||||||
|
|
||||||
|
areaofdamage: {
|
||||||
|
impact1: generateAreaOfDamage(job.impact_1 || ""),
|
||||||
|
impact2: generateAreaOfDamage(job.impact_2 || "")
|
||||||
|
},
|
||||||
|
|
||||||
|
jobLines: job.joblines.length > 0 ? job.joblines.map((jl) => GenerateDetailLines(jl)) : [generateNullDetailLine()]
|
||||||
|
};
|
||||||
|
return ret;
|
||||||
|
} catch (error) {
|
||||||
|
logger.log("CARFAX-RPS-job-data-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
|
||||||
|
errorCallback({ jobid: job.id, error });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const GenerateDetailLines = (line) => {
|
||||||
|
const ret = {
|
||||||
|
line_desc: line.line_desc ? line.line_desc.replace(NON_ASCII_REGEX, "") : null,
|
||||||
|
oem_partno: line.oem_partno ? line.oem_partno.replace(NON_ASCII_REGEX, "") : null,
|
||||||
|
alt_partno: line.alt_partno ? line.alt_partno.replace(NON_ASCII_REGEX, "") : null,
|
||||||
|
op_code_desc: generateOpCodeDescription(line.lbr_op),
|
||||||
|
lbr_ty: generateLaborType(line.mod_lbr_ty),
|
||||||
|
lbr_hrs: line.mod_lb_hrs || 0,
|
||||||
|
part_qty: line.part_qty || 0,
|
||||||
|
part_type: generatePartType(line.part_type),
|
||||||
|
act_price: line.act_price || 0
|
||||||
|
};
|
||||||
|
return ret;
|
||||||
|
};
|
||||||
|
|
||||||
|
const generateNullDetailLine = () => {
|
||||||
|
return {
|
||||||
|
line_desc: null,
|
||||||
|
oem_partno: null,
|
||||||
|
alt_partno: null,
|
||||||
|
lbr_ty: null,
|
||||||
|
part_qty: 0,
|
||||||
|
part_type: null,
|
||||||
|
act_price: 0
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const generateAreaOfDamage = (loc) => {
|
||||||
|
const areaMap = {
|
||||||
|
"01": "Right Front Corner",
|
||||||
|
"02": "Right Front Side",
|
||||||
|
"03": "Right Side",
|
||||||
|
"04": "Right Rear Side",
|
||||||
|
"05": "Right Rear Corner",
|
||||||
|
"06": "Rear",
|
||||||
|
"07": "Left Rear Corner",
|
||||||
|
"08": "Left Rear Side",
|
||||||
|
"09": "Left Side",
|
||||||
|
10: "Left Front Side",
|
||||||
|
11: "Left Front Corner",
|
||||||
|
12: "Front",
|
||||||
|
13: "Rollover",
|
||||||
|
14: "Uknown",
|
||||||
|
15: "Total Loss",
|
||||||
|
16: "Non-Collision",
|
||||||
|
19: "All Over",
|
||||||
|
25: "Hood",
|
||||||
|
26: "Deck Lid",
|
||||||
|
27: "Roof",
|
||||||
|
28: "Undercarriage",
|
||||||
|
34: "All Over"
|
||||||
|
};
|
||||||
|
return areaMap[loc] || null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const generateLaborType = (type) => {
|
||||||
|
const laborTypeMap = {
|
||||||
|
laa: "Aluminum",
|
||||||
|
lab: "Body",
|
||||||
|
lad: "Diagnostic",
|
||||||
|
lae: "Electrical",
|
||||||
|
laf: "Frame",
|
||||||
|
lag: "Glass",
|
||||||
|
lam: "Mechanical",
|
||||||
|
lar: "Refinish",
|
||||||
|
las: "Structural",
|
||||||
|
lau: "Other - LAU",
|
||||||
|
la1: "Other - LA1",
|
||||||
|
la2: "Other - LA2",
|
||||||
|
la3: "Other - LA3",
|
||||||
|
la4: "Other - LA4",
|
||||||
|
null: "Other",
|
||||||
|
mapa: "Paint Materials",
|
||||||
|
mash: "Shop Materials",
|
||||||
|
rates_subtotal: "Labor Total",
|
||||||
|
"timetickets.labels.shift": "Shift",
|
||||||
|
"timetickets.labels.amshift": "Morning Shift",
|
||||||
|
"timetickets.labels.ambreak": "Morning Break",
|
||||||
|
"timetickets.labels.pmshift": "Afternoon Shift",
|
||||||
|
"timetickets.labels.pmbreak": "Afternoon Break",
|
||||||
|
"timetickets.labels.lunch": "Lunch"
|
||||||
|
};
|
||||||
|
|
||||||
|
return laborTypeMap[type?.toLowerCase()] || null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const generatePartType = (type) => {
|
||||||
|
const partTypeMap = {
|
||||||
|
paa: "Aftermarket",
|
||||||
|
pae: "Existing",
|
||||||
|
pag: "Glass",
|
||||||
|
pal: "LKQ",
|
||||||
|
pan: "OEM",
|
||||||
|
pao: "Other",
|
||||||
|
pas: "Sublet",
|
||||||
|
pasl: "Sublet",
|
||||||
|
ccc: "CC Cleaning",
|
||||||
|
ccd: "CC Damage Waiver",
|
||||||
|
ccdr: "CC Daily Rate",
|
||||||
|
ccf: "CC Refuel",
|
||||||
|
ccm: "CC Mileage",
|
||||||
|
prt_dsmk_total: "Line Item Adjustment"
|
||||||
|
};
|
||||||
|
|
||||||
|
return partTypeMap[type?.toLowerCase()] || null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const generateOpCodeDescription = (type) => {
|
||||||
|
const opCodeMap = {
|
||||||
|
OP0: "REMOVE / REPLACE PARTIAL",
|
||||||
|
OP1: "REFINISH / REPAIR",
|
||||||
|
OP10: "REPAIR , PARTIAL",
|
||||||
|
OP100: "REPLACE PRE-PRICED",
|
||||||
|
OP101: "REMOVE/REPLACE RECYCLED PART",
|
||||||
|
OP103: "REMOVE / REPLACE PARTIAL",
|
||||||
|
OP104: "REMOVE / REPLACE PARTIAL LABOUR",
|
||||||
|
OP105: "!!ADJUST MANUALLY!!",
|
||||||
|
OP106: "REPAIR , PARTIAL",
|
||||||
|
OP107: "CHIPGUARD",
|
||||||
|
OP108: "MULTI TONE",
|
||||||
|
OP109: "REPLACE PRE-PRICED",
|
||||||
|
OP11: "REMOVE / REPLACE",
|
||||||
|
OP110: "REFINISH / REPAIR",
|
||||||
|
OP111: "REMOVE / REPLACE",
|
||||||
|
OP112: "REMOVE / REPLACE",
|
||||||
|
OP113: "REPLACE PRE-PRICED",
|
||||||
|
OP114: "REPLACE PRE-PRICED",
|
||||||
|
OP12: "REMOVE / REPLACE PARTIAL",
|
||||||
|
OP120: "REPAIR , PARTIAL",
|
||||||
|
OP13: "ADDITIONAL COSTS",
|
||||||
|
OP14: "ADDITIONAL OPERATIONS",
|
||||||
|
OP15: "BLEND",
|
||||||
|
OP16: "SUBLET",
|
||||||
|
OP17: "POLICY LIMIT ADJUSTMENT",
|
||||||
|
OP18: "APPEAR ALLOWANCE",
|
||||||
|
OP2: "REMOVE / INSTALL",
|
||||||
|
OP24: "CHIPGUARD",
|
||||||
|
OP25: "TWO TONE",
|
||||||
|
OP26: "PAINTLESS DENT REPAIR",
|
||||||
|
OP260: "SUBLET",
|
||||||
|
OP3: "ADDITIONAL LABOR",
|
||||||
|
OP4: "ALIGNMENT",
|
||||||
|
OP5: "OVERHAUL",
|
||||||
|
OP6: "REFINISH",
|
||||||
|
OP7: "INSPECT",
|
||||||
|
OP8: "CHECK / ADJUST",
|
||||||
|
OP9: "REPAIR"
|
||||||
|
};
|
||||||
|
|
||||||
|
return opCodeMap[type?.toUpperCase()] || null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const errorCode = ({ count, filename, results }) => {
|
||||||
|
if (count === 0) return 1;
|
||||||
|
if (!filename) return 3;
|
||||||
|
const sftpErrorCode = results?.sftpError?.code;
|
||||||
|
if (sftpErrorCode && ["ECONNREFUSED", "ENOTFOUND", "ETIMEDOUT", "ECONNRESET"].includes(sftpErrorCode)) {
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
|
if (sftpErrorCode) return 7;
|
||||||
|
return 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
default: carfaxExportRps,
|
||||||
|
ftpSetup
|
||||||
|
};
|
||||||
@@ -37,12 +37,12 @@ const S3_BUCKET_NAME = InstanceManager({
|
|||||||
const region = InstanceManager.InstanceRegion;
|
const region = InstanceManager.InstanceRegion;
|
||||||
const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
|
const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
|
||||||
|
|
||||||
const uploadToS3 = (jsonObj) => {
|
const uploadToS3 = (jsonObj, bucketName = S3_BUCKET_NAME) => {
|
||||||
const webPath = isLocal
|
const webPath = isLocal
|
||||||
? `https://${S3_BUCKET_NAME}.s3.localhost.localstack.cloud:4566/${jsonObj.filename}`
|
? `https://${bucketName}.s3.localhost.localstack.cloud:4566/${jsonObj.filename}`
|
||||||
: `https://${S3_BUCKET_NAME}.s3.${region}.amazonaws.com/${jsonObj.filename}`;
|
: `https://${bucketName}.s3.${region}.amazonaws.com/${jsonObj.filename}`;
|
||||||
|
|
||||||
uploadFileToS3({ bucketName: S3_BUCKET_NAME, key: jsonObj.filename, content: jsonObj.json })
|
uploadFileToS3({ bucketName: bucketName, key: jsonObj.filename, content: jsonObj.json })
|
||||||
.then(() => {
|
.then(() => {
|
||||||
logger.log("CARFAX-s3-upload", "DEBUG", "api", jsonObj.bodyshopid, {
|
logger.log("CARFAX-s3-upload", "DEBUG", "api", jsonObj.bodyshopid, {
|
||||||
imexshopid: jsonObj.imexshopid,
|
imexshopid: jsonObj.imexshopid,
|
||||||
@@ -61,7 +61,7 @@ const uploadToS3 = (jsonObj) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.default = async (req, res) => {
|
const carfaxExport = async (req, res) => {
|
||||||
// Only process if in production environment.
|
// Only process if in production environment.
|
||||||
if (process.env.NODE_ENV !== "production") {
|
if (process.env.NODE_ENV !== "production") {
|
||||||
return res.sendStatus(403);
|
return res.sendStatus(403);
|
||||||
@@ -80,7 +80,7 @@ exports.default = async (req, res) => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
logger.log("CARFAX-start", "DEBUG", "api", null, null);
|
logger.log("CARFAX-start", "DEBUG", "api", null, null);
|
||||||
const allXMLResults = [];
|
const allJSONResults = [];
|
||||||
const allErrors = [];
|
const allErrors = [];
|
||||||
|
|
||||||
const { bodyshops } = await client.request(queries.GET_CARFAX_SHOPS); //Query for the List of Bodyshop Clients.
|
const { bodyshops } = await client.request(queries.GET_CARFAX_SHOPS); //Query for the List of Bodyshop Clients.
|
||||||
@@ -96,12 +96,12 @@ exports.default = async (req, res) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allXMLResults, allErrors);
|
await processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allJSONResults, allErrors);
|
||||||
|
|
||||||
await sendServerEmail({
|
await sendServerEmail({
|
||||||
subject: `Project Mexico Report ${moment().format("MM-DD-YY")}`,
|
subject: `Project Mexico Report ${moment().format("MM-DD-YY")}`,
|
||||||
text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
|
text: `Total Count: ${allJSONResults.reduce((a, v) => a + v.count, 0)}\nErrors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
|
||||||
allXMLResults.map((x) => ({
|
allJSONResults.map((x) => ({
|
||||||
imexshopid: x.imexshopid,
|
imexshopid: x.imexshopid,
|
||||||
filename: x.filename,
|
filename: x.filename,
|
||||||
count: x.count,
|
count: x.count,
|
||||||
@@ -109,7 +109,8 @@ exports.default = async (req, res) => {
|
|||||||
})),
|
})),
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}`
|
)}`,
|
||||||
|
to: ["bradley.rhoades@convenient-brands.com"]
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.log("CARFAX-end", "DEBUG", "api", null, null);
|
logger.log("CARFAX-end", "DEBUG", "api", null, null);
|
||||||
@@ -118,7 +119,7 @@ exports.default = async (req, res) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allXMLResults, allErrors) {
|
async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allJSONResults, allErrors) {
|
||||||
for (const bodyshop of shopsToProcess) {
|
for (const bodyshop of shopsToProcess) {
|
||||||
const shopid = bodyshop.imexshopid?.toLowerCase() || bodyshop.shopname.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
|
const shopid = bodyshop.imexshopid?.toLowerCase() || bodyshop.shopname.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
|
||||||
const erroredJobs = [];
|
const erroredJobs = [];
|
||||||
@@ -195,7 +196,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
allXMLResults.push({
|
allJSONResults.push({
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
@@ -447,3 +448,9 @@ const errorCode = ({ count, filename, results }) => {
|
|||||||
if (sftpErrorCode) return 7;
|
if (sftpErrorCode) return 7;
|
||||||
return 0;
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
default: carfaxExport,
|
||||||
|
ftpSetup,
|
||||||
|
uploadToS3
|
||||||
|
};
|
||||||
|
|||||||
@@ -7,4 +7,5 @@ exports.usageReport = require("./usageReport").default;
|
|||||||
exports.podium = require("./podium").default;
|
exports.podium = require("./podium").default;
|
||||||
exports.emsUpload = require("./emsUpload").default;
|
exports.emsUpload = require("./emsUpload").default;
|
||||||
exports.carfax = require("./carfax").default;
|
exports.carfax = require("./carfax").default;
|
||||||
|
exports.carfaxRps = require("./carfax-rps").default;
|
||||||
exports.vehicletype = require("./vehicletype/vehicletype").default;
|
exports.vehicletype = require("./vehicletype/vehicletype").default;
|
||||||
@@ -44,8 +44,9 @@ const logEmail = async (req, email) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const sendServerEmail = async ({ subject, text }) => {
|
const sendServerEmail = async ({ subject, text, to = [] }) => {
|
||||||
if (process.env.NODE_ENV === undefined) return;
|
if (process.env.NODE_ENV === undefined) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mailer.sendMail(
|
mailer.sendMail(
|
||||||
{
|
{
|
||||||
@@ -53,7 +54,7 @@ const sendServerEmail = async ({ subject, text }) => {
|
|||||||
imex: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
|
imex: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
|
||||||
rome: `Rome Online API - ${process.env.NODE_ENV} <noreply@romeonline.io>`
|
rome: `Rome Online API - ${process.env.NODE_ENV} <noreply@romeonline.io>`
|
||||||
}),
|
}),
|
||||||
to: ["support@thinkimex.com"],
|
to: ["support@imexsystems.ca", ...to],
|
||||||
subject: subject,
|
subject: subject,
|
||||||
text: text,
|
text: text,
|
||||||
ses: {
|
ses: {
|
||||||
@@ -68,7 +69,7 @@ const sendServerEmail = async ({ subject, text }) => {
|
|||||||
},
|
},
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
(err, info) => {
|
(err, info) => {
|
||||||
logger.log("server-email-failure", err ? "error" : "debug", null, null, {
|
logger.log("server-email-send", err ? "error" : "debug", null, null, {
|
||||||
message: err?.message,
|
message: err?.message,
|
||||||
stack: err?.stack
|
stack: err?.stack
|
||||||
});
|
});
|
||||||
@@ -103,7 +104,7 @@ const sendMexicoBillingEmail = async ({ subject, text }) => {
|
|||||||
},
|
},
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
(err, info) => {
|
(err, info) => {
|
||||||
logger.log("server-email-failure", err ? "error" : "debug", null, null, {
|
logger.log("server-email-send", err ? "error" : "debug", null, null, {
|
||||||
message: err?.message,
|
message: err?.message,
|
||||||
stack: err?.stack
|
stack: err?.stack
|
||||||
});
|
});
|
||||||
@@ -258,7 +259,10 @@ const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachmen
|
|||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
(err, info) => {
|
(err, info) => {
|
||||||
// (message, type, user, record, meta
|
// (message, type, user, record, meta
|
||||||
logger.log("server-email", err ? "error" : "debug", null, null, { message: err?.message, stack: err?.stack });
|
logger.log("server-email-send", err ? "error" : "debug", null, null, {
|
||||||
|
message: err?.message,
|
||||||
|
stack: err?.stack
|
||||||
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -11,9 +11,25 @@ const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const rpsClient =
|
||||||
|
process.env.RPS_GRAPHQL_ENDPOINT && process.env.RPS_HASURA_ADMIN_SECRET
|
||||||
|
? new GraphQLClient(process.env.RPS_GRAPHQL_ENDPOINT, {
|
||||||
|
headers: {
|
||||||
|
"x-hasura-admin-secret": process.env.RPS_HASURA_ADMIN_SECRET
|
||||||
|
}
|
||||||
|
})
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (!rpsClient) {
|
||||||
|
//System log to disable RPS functions
|
||||||
|
|
||||||
|
console.log(`RPS secrets are not set. Client is not configured.`, "WARN", "redis", "api", {});
|
||||||
|
}
|
||||||
|
|
||||||
const unauthorizedClient = new GraphQLClient(process.env.GRAPHQL_ENDPOINT);
|
const unauthorizedClient = new GraphQLClient(process.env.GRAPHQL_ENDPOINT);
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
client,
|
client,
|
||||||
|
rpsClient,
|
||||||
unauthorizedClient
|
unauthorizedClient
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -420,6 +420,8 @@ query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
|
|||||||
v_make_desc
|
v_make_desc
|
||||||
v_color
|
v_color
|
||||||
ca_customer_gst
|
ca_customer_gst
|
||||||
|
scheduled_completion
|
||||||
|
actual_completion
|
||||||
vehicle {
|
vehicle {
|
||||||
v_trimcode
|
v_trimcode
|
||||||
v_makecode
|
v_makecode
|
||||||
@@ -919,6 +921,41 @@ exports.CARFAX_QUERY = `query CARFAX_EXPORT($start: timestamptz, $bodyshopid: uu
|
|||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
|
exports.CARFAX_RPS_QUERY = `query CARFAX_RPS_EXPORT($starttz: timestamptz, $endtz: timestamptz,$start: date, $end: date, $bodyshopid: uuid!) {
|
||||||
|
bodyshops_by_pk(id: $bodyshopid) {
|
||||||
|
id
|
||||||
|
shopname
|
||||||
|
}
|
||||||
|
jobs(where: {_and: [{_or: [{close_date: {_gt: $start, _lte: $end}}, {created_at: {_gt: $starttz, _lte: $endtz}, close_date: {_is_null: true}}]}, {_not: {_and: [{close_date: {_is_null: true}}, {created_at: {_is_null: true}}]}}, {bodyshopid: {_eq: $bodyshopid}}, {v_vin: {_is_null: false}}]}) {
|
||||||
|
close_date
|
||||||
|
created_at
|
||||||
|
id
|
||||||
|
ins_co_nm
|
||||||
|
impact_1
|
||||||
|
impact_2
|
||||||
|
joblines {
|
||||||
|
act_price
|
||||||
|
alt_partno
|
||||||
|
line_desc
|
||||||
|
mod_lb_hrs
|
||||||
|
mod_lbr_ty
|
||||||
|
oem_partno
|
||||||
|
lbr_op
|
||||||
|
part_type
|
||||||
|
part_qty
|
||||||
|
}
|
||||||
|
loss_date
|
||||||
|
loss_desc
|
||||||
|
theft_ind
|
||||||
|
tlos_ind
|
||||||
|
totals
|
||||||
|
v_makedesc
|
||||||
|
v_model
|
||||||
|
v_model_yr
|
||||||
|
v_vin
|
||||||
|
}
|
||||||
|
}`;
|
||||||
|
|
||||||
exports.CLAIMSCORP_QUERY = `query CLAIMSCORP_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
|
exports.CLAIMSCORP_QUERY = `query CLAIMSCORP_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
|
||||||
bodyshops_by_pk(id: $bodyshopid){
|
bodyshops_by_pk(id: $bodyshopid){
|
||||||
id
|
id
|
||||||
@@ -1865,6 +1902,13 @@ exports.GET_CARFAX_SHOPS = `query GET_CARFAX_SHOPS {
|
|||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
|
exports.GET_CARFAX_RPS_SHOPS = `query GET_CARFAX_RPS_SHOPS {
|
||||||
|
bodyshops(where: {carfax_exclude: {_neq: "true"}}){
|
||||||
|
id
|
||||||
|
shopname
|
||||||
|
}
|
||||||
|
}`;
|
||||||
|
|
||||||
exports.GET_CLAIMSCORP_SHOPS = `query GET_CLAIMSCORP_SHOPS {
|
exports.GET_CLAIMSCORP_SHOPS = `query GET_CLAIMSCORP_SHOPS {
|
||||||
bodyshops(where: {claimscorpid: {_is_null: false}, _or: {claimscorpid: {_neq: ""}}}){
|
bodyshops(where: {claimscorpid: {_is_null: false}, _or: {claimscorpid: {_neq: ""}}}){
|
||||||
id
|
id
|
||||||
@@ -2159,18 +2203,16 @@ exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $
|
|||||||
|
|
||||||
exports.INSERT_NEW_TRANSITION = (
|
exports.INSERT_NEW_TRANSITION = (
|
||||||
includeOldTransition
|
includeOldTransition
|
||||||
) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${
|
) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
|
||||||
includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
|
}) {
|
||||||
}) {
|
|
||||||
insert_transitions_one(object: $newTransition) {
|
insert_transitions_one(object: $newTransition) {
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
${
|
${includeOldTransition
|
||||||
includeOldTransition
|
? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
|
||||||
? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
|
|
||||||
affected_rows
|
affected_rows
|
||||||
}`
|
}`
|
||||||
: ""
|
: ""
|
||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
@@ -2859,6 +2901,7 @@ exports.GET_BODYSHOP_BY_ID = `
|
|||||||
intellipay_config
|
intellipay_config
|
||||||
state
|
state
|
||||||
notification_followers
|
notification_followers
|
||||||
|
timezone
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -2950,6 +2993,7 @@ query GET_JOBID_BY_MERCHANTID_RONUMBER($merchantID: String!, $roNumber: String!)
|
|||||||
id
|
id
|
||||||
intellipay_config
|
intellipay_config
|
||||||
email
|
email
|
||||||
|
timezone
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
@@ -2959,6 +3003,7 @@ query GET_BODYSHOP_BY_MERCHANTID($merchantID: String!) {
|
|||||||
bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) {
|
bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) {
|
||||||
id
|
id
|
||||||
email
|
email
|
||||||
|
timezone
|
||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ const {
|
|||||||
CREATE_SHOP,
|
CREATE_SHOP,
|
||||||
DELETE_VENDORS_BY_SHOP,
|
DELETE_VENDORS_BY_SHOP,
|
||||||
DELETE_SHOP,
|
DELETE_SHOP,
|
||||||
CREATE_USER
|
CREATE_USER,
|
||||||
|
UPDATE_BODYSHOP_BY_ID
|
||||||
} = require("../partsManagement.queries");
|
} = require("../partsManagement.queries");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -131,6 +132,61 @@ const insertUserAssociation = async (uid, email, shopId) => {
|
|||||||
return resp.insert_users_one;
|
return resp.insert_users_one;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PATCH handler for updating bodyshop fields.
|
||||||
|
* Allows patching: shopname, address1, address2, city, state, zip_post, country, email, timezone, phone, logo_img_path
|
||||||
|
* @param req
|
||||||
|
* @param res
|
||||||
|
* @returns {Promise<void>}
|
||||||
|
*/
|
||||||
|
const patchPartsManagementProvisioning = async (req, res) => {
|
||||||
|
const { id } = req.params;
|
||||||
|
const allowedFields = [
|
||||||
|
"shopname",
|
||||||
|
"address1",
|
||||||
|
"address2",
|
||||||
|
"city",
|
||||||
|
"state",
|
||||||
|
"zip_post",
|
||||||
|
"country",
|
||||||
|
"email",
|
||||||
|
"timezone",
|
||||||
|
"phone",
|
||||||
|
"logo_img_path"
|
||||||
|
];
|
||||||
|
const updateFields = {};
|
||||||
|
for (const field of allowedFields) {
|
||||||
|
if (req.body[field] !== undefined) {
|
||||||
|
updateFields[field] = req.body[field];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (Object.keys(updateFields).length === 0) {
|
||||||
|
return res.status(400).json({ error: "No valid fields provided for update." });
|
||||||
|
}
|
||||||
|
// Check that the bodyshop has an external_shop_id before allowing patch
|
||||||
|
try {
|
||||||
|
// Fetch the bodyshop by id
|
||||||
|
const shopResp = await client.request(
|
||||||
|
`query GetBodyshop($id: uuid!) { bodyshops_by_pk(id: $id) { id external_shop_id } }`,
|
||||||
|
{ 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." });
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
return res.status(500).json({ error: "Failed to validate bodyshop external_shop_id.", detail: err });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const resp = await client.request(UPDATE_BODYSHOP_BY_ID, { id, fields: updateFields });
|
||||||
|
if (!resp.update_bodyshops_by_pk) {
|
||||||
|
return res.status(404).json({ error: "Bodyshop not found." });
|
||||||
|
}
|
||||||
|
return res.json(resp.update_bodyshops_by_pk);
|
||||||
|
} catch (err) {
|
||||||
|
return res.status(500).json({ error: "Failed to update bodyshop.", detail: err });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles provisioning a new shop for parts management.
|
* Handles provisioning a new shop for parts management.
|
||||||
* @param req
|
* @param req
|
||||||
@@ -259,4 +315,4 @@ const partsManagementProvisioning = async (req, res) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = partsManagementProvisioning;
|
module.exports = { partsManagementProvisioning, patchPartsManagementProvisioning };
|
||||||
|
|||||||
@@ -298,6 +298,25 @@ const UPDATE_JOBLINE_BY_PK = `
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const UPDATE_BODYSHOP_BY_ID = `
|
||||||
|
mutation UpdateBodyshopById($id: uuid!, $fields: bodyshops_set_input!) {
|
||||||
|
update_bodyshops_by_pk(pk_columns: { id: $id }, _set: $fields) {
|
||||||
|
id
|
||||||
|
shopname
|
||||||
|
address1
|
||||||
|
address2
|
||||||
|
city
|
||||||
|
state
|
||||||
|
zip_post
|
||||||
|
country
|
||||||
|
email
|
||||||
|
timezone
|
||||||
|
phone
|
||||||
|
logo_img_path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
GET_BODYSHOP_STATUS,
|
GET_BODYSHOP_STATUS,
|
||||||
GET_VEHICLE_BY_SHOP_VIN,
|
GET_VEHICLE_BY_SHOP_VIN,
|
||||||
@@ -329,5 +348,6 @@ module.exports = {
|
|||||||
DELETE_PARTS_ORDERS_BY_JOB_IDS,
|
DELETE_PARTS_ORDERS_BY_JOB_IDS,
|
||||||
UPSERT_JOBLINES,
|
UPSERT_JOBLINES,
|
||||||
GET_JOBLINE_IDS_BY_JOBID_UNQSEQ,
|
GET_JOBLINE_IDS_BY_JOBID_UNQSEQ,
|
||||||
UPDATE_JOBLINE_BY_PK
|
UPDATE_JOBLINE_BY_PK,
|
||||||
|
UPDATE_BODYSHOP_BY_ID
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -48,7 +48,9 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta
|
|||||||
payer: "Customer",
|
payer: "Customer",
|
||||||
type: getPaymentType(ipMapping, values.cardtype),
|
type: getPaymentType(ipMapping, values.cardtype),
|
||||||
jobid: p.jobid,
|
jobid: p.jobid,
|
||||||
date: moment(Date.now()),
|
date: moment()
|
||||||
|
.tz(bodyshop?.bodyshops_by_pk?.timezone ?? "UTC")
|
||||||
|
.format("YYYY-MM-DD"),
|
||||||
payment_responses: {
|
payment_responses: {
|
||||||
data: {
|
data: {
|
||||||
amount: values.total,
|
amount: values.total,
|
||||||
|
|||||||
@@ -97,7 +97,9 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => {
|
|||||||
payer: "Customer",
|
payer: "Customer",
|
||||||
type: getPaymentType(ipMapping, values.cardtype),
|
type: getPaymentType(ipMapping, values.cardtype),
|
||||||
jobid: job.id,
|
jobid: job.id,
|
||||||
date: moment(Date.now())
|
date: moment()
|
||||||
|
.tz(bodyshop?.timezone ?? "UTC")
|
||||||
|
.format("YYYY-MM-DD")
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
40
server/job/patchJobStatus.js
Normal file
40
server/job/patchJobStatus.js
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
const client = require("../graphql-client/graphql-client").client;
|
||||||
|
const { UPDATE_JOB_BY_ID } = require("../integrations/partsManagement/partsManagement.queries");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PATCH handler to update job status (parts management only)
|
||||||
|
* @param req
|
||||||
|
* @param res
|
||||||
|
* @returns {Promise<void>}
|
||||||
|
*/
|
||||||
|
module.exports = async (req, res) => {
|
||||||
|
const { id } = req.params;
|
||||||
|
const { status } = req.body;
|
||||||
|
if (!status) {
|
||||||
|
return res.status(400).json({ error: "Missing required field: status" });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Fetch job to get shopid
|
||||||
|
const jobResp = await client.request(`query GetJob($id: uuid!) { jobs_by_pk(id: $id) { id shopid } }`, { id });
|
||||||
|
const job = jobResp.jobs_by_pk;
|
||||||
|
if (!job) {
|
||||||
|
return res.status(404).json({ error: "Job not found" });
|
||||||
|
}
|
||||||
|
// Fetch bodyshop to check external_shop_id
|
||||||
|
const shopResp = await client.request(
|
||||||
|
`query GetBodyshop($id: uuid!) { bodyshops_by_pk(id: $id) { id external_shop_id } }`,
|
||||||
|
{ id: job.shopid }
|
||||||
|
);
|
||||||
|
if (!shopResp.bodyshops_by_pk || !shopResp.bodyshops_by_pk.external_shop_id) {
|
||||||
|
return res.status(400).json({ error: "Cannot patch: parent bodyshop does not have an external_shop_id." });
|
||||||
|
}
|
||||||
|
// Update job status
|
||||||
|
const updateResp = await client.request(UPDATE_JOB_BY_ID, { id, job: { status } });
|
||||||
|
if (!updateResp.update_jobs_by_pk) {
|
||||||
|
return res.status(404).json({ error: "Job not found after update" });
|
||||||
|
}
|
||||||
|
return res.json(updateResp.update_jobs_by_pk);
|
||||||
|
} catch (err) {
|
||||||
|
return res.status(500).json({ error: "Failed to update job status.", detail: err });
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -82,22 +82,35 @@ exports.partsScan = async function (req, res) {
|
|||||||
criticalIds.add(jobline.id);
|
criticalIds.add(jobline.id);
|
||||||
}
|
}
|
||||||
if (update_field && update_value) {
|
if (update_field && update_value) {
|
||||||
const result = await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB_LINE, {
|
let actualUpdateField = update_field;
|
||||||
lineId: jobline.id,
|
if (update_field === "part_number") {
|
||||||
line: { [update_field]: update_value, manual_line: true }
|
// Determine which part number field to update based on the match
|
||||||
});
|
if (!jobline.oem_partno) {
|
||||||
|
actualUpdateField = "oem_partno";
|
||||||
const auditResult = await client
|
} else {
|
||||||
.setHeaders({ Authorization: BearerToken })
|
if (regex) {
|
||||||
.request(queries.INSERT_AUDIT_TRAIL, {
|
actualUpdateField = regex.test(jobline.oem_partno || "") ? "oem_partno" : "alt_partno";
|
||||||
auditObj: {
|
} else {
|
||||||
bodyshopid: data.jobs_by_pk.bodyshop.id,
|
actualUpdateField = jobline.oem_partno === value ? "oem_partno" : "alt_partno";
|
||||||
jobid,
|
|
||||||
operation: `Jobline (#${jobline.line_no} ${jobline.line_desc}/${jobline.id}) ${update_field} updated from ${jobline[update_field]} to ${update_value}. Lined marked as manual line.`,
|
|
||||||
type: "partscanupdate",
|
|
||||||
useremail: req.user.email
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (actualUpdateField) {
|
||||||
|
await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB_LINE, {
|
||||||
|
lineId: jobline.id,
|
||||||
|
line: { [actualUpdateField]: update_value, manual_line: true }
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
await client.setHeaders({ Authorization: BearerToken }).request(queries.INSERT_AUDIT_TRAIL, {
|
||||||
|
auditObj: {
|
||||||
|
bodyshopid: data.jobs_by_pk.bodyshop.id,
|
||||||
|
jobid,
|
||||||
|
operation: `Jobline (#${jobline.line_no} ${jobline.line_desc}/${jobline.id}) ${update_field} updated from ${jobline[update_field]} to ${update_value}. Lined marked as manual line.`,
|
||||||
|
type: "partscanupdate",
|
||||||
|
useremail: req.user.email
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
//break; // No need to evaluate further rules for this jobline
|
//break; // No need to evaluate further rules for this jobline
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
const express = require("express");
|
const express = require("express");
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const { autohouse, claimscorp, chatter, kaizen, usageReport, podium, carfax } = require("../data/data");
|
const { autohouse, claimscorp, chatter, kaizen, usageReport, podium, carfax, carfaxRps } = require("../data/data");
|
||||||
|
|
||||||
router.post("/ah", autohouse);
|
router.post("/ah", autohouse);
|
||||||
router.post("/cc", claimscorp);
|
router.post("/cc", claimscorp);
|
||||||
@@ -9,5 +9,6 @@ router.post("/kaizen", kaizen);
|
|||||||
router.post("/usagereport", usageReport);
|
router.post("/usagereport", usageReport);
|
||||||
router.post("/podium", podium);
|
router.post("/podium", podium);
|
||||||
router.post("/carfax", carfax);
|
router.post("/carfax", carfax);
|
||||||
|
router.post("/carfaxrps", carfaxRps);
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|||||||
@@ -19,11 +19,15 @@ if (typeof VSSTA_INTEGRATION_SECRET === "string" && VSSTA_INTEGRATION_SECRET.len
|
|||||||
if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_INTEGRATION_SECRET.length > 0) {
|
if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_INTEGRATION_SECRET.length > 0) {
|
||||||
const XML_BODY_LIMIT = "10mb"; // Set a limit for XML body size
|
const XML_BODY_LIMIT = "10mb"; // Set a limit for XML body size
|
||||||
|
|
||||||
const partsManagementProvisioning = require("../integrations/partsManagement/endpoints/partsManagementProvisioning");
|
const {
|
||||||
|
partsManagementProvisioning,
|
||||||
|
patchPartsManagementProvisioning
|
||||||
|
} = require("../integrations/partsManagement/endpoints/partsManagementProvisioning");
|
||||||
const partsManagementDeprovisioning = require("../integrations/partsManagement/endpoints/partsManagementDeprovisioning");
|
const partsManagementDeprovisioning = require("../integrations/partsManagement/endpoints/partsManagementDeprovisioning");
|
||||||
const partsManagementIntegrationMiddleware = require("../middleware/partsManagementIntegrationMiddleware");
|
const partsManagementIntegrationMiddleware = require("../middleware/partsManagementIntegrationMiddleware");
|
||||||
const partsManagementVehicleDamageEstimateAddRq = require("../integrations/partsManagement/endpoints/vehicleDamageEstimateAddRq");
|
const partsManagementVehicleDamageEstimateAddRq = require("../integrations/partsManagement/endpoints/vehicleDamageEstimateAddRq");
|
||||||
const partsManagementVehicleDamageEstimateChqRq = require("../integrations/partsManagement/endpoints/vehicleDamageEstimateChgRq");
|
const partsManagementVehicleDamageEstimateChqRq = require("../integrations/partsManagement/endpoints/vehicleDamageEstimateChgRq");
|
||||||
|
const patchJobStatus = require("../job/patchJobStatus");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Route to handle Vehicle Damage Estimate Add Request
|
* Route to handle Vehicle Damage Estimate Add Request
|
||||||
@@ -55,6 +59,20 @@ if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_
|
|||||||
* Route to handle Parts Management Provisioning
|
* Route to handle Parts Management Provisioning
|
||||||
*/
|
*/
|
||||||
router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
|
router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PATCH route to update Parts Management Provisioning info
|
||||||
|
*/
|
||||||
|
router.patch(
|
||||||
|
"/parts-management/provision/:id",
|
||||||
|
partsManagementIntegrationMiddleware,
|
||||||
|
patchPartsManagementProvisioning
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PATCH route to update job status (parts management only)
|
||||||
|
*/
|
||||||
|
router.patch("/parts-management/job/:id/status", partsManagementIntegrationMiddleware, patchJobStatus);
|
||||||
} else {
|
} else {
|
||||||
logger.logger.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
|
logger.logger.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user