IO-2327 timetickets test cases

Release/2023 06 02

.circleci/config.yml

@@ -0,0 +1,180 @@
+version: 2.1
+orbs:
+  #snyk: snyk/snyk@0.0.8
+  #cypress: cypress-io/cypress@1.23.0
+  aws-s3: circleci/aws-s3@2.0.0
+  eb: circleci/aws-elastic-beanstalk@1.0.2
+  jira: circleci/jira@1.3.1
+jobs:
+  api-deploy:
+    docker:
+      - image: "cimg/base:stable"
+    steps:
+      - checkout
+      - eb/setup
+      - run:
+          command: |
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb status --verbose
+            eb deploy
+            eb status
+      - jira/notify
+
+  hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_PROD_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            hasura migrate apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.imex.online/ --admin-secret << parameters.secret >>
+
+  app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+      - run: yarn run build
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://imex-online-production/"
+      - jira/notify
+
+  test-hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_TEST_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            echo ${HASURA_TEST_SECRET}
+            hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
+
+  test-app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+      - run: yarn run build:test
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://imex-online-test/"
+      - jira/notify
+
+  admin-app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/admin
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run: npm i
+
+      - save_cache:
+          paths:
+            - node_modules
+            - ~/.npm
+            - ~/.cache
+          key: v1-dependencies-{{ checksum "package.json" }}
+
+      - run: npm run build
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://adm.imex.online/"
+
+workflows:
+  deploy_and_build:
+    jobs:
+      - api-deploy:
+          filters:
+            branches:
+              only: master
+      - app-build:
+          filters:
+            branches:
+              only: master
+      - hasura-migrate:
+          secret: ${HASURA_PROD_SECRET}
+          filters:
+            branches:
+              only: master
+      - test-app-build:
+          filters:
+            branches:
+              only: test
+      - test-hasura-migrate:
+          secret: ${HASURA_TEST_SECRET}
+          filters:
+            branches:
+              only: test
+      #- admin-app-build:
+      #filters:
+      #branches:
+      #only: master

.gitignore

@@ -113,3 +113,10 @@ firebase/.env
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
 logs/oAuthClient-log.log
+
+
+.node-persist/**
+
+/*.env.*
+
+client/cypress/e2e/[1,2]-*

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+  "xml.fileAssociations": [
+    {
+      "pattern": "**/Test.xml",
+      "systemId": "file:///Users/pfic/Downloads/IMEX.xsd"
+    },
+    {
+      "pattern": "**/IMEX.xml",
+      "systemId": "logs/IMEX.xsd"
+    }
+  ]
+}

README.MD

@@ -1,16 +1,5 @@
-Yarn Dependency Management:
-To force upgrades for some packages:
-yarn upgrade-interactive --latest
-
-To Start Hasura CLI:
-npx hasura console
-
-Migrating to Staging:
-npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
-npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
-
 NGROK TEsting:
-./ngrok.exe http http://localhost:5000 -host-header="localhost:5000"
+./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
 
 Finding deadfiles - run from client directory
 npx deadfile ./src/index.js --exclude build templates
@@ -19,3 +8,6 @@ npx deadfile ./src/index.js --exclude build templates
 hasura migrate create "Init" --from-server --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 hasura migrate apply --version "1620771761757" --skip-execution --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
+
+Generate the license file: 
+$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite

admin/README.md

@@ -1,68 +0,0 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.<br />
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br />
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.<br />
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br />
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
-
-### Analyzing the Bundle Size
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
-
-### Making a Progressive Web App
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
-
-### Advanced Configuration
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
-
-### Deployment
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
-
-### `yarn build` fails to minify
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify

admin/package.json

@@ -1,47 +0,0 @@
-{
-  "name": "admin",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@apollo/client": "^3.3.15",
-    "@testing-library/jest-dom": "^5.11.10",
-    "@testing-library/react": "^11.2.6",
-    "@testing-library/user-event": "^13.1.5",
-    "@types/prop-types": "^15.7.3",
-    "apollo-boost": "^0.4.9",
-    "apollo-link-context": "^1.0.20",
-    "apollo-link-logger": "^2.0.0",
-    "dotenv": "^8.2.0",
-    "firebase": "^8.4.1",
-    "graphql": "^15.4.0",
-    "prop-types": "^15.7.2",
-    "ra-data-hasura-graphql": "^0.1.13",
-    "react": "^17.0.1",
-    "react-admin": "^3.14.4",
-    "react-dom": "^17.0.1",
-    "react-icons": "^4.2.0",
-    "react-scripts": "4.0.3",
-    "sass": "^1.32.10"
-  },
-  "scripts": {
-    "start": "set PORT=3001 && react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}

admin/public/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>ImEX Online - ADMIN</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

admin/public/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

admin/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

admin/src/App/App.css

@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

admin/src/App/App.js

@@ -1,12 +0,0 @@
-import React from "react";
-import AdminRoot from "../components/admin-root/admin-root.component";
-import "./App.css";
-function App() {
-  return (
-    <div className="App">
-      <AdminRoot />
-    </div>
-  );
-}
-
-export default App;

admin/src/App/App.test.js

@@ -1,9 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  const { getByText } = render(<App />);
-  const linkElement = getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

admin/src/Assets/logo.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>

admin/src/components/admin-root/admin-root.component.jsx

@@ -1,283 +0,0 @@
-import { ApolloClient, ApolloProvider, InMemoryCache } from "@apollo/client";
-import { ApolloLink } from "apollo-boost";
-import { setContext } from "apollo-link-context";
-import { HttpLink } from "apollo-link-http";
-import apolloLogger from "apollo-link-logger";
-import buildHasuraProvider from "ra-data-hasura-graphql";
-import React, { Component } from "react";
-import {
-  Admin,
-  EditGuesser,
-  ListGuesser,
-  Resource,
-  ShowGuesser,
-} from "react-admin";
-import { FaFileInvoiceDollar } from "react-icons/fa";
-import CircularProgress from "@material-ui/core/CircularProgress";
-import { auth } from "../../firebase/admin-firebase-utils";
-import authProvider from "../auth-provider/auth-provider";
-import JoblinesCreate from "../joblines/joblines.create";
-import JoblinesEdit from "../joblines/joblines.edit";
-import JoblinesList from "../joblines/joblines.list";
-import JoblinesShow from "../joblines/joblines.show";
-import JobsCreate from "../jobs/jobs.create";
-import JobsEdit from "../jobs/jobs.edit";
-import JobsList from "../jobs/jobs.list";
-import JobsShow from "../jobs/jobs.show";
-
-const httpLink = new HttpLink({
-  uri: process.env.REACT_APP_GRAPHQL_ENDPOINT,
-  headers: {
-    "x-hasura-admin-secret": `Dev-BodyShopApp!`,
-    // 'Authorization': `Bearer xxxx`,
-  },
-});
-
-const authLink = setContext((_, { headers }) => {
-  return (
-    auth.currentUser &&
-    auth.currentUser.getIdToken().then((token) => {
-      if (token) {
-        return {
-          headers: {
-            ...headers,
-            authorization: token ? `Bearer ${token}` : "",
-          },
-        };
-      } else {
-        return { headers };
-      }
-    })
-  );
-});
-
-const middlewares = [];
-if (process.env.NODE_ENV === "development") {
-  middlewares.push(apolloLogger);
-}
-
-middlewares.push(authLink.concat(httpLink));
-
-const client = new ApolloClient({
-  link: ApolloLink.from(middlewares),
-  cache: new InMemoryCache(),
-});
-
-// const client = new ApolloClient({
-//   uri: process.env.REACT_APP_GRAPHQL_ENDPOINT,
-//   cache: new InMemoryCache(),
-//   headers: {
-//     "x-hasura-admin-secret": `Dev-BodyShopApp!`,
-//     // 'Authorization': `Bearer xxxx`,
-//   },
-// });
-
-class AdminRoot extends Component {
-  constructor() {
-    super();
-    this.state = { dataProvider: null };
-  }
-  componentDidMount() {
-    buildHasuraProvider({
-      client,
-    }).then((dataProvider) => this.setState({ dataProvider }));
-  }
-
-  render() {
-    const { dataProvider } = this.state;
-
-    if (!dataProvider) {
-      return (
-        <div>
-          <CircularProgress />
-        </div>
-      );
-    }
-
-    return (
-      <ApolloProvider client={client}>
-        <Admin dataProvider={dataProvider} authProvider={authProvider}>
-          <Resource
-            icon={FaFileInvoiceDollar}
-            name="jobs"
-            list={JobsList}
-            edit={JobsEdit}
-            create={JobsCreate}
-            show={JobsShow}
-          />
-          <Resource
-            name="joblines"
-            list={JoblinesList}
-            edit={JoblinesEdit}
-            create={JoblinesCreate}
-            show={JoblinesShow}
-          />
-          <Resource
-            name="bodyshops"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="owners"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="vehicles"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="appointments"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="available_jobs"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="cccontracts"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="conversations"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="counters"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="courtesycars"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="csi"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="csiquestions"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="documents"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="employees"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="invoicelines"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="invoices"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="job_conversations"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="masterdata"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="messages"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="notes"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="parts_order_lines"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="parts_orders"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="payments"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="scoreboard"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="templates"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="timetickets"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="users"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-          <Resource
-            name="vendors"
-            list={ListGuesser}
-            edit={EditGuesser}
-            show={ShowGuesser}
-          />
-        </Admin>
-      </ApolloProvider>
-    );
-  }
-}
-
-export default AdminRoot;

admin/src/components/auth-provider/auth-provider.js

@@ -1,39 +0,0 @@
-import { auth, getCurrentUser } from "../../firebase/admin-firebase-utils";
-
-const authProvider = {
-  login: async ({ username, password }) => {
-    console.log(username, password);
-    try {
-      const { user } = await auth.signInWithEmailAndPassword(
-        username,
-        password
-      );
-      const token = await user.getIdToken();
-      localStorage.setItem("token", token);
-      return Promise.resolve();
-    } catch (error) {
-      console.log("error", error);
-      return Promise.reject();
-    }
-  },
-  logout: async (params) => {
-    await auth.signOut();
-    localStorage.removeItem("token");
-    return Promise.resolve();
-  },
-  checkAuth: async (params) => {
-    const user = await getCurrentUser();
-    if (!!user) {
-      return Promise.resolve();
-    } else {
-      return Promise.reject();
-    }
-  },
-  checkError: (error) => {
-    return Promise.resolve();
-  },
-  getPermissions: (params) => {
-    return Promise.resolve();
-  },
-};
-export default authProvider;

admin/src/components/joblines/joblines.create.jsx

@@ -1,26 +0,0 @@
-import React from "react";
-import {
-  Create,
-
-
-
-  NumberInput, SimpleForm,
-  TextInput
-} from "react-admin";
-
-const JoblinesCreate = (props) => (
-  <Create {...props}>
-    <SimpleForm>
-      <TextInput source="line_ref" />
-      <TextInput source="line_ind" />
-      <NumberInput source="db_price" />
-      <NumberInput source="act_price" />
-      <NumberInput source="part_qty" />
-      <NumberInput source="mod_lb_hrs" />
-      <TextInput source="mod_lbr_type" />
-      <TextInput source="lbr_op" />
-    </SimpleForm>
-  </Create>
-);
-
-export default JoblinesCreate;

admin/src/components/joblines/joblines.edit.jsx

@@ -1,70 +0,0 @@
-import React from "react";
-import {
-  BooleanInput,
-  DateField,
-  Edit,
-  NumberInput,
-  SimpleForm,
-  TextInput,
-} from "react-admin";
-
-const JoblinesEdit = (props) => (
-  <Edit {...props}>
-    <SimpleForm>
-      <TextInput source="id" />
-      <DateField showTime source="created_at" />
-      <DateField showTime source="updated_at" />
-      <TextInput source="jobid" />
-      <NumberInput source="unq_seq" />
-      <NumberInput source="line_ind" />
-      <TextInput source="line_desc" />
-      <TextInput source="part_type" />
-      <TextInput source="oem_partno" />
-      <TextInput source="est_seq" />
-      <TextInput source="db_ref" />
-      <TextInput source="line_ref" />
-      <BooleanInput source="tax_part" />
-      <NumberInput source="db_price" />
-      <NumberInput source="act_price" />
-      <NumberInput source="part_qty" />
-      <TextInput source="alt_partno" />
-      <TextInput source="mod_lbr_ty" />
-      <NumberInput source="db_hrs" />
-      <NumberInput source="mod_lb_hrs" />
-      <TextInput source="lbr_op" />
-      <NumberInput source="lbr_amt" />
-      <BooleanInput source="glass_flag" />
-      <TextInput source="price_inc" />
-      <TextInput source="alt_part_i" />
-      <TextInput source="price_j" />
-      <TextInput source="cert_part" />
-      <TextInput source="alt_co_id" />
-      <TextInput source="alt_overrd" />
-      <TextInput source="alt_partm" />
-      <TextInput source="prt_dsmk_p" />
-      <TextInput source="prt_dsmk_m" />
-      <TextInput source="lbr_inc" />
-      <TextInput source="lbr_hrs_j" />
-      <TextInput source="lbr_typ_j" />
-      <TextInput source="lbr_op_j" />
-      <TextInput source="paint_stg" />
-      <TextInput source="paint_tone" />
-      <TextInput source="lbr_tax" />
-      <NumberInput source="misc_amt" />
-      <TextInput source="misc_sublt" />
-      <TextInput source="misc_tax" />
-      <TextInput source="bett_type" />
-      <NumberInput source="bett_pctg" />
-      <NumberInput source="bett_amt" />
-      <TextInput source="bett_tax" />
-      <TextInput source="op_code_desc" />
-      <TextInput source="status" />
-      <TextInput source="removed" />
-      <NumberInput source="line_no" />
-      <TextInput source="notes" />
-      <TextInput source='"location"' />
-    </SimpleForm>
-  </Edit>
-);
-
-export default JoblinesEdit;

admin/src/components/joblines/joblines.list.jsx

@@ -1,29 +0,0 @@
-import React from "react";
-import {
-  Datagrid, List,
-
-
-  NumberField,
-
-  ReferenceField, TextField
-} from "react-admin";
-
-const JoblinesList = (props) => (
-  <List {...props}>
-    <Datagrid rowClick="edit">
-      <ReferenceField source="jobid" reference="jobs">
-        <TextField source="ro_number" />
-      </ReferenceField>
-      <TextField source="line_ref" />
-      <TextField source="line_ind" />
-      <NumberField source="db_price" />
-      <NumberField source="act_price" />
-      <NumberField source="part_qty" />
-      <NumberField source="mod_lb_hrs" />
-      <TextField source="mod_lbr_type" />
-      <TextField source="lbr_op" />
-    </Datagrid>
-  </List>
-);
-
-export default JoblinesList;

admin/src/components/joblines/joblines.show.jsx

@@ -1,24 +0,0 @@
-import React from "react";
-import {
-  NumberInput, Show,
-
-  SimpleShowLayout,
-  TextInput
-} from "react-admin";
-
-const JoblinesShow = (props) => (
-  <Show {...props}>
-    <SimpleShowLayout>
-      <TextInput source="line_ref" />
-      <TextInput source="line_ind" />
-      <NumberInput source="db_price" />
-      <NumberInput source="act_price" />
-      <NumberInput source="part_qty" />
-      <NumberInput source="mod_lb_hrs" />
-      <TextInput source="mod_lbr_type" />
-      <TextInput source="lbr_op" />
-    </SimpleShowLayout>
-  </Show>
-);
-
-export default JoblinesShow;

admin/src/components/jobs/jobs.create.jsx

@@ -1,17 +0,0 @@
-import React from "react";
-import { Create, EmailField, SimpleForm, TextInput } from "react-admin";
-
-const JobsCreate = (props) => (
-  <Create {...props}>
-    <SimpleForm>
-      <TextInput source="ro_number" />
-
-      <TextInput source="ownr_fn" />
-      <TextInput source="ownr_ln" />
-      <TextInput source="converted" />
-      <EmailField source="ownr_ea" />
-    </SimpleForm>
-  </Create>
-);
-
-export default JobsCreate;

admin/src/components/jobs/jobs.edit.jsx

@@ -1,316 +0,0 @@
-import React from "react";
-//@ts-ignore
-import {
-  AutocompleteInput,
-  BooleanInput,
-  Edit,
-  FormTab,
-  NumberInput,
-  ReferenceInput,
-  SelectInput,
-  SimpleForm,
-  TabbedForm,
-  TextInput,
-} from "react-admin";
-
-const JobsEdit = (props) => (
-  <Edit {...props}>
-    <TabbedForm>
-      <FormTab label="Job Info">
-        <SimpleForm>
-          <ReferenceInput label="Shopid" source="shopid" reference="bodyshops">
-            <SelectInput disabled optionText="shopname" />
-          </ReferenceInput>
-          <TextInput source="ro_number" />
-          <ReferenceInput label="Owner ID" source="ownerid" reference="owners">
-            <AutocompleteInput
-              matchSuggestion={(filter, choice) =>
-                choice.ownr_fn &&
-                choice.ownr_fn.toLowerCase().includes(filter.toLowerCase())
-              }
-              optionText={(record) =>
-                `${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-                  record.ownr_co_nm || ""
-                } (${record.ownr_ph1 || ""})`
-              }
-            />
-          </ReferenceInput>
-          <ReferenceInput
-            label="Vehicle Id"
-            source="vehicleid"
-            reference="vehicles"
-          >
-            <SelectInput optionText="v_vin" />
-          </ReferenceInput>
-          <ReferenceInput label="Shopid" source="shopid" reference="bodyshops">
-            <SelectInput disabled optionText="shopname" />
-          </ReferenceInput>
-          <TextInput source="ro_number" />
-          <ReferenceInput label="Owner ID" source="ownerid" reference="owners">
-            <AutocompleteInput
-              matchSuggestion={(filter, choice) =>
-                choice.ownr_fn &&
-                choice.ownr_fn.toLowerCase().includes(filter.toLowerCase())
-              }
-              optionText={(record) =>
-                `${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-                  record.ownr_co_nm || ""
-                } (${record.ownr_ph1 || ""})`
-              }
-            />
-          </ReferenceInput>
-          <ReferenceInput
-            label="Vehicle Id"
-            source="vehicleid"
-            reference="vehicles"
-          >
-            <SelectInput optionText="v_vin" />
-          </ReferenceInput>
-          <BooleanInput source="inproduction" />
-          <BooleanInput source="converted" />
-          <TextInput disabled source="id" />
-          <TextInput disabled source="created_at" />
-          <TextInput disabled source="updated_at" />
-        </SimpleForm>
-      </FormTab>
-
-      <FormTab label="Labor Rates">
-        <NumberInput source="labor_rate_id" />
-        <NumberInput source="labor_rate_desc" />
-        <NumberInput source="rate_lab" />
-        <NumberInput source="rate_lad" />
-        <NumberInput source="rate_lae" />
-        <NumberInput source="rate_lar" />
-        <NumberInput source="rate_las" />
-        <NumberInput source="rate_laf" />
-        <NumberInput source="rate_lam" />
-        <NumberInput source="rate_lag" />
-        <NumberInput source="rate_atp" />
-        <NumberInput source="rate_lau" />
-        <NumberInput source="rate_la1" />
-        <NumberInput source="rate_la2" />
-        <NumberInput source="rate_la3" />
-        <NumberInput source="rate_la4" />
-        <NumberInput source="rate_mapa" />
-        <NumberInput source="rate_mash" />
-        <NumberInput source="rate_mahw" />
-        <NumberInput source="rate_ma2s" />
-        <NumberInput source="rate_ma3s" />
-        <NumberInput source="rate_ma2t" />
-        <NumberInput source="rate_mabl" />
-        <NumberInput source="rate_macs" />
-        <NumberInput source="rate_matd" />
-        <NumberInput source="federal_tax_rate" />
-        <NumberInput source="state_tax_rate" />
-        <NumberInput source="local_tax_rate" />
-      </FormTab>
-      <FormTab label="Dates">
-        <TextInput source="scheduled_in" />
-        <TextInput source="actual_in" />
-        <TextInput source="scheduled_completion" />
-        <TextInput source="actual_completion" />
-        <TextInput source="scheduled_delivery" />
-        <TextInput source="actual_delivery" />
-        <TextInput source="invoice_date" />
-        <TextInput source="date_estimated" />
-        <TextInput source="date_open" />
-        <TextInput source="date_scheduled" />
-        <TextInput source="date_invoiced" />
-        <TextInput source="date_exported" />
-      </FormTab>
-      <FormTab label="Insurance info">
-        <TextInput source="est_co_nm" />
-        <TextInput source="est_addr1" />
-        <TextInput source="est_addr2" />
-        <TextInput source="est_city" />
-        <TextInput source="est_st" />
-        <TextInput source="est_zip" />
-        <TextInput source="est_ctry" />
-        <TextInput source="est_ph1" />
-        <TextInput source="est_ea" />
-        <TextInput source="est_ct_ln" />
-        <TextInput source="est_ct_fn" />
-        <TextInput source="regie_number" />
-        <TextInput source="statusid" />
-        <TextInput source="ins_co_id" />
-        <TextInput source="ins_co_nm" />
-        <TextInput source="ins_addr1" />
-        <TextInput source="ins_addr2" />
-        <TextInput source="ins_city" />
-        <TextInput source="ins_st" />
-        <TextInput source="ins_zip" />
-        <TextInput source="ins_ctry" />
-        <TextInput source="ins_ph1" />
-        <TextInput source="ins_ph1x" />
-        <TextInput source="ins_ph2" />
-        <TextInput source="ins_ph2x" />
-        <TextInput source="ins_fax" />
-        <TextInput source="ins_faxx" />
-        <TextInput source="ins_ct_ln" />
-        <TextInput source="ins_ct_fn" />
-        <TextInput source="ins_title" />
-        <TextInput source="ins_ct_ph" />
-        <TextInput source="ins_ct_phx" />
-        <TextInput source="ins_ea" />
-        <TextInput source="ins_memo" />
-        <TextInput source="policy_no" />
-        <TextInput source="ded_amt" />
-        <TextInput source="ded_status" />
-        <TextInput source="asgn_no" />
-        <TextInput source="asgn_date" />
-        <TextInput source="asgn_type" />
-        <TextInput source="clm_no" />
-        <TextInput source="clm_ofc_id" />
-        <TextInput source="agt_co_id" />
-        <TextInput source="agt_co_nm" />
-        <TextInput source="agt_addr1" />
-        <TextInput source="agt_addr2" />
-        <TextInput source="agt_city" />
-        <TextInput source="agt_st" />
-        <TextInput source="agt_zip" />
-        <TextInput source="agt_ctry" />
-        <TextInput source="agt_ph1" />
-        <TextInput source="agt_ph1x" />
-        <TextInput source="agt_ph2" />
-        <TextInput source="agt_ph2x" />
-        <TextInput source="agt_fax" />
-        <TextInput source="agt_faxx" />
-        <TextInput source="agt_ct_ln" />
-        <TextInput source="agt_ct_fn" />
-        <TextInput source="agt_ct_ph" />
-        <TextInput source="agt_ct_phx" />
-        <TextInput source="agt_ea" />
-        <TextInput source="agt_lic_no" />
-        <TextInput source="loss_type" />
-        <TextInput source="loss_desc" />
-        <TextInput source="theft_ind" />
-        <TextInput source="cat_no" />
-        <TextInput source="tlos_ind" />
-        <TextInput source="ciecaid" />
-        <TextInput source="loss_date" />
-        <TextInput source="clm_ofc_nm" />
-        <TextInput source="clm_addr1" />
-        <TextInput source="clm_addr2" />
-        <TextInput source="clm_city" />
-        <TextInput source="clm_st" />
-        <TextInput source="clm_zip" />
-        <TextInput source="clm_ctry" />
-        <TextInput source="clm_ph1" />
-        <TextInput source="clm_ph1x" />
-        <TextInput source="clm_ph2" />
-        <TextInput source="clm_ph2x" />
-        <TextInput source="clm_fax" />
-        <TextInput source="clm_faxx" />
-        <TextInput source="clm_ct_ln" />
-        <TextInput source="clm_ct_fn" />
-        <TextInput source="clm_title" />
-        <TextInput source="clm_ct_ph" />
-        <TextInput source="clm_ct_phx" />
-        <TextInput source="clm_ea" />
-        <TextInput source="payee_nms" />
-        <TextInput source="pay_type" />
-        <TextInput source="pay_date" />
-        <TextInput source="pay_chknm" />
-        <TextInput source="pay_amt" />
-      </FormTab>
-      <FormTab label="Owner Data on Job">
-        <TextInput source="cust_pr" />
-        <TextInput source="insd_ln" />
-        <TextInput source="insd_fn" />
-        <TextInput source="insd_title" />
-        <TextInput source="insd_co_nm" />
-        <TextInput source="insd_addr1" />
-        <TextInput source="insd_addr2" />
-        <TextInput source="insd_city" />
-        <TextInput source="insd_st" />
-        <TextInput source="insd_zip" />
-        <TextInput source="insd_ctry" />
-        <TextInput source="insd_ph1" />
-        <TextInput source="insd_ph1x" />
-        <TextInput source="insd_ph2" />
-        <TextInput source="insd_ph2x" />
-        <TextInput source="insd_fax" />
-        <TextInput source="insd_faxx" />
-        <TextInput source="insd_ea" />
-        <TextInput source="ownr_ln" />
-        <TextInput source="ownr_fn" />
-        <TextInput source="ownr_title" />
-        <TextInput source="ownr_co_nm" />
-        <TextInput source="ownr_addr1" />
-        <TextInput source="ownr_addr2" />
-        <TextInput source="ownr_city" />
-        <TextInput source="ownr_st" />
-        <TextInput source="ownr_zip" />
-        <TextInput source="ownr_ctry" />
-        <TextInput source="ownr_ph1" />
-        <TextInput source="ownr_ph1x" />
-        <TextInput source="ownr_ph2" />
-        <TextInput source="ownr_ph2x" />
-        <TextInput source="ownr_fax" />
-        <TextInput source="ownr_faxx" />
-        <TextInput source="ownr_ea" />
-      </FormTab>
-      <FormTab label="Financial">
-        <TextInput source="clm_total" />
-        <TextInput source="owner_owing" />
-      </FormTab>
-      <FormTab label="Other">
-        <TextInput source="area_of_damage" />
-        <TextInput source="loss_cat" />
-        <TextInput source="special_coverage_policy" />
-        <TextInput source="csr" />
-        <TextInput source="po_number" />
-        <TextInput source="unit_number" />
-        <TextInput source="kmin" />
-        <TextInput source="kmout" />
-        <TextInput source="referral_source" />
-        <TextInput source="selling_dealer" />
-        <TextInput source="servicing_dealer" />
-        <TextInput source="servicing_dealer_contact" />
-        <TextInput source="selling_dealer_contact" />
-        <TextInput source="depreciation_taxes" />
-        <TextInput source="federal_tax_payable" />
-        <TextInput source="other_amount_payable" />
-        <TextInput source="towing_payable" />
-        <TextInput source="storage_payable" />
-        <TextInput source="adjustment_bottom_line" />
-        <TextInput source="tax_pstthr" />
-        <TextInput source="tax_tow_rt" />
-        <TextInput source="tax_sub_rt" />
-        <TextInput source="tax_paint_mat_rt" />
-        <TextInput source="tax_levies_rt" />
-        <TextInput source="tax_prethr" />
-        <TextInput source="tax_thramt" />
-        <TextInput source="tax_str_rt" />
-        <TextInput source="tax_lbr_rt" />
-        <TextInput source="adj_g_disc" />
-        <TextInput source="adj_towdis" />
-        <TextInput source="adj_strdis" />
-        <TextInput source="tax_predis" />
-        <TextInput source="rate_laa" />
-        <TextInput source="status" />
-        <TextInput source="cieca_stl" />
-        <TextInput source="g_bett_amt" />
-        <TextInput source="cieca_ttl" />
-        <TextInput source="plate_no" />
-        <TextInput source="plate_st" />
-        <TextInput source="v_vin" />
-        <TextInput source="v_model_yr" />
-        <TextInput source="v_model_desc" />
-        <TextInput source="v_make_desc" />
-        <TextInput source="v_color" />
-        <TextInput source="parts_tax_rates" />
-        <TextInput source="job_totals" />
-        <TextInput source="production_vars" />
-        <TextInput source="intakechecklist" />
-        <TextInput source="invoice_allocation" />
-        <TextInput source="kanbanparent" />
-        <TextInput source="employee_body" />
-        <TextInput source="employee_refinish" />
-        <TextInput source="employee_prep" />
-      </FormTab>
-    </TabbedForm>
-  </Edit>
-);
-
-export default JobsEdit;

admin/src/components/jobs/jobs.list.jsx

@@ -1,66 +0,0 @@
-import { useQuery } from "@apollo/client";
-import CircularProgress from "@material-ui/core/CircularProgress";
-import React from "react";
-import {
-  Datagrid,
-  Filter,
-  List,
-  ReferenceField,
-  SelectInput,
-  TextField,
-  TextInput,
-} from "react-admin";
-import { QUERY_ALL_SHOPS } from "../../graphql/admin.shop.queries";
-
-const JobsList = (props) => (
-  <List filters={<JobsFilter />} {...props}>
-    <Datagrid rowClick="edit">
-      <TextField source="id" label="Job ID" />
-      <ReferenceField source="shopid" reference="bodyshops" label="Shop Name">
-        <TextField source="shopname" />
-      </ReferenceField>
-      <TextField source="ro_number" label="RO Number" />
-
-      <TextField source="ownr_fn" label="Owner FN" />
-      <TextField source="ownr_ln" label="Owner LN" />
-      <TextField source="ownr_co_nm" label="Owner CO" />
-
-      <ReferenceField source="ownerid" reference="owners" label="Owner Record">
-        <TextField source="id" />
-      </ReferenceField>
-      <TextField source="v_model_yr" label="Year" />
-      <TextField source="v_make_desc" label="Make" />
-      <TextField source="v_model_desc" label="Model" />
-
-      <ReferenceField
-        source="vehicleid"
-        reference="vehicles"
-        label="Vehicle ID"
-      >
-        <TextField source="id" />
-      </ReferenceField>
-    </Datagrid>
-  </List>
-);
-
-const JobsFilter = (props) => {
-  const { loading, error, data } = useQuery(QUERY_ALL_SHOPS);
-  if (loading) return <CircularProgress />;
-  if (error) return JSON.stringify(error);
-
-  return (
-    <Filter {...props}>
-      <TextInput label="RO Number" source="ro_number" />
-      <TextInput label="Job ID" source="id" />
-      <SelectInput
-        source="shopid"
-        label="Bodyshop"
-        choices={data.bodyshops.map((b) => {
-          return { id: b.id, name: b.shopname };
-        })}
-      />
-    </Filter>
-  );
-};
-
-export default JobsList;

admin/src/components/jobs/jobs.show.jsx

@@ -1,280 +0,0 @@
-import React from "react";
-import {
-  Datagrid,
-  EditButton,
-  NumberField,
-  ReferenceManyField,
-  Show,
-  Tab,
-  TabbedShowLayout,
-  TextField,
-} from "react-admin";
-
-const JobsShow = (props) => (
-  <Show {...props}>
-    <TabbedShowLayout>
-      <Tab label="summary">
-        <TextField source="id" />
-        <TextField source="created_at" />
-        <TextField source="updated_at" />
-        <TextField source="shopid" />
-        <TextField source="ro_number" />
-        <TextField source="ownerid" />
-        <TextField source="vehicleid" />
-      </Tab>
-      <Tab label="Job Lines">
-        <ReferenceManyField
-          reference="joblines"
-          target="jobid"
-          label="Job Lines"
-        >
-          <Datagrid>
-            <TextField source="id" />
-
-            <TextField source="line_ref" />
-            <TextField source="line_desc" />
-            <TextField source="line_ind" />
-            <NumberField source="db_price" />
-            <NumberField source="act_price" />
-            <NumberField source="part_qty" />
-            <NumberField source="mod_lb_hrs" />
-            <TextField source="mod_lbr_type" />
-            <TextField source="lbr_op" />
-
-            <EditButton />
-          </Datagrid>
-        </ReferenceManyField>
-      </Tab>
-      <Tab label="other">
-        <TextField source="labor_rate_id" />
-        <TextField source="labor_rate_desc" />
-        <TextField source="rate_lab" />
-        <TextField source="rate_lad" />
-        <TextField source="rate_lae" />
-        <TextField source="rate_lar" />
-        <TextField source="rate_las" />
-        <TextField source="rate_laf" />
-        <TextField source="rate_lam" />
-        <TextField source="rate_lag" />
-        <TextField source="rate_atp" />
-        <TextField source="rate_lau" />
-        <TextField source="rate_la1" />
-        <TextField source="rate_la2" />
-        <TextField source="rate_la3" />
-        <TextField source="rate_la4" />
-        <TextField source="rate_mapa" />
-        <TextField source="rate_mash" />
-        <TextField source="rate_mahw" />
-        <TextField source="rate_ma2s" />
-        <TextField source="rate_ma3s" />
-        <TextField source="rate_ma2t" />
-        <TextField source="rate_mabl" />
-        <TextField source="rate_macs" />
-        <TextField source="rate_matd" />
-        <TextField source="federal_tax_rate" />
-        <TextField source="state_tax_rate" />
-        <TextField source="local_tax_rate" />
-        <TextField source="est_co_nm" />
-        <TextField source="est_addr1" />
-        <TextField source="est_addr2" />
-        <TextField source="est_city" />
-        <TextField source="est_st" />
-        <TextField source="est_zip" />
-        <TextField source="est_ctry" />
-        <TextField source="est_ph1" />
-        <TextField source="est_ea" />
-        <TextField source="est_ct_ln" />
-        <TextField source="est_ct_fn" />
-        <TextField source="scheduled_in" />
-        <TextField source="actual_in" />
-        <TextField source="scheduled_completion" />
-        <TextField source="actual_completion" />
-        <TextField source="scheduled_delivery" />
-        <TextField source="actual_delivery" />
-        <TextField source="regie_number" />
-        <TextField source="invoice_date" />
-        <TextField source="inproduction" />
-        <TextField source="statusid" />
-        <TextField source="ins_co_id" />
-        <TextField source="ins_co_nm" />
-        <TextField source="ins_addr1" />
-        <TextField source="ins_addr2" />
-        <TextField source="ins_city" />
-        <TextField source="ins_st" />
-        <TextField source="ins_zip" />
-        <TextField source="ins_ctry" />
-        <TextField source="ins_ph1" />
-        <TextField source="ins_ph1x" />
-        <TextField source="ins_ph2" />
-        <TextField source="ins_ph2x" />
-        <TextField source="ins_fax" />
-        <TextField source="ins_faxx" />
-        <TextField source="ins_ct_ln" />
-        <TextField source="ins_ct_fn" />
-        <TextField source="ins_title" />
-        <TextField source="ins_ct_ph" />
-        <TextField source="ins_ct_phx" />
-        <TextField source="ins_ea" />
-        <TextField source="ins_memo" />
-        <TextField source="policy_no" />
-        <TextField source="ded_amt" />
-        <TextField source="ded_status" />
-        <TextField source="asgn_no" />
-        <TextField source="asgn_date" />
-        <TextField source="asgn_type" />
-        <TextField source="clm_no" />
-        <TextField source="clm_ofc_id" />
-        <TextField source="date_estimated" />
-        <TextField source="date_open" />
-        <TextField source="date_scheduled" />
-        <TextField source="date_invoiced" />
-        <TextField source="date_exported" />
-        <TextField source="clm_total" />
-        <TextField source="owner_owing" />
-        <TextField source="converted" />
-        <TextField source="ciecaid" />
-        <TextField source="loss_date" />
-        <TextField source="clm_ofc_nm" />
-        <TextField source="clm_addr1" />
-        <TextField source="clm_addr2" />
-        <TextField source="clm_city" />
-        <TextField source="clm_st" />
-        <TextField source="clm_zip" />
-        <TextField source="clm_ctry" />
-        <TextField source="clm_ph1" />
-        <TextField source="clm_ph1x" />
-        <TextField source="clm_ph2" />
-        <TextField source="clm_ph2x" />
-        <TextField source="clm_fax" />
-        <TextField source="clm_faxx" />
-        <TextField source="clm_ct_ln" />
-        <TextField source="clm_ct_fn" />
-        <TextField source="clm_title" />
-        <TextField source="clm_ct_ph" />
-        <TextField source="clm_ct_phx" />
-        <TextField source="clm_ea" />
-        <TextField source="payee_nms" />
-        <TextField source="pay_type" />
-        <TextField source="pay_date" />
-        <TextField source="pay_chknm" />
-        <TextField source="pay_amt" />
-        <TextField source="agt_co_id" />
-        <TextField source="agt_co_nm" />
-        <TextField source="agt_addr1" />
-        <TextField source="agt_addr2" />
-        <TextField source="agt_city" />
-        <TextField source="agt_st" />
-        <TextField source="agt_zip" />
-        <TextField source="agt_ctry" />
-        <TextField source="agt_ph1" />
-        <TextField source="agt_ph1x" />
-        <TextField source="agt_ph2" />
-        <TextField source="agt_ph2x" />
-        <TextField source="agt_fax" />
-        <TextField source="agt_faxx" />
-        <TextField source="agt_ct_ln" />
-        <TextField source="agt_ct_fn" />
-        <TextField source="agt_ct_ph" />
-        <TextField source="agt_ct_phx" />
-        <TextField source="agt_ea" />
-        <TextField source="agt_lic_no" />
-        <TextField source="loss_type" />
-        <TextField source="loss_desc" />
-        <TextField source="theft_ind" />
-        <TextField source="cat_no" />
-        <TextField source="tlos_ind" />
-        <TextField source="cust_pr" />
-        <TextField source="insd_ln" />
-        <TextField source="insd_fn" />
-        <TextField source="insd_title" />
-        <TextField source="insd_co_nm" />
-        <TextField source="insd_addr1" />
-        <TextField source="insd_addr2" />
-        <TextField source="insd_city" />
-        <TextField source="insd_st" />
-        <TextField source="insd_zip" />
-        <TextField source="insd_ctry" />
-        <TextField source="insd_ph1" />
-        <TextField source="insd_ph1x" />
-        <TextField source="insd_ph2" />
-        <TextField source="insd_ph2x" />
-        <TextField source="insd_fax" />
-        <TextField source="insd_faxx" />
-        <TextField source="insd_ea" />
-        <TextField source="ownr_ln" />
-        <TextField source="ownr_fn" />
-        <TextField source="ownr_title" />
-        <TextField source="ownr_co_nm" />
-        <TextField source="ownr_addr1" />
-        <TextField source="ownr_addr2" />
-        <TextField source="ownr_city" />
-        <TextField source="ownr_st" />
-        <TextField source="ownr_zip" />
-        <TextField source="ownr_ctry" />
-        <TextField source="ownr_ph1" />
-        <TextField source="ownr_ph1x" />
-        <TextField source="ownr_ph2" />
-        <TextField source="ownr_ph2x" />
-        <TextField source="ownr_fax" />
-        <TextField source="ownr_faxx" />
-        <TextField source="ownr_ea" />
-        <TextField source="area_of_damage" />
-        <TextField source="loss_cat" />
-
-        <TextField source="special_coverage_policy" />
-        <TextField source="csr" />
-        <TextField source="po_number" />
-        <TextField source="unit_number" />
-        <TextField source="kmin" />
-        <TextField source="kmout" />
-        <TextField source="referral_source" />
-        <TextField source="selling_dealer" />
-        <TextField source="servicing_dealer" />
-        <TextField source="servicing_dealer_contact" />
-        <TextField source="selling_dealer_contact" />
-        <TextField source="depreciation_taxes" />
-        <TextField source="federal_tax_payable" />
-        <TextField source="other_amount_payable" />
-        <TextField source="towing_payable" />
-        <TextField source="storage_payable" />
-        <TextField source="adjustment_bottom_line" />
-        <TextField source="tax_pstthr" />
-        <TextField source="tax_tow_rt" />
-        <TextField source="tax_sub_rt" />
-        <TextField source="tax_paint_mat_rt" />
-        <TextField source="tax_levies_rt" />
-        <TextField source="tax_prethr" />
-        <TextField source="tax_thramt" />
-        <TextField source="tax_str_rt" />
-        <TextField source="tax_lbr_rt" />
-        <TextField source="adj_g_disc" />
-        <TextField source="adj_towdis" />
-        <TextField source="adj_strdis" />
-        <TextField source="tax_predis" />
-        <TextField source="rate_laa" />
-        <TextField source="status" />
-        <TextField source="cieca_stl" />
-        <TextField source="g_bett_amt" />
-        <TextField source="cieca_ttl" />
-        <TextField source="plate_no" />
-        <TextField source="plate_st" />
-        <TextField source="v_vin" />
-        <TextField source="v_model_yr" />
-        <TextField source="v_model_desc" />
-        <TextField source="v_make_desc" />
-        <TextField source="v_color" />
-        <TextField source="parts_tax_rates" />
-        <TextField source="job_totals" />
-        <TextField source="production_vars" />
-        <TextField source="intakechecklist" />
-        <TextField source="invoice_allocation" />
-        <TextField source="kanbanparent" />
-        <TextField source="employee_body" />
-        <TextField source="employee_refinish" />
-        <TextField source="employee_prep" />
-      </Tab>
-    </TabbedShowLayout>
-  </Show>
-);
-
-export default JobsShow;

admin/src/firebase/admin-firebase-utils.js

@@ -1,31 +0,0 @@
-import firebase from "firebase/app";
-import "firebase/firestore";
-import "firebase/auth";
-
-const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
-firebase.initializeApp(config);
-
-export const auth = firebase.auth();
-export const firestore = firebase.firestore();
-
-export default firebase;
-
-export const getCurrentUser = () => {
-  return new Promise((resolve, reject) => {
-    const unsubscribe = auth.onAuthStateChanged((userAuth) => {
-      unsubscribe();
-      resolve(userAuth);
-    }, reject);
-  });
-};
-
-export const updateCurrentUser = (userDetails) => {
-  return new Promise((resolve, reject) => {
-    const unsubscribe = auth.onAuthStateChanged((userAuth) => {
-      userAuth.updateProfile(userDetails).then((r) => {
-        unsubscribe();
-        resolve(userAuth);
-      });
-    }, reject);
-  });
-};

admin/src/graphql/admin.shop.queries.js

@@ -1,10 +0,0 @@
-import { gql } from "@apollo/client";
-
-export const QUERY_ALL_SHOPS = gql`
-  query QUERY_ALL_SHOPS {
-    bodyshops {
-      id
-      shopname
-    }
-  }
-`;

admin/src/index.css

@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}

