Revert "Release/2022 11 25 (pull request #628)"

Release/2022 11 25

.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

.eslintrc.json

@@ -16,6 +16,6 @@
   "rules": {
     "no-console": "off"
   },
-  "settings": {},
-  "plugins": ["cypress"]
+  "settings": {}
+  //"plugins": ["cypress"]
 }

.gitignore

@@ -113,3 +113,8 @@ firebase/.env
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
 logs/oAuthClient-log.log
+
+
+.node-persist/**
+
+/*.env.*

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=https://api.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/.env.production

@@ -0,0 +1,13 @@
+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/src/App/App.jsx

@@ -1,4 +1,4 @@
-import { useTreatments } from "@splitsoftware/splitio-react";
+import { useClient } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
 import LogRocket from "logrocket";
 import React, { lazy, Suspense, useEffect } from "react";
@@ -51,11 +51,7 @@ export function App({
   online,
   setOnline,
 }) {
-  const { LogRocket_Tracking } = useTreatments(
-    ["LogRocket_Tracking"],
-    {},
-    bodyshop && bodyshop.imexshopid
-  );
+  const client = useClient();
 
   useEffect(() => {
     if (!navigator.onLine) {
@@ -78,15 +74,15 @@ export function App({
     setOnline(true);
   });
   useEffect(() => {
-    if (currentUser.authorized) {
-      if (
-        process.env.NODE_ENV === "production" &&
-        LogRocket_Tracking.treatment === "on"
-      ) {
+    if (currentUser.authorized && bodyshop) {
+      client.setAttribute("imexshopid", bodyshop.imexshopid);
+
+      if (client.getTreatment("LogRocket_Tracking") === "on") {
+        console.log("LR Start");
         LogRocket.init("gvfvfw/bodyshopapp");
       }
     }
-  }, [currentUser.authorized, LogRocket_Tracking.treatment]);
+  }, [bodyshop, client, currentUser.authorized]);
 
   if (currentUser.authorized === null) {
     return <LoadingSpinner message={t("general.labels.loggingin")} />;

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

@@ -1,19 +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";
-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,
@@ -184,6 +185,13 @@ 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}

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

@@ -4,6 +4,8 @@ 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, {
@@ -18,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-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";
@@ -26,6 +26,9 @@ 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,
@@ -38,6 +41,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertAuditTrail({ jobid, operation })),
 });
 
+const Templates = TemplateList("job_special");
+
 function BillEnterModalContainer({
   billEnterModal,
   toggleModalVisible,
@@ -54,7 +59,10 @@ function BillEnterModalContainer({
   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,
@@ -221,23 +229,26 @@ function BillEnterModalContainer({
         });
       }
     }
+    //If it's not a credit memo, update the statuses.
 
-    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 (!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) {
@@ -275,6 +286,20 @@ function BillEnterModalContainer({
     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({
@@ -330,6 +355,12 @@ 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()}>
             {t("general.actions.save")}

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

@@ -171,7 +171,7 @@ export function BillEnterModalLinesComponent({
           };
         },
         formInput: (record, index) => (
-          <InputNumber precision={0} min={0} disabled={disabled} />
+          <InputNumber precision={0} min={1} disabled={disabled} />
         ),
       },
       {

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/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx

@@ -0,0 +1,152 @@
+import { SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Form, Input, Table } from "antd";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(DmsAllocationsSummaryAp);
+
+export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
+  const { t } = useTranslation();
+  const [allocationsSummary, setAllocationsSummary] = useState([]);
+
+  useEffect(() => {
+    socket.on("ap-export-success", (billid) => {
+      setAllocationsSummary((allocationsSummary) =>
+        allocationsSummary.map((a) => {
+          if (a.billid !== billid) return a;
+          return { ...a, status: "Successful" };
+        })
+      );
+    });
+    socket.on("ap-export-failure", ({ billid, error }) => {
+      allocationsSummary.map((a) => {
+        if (a.billid !== billid) return a;
+        return { ...a, status: error };
+      });
+    });
+
+    if (socket.disconnected) socket.connect();
+    return () => {
+      socket.removeListener("ap-export-success");
+      socket.removeListener("ap-export-failure");
+      //socket.disconnect();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (socket.connected) {
+      socket.emit("pbs-calculate-allocations-ap", billids, (ack) => {
+        setAllocationsSummary(ack);
+
+        socket.allocationsSummary = ack;
+      });
+    }
+  }, [socket, socket.connected, billids]);
+  console.log(allocationsSummary);
+  const columns = [
+    {
+      title: t("general.labels.status"),
+      dataIndex: "status",
+      key: "status",
+    },
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: ["Posting", "Reference"],
+      key: "reference",
+    },
+
+    {
+      title: t("jobs.fields.dms.lines"),
+      dataIndex: "Lines",
+      key: "Lines",
+      render: (text, record) => (
+        <table style={{ tableLayout: "auto", width: "100%" }}>
+          <tr>
+            <th>{t("bills.fields.invoice_number")}</th>
+            <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
+            <th>{t("jobs.fields.dms.amount")}</th>
+          </tr>
+          {record.Posting.Lines.map((l, idx) => (
+            <tr key={idx}>
+              <td>{l.InvoiceNumber}</td>
+              <td>{l.Account}</td>
+              <td>{l.Amount}</td>
+            </tr>
+          ))}
+        </table>
+      ),
+    },
+  ];
+
+  const handleFinish = async (values) => {
+    socket.emit(`pbs-export-ap`, {
+      billids,
+      txEnvelope: values,
+    });
+  };
+
+  return (
+    <Card
+      title={title}
+      extra={
+        <Button
+          onClick={() => {
+            socket.emit("pbs-calculate-allocations-ap", billids, (ack) =>
+              setAllocationsSummary(ack)
+            );
+          }}
+        >
+          <SyncOutlined />
+        </Button>
+      }
+    >
+      <Table
+        pagination={{ position: "top", defaultPageSize: 50 }}
+        columns={columns}
+        rowKey={(record) => `${record.InvoiceNumber}${record.Account}`}
+        dataSource={allocationsSummary}
+        locale={{ emptyText: t("dms.labels.refreshallocations") }}
+      />
+      <Form layout="vertical" onFinish={handleFinish}>
+        <Form.Item
+          name="journal"
+          label={t("jobs.fields.dms.journal")}
+          initialValue={
+            bodyshop.cdk_configuration &&
+            bodyshop.cdk_configuration.default_journal
+          }
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Button
+          disabled={!allocationsSummary || allocationsSummary.length === 0}
+          htmlType="submit"
+        >
+          {t("jobs.actions.dms.post")}
+        </Button>
+      </Form>
+    </Card>
+  );
+}

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -1,4 +1,4 @@
-import { Button, Card, Table, Typography } from "antd";
+import { Alert, Button, Card, Table, Typography } from "antd";
 import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -90,6 +90,9 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
         </Button>
       }
     >
+      {bodyshop.pbs_configuration?.disablebillwip && (
+        <Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
+      )}
       <Table
         pagination={{ position: "top", defaultPageSize: 50 }}
         columns={columns}

client/src/components/documents-local-upload/documents-local-upload.component.jsx

@@ -23,6 +23,7 @@ export function DocumentsLocalUploadComponent({
   vendorid,
   invoice_number,
   callbackAfterUpload,
+  allowAllTypes,
 }) {
   const [fileList, setFileList] = useState([]);
 
@@ -52,7 +53,9 @@ export function DocumentsLocalUploadComponent({
           },
         })
       }
-      accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
+      {...(!allowAllTypes && {
+        accept: "audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx",
+      })}
     >
       {children || (
         <>

client/src/components/documents-local-upload/documents-local-upload.utility.js

@@ -2,6 +2,8 @@ import cleanAxios from "../../utils/CleanAxios";
 import { store } from "../../redux/store";
 import { addMediaForJob } from "../../redux/media/media.actions";
 import normalizeUrl from "normalize-url";
+import { notification } from "antd";
+import i18n from "i18next";
 
 export const handleUpload = async ({ ev, context }) => {
   const { onError, onSuccess, onProgress, file } = ev;
@@ -45,6 +47,11 @@ export const handleUpload = async ({ ev, context }) => {
     }
   } else {
     onSuccess && onSuccess(file);
+    notification.open({
+      type: "success",
+      key: "docuploadsuccess",
+      message: i18n.t("documents.successes.insert"),
+    });
     store.dispatch(
       addMediaForJob({
         jobid,
@@ -53,6 +60,11 @@ export const handleUpload = async ({ ev, context }) => {
             ...d,
             selected: false,
             src: normalizeUrl(`${bodyshop.localmediaserverhttp}/${d.src}`),
+            ...(d.optimized && {
+              optimized: normalizeUrl(
+                `${bodyshop.localmediaserverhttp}/${d.optimized}`
+              ),
+            }),
             thumbnail: normalizeUrl(
               `${bodyshop.localmediaserverhttp}/${d.thumbnail}`
             ),

client/src/components/email-overlay/email-overlay.container.jsx

@@ -1,4 +1,4 @@
-import { Divider, Form, Modal, notification } from "antd";
+import { Button, Divider, Form, Modal, notification, Space } from "antd";
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -77,6 +77,9 @@ export function EmailOverlayContainer({
     setSending(true);
     try {
       await axios.post("/sendemail", {
+        bodyshopid: bodyshop.id,
+        jobid: emailConfig.jobid,
+
         ...defaultEmailFrom,
         ReplyTo: {
           Email: from,
@@ -172,36 +175,77 @@ export function EmailOverlayContainer({
     <Modal
       destroyOnClose={true}
       visible={modalVisible}
+      maskClosable={false}
       width={"80%"}
       onOk={() => form.submit()}
+      title={t("emails.labels.emailpreview")}
       onCancel={() => {
         toggleEmailOverlayVisible();
       }}
+      //closeIcon={() => null}
+      okText={t("general.actions.send")}
       okButtonProps={{
         loading: sending,
+
         disabled:
           selectedMedia &&
-         ( (selectedMedia
+          (selectedMedia
             .filter((s) => s.isSelected)
             .reduce((acc, val) => (acc = acc + val.size), 0) >=
-            10485760 - new Blob([form.getFieldValue("html")]).size) || selectedMedia.filter((s) => s.isSelected).length > 10),
+            10485760 - new Blob([form.getFieldValue("html")]).size ||
+            selectedMedia.filter((s) => s.isSelected).length > 10),
       }}
     >
-      <Form layout="vertical" form={form} onFinish={handleFinish}>
-        {loading && (
-          <div>
-            <LoadingSkeleton />
-            <Divider>{t("emails.labels.preview")}</Divider>
-            <LoadingSpinner message={t("emails.labels.generatingemail")} />
-          </div>
-        )}
-        {!loading && (
-          <EmailOverlayComponent
-            form={form}
-            selectedMediaState={[selectedMedia, setSelectedMedia]}
-          />
-        )}
-      </Form>
+      <div>
+        <div
+          style={{
+            //   marginTop: "3rem",
+            display: "flex",
+            justifyContent: "flex-end",
+          }}
+        >
+          <Space style={{ alignSelf: "flex-end" }} align="right">
+            <Button
+              onClick={() => {
+                toggleEmailOverlayVisible();
+              }}
+            >
+              {t("general.actions.cancel")}
+            </Button>
+            <Button
+              loading={sending}
+              onClick={() => form.submit()}
+              disabled={
+                selectedMedia &&
+                (selectedMedia
+                  .filter((s) => s.isSelected)
+                  .reduce((acc, val) => (acc = acc + val.size), 0) >=
+                  10485760 - new Blob([form.getFieldValue("html")]).size ||
+                  selectedMedia.filter((s) => s.isSelected).length > 10)
+              }
+              type="primary"
+            >
+              {t("general.actions.send")}
+            </Button>
+          </Space>
+        </div>
+        <Form layout="vertical" form={form} onFinish={handleFinish}>
+          {loading && (
+            <div>
+              <LoadingSkeleton />
+              <Divider>{t("emails.labels.preview")}</Divider>
+              <LoadingSpinner message={t("emails.labels.generatingemail")} />
+            </div>
+          )}
+
+          {!loading && (
+            <EmailOverlayComponent
+              form={form}
+              selectedMediaState={[selectedMedia, setSelectedMedia]}
+            />
+          )}
+        </Form>
+      </div>
     </Modal>
   );
 }

client/src/components/header/header.component.jsx

@@ -12,7 +12,7 @@ import Icon, {
   FileAddFilled,
   FileAddOutlined,
   FileFilled,
-  GlobalOutlined,
+  //GlobalOutlined,
   HomeFilled,
   ImportOutlined,
   LineChartOutlined,
@@ -89,6 +89,11 @@ function Header({
     {},
     bodyshop && bodyshop.imexshopid
   );
+  const { DmsAp } = useTreatments(
+    ["DmsAp"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   const { t } = useTranslation();
 
@@ -264,10 +269,11 @@ function Header({
                 {t("menus.header.accounting-receivables")}
               </Link>
             </Menu.Item>
-            {!(
+            {(!(
               (bodyshop && bodyshop.cdk_dealerid) ||
               (bodyshop && bodyshop.pbs_serialnumber)
-            ) && (
+            ) ||
+              DmsAp.treatment === "on") && (
               <Menu.Item key="payables">
                 <Link to="/manage/accounting/payables">
                   {t("menus.header.accounting-payables")}
@@ -368,25 +374,27 @@ function Header({
           <Menu.Item key="profile">
             <Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
           </Menu.Item>
-          <Menu.SubMenu
-            key="langselecter"
-            title={
-              <span>
-                <GlobalOutlined />
-                <span>{t("menus.currentuser.languageselector")}</span>
-              </span>
-            }
-          >
-            <Menu.Item actiontype="lang-select" key="en-US">
-              {t("general.languages.english")}
-            </Menu.Item>
-            <Menu.Item actiontype="lang-select" key="fr-CA">
-              {t("general.languages.french")}
-            </Menu.Item>
-            <Menu.Item actiontype="lang-select" key="es-MX">
-              {t("general.languages.spanish")}
-            </Menu.Item>
-          </Menu.SubMenu>
+          {
+            //  <Menu.SubMenu
+            //           key="langselecter"
+            //           title={
+            //             <span>
+            //               <GlobalOutlined />
+            //               <span>{t("menus.currentuser.languageselector")}</span>
+            //             </span>
+            //           }
+            //         >
+            //           <Menu.Item actiontype="lang-select" key="en-US">
+            //             {t("general.languages.english")}
+            //           </Menu.Item>
+            //           <Menu.Item actiontype="lang-select" key="fr-CA">
+            //             {t("general.languages.french")}
+            //           </Menu.Item>
+            //           <Menu.Item actiontype="lang-select" key="es-MX">
+            //             {t("general.languages.spanish")}
+            //           </Menu.Item>
+            //         </Menu.SubMenu>
+          }
         </Menu.SubMenu>
         <Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
           {recentItems.map((i, idx) => (

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -19,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(Jobd3RdPartyModal);
 
-export function Jobd3RdPartyModal({ bodyshop, jobId }) {
+export function Jobd3RdPartyModal({ bodyshop, jobId, job }) {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const { t } = useTranslation();
   const [form] = Form.useForm();
@@ -33,6 +33,11 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
   );
 
   const showModal = () => {
+    form.setFieldsValue({
+      ded_amt: job.ded_amt,
+      depreciation: job.depreciation_taxes,
+      custgst: job.ca_customer_gst,
+    });
     setIsModalVisible(true);
   };
 
@@ -42,6 +47,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
   };
 
   const handleCancel = () => {
+    form.resetFields();
     setIsModalVisible(false);
   };
   const handleFinish = (values) => {

client/src/components/job-audit-trail/job-audit-trail.component.jsx

@@ -1,13 +1,24 @@
 import { useQuery } from "@apollo/client";
-import { Card, Table } from "antd";
+import { Button, Card, Col, Row, Table, Tag } from "antd";
+import { SyncOutlined } from "@ant-design/icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobAuditTrail);
 
-export default function JobAuditTrail({ jobId }) {
+export function JobAuditTrail({ currentUser, jobId }) {
   const { t } = useTranslation();
-  const { loading, data } = useQuery(QUERY_AUDIT_TRAIL, {
+  const { loading, data, refetch } = useQuery(QUERY_AUDIT_TRAIL, {
     variables: { jobid: jobId },
     skip: !jobId,
     fetchPolicy: "network-only",
@@ -34,15 +45,109 @@ export default function JobAuditTrail({ jobId }) {
       key: "operation",
     },
   ];
+  const emailColumns = [
+    {
+      title: t("audit.fields.created"),
+      dataIndex: " created_at",
+      key: " created_at",
 
+      render: (text, record) => (
+        <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
+      ),
+    },
+
+    {
+      title: t("audit.fields.useremail"),
+      dataIndex: "useremail",
+      key: "useremail",
+    },
+
+    {
+      title: t("audit.fields.to"),
+      dataIndex: "to",
+      key: "to",
+
+      render: (text, record) =>
+        record.to &&
+        record.to.map((email, idx) => <Tag key={idx}>{email}</Tag>),
+    },
+    {
+      title: t("audit.fields.cc"),
+      dataIndex: "cc",
+      key: "cc",
+
+      render: (text, record) =>
+        record.cc &&
+        record.cc.map((email, idx) => <Tag key={idx}>{email}</Tag>),
+    },
+    {
+      title: t("audit.fields.subject"),
+      dataIndex: "subject",
+      key: "subject",
+    },
+    {
+      title: t("audit.fields.status"),
+      dataIndex: "status",
+      key: "status",
+    },
+    ...(currentUser?.email.includes("@imex.")
+      ? [
+          {
+            title: t("audit.fields.contents"),
+            dataIndex: "contents",
+            key: "contents",
+            width: "10%",
+            render: (text, record) => (
+              <Button
+                onClick={() => {
+                  var win = window.open(
+                    "",
+                    "Title",
+                    "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=400,"
+                  );
+                  win.document.body.innerHTML = record.contents;
+                }}
+              >
+                Preview
+              </Button>
+            ),
+          },
+        ]
+      : []),
+  ];
   return (
-    <Card title={t("jobs.labels.audit")}>
-      <Table
-        loading={loading}
-        columns={columns}
-        rowKey="id"
-        dataSource={data ? data.audit_trail : []}
-      />
-    </Card>
+    <Row gutter={[16, 16]}>
+      <Col span={24}>
+        <Card
+          title={t("jobs.labels.audit")}
+          extra={
+            <Button
+              onClick={() => {
+                refetch();
+              }}
+            >
+              <SyncOutlined />
+            </Button>
+          }
+        >
+          <Table
+            loading={loading}
+            columns={columns}
+            rowKey="id"
+            dataSource={data ? data.audit_trail : []}
+          />
+        </Card>
+      </Col>
+      <Col span={24}>
+        <Card title={t("jobs.labels.emailaudit")}>
+          <Table
+            loading={loading}
+            columns={emailColumns}
+            rowKey="id"
+            dataSource={data ? data.email_audit_trail : []}
+          />
+        </Card>
+      </Col>
+    </Row>
   );
 }

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -7,7 +7,10 @@ import { connect } from "react-redux";
 import { useHistory, useLocation, useParams } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../../../firebase/firebase.utils";
-import { MARK_LATEST_APPOINTMENT_AS_ARRIVED } from "../../../../graphql/appointments.queries";
+import {
+  MARK_APPOINTMENT_ARRIVED,
+  MARK_LATEST_APPOINTMENT_ARRIVED,
+} from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
 import {
   selectBodyshop,
@@ -41,7 +44,8 @@ export function JobChecklistForm({
   const { t } = useTranslation();
   const [intakeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
-  const [markAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_AS_ARRIVED);
+  const [markAptArrived] = useMutation(MARK_APPOINTMENT_ARRIVED);
+  const [markLatestAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_ARRIVED);
   const [updateOwner] = useMutation(UPDATE_OWNER);
 
   const { jobId } = useParams();
@@ -125,6 +129,18 @@ export function JobChecklistForm({
         variables: { appointmentId: search.appointmentId },
       });
 
+      if (!!appUpdate.errors) {
+        notification["error"]({
+          message: t("checklist.errors.complete", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+    } else if (type === "intake" && !search.appointmentId) {
+      const appUpdate = await markLatestAptArrived({
+        variables: { jobId: jobId },
+      });
+
       if (!!appUpdate.errors) {
         notification["error"]({
           message: t("checklist.errors.complete", {
@@ -133,6 +149,7 @@ export function JobChecklistForm({
         });
       }
     }
+
     if (type === "intake" && job.owner && job.owner.id) {
       //Updae Owner Allow to Text
       const updateOwnerResult = await updateOwner({
@@ -175,12 +192,7 @@ export function JobChecklistForm({
       });
     }
   };
-  console.log(job, {
-    removeFromProduction: true,
-    actual_completion:
-      job && job.actual_completion && moment(job.actual_completion),
-    actual_delivery: job && job.actual_delivery && moment(job.actual_delivery),
-  });
+
   return (
     <Card
       title={t("checklist.labels.checklist")}

client/src/components/job-detail-lines/job-lines-expander.component.jsx

@@ -1,11 +1,12 @@
 import { useQuery } from "@apollo/client";
-import { Row, Col, Timeline, Typography, Space, Divider, Skeleton } from "antd";
+import { Col, Divider, Row, Skeleton, Space, Timeline, Typography } from "antd";
 import React from "react";
-import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
 import { useTranslation } from "react-i18next";
-import AlertComponent from "../alert/alert.component";
-import { DateFormatter } from "../../utils/DateFormatter";
 import { Link } from "react-router-dom";
+import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateFormatter } from "../../utils/DateFormatter";
+import AlertComponent from "../alert/alert.component";
 
 export default function JobLinesExpander({ jobline, jobid }) {
   const { t } = useTranslation();
@@ -48,7 +49,46 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
-      <Col md={24} lg={12}></Col>
+      <Col md={24} lg={12}>
+        <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
+        <Timeline>
+          {data.billlines.length > 0 ? (
+            data.billlines.map((line) => (
+              <Timeline.Item key={line.id}>
+                <Row wrap>
+                  <Col span={4}>
+                    <Link
+                      to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}
+                    >
+                      {line.bill.invoice_number}
+                    </Link>
+                  </Col>
+                  <Col span={4}>
+                    <span>
+                      {`${t("billlines.fields.actual_price")}: `}
+                      <CurrencyFormatter>{line.actual_price}</CurrencyFormatter>
+                    </span>
+                  </Col>
+                  <Col span={4}>
+                    <span>
+                    {`${t("billlines.fields.actual_cost")}: `}
+                      <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
+                    </span>
+                  </Col>
+                  <Col span={4}>
+                    <DateFormatter>{line.bill.date}</DateFormatter>
+                  </Col>
+                  <Col span={4}> {line.bill.vendor.name}</Col>
+                </Row>
+              </Timeline.Item>
+            ))
+          ) : (
+            <Timeline.Item>
+              {t("parts_orders.labels.notyetordered")}
+            </Timeline.Item>
+          )}
+        </Timeline>
+      </Col>
     </Row>
   );
 }

client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -1,4 +1,5 @@
 import { useMutation, useLazyQuery } from "@apollo/client";
+import { CheckCircleOutlined } from "@ant-design/icons";
 import {
   Button,
   Card,
@@ -141,6 +142,12 @@ export default function ScoreboardAddButton({
           </Form>
         )}
       </div>
+      {entryData && entryData.scoreboard && entryData.scoreboard[0] && (
+        <Space>
+          <CheckCircleOutlined style={{ color: "green" }} />
+          <span>{t("jobs.labels.alreadyaddedtoscoreboard")}</span>
+        </Space>
+      )}
     </Card>
   );
 

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addevent.jsx

@@ -0,0 +1,163 @@
+import { useMutation } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Form,
+  Input,
+  Menu,
+  notification,
+  Popover,
+  Select,
+  Space,
+} from "antd";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDetailHeaderAddEvent);
+
+export function JobsDetailHeaderAddEvent({ bodyshop, jobid, ...props }) {
+  const { t } = useTranslation();
+  const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
+
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [visibility, setVisibility] = useState(false);
+
+  const handleFinish = async (values) => {
+    logImEXEvent("schedule_manual_event");
+
+    setLoading(true);
+    try {
+      insertAppointment({
+        variables: {
+          apt: { ...values, isintake: false, jobid, bodyshopid: bodyshop.id },
+        },
+        refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
+      });
+      notification.open({
+        type: "success",
+        message: t("appointments.successes.created"),
+      });
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setLoading(false);
+      setVisibility(false);
+    }
+  };
+
+  const overlay = (
+    <Card>
+      <div>
+        <Form form={form} layout="vertical" onFinish={handleFinish}>
+          <Form.Item
+            label={t("appointments.fields.title")}
+            name="title"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label={t("appointments.fields.note")} name="note">
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label={t("appointments.fields.start")}
+            name="start"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <FormDateTimePickerComponent
+              onBlur={() => {
+                const start = form.getFieldValue("start");
+                form.setFieldsValue({ end: start.add(30, "minutes") });
+              }}
+            />
+          </Form.Item>
+          <Form.Item
+            label={t("appointments.fields.end")}
+            name="end"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+              ({ getFieldValue }) => ({
+                async validator(rule, value) {
+                  if (value) {
+                    const { start } = form.getFieldsValue();
+                    if (moment(start).isAfter(moment(value))) {
+                      return Promise.reject(
+                        t("employees.labels.endmustbeafterstart")
+                      );
+                    } else {
+                      return Promise.resolve();
+                    }
+                  } else {
+                    return Promise.resolve();
+                  }
+                },
+              }),
+            ]}
+          >
+            <FormDateTimePickerComponent />
+          </Form.Item>
+          <Form.Item label={t("appointments.fields.color")} name="color">
+            <Select>
+              {bodyshop.appt_colors.map((col, idx) => (
+                <Select.Option key={idx} value={col.color.hex}>
+                  {col.label}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+
+          <Space wrap>
+            <Button type="primary" htmlType="submit" loading={loading}>
+              {t("general.actions.save")}
+            </Button>
+            <Button onClick={() => setVisibility(false)}>
+              {t("general.actions.cancel")}
+            </Button>
+          </Space>
+        </Form>
+      </div>
+    </Card>
+  );
+
+  const handleClick = (e) => {
+    setVisibility(true);
+  };
+
+  return (
+    <Popover content={overlay} visible={visibility}>
+      <Menu.Item {...props} onClick={handleClick}>
+        {t("appointments.labels.manualevent")}
+      </Menu.Item>
+    </Popover>
+  );
+}

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -15,6 +15,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
@@ -421,6 +422,7 @@ export function JobsDetailHeaderActions({
           </Popconfirm>
         </Menu.Item>
       )}
+      <JobsDetailHeaderActionsAddevent jobid={job.id} />
       {!jobRO && job.converted && (
         <Menu.Item>
           <Popconfirm

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -2,8 +2,9 @@ import {
   ExclamationCircleFilled,
   PauseCircleOutlined,
   WarningFilled,
+  BranchesOutlined,
 } from "@ant-design/icons";
-import { Card, Col, Row, Space, Tag } from "antd";
+import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -78,6 +79,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.suspended && (
                   <PauseCircleOutlined style={{ color: "orangered" }} />
                 )}
+                {job.iouparent && (
+                  <Link to={`/manage/jobs/${job.iouparent}`}>
+                    <Tooltip title={t("jobs.labels.iou")}>
+                      <BranchesOutlined style={{ color: "orangered" }} />
+                    </Tooltip>
+                  </Link>
+                )}
                 {job.production_vars && job.production_vars.alert ? (
                   <ExclamationCircleFilled className="production-alert" />
                 ) : null}

client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx

@@ -1,14 +1,11 @@
-import { useApolloClient, useMutation } from "@apollo/client";
+import { useApolloClient } from "@apollo/client";
 import { Button, Form, notification, Popover, Space } from "antd";
 import axios from "axios";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
-  GET_DOC_SIZE_BY_JOB,
-  UPDATE_DOCUMENT,
-} from "../../graphql/documents.queries";
+import { GET_DOC_SIZE_BY_JOB } from "../../graphql/documents.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 
@@ -23,7 +20,11 @@ export default connect(
   mapDispatchToProps
 )(JobsDocumentsGalleryReassign);
 
-export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
+export function JobsDocumentsGalleryReassign({
+  bodyshop,
+  galleryImages,
+  callback,
+}) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
@@ -36,34 +37,33 @@ export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
   const client = useApolloClient();
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [updateDocument] = useMutation(UPDATE_DOCUMENT);
 
-  const updateImage = async (i, jobid) => {
-    //Move the cloudinary image
+  // const updateImage = async (i, jobid) => {
+  //   //Move the cloudinary image
 
-    //Update it in the database.
-    const result = await updateDocument({
-      variables: {
-        id: i.id,
-        document: {
-          key: i.public_id,
-          jobid: jobid,
-        },
-      },
-    });
+  //   //Update it in the database.
+  //   const result = await updateDocument({
+  //     variables: {
+  //       id: i.id,
+  //       document: {
+  //         key: i.public_id,
+  //         jobid: jobid,
+  //       },
+  //     },
+  //   });
 
-    if (!!result.errors) {
-      notification["error"]({
-        message: t("documents.errors.updating", {
-          message: JSON.stringify(result.errors),
-        }),
-      });
-    } else {
-      notification["success"]({
-        message: t("documents.successes.updated"),
-      });
-    }
-  };
+  //   if (!!result.errors) {
+  //     notification["error"]({
+  //       message: t("documents.errors.updating", {
+  //         message: JSON.stringify(result.errors),
+  //       }),
+  //     });
+  //   } else {
+  //     notification["success"]({
+  //       message: t("documents.successes.updated"),
+  //     });
+  //   }
+  // };
 
   const handleFinish = async ({ jobid }) => {
     setLoading(true);
@@ -96,6 +96,7 @@ export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
     }
 
     const res = await axios.post("/media/rename", {
+      tojobid: jobid,
       documents: selectedImages.map((i) => {
         //Need to check if the current key folder is null, or another job.
         const currentKeys = i.key.split("/");
@@ -110,24 +111,21 @@ export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
         };
       }),
     });
+    //Add in confirmation & errors.
+    if (callback) callback();
 
-    res.data
-      .filter((d) => d.error)
-      .forEach((d) => {
-        notification["error"]({ message: t("documents.errors.updating") });
-        console.error("Error updating job document", d);
+    if (res.errors) {
+      notification["error"]({
+        message: t("documents.errors.updating", {
+          message: JSON.stringify(res.errors),
+        }),
       });
-
-    const proms = [];
-
-    res.data
-      .filter((d) => !d.error)
-      .forEach((d) => {
-        proms.push(updateImage(d, jobid));
+    }
+    if (!res.mutationResult?.errors) {
+      notification["success"]({
+        message: t("documents.successes.updated"),
       });
-
-    await Promise.all(proms);
-
+    }
     setVisible(false);
     setLoading(false);
   };

client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx

@@ -125,7 +125,10 @@ function JobsDocumentsComponent({
               deletionCallback={billsCallback || refetch}
             />
             {!billId && (
-              <JobsDocumentsGalleryReassign galleryImages={galleryImages} />
+              <JobsDocumentsGalleryReassign
+                galleryImages={galleryImages}
+                callback={refetch}
+              />
             )}
           </Space>
         </Col>

client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx

@@ -1,11 +1,9 @@
 import { QuestionCircleOutlined } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
 import { Button, notification, Popconfirm } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { DELETE_DOCUMENTS } from "../../graphql/documents.queries";
 //Context: currentUserEmail, bodyshop, jobid, invoiceid
 
 export default function JobsDocumentsDeleteButton({
@@ -13,7 +11,7 @@ export default function JobsDocumentsDeleteButton({
   deletionCallback,
 }) {
   const { t } = useTranslation();
-  const [deleteDocument] = useMutation(DELETE_DOCUMENTS);
+
   const imagesToDelete = [
     ...galleryImages.images.filter((image) => image.isSelected),
     ...galleryImages.other.filter((image) => image.isSelected),
@@ -27,31 +25,10 @@ export default function JobsDocumentsDeleteButton({
       ids: imagesToDelete,
     });
 
-    const successfulDeletes = [];
-    res.data.forEach((resType) => {
-      Object.keys(resType.deleted).forEach((key) => {
-        if (resType.deleted[key] !== "deleted") {
-          notification["error"]({
-            message: t("documents.errors.deleting_cloudinary", {
-              message: JSON.stringify(resType.deleted[key]),
-            }),
-          });
-        } else {
-          successfulDeletes.push(key.replace(/\.[^/.]+$/, ""));
-        }
-      });
-    });
-    const delres = await deleteDocument({
-      variables: {
-        ids: imagesToDelete
-          .filter((i) => successfulDeletes.includes(i.key))
-          .map((i) => i.id),
-      },
-    });
-    if (delres.errors) {
+    if (res.data.error) {
       notification["error"]({
         message: t("documents.errors.deleting", {
-          message: JSON.stringify(delres.errors),
+          error: JSON.stringify(res.data.error.response.errors),
         }),
       });
     } else {

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -1,5 +1,5 @@
 import { SyncOutlined, FileExcelFilled } from "@ant-design/icons";
-import { Button, Card, Space } from "antd";
+import { Alert, Button, Card, Space } from "antd";
 import React, { useEffect } from "react";
 import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
@@ -14,6 +14,7 @@ import { selectAllMedia } from "../../redux/media/media.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { CreateExplorerLinkForJob } from "../../utils/localmedia";
 import DocumentsLocalUploadComponent from "../documents-local-upload/documents-local-upload.component";
+import JobsDocumentsLocalDeleteButton from "./jobs-documents-local-gallery.delete.component";
 import JobsLocalGalleryDownloadButton from "./jobs-documents-local-gallery.download";
 import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
 import JobsDocumentsLocalGallerySelectAllComponent from "./jobs-documents-local-gallery.selectall.component";
@@ -57,7 +58,7 @@ export function JobsDocumentsLocalGallery({
       }
     }
   }, [job, invoice_number, getJobMedia, getBillMedia]);
-
+  let optimized;
   const jobMedia =
     allMedia && allMedia[job.id]
       ? allMedia[job.id].reduce(
@@ -67,15 +68,23 @@ export function JobsDocumentsLocalGallery({
               val.type.mime &&
               val.type.mime.startsWith("image")
             ) {
-              acc.images.push(val);
+              acc.images.push({
+                ...val,
+                ...(val.optimized && { src: val.optimized, fullsize: val.src }),
+              });
+              if (val.optimized) optimized = true;
             } else {
-              acc.other.push(val);
+              acc.other.push({
+                ...val,
+                tags: [{ value: val.filename, title: val.filename }],
+              });
             }
             return acc;
           },
           { images: [], other: [] }
         )
       : { images: [], other: [] };
+
   return (
     <div>
       <Space wrap>
@@ -98,12 +107,14 @@ export function JobsDocumentsLocalGallery({
         <JobsDocumentsLocalGalleryReassign jobid={job.id} />
         <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
         <JobsLocalGalleryDownloadButton job={job} />
+        <JobsDocumentsLocalDeleteButton jobid={job.id} />
       </Space>
       <Card>
         <DocumentsLocalUploadComponent
           job={job}
           invoice_number={invoice_number}
           vendorid={vendorid}
+          allowAllTypes
         />
       </Card>
       <Card title={t("jobs.labels.documents-images")}>
@@ -113,9 +124,22 @@ export function JobsDocumentsLocalGallery({
           onSelectImage={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
+          {...(optimized && {
+            customControls: [
+              <Alert
+                style={{ margin: "4px" }}
+                message={t("documents.labels.optimizedimage")}
+                type="success"
+              />,
+            ],
+          })}
           onClickImage={(props) => {
+            const media = allMedia[job.id].find(
+              (m) => m.optimized === props.target.src
+            );
+
             window.open(
-              props.target.src,
+              media ? media.src : props.target.src,
               "_blank",
               "toolbar=0,location=0,menubar=0"
             );

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.delete.component.jsx

@@ -0,0 +1,81 @@
+import { QuestionCircleOutlined } from "@ant-design/icons";
+import { Button, notification, Popconfirm } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import cleanAxios from "../../utils/CleanAxios";
+//Context: currentUserEmail, bodyshop, jobid, invoiceid
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { getJobMedia } from "../../redux/media/media.actions";
+import { selectAllMedia } from "../../redux/media/media.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  allMedia: selectAllMedia,
+
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  getJobMedia: (id) => dispatch(getJobMedia(id)),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDocumentsLocalDeleteButton);
+
+export function JobsDocumentsLocalDeleteButton({
+  bodyshop,
+  getJobMedia,
+  allMedia,
+  jobid,
+}) {
+  const { t } = useTranslation();
+
+  const [loading, setLoading] = useState(false);
+
+  const handleDelete = async () => {
+    logImEXEvent("job_documents_delete");
+    setLoading(true);
+
+    const delres = await cleanAxios.post(
+      `${bodyshop.localmediaserverhttp}/jobs/delete`,
+      {
+        jobid: jobid,
+        files: ((allMedia && allMedia[jobid]) || [])
+          .filter((i) => i.isSelected)
+          .map((i) => i.filename),
+      },
+      { headers: { ims_token: bodyshop.localmediatoken } }
+    );
+
+    if (delres.errors) {
+      notification["error"]({
+        message: t("documents.errors.deleting", {
+          message: JSON.stringify(delres.errors),
+        }),
+      });
+    } else {
+      notification.open({
+        key: "docdeletedsuccesfully",
+        type: "success",
+        message: t("documents.successes.delete"),
+      });
+    }
+    getJobMedia(jobid);
+    setLoading(false);
+  };
+
+  return (
+    <Popconfirm
+      icon={<QuestionCircleOutlined style={{ color: "red" }} />}
+      onConfirm={handleDelete}
+      title={t("documents.labels.confirmdelete")}
+      okText={t("general.actions.delete")}
+      okButtonProps={{ type: "danger" }}
+      cancelText={t("general.actions.cancel")}
+    >
+      <Button loading={loading}>{t("documents.actions.delete")}</Button>
+    </Popconfirm>
+  );
+}

client/src/components/jobs-list/jobs-list.component.jsx

@@ -2,9 +2,10 @@ import {
   SyncOutlined,
   ExclamationCircleFilled,
   PauseCircleOutlined,
+  BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
-import { Button, Card, Grid, Input, Space, Table } from "antd";
+import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -128,6 +129,11 @@ export function JobsList({ bodyshop }) {
             {record.suspended && (
               <PauseCircleOutlined style={{ color: "orangered" }} />
             )}
+            {record.iouparent && (
+              <Tooltip title={t("jobs.labels.iou")}>
+                <BranchesOutlined style={{ color: "orangered" }} />
+              </Tooltip>
+            )}
           </Space>
         </Link>
       ),

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -2,9 +2,10 @@ import {
   ExclamationCircleFilled,
   PauseCircleOutlined,
   SyncOutlined,
+  BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
-import { Button, Card, Grid, Input, Space, Table } from "antd";
+import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -140,6 +141,11 @@ export function JobsReadyList({ bodyshop }) {
             {record.suspended && (
               <PauseCircleOutlined style={{ color: "orangered" }} />
             )}
+            {record.iouparent && (
+              <Tooltip title={t("jobs.labels.iou")}>
+                <BranchesOutlined style={{ color: "orangered" }} />
+              </Tooltip>
+            )}
           </Space>
         </Link>
       ),

client/src/components/labor-allocations-table/labor-allocations-table.component.jsx

@@ -1,5 +1,5 @@
 import { EditFilled } from "@ant-design/icons";
-import { Card, Col, Row, Space, Table } from "antd";
+import { Card, Col, Row, Space, Table, Typography } from "antd";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -188,6 +188,19 @@ export function LaborAllocationsTable({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
+  const summary =
+    totals &&
+    totals.reduce(
+      (acc, val) => {
+        acc.hrs_total += val.total;
+        acc.hrs_claimed += val.claimed;
+        acc.adjustments += val.adjustments;
+        acc.difference += val.difference;
+        return acc;
+      },
+      { hrs_total: 0, hrs_claimed: 0, adjustments: 0, difference: 0 }
+    );
+
   return (
     <Row gutter={[16, 16]}>
       <Col span={24}>
@@ -201,6 +214,27 @@ export function LaborAllocationsTable({
             scroll={{
               x: true,
             }}
+            summary={() => (
+              <Table.Summary.Row>
+                <Table.Summary.Cell>
+                  <Typography.Title level={4}>
+                    {t("general.labels.totals")}
+                  </Typography.Title>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
+                  {summary.hrs_total.toFixed(1)}
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
+                  {summary.hrs_claimed.toFixed(1)}
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
+                  {summary.adjustments.toFixed(1)}
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
+                  {summary.difference.toFixed(1)}
+                </Table.Summary.Cell>
+              </Table.Summary.Row>
+            )}
           />
         </Card>
       </Col>

client/src/components/labor-allocations-table/labor-allocations-table.utility.js

@@ -39,7 +39,7 @@ export const CalculateAllocationsTotals = (
       }, 0),
     };
 
-    r.difference = (r.total + r.adjustments - r.claimed).toFixed(2);
+    r.difference = r.total + r.adjustments - r.claimed;
     acc.push(r);
     return acc;
   }, []);

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -72,7 +72,8 @@ export function PartsOrderListTableComponent({
     ? bpoints[selectedBreakpoint[0]]
     : "100%";
   const responsibilityCenters = bodyshop.md_responsibility_centers;
-  const Templates = TemplateList("partsorder");
+  const Templates = TemplateList("partsorder", { job });
+
   const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},

client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx

@@ -0,0 +1,97 @@
+import { DownOutlined } from "@ant-design/icons";
+import { Dropdown, InputNumber, Menu, Space } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+export default function PartsOrderModalPriceChange({ form, field }) {
+  const { t } = useTranslation();
+  const menu = (
+    <Menu
+      onClick={({ key }) => {
+        if (key === "custom") return;
+        const values = form.getFieldsValue();
+
+        const { parts_order_lines } = values;
+
+        form.setFieldsValue({
+          parts_order_lines: {
+            data: parts_order_lines.data.map((p, idx) => {
+              if (idx !== field.name) return p;
+              return {
+                ...p,
+                act_price: (p.act_price || 0) * ((100 - key) / 100),
+              };
+            }),
+          },
+        });
+      }}
+      items={[
+        {
+          key: "5",
+          label: t("parts_orders.labels.discount", { percent: "5%" }),
+        },
+        {
+          key: "10",
+          label: t("parts_orders.labels.discount", { percent: "10%" }),
+        },
+        {
+          key: "15",
+          label: t("parts_orders.labels.discount", { percent: "15%" }),
+        },
+        {
+          key: "20",
+          label: t("parts_orders.labels.discount", { percent: "20%" }),
+        },
+        {
+          key: "25",
+          label: t("parts_orders.labels.discount", { percent: "25%" }),
+        },
+        {
+          key: "custom",
+          label: (
+            <InputNumber
+              onClick={(e) => e.stopPropagation()}
+              addonAfter="%"
+              onKeyUp={(e) => {
+                if (e.key === "Enter") {
+                  const values = form.getFieldsValue();
+                  const { parts_order_lines } = values;
+
+                  form.setFieldsValue({
+                    parts_order_lines: {
+                      data: parts_order_lines.data.map((p, idx) => {
+                        if (idx !== field.name) return p;
+                        console.log(
+                          p,
+                          e.target.value,
+                          (p.act_price || 0) *
+                            ((100 - (e.target.value || 0)) / 100)
+                        );
+                        return {
+                          ...p,
+                          act_price:
+                            (p.act_price || 0) *
+                            ((100 - (e.target.value || 0)) / 100),
+                        };
+                      }),
+                    },
+                  });
+                  e.target.value = 0;
+                }
+              }}
+              min={0}
+              max={100}
+            />
+          ),
+        },
+      ]}
+    />
+  );
+  return (
+    <Dropdown overlay={menu} trigger="click">
+      <Space>
+        %
+        <DownOutlined />
+      </Space>
+    </Dropdown>
+  );
+}

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -23,6 +23,7 @@ import CurrencyInput from "../form-items-formatted/currency-form-item.component"
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
+import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -133,6 +134,21 @@ export function PartsOrderModalComponent({
             <Checkbox />
           </Form.Item>
         )}
+
+        <Form.Item
+          name="order_type"
+          initialValue="parts_order"
+          label={t("parts_orders.labels.order_type")}
+        >
+          <Radio.Group disabled={sendType === "oec"}>
+            <Radio value={"parts_order"}>
+              {t("parts_orders.labels.parts_order")}
+            </Radio>
+            <Radio value={"sublet"}>
+              {t("parts_orders.labels.sublet_order")}
+            </Radio>
+          </Radio.Group>
+        </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">
         {t("parts_orders.labels.inthisorder")}
@@ -246,7 +262,14 @@ export function PartsOrderModalComponent({
                         key={`${index}act_price`}
                         name={[field.name, "act_price"]}
                       >
-                        <CurrencyInput />
+                        <CurrencyInput
+                          addonBefore={
+                            <PartsOrderModalPriceChange
+                              form={form}
+                              field={field}
+                            />
+                          }
+                        />
                       </Form.Item>
                       {isReturn && (
                         <Form.Item

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -94,6 +94,7 @@ export function PartsOrderModalContainer({
   const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleFinish = async ({
+    order_type,
     removefrompartsqueue,
     is_quote,
     ...values
@@ -102,47 +103,46 @@ export function PartsOrderModalContainer({
     setSaving(true);
     let insertResult;
 
-      insertResult = await insertPartOrder({
-        variables: {
-          po: [
-            {
-              ...values,
-              order_date: moment().format("YYYY-MM-DD"),
-              orderedby: currentUser.email,
-              jobid: jobId,
-              user_email: currentUser.email,
-              return: isReturn,
-              status: is_quote
-                ? bodyshop.md_order_statuses.default_quote || "Quote"
-                : bodyshop.md_order_statuses.default_ordered || "Ordered*",
-            },
-          ],
-        },
-        refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+    insertResult = await insertPartOrder({
+      variables: {
+        po: [
+          {
+            ...values,
+            order_date: moment().format("YYYY-MM-DD"),
+            orderedby: currentUser.email,
+            jobid: jobId,
+            user_email: currentUser.email,
+            return: isReturn,
+            status: is_quote
+              ? bodyshop.md_order_statuses.default_quote || "Quote"
+              : bodyshop.md_order_statuses.default_ordered || "Ordered*",
+          },
+        ],
+      },
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+    });
+    if (!!insertResult.errors) {
+      notification["error"]({
+        message: t("parts_orders.errors.creating"),
+        description: JSON.stringify(insertResult.errors),
       });
-      if (!!insertResult.errors) {
-        notification["error"]({
-          message: t("parts_orders.errors.creating"),
-          description: JSON.stringify(insertResult.errors),
-        });
-        return;
-      }
-      notification["success"]({
-        message: values.isReturn
-          ? t("parts_orders.successes.return_created")
-          : t("parts_orders.successes.created"),
-      });
-      insertAuditTrail({
-        jobid: jobId,
-        operation: isReturn
-          ? AuditTrailMapping.jobspartsreturn(
-              insertResult.data.insert_parts_orders.returning[0].order_number
-            )
-          : AuditTrailMapping.jobspartsorder(
-              insertResult.data.insert_parts_orders.returning[0].order_number
-            ),
-      });
-    
+      return;
+    }
+    notification["success"]({
+      message: values.isReturn
+        ? t("parts_orders.successes.return_created")
+        : t("parts_orders.successes.created"),
+    });
+    insertAuditTrail({
+      jobid: jobId,
+      operation: isReturn
+        ? AuditTrailMapping.jobspartsreturn(
+            insertResult.data.insert_parts_orders.returning[0].order_number
+          )
+        : AuditTrailMapping.jobspartsorder(
+            insertResult.data.insert_parts_orders.returning[0].order_number
+          ),
+    });
 
     const jobLinesResult = await updateJobLines({
       variables: {
@@ -228,7 +228,9 @@ export function PartsOrderModalContainer({
         {
           name: isReturn
             ? Templates.parts_return_slip.key
-            : Templates.parts_order.key,
+            : order_type === "parts_order"
+            ? Templates.parts_order.key
+            : Templates.sublet_order.key,
           variables: {
             id: insertResult.data.insert_parts_orders.returning[0].id,
           },
@@ -238,7 +240,9 @@ export function PartsOrderModalContainer({
           replyTo: bodyshop.email,
           subject: isReturn
             ? Templates.parts_return_slip.subject
-            : Templates.parts_order.subject,
+            : order_type === "parts_order"
+            ? Templates.parts_order.subject
+            : Templates.sublet_order.subject,
         },
         "e",
         jobId
@@ -248,7 +252,9 @@ export function PartsOrderModalContainer({
         {
           name: isReturn
             ? Templates.parts_return_slip.key
-            : Templates.parts_order.key,
+            : order_type === "parts_order"
+            ? Templates.parts_order.key
+            : Templates.sublet_order.key,
           variables: {
             id: insertResult.data.insert_parts_orders.returning[0].id,
           },

client/src/components/payable-export-all-button/payable-export-all-button.component.jsx

@@ -14,6 +14,7 @@ import {
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import _ from "lodash";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -176,6 +177,13 @@ export function PayableExportAll({
     setLoading(false);
   };
 
+  if (bodyshop.pbs_serialnumber)
+    return (
+      <Link to={{ state: { billids }, pathname: `/manage/dmsap` }}>
+        <Button>{t("jobs.actions.export")}</Button>
+      </Link>
+    );
+
   return (
     <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
       {t("jobs.actions.exportselected")}

client/src/components/payable-export-button/payable-export-button.component.jsx

@@ -13,6 +13,7 @@ import {
 } from "../../redux/user/user.selectors";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -179,6 +180,13 @@ export function PayableExportButton({
     setLoading(false);
   };
 
+  if (bodyshop.pbs_serialnumber)
+    return (
+      <Link to={{ state: { billids: [billId] }, pathname: `/manage/dmsap` }}>
+        <Button>{t("jobs.actions.export")}</Button>
+      </Link>
+    );
+
   return (
     <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
       {t("jobs.actions.export")}

client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx

@@ -1,5 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
+import { Button, notification, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -34,6 +34,7 @@ export function BillMarkSelectedExported({
 }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  const [visible, setVisible] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
   const [updateBill] = useMutation(gql`
     mutation UPDATE_BILL($billIds: [uuid!]!) {
@@ -84,11 +85,24 @@ export function BillMarkSelectedExported({
     completedCallback && completedCallback([]);
     setLoading(false);
     refetch && refetch();
+    setVisible(false);
   };
 
   return (
-    <Button loading={loading} disabled={disabled} onClick={handleUpdate}>
-      {t("bills.labels.markexported")}
-    </Button>
+    <Popconfirm
+      visible={visible}
+      title={t("general.labels.areyousure")}
+      onCancel={() => setVisible(false)}
+      onConfirm={handleUpdate}
+      disabled={disabled}
+    >
+      <Button
+        loading={loading}
+        disabled={disabled}
+        onClick={() => setVisible(true)}
+      >
+        {t("bills.labels.markexported")}
+      </Button>
+    </Popconfirm>
   );
 }

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

@@ -1,3 +1,4 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { CardElement } from "@stripe/react-stripe-js";
 import { Checkbox, Form, Input, Radio, Select } from "antd";
 import React from "react";
@@ -23,6 +24,11 @@ export function PaymentFormComponent({
   disabled,
 }) {
   const [stripeState, setStripeState] = stripeStateArr;
+  const { Qb_Multi_Ar } = useTreatments(
+    ["Qb_Multi_Ar"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   const { t } = useTranslation();
   const handleStripeChange = (e) => {
@@ -106,9 +112,21 @@ export function PaymentFormComponent({
             <Select.Option value={t("payments.labels.customer")}>
               {t("payments.labels.customer")}
             </Select.Option>
-            <Select.Option value={t("payments.labels.insurance")}>
-              {t("payments.labels.insurance")}
-            </Select.Option>
+            {Qb_Multi_Ar.treatment === "on" ? (
+              <>
+                <Select.OptGroup label={t("payments.labels.external")}>
+                  {bodyshop.md_ins_cos.map((i, idx) => (
+                    <Select.Option key={idx} value={i.name}>
+                      {i.name}
+                    </Select.Option>
+                  ))}
+                </Select.OptGroup>
+              </>
+            ) : (
+              <Select.Option value={t("payments.labels.insurance")}>
+                {t("payments.labels.insurance")}
+              </Select.Option>
+            )}
           </Select>
         </Form.Item>
 

client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx

@@ -0,0 +1,111 @@
+import { gql, useMutation } from "@apollo/client";
+import { Button, notification, Popconfirm } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PaymentMarkSelectedExported);
+
+export function PaymentMarkSelectedExported({
+  bodyshop,
+  currentUser,
+  paymentIds,
+  disabled,
+  loadingCallback,
+  completedCallback,
+  refetch,
+}) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const [visible, setVisible] = useState(false);
+
+  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [updatePayments] = useMutation(gql`
+    mutation UPDATE_PAYMENTS($paymentIds: [uuid!]!, $exportedat: timestamptz!) {
+      update_payments(
+        where: { id: { _in: $paymentIds } }
+        _set: { exportedat: $exportedat }
+      ) {
+        returning {
+          id
+          exportedat
+        }
+      }
+    }
+  `);
+
+  const handleUpdate = async () => {
+    setLoading(true);
+    loadingCallback(true);
+    const result = await updatePayments({
+      variables: { paymentIds: paymentIds, exportedat: new Date() },
+      update(cache) {},
+    });
+
+    await insertExportLog({
+      variables: {
+        logs: paymentIds.map((id) => {
+          return {
+            bodyshopid: bodyshop.id,
+            paymentid: id,
+            successful: true,
+            message: JSON.stringify([t("general.labels.markedexported")]),
+            useremail: currentUser.email,
+          };
+        }),
+      },
+    });
+
+    if (!result.errors) {
+      notification["success"]({
+        message: t("payments.successes.markexported"),
+      });
+    } else {
+      notification["error"]({
+        message: t("bills.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    loadingCallback(false);
+    completedCallback && completedCallback([]);
+    setLoading(false);
+    refetch && refetch();
+    setVisible(false);
+  };
+
+  return (
+    <Popconfirm
+      visible={visible}
+      title={t("general.labels.areyousure")}
+      onCancel={() => setVisible(false)}
+      onConfirm={handleUpdate}
+      disabled={disabled}
+    >
+      <Button
+        loading={loading}
+        disabled={disabled}
+        onClick={() => setVisible(true)}
+      >
+        {t("bills.labels.markexported")}
+      </Button>
+    </Popconfirm>
+  );
+}

client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx

@@ -1,4 +1,4 @@
-import { Button, Card, Form, InputNumber, Popover } from "antd";
+import { Button, Card, Form, InputNumber, Popover, Radio } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -24,7 +24,8 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
-  const handleOk = () => {
+  const handleOk = (e) => {
+    e.stopPropagation();
     form.submit();
     setIsModalVisible(false);
   };
@@ -33,12 +34,12 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
     setIsModalVisible(false);
     setLoading(false);
   };
-  const handleFinish = async (values) => {
+  const handleFinish = async ({ template, ...values }) => {
     const { sendtype, ...restVals } = values;
     setLoading(true);
     await GenerateDocument(
       {
-        name: TemplateList("job_special").folder_label_multiple.key,
+        name: TemplateList("job_special")[template].key,
         variables: { id: jobId },
         context: restVals,
       },
@@ -48,6 +49,7 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
     );
     setLoading(false);
     setIsModalVisible(false);
+    form.resetFields();
   };
 
   const content = (
@@ -58,13 +60,28 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
         layout="vertical"
         form={form}
       >
+        <Form.Item required name="template">
+          <Radio.Group>
+            <Radio.Button value="parts_label_multiple">
+              {t("printcenter.jobs.parts_label_multiple")}
+            </Radio.Button>
+            <Radio.Button value="folder_label_multiple">
+              {t("printcenter.jobs.folder_label_multiple")}
+            </Radio.Button>
+          </Radio.Group>
+        </Form.Item>
         <Form.Item
+          required
           label={t("printcenter.jobs.labels.position")}
           name="position"
         >
           <InputNumber min={1} precision={0} />
         </Form.Item>
-        <Form.Item label={t("printcenter.jobs.labels.count")} name="count">
+        <Form.Item
+          required
+          label={t("printcenter.jobs.labels.count")}
+          name="count"
+        >
           <InputNumber min={1} precision={0} max={99} />
         </Form.Item>
         <Button type="primary" loading={loading} onClick={handleOk}>

client/src/components/print-center-jobs/print-center-jobs.component.jsx

@@ -20,7 +20,7 @@ const mapDispatchToProps = (dispatch) => ({});
 
 export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
   const [search, setSearch] = useState("");
-  const { id: jobId } = printCenterModal.context;
+  const { id: jobId, job } = printCenterModal.context;
   const tempList = TemplateList("job", {});
   const { t } = useTranslation();
   const JobsReportsList = Object.keys(tempList)
@@ -54,7 +54,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
             extra={
               <Space wrap>
                 <PrintCenterJobsLabels jobId={jobId} />
-                <Jobd3RdPartyModal jobId={jobId} />
+                <Jobd3RdPartyModal jobId={jobId} job={job} />
                 <Input.Search
                   onChange={(e) => setSearch(e.target.value)}
                   value={search}

client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx

@@ -3,8 +3,9 @@ import {
   EyeFilled,
   DownloadOutlined,
   PauseCircleOutlined,
+  BranchesOutlined,
 } from "@ant-design/icons";
-import { Card, Col, Row, Space } from "antd";
+import { Card, Col, Row, Space, Tooltip } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -63,6 +64,11 @@ export default function ProductionBoardCard(
           {card.suspended && (
             <PauseCircleOutlined style={{ color: "orangered" }} />
           )}
+          {card.iouparent && (
+            <Tooltip title={t("jobs.labels.iou")}>
+              <BranchesOutlined style={{ color: "orangered" }} />
+            </Tooltip>
+          )}
           <span style={{ fontWeight: "bolder" }}>
             <Link
               to={

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,5 +1,5 @@
-import { PauseCircleOutlined } from "@ant-design/icons";
-import { Space } from "antd";
+import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
+import { Space, Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import { Link } from "react-router-dom";
@@ -61,6 +61,11 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
               {record.suspended && (
                 <PauseCircleOutlined style={{ color: "orangered" }} />
               )}
+              {record.iouparent && (
+                <Tooltip title={i18n.t("jobs.labels.iou")}>
+                  <BranchesOutlined style={{ color: "orangered" }} />
+                </Tooltip>
+              )}
             </Space>
           </Link>
         ),

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js

@@ -40,7 +40,10 @@ export function ScheduleCalendarHeaderComponent({
     if (!events) return [];
     return _.groupBy(
       events.filter(
-        (e) => !e.vacation && moment(date).isSame(moment(e.start), "day")
+        (e) =>
+          !e.vacation &&
+          e.isintake &&
+          moment(date).isSame(moment(e.start), "day")
       ),
       "job.alt_transport"
     );

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -1,6 +1,8 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Col, PageHeader, Row, Space } from "antd";
-import React from "react";
+import { Button, Card, Checkbox, Col, PageHeader, Row, Space } from "antd";
+import { t } from "i18next";
+import React, { useMemo } from "react";
+import useLocalStorage from "../../utils/useLocalStorage";
 import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component";
 import ScheduleModal from "../schedule-job-modal/schedule-job-modal.container";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
@@ -8,6 +10,23 @@ import ScheduleProductionList from "../schedule-production-list/schedule-product
 import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verify-integrity.component";
 
 export default function ScheduleCalendarComponent({ data, refetch }) {
+  const [filter, setFilter] = useLocalStorage("filter_events", {
+    intake: true,
+    manual: true,
+    employeevacation: true,
+  });
+  const filteredData = useMemo(() => {
+    return data.filter(
+      (d) =>
+        d.block ||
+        (filter.intake && d.isintake) ||
+        (filter.manual && !d.isintake && d.block === false) ||
+        (d.__typename === "employee_vacation" &&
+          filter.employeevacation &&
+          !!d.employee)
+    );
+  }, [data, filter]);
+
   return (
     <Row gutter={[16, 16]}>
       <ScheduleModal />
@@ -16,6 +35,30 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
         <PageHeader
           extra={
             <Space wrap>
+              <Checkbox
+                checked={filter?.intake}
+                onChange={(e) => {
+                  setFilter({ ...filter, intake: e.target.checked });
+                }}
+              >
+                {t("schedule.labels.intake")}
+              </Checkbox>
+              <Checkbox
+                checked={filter?.manual}
+                onChange={(e) => {
+                  setFilter({ ...filter, manual: e.target.checked });
+                }}
+              >
+                {t("schedule.labels.manual")}
+              </Checkbox>
+              <Checkbox
+                checked={filter?.employeevacation}
+                onChange={(e) => {
+                  setFilter({ ...filter, employeevacation: e.target.checked });
+                }}
+              >
+                {t("schedule.labels.employeevacation")}
+              </Checkbox>
               <ScheduleVerifyIntegrity />
               <Button
                 onClick={() => {
@@ -35,7 +78,7 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
       <Col span={24}>
         <Card>
           <ScheduleCalendarWrapperComponent
-            data={data}
+            data={filteredData}
             refetch={refetch}
             style={{ height: "100rem" }}
           />

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -16,6 +16,7 @@ import DataLabel from "../data-label/data-label.component";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
@@ -37,7 +38,16 @@ export default connect(
 
 export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
   const { t } = useTranslation();
-
+  const { Qb_Multi_Ar } = useTreatments(
+    ["Qb_Multi_Ar"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+  const { DmsAp } = useTreatments(
+    ["DmsAp"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
   const [costOptions, setCostOptions] = useState(
     [
       ...((form.getFieldValue(["md_responsibility_centers", "costs"]) &&
@@ -138,6 +148,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 <Switch />
               </Form.Item>
             )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.disablebillwip")}
+                valuePropName="checked"
+                name={["pbs_configuration", "disablebillwip"]}
+              >
+                <Switch />
+              </Form.Item>
+            )}
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>
@@ -4153,6 +4172,121 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
+      {DmsAp.treatment === "on" && (
+        <LayoutFormRow>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.federal_tax_itc")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "taxes", "federal_itc", "name"]}
+          >
+            <Input />
+          </Form.Item>
+          {/* <Form.Item
+          label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={[
+            "md_responsibility_centers",
+            "taxes",
+            "federal_itc",
+            "accountnumber",
+          ]}
+        >
+          <Input />
+        </Form.Item> */}
+          {/* <Form.Item
+          label={t("bodyshop.fields.responsibilitycenter_accountname")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={[
+            "md_responsibility_centers",
+            "taxes",
+            "federal_itc",
+            "accountname",
+          ]}
+        >
+          <Input />
+        </Form.Item> */}
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={[
+              "md_responsibility_centers",
+              "taxes",
+              "federal_itc",
+              "accountdesc",
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_accountitem")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={[
+              "md_responsibility_centers",
+              "taxes",
+              "federal_itc",
+              "accountitem",
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
+            <Form.Item
+              label={t("bodyshop.fields.dms.dms_acctnumber")}
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+              name={[
+                "md_responsibility_centers",
+                "taxes",
+                "federal_itc",
+                "dms_acctnumber",
+              ]}
+            >
+              <Input />
+            </Form.Item>
+          )}
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_rate")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "taxes", "federal_itc", "rate"]}
+          >
+            <InputNumber precision={2} />
+          </Form.Item>
+        </LayoutFormRow>
+      )}
       <LayoutFormRow>
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.state_tax")}
@@ -4411,68 +4545,71 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <Input />
         </Form.Item> */}
       </LayoutFormRow>
