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

@@ -115,4 +115,6 @@ firebase/.env
 logs/oAuthClient-log.log
 
 
-.node-persist/**
+.node-persist/**
+
+/*.env.*

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -4213,6 +4213,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>disablebillwip</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>disablecontactvehiclecreation</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -6921,6 +6942,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>federal_tax_itc</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>gst_override</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -14170,6 +14212,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>emailpreview</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>generatingemail</name>
                                         <definition_loaded>false</definition_loaded>
@@ -16859,6 +16922,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>status</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <folder_node>
                                         <name>sub_status</name>
                                         <children>
@@ -22330,6 +22414,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>amount</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>center</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -22519,6 +22624,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>lines</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>name1</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -27388,6 +27514,27 @@
                                     <folder_node>
                                         <name>dms</name>
                                         <children>
+                                            <concept_node>
+                                                <name>apexported</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>damageto</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -27430,6 +27577,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>disablebillwip</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>invoicedatefuture</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -40287,6 +40455,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>cycle_time_analysis</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>estimates_written_converted</name>
                                         <definition_loaded>false</definition_loaded>
@@ -47238,6 +47427,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>dmsid</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>due_date</name>
                                         <definition_loaded>false</definition_loaded>

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/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/email-overlay/email-overlay.container.jsx

@@ -175,11 +175,14 @@ 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,
@@ -196,7 +199,7 @@ export function EmailOverlayContainer({
       <div>
         <div
           style={{
-            marginTop: "1rem",
+            //   marginTop: "3rem",
             display: "flex",
             justifyContent: "flex-end",
           }}

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/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/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -43,7 +43,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
     {},
     bodyshop && bodyshop.imexshopid
   );
-
+  const { DmsAp } = useTreatments(
+    ["DmsAp"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
   const [costOptions, setCostOptions] = useState(
     [
       ...((form.getFieldValue(["md_responsibility_centers", "costs"]) &&
@@ -144,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"]}>
@@ -4159,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")}
@@ -4417,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")}

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/graphql/jobs.queries.js

@@ -855,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

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/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/translations/en_us/common.json

@@ -264,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 #",
@@ -437,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",
@@ -880,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"
@@ -1038,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. "
 				},
@@ -1354,6 +1358,7 @@
 				"depreciation_taxes": "Depreciation/Taxes",
 				"dms": {
 					"address": "Customer Address",
+					"amount": "Amount",
 					"center": "Center",
 					"cost": "Cost",
 					"cost_dms_acctnumber": "Cost DMS Acct #",
@@ -1363,6 +1368,7 @@
 					"id": "DMS ID",
 					"inservicedate": "In Service Date",
 					"journal": "Journal #",
+					"lines": "Posting Lines",
 					"name1": "Customer Name",
 					"payer": {
 						"amount": "Amount",
@@ -1616,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",
@@ -2091,7 +2099,7 @@
 			},
 			"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?",
@@ -2267,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": {
@@ -2395,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)",
@@ -2800,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

@@ -264,6 +264,7 @@
 				"dms": {
 					"cashierid": "",
 					"default_journal": "",
+					"disablebillwip": "",
 					"disablecontactvehiclecreation": "",
 					"dms_acctnumber": "",
 					"dms_wip_acctnumber": "",
@@ -437,6 +438,7 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"federal_tax_itc": "",
 					"gst_override": "",
 					"la1": "",
 					"la2": "",
@@ -880,6 +882,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""
@@ -1038,6 +1041,7 @@
 				"sendby": "",
 				"signin": "",
 				"sms": "",
+				"status": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1354,6 +1358,7 @@
 				"depreciation_taxes": "Depreciación / Impuestos",
 				"dms": {
 					"address": "",
+					"amount": "",
 					"center": "",
 					"cost": "",
 					"cost_dms_acctnumber": "",
@@ -1363,6 +1368,7 @@
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
+					"lines": "",
 					"name1": "",
 					"payer": {
 						"amount": "",
@@ -1616,8 +1622,10 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"apexported": "",
 					"damageto": "",
 					"defaultstory": "",
+					"disablebillwip": "",
 					"invoicedatefuture": "",
 					"kmoutnotgreaterthankmin": "",
 					"logs": "",
@@ -2395,6 +2403,7 @@
 				"credits_not_received_date": "",
 				"credits_not_received_date_vendorid": "",
 				"csi": "",
+				"cycle_time_analysis": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
@@ -2800,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

@@ -264,6 +264,7 @@
 				"dms": {
 					"cashierid": "",
 					"default_journal": "",
+					"disablebillwip": "",
 					"disablecontactvehiclecreation": "",
 					"dms_acctnumber": "",
 					"dms_wip_acctnumber": "",
@@ -437,6 +438,7 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"federal_tax_itc": "",
 					"gst_override": "",
 					"la1": "",
 					"la2": "",
@@ -880,6 +882,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""
@@ -1038,6 +1041,7 @@
 				"sendby": "",
 				"signin": "",
 				"sms": "",
+				"status": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1354,6 +1358,7 @@
 				"depreciation_taxes": "Amortissement / taxes",
 				"dms": {
 					"address": "",
+					"amount": "",
 					"center": "",
 					"cost": "",
 					"cost_dms_acctnumber": "",
@@ -1363,6 +1368,7 @@
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
+					"lines": "",
 					"name1": "",
 					"payer": {
 						"amount": "",
@@ -1616,8 +1622,10 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"apexported": "",
 					"damageto": "",
 					"defaultstory": "",
+					"disablebillwip": "",
 					"invoicedatefuture": "",
 					"kmoutnotgreaterthankmin": "",
 					"logs": "",
@@ -2395,6 +2403,7 @@
 				"credits_not_received_date": "",
 				"credits_not_received_date_vendorid": "",
 				"csi": "",
+				"cycle_time_analysis": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
@@ -2800,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

@@ -1682,6 +1682,18 @@ export const TemplateList = (type, context) => {
             },
             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"

hasura/metadata/tables.yaml

@@ -3769,6 +3769,27 @@
                 - active:
                     _eq: true
   event_triggers:
+    - name: job_status_transition
+      definition:
+        enable_manual: false
+        insert:
+          columns: '*'
+        update:
+          columns:
+            - status
+      retry_conf:
+        interval_sec: 10
+        num_retries: 0
+        timeout_sec: 60
+      webhook_from_env: HASURA_API_URL
+      headers:
+        - name: event-secret
+          value_from_env: EVENT_SECRET
+      request_transform:
+        query_params: {}
+        template_engine: Kriti
+        url: '{{$base_url}}/job/statustransition'
+        version: 2
     - name: jobs_arms
       definition:
         enable_manual: false
@@ -5396,6 +5417,7 @@
           - country
           - created_at
           - discount
+          - dmsid
           - due_date
           - email
           - favorite
@@ -5418,6 +5440,7 @@
           - country
           - created_at
           - discount
+          - dmsid
           - due_date
           - email
           - favorite
@@ -5450,6 +5473,7 @@
           - country
           - created_at
           - discount
+          - dmsid
           - due_date
           - email
           - favorite

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;

server.js

@@ -64,11 +64,7 @@ app.use(
 //Email Based Paths.
 var sendEmail = require("./server/email/sendemail.js");
 app.post("/sendemail", fb.validateFirebaseIdToken, sendEmail.sendEmail);
-app.post(
-  "/emailbounce",
-bodyParser.text(),
-  sendEmail.emailBounce
-);
+app.post("/emailbounce", bodyParser.text(), sendEmail.emailBounce);
 
 //Test route to ensure Express is responding.
 app.get("/test", async function (req, res) {
@@ -133,7 +129,7 @@ var job = require("./server/job/job");
 app.post("/job/totals", fb.validateFirebaseIdToken, job.totals);
 app.post(
   "/job/statustransition",
-  fb.validateFirebaseIdToken,
+  // fb.validateFirebaseIdToken,
   job.statustransition
 );
 app.post("/job/totalsssu", fb.validateFirebaseIdToken, job.totalsSsu);

server/accounting/pbs/pbs-ap-allocations.js

@@ -0,0 +1,285 @@
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+const GraphQLClient = require("graphql-request").GraphQLClient;
+
+const queries = require("../../graphql-client/queries");
+const CdkBase = require("../../web-sockets/web-socket");
+const moment = require("moment");
+const Dinero = require("dinero.js");
+const AxiosLib = require("axios").default;
+const axios = AxiosLib.create();
+const { PBS_ENDPOINTS, PBS_CREDENTIALS } = require("./pbs-constants");
+const { CheckForErrors } = require("./pbs-job-export");
+const uuid = require("uuid").v4;
+axios.interceptors.request.use((x) => {
+  const socket = x.socket;
+
+  const headers = {
+    ...x.headers.common,
+    ...x.headers[x.method],
+    ...x.headers,
+  };
+  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
+    x.url
+  } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
+  console.log(printable);
+
+  CdkBase.createJsonEvent(socket, "TRACE", `Raw Request: ${printable}`, x.data);
+
+  return x;
+});
+
+axios.interceptors.response.use((x) => {
+  const socket = x.config.socket;
+
+  const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(
+    x.data
+  )}`;
+  console.log(printable);
+  CdkBase.createJsonEvent(
+    socket,
+    "TRACE",
+    `Raw Response: ${printable}`,
+    x.data
+  );
+
+  return x;
+});
+
+async function PbsCalculateAllocationsAp(socket, billids) {
+  try {
+    CdkBase.createLogEvent(
+      socket,
+      "DEBUG",
+      `Received request to calculate allocations for ${billids}`
+    );
+    const { bills, bodyshops } = await QueryBillData(socket, billids);
+    const bodyshop = bodyshops[0];
+    socket.bodyshop = bodyshop;
+    socket.bills = bills;
+
+    //Each bill will enter it's own top level transaction.
+
+    const transactionlist = [];
+    if (bills.length === 0) {
+      CdkBase.createLogEvent(
+        socket,
+        "ERROR",
+        `No bills found for export. Ensure they have not already been exported and try again.`
+      );
+    }
+    bills.forEach((bill) => {
+      //Keep the allocations at the bill level.
+
+      const transactionObject = {
+        SerialNumber: socket.bodyshop.pbs_serialnumber,
+        billid: bill.id,
+        Posting: {
+          Reference: bill.invoice_number,
+          JournalCode: socket.txEnvelope ? socket.txEnvelope.journal : null,
+          TransactionDate: moment().tz(socket.bodyshop.timezone).toISOString(), //"0001-01-01T00:00:00.0000000Z",
+          //Description: "Bulk AP posting.",
+          //AdditionalInfo: "String",
+          Source: "ImEX Online",
+          Lines: [], //socket.apAllocations,
+        },
+      };
+
+      const billHash = {
+        [bodyshop.md_responsibility_centers.taxes.federal_itc.name]: {
+          Account:
+            bodyshop.md_responsibility_centers.taxes.federal_itc.dms_acctnumber,
+          ControlNumber: bill.vendor.dmsid,
+          Amount: Dinero(),
+          // Comment: "String",
+          AdditionalInfo: bill.vendor.name,
+          InvoiceNumber: bill.invoice_number,
+          InvoiceDate: moment(bill.date).tz(bodyshop.timezone).toISOString(),
+        },
+        [bodyshop.md_responsibility_centers.taxes.state.name]: {
+          Account:
+            bodyshop.md_responsibility_centers.taxes.state.dms_acctnumber,
+          ControlNumber: bill.vendor.dmsid,
+          Amount: Dinero(),
+          // Comment: "String",
+          AdditionalInfo: bill.vendor.name,
+          InvoiceNumber: bill.invoice_number,
+          InvoiceDate: moment(bill.date).tz(bodyshop.timezone).toISOString(),
+        },
+      };
+
+      bill.billlines.forEach((bl) => {
+        let lineDinero = Dinero({
+          amount: Math.round((bl.actual_cost || 0) * 100),
+        })
+          .multiply(bl.quantity)
+          .multiply(bill.is_credit_memo ? -1 : 1);
+        const cc = getCostAccount(bl, bodyshop.md_responsibility_centers);
+
+        if (!billHash[cc.name]) {
+          billHash[cc.name] = {
+            Account: cc.dms_acctnumber,
+            ControlNumber: bill.vendor.dmsid,
+            Amount: Dinero(),
+            // Comment: "String",
+            AdditionalInfo: bill.vendor.name,
+            InvoiceNumber: bill.invoice_number,
+            InvoiceDate: moment(bill.date).tz(bodyshop.timezone).toISOString(),
+          };
+        }
+
+        //Add the line amount.
+        billHash[cc.name] = {
+          ...billHash[cc.name],
+          Amount: billHash[cc.name].Amount.add(lineDinero),
+        };
+
+        //Does the line have taxes?
+        if (bl.applicable_taxes.federal) {
+          billHash[bodyshop.md_responsibility_centers.taxes.federal_itc.name] =
+            {
+              ...billHash[
+                bodyshop.md_responsibility_centers.taxes.federal_itc.name
+              ],
+              Amount: billHash[
+                bodyshop.md_responsibility_centers.taxes.federal_itc.name
+              ].Amount.add(lineDinero.percentage(bill.federal_tax_rate || 0)),
+            };
+        }
+        if (bl.applicable_taxes.state) {
+          billHash[bodyshop.md_responsibility_centers.taxes.state.name] = {
+            ...billHash[bodyshop.md_responsibility_centers.taxes.state.name],
+            Amount: billHash[
+              bodyshop.md_responsibility_centers.taxes.state.name
+            ].Amount.add(lineDinero.percentage(bill.state_tax_rate || 0)),
+          };
+        }
+        //End tax check
+      });
+
+      let APAmount = Dinero();
+      Object.keys(billHash).map((key) => {
+        if (billHash[key].Amount.getAmount() > 0) {
+          transactionObject.Posting.Lines.push({
+            ...billHash[key],
+            Amount: billHash[key].Amount.toFormat("0.00"),
+          });
+          APAmount = APAmount.add(billHash[key].Amount); //Calculate the total expense for the bill iteratively to create the corresponding credit to AP.
+        }
+      });
+
+      transactionObject.Posting.Lines.push({
+        Account: bodyshop.md_responsibility_centers.ap.dms_acctnumber,
+        ControlNumber: bill.vendor.dmsid,
+        Amount: APAmount.multiply(-1).toFormat("0.00"),
+        // Comment: "String",
+        AdditionalInfo: bill.vendor.name,
+        InvoiceNumber: bill.invoice_number,
+        InvoiceDate: moment(bill.date).tz(bodyshop.timezone).toISOString(),
+      });
+
+      transactionlist.push(transactionObject);
+    });
+
+    return transactionlist;
+  } catch (error) {
+    CdkBase.createLogEvent(
+      socket,
+      "ERROR",
+      `Error encountered in PbsCalculateAllocationsAp. ${error}`
+    );
+  }
+}
+
+exports.PbsCalculateAllocationsAp = PbsCalculateAllocationsAp;
+
+async function QueryBillData(socket, billids) {
+  CdkBase.createLogEvent(
+    socket,
+    "DEBUG",
+    `Querying bill data for id(s) ${billids}`
+  );
+  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
+  const result = await client
+    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
+    .request(queries.GET_PBS_AP_ALLOCATIONS, { billids: billids });
+  CdkBase.createLogEvent(
+    socket,
+    "TRACE",
+    `Bill data query result ${JSON.stringify(result, null, 2)}`
+  );
+
+  return result;
+}
+
+//@returns the account object.
+function getCostAccount(billline, respcenters) {
+  if (!billline.cost_center) return null;
+
+  const acctName = respcenters.defaults.costs[billline.cost_center];
+
+  return respcenters.costs.find((c) => c.name === acctName);
+}
+
+exports.PbsExportAp = async function (socket, { billids, txEnvelope }) {
+  CdkBase.createLogEvent(socket, "DEBUG", `Exporting selected AP.`);
+
+  //apAllocations has the same shap as the lines key for the accounting posting to PBS.
+  socket.apAllocations = await PbsCalculateAllocationsAp(socket, billids);
+  socket.txEnvelope = txEnvelope;
+  for (const allocation of socket.apAllocations) {
+    const { billid, ...restAllocation } = allocation;
+    const { data: AccountPostingChange } = await axios.post(
+      PBS_ENDPOINTS.AccountingPostingChange,
+      restAllocation,
+      { auth: PBS_CREDENTIALS, socket }
+    );
+
+    CheckForErrors(socket, AccountPostingChange);
+
+    if (AccountPostingChange.WasSuccessful) {
+      CdkBase.createLogEvent(socket, "DEBUG", `Marking bill as exported.`);
+      await MarkApExported(socket, [billid]);
+
+      socket.emit("ap-export-success", billid);
+    } else {
+      CdkBase.createLogEvent(socket, "ERROR", `Export was not succesful.`);
+      socket.emit("ap-export-failure", {
+        billid,
+        error: AccountPostingChange.Message,
+      });
+    }
+  }
+  socket.emit("ap-export-complete");
+};
+
+async function MarkApExported(socket, billids) {
+  CdkBase.createLogEvent(
+    socket,
+    "DEBUG",
+    `Marking bills as exported for id ${billids}`
+  );
+  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
+  const result = await client
+    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
+    .request(queries.MARK_BILLS_EXPORTED, {
+      billids,
+      bill: {
+        exported: true,
+        exported_at: new Date(),
+      },
+      logs: socket.bills.map((bill) => ({
+        bodyshopid: socket.bodyshop.id,
+        billid: bill.id,
+        successful: true,
+        useremail: socket.user.email,
+      })),
+    });
+
+  return result;
+}

server/accounting/pbs/pbs-job-export.js

@@ -182,6 +182,8 @@ async function CheckForErrors(socket, response) {
   }
 }
 
+exports.CheckForErrors = CheckForErrors;
+
 async function QueryJobData(socket, jobid) {
   CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});

server/cdk/cdk-calculate-allocations.js

@@ -118,26 +118,34 @@ exports.default = async function (socket, jobid) {
       } for cost export.`
     );
 
-    const costCenterHash = job.bills.reduce((bill_acc, bill_val) => {
-      bill_val.billlines.map((line_val) => {
-        if (!bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]])
+    let costCenterHash = {};
+    //Check whether to skip this if PBS and using AP module.
+    const disablebillwip = !!bodyshop?.pbs_configuration?.disablebillwip;
+
+    if (!disablebillwip) {
+      costCenterHash = job.bills.reduce((bill_acc, bill_val) => {
+        bill_val.billlines.map((line_val) => {
+          if (
+            !bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]]
+          )
+            bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]] =
+              Dinero();
+
+          let lineDinero = Dinero({
+            amount: Math.round((line_val.actual_cost || 0) * 100),
+          })
+            .multiply(line_val.quantity)
+            .multiply(bill_val.is_credit_memo ? -1 : 1);
+
           bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]] =
-            Dinero();
-
-        let lineDinero = Dinero({
-          amount: Math.round((line_val.actual_cost || 0) * 100),
-        })
-          .multiply(line_val.quantity)
-          .multiply(bill_val.is_credit_memo ? -1 : 1);
-
-        bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]] =
-          bill_acc[selectedDmsAllocationConfig.costs[line_val.cost_center]].add(
-            lineDinero
-          );
-        return null;
-      });
-      return bill_acc;
-    }, {});
+            bill_acc[
+              selectedDmsAllocationConfig.costs[line_val.cost_center]
+            ].add(lineDinero);
+          return null;
+        });
+        return bill_acc;
+      }, {});
+    }
 
     job.timetickets.forEach((ticket) => {
       //Get the total amount of the ticket.

server/data/arms.js

@@ -271,7 +271,7 @@ exports.default = async (req, res) => {
                 CompanyName:
                   process.env.NODE_ENV === "production"
                     ? bodyshop.shopname
-                    : "IMEX Test Shop",
+                    : "IMEX Test Canadian Shop",
                 IDInfo: {
                   IDQualifierCode: "US",
                   IDNum: bodyshop.entegral_id,
@@ -515,11 +515,8 @@ exports.default = async (req, res) => {
           {
             TotalType: "LAB",
             TotalTypeDesc: "Body Labor",
-            TotalHours:
-              job.job_totals.rates.lab.hours + job.job_totals.rates.la1.hours,
-            TotalAmt: Dinero(job.job_totals.rates.lab.total)
-              .add(Dinero(job.job_totals.rates.la1.total))
-              .toFormat("0.00"),
+            TotalHours: job.job_totals.rates.lab.hours,
+            TotalAmt: Dinero(job.job_totals.rates.lab.total).toFormat("0.00"),
           },
           {
             TotalType: "LAF",
@@ -856,6 +853,13 @@ exports.default = async (req, res) => {
             fs.writeFileSync(`./logs/arms-request.xml`, rawRequest);
             fs.writeFileSync(`./logs/arms-response.xml`, rawResponse);
 
+            logger.log("arms-job-xml-request", "DEBUG", "api", job.id, {
+              xml: rawRequest,
+            });
+            logger.log("arms-job-xml-response", "DEBUG", "api", job.id, {
+              xml: rawResponse,
+            });
+
             if (err) {
               sendServerEmail({
                 subject: `ARMS Update Failed: ${bodyshop.shopname} - ${job.ro_number}`,

server/graphql-client/queries.js

@@ -1351,6 +1351,7 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
       id
       md_responsibility_centers
       cdk_configuration
+      pbs_configuration
     }
     ro_number
     dms_allocation
@@ -1506,6 +1507,23 @@ mutation MARK_JOB_EXPORTED($jobId: uuid!, $job: jobs_set_input!, $log: exportlog
 }
 `;
 
+exports.MARK_BILLS_EXPORTED = `
+mutation UPDATE_BILLS($billids: [uuid!]!, $bill: bills_set_input!, $logs: [exportlog_insert_input!]!) {
+  update_bills(where: {id: {_in: $billids}}, _set: $bill) {
+    returning {
+      id
+      exported
+      exported_at
+    }
+  }
+  insert_exportlog(objects: $logs) {
+returning{
+  id
+}
+  }
+}
+`;
+
 exports.INSERT_EXPORT_LOG = `
 mutation INSERT_EXPORT_LOG($log: exportlog_insert_input!) {
   insert_exportlog_one(object: $log) {
@@ -1633,3 +1651,46 @@ mutation ($sesid: String!, $status: String, $context: jsonb) {
     }
   }
 }`;
+
+exports.GET_PBS_AP_ALLOCATIONS = `
+query GET_PBS_AP_ALLOCATIONS($billids: [uuid!]) {
+  bodyshops(where: {associations: {active: {_eq: true}}}) {
+    md_responsibility_centers
+    timezone
+    pbs_serialnumber
+    id
+  }
+  bills(where: {id: {_in: $billids}, exported:{_eq: false}}) {
+    id
+    date
+    isinhouse
+    invoice_number
+    federal_tax_rate
+    is_credit_memo
+    jobid
+    job {
+      id
+      ro_number
+    }
+    local_tax_rate
+    state_tax_rate
+    total
+    vendorid
+    vendor {
+      id
+      name
+      dmsid
+    }
+    billlines {
+      id
+      actual_cost
+      actual_price
+      applicable_taxes
+      cost_center
+      deductedfromlbr
+      lbr_adjustment
+      quantity
+    }
+  }
+}
+`;

server/job/job-status-transition.js

@@ -7,22 +7,29 @@ const logger = require("../utils/logger");
 // Dinero.defaultCurrency = "USD";
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
-
+const path = require("path");
+const client = require("../graphql-client/graphql-client").client;
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
 async function StatusTransition(req, res) {
-  const { jobid, value, bodyshopid } = req.body;
-
-  const BearerToken = req.headers.authorization;
-  logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+  if (req.headers["event-secret"] !== process.env.EVENT_SECRET) {
+    res.status(403).send("Unauthorized");
+    return;
+  }
 
+  const {
+    id: jobid,
+    status: value,
+    shopid: bodyshopid,
+  } = req.body.event.data.new;
   try {
-    const { update_transitions } = await client
-      .setHeaders({ Authorization: BearerToken })
-      .request(queries.UPDATE_OLD_TRANSITION, {
+    const { update_transitions } = await client.request(
+      queries.UPDATE_OLD_TRANSITION,
+      {
         jobid: jobid,
         existingTransition: {
           end: new Date(),
@@ -30,7 +37,8 @@ async function StatusTransition(req, res) {
 
           //duration
         },
-      });
+      }
+    );
 
     let duration =
       update_transitions.affected_rows === 0
@@ -38,29 +46,27 @@ async function StatusTransition(req, res) {
         : new Date(update_transitions.returning[0].end) -
           new Date(update_transitions.returning[0].start);
 
-    const resp2 = await client
-      .setHeaders({ Authorization: BearerToken })
-      .request(queries.INSERT_NEW_TRANSITION, {
-        oldTransitionId:
+    const resp2 = await client.request(queries.INSERT_NEW_TRANSITION, {
+      oldTransitionId:
+        update_transitions.affected_rows === 0
+          ? null
+          : update_transitions.returning[0].id,
+      duration,
+      newTransition: {
+        bodyshopid: bodyshopid,
+        jobid: jobid,
+        start:
+          update_transitions.affected_rows === 0
+            ? new Date()
+            : update_transitions.returning[0].end,
+        prev_value:
           update_transitions.affected_rows === 0
             ? null
-            : update_transitions.returning[0].id,
-        duration,
-        newTransition: {
-          bodyshopid: bodyshopid,
-          jobid: jobid,
-          start:
-            update_transitions.affected_rows === 0
-              ? new Date()
-              : update_transitions.returning[0].end,
-          prev_value:
-            update_transitions.affected_rows === 0
-              ? null
-              : update_transitions.returning[0].value,
-          value: value,
-          type: "status",
-        },
-      });
+            : update_transitions.returning[0].value,
+        value: value,
+        type: "status",
+      },
+    });
 
     //Check to see if there is an existing status transition record.
     //Query using Job ID, start is not null, end is null.

server/web-sockets/web-socket.js

@@ -22,6 +22,11 @@ const {
   PbsSelectedCustomer,
 } = require("../accounting/pbs/pbs-job-export");
 
+const {
+  PbsCalculateAllocationsAp,
+  PbsExportAp,
+} = require("../accounting/pbs/pbs-ap-allocations");
+
 io.use(function (socket, next) {
   try {
     if (socket.handshake.auth.token) {
@@ -101,7 +106,7 @@ io.on("connection", (socket) => {
   });
   //END CDK
 
-  //PBS
+  //PBS AR
   socket.on("pbs-calculate-allocations", async (jobid, callback) => {
     const allocations = await CdkCalculateAllocations(socket, jobid);
     createLogEvent(socket, "DEBUG", `Allocations calculated.`);
@@ -125,7 +130,27 @@ io.on("connection", (socket) => {
     socket.selectedCustomerId = selectedCustomerId;
     PbsSelectedCustomer(socket, selectedCustomerId);
   });
-  //End PBS
+  //End PBS AR
+
+  //PBS AP
+  socket.on("pbs-calculate-allocations-ap", async (billids, callback) => {
+    const allocations = await PbsCalculateAllocationsAp(socket, billids);
+    createLogEvent(socket, "DEBUG", `AP Allocations calculated.`);
+    createLogEvent(
+      socket,
+      "TRACE",
+      `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`
+    );
+    socket.apAllocations = allocations;
+    callback(allocations);
+  });
+
+  socket.on("pbs-export-ap", ({ billids, txEnvelope }) => {
+    socket.txEnvelope = txEnvelope;
+    PbsExportAp(socket, { billids, txEnvelope });
+  });
+
+  //END PBS AP
 
   socket.on("disconnect", () => {
     createLogEvent(socket, "DEBUG", `User disconnected.`);