admin/src/index.js

@@ -1,17 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import "./index.css";
-import App from "./App/App";
-import * as serviceWorker from "./serviceWorker";
-
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById("root")
-);
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();

admin/src/serviceWorker.js

@@ -1,141 +0,0 @@
-// This optional code is used to register a service worker.
-// register() is not called by default.
-
-// This lets the app load faster on subsequent visits in production, and gives
-// it offline capabilities. However, it also means that developers (and users)
-// will only see deployed updates on subsequent visits to a page, after all the
-// existing tabs open on the page have been closed, since previously cached
-// resources are updated in the background.
-
-// To learn more about the benefits of this model and instructions on how to
-// opt-in, read https://bit.ly/CRA-PWA
-
-const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
-    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
-    // 127.0.0.0/8 are considered localhost for IPv4.
-    window.location.hostname.match(
-      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
-    )
-);
-
-export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
-    if (publicUrl.origin !== window.location.origin) {
-      // Our service worker won't work if PUBLIC_URL is on a different origin
-      // from what our page is served on. This might happen if a CDN is used to
-      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
-      return;
-    }
-
-    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
-
-      if (isLocalhost) {
-        // This is running on localhost. Let's check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl, config);
-
-        // Add some additional logging to localhost, pointing developers to the
-        // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
-          console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://bit.ly/CRA-PWA'
-          );
-        });
-      } else {
-        // Is not localhost. Just register service worker
-        registerValidSW(swUrl, config);
-      }
-    });
-  }
-}
-
-function registerValidSW(swUrl, config) {
-  navigator.serviceWorker
-    .register(swUrl)
-    .then(registration => {
-      registration.onupdatefound = () => {
-        const installingWorker = registration.installing;
-        if (installingWorker == null) {
-          return;
-        }
-        installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
-            if (navigator.serviceWorker.controller) {
-              // At this point, the updated precached content has been fetched,
-              // but the previous service worker will still serve the older
-              // content until all client tabs are closed.
-              console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
-              );
-
-              // Execute callback
-              if (config && config.onUpdate) {
-                config.onUpdate(registration);
-              }
-            } else {
-              // At this point, everything has been precached.
-              // It's the perfect time to display a
-              // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
-
-              // Execute callback
-              if (config && config.onSuccess) {
-                config.onSuccess(registration);
-              }
-            }
-          }
-        };
-      };
-    })
-    .catch(error => {
-      console.error('Error during service worker registration:', error);
-    });
-}
-
-function checkValidServiceWorker(swUrl, config) {
-  // Check if the service worker can be found. If it can't reload the page.
-  fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
-  })
-    .then(response => {
-      // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
-      if (
-        response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
-      ) {
-        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then(registration => {
-          registration.unregister().then(() => {
-            window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl, config);
-      }
-    })
-    .catch(() => {
-      console.log(
-        'No internet connection found. App is running in offline mode.'
-      );
-    });
-}
-
-export function unregister() {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.ready
-      .then(registration => {
-        registration.unregister();
-      })
-      .catch(error => {
-        console.error(error.message);
-      });
-  }
-}

admin/src/setupTests.js

@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';

client/.env.development

@@ -0,0 +1,13 @@
+REACT_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
+REACT_APP_GA_CODE=231099835
+REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
+REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
+REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
+REACT_APP_CLOUDINARY_API_KEY=957865933348715
+REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
+REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
+REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
+REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/.env.production

@@ -0,0 +1,14 @@
+GENERATE_SOURCEMAP=false
+REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
+REACT_APP_GA_CODE=231103507
+REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU","authDomain":"imex-prod.firebaseapp.com","databaseURL":"https://imex-prod.firebaseio.com","projectId":"imex-prod","storageBucket":"imex-prod.appspot.com","messagingSenderId":"253497221485","appId":"1:253497221485:web:3c81c483b94db84b227a64","measurementId":"G-NTWBKG2L0M"}
+REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
+REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
+REACT_APP_CLOUDINARY_API_KEY=473322739956866
+REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
+REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
+REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports.imex.online
+REACT_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk

client/.env.test

@@ -0,0 +1,14 @@
+REACT_APP_GRAPHQL_ENDPOINT=https://db.test.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.bodyshop.app/v1/graphql
+REACT_APP_GA_CODE=231099835
+REACT_APP_FIREBASE_CONFIG={   "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c",   "authDomain":"imex-test.firebaseapp.com",   "projectId":"imex-test",   "storageBucket":"imex-test.appspot.com",   "messagingSenderId":"991923618608",   "appId":"1:991923618608:web:633437569cdad78299bef5",   "measurementId":"G-TW0XLZEH18"}
+REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
+REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
+REACT_APP_CLOUDINARY_API_KEY=473322739956866
+REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
+REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
+REACT_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+REACT_APP_IS_TEST=true
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/cypress.config.js

@@ -0,0 +1,17 @@
+const { defineConfig } = require("cypress");
+
+module.exports = defineConfig({
+  experimentalStudio: true,
+
+  env: {
+    FIREBASE_USERNAME: "cypress@imex.test",
+    FIREBASE_PASSWORD: "cypress",
+  },
+
+  e2e: {
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+    baseUrl: "http://localhost:3000",
+  },
+});

client/cypress.env.json

@@ -0,0 +1,4 @@
+{
+  "graphql_dev_endpoint": "https://db.dev.bodyshop.app/v1/graphql",
+  "uploaded_by_email": "john@imex.dev"
+}

client/cypress/e2e/intake/intake-checklist.cy.js

@@ -0,0 +1,232 @@
+import moment from "moment";
+import job from "../../fixtures/jobs/job-3.json";
+
+describe(
+  "Adding job to checklist",
+  {
+    defaultCommandTimeout: 10000,
+  },
+  () => {
+    beforeEach(() => {
+      cy.visit("/manage/jobs");
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_BODYSHOP") {
+          req.alias = "bodyshop";
+        }
+      });
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@active-jobs-table")
+        .contains(job.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+    });
+
+    it("adds checklists to the job and set the job to production", () => {
+      const tomorrow = moment(new Date()).format("YYYY-MM-DD");
+
+      cy.get('[data-cy="job-actions-button"]').click();
+      // Go to intake
+      cy.get('[data-cy="job-intake-button"]').should("not.be.disabled").click();
+      cy.url().should("include", "/intake");
+      // Fill out the form
+      cy.get('[data-cy="checklist-form"]').should("be.visible");
+
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        // intakechecklist
+        const checklists = bodyshop.intakechecklist.form;
+
+        checklists.forEach((item, index) => {
+          if (item.type === "text") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("input:text")
+              .type("Random Word");
+          } else if (item.type === "textarea") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("textarea")
+              .type("Random Word");
+          } else if (item.type === "checkbox") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("input:checkbox")
+              .check();
+          } else if (item.type === "slider") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find(".ant-slider-dot:eq(1)")
+              .click({ force: true });
+          } else if (item.type === "rate") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find(".ant-rate > li")
+              .eq(3)
+              .find("div[role='radio']")
+              .click({ force: true });
+          }
+        });
+      });
+
+      // Check if `Add Job to Production` is switched to on
+      cy.get('[data-cy="add-to-production-switch"]').should(
+        "have.attr",
+        "aria-checked",
+        "true"
+      );
+      // Select dates for completion and delivery
+      cy.get("#scheduled_completion").find(".ant-picker-input").first().click();
+      cy.get(`[title="${tomorrow}"]`).should("be.visible").click();
+      // Add time selection
+      cy.get("#scheduled_delivery").find(".ant-picker-input").first().click();
+      cy.get(`[title="${tomorrow}"]`)
+        .should("be.visible")
+        .click({ multiple: true, force: true });
+      // Add time selection
+      // Add note
+      cy.get('[data-cy="checklist-production-note"]').type("automated testing");
+      // Submit the form
+      cy.get('[data-cy="checklist-submit-button"]').click();
+
+      cy.url().should("include", "/manage/jobs");
+      cy.contains("In Production");
+    });
+
+    it("adds checklists to the job and remove the job to production", () => {
+      const tomorrow = moment(new Date()).format("YYYY-MM-DD");
+
+      cy.get('[data-cy="job-actions-button"]').click();
+      // Go to deliver
+      cy.get('[data-cy="job-deliver"]').should("not.be.disabled").click();
+      cy.url().should("include", "/deliver");
+      // Fill out the form
+      cy.get('[data-cy="checklist-form"]').should("be.visible");
+
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        // deliverchecklist
+        const checklists = bodyshop.deliverchecklist.form;
+
+        checklists.forEach((item, index) => {
+          if (item.type === "text") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("input:text")
+              .type("Random Word");
+          } else if (item.type === "textarea") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("textarea")
+              .type("Random Word");
+          } else if (item.type === "checkbox") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("input:checkbox")
+              .check();
+          } else if (item.type === "slider") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find(".ant-slider-dot:eq(1)")
+              .click({ force: true });
+          } else if (item.type === "rate") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find(".ant-rate > li")
+              .eq(3)
+              .find("div[role='radio']")
+              .click({ force: true });
+          }
+        });
+      });
+
+      // Select dates for completion and delivery
+      cy.get("#actual_completion").find(".ant-picker-input").first().click();
+      cy.get(`[title="${tomorrow}"]`).should("be.visible").click();
+      cy.get("#actual_delivery").find(".ant-picker-input").first().click();
+      cy.get(`[title="${tomorrow}"]`)
+        .should("be.visible")
+        .click({ multiple: true, force: true });
+
+      cy.get('[data-cy="remove-from-production"]').should(
+        "have.attr",
+        "aria-checked",
+        "true"
+      );
+
+      // Submit the form
+      cy.get('[data-cy="checklist-submit-button"]').click();
+
+      //   Job checklist completed.
+      cy.url().should("include", "/manage/jobs");
+      cy.contains("Delivered");
+    });
+
+    it("renders and check the checklists correctly", () => {
+      // Click the actions button
+      cy.get('[data-cy="job-actions-button"]').click();
+      // Go to checklists
+      cy.get('[data-cy="job-checklist"]').should("not.be.disabled").click();
+
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        // intakechecklist
+        const intakechecklist = bodyshop.intakechecklist.form;
+        // deliverchecklist
+        const deliverchecklist = bodyshop.deliverchecklist.form;
+
+        const checklists = [...intakechecklist, ...deliverchecklist];
+
+        cy.get('[data-cy="intake-checklist"]')
+          .should("be.visible")
+          .find("input")
+          .should("be.disabled");
+
+        cy.get('[data-cy="deliver-checklist"]')
+          .should("be.visible")
+          .find("input")
+          .should("be.disabled");
+
+        checklists.forEach((item, index) => {
+          if (item.type === "text") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("input:text")
+              .should("have.value", "Random Word");
+          } else if (item.type === "textarea") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("textarea")
+              .should("have.value", "Random Word");
+          } else if (item.type === "checkbox") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find("input:checkbox")
+              .should("be.checked");
+          } else if (item.type === "slider") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find(".ant-slider-handle")
+              .should("have.attr", "aria-valuenow", item.max / 2);
+          } else if (item.type === "rate") {
+            cy.get('[data-cy="config-form-components"] > div')
+              .eq(index)
+              .find(".ant-rate > .ant-rate-star-full")
+              .should("have.length", 3);
+          }
+        });
+      });
+    });
+  }
+);

client/cypress/e2e/job-import/converting.cy.js

@@ -0,0 +1,149 @@
+import job from "../../fixtures/jobs/job-3.json";
+
+const errorMessages = {
+  class: "Class is required. ",
+  referral_source: "Referral Source is required. ",
+  employee_csr: "Customer Service Rep. is required. ",
+  category: "Category is required. ",
+};
+
+describe(
+  "Converting a job with ",
+  {
+    defaultCommandTimeout: 10000,
+  },
+  () => {
+    beforeEach(() => {
+      cy.visit("/manage/jobs");
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_BODYSHOP") {
+          req.alias = "bodyshop";
+        }
+      });
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@active-jobs-table")
+        .contains(job.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+
+      cy.get('[data-cy="job-convert-button"]').click();
+    });
+
+    it("shows the error messages of required fields", () => {
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        const data = {
+          ins_cos: bodyshop.md_ins_cos,
+          config: {
+            class: bodyshop.enforce_class,
+            referral_source: bodyshop.enforce_referral,
+            employee_csr: bodyshop.enforce_conversion_csr,
+            category: bodyshop.enforce_conversion_category,
+          },
+        };
+
+        cy.get('[data-cy="convert-button"]').click();
+
+        cy.get("#ins_co_nm_help")
+          .find(".ant-form-item-explain-error")
+          .should("have.text", "Insurance Company Name is required. ");
+
+        for (const id in data.config) {
+          if (data.config[id]) {
+            cy.get(`#${id}_help`)
+              .find(".ant-form-item-explain-error")
+              .should("have.text", errorMessages[id]);
+          }
+        }
+      });
+    });
+
+    it("shows error of required fields when insurance company is selected", () => {
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        const data = {
+          ins_cos: bodyshop.md_ins_cos,
+          config: {
+            class: bodyshop.enforce_class,
+            referral_source: bodyshop.enforce_referral,
+            employee_csr: bodyshop.enforce_conversion_csr,
+            category: bodyshop.enforce_conversion_category,
+          },
+        };
+
+        cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
+        cy.get("#ins_co_nm_list")
+          .next()
+          .find(".ant-select-item-option-content")
+          .first()
+          .click();
+
+        cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
+        cy.get("#driveable").should("have.class", "ant-switch").click();
+        cy.get("#towin").should("have.class", "ant-switch").click();
+
+        cy.get('[data-cy="convert-button"]').click();
+
+        for (const id in data.config) {
+          if (data.config[id]) {
+            cy.get(`#${id}_help`)
+              .find(".ant-form-item-explain-error")
+              .should("have.text", errorMessages[id]);
+          }
+        }
+      });
+    });
+
+    it("checks for the job to convert", () => {
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        const data = {
+          ins_cos: bodyshop.md_ins_cos,
+          config: {
+            class: bodyshop.enforce_class,
+            referral_source: bodyshop.enforce_referral,
+            employee_csr: bodyshop.enforce_conversion_csr,
+            category: bodyshop.enforce_conversion_category,
+          },
+        };
+
+        cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
+        cy.get("#ins_co_nm_list")
+          .next()
+          .find(".ant-select-item-option-content")
+          .first()
+          .click();
+
+        for (const id in data.config) {
+          if (data.config[id]) {
+            cy.get(".ant-select-selection-search").find(`#${id}`).click();
+            cy.get(`#${id}_list`)
+              .next()
+              .find(".ant-select-item-option-content")
+              .first()
+              .click();
+          }
+        }
+
+        cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
+        cy.get("#driveable").should("have.class", "ant-switch").click();
+        cy.get("#towin").should("have.class", "ant-switch").click();
+
+        // cy.get('[data-cy="convert-button"]').click();
+        // cy.get(".ant-notification-notice-message").contains("successfully");
+      });
+    });
+  }
+);