-      {/* <LayoutFormRow>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenters.ap")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "ap", "name"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "ap", "accountnumber"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountname")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "ap", "accountname"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "ap", "accountdesc"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountitem")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "ap", "accountitem"]}
-        >
-          <Input />
-        </Form.Item>
-      </LayoutFormRow> */}
+
+      {DmsAp.treatment === "on" && (
+        <LayoutFormRow header={t("bodyshop.fields.responsibilitycenters.ap")}>
+          {/* <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.ap")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "ap", "name"]}
+          >
+            <Input />
+          </Form.Item> */}
+          {/* <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "ap", "accountnumber"]}
+          >
+            <Input />
+          </Form.Item> */}
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_accountname")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "ap", "accountname"]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "ap", "accountdesc"]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "ap", "dms_acctnumber"]}
+          >
+            <Input />
+          </Form.Item>
+        </LayoutFormRow>
+      )}
       <LayoutFormRow header={<div>Refund</div>}>
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.refund")}
@@ -4535,6 +4672,26 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
+      {Qb_Multi_Ar.treatment === "on" && (
+        <LayoutFormRow header={<div>Multiple Payers Item</div>}>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenter_accountitem")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={[
+              "md_responsibility_centers",
+              "qb_multiple_payers",
+              "accountitem",
+            ]}
+          >
+            <Input />
+          </Form.Item>
+        </LayoutFormRow>
+      )}
       <Typography.Title level={4}>
         {t("bodyshop.labels.responsibilitycenters.sales_tax_codes")}
       </Typography.Title>

client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx

@@ -27,6 +27,7 @@ export function TimeTicektShiftContainer({
   technician,
   currentUser,
   isTechConsole,
+  checkIfAlreadyClocked,
 }) {
   const [form] = Form.useForm();
   const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET);
@@ -43,36 +44,47 @@ export function TimeTicektShiftContainer({
 
   const handleFinish = async (values) => {
     setLoading(true);
-    const theTime = moment((await axios.post("/utils/time")).data);
 
-    const result = await insertTimeTicket({
-      variables: {
-        timeTicketInput: [
-          {
-            bodyshopid: bodyshop.id,
-            employeeid: isTechConsole ? technician.id : employeeId,
-            cost_center: "timetickets.labels.shift",
-            clockon: theTime,
-            date: theTime,
-            memo: values.memo,
-          },
-        ],
-      },
-      awaitRefetchQueries: true,
-      refetchQueries: ["QUERY_ACTIVE_SHIFT_TIME_TICKETS"],
-    });
+    const alreadyClocked = await checkIfAlreadyClocked();
 
-    if (!!result.errors) {
+    if (alreadyClocked) {
+      //Show the error.
       notification["error"]({
-        message: t("timetickets.errors.clockingin", {
-          message: JSON.stringify(result.errors),
-        }),
+        message: t("timetickets.errors.shiftalreadyclockedon"),
       });
     } else {
-      notification["success"]({
-        message: t("timetickets.successes.clockedin"),
+      const theTime = moment((await axios.post("/utils/time")).data);
+
+      const result = await insertTimeTicket({
+        variables: {
+          timeTicketInput: [
+            {
+              bodyshopid: bodyshop.id,
+              employeeid: isTechConsole ? technician.id : employeeId,
+              cost_center: "timetickets.labels.shift",
+              clockon: theTime,
+              date: theTime,
+              memo: values.memo,
+            },
+          ],
+        },
+        awaitRefetchQueries: true,
+        refetchQueries: ["QUERY_ACTIVE_SHIFT_TIME_TICKETS"],
       });
+
+      if (!!result.errors) {
+        notification["error"]({
+          message: t("timetickets.errors.clockingin", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        notification["success"]({
+          message: t("timetickets.successes.clockedin"),
+        });
+      }
     }
+
     setLoading(false);
   };
 

client/src/components/time-ticket-shift/time-ticket-shift.container.jsx

@@ -64,6 +64,12 @@ export function TimeTicketShiftContainer({
       </div>
     );
 
+  const checkIfAlreadyClocked = async () => {
+    const { data } = await refetch();
+
+    return data.timetickets.length > 0;
+  };
+
   return (
     <div>
       {data.timetickets.length > 0 ? (
@@ -72,7 +78,10 @@ export function TimeTicketShiftContainer({
           refetch={refetch}
         />
       ) : (
-        <TimeTicketShiftFormContainer isTechConsole={isTechConsole} />
+        <TimeTicketShiftFormContainer
+          isTechConsole={isTechConsole}
+          checkIfAlreadyClocked={checkIfAlreadyClocked}
+        />
       )}
     </div>
   );

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

@@ -1,5 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
   Divider,
@@ -20,7 +21,23 @@ import PhoneFormItem, {
 } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorsPhonebookAdd from "../vendors-phonebook-add/vendors-phonebook-add.component";
-export default function VendorsFormComponent({
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(VendorsFormComponent);
+
+export function VendorsFormComponent({
+  bodyshop,
   form,
   formLoading,
   handleDelete,
@@ -29,6 +46,12 @@ export default function VendorsFormComponent({
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
+  const { DmsAp } = useTreatments(
+    ["DmsAp"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
   const { getFieldValue } = form;
   return (
     <div>
@@ -184,6 +207,12 @@ export default function VendorsFormComponent({
           // </Form.Item>
         }
       </LayoutFormRow>
+
+      {DmsAp.treatment === "on" && (
+        <Form.Item label={t("vendors.fields.dmsid")} name="dmsid">
+          <Input />
+        </Form.Item>
+      )}
       <Divider align="left">{t("vendors.labels.preferredmakes")}</Divider>
       <Form.List name="favorite">
         {(fields, { add, remove }) => {

client/src/firebase/firebase.utils.js

@@ -53,7 +53,6 @@ export const requestForToken = () => {
   })
     .then((currentToken) => {
       if (currentToken) {
-        console.log("current token for client: ", currentToken);
         window.sessionStorage.setItem("fcmtoken", currentToken);
         // Perform any other necessary action with the token
       } else {

client/src/graphql/appointments.queries.js

@@ -1,77 +1,81 @@
 import { gql } from "@apollo/client";
 
 export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
-query QUERY_ALL_ACTIVE_APPOINTMENTS(
-  $start: timestamptz!
-  $end: timestamptz!
-  $startd: date!
-  $endd: date!
-) {
-  employee_vacation(
-    where: { _or: [{ start: { _gte: $startd } },
-      { end: { _lte: $endd } },
-      {_and:[{start:{_lte: $startd}},{end:{_gte:$endd}}]}] }
+  query QUERY_ALL_ACTIVE_APPOINTMENTS(
+    $start: timestamptz!
+    $end: timestamptz!
+    $startd: date!
+    $endd: date!
   ) {
-    id
-    start
-    end
-    employee {
+    employee_vacation(
+      where: {
+        _or: [
+          { start: { _gte: $startd } }
+          { end: { _lte: $endd } }
+          { _and: [{ start: { _lte: $startd } }, { end: { _gte: $endd } }] }
+        ]
+      }
+    ) {
       id
-      last_name
-      first_name
+      start
+      end
+      employee {
+        id
+        last_name
+        first_name
+      }
     }
-  }
-  appointments(
-    where: {
-      canceled: { _eq: false }
-      end: { _lte: $end }
-      start: { _gte: $start }
-    }
-  ) {
-    start
-    id
-    end
-    arrived
-    title
-    isintake
-    block
-    color
-    note
-    job {
-      alt_transport
-      ro_number
-      ownr_ln
-      ownr_co_nm
-      ownr_fn
-      ownr_ph1
-      ownr_ph2
-      ownr_ea
-      clm_total
+    appointments(
+      where: {
+        canceled: { _eq: false }
+        end: { _lte: $end }
+        start: { _gte: $start }
+      }
+    ) {
+      start
       id
-      clm_no
-      ins_co_nm
-      v_model_yr
-      v_make_desc
-      v_model_desc
-      labhrs: joblines_aggregate(
-        where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
-      ) {
-        aggregate {
-          sum {
-            mod_lb_hrs
+      end
+      arrived
+      title
+      isintake
+      block
+      color
+      note
+      job {
+        alt_transport
+        ro_number
+        ownr_ln
+        ownr_co_nm
+        ownr_fn
+        ownr_ph1
+        ownr_ph2
+        ownr_ea
+        clm_total
+        id
+        clm_no
+        ins_co_nm
+        v_model_yr
+        v_make_desc
+        v_model_desc
+        labhrs: joblines_aggregate(
+          where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
+        ) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
+          }
+        }
+        larhrs: joblines_aggregate(
+          where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }
+        ) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
           }
         }
       }
-      larhrs: joblines_aggregate(
-        where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }
-      ) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-    }
     }
   }
 `;
@@ -382,8 +386,8 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
   }
 `;
 
-export const MARK_LATEST_APPOINTMENT_AS_ARRIVED = gql`
-  mutation MARK_LATEST_APPOINTMENT_AS_ARRIVED($appointmentId: uuid!) {
+export const MARK_APPOINTMENT_ARRIVED = gql`
+  mutation MARK_APPOINTMENT_ARRIVED($appointmentId: uuid!) {
     update_appointments(
       where: { id: { _eq: $appointmentId } }
       _set: { arrived: true }
@@ -396,3 +400,21 @@ export const MARK_LATEST_APPOINTMENT_AS_ARRIVED = gql`
     }
   }
 `;
+export const MARK_LATEST_APPOINTMENT_ARRIVED = gql`
+  mutation MARK_LATEST_APPOINTMENT_ARRIVED($jobId: uuid!) {
+    update_appointments(
+      where: {
+        jobid: { _eq: $jobId }
+        canceled: { _eq: false }
+        isintake: { _eq: true }
+      }
+      _set: { arrived: true }
+    ) {
+      affected_rows
+      returning {
+        id
+        arrived
+      }
+    }
+  }
+`;

client/src/graphql/audit_trail.queries.js

@@ -13,6 +13,21 @@ export const QUERY_AUDIT_TRAIL = gql`
       created
       bodyshopid
     }
+    email_audit_trail(
+      where: { jobid: { _eq: $jobid } }
+      order_by: { created_at: desc }
+    ) {
+      cc
+      contents
+      created_at
+      id
+      jobid
+      noteid
+      subject
+      to
+      useremail
+      status
+    }
   }
 `;
 

client/src/graphql/jobs.queries.js

@@ -6,6 +6,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       where: { status: { _in: $statuses } }
       order_by: { created_at: desc }
     ) {
+      iouparent
       ownr_fn
       ownr_ln
       ownr_co_nm
@@ -109,6 +110,7 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
   query QUERY_EXACT_JOB_IN_PRODUCTION($id: uuid!) {
     jobs(where: { id: { _eq: $id } }) {
       id
+      iouparent
       status
       ro_number
       comment
@@ -187,6 +189,7 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
   query QUERY_EXACT_JOBS_IN_PRODUCTION($ids: [uuid!]!) {
     jobs(where: { id: { _in: $ids } }) {
       id
+      iouparent
       status
       ro_number
       comment
@@ -269,6 +272,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       comment
       status
       category
+      iouparent
       ro_number
       ownr_fn
       ownr_ln
@@ -609,6 +613,7 @@ export const GET_JOB_BY_PK = gql`
       materials
       auto_add_ats
       rate_ats
+      iouparent
       owner {
         id
         ownr_fn
@@ -850,7 +855,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         count
         status
       }
-      joblines {
+      joblines(where: { removed: { _eq: false } }) {
         id
         mod_lbr_ty
         mod_lb_hrs
@@ -1890,6 +1895,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       actual_in
       kmin
       kmout
+      qb_multiple_payers
       joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         id
         removed
@@ -2114,6 +2120,22 @@ export const DELETE_RELATED_RO = gql`
 `;
 export const GET_JOB_LINE_ORDERS = gql`
   query GET_JOB_LINE_ORDERS($joblineid: uuid!) {
+    billlines(where: { joblineid: { _eq: $joblineid } }) {
+      actual_cost
+      actual_price
+      billid
+      quantity
+      bill {
+        id
+        invoice_number
+        date
+        vendorid
+        vendor {
+          id
+          name
+        }
+      }
+    }
     parts_order_lines(where: { job_line_id: { _eq: $joblineid } }) {
       id
       act_price

client/src/graphql/vendors.queries.js

@@ -18,6 +18,7 @@ export const QUERY_VENDOR_BY_ID = gql`
       street1
       active
       phone
+      dmsid
     }
   }
 `;

client/src/pages/dms-payables/dms-payables.container.jsx

@@ -0,0 +1,163 @@
+import { Button, Card, Col, notification, Row, Select, Space } from "antd";
+import React, { useEffect, useRef, 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 SocketIO from "socket.io-client";
+import DmsAllocationsSummaryApComponent from "../../components/dms-allocations-summary-ap/dms-allocations-summary-ap.component";
+import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
+import { auth } from "../../firebase/firebase.utils";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
+
+export const socket = SocketIO(
+  process.env.NODE_ENV === "production"
+    ? process.env.REACT_APP_AXIOS_BASE_API_URL
+    : window.location.origin,
+  {
+    path: "/ws",
+    withCredentials: true,
+    auth: async (callback) => {
+      const token = auth.currentUser && (await auth.currentUser.getIdToken());
+      callback({ token });
+    },
+  }
+);
+
+export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+  const { t } = useTranslation();
+  const [logLevel, setLogLevel] = useState("DEBUG");
+  const history = useHistory();
+  const [logs, setLogs] = useState([]);
+
+  const { state } = useLocation();
+
+  const logsRef = useRef(null);
+
+  useEffect(() => {
+    document.title = t("titles.dms");
+    setSelectedHeader("dms");
+    setBreadcrumbs([
+      {
+        link: "/manage/accounting/payables",
+        label: t("titles.bc.accounting-payables"),
+      },
+      {
+        link: "/manage/dms",
+        label: t("titles.bc.dms"),
+      },
+    ]);
+  }, [t, setBreadcrumbs, setSelectedHeader]);
+
+  useEffect(() => {
+    socket.on("connect", () => socket.emit("set-log-level", logLevel));
+    socket.on("reconnect", () => {
+      setLogs((logs) => {
+        return [
+          ...logs,
+          {
+            timestamp: new Date(),
+            level: "WARNING",
+            message: "Reconnected to CDK Export Service",
+          },
+        ];
+      });
+    });
+
+    socket.on("log-event", (payload) => {
+      setLogs((logs) => {
+        return [...logs, payload];
+      });
+    });
+
+    socket.on("ap-export-complete", (payload) => {
+      notification.open({
+        type: "success",
+        message: t("jobs.labels.dms.apexported"),
+      });
+    });
+
+    if (socket.disconnected) socket.connect();
+    return () => {
+      socket.removeAllListeners();
+      socket.disconnect();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  if (!state?.billids) {
+    history.push(`/manage/accounting/payables`);
+  }
+
+  return (
+    <Row gutter={[16, 16]}>
+      <Col md={24} lg={12}>
+        <DmsAllocationsSummaryApComponent
+          socket={socket}
+          billids={state?.billids}
+        />
+      </Col>
+
+      <Col md={24} lg={12}>
+        <div ref={logsRef}>
+          <Card
+            title={t("jobs.labels.dms.logs")}
+            extra={
+              <Space wrap>
+                <Select
+                  placeholder="Log Level"
+                  value={logLevel}
+                  onChange={(value) => {
+                    setLogLevel(value);
+                    socket.emit("set-log-level", value);
+                  }}
+                >
+                  <Select.Option key="TRACE">TRACE</Select.Option>
+                  <Select.Option key="DEBUG">DEBUG</Select.Option>
+                  <Select.Option key="INFO">INFO</Select.Option>
+                  <Select.Option key="WARNING">WARNING</Select.Option>
+                  <Select.Option key="ERROR">ERROR</Select.Option>
+                </Select>
+                <Button onClick={() => setLogs([])}>Clear Logs</Button>
+                <Button
+                  onClick={() => {
+                    setLogs([]);
+
+                    socket.disconnect();
+                    socket.connect();
+                  }}
+                >
+                  Reconnect
+                </Button>
+              </Space>
+            }
+          >
+            <DmsLogEvents socket={socket} logs={logs} />
+          </Card>
+        </div>
+      </Col>
+    </Row>
+  );
+}
+
+export const determineDmsType = (bodyshop) => {
+  if (bodyshop.cdk_dealerid) return "cdk";
+  else {
+    return "pbs";
+  }
+};

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -1,35 +1,43 @@
+import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation } from "@apollo/client";
 import {
-  Button,
-  Form,
-  notification,
-  Popconfirm,
-  Space,
   Alert,
+  Button,
+  Col,
   Divider,
-  PageHeader,
-  InputNumber,
+  Form,
   Input,
+  InputNumber,
+  notification,
+  PageHeader,
+  Popconfirm,
+  Row,
+  Select,
+  Space,
+  Statistic,
   Switch,
+  Typography,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 //import { useHistory } from "react-router-dom";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import moment from "moment";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import DateTimePicker from "../../components/form-date-time-picker/form-date-time-picker.component";
 import FormsFieldChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
+import CurrencyInput from "../../components/form-items-formatted/currency-form-item.component";
 import JobsScoreboardAdd from "../../components/job-scoreboard-add-button/job-scoreboard-add-button.component";
 import JobsCloseAutoAllocate from "../../components/jobs-close-auto-allocate/jobs-close-auto-allocate.component";
 import JobsCloseLines from "../../components/jobs-close-lines/jobs-close-lines.component";
+import LayoutFormRow from "../../components/layout-form-row/layout-form-row.component";
 import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import LayoutFormRow from "../../components/layout-form-row/layout-form-row.component";
-import DateTimePicker from "../../components/form-date-time-picker/form-date-time-picker.component";
-import moment from "moment";
-import { Link } from "react-router-dom";
-
+import Dinero from "dinero.js";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
@@ -42,6 +50,11 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
   // const history = useHistory();
   const [closeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
+  const { Qb_Multi_Ar } = useTreatments(
+    ["Qb_Multi_Ar"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   const handleFinish = async ({ removefromproduction, ...values }) => {
     setLoading(true);
@@ -65,6 +78,9 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           kmout: values.kmout,
           dms_allocation: values.dms_allocation,
           ...(removefromproduction ? { inproduction: false } : {}),
+          ...(values.qb_multiple_payers
+            ? { qb_multiple_payers: values.qb_multiple_payers }
+            : {}),
         },
       },
       refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
@@ -127,6 +143,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           kmin: job.kmin,
           kmout: job.kmout,
           dms_allocation: job.dms_allocation,
+          qb_multiple_payers: job.qb_multiple_payers,
         }}
         scrollToFirstError
       >
@@ -312,6 +329,165 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
             </Form.Item>
           )}
         </LayoutFormRow>
+        <Divider>{t("jobs.labels.multipayers")}</Divider>
+        {Qb_Multi_Ar.treatment === "on" && (
+          <Row gutter={[16, 16]}>
+            <Col lg={8} md={24}>
+              <Form.List
+                name={["qb_multiple_payers"]}
+                rules={[
+                  ({ getFieldValue }) => ({
+                    validator(_, value) {
+                      let totalAllocated = Dinero();
+
+                      const payers = form.getFieldValue("qb_multiple_payers");
+                      payers &&
+                        payers.forEach((payer) => {
+                          totalAllocated = totalAllocated.add(
+                            Dinero({
+                              amount: Math.round((payer?.amount || 0) * 100),
+                            })
+                          );
+                        });
+                      const discrep = job.job_totals
+                        ? Dinero(job.job_totals.totals.total_repairs).subtract(
+                            totalAllocated
+                          )
+                        : Dinero();
+                      return discrep.getAmount() >= 0
+                        ? Promise.resolve()
+                        : Promise.reject(
+                            new Error(
+                              t("jobs.labels.additionalpayeroverallocation")
+                            )
+                          );
+                    },
+                  }),
+                ]}
+              >
+                {(fields, { add, remove }) => {
+                  return (
+                    <div>
+                      {fields.map((field, index) => (
+                        <Form.Item key={field.key}>
+                          <Space>
+                            <Form.Item
+                              label={t("jobs.fields.qb_multiple_payers.name")}
+                              key={`${index}name`}
+                              name={[field.name, "name"]}
+                              rules={[
+                                {
+                                  required: true,
+                                },
+                              ]}
+                            >
+                              <Select
+                                style={{ minWidth: "12rem" }}
+                                disabled={jobRO}
+                              >
+                                {bodyshop.md_ins_cos.map((s) => (
+                                  <Select.Option key={s.name} value={s.name}>
+                                    {s.name}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+
+                            <Form.Item
+                              label={t("jobs.fields.qb_multiple_payers.amount")}
+                              key={`${index}amount`}
+                              name={[field.name, "amount"]}
+                              rules={[
+                                {
+                                  required: true,
+                                },
+                              ]}
+                            >
+                              <CurrencyInput min={0} disabled={jobRO} />
+                            </Form.Item>
+
+                            <DeleteFilled
+                              disabled={jobRO}
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                          </Space>
+                        </Form.Item>
+                      ))}
+                      <Form.Item>
+                        <Button
+                          disabled={jobRO}
+                          onClick={() => {
+                            add();
+                          }}
+                          style={{ width: "100%" }}
+                        >
+                          {t("jobs.actions.dms.addpayer")}
+                        </Button>
+                      </Form.Item>
+                    </div>
+                  );
+                }}
+              </Form.List>
+            </Col>
+            <Col lg={16} md={24}>
+              <Form.Item shouldUpdate>
+                {() => {
+                  //Perform Calculation to determine discrepancy.
+                  let totalAllocated = Dinero();
+
+                  const payers = form.getFieldValue("qb_multiple_payers");
+                  payers &&
+                    payers.forEach((payer) => {
+                      totalAllocated = totalAllocated.add(
+                        Dinero({
+                          amount: Math.round((payer?.amount || 0) * 100),
+                        })
+                      );
+                    });
+                  const discrep = job.job_totals
+                    ? Dinero(job.job_totals.totals.total_repairs).subtract(
+                        totalAllocated
+                      )
+                    : Dinero();
+                  return (
+                    <Space size="large" wrap align="center">
+                      <Statistic
+                        title={t("jobs.labels.total_cust_payable")}
+                        value={(job.job_totals
+                          ? Dinero(job.job_totals.totals.custPayable)
+                          : Dinero()
+                        ).toFormat()}
+                      />
+                      <Divider type="vertical" />
+                      <Statistic
+                        title={t("jobs.labels.total_repairs")}
+                        value={(job.job_totals
+                          ? Dinero(job.job_totals.totals.total_repairs)
+                          : Dinero()
+                        ).toFormat()}
+                      />
+                      <Typography.Title>-</Typography.Title>
+                      <Statistic
+                        title={t("jobs.labels.dms.totalallocated")}
+                        value={totalAllocated.toFormat()}
+                      />
+                      <Typography.Title>=</Typography.Title>
+                      <Statistic
+                        title={t("jobs.labels.pimraryamountpayable")}
+                        valueStyle={{
+                          color: discrep.getAmount() > 0 ? "green" : "red",
+                        }}
+                        value={discrep.toFormat()}
+                      />
+                    </Space>
+                  );
+                }}
+              </Form.Item>
+            </Col>
+          </Row>
+        )}
         <Divider />
         <JobsCloseLines job={job} />
       </Form>

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -89,6 +89,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     let job = Object.assign(
       {},
       values,
+      { date_open: new Date() },
       {
         vehicle:
           state.vehicle.selectedid || state.vehicle.none

client/src/pages/manage/manage.page.component.jsx

@@ -164,6 +164,9 @@ const EmailTest = lazy(() =>
 );
 const Dashboard = lazy(() => import("../dashboard/dashboard.container"));
 const Dms = lazy(() => import("../dms/dms.container"));
+const DmsPayables = lazy(() =>
+  import("../dms-payables/dms-payables.container")
+);
 
 const { Content, Footer } = Layout;
 
@@ -391,6 +394,7 @@ export function Manage({ match, conflict, bodyshop }) {
       <Route exact path={`${match.path}/emailtest`} component={EmailTest} />
       <Route exact path={`${match.path}/dashboard`} component={Dashboard} />
       <Route exact path={`${match.path}/dms`} component={Dms} />
+      <Route exact path={`${match.path}/dmsap`} component={DmsPayables} />
     </Suspense>
   );
 

client/src/pages/parts-queue/parts-queue.page.component.jsx

@@ -1,6 +1,7 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Input, Space, Table } from "antd";
+import _ from "lodash";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +15,6 @@ import OwnerNameDisplay from "../../components/owner-name-display/owner-name-dis
 import ProductionListColumnComment from "../../components/production-list-columns/production-list-columns.comment.component";
 import { QUERY_PARTS_QUEUE } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
 import { DateTimeFormatter, TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
@@ -94,6 +94,14 @@ export function PartsQueuePageComponent({ bodyshop }) {
     //  searchParams.page = pagination.current;
     searchParams.sortcolumn = sorter.columnKey;
     searchParams.sortorder = sorter.order;
+
+    if (filters.status) {
+      searchParams.statusFilters = JSON.stringify(
+        _.flattenDeep(filters.status)
+      );
+    } else {
+      delete searchParams.statusFilters;
+    }
     setFilter(filters);
     history.push({ search: queryString.stringify(searchParams) });
   };
@@ -136,19 +144,14 @@ export function PartsQueuePageComponent({ bodyshop }) {
       key: "status",
       sorter: (a, b) => alphaSort(a.status, b.status),
       sortOrder: sortcolumn === "status" && sortorder,
+      filteredValue: statusFilters ? JSON.parse(statusFilters) : null,
       filters:
-        (jobs &&
-          jobs
-            .map((j) => j.status)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Status*",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.status),
+        bodyshop.md_ro_statuses.active_statuses.map((s) => {
+          return {
+            text: s || "No Status*",
+            value: [s],
+          };
+        }) || [],
       render: (text, record) => {
         return record.status || t("general.labels.na");
       },

client/src/redux/media/media.sagas.js

@@ -39,6 +39,11 @@ export function* getJobMedia({ payload: jobid }) {
                 thumbnail: normalizeUrl(
                   `${localmediaserverhttp}/${d.thumbnail}`
                 ),
+                ...(d.optimized && {
+                  optimized: normalizeUrl(
+                    `${localmediaserverhttp}/${d.optimized}`
+                  ),
+                }),
                 isSelected: false,
                 key: idx,
               };
@@ -50,6 +55,7 @@ export function* getJobMedia({ payload: jobid }) {
                 thumbnail: normalizeUrl(
                   `${localmediaserverhttp}/${d.thumbnail}`
                 ),
+
                 isSelected: false,
                 key: idx,
               };
@@ -91,6 +97,11 @@ export function* getBillMedia({ payload: { jobid, invoice_number } }) {
                 thumbnail: normalizeUrl(
                   `${localmediaserverhttp}/${d.thumbnail}`
                 ),
+                ...(d.optimized && {
+                  optimized: normalizeUrl(
+                    `${localmediaserverhttp}/${d.optimized}`
+                  ),
+                }),
                 isSelected: false,
                 key: idx,
               };

client/src/translations/en_us/common.json

@@ -82,8 +82,13 @@
 		},
 		"audit": {
 			"fields": {
+				"cc": "CC",
+				"contents": "Contents",
 				"created": "Time",
 				"operation": "Operation",
+				"status": "Status",
+				"subject": "Subject",
+				"to": "To",
 				"useremail": "User",
 				"values": "Values"
 			}
@@ -190,6 +195,7 @@
 				"entered_total": "Total of Entered Lines",
 				"enteringcreditmemo": "You are entering a credit memo. Please ensure you are also entering positive values.",
 				"federal_tax": "Federal Tax",
+				"generatepartslabel": "Generate Parts Labels after Saving?",
 				"iouexists": "An IOU exists that is associated to this RO.",
 				"local_tax": "Local Tax",
 				"markexported": "Mark Exported",
@@ -258,6 +264,7 @@
 				"dms": {
 					"cashierid": "Cashier ID",
 					"default_journal": "Default Journal",
+					"disablebillwip": "Disable bill WIP for A/P Posting",
 					"disablecontactvehiclecreation": "Disable Contact & Vehicle Updates/Creation",
 					"dms_acctnumber": "DMS Account #",
 					"dms_wip_acctnumber": "DMS W.I.P.  Account #",
@@ -431,6 +438,7 @@
 					"ar": "Accounts Receivable",
 					"ats": "ATS",
 					"federal_tax": "Federal Tax",
+					"federal_tax_itc": "Federal Tax Credit",
 					"gst_override": "GST Override Account #",
 					"la1": "LA1",
 					"la2": "LA2",
@@ -831,6 +839,7 @@
 			},
 			"errors": {
 				"deletes3": "Error deleting document from storage. ",
+				"deleting": "Error deleting documents {{error}}",
 				"deleting_cloudinary": "Error deleting document from storage. {{message}}",
 				"getpresignurl": "Error obtaining presigned URL for document.  {{message}}",
 				"insert": "Unable to upload file. {{message}}",
@@ -842,6 +851,7 @@
 				"doctype": "Document Type",
 				"newjobid": "Assign to Job",
 				"openinexplorer": "Open in Explorer",
+				"optimizedimage": "The below image is optimized. Click on the picture below to open in a new window and view it full size, or open it in explorer.",
 				"reassign_limitexceeded": "Reassigning all selected documents will exceed the job storage limit for your shop.  ",
 				"reassign_limitexceeded_title": "Unable to reassign document(s)",
 				"storageexceeded": "You've exceeded your storage limit for this job. Please remove documents, or increase your storage plan.",
@@ -872,6 +882,7 @@
 			"labels": {
 				"attachments": "Attachments",
 				"documents": "Documents",
+				"emailpreview": "Email Preview",
 				"generatingemail": "Generating email...",
 				"pdfcopywillbeattached": "A PDF copy of this email will be attached when it is sent.",
 				"preview": "Email Preview"
@@ -960,6 +971,7 @@
 				"save": "Save",
 				"saveandnew": "Save and New",
 				"selectall": "Select All",
+				"send": "Send",
 				"senderrortosupport": "Send Error to Support",
 				"submit": "Submit",
 				"tryagain": "Try Again",
@@ -1029,6 +1041,7 @@
 				"sendby": "Send By",
 				"signin": "Sign In",
 				"sms": "SMS",
+				"status": "Status",
 				"sub_status": {
 					"expired": "The subscription for this shop has expired.  Please contact technical support to reactivate the subscription. "
 				},
@@ -1345,6 +1358,7 @@
 				"depreciation_taxes": "Depreciation/Taxes",
 				"dms": {
 					"address": "Customer Address",
+					"amount": "Amount",
 					"center": "Center",
 					"cost": "Cost",
 					"cost_dms_acctnumber": "Cost DMS Acct #",
@@ -1354,6 +1368,7 @@
 					"id": "DMS ID",
 					"inservicedate": "In Service Date",
 					"journal": "Journal #",
+					"lines": "Posting Lines",
 					"name1": "Customer Name",
 					"payer": {
 						"amount": "Amount",
@@ -1462,6 +1477,10 @@
 				"production_vars": {
 					"note": "Production Note"
 				},
+				"qb_multiple_payers": {
+					"amount": "Amount",
+					"name": "Name"
+				},
 				"queued_for_parts": "Queued for Parts",
 				"rate_ats": "ATS Rate",
 				"rate_la1": "LA1",
@@ -1535,11 +1554,13 @@
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
 				"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
 				"actual_in_inferred": "$t(jobs.fields.actual_in) inferred using $t(jobs.fields.scheduled_in).",
+				"additionalpayeroverallocation": "You have allocated more than the sale of the Job to additional payers.",
 				"additionaltotal": "Additional Total",
 				"adjustmentrate": "Adjustment Rate",
 				"adjustments": "Adjustments",
 				"adminwarning": "Use the functionality on this page at your own risk.  You are responsible for any and all changes to your data.",
 				"allocations": "Allocations",
+				"alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
 				"alreadyclosed": "This job has already been closed.",
 				"appointmentconfirmation": "Send confirmation to customer?",
 				"associationwarning": "Any changes to associations will require updating the data from the new parent record to the job.",
@@ -1601,8 +1622,10 @@
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
 				"dms": {
+					"apexported": "AP export completed.  See logs for details.",
 					"damageto": "Damage to $t(jobs.fields.area_of_damage_impact.{{area_of_damage}}).",
 					"defaultstory": "B/S RO: {{ro_number}}. Owner: {{ownr_nm}}. Insurance Co: {{ins_co_nm}}. Claim/PO #: {{clm_po}}",
+					"disablebillwip": "Cost and WIP for bills has been ignored per shop configuration.",
 					"invoicedatefuture": "Invoice date must be today or in the future for CDK posting.",
 					"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
 					"logs": "Logs",
@@ -1614,6 +1637,7 @@
 				"documents-images": "Images",
 				"documents-other": "Other Documents",
 				"duplicateconfirm": "Are you sure you want to duplicate this job? Some elements of this job will not be duplicated.",
+				"emailaudit": "Email Audit Trail",
 				"employeeassignments": "Employee Assignments",
 				"estimatelines": "Estimate Lines",
 				"estimator": "Estimator",
@@ -1626,6 +1650,7 @@
 				"importnote": "The job was initially imported.",
 				"inproduction": "In Production",
 				"intakechecklist": "Intake Checklist",
+				"iou": "IOU",
 				"job": "Job Details",
 				"jobcosting": "Job Costing",
 				"jobtotals": "Job Totals",
@@ -1637,6 +1662,7 @@
 				"mapa": "Paint Materials",
 				"markforreexport": "Mark for Re-export",
 				"mash": "Shop Materials",
+				"multipayers": "Additional Payers",
 				"net_repairs": "Net Repairs",
 				"notes": "Notes",
 				"othertotal": "Other Totals",
@@ -1648,6 +1674,7 @@
 				"partsfilter": "Parts Only",
 				"partssubletstotal": "Parts & Sublets Total",
 				"partstotal": "Parts Total (ex. Taxes)",
+				"pimraryamountpayable": "Total Primary Payable",
 				"plitooltips": {
 					"billtotal": "The total amount of all bill lines that have been posted against this RO (not including credits, taxes, or labor adjustments).",
 					"calculatedcreditsnotreceived": "The calculated credits not received is derived by subtracting the amount of credit memos entered from the <b>retail</b> total of returns created. This does not take into account whether the credit was marked as received. You can find more information <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>.",
@@ -2027,6 +2054,8 @@
 			"labels": {
 				"allpartsto": "All Parts Location",
 				"confirmdelete": "Are you sure you want to delete this item? It cannot be recovered.  Job line statuses will not be updated and may require manual review. ",
+				"custompercent": "Custom %",
+				"discount": "Discount {{percent}}",
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
 				"is_quote": "Parts Quote?",
@@ -2034,12 +2063,15 @@
 				"newpartsorder": "New Parts Order",
 				"notyetordered": "This part has not yet been ordered.",
 				"oec": "Order via OEC",
+				"order_type": "Order Type",
 				"orderhistory": "Order History",
+				"parts_order": "Parts Order",
 				"parts_orders": "Parts Orders",
 				"print": "Show Printed Form",
 				"receive": "Receive Parts Order",
 				"removefrompartsqueue": "Remove from Parts Queue?",
-				"returnpartsorder": "Return Parts Order"
+				"returnpartsorder": "Return Parts Order",
+				"sublet_order": "Sublet Order"
 			},
 			"successes": {
 				"created": "Parts order created successfully. ",
@@ -2067,10 +2099,11 @@
 			},
 			"labels": {
 				"balance": "Balance",
-				"ca_bc_etf_table": "ICBC ETF Table Converter",
+				"ca_bc_etf_table": "ICBC EFT Table Converter",
 				"customer": "Customer",
 				"edit": "Edit Payment",
 				"electronicpayment": "Use Electronic Payment Processing?",
+				"external": "External",
 				"findermodal": "ICBC Payment Finder",
 				"insurance": "Insurance",
 				"new": "New Payment",
@@ -2080,6 +2113,7 @@
 			},
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
+				"markexported": "Payment(s) marked exported.",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}
@@ -2169,7 +2203,7 @@
 				"filing_coversheet_portrait": "Filing Coversheet (Portrait)",
 				"final_invoice": "Final Invoice",
 				"fippa_authorization": "FIPPA Authorization",
-				"folder_label_multiple": "Folder Label Multiple",
+				"folder_label_multiple": "Folder Label - Multi",
 				"glass_express_checklist": "Glass Express Checklist",
 				"guarantee": "Repair Guarantee",
 				"individual_job_note": "Job Note RO # {{ro_number}}",
@@ -2190,6 +2224,8 @@
 				"mpi_eglass_auth": "MPI - eGlass Auth",
 				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet",
 				"paint_grid": "Paint Grid",
+				"parts_invoice_label_single": "Parts Label Single",
+				"parts_label_multiple": "Parts Label - Multi",
 				"parts_label_single": "Parts Label - Single",
 				"parts_list": "Parts List",
 				"parts_order": "Parts Order Confirmation",
@@ -2208,6 +2244,7 @@
 				"sgi_certificate_of_repairs": "SGI - Certificate of Repairs",
 				"sgi_windshield_auth": "SGI - Windshield Authorization",
 				"stolen_recovery_checklist": "Stolen Recovery Checklist",
+				"sublet_order": "Sublet Order",
 				"supplement_request": "Supplement Request",
 				"thank_you_ro": "Thank You Letter",
 				"thirdpartypayer": "Third Party Payer",
@@ -2238,7 +2275,7 @@
 				"title": "Print Center"
 			},
 			"payments": {
-				"ca_bc_etf_table": "ICBC ETF Table",
+				"ca_bc_etf_table": "ICBC EFT Table",
 				"exported_payroll": "Payroll Table"
 			},
 			"special": {
@@ -2246,7 +2283,8 @@
 			},
 			"subjects": {
 				"jobs": {
-					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}"
+					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
+					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
 			},
 			"vendors": {
@@ -2365,6 +2403,7 @@
 				"credits_not_received_date": "Credits not Received by Date",
 				"credits_not_received_date_vendorid": "Credits not Received by Vendor",
 				"csi": "CSI Responses",
+				"cycle_time_analysis": "Cycle Time Analysis",
 				"estimates_written_converted": "Estimates Written/Converted",
 				"estimator_detail": "Jobs by Estimator (Detail)",
 				"estimator_summary": "Jobs by Estimator (Summary)",
@@ -2383,15 +2422,19 @@
 				"hours_sold_detail_closed": "Hours Sold Detail - Closed",
 				"hours_sold_detail_closed_csr": "Hours Sold Detail - Closed by CSR",
 				"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
+				"hours_sold_detail_closed_status": "Hours Sold Detail - Closed by Status",
 				"hours_sold_detail_open": "Hours Sold Detail - Open",
 				"hours_sold_detail_open_csr": "Hours Sold Detail - Open by CSR",
 				"hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
+				"hours_sold_detail_open_status": "Hours Sold Detail - Open by Status",
 				"hours_sold_summary_closed": "Hours Sold Summary - Closed",
 				"hours_sold_summary_closed_csr": "Hours Sold Summary - Closed by CSR",
 				"hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
+				"hours_sold_summary_closed_status": "Hours Sold Summary - Closed by Status",
 				"hours_sold_summary_open": "Hours Sold Summary - Open",
 				"hours_sold_summary_open_csr": "Hours Sold Summary - Open CSR",
 				"hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
+				"hours_sold_summary_open_status": "Hours Sold Summary - Open by Status",
 				"job_costing_ro_csr": "Job Costing by CSR",
 				"job_costing_ro_date_detail": "Job Costing by RO - Detail",
 				"job_costing_ro_date_summary": "Job Costing by RO - Summary",
@@ -2407,6 +2450,7 @@
 				"parts_backorder": "IOU Parts List",
 				"parts_not_recieved": "Parts Not Received",
 				"parts_not_recieved_vendor": "Parts Not Received by Vendor",
+				"parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
 				"payments_by_date": "Payments by Date",
 				"payments_by_date_type": "Payments by Date and Type",
 				"production_by_category": "Production by Category",
@@ -2419,6 +2463,7 @@
 				"production_by_target_date": "Production by Target Date",
 				"production_by_technician": "Production by Technician",
 				"production_by_technician_one": "Production filtered by Technician",
+				"psr_by_make": "Percent of Sales by Vehicle Make",
 				"purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
 				"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
 				"purchases_by_date_range_detail": "Purchases by Date - Detail",
@@ -2443,6 +2488,9 @@
 		},
 		"schedule": {
 			"labels": {
+				"employeevacation": "Employee Vacations",
+				"intake": "Intake Events",
+				"manual": "Manual Events",
 				"manualevent": "Add Manual Event"
 			}
 		},
@@ -2520,7 +2568,8 @@
 				"creating": "Error creating time ticket. {{message}}",
 				"deleting": "Error deleting time ticket. {{message}}",
 				"noemployeeforuser": "Unable to use Shift Clock",
-				"noemployeeforuser_sub": "An employee record has not been created for this user. Please create one before using the shift clock. "
+				"noemployeeforuser_sub": "An employee record has not been created for this user. Please create one before using the shift clock. ",
+				"shiftalreadyclockedon": "You are already clocked onto a shift. Unable to create shift entry."
 			},
 			"fields": {
 				"actualhrs": "Actual Hours",
@@ -2760,6 +2809,7 @@
 				"country": "Country",
 				"discount": "Discount % (as decimal)",
 				"display_name": "Display Name",
+				"dmsid": "DMS ID",
 				"due_date": "Payment Due Date (# of days)",
 				"email": "Contact Email",
 				"favorite": "Favorite?",

client/src/translations/es/common.json

@@ -82,8 +82,13 @@
 		},
 		"audit": {
 			"fields": {
+				"cc": "",
+				"contents": "",
 				"created": "",
 				"operation": "",
+				"status": "",
+				"subject": "",
+				"to": "",
 				"useremail": "",
 				"values": ""
 			}
@@ -190,6 +195,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
 				"markexported": "",
@@ -258,6 +264,7 @@
 				"dms": {
 					"cashierid": "",
 					"default_journal": "",
+					"disablebillwip": "",
 					"disablecontactvehiclecreation": "",
 					"dms_acctnumber": "",
 					"dms_wip_acctnumber": "",
@@ -431,6 +438,7 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"federal_tax_itc": "",
 					"gst_override": "",
 					"la1": "",
 					"la2": "",
@@ -831,6 +839,7 @@
 			},
 			"errors": {
 				"deletes3": "Error al eliminar el documento del almacenamiento.",
+				"deleting": "",
 				"deleting_cloudinary": "",
 				"getpresignurl": "Error al obtener la URL prescrita para el documento. {{message}}",
 				"insert": "Incapaz de cargar el archivo. {{message}}",
@@ -842,6 +851,7 @@
 				"doctype": "",
 				"newjobid": "",
 				"openinexplorer": "",
+				"optimizedimage": "",
 				"reassign_limitexceeded": "",
 				"reassign_limitexceeded_title": "",
 				"storageexceeded": "",
@@ -872,6 +882,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""
@@ -960,6 +971,7 @@
 				"save": "Salvar",
 				"saveandnew": "",
 				"selectall": "",
+				"send": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1029,6 +1041,7 @@
 				"sendby": "",
 				"signin": "",
 				"sms": "",
+				"status": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1345,6 +1358,7 @@
 				"depreciation_taxes": "Depreciación / Impuestos",
 				"dms": {
 					"address": "",
+					"amount": "",
 					"center": "",
 					"cost": "",
 					"cost_dms_acctnumber": "",
@@ -1354,6 +1368,7 @@
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
+					"lines": "",
 					"name1": "",
 					"payer": {
 						"amount": "",
@@ -1462,6 +1477,10 @@
 				"production_vars": {
 					"note": ""
 				},
+				"qb_multiple_payers": {
+					"amount": "",
+					"name": ""
+				},
 				"queued_for_parts": "",
 				"rate_ats": "",
 				"rate_la1": "Tarifa LA1",
@@ -1535,11 +1554,13 @@
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
+				"additionalpayeroverallocation": "",
 				"additionaltotal": "",
 				"adjustmentrate": "",
 				"adjustments": "",
 				"adminwarning": "",
 				"allocations": "",
+				"alreadyaddedtoscoreboard": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "¿Enviar confirmación al cliente?",
 				"associationwarning": "",
@@ -1601,8 +1622,10 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"apexported": "",
 					"damageto": "",
 					"defaultstory": "",
+					"disablebillwip": "",
 					"invoicedatefuture": "",
 					"kmoutnotgreaterthankmin": "",
 					"logs": "",
@@ -1614,6 +1637,7 @@
 				"documents-images": "",
 				"documents-other": "",
 				"duplicateconfirm": "",
+				"emailaudit": "",
 				"employeeassignments": "",
 				"estimatelines": "",
 				"estimator": "",
@@ -1626,6 +1650,7 @@
 				"importnote": "",
 				"inproduction": "",
 				"intakechecklist": "",
+				"iou": "",
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
@@ -1637,6 +1662,7 @@
 				"mapa": "",
 				"markforreexport": "",
 				"mash": "",
+				"multipayers": "",
 				"net_repairs": "",
 				"notes": "Notas",
 				"othertotal": "",
@@ -1648,6 +1674,7 @@
 				"partsfilter": "",
 				"partssubletstotal": "",
 				"partstotal": "",
+				"pimraryamountpayable": "",
 				"plitooltips": {
 					"billtotal": "",
 					"calculatedcreditsnotreceived": "",
@@ -2027,6 +2054,8 @@
 			"labels": {
 				"allpartsto": "",
 				"confirmdelete": "",
+				"custompercent": "",
+				"discount": "",
 				"email": "Enviar por correo electrónico",
 				"inthisorder": "Partes en este pedido",
 				"is_quote": "",
@@ -2034,12 +2063,15 @@
 				"newpartsorder": "",
 				"notyetordered": "",
 				"oec": "",
+				"order_type": "",
 				"orderhistory": "Historial de pedidos",
+				"parts_order": "",
 				"parts_orders": "",
 				"print": "Mostrar formulario impreso",
 				"receive": "",
 				"removefrompartsqueue": "",
-				"returnpartsorder": ""
+				"returnpartsorder": "",
+				"sublet_order": ""
 			},
 			"successes": {
 				"created": "Pedido de piezas creado con éxito.",
@@ -2071,6 +2103,7 @@
 				"customer": "",
 				"edit": "",
 				"electronicpayment": "",
+				"external": "",
 				"findermodal": "",
 				"insurance": "",
 				"new": "",
@@ -2080,6 +2113,7 @@
 			},
 			"successes": {
 				"exported": "",
+				"markexported": "",
 				"payment": "",
 				"stripe": ""
 			}
@@ -2190,6 +2224,8 @@
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
 				"paint_grid": "",
+				"parts_invoice_label_single": "",
+				"parts_label_multiple": "",
 				"parts_label_single": "",
 				"parts_list": "",
 				"parts_order": "",
@@ -2208,6 +2244,7 @@
 				"sgi_certificate_of_repairs": "",
 				"sgi_windshield_auth": "",
 				"stolen_recovery_checklist": "",
+				"sublet_order": "",
 				"supplement_request": "",
 				"thank_you_ro": "",
 				"thirdpartypayer": "",
@@ -2246,7 +2283,8 @@
 			},
 			"subjects": {
 				"jobs": {
-					"parts_order": ""
+					"parts_order": "",
+					"sublet_order": ""
 				}
 			},
 			"vendors": {
@@ -2365,6 +2403,7 @@
 				"credits_not_received_date": "",
 				"credits_not_received_date_vendorid": "",
 				"csi": "",
+				"cycle_time_analysis": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
@@ -2383,15 +2422,19 @@
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
 				"hours_sold_detail_closed_ins_co": "",
+				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
 				"hours_sold_detail_open_ins_co": "",
+				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
 				"hours_sold_summary_closed_ins_co": "",
+				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
 				"hours_sold_summary_open_ins_co": "",
+				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",
 				"job_costing_ro_date_detail": "",
 				"job_costing_ro_date_summary": "",
@@ -2407,6 +2450,7 @@
 				"parts_backorder": "",
 				"parts_not_recieved": "",
 				"parts_not_recieved_vendor": "",
+				"parts_received_not_scheduled": "",
 				"payments_by_date": "",
 				"payments_by_date_type": "",
 				"production_by_category": "",
@@ -2419,6 +2463,7 @@
 				"production_by_target_date": "",
 				"production_by_technician": "",
 				"production_by_technician_one": "",
+				"psr_by_make": "",
 				"purchases_by_cost_center_detail": "",
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
@@ -2443,6 +2488,9 @@
 		},
 		"schedule": {
 			"labels": {
+				"employeevacation": "",
+				"intake": "",
+				"manual": "",
 				"manualevent": ""
 			}
 		},
@@ -2520,7 +2568,8 @@
 				"creating": "",
 				"deleting": "",
 				"noemployeeforuser": "",
-				"noemployeeforuser_sub": ""
+				"noemployeeforuser_sub": "",
+				"shiftalreadyclockedon": ""
 			},
 			"fields": {
 				"actualhrs": "",
@@ -2760,6 +2809,7 @@
 				"country": "País",
 				"discount": "% De descuento",
 				"display_name": "Nombre para mostrar",
+				"dmsid": "",
 				"due_date": "Fecha de vencimiento del pago",
 				"email": "Email de contacto",
 				"favorite": "¿Favorito?",

client/src/translations/fr/common.json

@@ -82,8 +82,13 @@
 		},
 		"audit": {
 			"fields": {
+				"cc": "",
+				"contents": "",
 				"created": "",
 				"operation": "",
+				"status": "",
+				"subject": "",
+				"to": "",
 				"useremail": "",
 				"values": ""
 			}
@@ -190,6 +195,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
 				"markexported": "",
@@ -258,6 +264,7 @@
 				"dms": {
 					"cashierid": "",
 					"default_journal": "",
+					"disablebillwip": "",
 					"disablecontactvehiclecreation": "",
 					"dms_acctnumber": "",
 					"dms_wip_acctnumber": "",
@@ -431,6 +438,7 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"federal_tax_itc": "",
 					"gst_override": "",
 					"la1": "",
 					"la2": "",
@@ -831,6 +839,7 @@
 			},
 			"errors": {
 				"deletes3": "Erreur lors de la suppression du document du stockage.",
+				"deleting": "",
 				"deleting_cloudinary": "",
 				"getpresignurl": "Erreur lors de l'obtention de l'URL présignée pour le document. {{message}}",
 				"insert": "Incapable de télécharger le fichier. {{message}}",
@@ -842,6 +851,7 @@
 				"doctype": "",
 				"newjobid": "",
 				"openinexplorer": "",
+				"optimizedimage": "",
 				"reassign_limitexceeded": "",
 				"reassign_limitexceeded_title": "",
 				"storageexceeded": "",
@@ -872,6 +882,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""
@@ -960,6 +971,7 @@
 				"save": "sauvegarder",
 				"saveandnew": "",
 				"selectall": "",
+				"send": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1029,6 +1041,7 @@
 				"sendby": "",
 				"signin": "",
 				"sms": "",
+				"status": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1345,6 +1358,7 @@
 				"depreciation_taxes": "Amortissement / taxes",
 				"dms": {
 					"address": "",
+					"amount": "",
 					"center": "",
 					"cost": "",
 					"cost_dms_acctnumber": "",
@@ -1354,6 +1368,7 @@
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
+					"lines": "",
 					"name1": "",
 					"payer": {
 						"amount": "",
@@ -1462,6 +1477,10 @@
 				"production_vars": {
 					"note": ""
 				},
+				"qb_multiple_payers": {
+					"amount": "",
+					"name": ""
+				},
 				"queued_for_parts": "",
 				"rate_ats": "",
 				"rate_la1": "Taux LA1",
@@ -1535,11 +1554,13 @@
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
+				"additionalpayeroverallocation": "",
 				"additionaltotal": "",
 				"adjustmentrate": "",
 				"adjustments": "",
 				"adminwarning": "",
 				"allocations": "",
+				"alreadyaddedtoscoreboard": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "Envoyer une confirmation au client?",
 				"associationwarning": "",
@@ -1601,8 +1622,10 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"apexported": "",
 					"damageto": "",
 					"defaultstory": "",
+					"disablebillwip": "",
 					"invoicedatefuture": "",
 					"kmoutnotgreaterthankmin": "",
 					"logs": "",
@@ -1614,6 +1637,7 @@
 				"documents-images": "",
 				"documents-other": "",
 				"duplicateconfirm": "",
+				"emailaudit": "",
 				"employeeassignments": "",
 				"estimatelines": "",
 				"estimator": "",
@@ -1626,6 +1650,7 @@
 				"importnote": "",
 				"inproduction": "",
 				"intakechecklist": "",
+				"iou": "",
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
@@ -1637,6 +1662,7 @@
 				"mapa": "",
 				"markforreexport": "",
 				"mash": "",
+				"multipayers": "",
 				"net_repairs": "",
 				"notes": "Remarques",
 				"othertotal": "",
@@ -1648,6 +1674,7 @@
 				"partsfilter": "",
 				"partssubletstotal": "",
 				"partstotal": "",
+				"pimraryamountpayable": "",
 				"plitooltips": {
 					"billtotal": "",
 					"calculatedcreditsnotreceived": "",
@@ -2027,6 +2054,8 @@
 			"labels": {
 				"allpartsto": "",
 				"confirmdelete": "",
+				"custompercent": "",
+				"discount": "",
 				"email": "Envoyé par email",
 				"inthisorder": "Pièces dans cette commande",
 				"is_quote": "",
@@ -2034,12 +2063,15 @@
 				"newpartsorder": "",
 				"notyetordered": "",
 				"oec": "",
+				"order_type": "",
 				"orderhistory": "Historique des commandes",
+				"parts_order": "",
 				"parts_orders": "",
 				"print": "Afficher le formulaire imprimé",
 				"receive": "",
 				"removefrompartsqueue": "",
-				"returnpartsorder": ""
+				"returnpartsorder": "",
+				"sublet_order": ""
 			},
 			"successes": {
 				"created": "Commande de pièces créée avec succès.",
@@ -2071,6 +2103,7 @@
 				"customer": "",
 				"edit": "",
 				"electronicpayment": "",
+				"external": "",
 				"findermodal": "",
 				"insurance": "",
 				"new": "",
@@ -2080,6 +2113,7 @@
 			},
 			"successes": {
 				"exported": "",
+				"markexported": "",
 				"payment": "",
 				"stripe": ""
 			}
@@ -2190,6 +2224,8 @@
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
 				"paint_grid": "",
+				"parts_invoice_label_single": "",
+				"parts_label_multiple": "",
 				"parts_label_single": "",
 				"parts_list": "",
 				"parts_order": "",
@@ -2208,6 +2244,7 @@
 				"sgi_certificate_of_repairs": "",
 				"sgi_windshield_auth": "",
 				"stolen_recovery_checklist": "",
+				"sublet_order": "",
 				"supplement_request": "",
 				"thank_you_ro": "",
 				"thirdpartypayer": "",
@@ -2246,7 +2283,8 @@
 			},
 			"subjects": {
 				"jobs": {
-					"parts_order": ""
+					"parts_order": "",
+					"sublet_order": ""
 				}
 			},
 			"vendors": {
@@ -2365,6 +2403,7 @@
 				"credits_not_received_date": "",
 				"credits_not_received_date_vendorid": "",
 				"csi": "",
+				"cycle_time_analysis": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
@@ -2383,15 +2422,19 @@
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
 				"hours_sold_detail_closed_ins_co": "",
+				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
 				"hours_sold_detail_open_ins_co": "",
+				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
 				"hours_sold_summary_closed_ins_co": "",
+				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
 				"hours_sold_summary_open_ins_co": "",
+				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",
 				"job_costing_ro_date_detail": "",
 				"job_costing_ro_date_summary": "",
@@ -2407,6 +2450,7 @@
 				"parts_backorder": "",
 				"parts_not_recieved": "",
 				"parts_not_recieved_vendor": "",
+				"parts_received_not_scheduled": "",
 				"payments_by_date": "",
 				"payments_by_date_type": "",
 				"production_by_category": "",
@@ -2419,6 +2463,7 @@
 				"production_by_target_date": "",
 				"production_by_technician": "",
 				"production_by_technician_one": "",
+				"psr_by_make": "",
 				"purchases_by_cost_center_detail": "",
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
@@ -2443,6 +2488,9 @@
 		},
 		"schedule": {
 			"labels": {
+				"employeevacation": "",
+				"intake": "",
+				"manual": "",
 				"manualevent": ""
 			}
 		},
@@ -2520,7 +2568,8 @@
 				"creating": "",
 				"deleting": "",
 				"noemployeeforuser": "",
-				"noemployeeforuser_sub": ""
+				"noemployeeforuser_sub": "",
+				"shiftalreadyclockedon": ""
 			},
 			"fields": {
 				"actualhrs": "",
@@ -2760,6 +2809,7 @@
 				"country": "Pays",
 				"discount": "Remise %",
 				"display_name": "Afficher un nom",
+				"dmsid": "",
 				"due_date": "Date limite de paiement",
 				"email": "Email du contact",
 				"favorite": "Préféré?",

client/src/utils/DatePickerRanges.js

@@ -22,5 +22,6 @@ const range = {
     moment().startOf("quarter"),
     moment().startOf("quarter").add(1, "quarter").subtract(1, "day"),
   ],
+  "Last 90 Days": [moment().add(-90, "days"), moment()],
 };
 export default range;

client/src/utils/TemplateConstants.js

@@ -504,6 +504,19 @@ export const TemplateList = (type, context) => {
             key: "folder_label_multiple",
             disabled: false,
           },
+          parts_label_multiple: {
+            title: i18n.t("printcenter.jobs.parts_label_multiple"),
+            description: "Parts Label Multiple",
+            key: "parts_label_multiple",
+            disabled: false,
+          },
+          parts_invoice_label_single: {
+            title: i18n.t("printcenter.jobs.parts_invoice_label_single"),
+            description: "Parts Label Multiple",
+            key: "parts_invoice_label_single",
+            disabled: false,
+            ignoreCustomMargins: true,
+          },
           csi_invitation_action: {
             title: i18n.t("printcenter.jobs.csi_invitation_action"),
             description: "CSI invite",
@@ -551,6 +564,20 @@ export const TemplateList = (type, context) => {
             }),
             disabled: false,
           },
+          sublet_order: {
+            title: i18n.t("printcenter.jobs.sublet_order"),
+            description: "Parts Order",
+            key: "sublet_order",
+            subject: i18n.t("printcenter.subjects.jobs.sublet_order", {
+              ro_number: context && context.job && context.job.ro_number,
+              name: (
+                (context && context.job && context.job.ownr_ln) ||
+                (context && context.job && context.job.ownr_co_nm) ||
+                ""
+              ).trim(),
+            }),
+            disabled: false,
+          },
           parts_return_slip: {
             title: i18n.t("printcenter.jobs.parts_return_slip"),
             subject: i18n.t("printcenter.jobs.parts_return_slip"),
@@ -766,6 +793,74 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          hours_sold_summary_open_status: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_status"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_status"
+            ),
+            key: "hours_sold_summary_open_status",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_closed_status: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_status"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_status"
+            ),
+            key: "hours_sold_summary_closed_status",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_detail_open_status: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_status"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_status"
+            ),
+            key: "hours_sold_detail_open_status",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_detail_closed_status: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_status"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_status"
+            ),
+            key: "hours_sold_detail_closed_status",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
           purchases_by_date_range_detail: {
             title: i18n.t(
               "reportcenter.templates.purchases_by_date_range_detail"
@@ -1559,6 +1654,46 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          parts_received_not_scheduled: {
+            title: i18n.t(
+              "reportcenter.templates.parts_received_not_scheduled"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.parts_received_not_scheduled"
+            ),
+            key: "parts_received_not_scheduled",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
+          psr_by_make: {
+            title: i18n.t("reportcenter.templates.psr_by_make"),
+            subject: i18n.t("reportcenter.templates.psr_by_make"),
+            key: "psr_by_make",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          cycle_time_analysis: {
+            title: i18n.t("reportcenter.templates.cycle_time_analysis"),
+            subject: i18n.t("reportcenter.templates.cycle_time_analysis"),
+            key: "cycle_time_analysis",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.actual_completion"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

firebase/readme.md

@@ -1,3 +1,3 @@
 Must set the environment variables using:
 
-firebase functions:config:set auth.graphql_endpoint="https://db.development.bodyshop.app/v1/graphql" auth.hasura_secret_admin_key="Dev-BodyShopApp!"
+firebase functions:config:set auth.graphql_endpoint="https://db.dev.bodyshop.app/v1/graphql" auth.hasura_secret_admin_key="Dev-BodyShopApp!"

hasura/MigrationResolution.md

@@ -0,0 +1,24 @@
+Issue when migrating events resolved by running SQL below. User needed updating when running in prod. 
+
+CREATE TABLE IF NOT EXISTS hdb_catalog.hdb_source_catalog_version
+(
+    version text COLLATE pg_catalog."default" NOT NULL,
+    upgraded_on timestamp with time zone NOT NULL
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE hdb_catalog.hdb_source_catalog_version
+    OWNER to postgres;
+-- Index: hdb_source_catalog_version_one_row
+
+-- DROP INDEX hdb_catalog.hdb_source_catalog_version_one_row;
+
+CREATE UNIQUE INDEX hdb_source_catalog_version_one_row
+    ON hdb_catalog.hdb_source_catalog_version USING btree
+    ((version IS NOT NULL) ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+INSERT INTO hdb_catalog.hdb_source_catalog_version (version, upgraded_on) VALUES ('2', NOW());
+
+https://devscope.io/code/hasura/graphql-engine/issues/8694

hasura/config.yaml

@@ -1,5 +1,5 @@
 version: 2
-endpoint: https://db.development.bodyshop.app
+endpoint: https://db.dev.bodyshop.app
 admin_secret: Dev-BodyShopApp!
 metadata_directory: metadata
 actions:

hasura/metadata/functions.yaml

@@ -1,30 +1,30 @@
 - function:
-    schema: public
     name: search_bills
-- function:
     schema: public
+- function:
     name: search_cccontracts
-- function:
     schema: public
+- function:
     name: search_dms_vehicles
-- function:
     schema: public
+- function:
     name: search_exportlog
-- function:
     schema: public
+- function:
     name: search_inventory
-- function:
     schema: public
+- function:
     name: search_jobs
-- function:
     schema: public
+- function:
     name: search_owners
-- function:
     schema: public
+- function:
     name: search_payments
-- function:
     schema: public
+- function:
     name: search_phonebook
-- function:
     schema: public
+- function:
     name: search_vehicles
+    schema: public

hasura/migrations/1661191155179_create_table_public_email_audit_trail/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."email_audit_trail";

hasura/migrations/1661191155179_create_table_public_email_audit_trail/up.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "public"."email_audit_trail" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "bodyshopid" uuid NOT NULL, "jobid" uuid, "noteid" uuid, "to" jsonb NOT NULL DEFAULT jsonb_build_array(), "cc" jsonb NOT NULL DEFAULT jsonb_build_array(), "subject" text, "contents" text, "useremail" text NOT NULL, PRIMARY KEY ("id") );
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_email_audit_trail_updated_at"
+BEFORE UPDATE ON "public"."email_audit_trail"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_email_audit_trail_updated_at" ON "public"."email_audit_trail" 
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1661193068342_create_table_public_email_audit_trail/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."email_audit_trail";

hasura/migrations/1661193068342_create_table_public_email_audit_trail/up.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "public"."email_audit_trail" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "bodyshopid" uuid NOT NULL, "jobid" uuid, "noteid" uuid, "to" jsonb NOT NULL DEFAULT jsonb_build_array(), "cc" jsonb NOT NULL DEFAULT jsonb_build_array(), "subject" text, "contents" text, "useremail" text NOT NULL, PRIMARY KEY ("id") );
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_email_audit_trail_updated_at"
+BEFORE UPDATE ON "public"."email_audit_trail"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_email_audit_trail_updated_at" ON "public"."email_audit_trail" 
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1661193112109_set_fk_public_email_audit_trail_bodyshopid/down.sql

@@ -0,0 +1 @@
+alter table "public"."email_audit_trail" drop constraint "email_audit_trail_bodyshopid_fkey";

hasura/migrations/1661193112109_set_fk_public_email_audit_trail_bodyshopid/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."email_audit_trail"
+  add constraint "email_audit_trail_bodyshopid_fkey"
+  foreign key ("bodyshopid")
+  references "public"."bodyshops"
+  ("id") on update cascade on delete cascade;

hasura/migrations/1661193135139_set_fk_public_email_audit_trail_jobid/down.sql

@@ -0,0 +1 @@
+alter table "public"."email_audit_trail" drop constraint "email_audit_trail_jobid_fkey";

hasura/migrations/1661193135139_set_fk_public_email_audit_trail_jobid/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."email_audit_trail"
+  add constraint "email_audit_trail_jobid_fkey"
+  foreign key ("jobid")
+  references "public"."jobs"
+  ("id") on update cascade on delete cascade;

hasura/migrations/1661193154564_set_fk_public_email_audit_trail_useremail/down.sql

@@ -0,0 +1 @@
+alter table "public"."email_audit_trail" drop constraint "email_audit_trail_useremail_fkey";

hasura/migrations/1661193154564_set_fk_public_email_audit_trail_useremail/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."email_audit_trail"
+  add constraint "email_audit_trail_useremail_fkey"
+  foreign key ("useremail")
+  references "public"."users"
+  ("email") on update cascade on delete cascade;

hasura/migrations/1663703336163_alter_table_public_jobs_add_column_qb_multiple_payers/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "qb_multiple_payers" jsonb
+--  null;

hasura/migrations/1663703336163_alter_table_public_jobs_add_column_qb_multiple_payers/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "qb_multiple_payers" jsonb
+ null;

hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."email_audit_trail" add column "sesmessageid" text
+--  null;

hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."email_audit_trail" add column "sesmessageid" text
+ null;

hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."email_audit_trail_sesmessageid";

hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "email_audit_trail_sesmessageid" on
+  "public"."email_audit_trail" using btree ("sesmessageid");

hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."email_audit_trail" add column "status" text
+--  null;

hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."email_audit_trail" add column "status" text
+ null;

hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."email_audit_trail" add column "status_context" jsonb
+--  null default jsonb_build_array();

hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."email_audit_trail" add column "status_context" jsonb
+ null default jsonb_build_array();

hasura/migrations/1667251913323_alter_table_public_vendors_add_column_dmsid/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."vendors" add column "dmsid" text
+--  null;

hasura/migrations/1667251913323_alter_table_public_vendors_add_column_dmsid/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."vendors" add column "dmsid" text
+ null;