client/cypress/e2e/job-import/job-import.cy.js

@@ -0,0 +1,500 @@
+import job from "../../fixtures/jobs/job-3.json";
+import job2 from "../../fixtures/jobs/job-4.json";
+import jobSupplement from "../../fixtures/jobs/job-3-supplement.json";
+import jobMetadata from "../../fixtures/jobs/job-3-jobmetadata.json";
+import jobSupplementMetadata from "../../fixtures/jobs/job-3-supplment-jobmetadata.json";
+import Dinero from "dinero.js";
+
+const createJobEstimate = (job, bodyshopid) => {
+  return {
+    owner: {
+      data: {
+        shopid: bodyshopid,
+        ...job.owner.data,
+      },
+    },
+    vehicle: {
+      data: {
+        shopid: bodyshopid,
+        ...job.vehicle.data,
+      },
+    },
+    shopid: bodyshopid,
+    ...job,
+  };
+};
+
+describe(
+  "Importing an available job",
+  {
+    defaultCommandTimeout: 10000,
+    requestTimeout: 10000,
+  },
+  () => {
+    // assuming that user is logged in
+    beforeEach(() => {
+      cy.visit("/manage/available");
+      // intercept bodyshop query for id
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_BODYSHOP") {
+          req.alias = "bodyshop";
+        }
+      });
+
+      cy.wait("@bodyshop").then(({ response }) => {
+        const id = response.body.data.bodyshops[0].id;
+
+        cy.wrap(id).as("bodyshopid");
+      });
+    });
+
+    it("Enters a job programatically", () => {
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
+          req.alias = "availableJobs";
+        }
+      });
+
+      cy.wait("@availableJobs").then(({ request }) => {
+        const token = request.headers.authorization;
+
+        cy.get("@bodyshopid").then((bodyshopid) => {
+          const job_est_data = createJobEstimate(job, bodyshopid);
+
+          cy.insertAvailableJob({
+            bodyshopid,
+            job,
+            token,
+            job_est_data,
+          });
+        });
+      });
+    });
+
+    it("creates a new owner record for the job", () => {
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
+          req.alias = "availableJobs";
+        }
+      });
+
+      cy.wait("@availableJobs");
+
+      cy.get('[data-cy="available-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .contains(job.clm_no)
+        .parent()
+        .as("row");
+
+      cy.get("@row")
+        .find('[data-cy="add-job-as-new-button"]')
+        .should("be.enabled")
+        .click();
+
+      cy.get('[data-cy="new_owner_checkbox"]').should("be.checked");
+      cy.get('[data-cy="existing-owners-ok-button"]')
+        .should("be.enabled")
+        .click();
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "INSERT_JOB") {
+          req.alias = "insertJob";
+        }
+      });
+
+      cy.wait("@insertJob").then(({ response }) => {
+        const id = response.body.data.insert_jobs.returning[0].id;
+
+        cy.get(".ant-notification-notice-message")
+          .contains("Job created successfully. Click to view.")
+          .click();
+
+        cy.url().should("include", `/manage/jobs/${id}`);
+      });
+
+      cy.get('[data-cy="tab-totals"]').should("be.visible").click();
+
+      cy.get('[data-cy="job-totals-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("totals-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@totals-table")
+        .eq(0)
+        .find("td:not(.ant-table-selection-column)")
+        .eq(1)
+        .invoke("text")
+        .should(
+          "be.equal",
+          Dinero({
+            amount: jobMetadata.totals.subtotal.amount,
+          }).toFormat()
+        );
+    });
+
+    it("imports a supplement for an existing job", () => {
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
+          req.alias = "availableJobs";
+        }
+      });
+
+      cy.wait("@availableJobs").then(({ request }) => {
+        const token = request.headers.authorization;
+
+        cy.get("@bodyshopid").then((bodyshopid) => {
+          const job_est_data = createJobEstimate(jobSupplement, bodyshopid);
+
+          cy.insertAvailableJob({
+            bodyshopid,
+            job: jobSupplement,
+            token,
+            job_est_data,
+          });
+        });
+      });
+
+      cy.get('[data-cy="refetch-available-jobs-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="available-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .contains(jobSupplement.clm_no)
+        .parent()
+        .as("row");
+
+      cy.get('[data-cy="add-job-as-supplement"]').should("be.enabled").click();
+
+      cy.get('[data-cy="existing-jobs-table"]')
+        .find(".ant-table-tbody tr")
+        .should("not.have.class", "ant-table-placeholder")
+        .first()
+        .click();
+
+      cy.get('[data-cy="existing-jobs-ok-button"]')
+        .should("not.be", "disabled")
+        .click();
+
+      cy.get(".ant-notification-notice-message")
+        .contains("Job supplemented successfully.")
+        .click();
+
+      cy.url().should("include", "/manage/jobs");
+
+      cy.get('[data-cy="tab-totals"]').should("be.visible").click();
+
+      cy.get('[data-cy="job-totals-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("totals-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@totals-table")
+        .eq(0)
+        .find("td:not(.ant-table-selection-column)")
+        .eq(1)
+        .invoke("text")
+        .should(
+          "be.equal",
+          Dinero({
+            amount: jobSupplementMetadata.totals.subtotal.amount,
+          }).toFormat()
+        );
+    });
+
+    it("imports a supplement and override estimate header", () => {
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
+          req.alias = "availableJobs";
+        }
+      });
+
+      cy.wait("@availableJobs").then(({ request }) => {
+        const token = request.headers.authorization;
+
+        cy.get("@bodyshopid").then((bodyshopid) => {
+          const job_est_data = createJobEstimate(jobSupplement, bodyshopid);
+
+          cy.insertAvailableJob({
+            bodyshopid,
+            job: jobSupplement,
+            token,
+            job_est_data,
+          });
+        });
+      });
+
+      cy.get('[data-cy="refetch-available-jobs-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="available-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .contains(jobSupplement.clm_no)
+        .parent()
+        .as("row");
+
+      cy.get('[data-cy="add-job-as-supplement"]').should("be.enabled").click();
+
+      cy.get('[data-cy="existing-jobs-table"]')
+        .find(".ant-table-tbody tr")
+        .should("not.have.class", "ant-table-placeholder")
+        .first()
+        .click();
+
+      // click override
+      cy.get('[data-cy="override-header-checkbox"]').check();
+
+      cy.get('[data-cy="existing-jobs-ok-button"]')
+        .should("not.be", "disabled")
+        .click();
+
+      cy.get(".ant-notification-notice-message")
+        .contains("Job supplemented successfully.")
+        .click();
+
+      cy.url().should("include", "/manage/jobs");
+
+      cy.get('[data-cy="tab-totals"]').should("be.visible").click();
+
+      cy.get('[data-cy="job-totals-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("totals-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@totals-table")
+        .eq(0)
+        .find("td:not(.ant-table-selection-column)")
+        .eq(1)
+        .invoke("text")
+        .should(
+          "be.equal",
+          Dinero({
+            amount: jobSupplementMetadata.totals.subtotal.amount,
+          }).toFormat()
+        );
+    });
+
+    it("imports a job with an existing owner", () => {
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
+          req.alias = "availableJobs";
+        }
+      });
+
+      cy.wait("@availableJobs").then(({ request }) => {
+        const token = request.headers.authorization;
+
+        cy.get("@bodyshopid").then((bodyshopid) => {
+          const job_est_data = createJobEstimate(job2, bodyshopid);
+
+          cy.insertAvailableJob({
+            bodyshopid,
+            job: job2,
+            token,
+            job_est_data,
+          });
+        });
+      });
+
+      cy.get('[data-cy="refetch-available-jobs-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="add-job-as-new-button"]').should("be.enabled").click();
+
+      cy.get('[data-cy="existing-owner-table"]', { timeout: 20000 })
+        .find(".ant-table-tbody tr")
+        .should("not.have.class", "ant-table-placeholder")
+        .then(($table) => {
+          cy.wrap($table).first().click();
+
+          cy.get('[data-cy="new_owner_checkbox"]').should("not.be", "checked");
+        });
+
+      cy.get('[data-cy="existing-owners-ok-button"]').click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Job created successfully. Click to view."
+      );
+
+      cy.visit("/manage/owners");
+      // Navigate to owner records
+      cy.get('[data-cy="owners-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("owners-table")
+        .should("not.have.class", "ant-table-placeholder");
+      // Get owner name
+      cy.get("@owners-table")
+        .contains(`${job2.owner.data.ownr_fn} ${job2.owner.data.ownr_ln}`)
+        .click();
+
+      // check list if claim number is there
+      cy.get('[data-cy="owner-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("owner-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+      // Get owner name
+      cy.get("@owner-jobs-table").contains(job2.clm_no).should("exist");
+    });
+  }
+);
+
+const errorMessages = {
+  class: "Class is required. ",
+  referral_source: "Referral Source is required. ",
+  employee_csr: "Customer Service Rep. is required. ",
+  category: "Category is required. ",
+};
+
+describe(
+  "Converting an active job",
+  {
+    defaultCommandTimeout: 10000,
+  },
+  () => {
+    beforeEach(() => {
+      cy.visit("/manage/jobs");
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_BODYSHOP") {
+          req.alias = "bodyshop";
+        }
+      });
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@active-jobs-table")
+        .contains(job.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+
+      cy.get('[data-cy="job-convert-button"]').click();
+    });
+
+    it("shows the error messages of required fields", () => {
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        const data = {
+          ins_cos: bodyshop.md_ins_cos,
+          config: {
+            class: bodyshop.enforce_class,
+            referral_source: bodyshop.enforce_referral,
+            employee_csr: bodyshop.enforce_conversion_csr,
+            category: bodyshop.enforce_conversion_category,
+          },
+        };
+
+        cy.get('[data-cy="convert-button"]').click();
+
+        cy.get("#ins_co_nm_help")
+          .find(".ant-form-item-explain-error")
+          .should("have.text", "Insurance Company Name is required. ");
+
+        for (const id in data.config) {
+          if (data.config[id]) {
+            cy.get(`#${id}_help`)
+              .find(".ant-form-item-explain-error")
+              .should("have.text", errorMessages[id]);
+          }
+        }
+      });
+    });
+
+    it("shows error of required fields when insurance company is selected", () => {
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        const data = {
+          ins_cos: bodyshop.md_ins_cos,
+          config: {
+            class: bodyshop.enforce_class,
+            referral_source: bodyshop.enforce_referral,
+            employee_csr: bodyshop.enforce_conversion_csr,
+            category: bodyshop.enforce_conversion_category,
+          },
+        };
+
+        cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
+        cy.get("#ins_co_nm_list")
+          .next()
+          .find(".ant-select-item-option-content")
+          .first()
+          .click();
+
+        cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
+        cy.get("#driveable").should("have.class", "ant-switch").click();
+        cy.get("#towin").should("have.class", "ant-switch").click();
+
+        cy.get('[data-cy="convert-button"]').click();
+
+        for (const id in data.config) {
+          if (data.config[id]) {
+            cy.get(`#${id}_help`)
+              .find(".ant-form-item-explain-error")
+              .should("have.text", errorMessages[id]);
+          }
+        }
+      });
+    });
+
+    it("checks for the job to convert", () => {
+      cy.wait("@bodyshop").then(({ response }) => {
+        const bodyshop = response.body.data.bodyshops[0];
+
+        const data = {
+          ins_cos: bodyshop.md_ins_cos,
+          config: {
+            class: bodyshop.enforce_class,
+            referral_source: bodyshop.enforce_referral,
+            employee_csr: bodyshop.enforce_conversion_csr,
+            category: bodyshop.enforce_conversion_category,
+          },
+        };
+
+        cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
+        cy.get("#ins_co_nm_list")
+          .next()
+          .find(".ant-select-item-option-content")
+          .first()
+          .click();
+
+        for (const id in data.config) {
+          if (data.config[id]) {
+            cy.get(".ant-select-selection-search").find(`#${id}`).click();
+            cy.get(`#${id}_list`)
+              .next()
+              .find(".ant-select-item-option-content")
+              .first()
+              .click();
+          }
+        }
+
+        cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
+        cy.get("#driveable").should("have.class", "ant-switch").click();
+        cy.get("#towin").should("have.class", "ant-switch").click();
+
+        cy.get('[data-cy="convert-button"]').click();
+        cy.get(".ant-notification-notice-message").contains(
+          "Job converted successfully."
+        );
+      });
+    });
+  }
+);

client/cypress/e2e/login-and-navigation/login.cy.js

@@ -0,0 +1,32 @@
+describe("logging in to the application", () => {
+  // FIXME error message
+  it("logs in the using wrong credentials", () => {
+    cy.login("fakeusername", "veryverylongpassword_123@#");
+    cy.contains("invalid-email");
+  });
+
+  it("logs in the using wrong password", () => {
+    cy.login("john@imex.dev", "veryverylongpassword_123@#");
+    cy.contains(
+      "The email and password combination you provided is incorrect."
+    );
+  });
+
+  it("logs in a non-existent credentials", () => {
+    cy.login("franz@imex.dev", "veryverylongpassword_123@#");
+    cy.contains("A user with this email does not exist.");
+  });
+
+  //   TODO create disabled account
+  //   it("logs in with a disabled account", () => {
+  //     cy.login("disabled_account@imex.dev", "john123");
+  //     cy.contains("User account disabled.");
+  //   });
+
+  //   TODO log in to the application
+  //   it("logs in the using the right credentials", () => {
+  //     cy.login("john@imex.dev", "john123");
+
+  //     cy.url().should('include', '/manage')
+  //   });
+});

client/cypress/e2e/login-and-navigation/reset-password.cy.js

@@ -0,0 +1,17 @@
+describe("resetting user password", () => {
+  it("resets forgotten password with an invalid email", () => {
+    cy.passwordReset("franz");
+    cy.contains("Email is not a valid email");
+  });
+
+  //   FIXME error message
+  it("resets forgotten password with a user that does not exist", () => {
+    cy.passwordReset("franz@imex.dev");
+    cy.contains("user-not-found");
+  });
+
+  it("resets forgotten password using the right credentials", () => {
+    cy.passwordReset("john@imex.dev");
+    cy.contains("A password reset link has been sent to you.");
+  });
+});

client/cypress/e2e/parts-ordering/parts-ordering.cy.js

@@ -0,0 +1,131 @@
+import job from "../../fixtures/jobs/job-3.json";
+import job2 from "../../fixtures/jobs/job-4.json";
+import moment from "moment";
+
+describe(
+  "Ordering parts for the job",
+  {
+    defaultCommandTimeout: 10000,
+  },
+  () => {
+    beforeEach(() => {
+      cy.visit("/manage/jobs");
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+    });
+
+    it("order parts for the job", () => {
+      const today = moment(new Date()).format("YYYY-MM-DD");
+
+      cy.get("@active-jobs-table")
+        .contains(job.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+
+      // Go to repair data tab
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+      // Click on filter parts only
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select multiple rows
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-checkbox-input")
+        .click();
+      // Click Order Parts
+      cy.get('[data-cy="order-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Modal should be visible
+      cy.get('[data-cy="parts-order-modal"]').should("be.visible");
+      // Fill required fields
+      cy.get(".ant-select-selection-search").find(`#vendorid`).click();
+      cy.get(`#vendorid_list`)
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click({ force: true });
+      cy.get("#deliver_by").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="part-order-select-none"]').check();
+      cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Parts order created successfully."
+      );
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-table-cell")
+        .eq(15)
+        .contains("Ordered");
+    });
+
+    it.only("order multiple  parts for the job", () => {
+      const today = moment(new Date()).format("YYYY-MM-DD");
+
+      cy.get("@active-jobs-table")
+        .contains(job2.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+
+      // Go to repair data tab
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+      // Click on filter parts only
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select multiple rows
+      cy.get('[data-cy="repair-data-table"]')
+        .find("input:checkbox")
+        .first()
+        .click();
+      // Click Order Parts
+      cy.get('[data-cy="order-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Modal should be visible
+      cy.get('[data-cy="parts-order-modal"]').should("be.visible");
+      // Fill required fields
+      cy.get(".ant-select-selection-search").find(`#vendorid`).click();
+      cy.get(`#vendorid_list`)
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click({ force: true });
+      cy.get("#deliver_by").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="part-order-comments"]').type("testing from cypress");
+
+      cy.get('[data-cy="part-order-select-none"]').check();
+      cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Parts order created successfully."
+      );
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-table-cell")
+        .eq(15)
+        .contains("Ordered");
+    });
+  }
+);

client/cypress/e2e/payments/entering-payments.cy.js

@@ -0,0 +1,89 @@
+describe(
+  "Entering payment for the job",
+  {
+    defaultCommandTimeout: 5000,
+  },
+  () => {
+    beforeEach(() => {
+      cy.visit("/manage");
+
+      cy.get("body").then(($body) => {
+        if ($body.text().includes("Login")) {
+          // Log in
+          cy.get('[data-cy="username"]').type("john@imex.dev");
+          cy.get('[data-cy="password"]').type("john123");
+          cy.get('[data-cy="sign-in-button"]').click();
+        }
+
+        cy.get(".ant-table-tbody")
+          .should("be.visible")
+          .find("tr")
+          .should("not.have.class", "ant-table-placeholder");
+
+        cy.get(".ant-table-row")
+          .not(':contains("Open")')
+          .first()
+          .find("a")
+          .first()
+          .click();
+
+        cy.url().should("include", "/manage/jobs");
+
+        // Go to totals data tab
+        cy.get('[data-cy="tab-totals"]').should("be.visible").click();
+      });
+    });
+
+    it("enters a payment manually", () => {
+      cy.get('[data-cy="job-payment-button"]').should("be.visible").click();
+
+      // fill out form
+      cy.get('[data-cy="payment-amount"]').type(100);
+      cy.get('[data-cy="payment-transactionid"]').type("QBD-P-03");
+      cy.get('[data-cy="payment-memo"]').type("e2e testing");
+      cy.get('[data-cy="payment-date"]').click();
+      cy.get('[title="2023-07-03"]').should("be.visible").click();
+
+      cy.antdSelect("payer");
+      cy.antdSelect("type");
+
+      cy.get('[data-cy="payment-form-save"]').click();
+    });
+
+    // TODO Add payment using intellipay
+
+    it("marks payment as exported", () => {
+      cy.get('[data-cy="payments-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("payments-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@payments-table")
+        .first()
+        .find('[data-cy="edit-payment-button"]')
+        .click();
+
+      cy.get('[data-cy="payment-markexported"]')
+        .should("not.be.disabled")
+        .click();
+    });
+
+    it("marks payment for re-export", () => {
+      cy.get('[data-cy="payments-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("payments-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@payments-table")
+        .last()
+        .find('[data-cy="edit-payment-button"]')
+        .click();
+
+      cy.get('[data-cy="payment-markforreexport"]')
+        .should("not.be.disabled")
+        .click();
+    });
+  }
+);

client/cypress/e2e/posting-bills/part-ordering.cy.js

@@ -0,0 +1,431 @@
+import job from "../../fixtures/jobs/job-3.json";
+import moment from "moment";
+
+const uuid = () => Cypress._.random(0, 1e6);
+
+describe(
+  "Billing job parts orders",
+  {
+    defaultCommandTimeout: 10000,
+  },
+  () => {
+    const today = moment(new Date()).format("YYYY-MM-DD");
+
+    beforeEach(() => {
+      cy.viewport(1280, 720);
+      cy.visit("/manage/jobs");
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "SEARCH_VENDOR_AUTOCOMPLETE") {
+          req.alias = "vendors";
+        }
+      });
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@active-jobs-table")
+        .contains(job.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+    });
+
+    it("receives a part bill", () => {
+      // Order a part
+      // Go to repair data tab
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+      // Click on filter parts only
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select multiple rows
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-checkbox-input")
+        .click();
+      // Click Order Parts
+      cy.get('[data-cy="order-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Modal should be visible
+      cy.get('[data-cy="parts-order-modal"]').should("be.visible");
+      // Fill required fields
+      cy.get(".ant-select-selection-search").find(`#vendorid`).click();
+      cy.get(`#vendorid_list`)
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click({ force: true });
+      cy.get("#deliver_by").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="part-order-comments"]').type("testing from cypress");
+
+      cy.get('[data-cy="part-order-select-none"]').check();
+      cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Parts order created successfully."
+      );
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-table-cell")
+        .eq(15)
+        .contains("Ordered");
+
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+      // Find the first row in the parts order
+      cy.get('[data-cy="part-orders-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("orders-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@orders-table")
+        .first()
+        .should("be.visible")
+        .find('[data-cy="receive-bill-button"]')
+        .click();
+
+      // fill out form
+      cy.get('[data-cy="bill-form-invoice"]').type(uuid());
+
+      cy.get("#bill-form-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
+      cy.get("#location_list")
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click();
+
+      cy.get('[data-cy="bill-line-table"]').each(($row) => {
+        // get retail amount
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-price"]')
+          .click({ force: true, multiple: true });
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-cost"]')
+          .click({ multiple: true });
+      });
+
+      cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
+        const totals = cells.toArray().map((el) => Number(el.value));
+        const sum = Cypress._.sum(totals);
+
+        cy.get('[data-cy="bill-form-bill-total"]').type(sum);
+      });
+      // Click save
+      cy.get('[data-cy="bill-form-save-button"]').click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Invoice added successfully."
+      );
+
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-table-cell")
+        .eq(15)
+        .contains("Received");
+    });
+
+    it("backorders part from order", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="part-orders-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("orders-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@orders-table")
+        .first()
+        .should("be.visible")
+        .find('[data-cy="view-part-order-button"]')
+        .click();
+
+      cy.get('[data-cy="mark-backorder-button"]').click();
+      cy.get(".backorder-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="mark-for-backorder-button"]').click();
+
+      cy.get(".ant-drawer-close").click();
+
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-table-cell")
+        .eq(15)
+        .contains("Backordered");
+    });
+
+    it("order parts inhouse", () => {
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+      // Click on filter parts only
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select multiple rows
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-checkbox-input")
+        .click();
+      // Click Order Parts
+      cy.get('[data-cy="order-parts-inhouse-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.antdSelect("bill-vendor");
+
+      cy.antdSelect("bill-cost-center");
+
+      cy.get('[data-cy="bill-form-save-button"]').click({ force: true });
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Invoice added successfully."
+      );
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find(".ant-table-cell")
+        .eq(15)
+        .contains("Received");
+    });
+
+    it("check inhouse bill to have extra actions", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="bills-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("bills-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@bills-table")
+        .contains("$0.00")
+        .parent()
+        .parent()
+        .first()
+        .find('[data-cy="print-wrapper"]')
+        .should("exist");
+    });
+
+    it("posts bill directly", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="bills-post-button"]').should("be.visible").click();
+
+      // Add New Line
+      cy.get('[data-cy="bill-line-add-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select Vendor
+      cy.antdSelect("bill-vendor");
+      // Select Line
+      cy.antdSelect("bill-line");
+
+      cy.get('[data-cy="bill-line-line-desc"]').type("Line Description");
+      // Fill the Form
+      cy.get('[data-cy="bill-form-invoice"]').type(uuid());
+
+      cy.get("#bill-form-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
+      cy.get("#location_list")
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click();
+
+      cy.get('[data-cy="bill-line-table"]').each(($row) => {
+        // get retail amount
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-price"]')
+          .click({ force: true, multiple: true });
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-cost"]')
+          .click({ multiple: true });
+      });
+
+      cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
+        const totals = cells.toArray().map((el) => Number(el.value));
+        const sum = Cypress._.sum(totals);
+
+        cy.get('[data-cy="bill-form-bill-total"]').type(sum);
+      });
+
+      cy.antdSelect("bill-cost-center");
+
+      // Click save
+      cy.get('[data-cy="bill-form-save-button"]').click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Invoice added successfully."
+      );
+    });
+
+    it("posts a bill with save and new", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="bills-post-button"]').should("be.visible").click();
+
+      // Add New Line
+      cy.get('[data-cy="bill-line-add-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select Vendor
+      cy.antdSelect("bill-vendor");
+      // Select Line
+      cy.antdSelect("bill-line", "-- Not On Estimate --");
+      // Fill the Form
+      cy.get('[data-cy="bill-form-invoice"]').type(uuid());
+
+      cy.get("#bill-form-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
+      cy.get("#location_list")
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click();
+
+      cy.get('[data-cy="bill-line-table"]').each(($row) => {
+        // get retail amount
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-price"]')
+          .click({ force: true, multiple: true });
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-cost"]')
+          .click({ multiple: true });
+      });
+
+      cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
+        const totals = cells.toArray().map((el) => Number(el.value));
+        const sum = Cypress._.sum(totals);
+
+        cy.get('[data-cy="bill-form-bill-total"]').type(sum);
+      });
+
+      cy.antdSelect("bill-cost-center");
+
+      // Click save
+      cy.get('[data-cy="bill-form-savenew-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Invoice added successfully."
+      );
+    });
+
+    it("uploads a document to a bill", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="bills-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("bills-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@bills-table")
+        .first()
+        .should("be.visible")
+        .find('[data-cy="edit-bill-button"]')
+        .click();
+
+      cy.location("search").should("include", "billid");
+      cy.get('[data-cy="bill-edit-form"]')
+        .find(".ant-upload #bill-document-upload")
+        .selectFile("job.json", { force: true });
+    });
+
+    it("marks bill as exported", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="bills-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("bills-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@bills-table")
+        .find('[data-cy="bill-exported-checkbox"]')
+        .not(":checked")
+        .first()
+        .as("export-status")
+        .parent()
+        .parent()
+        .parent()
+        .parent()
+        .find('[data-cy="edit-bill-button"]')
+        .click();
+
+      cy.location("search").should("include", "billid");
+      cy.get('[data-cy="bill-mark-export-button"]')
+        .as("mark-for-export")
+        .click();
+      cy.get("@mark-for-export").should("be.disabled");
+    });
+
+    it("marks bill for re-export", () => {
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      cy.get('[data-cy="bills-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("bills-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@bills-table")
+        .find('[data-cy="bill-exported-checkbox"]')
+        .filter(":checked")
+        .first()
+        .as("export-status")
+        .parent()
+        .parent()
+        .parent()
+        .parent()
+        .find('[data-cy="edit-bill-button"]')
+        .click();
+
+      cy.location("search").should("include", "billid");
+      cy.get('[data-cy="bill-mark-reexport-button"]')
+        .as("mark-for-reexport")
+        .click();
+      cy.get("@mark-for-reexport").should("be.disabled");
+    });
+  }
+);

client/cypress/e2e/posting-bills/posting-bills.cy.js

@@ -0,0 +1,487 @@
+import job2 from "../../fixtures/jobs/job-4.json";
+import moment from "moment";
+import Dinero from "dinero.js";
+
+const uuid = () => Cypress._.random(0, 1e6);
+
+describe(
+  "Validating and calculating bills",
+  {
+    defaultCommandTimeout: 10000,
+  },
+  () => {
+    const today = moment(new Date()).format("YYYY-MM-DD");
+    const jobLines = job2.joblines.data.filter(
+      (line) => line.part_type === "PAS" || line.part_type === "PAE"
+    );
+    const linesTotal = jobLines.reduce(
+      (prev, line) => prev + line.act_price,
+      0
+    );
+
+    beforeEach(() => {
+      cy.viewport(1280, 720);
+      cy.visit("/manage/jobs");
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "SEARCH_VENDOR_AUTOCOMPLETE") {
+          req.alias = "vendors";
+        }
+      });
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@active-jobs-table")
+        .contains(job2.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+
+      // Go to repair data tab
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+    });
+
+    it("validates auto reconciliation through posting bill", () => {
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+      // Click on filter parts only
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Select multiple rows
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-checkbox-input")
+        .first()
+        .click();
+      // Click Order Parts
+      cy.get('[data-cy="order-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+      // Modal should be visible
+      cy.get('[data-cy="parts-order-modal"]').should("be.visible");
+      // Fill required fields
+      cy.get(".ant-select-selection-search").find(`#vendorid`).click();
+      cy.get(`#vendorid_list`)
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click({ force: true });
+      cy.get("#deliver_by").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="part-order-comments"]').type("testing from cypress");
+
+      cy.get('[data-cy="part-order-select-none"]').check();
+      cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Parts order created successfully."
+      );
+
+      cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
+
+      // Find the first row in the parts order
+      cy.get('[data-cy="part-orders-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("orders-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@orders-table")
+        .first()
+        .should("be.visible")
+        .find('[data-cy="receive-bill-button"]')
+        .click();
+
+      // fill out form
+      cy.get('[data-cy="bill-form-invoice"]').type(uuid());
+
+      cy.get("#bill-form-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
+      cy.get("#location_list")
+        .next()
+        .find(".ant-select-item-option-content")
+        .first()
+        .click();
+
+      cy.get('[data-cy="bill-line-table"]').each(($row) => {
+        // get retail amount
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-price"]')
+          .as("retailPrice")
+          .click({ force: true, multiple: true });
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-cost"]')
+          .click({ multiple: true });
+      });
+
+      cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
+        const totals = cells.toArray().map((el) => Number(el.value));
+        const sum = Cypress._.sum(totals);
+
+        cy.get('[data-cy="bill-form-bill-total"]').type(sum);
+
+        // Get taxes add it to the sum
+        cy.get('[data-cy="bill-form-tax"]').then((taxes) => {
+          const subtotals = taxes
+            .toArray()
+            .map((el) => Number(el.innerText.substring(1)));
+          const totalTax = Cypress._.sum(subtotals);
+
+          const billAmount = sum + totalTax;
+
+          cy.get('[data-cy="bill-form-bill-total"]')
+            .find("input")
+            .clear()
+            .type(billAmount);
+        });
+      });
+
+      cy.get("#bill-form-discrepancy").should("have.text", "$0.00");
+
+      // Click save
+      cy.get('[data-cy="bill-form-save-button"]').click();
+
+      cy.get("@retailPrice")
+        .invoke("val")
+        .then((val) => {
+          const discrepancy = linesTotal - Number(val);
+
+          cy.get("#retailtotal").should("have.text", `$${val}`);
+
+          cy.get(".discrepancy").each(($statistic) => {
+            cy.wrap($statistic).should(
+              "have.text",
+              Dinero({
+                amount: discrepancy,
+                precision: 0,
+              }).toFormat()
+            );
+          });
+        });
+    });
+
+    it("returning item and validating statistics", () => {
+      cy.get('[data-cy="bills-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("bills-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@bills-table")
+        .find('[data-cy="credit-memo-checkbox"]')
+        .filter(":not(:checked)")
+        .first()
+        .should("not.be.disabled")
+        .parent()
+        .parent()
+        .parent()
+        .parent()
+        .find('[data-cy="return-items-button"]')
+        .click();
+
+      cy.get('[data-cy="billline-checkbox"]').check();
+      cy.get('[data-cy="billline-return-items-ok-button"]').click();
+      cy.get('[data-cy="billline-actual-price"]')
+        .find(".ant-form-item-control-input-content")
+        .then((prices) => {
+          const totals = prices
+            .toArray()
+            .map((el) => Number(el.innerText.substring(1)));
+          const sum = Cypress._.sum(totals);
+
+          const price = Dinero({
+            amount: sum * 100,
+          }).toFormat();
+
+          cy.get('[data-cy="order-quantity"]').each((input) => {
+            cy.wrap(input).type("1");
+          });
+          cy.get('[data-cy="part-order-select-none"]').click();
+
+          cy.get('[data-cy="order-part-submit"]').click();
+
+          cy.get("#totalReturns").should("have.text", price);
+          cy.get("#calculatedcreditsnotreceived").should("have.text", price);
+          cy.get("#creditsnotreceived").should("have.text", price);
+        });
+    });
+
+    it("receives credit memo without return part", () => {
+      // Find the first row in the parts order
+      cy.get('[data-cy="part-orders-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("orders-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@orders-table")
+        .find('[data-cy="part-order-return-checkbox"]')
+        .filter(":checked")
+        .first()
+        .parent()
+        .parent()
+        .parent()
+        .parent()
+        .find('[data-cy="receive-bill-button"]')
+        .click();
+
+      // fill out form
+      cy.get('[data-cy="bill-form-invoice"]').type(uuid());
+
+      cy.get("#bill-form-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="bill-line-table"]').each(($row) => {
+        // get retail amount
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-price"]')
+          .click({ force: true, multiple: true });
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-cost"]')
+          .click({ multiple: true });
+      });
+
+      cy.get('[data-cy="is-credit-memo-switch"]').click();
+
+      cy.get('[data-cy="is-credit-memo-switch"]').should(
+        "have.attr",
+        "aria-checked",
+        "false"
+      );
+
+      cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
+        cy.get('[data-cy="bill-line-actual-price"]').then((priceCells) => {
+          const totals = cells.toArray().map((el) => Number(el.value));
+          const priceTotals = priceCells
+            .toArray()
+            .map((el) => Number(el.value));
+          const sum = Cypress._.sum(totals);
+          const priceSum = Cypress._.sum(priceTotals);
+
+          cy.get('[data-cy="bill-form-bill-total"]').type(sum);
+
+          // Get taxes add it to the sum
+          cy.get('[data-cy="bill-form-tax"]').then((taxes) => {
+            const subtotals = taxes
+              .toArray()
+              .map((el) => Number(el.innerText.substring(1)));
+            const totalTax = Cypress._.sum(subtotals);
+
+            const billAmount = sum + totalTax;
+
+            cy.get('[data-cy="bill-form-bill-total"]')
+              .find("input")
+              .clear()
+              .type(billAmount);
+          });
+
+          cy.get("#bill-form-discrepancy").should("have.text", "$0.00");
+
+          cy.get(`.ant-select-bill-cost-center > .ant-select-selector`).each(
+            (select) => {
+              cy.wrap(select).click();
+
+              cy.wrap(select)
+                .find("input")
+                .invoke("attr", "id")
+                .then((id) => {
+                  cy.get(`#${id}_list`)
+                    .next()
+                    .find(".ant-select-item-option-content")
+                    .first()
+                    .click({ force: true });
+                });
+            }
+          );
+
+          cy.get('[data-cy="bill-form-save-button"]').click();
+
+          cy.get("#totalReturns")
+            .invoke("text")
+            .then((value) => {
+              const totalReturns =
+                Number(value.substring(1)) - priceSum < 0
+                  ? 0
+                  : Number(value.substring(1)) - priceSum;
+
+              cy.get("#calculatedcreditsnotreceived").should(
+                "have.text",
+                Dinero({
+                  amount: totalReturns,
+                  precision: 0,
+                }).toFormat()
+              );
+            });
+        });
+      });
+    });
+
+    it("receives credit memo with return part", () => {
+      // Find the first row in the parts order
+      cy.get('[data-cy="part-orders-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("orders-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@orders-table")
+        .find('[data-cy="part-order-return-checkbox"]')
+        .filter(":checked")
+        .first()
+        .parent()
+        .parent()
+        .parent()
+        .parent()
+        .find('[data-cy="receive-bill-button"]')
+        .click();
+
+      // fill out form
+      cy.get('[data-cy="bill-form-invoice"]').type(uuid());
+
+      cy.get("#bill-form-date").click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.get('[data-cy="bill-line-table"]').each(($row) => {
+        // get retail amount
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-price"]')
+          .click({ force: true, multiple: true });
+        cy.wrap($row)
+          .find('[data-cy="bill-line-actual-cost"]')
+          .click({ multiple: true });
+      });
+
+      cy.get('[data-cy="is-credit-memo-switch"]').should(
+        "have.attr",
+        "aria-checked",
+        "true"
+      );
+
+      cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
+        cy.get('[data-cy="bill-line-actual-price"]').then((priceCells) => {
+          const totals = cells.toArray().map((el) => Number(el.value));
+          const priceTotals = priceCells
+            .toArray()
+            .map((el) => Number(el.value));
+          const sum = Cypress._.sum(totals);
+          const priceSum = Cypress._.sum(priceTotals);
+
+          cy.get('[data-cy="bill-form-bill-total"]').type(sum);
+
+          // Get taxes add it to the sum
+          cy.get('[data-cy="bill-form-tax"]').then((taxes) => {
+            const subtotals = taxes
+              .toArray()
+              .map((el) => Number(el.innerText.substring(1)));
+            const totalTax = Cypress._.sum(subtotals);
+
+            const billAmount = sum + totalTax;
+
+            cy.get('[data-cy="bill-form-bill-total"]')
+              .find("input")
+              .clear()
+              .type(billAmount);
+          });
+
+          cy.get("#bill-form-discrepancy").should("have.text", "$0.00");
+
+          cy.get(`.ant-select-bill-cost-center > .ant-select-selector`).each(
+            (select) => {
+              cy.wrap(select).click();
+
+              cy.wrap(select)
+                .find("input")
+                .invoke("attr", "id")
+                .then((id) => {
+                  cy.get(`#${id}_list`)
+                    .next()
+                    .find(".ant-select-item-option-content")
+                    .first()
+                    .click({ force: true });
+                });
+            }
+          );
+
+          cy.get('[data-cy="mark-as-received-checkbox"]').check({
+            multiple: true,
+          });
+
+          cy.get('[data-cy="bill-form-save-button"]').click();
+
+          cy.get("#totalReturns")
+            .invoke("text")
+            .then((value) => {
+              const totalReturns =
+                Number(value.substring(1)) - priceSum < 0
+                  ? 0
+                  : Number(value.substring(1)) - priceSum;
+
+              cy.get("#creditsnotreceived").should(
+                "have.text",
+                Dinero({
+                  amount: totalReturns,
+                  precision: 0,
+                }).toFormat()
+              );
+            });
+        });
+      });
+    });
+
+    it("views the row expander if it has the order and bill", () => {
+      cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
+
+      cy.get('[data-cy="filter-parts-button"]')
+        .should("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find("td")
+        .first()
+        .click();
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find("td")
+        .eq(13)
+        .find("div")
+        .should("exist");
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find("td")
+        .eq(14)
+        .find("div")
+        .should("exist");
+
+      cy.get('[data-cy="repair-data-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .first()
+        .find("td")
+        .eq(15)
+        .find("div")
+        .should("have.text", "Returned");
+
+      cy.get('[data-cy="parts-bills-order"]')
+        .should("be.visible")
+        .find("li")
+        .first()
+        .should("not.have.text", "This part has not yet been ordered.");
+    });
+  }
+);

client/cypress/e2e/time-tickets/time-tickets.cy.js

@@ -0,0 +1,318 @@
+import moment from "moment";
+import job2 from "../../fixtures/jobs/job-4.json";
+import Dinero from "dinero.js";
+
+const uuid = () => Cypress._.random(0, 1e6);
+
+describe(
+  "Entering payment for the job",
+  {
+    defaultCommandTimeout: 5000,
+  },
+  () => {
+    const today = moment().format("YYYY-MM-DD");
+    const LABOR_HOURS = 1;
+    const COST_CENTER = "Body";
+
+    beforeEach(() => {
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_ACTIVE_EMPLOYEES") {
+          req.alias = "employees";
+        }
+      });
+
+      cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
+        if (req.body.operationName === "QUERY_BODYSHOP") {
+          req.alias = "bodyshop";
+        }
+      });
+
+      cy.visit("/manage");
+
+      cy.get('[data-cy="active-jobs-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("active-jobs-table")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@active-jobs-table")
+        .contains(job2.clm_no)
+        .first()
+        .parent()
+        .find('[data-cy="active-job-link"]')
+        .click();
+
+      cy.url().should("include", "/manage/jobs");
+    });
+
+    it("checks input validations", () => {
+      cy.get('[data-cy="job-actions-button"]').click();
+
+      cy.get('[data-cy="actions-timetickets"]')
+        .should("be.visible")
+        .and("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="timeticket-save-button"]').first().click();
+
+      cy.get('[data-cy="form-timeticket"]')
+        .find(".ant-form-item-explain-error")
+        .should("have.length", 4);
+
+      cy.get('[data-cy="form-timeticket-date"]').click();
+      cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
+
+      cy.antdSelect("timeticket-employee");
+
+      cy.antdSelect("cost-center");
+
+      cy.get('[data-cy="labor-allocations-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("labor-allocations")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get("@labor-allocations")
+        .eq(0)
+        .find("td:not(.ant-table-selection-column)")
+        .eq(4)
+        .find("strong")
+        .invoke("text")
+        .as("bodyDiff")
+        .then((diff) => {
+          // TODO dynamically select the employee prior to what is the labor and cost
+          cy.get('[data-cy="form-timeticket-productivehrs"]').type(
+            Number(diff) + 1
+          );
+
+          cy.get(".ant-form-item-explain-error").should(
+            "have.text",
+            "The number of hours entered is more than what is available for this cost center."
+          );
+        });
+    });
+
+    it("adds new time ticket to a job with flat rate", () => {
+      cy.get('[data-cy="job-actions-button"]').click();
+
+      cy.get('[data-cy="actions-timetickets"]')
+        .should("be.visible")
+        .and("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="labor-allocations-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("labor-allocations")
+        .should("not.have.class", "ant-table-placeholder");
+
+      // Get Difference for Body
+      cy.get('[data-cy="form-timeticket-date"]').click();
+      cy.get(`[title="${today}"]`).should("be.visible").click();
+
+      cy.get("@labor-allocations")
+        .eq(0)
+        .find("td:not(.ant-table-selection-column)")
+        .eq(4)
+        .find("strong")
+        .invoke("text")
+        .as("bodyDiff")
+        .then((diff) => {
+          cy.get('[data-cy="form-timeticket-productivehrs"]').type(LABOR_HOURS);
+
+          cy.get('[data-cy="form-timeticket-actualhrs"]').type(LABOR_HOURS);
+        });
+
+      cy.wait("@employees").then(({ response }) => {
+        const employees = response.body.data.employees;
+        const employee = employees.find((e) => e.flat_rate);
+        const employee_name = `${employee.first_name} ${employee.last_name}`;
+
+        cy.antdSelectValue("timeticket-employee", employee_name);
+
+        cy.antdSelectValue("cost-center", COST_CENTER);
+      });
+
+      cy.get('[data-cy="form-timeticket-memo"]').type(uuid());
+
+      cy.get('[data-cy="timeticket-save-button"]').first().click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Time ticket entered successfully."
+      );
+    });
+
+    it("adds new time ticket to a job with straight rate", () => {
+      cy.get('[data-cy="job-actions-button"]').click();
+
+      cy.get('[data-cy="actions-timetickets"]')
+        .should("be.visible")
+        .and("not.be.disabled")
+        .click();
+
+      cy.get('[data-cy="labor-allocations-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("labor-allocations")
+        .should("not.have.class", "ant-table-placeholder");
+
+      // Get Difference for Body
+      cy.get('[data-cy="form-timeticket-date"]').click();
+      cy.get(`[title="${today}"]`).should("be.visible").click();
+
+      cy.get("@labor-allocations")
+        .eq(0)
+        .find("td:not(.ant-table-selection-column)")
+        .eq(4)
+        .find("strong")
+        .invoke("text")
+        .as("bodyDiff")
+        .then((diff) => {
+          cy.get('[data-cy="form-timeticket-productivehrs"]').type(LABOR_HOURS);
+
+          cy.get('[data-cy="form-timeticket-actualhrs"]').type(LABOR_HOURS);
+        });
+
+      cy.wait("@employees").then(({ response }) => {
+        const employees = response.body.data.employees;
+        const employee = employees.find((e) => !e.flat_rate);
+        const employee_name = `${employee.first_name} ${employee.last_name}`;
+
+        cy.antdSelectValue("timeticket-employee", employee_name);
+
+        cy.antdSelectValue("cost-center", COST_CENTER);
+      });
+
+      cy.get('[data-cy="form-timeticket-memo"]').type(uuid());
+
+      cy.get('[data-cy="timeticket-save-button"]').first().click();
+
+      cy.get(".ant-notification-notice-message").contains(
+        "Time ticket entered successfully."
+      );
+    });
+
+    it("checks hours calculated to the allocations table", () => {
+      cy.get('[data-cy="tab-labor"]').should("be.visible").click();
+
+      cy.get('[data-cy="labor-allocations-table"]')
+        .find(".ant-table-tbody")
+        .find("> tr:not(.ant-table-measure-row)")
+        .as("labor-allocations")
+        .should("not.have.class", "ant-table-placeholder");
+
+      cy.get('[data-cy="labor-total-hrs-claimed"]')
+        .invoke("text")
+        .then((hours) => {
+          cy.wrap(hours).should("not.equal", "0");
+        });
+    });
+
+    it("checks the job costing calculations", () => {
+      cy.get('[data-cy="job-actions-button"]').click();
+
+      cy.get('[data-cy="actions-jobcosting"]')
+        .should("be.visible")
+        .and("not.be.disabled")
+        .click();
+
+      cy.wait("@bodyshop").then(({ request }) => {
+        const token = request.headers.authorization;
+
+        const query = `query QUERY_ACTIVE_EMPLOYEES {
+          employees(where: { active: { _eq: true } }) {
+            last_name
+            id
+            first_name
+            employee_number
+            active
+            termination_date
+            hire_date
+            flat_rate
+            rates
+            pin
+            user_email
+          }
+        }`;
+
+        cy.request({
+          url: "http://localhost:4000/test/query",
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: token,
+          },
+          body: {
+            query,
+          },
+        }).then((response) => {
+          const cost_center = COST_CENTER;
+          const employees = response.body.employees;
+          const total_cost = employees.reduce((prev, employee) => {
+            const rate =
+              employee.rates.find((rate) => rate.cost_center === cost_center)
+                .rate ?? 0;
+
+            return prev + rate * LABOR_HOURS;
+          }, 0);
+
+          cy.get('[data-cy="responsibilitycenter"]')
+            .contains(cost_center)
+            .parent()
+            .parent()
+            .find('[data-cy="cost"]')
+            .should(
+              "have.text",
+              Dinero({
+                amount: total_cost,
+                precision: 0,
+              }).toFormat()
+            );
+        });
+      });
+    });
+
+    it.only("clocks in and out of the tech page for the timeticket", () => {
+      // TODO go to tech page for the clock in and out
+      cy.visit("/tech");
+
+      cy.get('[data-cy="tech-employee-id"]').type("a");
+      cy.get('[data-cy="tech-employee-password"]').type("a{enter}");
+
+      cy.contains("Logged in as");
+      // go to clock in
+      cy.get('[data-cy="sider-joblock"]').click({ force: true });
+      // find the job ro
+      cy.get('[data-cy="clock-ro-select"]').type("273");
+      cy.get('[data-cy="clock-ro-select"] .ant-select-selection-search input')
+        .invoke("attr", "id")
+        .then((selElm) => {
+          const dropDownSelector = `#${selElm}_list`;
+
+          cy.get(dropDownSelector)
+            .next()
+            .find(".ant-select-item-option-content")
+            .first()
+            .click({ force: true });
+        });
+      // select cost center
+      cy.get('[data-cy="clock-cost-center-select"]').click();
+      cy.get(
+        '[data-cy="clock-cost-center-select"] .ant-select-selection-search input'
+      )
+        .invoke("attr", "id")
+        .then((selElm) => {
+          const dropDownSelector = `#${selElm}_list`;
+
+          cy.get(dropDownSelector)
+            .next()
+            .find(".ant-select-item-option-content")
+            .contains("Body")
+            .first()
+            .click({ force: true });
+        });
+
+      // clock in and out of the job
+    });
+  }
+);

client/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

client/cypress/fixtures/jobs/job-3-jobmetadata.json

@@ -0,0 +1,316 @@
+{
+  "parts": {
+    "parts": {
+      "list": {
+        "PAE": {
+          "total": {
+            "amount": 0,
+            "currency": "USD",
+            "precision": 2
+          }
+        },
+        "PAN": {
+          "total": {
+            "amount": 26661,
+            "currency": "USD",
+            "precision": 2
+          }
+        }
+      },
+      "total": {
+        "amount": 26661,
+        "currency": "USD",
+        "precision": 2
+      },
+      "subtotal": {
+        "amount": 26661,
+        "currency": "USD",
+        "precision": 2
+      },
+      "prt_dsmk_total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "sublets": {
+      "total": {
+        "amount": 5000,
+        "currency": "USD",
+        "precision": 2
+      },
+      "subtotal": {
+        "amount": 5000,
+        "currency": "USD",
+        "precision": 2
+      }
+    }
+  },
+  "rates": {
+    "la1": {
+      "rate": 92.49,
+      "hours": 3.5,
+      "total": {
+        "amount": 32372,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "la2": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "la3": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "la4": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "laa": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lab": {
+      "rate": 85.16,
+      "hours": 29.7,
+      "total": {
+        "amount": 252925,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lad": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lae": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "laf": {
+      "rate": 97.34,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lag": {
+      "rate": 85.16,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lam": {
+      "rate": 109.5,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lar": {
+      "rate": 85.16,
+      "hours": 8.500000000000002,
+      "total": {
+        "amount": 72386,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "las": {
+      "rate": 85.16,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lau": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "mapa": {
+      "rate": 55.38,
+      "hours": 8.500000000000002,
+      "total": {
+        "amount": 47073,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "mash": {
+      "rate": 6.85,
+      "hours": 33.199999999999996,
+      "total": {
+        "amount": 22742,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "subtotal": {
+      "amount": 427498,
+      "currency": "USD",
+      "precision": 2
+    },
+    "rates_subtotal": {
+      "amount": 357683,
+      "currency": "USD",
+      "precision": 2
+    }
+  },
+  "totals": {
+    "subtotal": {
+      "amount": 495355,
+      "currency": "USD",
+      "precision": 2
+    },
+    "local_tax": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "state_tax": {
+      "amount": 34675,
+      "currency": "USD",
+      "precision": 2
+    },
+    "custPayable": {
+      "total": {
+        "amount": 30000,
+        "currency": "USD",
+        "precision": 2
+      },
+      "dep_taxes": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      },
+      "deductible": {
+        "amount": 30000,
+        "currency": "USD",
+        "precision": 2
+      },
+      "federal_tax": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      },
+      "other_customer_amount": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "federal_tax": {
+      "amount": 24768,
+      "currency": "USD",
+      "precision": 2
+    },
+    "net_repairs": {
+      "amount": 524798,
+      "currency": "USD",
+      "precision": 2
+    },
+    "statePartsTax": {
+      "amount": 2216,
+      "currency": "USD",
+      "precision": 2
+    },
+    "total_repairs": {
+      "amount": 554798,
+      "currency": "USD",
+      "precision": 2
+    }
+  },
+  "additional": {
+    "pvrt": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "total": {
+      "amount": 36196,
+      "currency": "USD",
+      "precision": 2
+    },
+    "towing": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "storage": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "shipping": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "adjustments": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "additionalCosts": {
+      "amount": 36196,
+      "currency": "USD",
+      "precision": 2
+    },
+    "additionalCostItems": [
+      {
+        "key": "ATS Amount",
+        "total": {
+          "amount": 36196,
+          "currency": "USD",
+          "precision": 2
+        }
+      }
+    ]
+  }
+}

client/cypress/fixtures/jobs/job-3-supplment-jobmetadata.json

@@ -0,0 +1,316 @@
+{
+  "parts": {
+    "parts": {
+      "list": {
+        "PAE": {
+          "total": {
+            "amount": 0,
+            "currency": "USD",
+            "precision": 2
+          }
+        },
+        "PAN": {
+          "total": {
+            "amount": 36661,
+            "currency": "USD",
+            "precision": 2
+          }
+        }
+      },
+      "total": {
+        "amount": 36661,
+        "currency": "USD",
+        "precision": 2
+      },
+      "subtotal": {
+        "amount": 36661,
+        "currency": "USD",
+        "precision": 2
+      },
+      "prt_dsmk_total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "sublets": {
+      "total": {
+        "amount": 5000,
+        "currency": "USD",
+        "precision": 2
+      },
+      "subtotal": {
+        "amount": 5000,
+        "currency": "USD",
+        "precision": 2
+      }
+    }
+  },
+  "rates": {
+    "la1": {
+      "rate": 92.49,
+      "hours": 3.5,
+      "total": {
+        "amount": 32372,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "la2": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "la3": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "la4": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "laa": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lab": {
+      "rate": 85.16,
+      "hours": 29.7,
+      "total": {
+        "amount": 252925,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lad": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lae": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "laf": {
+      "rate": 97.34,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lag": {
+      "rate": 85.16,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lam": {
+      "rate": 109.5,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lar": {
+      "rate": 85.16,
+      "hours": 8.500000000000002,
+      "total": {
+        "amount": 72386,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "las": {
+      "rate": 85.16,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "lau": {
+      "rate": 0,
+      "hours": 0,
+      "total": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "mapa": {
+      "rate": 55.38,
+      "hours": 8.500000000000002,
+      "total": {
+        "amount": 47073,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "mash": {
+      "rate": 6.85,
+      "hours": 33.199999999999996,
+      "total": {
+        "amount": 22742,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "subtotal": {
+      "amount": 427498,
+      "currency": "USD",
+      "precision": 2
+    },
+    "rates_subtotal": {
+      "amount": 357683,
+      "currency": "USD",
+      "precision": 2
+    }
+  },
+  "totals": {
+    "subtotal": {
+      "amount": 505355,
+      "currency": "USD",
+      "precision": 2
+    },
+    "local_tax": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "state_tax": {
+      "amount": 35375,
+      "currency": "USD",
+      "precision": 2
+    },
+    "custPayable": {
+      "total": {
+        "amount": 30000,
+        "currency": "USD",
+        "precision": 2
+      },
+      "dep_taxes": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      },
+      "deductible": {
+        "amount": 30000,
+        "currency": "USD",
+        "precision": 2
+      },
+      "federal_tax": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      },
+      "other_customer_amount": {
+        "amount": 0,
+        "currency": "USD",
+        "precision": 2
+      }
+    },
+    "federal_tax": {
+      "amount": 25268,
+      "currency": "USD",
+      "precision": 2
+    },
+    "net_repairs": {
+      "amount": 535998,
+      "currency": "USD",
+      "precision": 2
+    },
+    "statePartsTax": {
+      "amount": 2916,
+      "currency": "USD",
+      "precision": 2
+    },
+    "total_repairs": {
+      "amount": 565998,
+      "currency": "USD",
+      "precision": 2
+    }
+  },
+  "additional": {
+    "pvrt": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "total": {
+      "amount": 36196,
+      "currency": "USD",
+      "precision": 2
+    },
+    "towing": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "storage": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "shipping": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "adjustments": {
+      "amount": 0,
+      "currency": "USD",
+      "precision": 2
+    },
+    "additionalCosts": {
+      "amount": 36196,
+      "currency": "USD",
+      "precision": 2
+    },
+    "additionalCostItems": [
+      {
+        "key": "ATS Amount",
+        "total": {
+          "amount": 36196,
+          "currency": "USD",
+          "precision": 2
+        }
+      }
+    ]
+  }
+}

client/cypress/support/commands.js

@@ -0,0 +1,127 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+
+Cypress.Commands.add("goToSignInPage", () => {
+  cy.visit("/");
+  cy.contains("Sign In").click();
+});
+
+Cypress.Commands.add("login", (username, password) => {
+  cy.goToSignInPage();
+
+  cy.get('[data-cy="username"]').type(username);
+  cy.get('[data-cy="password"]').type(password);
+  cy.get('[data-cy="sign-in-button"]', { timeout: 2000 }).click();
+});
+
+Cypress.Commands.add("passwordReset", (email) => {
+  cy.goToSignInPage();
+  cy.get('[data-cy="reset-password"]').click();
+  cy.get('[data-cy="reset-password-email-input"]').type(email);
+  cy.get('[data-cy="reset-password-button"]').click();
+});
+
+Cypress.on("uncaught:exception", (err, runnable) => {
+  // returning false here prevents Cypress from
+  // failing the test
+  return false;
+});
+
+Cypress.Commands.add("antdSelect", (selector, filter) => {
+  cy.get(`.ant-select-${selector} > .ant-select-selector`).click();
+  cy.get(`.ant-select-${selector} .ant-select-selection-search input`)
+    .invoke("attr", "id")
+    .then((selElm) => {
+      const dropDownSelector = `#${selElm}_list`;
+
+      if (filter) {
+        cy.get(dropDownSelector)
+          .next()
+          .find(".ant-select-item-option-content")
+          .not(`:contains("${filter}")`)
+          .first()
+          .click({ force: true });
+      } else {
+        cy.get(dropDownSelector)
+          .next()
+          .find(".ant-select-item-option-content")
+          .first()
+          .click({ force: true });
+      }
+    });
+});
+
+Cypress.Commands.add("antdSelectValue", (selector, filter) => {
+  cy.get(`.ant-select-${selector} > .ant-select-selector`).click();
+  cy.get(`.ant-select-${selector} .ant-select-selection-search input`)
+    .invoke("attr", "id")
+    .then((selElm) => {
+      const dropDownSelector = `#${selElm}_list`;
+
+      cy.get(dropDownSelector)
+        .next()
+        .find(".ant-select-item-option-content")
+        .contains(filter)
+        .first()
+        .click({ force: true });
+    });
+});
+
+Cypress.Commands.add(
+  "insertAvailableJob",
+  ({ bodyshopid, job, job_est_data, token }) => {
+    const query = `mutation INSERT_AVAILABLE_JOB($job: available_jobs_insert_input!) {
+      insert_available_jobs_one(object: $job) {
+        id
+      }
+    }`;
+
+    cy.request({
+      url: "http://localhost:4000/test/query",
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: token,
+      },
+      body: {
+        query,
+        job: {
+          est_data: job_est_data,
+          uploaded_by: Cypress.env("uploaded_by_email"),
+          cieca_id: job.ciecaid,
+          bodyshopid,
+          clm_amt: job.clm_total,
+          clm_no: job.clm_no,
+          ins_co_nm: job.ins_co_nm,
+          ownr_name: `${job.owner.data.ownr_fn} ${job.owner.data.ownr_ln}`,
+          vehicle_info: `${job.v_model_yr} ${job.v_make_desc} ${job.v_model_desc}`,
+        },
+      },
+    })
+      .its("body.insert_available_jobs_one")
+      .should("have.property", "id");
+  }
+);

client/cypress/support/e2e.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/e2e.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import "./commands";
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

client/package.json

@@ -1,105 +1,107 @@
 {
   "name": "bodyshop",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.4.17",
+    "@apollo/client": "^3.7.9",
     "@asseinfo/react-kanban": "^2.2.0",
-    "@craco/craco": "^6.4.0",
-    "@fingerprintjs/fingerprintjs": "^3.3.0",
-    "@openreplay/tracker": "^3.4.7",
-    "@openreplay/tracker-assist": "^3.4.4",
-    "@openreplay/tracker-graphql": "^3.0.0",
-    "@openreplay/tracker-redux": "^3.0.0",
-    "@sentry/react": "^6.14.3",
-    "@sentry/tracing": "^6.14.3",
-    "@splitsoftware/splitio-react": "^1.3.0",
-    "@stripe/react-stripe-js": "^1.6.0",
-    "@stripe/stripe-js": "^1.21.1",
-    "@tanem/react-nprogress": "^3.0.82",
-    "antd": "^4.16.13",
-    "apollo-link-logger": "^2.0.0",
-    "axios": "^0.24.0",
-    "craco-less": "^1.20.0",
+    "@craco/craco": "^7.0.0",
+    "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@jsreport/browser-client": "^3.1.0",
+    "@sentry/react": "^7.40.0",
+    "@sentry/tracing": "^7.40.0",
+    "@splitsoftware/splitio-react": "^1.8.1",
+    "@tanem/react-nprogress": "^5.0.8",
+    "antd": "^4.24.8",
+    "apollo-link-logger": "^2.0.1",
+    "axios": "^1.3.4",
+    "craco-less": "^2.0.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.1",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.4.1",
-    "graphql": "^16.0.1",
-    "i18next": "^21.4.2",
-    "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.7",
+    "firebase": "^9.17.1",
+    "graphql": "^16.6.0",
+    "i18next": "^22.4.10",
+    "i18next-browser-languagedetector": "^7.0.1",
+    "jsoneditor": "^9.9.0",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.42",
-    "logrocket": "^2.1.1",
-    "markerjs2": "^2.17.0",
+    "libphonenumber-js": "^1.10.21",
+    "logrocket": "^3.0.1",
+    "markerjs2": "^2.28.1",
     "moment-business-days": "^1.2.0",
-    "phone": "^3.1.9",
+    "moment-timezone": "^0.5.41",
+    "normalize-url": "^8.0.0",
+    "phone": "^3.1.35",
     "preval.macro": "^5.0.0",
-    "prop-types": "^15.7.2",
-    "query-string": "^7.0.1",
+    "prop-types": "^15.8.1",
+    "query-string": "^7.1.3",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
-    "react": "^17.0.1",
-    "react-big-calendar": "^0.38.1",
+    "react": "^17.0.2",
+    "react-big-calendar": "^1.6.8",
     "react-color": "^2.19.3",
     "react-cookie": "^4.1.1",
-    "react-dom": "^17.0.1",
-    "react-drag-listview": "^0.1.8",
-    "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.3.0",
-    "react-i18next": "^11.14.2",
-    "react-icons": "^4.3.1",
-    "react-number-format": "^4.8.0",
-    "react-redux": "^7.2.6",
+    "react-dom": "^17.0.2",
+    "react-drag-listview": "^0.2.1",
+    "react-grid-gallery": "^1.0.0",
+    "react-grid-layout": "^1.3.4",
+    "react-i18next": "^12.2.0",
+    "react-icons": "^4.7.1",
+    "react-image-lightbox": "^5.1.4",
+    "react-intersection-observer": "^9.4.3",
+    "react-number-format": "^5.1.3",
+    "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",
     "react-router-dom": "^5.3.0",
-    "react-scripts": "^4.0.3",
+    "react-scripts": "^5.0.1",
+    "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.6",
-    "redux": "^4.1.2",
+    "recharts": "^2.4.3",
+    "redux": "^4.2.1",
     "redux-persist": "^6.0.0",
-    "redux-saga": "^1.1.3",
-    "redux-state-sync": "^3.1.2",
-    "reselect": "^4.1.2",
-    "sass": "^1.43.4",
-    "socket.io-client": "^4.3.2",
-    "styled-components": "^5.3.3",
+    "redux-saga": "^1.2.2",
+    "redux-state-sync": "^3.1.4",
+    "reselect": "^4.1.7",
+    "sass": "^1.58.3",
+    "socket.io-client": "^4.6.1",
+    "styled-components": "^5.3.6",
     "subscriptions-transport-ws": "^0.11.0",
-    "web-vitals": "^2.1.2",
-    "workbox-background-sync": "^6.3.0",
-    "workbox-broadcast-update": "^6.3.0",
-    "workbox-cacheable-response": "^6.3.0",
-    "workbox-core": "^6.3.0",
-    "workbox-expiration": "^6.3.0",
-    "workbox-google-analytics": "^6.3.0",
-    "workbox-navigation-preload": "^6.3.0",
-    "workbox-precaching": "^6.3.0",
-    "workbox-range-requests": "^6.3.0",
-    "workbox-routing": "^6.3.0",
-    "workbox-strategies": "^6.3.0",
-    "workbox-streams": "^6.3.0"
+    "uniqid": "^5.4.0",
+    "web-vitals": "^2.1.4",
+    "workbox-background-sync": "^6.5.3",
+    "workbox-broadcast-update": "^6.5.3",
+    "workbox-cacheable-response": "^6.5.3",
+    "workbox-core": "^6.5.3",
+    "workbox-expiration": "^6.5.3",
+    "workbox-google-analytics": "^6.5.3",
+    "workbox-navigation-preload": "^6.5.3",
+    "workbox-precaching": "^6.5.3",
+    "workbox-range-requests": "^6.5.3",
+    "workbox-routing": "^6.5.3",
+    "workbox-strategies": "^6.5.3",
+    "workbox-streams": "^6.5.3",
+    "yauzl": "^2.10.0"
   },
   "scripts": {
-    "postinstall": "patch-package",
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "build:test": "env-cmd -f .env.test yarn run build",
     "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
-    "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build",
-    "test": "craco test",
+    "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
+    "test": "cypress open",
     "eject": "react-scripts eject",
     "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ."
   },
   "eslintConfig": {
     "extends": [
       "react-app",
-      "react-app/jest"
+      "react-app/jest",
+      "plugin:cypress/recommended"
     ]
   },
   "browserslist": {
@@ -114,9 +116,15 @@
       "last 1 safari version"
     ]
   },
+  "resolutions": {
+    "react-error-overlay": "6.0.9"
+  },
   "devDependencies": {
-    "@sentry/webpack-plugin": "^1.18.3",
-    "patch-package": "^6.4.7",
+    "@sentry/webpack-plugin": "^1.20.0",
+    "@testing-library/cypress": "^8.0.3",
+    "cypress": "^12.13.0",
+    "eslint-plugin-cypress": "^2.12.1",
+    "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.2"
   }

client/src/App/App.container.jsx

@@ -2,7 +2,6 @@ import { ApolloProvider } from "@apollo/client";
 import { SplitFactory, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
-import LogRocket from "logrocket";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -10,13 +9,8 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import client from "../utils/GraphQLClient";
 import App from "./App";
 
-
 moment.locale("en-US");
 
-
-//tracker.start();
-if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
-
 export const factory = SplitSdk({
   core: {
     authorizationKey: process.env.REACT_APP_SPLIT_API,

client/src/App/App.jsx

@@ -1,4 +1,6 @@
+import { useClient } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
+import LogRocket from "logrocket";
 import React, { lazy, Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -9,15 +11,18 @@ import ErrorBoundary from "../components/error-boundary/error-boundary.component
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
 import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
+import LandingPage from "../pages/landing/landing.page";
 import TechPageContainer from "../pages/tech/tech.page.container";
 import { setOnline } from "../redux/application/application.actions";
 import { selectOnline } from "../redux/application/application.selectors";
 import { checkUserSession } from "../redux/user/user.actions";
-import { selectCurrentUser } from "../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
 
-import LandingPage from "../pages/landing/landing.page";
 const ResetPassword = lazy(() =>
   import("../pages/reset-password/reset-password.component")
 );
@@ -32,13 +37,22 @@ const MobilePaymentContainer = lazy(() =>
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   online: selectOnline,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   checkUserSession: () => dispatch(checkUserSession()),
   setOnline: (isOnline) => dispatch(setOnline(isOnline)),
 });
 
-export function App({ checkUserSession, currentUser, online, setOnline }) {
+export function App({
+  bodyshop,
+  checkUserSession,
+  currentUser,
+  online,
+  setOnline,
+}) {
+  const client = useClient();
+
   useEffect(() => {
     if (!navigator.onLine) {
       setOnline(false);
@@ -59,6 +73,16 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
+  useEffect(() => {
+    if (currentUser.authorized && bodyshop) {
+      client.setAttribute("imexshopid", bodyshop.imexshopid);
+
+      if (client.getTreatment("LogRocket_Tracking") === "on") {
+        console.log("LR Start");
+        LogRocket.init("gvfvfw/bodyshopapp");
+      }
+    }
+  }, [bodyshop, client, currentUser.authorized]);
 
   if (currentUser.authorized === null) {
     return <LoadingSpinner message={t("general.labels.loggingin")} />;

client/src/App/App.styles.scss

@@ -91,13 +91,13 @@
   color: blue;
 }
 
-.production-completion-1 {
-  animation: production-completion-1-blinker 5s linear infinite;
+.production-completion-soon {
+  color: rgba(255, 140, 0, 0.8);
+  font-weight: bold;
 }
-@keyframes production-completion-1-blinker {
-  50% {
-    background: rgba(207, 12, 12, 0.555);
-  }
+.production-completion-past {
+  color: rgba(255, 0, 0, 0.8);
+  font-weight: bold;
 }
 
 .react-resizable {
@@ -134,3 +134,33 @@
     background: unset;
   }
 }
+
+.ReactGridGallery_tile-icon-bar {
+  div {
+    svg {
+      fill: #1890ff;
+    }
+  }
+}
+
+//Update row highlighting on production board.
+.ant-table-tbody > tr.ant-table-row:hover > td {
+  background: #eaeaea !important;
+}
+
+.job-line-manual {
+  color: tomato;
+  font-style: italic;
+}
+
+td.ant-table-column-sort {
+  background-color: transparent;
+}
+
+.ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
+  background-color: #f4f4f4;
+}
+
+.rowWithColor > td {
+  background-color: var(--bgColor) !important;
+}

client/src/components/_test/paymentMethod.jsx

@@ -1,8 +1,4 @@
-import {
-  PaymentRequestButtonElement,
-  useStripe,
-} from "@stripe/react-stripe-js";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -19,49 +15,6 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 function Test({ bodyshop, setEmailOptions }) {
-  const stripe = useStripe();
-
-  const [paymentRequest, setPaymentRequest] = useState(null);
-  useEffect(() => {
-    if (stripe) {
-      const pr = stripe.paymentRequest({
-        country: "CA",
-        displayItems: [{ label: "Deductible", amount: 1099 }],
-        currency: "cad",
-        total: {
-          label: "Demo total",
-          amount: 1099,
-        },
-        requestPayerName: true,
-        requestPayerEmail: true,
-      });
-
-      // Check the availability of the Payment Request API.
-      pr.canMakePayment().then((result) => {
-        if (result) {
-          setPaymentRequest(pr);
-        } else {
-          // var details = {
-          //   total: { label: "", amount: { currency: "CAD", value: "0.00" } },
-          // };
-          new PaymentRequest(
-            [{ supportedMethods: ["basic-card"] }],
-            {}
-            //  details
-          ).show();
-        }
-      });
-    }
-  }, [stripe]);
-
-  if (paymentRequest) {
-    return (
-      <div style={{ height: "300px" }}>
-        <PaymentRequestButtonElement options={{ paymentRequest }} />
-      </div>
-    );
-  }
-
   return (
     <div>
       <button

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -13,6 +13,8 @@ import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -27,7 +29,12 @@ export default connect(
   mapDispatchToProps
 )(AccountingPayablesTableComponent);
 
-export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
+export function AccountingPayablesTableComponent({
+  bodyshop,
+  loading,
+  bills,
+  refetch,
+}) {
   const { t } = useTranslation();
   const [selectedBills, setSelectedBills] = useState([]);
   const [transInProgress, setTransInProgress] = useState(false);
@@ -131,11 +138,9 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
       dataIndex: "attempts",
       key: "attempts",
 
-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
+      render: (text, record) => (
+        <ExportLogsCountDisplay logs={record.exportlogs} />
+      ),
     },
     {
       title: t("general.labels.actions"),
@@ -144,14 +149,13 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
       sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
-        <div>
-          <PayableExportButton
-            billId={record.id}
-            disabled={transInProgress || !!record.exported}
-            loadingCallback={setTransInProgress}
-            setSelectedBills={setSelectedBills}
-          />
-        </div>
+        <PayableExportButton
+          billId={record.id}
+          disabled={transInProgress || !!record.exported}
+          loadingCallback={setTransInProgress}
+          setSelectedBills={setSelectedBills}
+          refetch={refetch}
+        />
       ),
     },
   ];
@@ -177,11 +181,19 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
     <Card
       extra={
         <Space wrap>
+          <BillMarkSelectedExported
+            billids={selectedBills}
+            disabled={transInProgress || selectedBills.length === 0}
+            loadingCallback={setTransInProgress}
+            completedCallback={setSelectedBills}
+            refetch={refetch}
+          />
           <PayableExportAll
             billids={selectedBills}
             disabled={transInProgress || selectedBills.length === 0}
             loadingCallback={setTransInProgress}
             completedCallback={setSelectedBills}
+            refetch={refetch}
           />
           {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
             <QboAuthorizeComponent />

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -1,17 +1,20 @@
 import { Card, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
+import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -30,6 +33,7 @@ export function AccountingPayablesTableComponent({
   bodyshop,
   loading,
   payments,
+  refetch,
 }) {
   const { t } = useTranslation();
   const [selectedPayments, setSelectedPayments] = useState([]);
@@ -76,14 +80,12 @@ export function AccountingPayablesTableComponent({
       render: (text, record) => {
         return record.job.owner ? (
           <Link to={"/manage/owners/" + record.job.owner.id}>
-            {`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
-              record.job.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record.job} />
           </Link>
         ) : (
-          <span>{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
-            record.job.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record.job} />
+          </span>
         );
       },
     },
@@ -105,11 +107,6 @@ export function AccountingPayablesTableComponent({
       dataIndex: "transactionid",
       key: "transactionid",
     },
-    {
-      title: t("payments.fields.stripeid"),
-      dataIndex: "stripeid",
-      key: "stripeid",
-    },
     {
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",
@@ -131,11 +128,9 @@ export function AccountingPayablesTableComponent({
       dataIndex: "attempts",
       key: "attempts",
 
-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
+      render: (text, record) => (
+        <ExportLogsCountDisplay logs={record.exportlogs} />
+      ),
     },
     {
       title: t("general.labels.actions"),
@@ -149,6 +144,7 @@ export function AccountingPayablesTableComponent({
           disabled={transInProgress || !!record.exportedat}
           loadingCallback={setTransInProgress}
           setSelectedPayments={setSelectedPayments}
+          refetch={refetch}
         />
       ),
     },
@@ -162,10 +158,19 @@ export function AccountingPayablesTableComponent({
   const dataSource = state.search
     ? payments.filter(
         (v) =>
-          (v.vendor.name || "")
+          (v.paymentnum || "")
             .toLowerCase()
             .includes(state.search.toLowerCase()) ||
-          (v.invoice_number || "")
+          ((v.job && v.job.ro_number) || "")
+            .toLowerCase()
+            .includes(state.search.toLowerCase()) ||
+          ((v.job && v.job.ownr_fn) || "")
+            .toLowerCase()
+            .includes(state.search.toLowerCase()) ||
+          ((v.job && v.job.ownr_ln) || "")
+            .toLowerCase()
+            .includes(state.search.toLowerCase()) ||
+          ((v.job && v.job.ownr_co_nm) || "")
             .toLowerCase()
             .includes(state.search.toLowerCase())
       )
@@ -175,11 +180,19 @@ export function AccountingPayablesTableComponent({
     <Card
       extra={
         <Space wrap>
+          <PaymentMarkSelectedExported
+            paymentIds={selectedPayments}
+            disabled={transInProgress || selectedPayments.length === 0}
+            loadingCallback={setTransInProgress}
+            completedCallback={setSelectedPayments}
+            refetch={refetch}
+          />
           <PaymentsExportAllButton
             paymentIds={selectedPayments}
             disabled={transInProgress || selectedPayments.length === 0}
             loadingCallback={setTransInProgress}
             completedCallback={setSelectedPayments}
+            refetch={refetch}
           />
           {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
             <QboAuthorizeComponent />

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
@@ -12,6 +12,10 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -27,6 +31,7 @@ export function AccountingReceivablesTableComponent({
   bodyshop,
   loading,
   jobs,
+  refetch,
 }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
@@ -62,6 +67,18 @@ export function AccountingReceivablesTableComponent({
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
+    {
+      title: t("jobs.fields.date_invoiced"),
+      dataIndex: "date_invoiced",
+      key: "date_invoiced",
+      sorter: (a, b) => dateSort(a.date_invoiced, b.date_invoiced),
+      sortOrder:
+        state.sortedInfo.columnKey === "date_invoiced" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <DateFormatter>{record.date_invoiced}</DateFormatter>
+      ),
+    },
     {
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
@@ -72,14 +89,12 @@ export function AccountingReceivablesTableComponent({
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
-            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-              record.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record} />
           </Link>
         ) : (
-          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-            record.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
         );
       },
     },
@@ -110,13 +125,6 @@ export function AccountingReceivablesTableComponent({
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder:
         state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.clm_no ? (
-          <span>{record.clm_no}</span>
-        ) : (
-          t("general.labels.unknown")
-        );
-      },
     },
     {
       title: t("jobs.fields.clm_total"),
@@ -126,23 +134,16 @@ export function AccountingReceivablesTableComponent({
       sortOrder:
         state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
       render: (text, record) => {
-        return record.clm_total ? (
-          <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
-        ) : (
-          t("general.labels.unknown")
-        );
+        return <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>;
       },
     },
     {
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
-
-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
+      render: (text, record) => (
+        <ExportLogsCountDisplay logs={record.exportlogs} />
+      ),
     },
     {
       title: t("general.labels.actions"),
@@ -155,6 +156,7 @@ export function AccountingReceivablesTableComponent({
             jobId={record.id}
             disabled={!!record.date_exported}
             setSelectedJobs={setSelectedJobs}
+            refetch={refetch}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
             <Button>{t("jobs.labels.viewallocations")}</Button>
@@ -205,6 +207,7 @@ export function AccountingReceivablesTableComponent({
               disabled={transInProgress || selectedJobs.length === 0}
               loadingCallback={setTransInProgress}
               completedCallback={setSelectedJobs}
+              refetch={refetch}
             />
           )}
           {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (

client/src/components/audit-trail-list/audit-trail-list.container.jsx

@@ -4,11 +4,14 @@ import { useQuery } from "@apollo/client";
 import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
 import AlertComponent from "../alert/alert.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import EmailAuditTrailListComponent from "./email-audit-trail-list.component";
+import { Card, Row } from "antd";
 
 export default function AuditTrailListContainer({ recordId }) {
   const { loading, error, data } = useQuery(QUERY_AUDIT_TRAIL, {
     variables: { id: recordId },
     fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
   });
 
   logImEXEvent("audittrail_view", { recordId });
@@ -17,10 +20,20 @@ export default function AuditTrailListContainer({ recordId }) {
       {error ? (
         <AlertComponent type="error" message={error.message} />
       ) : (
-        <AuditTrailListComponent
-          loading={loading}
-          data={data ? data.audit_trail : null}
-        />
+        <Row gutter={[16, 16]}>
+          <Card>
+            <AuditTrailListComponent
+              loading={loading}
+              data={data ? data.audit_trail : []}
+            />
+          </Card>
+          <Card>
+            <EmailAuditTrailListComponent
+              loading={loading}
+              data={data ? data.audit_trail : []}
+            />
+          </Card>
+        </Row>
       )}
     </div>
   );

client/src/components/audit-trail-list/email-audit-trail-list.component.jsx

@@ -0,0 +1,63 @@
+import { Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { alphaSort } from "../../utils/sorters";
+
+export default function EmailAuditTrailListComponent({ loading, data }) {
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: {},
+  });
+  const { t } = useTranslation();
+  const columns = [ 
+    {
+      title: t("audit.fields.created"),
+      dataIndex: " created",
+      key: " created",
+      width: "10%",
+      render: (text, record) => (
+        <DateTimeFormatter>{record.created}</DateTimeFormatter>
+      ),
+      sorter: (a, b) => a.created - b.created,
+      sortOrder:
+        state.sortedInfo.columnKey === "created" && state.sortedInfo.order,
+    },
+
+    {
+      title: t("audit.fields.useremail"),
+      dataIndex: "useremail",
+      key: "useremail",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.useremail, b.useremail),
+      sortOrder:
+        state.sortedInfo.columnKey === "useremail" && state.sortedInfo.order,
+    },
+  ];
+
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 12 },
+      sm: { span: 5 },
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 12 },
+    },
+  };
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  return (
+    <Table
+      {...formItemLayout}
+      loading={loading}
+      pagination={{ position: "top", defaultPageSize: 25 }}
+      columns={columns}
+      rowKey="id"
+      dataSource={data}
+      onChange={handleTableChange}
+    />
+  );
+}

client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx

@@ -0,0 +1,135 @@
+import { Checkbox, Form, Skeleton, Typography } from "antd";
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
+import "./bill-cm-returns-table.styles.scss";
+export default function BillCmdReturnsTableComponent({
+  form,
+  returnLoading,
+  returnData,
+}) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (returnData) {
+      form.setFieldsValue({
+        outstanding_returns: returnData.parts_order_lines,
+      });
+    }
+  }, [returnData, form]);
+
+  return (
+    <Form.Item
+      shouldUpdate={(prev, cur) =>
+        prev.jobid !== cur.jobid ||
+        prev.is_credit_memo !== cur.is_credit_memo ||
+        prev.vendorid !== cur.vendorid
+      }
+      noStyle
+    >
+      {() => {
+        const isReturn = form.getFieldValue("is_credit_memo");
+
+        if (!isReturn) {
+          return null;
+        }
+
+        if (returnLoading) return <Skeleton />;
+
+        return (
+          <Form.List name="outstanding_returns">
+            {(fields, { add, remove, move }) => {
+              return (
+                <>
+                  <Typography.Title level={4}>
+                    {t("bills.labels.creditsnotreceived")}
+                  </Typography.Title>
+                  <table className="bill-cm-returns-table">
+                    <thead>
+                      <tr>
+                        <th>{t("parts_orders.fields.line_desc")}</th>
+                        <th>{t("parts_orders.fields.part_type")}</th>
+                        <th>{t("parts_orders.fields.quantity")}</th>
+                        <th>{t("parts_orders.fields.act_price")}</th>
+                        <th>{t("parts_orders.fields.cost")}</th>
+                        <th>{t("parts_orders.labels.mark_as_received")}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {fields.map((field, index) => (
+                        <tr key={field.key}>
+                          <td>
+                            <Form.Item
+                              //   label={t("joblines.fields.line_desc")}
+                              key={`${index}line_desc`}
+                              name={[field.name, "line_desc"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}part_type`}
+                              name={[field.name, "part_type"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}quantity`}
+                              name={[field.name, "quantity"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}act_price`}
+                              name={[field.name, "act_price"]}
+                            >
+                              <ReadOnlyFormItemComponent type="currency" />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}cost`}
+                              name={[field.name, "cost"]}
+                            >
+                              <ReadOnlyFormItemComponent type="currency" />
+                            </Form.Item>
+                          </td>
+
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}cm_received`}
+                              name={[field.name, "cm_received"]}
+                              valuePropName="checked"
+                            >
+                              <Checkbox data-cy="mark-as-received-checkbox" />
+                            </Form.Item>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
+                </>
+              );
+            }}
+          </Form.List>
+        );
+      }}
+    </Form.Item>
+  );
+}

client/src/components/bill-cm-returns-table/bill-cm-returns-table.styles.scss

@@ -0,0 +1,19 @@
+.bill-cm-returns-table {
+    table-layout: fixed;
+    width: 100%;
+
+    th,
+    td {
+        padding: 8px;
+        text-align: left;
+        border-bottom: 1px solid #ddd;
+
+        .ant-form-item {
+            margin-bottom: 0px !important;
+        }
+    }
+
+    tr:hover {
+        background-color: #f5f5f5;
+    }
+}

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
-export default function BillDeleteButton({ bill }) {
+export default function BillDeleteButton({ bill, callback }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -15,7 +15,8 @@ export default function BillDeleteButton({ bill }) {
     setLoading(true);
     const result = await deleteBill({
       variables: { billId: bill.id },
-      update(cache) {
+      update(cache, { errors }) {
+        if (errors) return;
         cache.modify({
           fields: {
             bills(existingBills, { readField }) {
@@ -35,12 +36,25 @@ export default function BillDeleteButton({ bill }) {
 
     if (!!!result.errors) {
       notification["success"]({ message: t("bills.successes.deleted") });
+
+      if (callback && typeof callback === "function") callback(bill.id);
     } else {
-      notification["error"]({
-        message: t("bills.errors.deleting", {
-          error: JSON.stringify(result.errors),
-        }),
-      });
+      //Check if it's an fkey violation.
+      const error = JSON.stringify(result.errors);
+
+      if (error.toLowerCase().includes("inventory_billid_fkey")) {
+        notification["error"]({
+          message: t("bills.errors.deleting", {
+            error: t("bills.errors.existinginventoryline"),
+          }),
+        });
+      } else {
+        notification["error"]({
+          message: t("bills.errors.deleting", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
     }
 
     setLoading(false);

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -0,0 +1,258 @@
+import { useMutation, useQuery } from "@apollo/client";
+import { Button, Form, PageHeader, Popconfirm, Space } from "antd";
+import moment from "moment";
+import queryString from "query-string";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import {
+  DELETE_BILL_LINE,
+  INSERT_NEW_BILL_LINES,
+  UPDATE_BILL_LINE,
+} from "../../graphql/bill-lines.queries";
+import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import AlertComponent from "../alert/alert.component";
+import BillFormContainer from "../bill-form/bill-form.container";
+import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
+import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
+import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
+import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import BillDetailEditReturn from "./bill-detail-edit-return.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  setPartsOrderContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillDetailEditcontainer);
+
+export function BillDetailEditcontainer({
+  setPartsOrderContext,
+  insertAuditTrail,
+  bodyshop,
+}) {
+  const search = queryString.parse(useLocation().search);
+
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+  const [visible, setVisible] = useState(false);
+  const [updateLoading, setUpdateLoading] = useState(false);
+  const [update_bill] = useMutation(UPDATE_BILL);
+  const [insertBillLine] = useMutation(INSERT_NEW_BILL_LINES);
+  const [updateBillLine] = useMutation(UPDATE_BILL_LINE);
+  const [deleteBillLine] = useMutation(DELETE_BILL_LINE);
+
+  const { loading, error, data, refetch } = useQuery(QUERY_BILL_BY_PK, {
+    variables: { billid: search.billid },
+    skip: !!!search.billid,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  const handleSave = () => {
+    //It's got a previously deducted bill line!
+    if (
+      data.bills_by_pk.billlines.filter((b) => b.deductedfromlbr).length > 0 ||
+      form.getFieldValue("billlines").filter((b) => b.deductedfromlbr).length >
+        0
+    )
+      setVisible(true);
+    else {
+      form.submit();
+    }
+  };
+
+  const handleFinish = async (values) => {
+    setUpdateLoading(true);
+    //let adjustmentsToInsert = {};
+
+    const { billlines, upload, ...bill } = values;
+    const updates = [];
+    updates.push(
+      update_bill({
+        variables: { billId: search.billid, bill: bill },
+      })
+    );
+
+    billlines.forEach((l) => {
+      delete l.selected;
+    });
+
+    //Find bill lines that were deleted.
+    const deletedJobLines = [];
+
+    data.bills_by_pk.billlines.forEach((a) => {
+      const matchingRecord = billlines.find((b) => b.id === a.id);
+      if (!matchingRecord) {
+        deletedJobLines.push(a);
+      }
+    });
+
+    deletedJobLines.forEach((d) => {
+      updates.push(deleteBillLine({ variables: { id: d.id } }));
+    });
+
+    billlines.forEach((billline) => {
+      const { deductedfromlbr, inventories, jobline, ...il } = billline;
+      delete il.__typename;
+
+      if (il.id) {
+        updates.push(
+          updateBillLine({
+            variables: {
+              billLineId: il.id,
+              billLine: {
+                ...il,
+                deductedfromlbr: deductedfromlbr,
+                joblineid: il.joblineid === "noline" ? null : il.joblineid,
+              },
+            },
+          })
+        );
+      } else {
+        //It's a new line, have to insert it.
+        updates.push(
+          insertBillLine({
+            variables: {
+              billLines: [
+                {
+                  ...il,
+                  deductedfromlbr: deductedfromlbr,
+                  billid: search.billid,
+                  joblineid: il.joblineid === "noline" ? null : il.joblineid,
+                },
+              ],
+            },
+          })
+        );
+      }
+    });
+
+    await Promise.all(updates);
+
+    insertAuditTrail({
+      jobid: bill.jobid,
+      billid: search.billid,
+      operation: AuditTrailMapping.billupdated(bill.invoice_number),
+    });
+
+    await refetch();
+    form.setFieldsValue(transformData(data));
+    form.resetFields();
+    setVisible(false);
+    setUpdateLoading(false);
+  };
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+  if (!search.billid) return <></>; //<div>{t("bills.labels.noneselected")}</div>;
+
+  const exported = data && data.bills_by_pk && data.bills_by_pk.exported;
+
+  return (
+    <>
+      {loading && <LoadingSkeleton />}
+      {data && (
+        <>
+          <PageHeader
+            title={
+              data &&
+              `${data.bills_by_pk.invoice_number} - ${data.bills_by_pk.vendor.name}`
+            }
+            extra={
+              <Space>
+                <BillDetailEditReturn data={data} />
+
+                <Popconfirm
+                  visible={visible}
+                  onConfirm={() => form.submit()}
+                  onCancel={() => setVisible(false)}
+                  okButtonProps={{ loading: updateLoading }}
+                  title={t("bills.labels.editadjwarning")}
+                >
+                  <Button
+                    htmlType="submit"
+                    disabled={exported}
+                    onClick={handleSave}
+                    loading={updateLoading}
+                    type="primary"
+                  >
+                    {t("general.actions.save")}
+                  </Button>
+                </Popconfirm>
+                <BillReeportButtonComponent
+                  data-cy="bill-mark-reexport-button"
+                  bill={data && data.bills_by_pk}
+                />
+                <BillMarkExportedButton
+                  data-cy="bill-mark-export-button"
+                  bill={data && data.bills_by_pk}
+                />
+              </Space>
+            }
+          />
+          <Form
+            data-cy="bill-edit-form"
+            form={form}
+            onFinish={handleFinish}
+            initialValues={transformData(data)}
+            layout="vertical"
+          >
+            <BillFormContainer form={form} billEdit disabled={exported} />
+
+            {bodyshop.uselocalmediaserver ? (
+              <JobsDocumentsLocalGallery
+                job={{ id: data ? data.bills_by_pk.jobid : null }}
+                invoice_number={data ? data.bills_by_pk.invoice_number : null}
+                vendorid={data ? data.bills_by_pk.vendorid : null}
+              />
+            ) : (
+              <JobDocumentsGallery
+                jobId={data ? data.bills_by_pk.jobid : null}
+                billId={search.billid}
+                documentsList={data ? data.bills_by_pk.documents : []}
+                billsCallback={refetch}
+              />
+            )}
+          </Form>
+        </>
+      )}
+    </>
+  );
+}
+
+const transformData = (data) => {
+  return data
+    ? {
+        ...data.bills_by_pk,
+
+        billlines: data.bills_by_pk.billlines.map((i) => {
+          return {
+            ...i,
+            joblineid: !!i.joblineid ? i.joblineid : "noline",
+            applicable_taxes: {
+              federal:
+                (i.applicable_taxes && i.applicable_taxes.federal) || false,
+              state: (i.applicable_taxes && i.applicable_taxes.state) || false,
+              local: (i.applicable_taxes && i.applicable_taxes.local) || false,
+            },
+          };
+        }),
+        date: data.bills_by_pk ? moment(data.bills_by_pk.date) : null,
+      }
+    : {};
+};

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -0,0 +1,191 @@
+import { Button, Checkbox, Form, Modal } from "antd";
+import queryString from "query-string";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  setPartsOrderContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillDetailEditReturn);
+
+export function BillDetailEditReturn({
+  setPartsOrderContext,
+  insertAuditTrail,
+  bodyshop,
+  data,
+  disabled,
+}) {
+  const search = queryString.parse(useLocation().search);
+  const history = useHistory();
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+  const [visible, setVisible] = useState(false);
+
+  const handleFinish = ({ billlines }) => {
+    const selectedLines = billlines.filter((l) => l.selected).map((l) => l.id);
+
+    setPartsOrderContext({
+      actions: {},
+      context: {
+        jobId: data.bills_by_pk.jobid,
+        vendorId: data.bills_by_pk.vendorid,
+        returnFromBill: data.bills_by_pk.id,
+        invoiceNumber: data.bills_by_pk.invoice_number,
+        linesToOrder: data.bills_by_pk.billlines
+          .filter((l) => selectedLines.includes(l.id))
+          .map((i) => {
+            return {
+              line_desc: i.line_desc,
+              //  db_price: i.actual_price,
+              act_price: i.actual_price,
+              cost: i.actual_cost,
+              quantity: i.quantity,
+              joblineid: i.joblineid,
+              oem_partno: i.jobline && i.jobline.oem_partno,
+              part_type: i.jobline && i.jobline.part_type,
+            };
+          }),
+        isReturn: true,
+      },
+    });
+    delete search.billid;
+
+    history.push({ search: queryString.stringify(search) });
+    setVisible(false);
+  };
+  useEffect(() => {
+    if (visible === false) form.resetFields();
+  }, [visible, form]);
+
+  return (
+    <>
+      <Modal
+        open={visible}
+        onCancel={() => setVisible(false)}
+        destroyOnClose
+        title={t("bills.actions.return")}
+        onOk={() => form.submit()}
+        okButtonProps={{
+          "data-cy": "billline-return-items-ok-button",
+        }}
+      >
+        <Form
+          initialValues={data && data.bills_by_pk}
+          onFinish={handleFinish}
+          form={form}
+        >
+          <Form.List name={["billlines"]}>
+            {(fields, { add, remove, move }) => {
+              return (
+                <table style={{ tableLayout: "auto", width: "100%" }}>
+                  <thead>
+                    <tr>
+                      <td>
+                        <Checkbox
+                          data-cy="billline-checkbox"
+                          onChange={(e) => {
+                            form.setFieldsValue({
+                              billlines: form
+                                .getFieldsValue()
+                                .billlines.map((b) => ({
+                                  ...b,
+                                  selected: e.target.checked,
+                                })),
+                            });
+                          }}
+                        />
+                      </td>
+                      <td>{t("billlines.fields.line_desc")}</td>
+                      <td>{t("billlines.fields.quantity")}</td>
+                      <td>{t("billlines.fields.actual_price")}</td>
+                      <td>{t("billlines.fields.actual_cost")}</td>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {fields.map((field, index) => (
+                      <tr key={field.key}>
+                        <td>
+                          <Form.Item
+                            //   label={t("joblines.fields.selected")}
+                            key={`${index}selected`}
+                            name={[field.name, "selected"]}
+                            valuePropName="checked"
+                          >
+                            <Checkbox />
+                          </Form.Item>
+                        </td>
+                        <td>
+                          <Form.Item
+                            //   label={t("joblines.fields.line_desc")}
+                            key={`${index}line_desc`}
+                            name={[field.name, "line_desc"]}
+                          >
+                            <ReadOnlyFormItemComponent />
+                          </Form.Item>
+                        </td>
+                        <td>
+                          <Form.Item
+                            //   label={t("joblines.fields.quantity")}
+                            key={`${index}quantity`}
+                            name={[field.name, "quantity"]}
+                          >
+                            <ReadOnlyFormItemComponent />
+                          </Form.Item>
+                        </td>
+                        <td>
+                          <Form.Item
+                            //   label={t("joblines.fields.actual_price")}
+                            key={`${index}actual_price`}
+                            name={[field.name, "actual_price"]}
+                            data-cy="billline-actual-price"
+                          >
+                            <ReadOnlyFormItemComponent type="currency" />
+                          </Form.Item>
+                        </td>
+                        <td>
+                          <Form.Item
+                            //   label={t("joblines.fields.actual_cost")}
+                            key={`${index}actual_cost`}
+                            name={[field.name, "actual_cost"]}
+                          >
+                            <ReadOnlyFormItemComponent type="currency" />
+                          </Form.Item>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              );
+            }}
+          </Form.List>
+        </Form>
+      </Modal>
+      <Button
+        data-cy="return-items-button"
+        disabled={data.bills_by_pk.is_credit_memo || disabled}
+        onClick={() => {
+          setVisible(true);
+        }}
+      >
+        {t("bills.actions.return")}
+      </Button>
+    </>
+  );
+}

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -1,62 +1,12 @@
-import { useMutation, useQuery } from "@apollo/client";
-import {
-  Button,
-  Drawer,
-  Form,
-  Grid,
-  PageHeader,
-  Popconfirm,
-  Space,
-} from "antd";
-import moment from "moment";
+import { Drawer, Grid } from "antd";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useLocation, useHistory } from "react-router-dom";
-import {
-  INSERT_NEW_BILL_LINES,
-  UPDATE_BILL_LINE,
-} from "../../graphql/bill-lines.queries";
-import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
-import AlertComponent from "../alert/alert.component";
-import BillFormContainer from "../bill-form/bill-form.container";
-import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import React from "react";
+import { useHistory, useLocation } from "react-router-dom";
+import BillDetailEditComponent from "./bill-detail-edit-component";
 
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-});
-const mapDispatchToProps = (dispatch) => ({
-  setPartsOrderContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(BillDetailEditcontainer);
-
-export function BillDetailEditcontainer({
-  setPartsOrderContext,
-  insertAuditTrail,
-}) {
+export default function BillDetailEditcontainer() {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
-  const { t } = useTranslation();
-  const [form] = Form.useForm();
-  const [visible, setVisible] = useState(false);
-  const [updateLoading, setUpdateLoading] = useState(false);
-  const [update_bill] = useMutation(UPDATE_BILL);
-  const [insertBillLine] = useMutation(INSERT_NEW_BILL_LINES);
-  const [updateBillLine] = useMutation(UPDATE_BILL_LINE);
 
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
@@ -67,104 +17,13 @@ export function BillDetailEditcontainer({
     sm: "100%",
     md: "100%",
     lg: "100%",
-    xl: "80%",
-    xxl: "80%",
+    xl: "90%",
+    xxl: "90%",
   };
   const drawerPercentage = selectedBreakpoint
     ? bpoints[selectedBreakpoint[0]]
     : "100%";
 
-  const { loading, error, data, refetch } = useQuery(QUERY_BILL_BY_PK, {
-    variables: { billid: search.billid },
-    skip: !!!search.billid,
-  });
-
-  const handleSave = () => {
-    //It's got a previously deducted bill line!
-    if (
-      data.bills_by_pk.billlines.filter((b) => b.deductedfromlbr).length > 0 ||
-      form.getFieldValue("billlines").filter((b) => b.deductedfromlbr).length >
-        0
-    )
-      setVisible(true);
-    else {
-      form.submit();
-    }
-  };
-
-  const handleFinish = async (values) => {
-    setUpdateLoading(true);
-    //let adjustmentsToInsert = {};
-
-    const { billlines, upload, ...bill } = values;
-    const updates = [];
-    updates.push(
-      update_bill({
-        variables: { billId: search.billid, bill: bill },
-      })
-    );
-
-    billlines.forEach((billline) => {
-      const { deductedfromlbr, ...il } = billline;
-      delete il.__typename;
-
-      if (il.id) {
-        updates.push(
-          updateBillLine({
-            variables: {
-              billLineId: il.id,
-              billLine: {
-                ...il,
-                deductedfromlbr: deductedfromlbr,
-                joblineid: il.joblineid === "noline" ? null : il.joblineid,
-              },
-            },
-          })
-        );
-      } else {
-        //It's a new line, have to insert it.
-        updates.push(
-          insertBillLine({
-            variables: {
-              billLines: [
-                {
-                  ...il,
-                  deductedfromlbr: deductedfromlbr,
-                  billid: search.billid,
-                  joblineid: il.joblineid === "noline" ? null : il.joblineid,
-                },
-              ],
-            },
-          })
-        );
-      }
-    });
-    await Promise.all(updates);
-
-    insertAuditTrail({
-      jobid: bill.jobid,
-      billid: search.billid,
-      operation: AuditTrailMapping.billupdated(bill.invoice_number),
-    });
-
-    await refetch();
-    form.setFieldsValue(transformData(data));
-    form.resetFields();
-    setVisible(false);
-    setUpdateLoading(false);
-  };
-
-  useEffect(() => {
-    if (search.billid && data) {
-      form.resetFields();
-    }
-  }, [form, search.billid, data]);
-
-  if (error) return <AlertComponent message={error.message} type="error" />;
-  if (!search.billid) return <></>; //<div>{t("bills.labels.noneselected")}</div>;
-
-  const exported = data && data.bills_by_pk && data.bills_by_pk.exported;
-
   return (
     <Drawer
       width={drawerPercentage}
@@ -172,107 +31,10 @@ export function BillDetailEditcontainer({
         delete search.billid;
         history.push({ search: queryString.stringify(search) });
       }}
+      destroyOnClose
       visible={search.billid}
     >
-      {loading && <LoadingSkeleton />}
-      {!loading && (
-        <>
-          <PageHeader
-            title={
-              data &&
-              `${data.bills_by_pk.invoice_number} - ${data.bills_by_pk.vendor.name}`
-            }
-            extra={
-              <Space>
-                <Button
-                  disabled={data.bills_by_pk.is_credit_memo}
-                  onClick={() => {
-                    delete search.billid;
-                    history.push({ search: queryString.stringify(search) });
-                    setPartsOrderContext({
-                      actions: {},
-                      context: {
-                        jobId: data.bills_by_pk.jobid,
-                        vendorId: data.bills_by_pk.vendorid,
-                        returnFromBill: data.bills_by_pk.id,
-                        invoiceNumber: data.bills_by_pk.invoice_number,
-                        linesToOrder: data.bills_by_pk.billlines.map((i) => {
-                          return {
-                            line_desc: i.line_desc,
-                            //  db_price: i.actual_price,
-                            act_price: i.actual_price,
-                            cost: i.actual_cost,
-                            quantity: i.quantity,
-                            joblineid: i.joblineid,
-                          };
-                        }),
-                        isReturn: true,
-                      },
-                    });
-                  }}
-                >
-                  {t("bills.actions.return")}
-                </Button>
-
-                <Popconfirm
-                  visible={visible}
-                  onConfirm={() => form.submit()}
-                  onCancel={() => setVisible(false)}
-                  okButtonProps={{ loading: updateLoading }}
-                  title={t("bills.labels.editadjwarning")}
-                >
-                  <Button
-                    htmlType="submit"
-                    disabled={exported}
-                    onClick={handleSave}
-                    loading={updateLoading}
-                    type="primary"
-                  >
-                    {t("general.actions.save")}
-                  </Button>
-                </Popconfirm>
-                <BillReeportButtonComponent bill={data && data.bills_by_pk} />
-              </Space>
-            }
-          />
-          <Form
-            form={form}
-            onFinish={handleFinish}
-            initialValues={transformData(data)}
-            layout="vertical"
-          >
-            <BillFormContainer form={form} billEdit disabled={exported} />
-            <JobDocumentsGallery
-              jobId={data ? data.bills_by_pk.jobid : null}
-              billId={search.billid}
-              documentsList={data ? data.bills_by_pk.documents : []}
-              billsCallback={refetch}
-            />
-          </Form>
-        </>
-      )}
+      <BillDetailEditComponent />
     </Drawer>
   );
 }
-
-const transformData = (data) => {
-  return data
-    ? {
-        ...data.bills_by_pk,
-
-        billlines: data.bills_by_pk.billlines.map((i) => {
-          return {
-            ...i,
-            joblineid: !!i.joblineid ? i.joblineid : "noline",
-            applicable_taxes: {
-              federal:
-                (i.applicable_taxes && i.applicable_taxes.federal) || false,
-              state: (i.applicable_taxes && i.applicable_taxes.state) || false,
-              local: (i.applicable_taxes && i.applicable_taxes.local) || false,
-            },
-          };
-        }),
-        date: data.bills_by_pk ? moment(data.bills_by_pk.date) : null,
-      }
-    : {};
-};

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -1,5 +1,5 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Form, Modal, notification, Space } from "antd";
+import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
 import _ from "lodash";
 import React, { useEffect, useState, useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -11,6 +11,8 @@ import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
+import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
+import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
@@ -23,6 +25,10 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
+import useLocalStorage from "../../utils/useLocalStorage";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -35,6 +41,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertAuditTrail({ jobid, operation })),
 });
 
+const Templates = TemplateList("job_special");
+
 function BillEnterModalContainer({
   billEnterModal,
   toggleModalVisible,
@@ -47,9 +55,14 @@ function BillEnterModalContainer({
   const [enterAgain, setEnterAgain] = useState(false);
   const [insertBill] = useMutation(INSERT_NEW_BILL);
   const [updateJobLines] = useMutation(UPDATE_JOB_LINE);
+  const [updatePartsOrderLines] = useMutation(MUTATION_MARK_RETURN_RECEIVED);
+  const [updateInventoryLines] = useMutation(UPDATE_INVENTORY_LINES);
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
-
+  const [generateLabel, setGenerateLabel] = useLocalStorage(
+    "enter_bill_generate_label",
+    false
+  );
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
@@ -76,7 +89,13 @@ function BillEnterModalContainer({
     }
 
     setLoading(true);
-    const { upload, location, ...remainingValues } = values;
+    const {
+      upload,
+      location,
+      outstanding_returns,
+      inventory,
+      ...remainingValues
+    } = values;
 
     let adjustmentsToInsert = {};
 
@@ -93,6 +112,7 @@ function BillEnterModalContainer({
                     deductedfromlbr,
                     lbr_adjustment,
                     location: lineLocation,
+                    part_type,
                     ...restI
                   } = i;
 
@@ -132,6 +152,14 @@ function BillEnterModalContainer({
       adjKeys.forEach((key) => {
         newAdjustments[key] =
           (newAdjustments[key] || 0) + adjustmentsToInsert[key];
+
+        insertAuditTrail({
+          jobid: values.jobid,
+          operation: AuditTrailMapping.jobmodifylbradj({
+            mod_lbr_ty: key,
+            hours: adjustmentsToInsert[key].toFixed(1),
+          }),
+        });
       });
 
       const jobUpdate = client.mutate({
@@ -149,10 +177,25 @@ function BillEnterModalContainer({
         });
         return;
       }
-      insertAuditTrail({
-        jobid: values.jobid,
-        operation: AuditTrailMapping.jobmodifylbradj(),
+    }
+
+    const markPolReceived =
+      outstanding_returns &&
+      outstanding_returns.filter((o) => o.cm_received === true);
+
+    if (markPolReceived && markPolReceived.length > 0) {
+      const r2 = await updatePartsOrderLines({
+        variables: { partsLineIds: markPolReceived.map((p) => p.id) },
       });
+      if (!!r2.errors) {
+        setLoading(false);
+        setEnterAgain(false);
+        notification["error"]({
+          message: t("parts_orders.errors.updating", {
+            message: JSON.stringify(r2.errors),
+          }),
+        });
+      }
     }
 
     if (!!r1.errors) {
@@ -166,46 +209,97 @@ function BillEnterModalContainer({
     }
 
     const billId = r1.data.insert_bills.returning[0].id;
+    const markInventoryConsumed =
+      inventory && inventory.filter((i) => i.consumefrominventory);
 
-    await Promise.all(
-      remainingValues.billlines
-        .filter((il) => il.joblineid !== "noline")
-        .map((li) => {
-          return updateJobLines({
-            variables: {
-              lineId: li.joblineid,
-              line: {
-                location: li.location || location,
-                status:
-                  bodyshop.md_order_statuses.default_received || "Received*",
+    if (markInventoryConsumed && markInventoryConsumed.length > 0) {
+      const r2 = await updateInventoryLines({
+        variables: {
+          InventoryIds: markInventoryConsumed.map((p) => p.id),
+          consumedbybillid: billId,
+        },
+      });
+      if (!!r2.errors) {
+        setLoading(false);
+        setEnterAgain(false);
+        notification["error"]({
+          message: t("inventory.errors.updating", {
+            message: JSON.stringify(r2.errors),
+          }),
+        });
+      }
+    }
+    //If it's not a credit memo, update the statuses.
+
+    if (!values.is_credit_memo) {
+      await Promise.all(
+        remainingValues.billlines
+          .filter((il) => il.joblineid !== "noline")
+          .map((li) => {
+            return updateJobLines({
+              variables: {
+                lineId: li.joblineid,
+                line: {
+                  location: li.location || location,
+                  status:
+                    bodyshop.md_order_statuses.default_received || "Received*",
+                },
               },
-            },
-          });
-        })
-    );
+            });
+          })
+      );
+    }
 
     /////////////////////////
     if (upload && upload.length > 0) {
       //insert Each of the documents?
-      upload.forEach((u) => {
-        handleUpload(
-          { file: u.originFileObj },
-          {
-            bodyshop: bodyshop,
-            uploaded_by: currentUser.email,
-            jobId: values.jobid,
-            billId: billId,
-            tagsArray: null,
-            callback: null,
-          }
-        );
-      });
+
+      if (bodyshop.uselocalmediaserver) {
+        upload.forEach((u) => {
+          handleLocalUpload({
+            ev: { file: u.originFileObj },
+            context: {
+              jobid: values.jobid,
+              invoice_number: remainingValues.invoice_number,
+              vendorid: remainingValues.vendorid,
+            },
+          });
+        });
+      } else {
+        upload.forEach((u) => {
+          handleUpload(
+            { file: u.originFileObj },
+            {
+              bodyshop: bodyshop,
+              uploaded_by: currentUser.email,
+              jobId: values.jobid,
+              billId: billId,
+              tagsArray: null,
+              callback: null,
+            }
+          );
+        });
+      }
     }
     ///////////////////////////
     setLoading(false);
     notification["success"]({
       message: t("bills.successes.created"),
     });
+
+    if (generateLabel) {
+      GenerateDocument(
+        {
+          name: Templates.parts_invoice_label_single.key,
+          variables: {
+            id: billId,
+          },
+        },
+        {},
+        "p"
+      );
+    }
+
     if (billEnterModal.actions.refetch) billEnterModal.actions.refetch();
 
     insertAuditTrail({
@@ -216,7 +310,11 @@ function BillEnterModalContainer({
 
     if (enterAgain) {
       form.resetFields();
-      form.setFieldsValue({ ...form.getFieldsValue(), billlines: [] });
+      form.resetFields();
+      form.setFieldsValue({
+        ...formValues,
+        billlines: [],
+      });
     } else {
       toggleModalVisible();
     }
@@ -245,7 +343,7 @@ function BillEnterModalContainer({
   return (
     <Modal
       title={t("bills.labels.new")}
-      width={"90%"}
+      width={"98%"}
       visible={billEnterModal.visible}
       okText={t("general.actions.save")}
       keyboard="false"
@@ -257,12 +355,23 @@ function BillEnterModalContainer({
       }}
       footer={
         <Space>
+          <Checkbox
+            checked={generateLabel}
+            onChange={(e) => setGenerateLabel(e.target.checked)}
+          >
+            {t("bills.labels.generatepartslabel")}
+          </Checkbox>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
-          <Button loading={loading} onClick={() => form.submit()}>
+          <Button
+            data-cy="bill-form-save-button"
+            loading={loading}
+            onClick={() => form.submit()}
+          >
             {t("general.actions.save")}
           </Button>
           {billEnterModal.context && billEnterModal.context.id ? null : (
             <Button
+              data-cy="bill-form-savenew-button"
               type="primary"
               loading={loading}
               onClick={() => {

client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx

@@ -0,0 +1,135 @@
+import { Form, Input, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort } from "../../utils/sorters";
+import BillFormItemsExtendedFormItem from "./bill-form-lines.extended.formitem.component";
+export default function BillFormLinesExtended({
+  lineData,
+  discount,
+  form,
+  responsibilityCenters,
+  disabled,
+}) {
+  const [search, setSearch] = useState("");
+  const { t } = useTranslation();
+  const columns = [
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      key: "line_desc",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+    },
+    {
+      title: t("joblines.fields.oem_partno"),
+      dataIndex: "oem_partno",
+      key: "oem_partno",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
+    },
+    {
+      title: t("joblines.fields.part_type"),
+      dataIndex: "part_type",
+      key: "part_type",
+      width: "10%",
+      filters: [
+        {
+          text: t("jobs.labels.partsfilter"),
+          value: ["PAN", "PAP", "PAL", "PAA", "PAS", "PASL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAN"),
+          value: ["PAN", "PAP"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAL"),
+          value: ["PAL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAA"),
+          value: ["PAA"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAS"),
+          value: ["PAS", "PASL"],
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.part_type),
+      render: (text, record) =>
+        record.part_type
+          ? t(`joblines.fields.part_types.${record.part_type}`)
+          : null,
+    },
+
+    {
+      title: t("joblines.fields.act_price"),
+      dataIndex: "act_price",
+      key: "act_price",
+      width: "10%",
+      sorter: (a, b) => a.act_price - b.act_price,
+      shouldCellUpdate: false,
+      render: (text, record) => (
+        <>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
+          {record.part_qty ? `(x ${record.part_qty})` : null}
+          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
+            <span
+              style={{ marginLeft: ".2rem" }}
+            >{`(${record.prt_dsmk_p}%)`}</span>
+          ) : (
+            <></>
+          )}
+        </>
+      ),
+    },
+    {
+      title: t("billlines.fields.posting"),
+      dataIndex: "posting",
+      key: "posting",
+
+      render: (text, record, index) => (
+        <Form.Item noStyle name={["billlineskeys", record.id]}>
+          <BillFormItemsExtendedFormItem
+            form={form}
+            record={record}
+            index={index}
+            responsibilityCenters={responsibilityCenters}
+            discount={discount}
+          />
+        </Form.Item>
+      ),
+    },
+  ];
+
+  const data =
+    search === ""
+      ? lineData
+      : lineData.filter(
+          (l) =>
+            (l.line_desc &&
+              l.line_desc.toLowerCase().includes(search.toLowerCase())) ||
+            (l.oem_partno &&
+              l.oem_partno.toLowerCase().includes(search.toLowerCase())) ||
+            (l.act_price &&
+              l.act_price.toString().startsWith(search.toString()))
+        );
+
+  return (
+    <Form.Item noStyle name="billlineskeys">
+      <button onClick={() => console.log(form.getFieldsValue())}>form</button>
+      <Input onChange={(e) => setSearch(e.target.value)} allowClear />
+      <Table
+        pagination={false}
+        size="small"
+        columns={columns}
+        rowKey="id"
+        dataSource={data}
+      />
+    </Form.Item>
+  );
+}

client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx

@@ -0,0 +1,288 @@
+import React from "react";
+import {
+  PlusCircleFilled,
+  MinusCircleFilled,
+  WarningOutlined,
+} from "@ant-design/icons";
+import { Form, Button, InputNumber, Input, Select, Switch, Space } from "antd";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import CiecaSelect from "../../utils/Ciecaselect";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillFormItemsExtendedFormItem);
+
+export function BillFormItemsExtendedFormItem({
+  value,
+  bodyshop,
+  form,
+  record,
+  index,
+  disabled,
+  responsibilityCenters,
+  discount,
+}) {
+  // const { billlineskeys } = form.getFieldsValue("billlineskeys");
+
+  const { t } = useTranslation();
+  if (!value)
+    return (
+      <Button
+        onClick={() => {
+          const values = form.getFieldsValue("billlineskeys");
+
+          form.setFieldsValue({
+            ...values,
+            billlineskeys: {
+              ...(values.billlineskeys || {}),
+              [record.id]: {
+                joblineid: record.id,
+                line_desc: record.line_desc,
+                quantity: record.part_qty || 1,
+                actual_price: record.act_price,
+                cost_center: record.part_type
+                  ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
+                    ? record.part_type
+                    : responsibilityCenters.defaults &&
+                      (responsibilityCenters.defaults.costs[record.part_type] ||
+                        null)
+                  : null,
+              },
+            },
+          });
+        }}
+      >
+        <PlusCircleFilled />
+      </Button>
+    );
+
+  return (
+    <Space wrap>
+      <Form.Item
+        label={t("billlines.fields.line_desc")}
+        name={["billlineskeys", record.id, "line_desc"]}
+      >
+        <Input disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.quantity")}
+        name={["billlineskeys", record.id, "quantity"]}
+      >
+        <InputNumber precision={0} min={0} disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.actual_price")}
+        name={["billlineskeys", record.id, "actual_price"]}
+      >
+        <CurrencyInput
+          min={0}
+          disabled={disabled}
+          onBlur={(e) => {
+            const { billlineskeys } = form.getFieldsValue("billlineskeys");
+            form.setFieldsValue({
+              billlineskeys: {
+                ...billlineskeys,
+                [record.id]: {
+                  ...billlineskeys[billlineskeys],
+                  actual_cost: !!billlineskeys[billlineskeys].actual_cost
+                    ? billlineskeys[billlineskeys].actual_cost
+                    : Math.round(
+                        (parseFloat(e.target.value) * (1 - discount) +
+                          Number.EPSILON) *
+                          100
+                      ) / 100,
+                },
+              },
+            });
+          }}
+        />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.actual_cost")}
+        name={["billlineskeys", record.id, "actual_cost"]}
+      >
+        <CurrencyInput min={0} disabled={disabled} />
+      </Form.Item>
+      <Form.Item shouldUpdate>
+        {() => {
+          const line = value;
+          if (!!!line) return null;
+          const lineDiscount = (
+            1 -
+            Math.round((line.actual_cost / line.actual_price) * 100) / 100
+          ).toPrecision(2);
+
+          if (lineDiscount - discount === 0) return <div />;
+          return <WarningOutlined style={{ color: "red" }} />;
+        }}
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.cost_center")}
+        name={["billlineskeys", record.id, "cost_center"]}
+      >
+        <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
+          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+            ? CiecaSelect(true, false)
+            : responsibilityCenters.costs.map((item) => (
+                <Select.Option key={item.name}>{item.name}</Select.Option>
+              ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.location")}
+        name={["billlineskeys", record.id, "location"]}
+      >
+        <Select disabled={disabled}>
+          {bodyshop.md_parts_locations.map((loc, idx) => (
+            <Select.Option key={idx} value={loc}>
+              {loc}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.deductedfromlbr")}
+        name={["billlineskeys", record.id, "deductedfromlbr"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item shouldUpdate style={{ display: "inline-block" }}>
+        {() => {
+          if (
+            form.getFieldsValue("billlineskeys").billlineskeys[record.id]
+              .deductedfromlbr
+          )
+            return (
+              <div>
+                <Form.Item
+                  label={t("joblines.fields.mod_lbr_ty")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                  name={[
+                    "billlineskeys",
+                    record.id,
+                    "lbr_adjustment",
+                    "mod_lbr_ty",
+                  ]}
+                >
+                  <Select allowClear>
+                    <Select.Option value="LAA">
+                      {t("joblines.fields.lbr_types.LAA")}
+                    </Select.Option>
+                    <Select.Option value="LAB">
+                      {t("joblines.fields.lbr_types.LAB")}
+                    </Select.Option>
+                    <Select.Option value="LAD">
+                      {t("joblines.fields.lbr_types.LAD")}
+                    </Select.Option>
+                    <Select.Option value="LAE">
+                      {t("joblines.fields.lbr_types.LAE")}
+                    </Select.Option>
+                    <Select.Option value="LAF">
+                      {t("joblines.fields.lbr_types.LAF")}
+                    </Select.Option>
+                    <Select.Option value="LAG">
+                      {t("joblines.fields.lbr_types.LAG")}
+                    </Select.Option>
+                    <Select.Option value="LAM">
+                      {t("joblines.fields.lbr_types.LAM")}
+                    </Select.Option>
+                    <Select.Option value="LAR">
+                      {t("joblines.fields.lbr_types.LAR")}
+                    </Select.Option>
+                    <Select.Option value="LAS">
+                      {t("joblines.fields.lbr_types.LAS")}
+                    </Select.Option>
+                    <Select.Option value="LAU">
+                      {t("joblines.fields.lbr_types.LAU")}
+                    </Select.Option>
+                    <Select.Option value="LA1">
+                      {t("joblines.fields.lbr_types.LA1")}
+                    </Select.Option>
+                    <Select.Option value="LA2">
+                      {t("joblines.fields.lbr_types.LA2")}
+                    </Select.Option>
+                    <Select.Option value="LA3">
+                      {t("joblines.fields.lbr_types.LA3")}
+                    </Select.Option>
+                    <Select.Option value="LA4">
+                      {t("joblines.fields.lbr_types.LA4")}
+                    </Select.Option>
+                  </Select>
+                </Form.Item>
+                <Form.Item
+                  label={t("jobs.labels.adjustmentrate")}
+                  name={["billlineskeys", record.id, "lbr_adjustment", "rate"]}
+                  initialValue={bodyshop.default_adjustment_rate}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <InputNumber precision={2} min={0.01} />
+                </Form.Item>
+              </div>
+            );
+          return <></>;
+        }}
+      </Form.Item>
+
+      <Form.Item
+        label={t("billlines.fields.federal_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "federal"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.state_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "state"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.local_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "local"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+
+      <Button
+        onClick={() => {
+          const values = form.getFieldsValue("billlineskeys");
+
+          form.setFieldsValue({
+            ...values,
+            billlineskeys: {
+              ...(values.billlineskeys || {}),
+              [record.id]: null,
+            },
+          });
+        }}
+      >
+        <MinusCircleFilled />
+      </Button>
+    </Space>
+  );
+}

client/src/components/bill-form/bill-form.component.jsx

@@ -28,6 +28,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -45,13 +47,29 @@ export function BillFormComponent({
   billEdit,
   disableInvNumber,
   job,
+  loadOutstandingReturns,
+  loadInventory,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
   const [discount, setDiscount] = useState(0);
+  const { Extended_Bill_Posting } = useTreatments(
+    ["Extended_Bill_Posting"],
+    {},
+    bodyshop.imexshopid
+  );
 
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
+
+    opt &&
+      !billEdit &&
+      loadOutstandingReturns({
+        variables: {
+          jobId: form.getFieldValue("jobid"),
+          vendorId: opt.value,
+        },
+      });
   };
 
   useEffect(() => {
@@ -59,8 +77,8 @@ export function BillFormComponent({
   }, [job, form]);
 
   useEffect(() => {
-    if (form.getFieldValue("vendorid") && vendorAutoCompleteOptions) {
-      const vendorId = form.getFieldValue("vendorid");
+    const vendorId = form.getFieldValue("vendorid");
+    if (vendorId && vendorAutoCompleteOptions) {
       const matchingVendors = vendorAutoCompleteOptions.filter(
         (v) => v.id === vendorId
       );
@@ -68,10 +86,32 @@ export function BillFormComponent({
         setDiscount(matchingVendors[0].discount);
       }
     }
-    if (form.getFieldValue("jobid")) {
-      loadLines({ variables: { id: form.getFieldValue("jobid") } });
+    const jobId = form.getFieldValue("jobid");
+    if (jobId) {
+      loadLines({ variables: { id: jobId } });
+      if (form.getFieldValue("is_credit_memo") && vendorId && !billEdit) {
+        loadOutstandingReturns({
+          variables: {
+            jobId: jobId,
+            vendorId: vendorId,
+          },
+        });
+      }
     }
-  }, [form, setDiscount, vendorAutoCompleteOptions, loadLines]);
+
+    if (vendorId === bodyshop.inhousevendorid && !billEdit) {
+      loadInventory();
+    }
+  }, [
+    form,
+    billEdit,
+    loadOutstandingReturns,
+    loadInventory,
+    setDiscount,
+    vendorAutoCompleteOptions,
+    loadLines,
+    bodyshop.inhousevendorid,
+  ]);
 
   return (
     <div>
@@ -101,6 +141,14 @@ export function BillFormComponent({
             onBlur={() => {
               if (form.getFieldValue("jobid") !== null) {
                 loadLines({ variables: { id: form.getFieldValue("jobid") } });
+                if (form.getFieldValue("vendorid") !== null) {
+                  loadOutstandingReturns({
+                    variables: {
+                      jobId: form.getFieldValue("jobid"),
+                      vendorId: form.getFieldValue("vendorid"),
+                    },
+                  });
+                }
               }
             }}
           />
@@ -108,7 +156,7 @@ export function BillFormComponent({
         <Form.Item
           label={t("bills.fields.vendor")}
           name="vendorid"
-          style={{ display: billEdit ? "none" : null }}
+          // style={{ display: billEdit ? "none" : null }}
           rules={[
             {
               required: true,
@@ -129,6 +177,7 @@ export function BillFormComponent({
           ]}
         >
           <VendorSearchSelect
+            className="ant-select-bill-vendor"
             disabled={disabled}
             options={vendorAutoCompleteOptions}
             onSelect={handleVendorSelect}
@@ -201,7 +250,10 @@ export function BillFormComponent({
             }),
           ]}
         >
-          <Input disabled={disabled || disableInvNumber} />
+          <Input
+            data-cy="bill-form-invoice"
+            disabled={disabled || disableInvNumber}
+          />
         </Form.Item>
         <Form.Item
           label={t("bills.fields.date")}
@@ -213,7 +265,7 @@ export function BillFormComponent({
             },
           ]}
         >
-          <FormDatePicker disabled={disabled} />
+          <FormDatePicker id="bill-form-date" disabled={disabled} />
         </Form.Item>
         <Form.Item
           label={t("bills.fields.is_credit_memo")}
@@ -223,6 +275,22 @@ export function BillFormComponent({
             ({ getFieldValue }) => ({
               validator(rule, value) {
                 if (
+                  value === true &&
+                  getFieldValue("jobid") &&
+                  getFieldValue("vendorid")
+                ) {
+                  //Removed as this would cause an additional reload when validating the form on submit and clear the values.
+                  // loadOutstandingReturns({
+                  //   variables: {
+                  //     jobId: form.getFieldValue("jobid"),
+                  //     vendorId: form.getFieldValue("vendorid"),
+                  //   },
+                  // });
+                }
+
+                if (
+                  !bodyshop.bill_allow_post_to_closed &&
+                  job &&
                   (job.status === bodyshop.md_ro_statuses.default_invoiced ||
                     job.status === bodyshop.md_ro_statuses.default_exported ||
                     job.status === bodyshop.md_ro_statuses.default_void) &&
@@ -236,9 +304,10 @@ export function BillFormComponent({
             }),
           ]}
         >
-          <Switch />
+          <Switch data-cy="is-credit-memo-switch" />
         </Form.Item>
         <Form.Item
+          data-cy="bill-form-bill-total"
           label={t("bills.fields.total")}
           name="total"
           rules={[
@@ -250,15 +319,22 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} disabled={disabled} />
         </Form.Item>
-        <Form.Item label={t("bills.fields.allpartslocation")} name="location">
-          <Select style={{ width: "10rem" }} disabled={disabled} allowClear>
-            {bodyshop.md_parts_locations.map((loc, idx) => (
-              <Select.Option key={idx} value={loc}>
-                {loc}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
+        {!billEdit && (
+          <Form.Item label={t("bills.fields.allpartslocation")} name="location">
+            <Select
+              data-cy="bill-form-parts-bin"
+              style={{ width: "10rem" }}
+              disabled={disabled}
+              allowClear
+            >
+              {bodyshop.md_parts_locations.map((loc, idx) => (
+                <Select.Option key={idx} value={loc}>
+                  {loc}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+        )}
       </LayoutFormRow>
       <LayoutFormRow>
         <Form.Item
@@ -309,17 +385,29 @@ export function BillFormComponent({
                     />
                     <Statistic
                       title={t("bills.labels.federal_tax")}
-                      value={totals.federalTax.toFormat()}
+                      valueRender={() => (
+                        <span data-cy="bill-form-tax">
+                          {totals.federalTax.toFormat()}
+                        </span>
+                      )}
                       precision={2}
                     />
                     <Statistic
                       title={t("bills.labels.state_tax")}
-                      value={totals.stateTax.toFormat()}
+                      valueRender={() => (
+                        <span data-cy="bill-form-tax">
+                          {totals.stateTax.toFormat()}
+                        </span>
+                      )}
                       precision={2}
                     />
                     <Statistic
                       title={t("bills.labels.local_tax")}
-                      value={totals.localTax.toFormat()}
+                      valueRender={() => (
+                        <span data-cy="bill-form-tax">
+                          {totals.localTax.toFormat()}
+                        </span>
+                      )}
                       precision={2}
                     />
                     <Statistic
@@ -340,7 +428,12 @@ export function BillFormComponent({
                             ? "green"
                             : "red",
                       }}
-                      value={totals.discrepancy.toFormat()}
+                      // value={totals.discrepancy.toFormat()}
+                      valueRender={() => (
+                        <span id="bill-form-discrepancy">
+                          {totals.discrepancy.toFormat()}
+                        </span>
+                      )}
                       precision={2}
                     />
                   </Space>
@@ -357,13 +450,25 @@ export function BillFormComponent({
         </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bills.labels.bill_lines")}</Divider>
-      <BillFormLines
-        lineData={lineData}
-        discount={discount}
-        form={form}
-        responsibilityCenters={responsibilityCenters}
-        disabled={disabled}
-      />
+
+      {Extended_Bill_Posting.treatment === "on" ? (
+        <BillFormLinesExtended
+          lineData={lineData}
+          discount={discount}
+          form={form}
+          responsibilityCenters={responsibilityCenters}
+          disabled={disabled}
+        />
+      ) : (
+        <BillFormLines
+          lineData={lineData}
+          discount={discount}
+          form={form}
+          responsibilityCenters={responsibilityCenters}
+          disabled={disabled}
+          billEdit={billEdit}
+        />
+      )}
 
       <Form.Item
         name="upload"
@@ -378,19 +483,20 @@ export function BillFormComponent({
         }}
       >
         <Upload.Dragger
+          id="bill-image-upload"
           multiple={true}
           name="logo"
           beforeUpload={() => false}
           listType="picture"
         >
-          <>
+          <div>
             <p className="ant-upload-drag-icon">
               <UploadOutlined />
             </p>
             <p className="ant-upload-text">
               Click or drag files to this area to upload.
             </p>
-          </>
+          </div>
         </Upload.Dragger>
       </Form.Item>
     </div>

client/src/components/bill-form/bill-form.container.jsx

@@ -6,6 +6,11 @@ import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import BillFormComponent from "./bill-form.component";
+import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
+import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
+import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
+import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -18,26 +23,59 @@ export function BillFormContainer({
   disabled,
   disableInvNumber,
 }) {
-  const { data: VendorAutoCompleteData } = useQuery(SEARCH_VENDOR_AUTOCOMPLETE);
+  const { Simple_Inventory } = useTreatments(
+    ["Simple_Inventory"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
+  const { data: VendorAutoCompleteData } = useQuery(
+    SEARCH_VENDOR_AUTOCOMPLETE,
+    { fetchPolicy: "network-only", nextFetchPolicy: "network-only" }
+  );
 
   const [loadLines, { data: lineData }] = useLazyQuery(
     GET_JOB_LINES_TO_ENTER_BILL
   );
 
+  const [loadOutstandingReturns, { loading: returnLoading, data: returnData }] =
+    useLazyQuery(QUERY_UNRECEIVED_LINES);
+  const [loadInventory, { loading: inventoryLoading, data: inventoryData }] =
+    useLazyQuery(QUERY_OUTSTANDING_INVENTORY);
+
   return (
-    <BillFormComponent
-      disabled={disabled}
-      form={form}
-      billEdit={billEdit}
-      vendorAutoCompleteOptions={
-        VendorAutoCompleteData && VendorAutoCompleteData.vendors
-      }
-      loadLines={loadLines}
-      lineData={lineData ? lineData.joblines : []}
-      job={lineData ? lineData.jobs_by_pk : null}
-      responsibilityCenters={bodyshop.md_responsibility_centers || null}
-      disableInvNumber={disableInvNumber}
-    />
+    <>
+      <BillFormComponent
+        disabled={disabled}
+        form={form}
+        billEdit={billEdit}
+        vendorAutoCompleteOptions={
+          VendorAutoCompleteData && VendorAutoCompleteData.vendors
+        }
+        loadLines={loadLines}
+        lineData={lineData ? lineData.joblines : []}
+        job={lineData ? lineData.jobs_by_pk : null}
+        responsibilityCenters={bodyshop.md_responsibility_centers || null}
+        disableInvNumber={disableInvNumber}
+        loadOutstandingReturns={loadOutstandingReturns}
+        loadInventory={loadInventory}
+      />
+      {!billEdit && (
+        <BillCmdReturnsTableComponent
+          form={form}
+          returnLoading={returnLoading}
+          returnData={returnData}
+        />
+      )}
+      {Simple_Inventory.treatment === "on" && (
+        <BillInventoryTable
+          form={form}
+          inventoryLoading={inventoryLoading}
+          inventoryData={billEdit ? [] : inventoryData}
+          billEdit={billEdit}
+        />
+      )}
+    </>
   );
 }
 export default connect(mapStateToProps, null)(BillFormContainer);

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -1,4 +1,5 @@
-import { DeleteFilled, WarningOutlined } from "@ant-design/icons";
+import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
   Form,
@@ -7,7 +8,8 @@ import {
   Select,
   Space,
   Switch,
-  Table
+  Table,
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -16,6 +18,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
 import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
+import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -33,17 +36,23 @@ export function BillEnterModalLinesComponent({
   discount,
   form,
   responsibilityCenters,
+  billEdit,
+  billid,
 }) {
   const { t } = useTranslation();
   const { setFieldsValue, getFieldsValue, getFieldValue } = form;
-
+  const { Simple_Inventory } = useTreatments(
+    ["Simple_Inventory"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
   const columns = (remove) => {
     return [
       {
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-
+        width: "20rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}joblinename`,
@@ -57,11 +66,25 @@ export function BillEnterModalLinesComponent({
             ],
           };
         },
+        wrapper: (props) => (
+          <Form.Item
+            noStyle
+            shouldUpdate={(prev, cur) =>
+              prev.is_credit_memo !== cur.is_credit_memo
+            }
+          >
+            {() => {
+              return props.children;
+            }}
+          </Form.Item>
+        ),
         formInput: (record, index) => (
           <BillLineSearchSelect
+            className="ant-select-bill-line"
             disabled={disabled}
             options={lineData}
             style={{ width: "100%", minWidth: "10rem" }}
+            allowRemoved={form.getFieldValue("is_credit_memo") || false}
             onSelect={(value, opt) => {
               setFieldsValue({
                 billlines: getFieldsValue(["billlines"]).billlines.map(
@@ -74,7 +97,9 @@ export function BillEnterModalLinesComponent({
                         actual_price: opt.cost,
                         cost_center: opt.part_type
                           ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
-                            ? opt.part_type
+                            ? opt.part_type !== "PAE"
+                              ? opt.part_type
+                              : null
                             : responsibilityCenters.defaults &&
                               (responsibilityCenters.defaults.costs[
                                 opt.part_type
@@ -109,7 +134,9 @@ export function BillEnterModalLinesComponent({
             ],
           };
         },
-        formInput: (record, index) => <Input disabled={disabled} />,
+        formInput: (record, index) => (
+          <Input data-cy="bill-line-line-desc" disabled={disabled} />
+        ),
       },
       {
         title: t("billlines.fields.quantity"),
@@ -126,11 +153,29 @@ export function BillEnterModalLinesComponent({
                 required: true,
                 //message: t("general.validation.required"),
               },
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (
+                    value &&
+                    getFieldValue("billlines")[field.fieldKey]?.inventories
+                      ?.length > value
+                  ) {
+                    return Promise.reject(
+                      t("bills.validation.inventoryquantity", {
+                        number:
+                          getFieldValue("billlines")[field.fieldKey]
+                            ?.inventories?.length,
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                },
+              }),
             ],
           };
         },
         formInput: (record, index) => (
-          <InputNumber precision={0} min={0} disabled={disabled} />
+          <InputNumber precision={0} min={1} disabled={disabled} />
         ),
       },
       {
@@ -153,6 +198,7 @@ export function BillEnterModalLinesComponent({
         },
         formInput: (record, index) => (
           <CurrencyInput
+            data-cy="bill-line-actual-price"
             min={0}
             disabled={disabled}
             onBlur={(e) => {
@@ -199,23 +245,59 @@ export function BillEnterModalLinesComponent({
           };
         },
         formInput: (record, index) => (
-          <CurrencyInput min={0} disabled={disabled} />
+          <CurrencyInput
+            data-cy="bill-line-actual-cost"
+            min={0}
+            disabled={disabled}
+            controls={false}
+            addonAfter={
+              <Form.Item shouldUpdate noStyle>
+                {() => {
+                  const line = getFieldsValue(["billlines"]).billlines[index];
+                  if (!!!line) return null;
+                  let lineDiscount = 1 - line.actual_cost / line.actual_price;
+                  if (isNaN(lineDiscount)) lineDiscount = 0;
+                  return (
+                    <Tooltip title={`${(lineDiscount * 100).toFixed(2) || 0}%`}>
+                      <DollarCircleFilled
+                        style={{
+                          color:
+                            Math.abs(lineDiscount - discount) > 0.005
+                              ? lineDiscount > discount
+                                ? "orange"
+                                : "red"
+                              : "green",
+                        }}
+                      />
+                    </Tooltip>
+                  );
+                }}
+              </Form.Item>
+            }
+          />
         ),
-        additional: (record, index) => (
-          <Form.Item shouldUpdate>
-            {() => {
-              const line = getFieldsValue(["billlines"]).billlines[index];
-              if (!!!line) return null;
-              const lineDiscount = (
-                1 -
-                Math.round((line.actual_cost / line.actual_price) * 100) / 100
-              ).toPrecision(2);
+        // additional: (record, index) => (
+        //   <Form.Item shouldUpdate>
+        //     {() => {
+        //       const line = getFieldsValue(["billlines"]).billlines[index];
+        //       if (!!!line) return null;
+        //       const lineDiscount = (
+        //         1 -
+        //         Math.round((line.actual_cost / line.actual_price) * 100) / 100
+        //       ).toPrecision(2);
 
-              if (lineDiscount - discount === 0) return <div />;
-              return <WarningOutlined style={{ color: "red" }} />;
-            }}
-          </Form.Item>
-        ),
+        //       return (
+        //         <Tooltip title={`${(lineDiscount * 100).toFixed(0) || 0}%`}>
+        //           <DollarCircleFilled
+        //             style={{
+        //               color: lineDiscount - discount !== 0 ? "red" : "green",
+        //             }}
+        //           />
+        //         </Tooltip>
+        //       );
+        //     }}
+        //   </Form.Item>
+        // ),
       },
       {
         title: t("billlines.fields.cost_center"),
@@ -237,7 +319,12 @@ export function BillEnterModalLinesComponent({
           };
         },
         formInput: (record, index) => (
-          <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
+          <Select
+            showSearch
+            style={{ minWidth: "3rem" }}
+            disabled={disabled}
+            className="ant-select-bill-cost-center"
+          >
             {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
               ? CiecaSelect(true, false)
               : responsibilityCenters.costs.map((item) => (
@@ -246,28 +333,31 @@ export function BillEnterModalLinesComponent({
           </Select>
         ),
       },
-
-      {
-        title: t("billlines.fields.location"),
-        dataIndex: "location",
-        editable: true,
-        label: t("billlines.fields.location"),
-        formItemProps: (field) => {
-          return {
-            key: `${field.index}location`,
-            name: [field.name, "location"],
-          };
-        },
-        formInput: (record, index) => (
-          <Select disabled={disabled}>
-            {bodyshop.md_parts_locations.map((loc, idx) => (
-              <Select.Option key={idx} value={loc}>
-                {loc}
-              </Select.Option>
-            ))}
-          </Select>
-        ),
-      },
+      ...(billEdit
+        ? []
+        : [
+            {
+              title: t("billlines.fields.location"),
+              dataIndex: "location",
+              editable: true,
+              label: t("billlines.fields.location"),
+              formItemProps: (field) => {
+                return {
+                  key: `${field.index}location`,
+                  name: [field.name, "location"],
+                };
+              },
+              formInput: (record, index) => (
+                <Select disabled={disabled}>
+                  {bodyshop.md_parts_locations.map((loc, idx) => (
+                    <Select.Option key={idx} value={loc}>
+                      {loc}
+                    </Select.Option>
+                  ))}
+                </Select>
+              ),
+            },
+          ]),
       {
         title: t("billlines.labels.deductedfromlbr"),
         dataIndex: "deductedfromlbr",
@@ -283,6 +373,19 @@ export function BillEnterModalLinesComponent({
         additional: (record, index) => (
           <Form.Item shouldUpdate style={{ display: "inline-block" }}>
             {() => {
+              const price = getFieldValue([
+                "billlines",
+                record.name,
+                "actual_price",
+              ]);
+
+              const adjustmentRate = getFieldValue([
+                "billlines",
+                record.name,
+                "lbr_adjustment",
+                "rate",
+              ]);
+
               if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                 return (
                   <div>
@@ -355,6 +458,9 @@ export function BillEnterModalLinesComponent({
                     >
                       <InputNumber precision={2} min={0.01} />
                     </Form.Item>
+                    {price &&
+                      adjustmentRate &&
+                      `${(price / adjustmentRate).toFixed(1)} hrs`}
                   </div>
                 );
               return <></>;
@@ -410,9 +516,33 @@ export function BillEnterModalLinesComponent({
 
         dataIndex: "actions",
         render: (text, record) => (
-          <Button disabled={disabled} onClick={() => remove(record.name)}>
-            <DeleteFilled />
-          </Button>
+          <Form.Item shouldUpdate noStyle>
+            {() => (
+              <Space wrap>
+                <Button
+                  disabled={
+                    disabled ||
+                    getFieldValue("billlines")[record.fieldKey]?.inventories
+                      ?.length > 0
+                  }
+                  onClick={() => remove(record.name)}
+                >
+                  <DeleteFilled />
+                </Button>
+                {Simple_Inventory.treatment === "on" && (
+                  <BilllineAddInventory
+                    disabled={
+                      !billEdit ||
+                      form.isFieldsTouched() ||
+                      form.getFieldValue("is_credit_memo")
+                    }
+                    billline={getFieldValue("billlines")[record.fieldKey]}
+                    jobid={getFieldValue("jobid")}
+                  />
+                )}
+              </Space>
+            )}
+          </Form.Item>
         ),
       },
     ];
@@ -435,11 +565,25 @@ export function BillEnterModalLinesComponent({
     });
 
   return (
-    <Form.List name="billlines">
+    <Form.List
+      name="billlines"
+      rules={[
+        {
+          validator: async (_, billlines) => {
+            if (!billlines || billlines.length < 1) {
+              return Promise.reject(
+                new Error(t("billlines.validation.atleastone"))
+              );
+            }
+          },
+        },
+      ]}
+    >
       {(fields, { add, remove, move }) => {
         return (
           <>
             <Table
+              data-cy="bill-line-table"
               components={{
                 body: {
                   cell: EditableCell,
@@ -455,6 +599,7 @@ export function BillEnterModalLinesComponent({
             />
             <Form.Item>
               <Button
+                data-cy="bill-line-add-button"
                 disabled={disabled}
                 onClick={() => {
                   add();
@@ -486,6 +631,7 @@ const EditableCell = ({
   formInput,
   formItemProps,
   additional,
+  wrapper,
   ...restProps
 }) => {
   if (additional)
@@ -503,7 +649,20 @@ const EditableCell = ({
         </Space>
       </td>
     );
-
+  if (wrapper)
+    return (
+      <wrapper>
+        <td {...restProps}>
+          <Form.Item
+            labelCol={{ span: 0 }}
+            name={dataIndex}
+            {...(formItemProps && formItemProps(record))}
+          >
+            {(formInput && formInput(record, record.name)) || children}
+          </Form.Item>
+        </td>
+      </wrapper>
+    );
   return (
     <td {...restProps}>
       <Form.Item

client/src/components/bill-inventory-table/bill-inventory-table.component.jsx

@@ -0,0 +1,173 @@
+import { Checkbox, Form, Skeleton, Typography } from "antd";
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
+import "./bill-inventory-table.styles.scss";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  billEnterModal: selectBillEnterModal,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(BillInventoryTable);
+
+export function BillInventoryTable({
+  billEnterModal,
+  bodyshop,
+  form,
+  billEdit,
+  inventoryLoading,
+  inventoryData,
+}) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (inventoryData && inventoryData.inventory) {
+      form.setFieldsValue({
+        inventory: billEnterModal.context.consumeinventoryid
+          ? inventoryData.inventory.map((i) => {
+              if (i.id === billEnterModal.context.consumeinventoryid)
+                i.consumefrominventory = true;
+              return i;
+            })
+          : inventoryData.inventory,
+      });
+    }
+  }, [inventoryData, form, billEnterModal.context.consumeinventoryid]);
+
+  return (
+    <Form.Item
+      shouldUpdate={(prev, cur) => prev.vendorid !== cur.vendorid}
+      noStyle
+    >
+      {() => {
+        const is_inhouse =
+          form.getFieldValue("vendorid") === bodyshop.inhousevendorid;
+
+        if (!is_inhouse || billEdit) {
+          return null;
+        }
+
+        if (inventoryLoading) return <Skeleton />;
+
+        return (
+          <Form.List name="inventory">
+            {(fields, { add, remove, move }) => {
+              return (
+                <>
+                  <Typography.Title level={4}>
+                    {t("inventory.labels.inventory")}
+                  </Typography.Title>
+                  <table className="bill-inventory-table">
+                    <thead>
+                      <tr>
+                        <th>{t("billlines.fields.line_desc")}</th>
+                        <th>{t("vendors.fields.name")}</th>
+                        <th>{t("billlines.fields.quantity")}</th>
+                        <th>{t("billlines.fields.actual_price")}</th>
+                        <th>{t("billlines.fields.actual_cost")}</th>
+                        <th>{t("inventory.fields.comment")}</th>
+                        <th>{t("inventory.actions.consumefrominventory")}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {fields.map((field, index) => (
+                        <tr key={field.key}>
+                          <td>
+                            <Form.Item
+                              //   label={t("joblines.fields.line_desc")}
+                              key={`${index}line_desc`}
+                              name={[field.name, "line_desc"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}part_type`}
+                              name={[
+                                field.name,
+                                "billline",
+                                "bill",
+                                "vendor",
+                                "name",
+                              ]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}quantity`}
+                              name={[field.name, "quantity"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}act_price`}
+                              name={[field.name, "actual_price"]}
+                            >
+                              <ReadOnlyFormItemComponent type="currency" />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}cost`}
+                              name={[field.name, "actual_cost"]}
+                            >
+                              <ReadOnlyFormItemComponent type="currency" />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}comment`}
+                              name={[field.name, "comment"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}consumefrominventory`}
+                              name={[field.name, "consumefrominventory"]}
+                              valuePropName="checked"
+                            >
+                              <Checkbox />
+                            </Form.Item>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
+                </>
+              );
+            }}
+          </Form.List>
+        );
+      }}
+    </Form.Item>
+  );
+}

client/src/components/bill-inventory-table/bill-inventory-table.styles.scss

@@ -0,0 +1,19 @@
+.bill-inventory-table {
+    table-layout: fixed;
+    width: 100%;
+
+    th,
+    td {
+        padding: 8px;
+        text-align: left;
+        border-bottom: 1px solid #ddd;
+
+        .ant-form-item {
+            margin-bottom: 0px !important;
+        }
+    }
+
+    tr:hover {
+        background-color: #f5f5f5;
+    }
+}

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -4,7 +4,10 @@ import { useTranslation } from "react-i18next";
 
 //To be used as a form element only.
 const { Option } = Select;
-const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
+const BillLineSearchSelect = (
+  { options, disabled, allowRemoved, ...restProps },
+  ref
+) => {
   const { t } = useTranslation();
 
   return (
@@ -12,6 +15,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       disabled={disabled}
       ref={ref}
       showSearch
+      dropdownMatchSelectWidth={false}
       //  optionFilterProp="line_desc"
       filterOption={(inputValue, option) => {
         return (
@@ -20,7 +24,15 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
               .toLowerCase()
               .includes(inputValue.toLowerCase())) ||
           (option.oem_partno &&
-            option.oem_partno.toLowerCase().includes(inputValue.toLowerCase()))
+            option.oem_partno
+              .toLowerCase()
+              .includes(inputValue.toLowerCase())) ||
+          (option.alt_partno &&
+            option.alt_partno
+              .toLowerCase()
+              .includes(inputValue.toLowerCase())) ||
+          (option.act_price &&
+            option.act_price.toString().startsWith(inputValue.toString()))
         );
       }}
       notFoundContent={"Removed."}
@@ -32,7 +44,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       {options
         ? options.map((item) => (
             <Option
-              disabled={item.removed}
+              disabled={allowRemoved ? false : item.removed}
               key={item.id}
               value={item.id}
               cost={item.act_price ? item.act_price : 0}
@@ -40,13 +52,22 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
               line_desc={item.line_desc}
               part_qty={item.part_qty}
               oem_partno={item.oem_partno}
+              alt_partno={item.alt_partno}
+              act_price={item.act_price}
               style={{
                 ...(item.removed ? { textDecoration: "line-through" } : {}),
               }}
             >
-              {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-                item.oem_partno ? ` - ${item.oem_partno}` : ""
-              }`}
+              <span>
+                {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+                  item.oem_partno ? ` - ${item.oem_partno}` : ""
+                }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
+              </span>
+              <span style={{ float: "right", paddingleft: "1rem" }}>
+                {item.act_price
+                  ? `$${item.act_price && item.act_price.toFixed(2)}`
+                  : ``}
+              </span>
             </Option>
           ))
         : null}

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -0,0 +1,107 @@
+import { useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import { gql } from "@apollo/client";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  authLevel: selectAuthLevel,
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillMarkExportedButton);
+
+export function BillMarkExportedButton({
+  currentUser,
+  bodyshop,
+  authLevel,
+  bill,
+  ...props
+}) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+
+  const [updateBill] = useMutation(gql`
+    mutation UPDATE_BILL($billId: uuid!) {
+      update_bills(where: { id: { _eq: $billId } }, _set: { exported: true }) {
+        returning {
+          id
+          exported
+          exported_at
+        }
+      }
+    }
+  `);
+
+  const handleUpdate = async () => {
+    setLoading(true);
+    const result = await updateBill({
+      variables: { billId: bill.id },
+    });
+
+    await insertExportLog({
+      variables: {
+        logs: [
+          {
+            bodyshopid: bodyshop.id,
+            billid: bill.id,
+            successful: true,
+            message: JSON.stringify([t("general.labels.markedexported")]),
+            useremail: currentUser.email,
+          },
+        ],
+      },
+    });
+
+    if (!result.errors) {
+      notification["success"]({
+        message: t("bills.successes.markexported"),
+      });
+    } else {
+      notification["error"]({
+        message: t("bills.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+    //Get the owner details, populate it all back into the job.
+  };
+
+  const hasAccess = HasRbacAccess({
+    bodyshop,
+    authLevel,
+    action: "bills:reexport",
+  });
+
+  if (hasAccess)
+    return (
+      <Button
+        loading={loading}
+        disabled={bill.exported}
+        onClick={handleUpdate}
+        {...props}
+      >
+        {t("bills.labels.markexported")}
+      </Button>
+    );
+
+  return <></>;
+}

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -24,7 +24,12 @@ export default connect(
   mapDispatchToProps
 )(BillMarkForReexportButton);
 
-export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
+export function BillMarkForReexportButton({
+  bodyshop,
+  authLevel,
+  bill,
+  ...props
+}) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
 
@@ -73,6 +78,7 @@ export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
         loading={loading}
         disabled={!bill.exported}
         onClick={handleUpdate}
+        {...props}
       >
         {t("bills.labels.markforreexport")}
       </Button>

client/src/components/billline-add-inventory/billline-add-inventory.component.jsx

@@ -0,0 +1,155 @@
+import { FileAddFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, notification, Tooltip } from "antd";
+import { t } from "i18next";
+import moment from "moment";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { INSERT_INVENTORY_AND_CREDIT } from "../../graphql/inventory.queries";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
+import queryString from "query-string";
+import { useLocation } from "react-router-dom";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BilllineAddInventory);
+
+export function BilllineAddInventory({
+  currentUser,
+  bodyshop,
+  billline,
+  disabled,
+  jobid,
+}) {
+  const [loading, setLoading] = useState(false);
+  const { billid } = queryString.parse(useLocation().search);
+
+  const [insertInventoryLine] = useMutation(INSERT_INVENTORY_AND_CREDIT);
+
+  const addToInventory = async () => {
+    setLoading(true);
+
+    //Check to  make sure there are no existing items already in the inventory.
+
+    const cm = {
+      vendorid: bodyshop.inhousevendorid,
+      invoice_number: "ih",
+      jobid: jobid,
+      isinhouse: true,
+      is_credit_memo: true,
+      date: moment().format("YYYY-MM-DD"),
+      federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate,
+      state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate,
+      local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate,
+      total: 0,
+      billlines: [
+        {
+          actual_price: billline.actual_price,
+          actual_cost: billline.actual_cost,
+          quantity: billline.quantity,
+          line_desc: billline.line_desc,
+          cost_center: billline.cost_center,
+          deductedfromlbr: billline.deductedfromlbr,
+          applicable_taxes: {
+            local: billline.applicable_taxes.local,
+            state: billline.applicable_taxes.state,
+            federal: billline.applicable_taxes.federal,
+          },
+        },
+      ],
+    };
+
+    cm.total = CalculateBillTotal(cm).enteredTotal.getAmount() / 100;
+
+    const insertResult = await insertInventoryLine({
+      variables: {
+        joblineId:
+          billline.joblineid === "noline" ? billline.id : billline.joblineid, //This will return null as there will be no jobline that has the id of the bill line.
+        //Unfortunately, we can't send null as the GQL syntax validation fails.
+        joblineStatus: bodyshop.md_order_statuses.default_returned,
+        inv: {
+          shopid: bodyshop.id,
+          billlineid: billline.id,
+          actual_price: billline.actual_price,
+          actual_cost: billline.actual_cost,
+          quantity: billline.quantity,
+          line_desc: billline.line_desc,
+        },
+        cm: { ...cm, billlines: { data: cm.billlines } }, //Fix structure for apollo insert.
+        pol: {
+          returnfrombill: billid,
+          vendorid: bodyshop.inhousevendorid,
+          deliver_by: moment().format("YYYY-MM-DD"),
+          parts_order_lines: {
+            data: [
+              {
+                line_desc: billline.line_desc,
+
+                act_price: billline.actual_price,
+                cost: billline.actual_cost,
+                quantity: billline.quantity,
+                job_line_id:
+                  billline.joblineid === "noline" ? null : billline.joblineid,
+                part_type: billline.jobline && billline.jobline.part_type,
+                cm_received: true,
+              },
+            ],
+          },
+          order_date: "2022-06-01",
+          orderedby: currentUser.email,
+          jobid: jobid,
+          user_email: currentUser.email,
+          return: true,
+          status: "Ordered",
+        },
+      },
+      refetchQueries: ["QUERY_BILL_BY_PK"],
+    });
+
+    if (!insertResult.errors) {
+      notification.open({
+        type: "success",
+        message: t("inventory.successes.inserted"),
+      });
+    } else {
+      notification.open({
+        type: "error",
+        message: t("inventory.errors.inserting", {
+          error: JSON.stringify(insertResult.errors),
+        }),
+      });
+    }
+
+    setLoading(false);
+  };
+
+  return (
+    <Tooltip title={t("inventory.actions.addtoinventory")}>
+      <Button
+        loading={loading}
+        disabled={
+          disabled || billline?.inventories?.length >= billline.quantity
+        }
+        onClick={addToInventory}
+      >
+        <FileAddFilled />
+        {billline?.inventories?.length > 0 && (
+          <div>({billline?.inventories?.length} in inv)</div>
+        )}
+      </Button>
+    </Tooltip>
+  );
+}

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -4,6 +4,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -11,10 +12,11 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
 import BillDeleteButton from "../bill-delete-button/bill-delete-button.component";
+import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-return.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
-  //jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly,
   bodyshop: selectBodyshop,
 });
 
@@ -29,6 +31,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function BillsListTableComponent({
   bodyshop,
+  jobRO,
   job,
   billsQuery,
   handleOnRowClick,
@@ -43,46 +46,31 @@ export function BillsListTableComponent({
   });
   // const search = queryString.parse(useLocation().search);
   // const selectedBill = search.billid;
+  const [searchText, setSearchText] = useState("");
+
   const Templates = TemplateList("bill");
   const bills = billsQuery.data ? billsQuery.data.bills : [];
   const { refetch } = billsQuery;
   const recordActions = (record, showView = false) => (
     <Space wrap>
       {showView && (
-        <Button onClick={() => handleOnRowClick(record)}>
+        <Button
+          onClick={() => handleOnRowClick(record)}
+          data-cy="edit-bill-button"
+        >
           <EditFilled />
         </Button>
       )}
       <BillDeleteButton bill={record} />
-      <Button
+      <BillDetailEditReturnComponent
+        data={{ bills_by_pk: { ...record, jobid: job.id } }}
         disabled={
-          record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
+          record.is_credit_memo ||
+          record.vendorid === bodyshop.inhousevendorid ||
+          jobRO
         }
-        onClick={() =>
-          setPartsOrderContext({
-            actions: {},
-            context: {
-              jobId: job.id,
-              vendorId: record.vendorid,
-              returnFromBill: record.id,
-              invoiceNumber: record.invoice_number,
-              linesToOrder: record.billlines.map((i) => {
-                return {
-                  line_desc: i.line_desc,
-                  // db_price: i.actual_price,
-                  act_price: i.actual_price,
-                  cost: i.actual_cost,
-                  quantity: i.quantity,
-                  joblineid: i.joblineid,
-                };
-              }),
-              isReturn: true,
-            },
-          })
-        }
-      >
-        {t("bills.actions.return")}
-      </Button>
+      />
+
       {record.isinhouse && (
         <PrintWrapperComponent
           templateObject={{
@@ -141,7 +129,12 @@ export function BillsListTableComponent({
       sortOrder:
         state.sortedInfo.columnKey === "is_credit_memo" &&
         state.sortedInfo.order,
-      render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
+      render: (text, record) => (
+        <Checkbox
+          data-cy="credit-memo-checkbox"
+          checked={record.is_credit_memo}
+        />
+      ),
     },
     {
       title: t("bills.fields.exported"),
@@ -150,7 +143,9 @@ export function BillsListTableComponent({
       sorter: (a, b) => a.exported - b.exported,
       sortOrder:
         state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
-      render: (text, record) => <Checkbox checked={record.exported} />,
+      render: (text, record) => (
+        <Checkbox data-cy="bill-exported-checkbox" checked={record.exported} />
+      ),
     },
     {
       title: t("general.labels.actions"),
@@ -164,6 +159,24 @@ export function BillsListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
+  const filteredBills = bills
+    ? searchText === ""
+      ? bills
+      : bills.filter(
+          (b) =>
+            (b.invoice_number || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (b.vendor.name || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (b.total || "")
+              .toString()
+              .toLowerCase()
+              .includes(searchText.toLowerCase())
+        )
+    : [];
+
   return (
     <Card
       title={t("bills.labels.bills")}
@@ -175,6 +188,7 @@ export function BillsListTableComponent({
           {job && job.converted ? (
             <>
               <Button
+                data-cy="bills-post-button"
                 onClick={() => {
                   setBillEnterContext({
                     actions: { refetch: billsQuery.refetch },
@@ -204,21 +218,24 @@ export function BillsListTableComponent({
 
           <Input.Search
             placeholder={t("general.labels.search")}
+            value={searchText}
             onChange={(e) => {
               e.preventDefault();
+              setSearchText(e.target.value);
             }}
           />
         </Space>
       }
     >
       <Table
+        data-cy="bills-table"
         loading={billsQuery.loading}
         scroll={{
           x: true, // y: "50rem"
         }}
         columns={columns}
         rowKey="id"
-        dataSource={bills}
+        dataSource={filteredBills}
         onChange={handleTableChange}
       />
     </Card>

client/src/components/bills-vendors-list/bills-vendors-list.component.jsx

@@ -12,7 +12,10 @@ export default function BillsVendorsList() {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
 
-  const { loading, error, data } = useQuery(QUERY_ALL_VENDORS);
+  const { loading, error, data } = useQuery(QUERY_ALL_VENDORS, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
 
   const { t } = useTranslation();
 

client/src/components/breadcrumbs/breadcrumbs.component.jsx

@@ -5,21 +5,33 @@ import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBreadcrumbs } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import GlobalSearch from "../global-search/global-search.component";
+import GlobalSearchOs from "../global-search/global-search-os.component";
 import "./breadcrumbs.styles.scss";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   breadcrumbs: selectBreadcrumbs,
+  bodyshop: selectBodyshop,
 });
 
-export function BreadCrumbs({ breadcrumbs }) {
+export function BreadCrumbs({ breadcrumbs, bodyshop }) {
+  const { OpenSearch } = useTreatments(
+    ["OpenSearch"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
   return (
     <Row className="breadcrumb-container">
       <Col xs={24} sm={24} md={16}>
         <Breadcrumb separator=">">
           <Breadcrumb.Item>
             <Link to={`/manage`}>
-              <HomeFilled />
+              <HomeFilled />{" "}
+              {(bodyshop && bodyshop.shopname && `(${bodyshop.shopname})`) ||
+                ""}
             </Link>
           </Breadcrumb.Item>
           {breadcrumbs.map((item) =>
@@ -34,7 +46,7 @@ export function BreadCrumbs({ breadcrumbs }) {
         </Breadcrumb>
       </Col>
       <Col xs={24} sm={24} md={8}>
-        <GlobalSearch />
+        {OpenSearch.treatment === "on" ? <GlobalSearchOs /> : <GlobalSearch />}
       </Col>
     </Row>
   );

client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx

@@ -39,7 +39,13 @@ export function ContractsFindModalContainer({
       if (!claim || !shortclaim) return;
       const trimmedShortClaim = shortclaim.trim();
       // const trimmedClaim = claim.trim();
-      claimNumbers.push({ claim: trimmedShortClaim, amount });
+      if (amount.slice(-1) === "-") {
+      }
+
+      claimNumbers.push({
+        claim: trimmedShortClaim,
+        amount: amount.slice(-1) === "-" ? parseFloat(amount) * -1 : amount,
+      });
     });
 
     await GenerateDocument(

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -10,7 +10,10 @@ export default function CABCpvrtCalculator({ disabled, form }) {
 
   const handleFinish = async (values) => {
     logImEXEvent("job_ca_bc_pvrt_calculate");
-    form.setFieldsValue({ ca_bc_pvrt: (values.rate * values.days).toFixed(2) });
+    form.setFieldsValue({
+      ca_bc_pvrt: ((values.rate || 0) * (values.days || 0)).toFixed(2),
+    });
+    form.setFields([{ name: "ca_bc_pvrt", touched: true }]);
     setVisibility(false);
   };
 

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -13,6 +13,7 @@ export default function ChatArchiveButton({ conversation }) {
 
     await updateConversation({
       variables: { id: conversation.id, archived: !conversation.archived },
+      refetchQueries: ["CONVERSATION_LIST_QUERY"],
     });
 
     setLoading(false);

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -1,11 +1,14 @@
 import { Badge, List, Tag } from "antd";
-import React from "react";
+import React, { useEffect } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { List as VirtualizedList, AutoSizer } from "react-virtualized";
+
 import "./chat-conversation-list.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -17,56 +20,86 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setSelectedConversation(conversationId)),
 });
 
-export function ChatConversationListComponent({
+function ChatConversationListComponent({
   conversationList,
   selectedConversation,
   setSelectedConversation,
+  subscribeToMoreConversations,
+  loadMoreConversations,
 }) {
+  useEffect(
+    () => subscribeToMoreConversations(),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const rowRenderer = ({ index, key, style }) => {
+    const item = conversationList[index];
+
+    return (
+      <List.Item
+        key={key}
+        onClick={() => setSelectedConversation(item.id)}
+        className={`chat-list-item ${
+          item.id === selectedConversation
+            ? "chat-list-selected-conversation"
+            : null
+        }`}
+        style={style}
+      >
+        <div sryle={{ display: "inline-block" }}>
+          {item.label && <div className="chat-name">{item.label}</div>}
+          {item.job_conversations.length > 0 ? (
+            <div className="chat-name">
+              {item.job_conversations.map((j, idx) => (
+                <div key={idx}>
+                  <OwnerNameDisplay ownerObject={j.job} />
+                </div>
+              ))}
+            </div>
+          ) : (
+            <PhoneFormatter>{item.phone_num}</PhoneFormatter>
+          )}
+        </div>
+        <div sryle={{ display: "inline-block" }}>
+          <div>
+            {item.job_conversations.length > 0
+              ? item.job_conversations.map((j, idx) => (
+                  <Tag key={idx} className="ro-number-tag">
+                    {j.job.ro_number}
+                  </Tag>
+                ))
+              : null}
+          </div>
+          <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
+        </div>
+        <Badge count={item.messages_aggregate.aggregate.count || 0} />
+      </List.Item>
+    );
+  };
+
   return (
     <div className="chat-list-container">
-      <List
-        bordered
-        dataSource={conversationList}
-        renderItem={(item) => (
-          <List.Item
-            key={item.id}
-            onClick={() => setSelectedConversation(item.id)}
-            className={`chat-list-item ${
-              item.id === selectedConversation
-                ? "chat-list-selected-conversation"
-                : null
-            }`}
-          >
-            {item.job_conversations.length > 0 ? (
-              <div className="chat-name">
-                {item.job_conversations.map((j, idx) => (
-                  <div key={idx}>{`${j.job.ownr_fn || ""} ${
-                    j.job.ownr_ln || ""
-                  } ${j.job.ownr_co_nm || ""} `}</div>
-                ))}
-              </div>
-            ) : (
-              <PhoneFormatter>{item.phone_num}</PhoneFormatter>
-            )}
-            <div sryle={{ display: "inline-block" }}>
-              <div>
-                {item.job_conversations.length > 0
-                  ? item.job_conversations.map((j, idx) => (
-                      <Tag key={idx} className="ro-number-tag">
-                        {j.job.ro_number}
-                      </Tag>
-                    ))
-                  : null}
-              </div>
-              <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
-            </div>
-            <Badge count={item.messages_aggregate.aggregate.count || 0} />
-          </List.Item>
+      <AutoSizer>
+        {({ height, width }) => (
+          <VirtualizedList
+            height={height}
+            width={width}
+            rowCount={conversationList.length}
+            rowHeight={60}
+            rowRenderer={rowRenderer}
+            onScroll={({ scrollTop, scrollHeight, clientHeight }) => {
+              if (scrollTop + clientHeight === scrollHeight) {
+                loadMoreConversations();
+              }
+            }}
+          />
         )}
-      />
+      </AutoSizer>
     </div>
   );
 }
+
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -3,8 +3,9 @@
 }
 .chat-list-container {
   flex: 1;
-  overflow: auto;
+  overflow: hidden;
   height: 100%;
+  border: 1px solid gainsboro;
 }
 
 .chat-list-item {
@@ -21,4 +22,6 @@
   .ro-number-tag {
     align-self: baseline;
   }
+  padding: 12px 24px;
+  border-bottom: 1px solid gainsboro;
 }