Adjust logging statements.

IO-3376 Scrollbar Theming

bodyshop_translations.babel

@@ -5305,6 +5305,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>ro_posting</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>sendmaterialscosting</name>
                                                 <definition_loaded>false</definition_loaded>

client/.env.development.imex

@@ -15,4 +15,5 @@ VITE_APP_INSTANCE=IMEX
 TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com

client/.env.development.rome

@@ -17,4 +17,5 @@ VITE_APP_INSTANCE=ROME
 TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com

client/.env.production.imex

@@ -14,4 +14,5 @@ VITE_APP_REPORTS_SERVER_URL=https://reports.imex.online
 VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=IMEX
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com

client/.env.production.rome

@@ -14,4 +14,5 @@ VITE_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=ROME
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com

client/.env.test.imex

@@ -14,4 +14,5 @@ VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com

client/.env.test.rome

@@ -14,4 +14,5 @@ VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=ROME
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com

client/src/App/App.jsx

@@ -233,9 +233,7 @@ export function App({
             path="/parts/*"
             element={
               <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
-                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
               </ErrorBoundary>
             }
           >

client/src/App/App.styles.scss

@@ -272,23 +272,23 @@
 }
 
 // Scrollbar styles (uncomment if needed, updated for dark mode)
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  border-radius: 0.2rem;
-  background-color: var(--table-stripe-bg);
-}
+// ::-webkit-scrollbar-track {
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   border-radius: 0.2rem;
+//   background-color: var(--table-stripe-bg);
+// }
 
-::-webkit-scrollbar {
-  width: 0.25rem;
-  max-height: 0.25rem;
-  background-color: var(--table-stripe-bg);
-}
+// ::-webkit-scrollbar {
+//   width: 0.25rem;
+//   max-height: 0.25rem;
+//   background-color: var(--table-stripe-bg);
+// }
 
-::-webkit-scrollbar-thumb {
-  border-radius: 0.2rem;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  background-color: var(--alert-color);
-}
+// ::-webkit-scrollbar-thumb {
+//   border-radius: 0.2rem;
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   background-color: var(--alert-color);
+// }
 
 .ant-input-number-input,
 .ant-input-number,

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

@@ -109,6 +109,13 @@ export function BillsListTableComponent({
       key: "vendorname",
       sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
       sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      filters: bills
+        ? [...new Set(bills.map((bill) => bill.vendor.name))].map((name) => ({
+            text: name,
+            value: name
+          }))
+        : [],
+      onFilter: (value, record) => record.vendor.name === value,
       render: (text, record) => <span>{record.vendor.name}</span>
     },
     {

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -80,7 +80,7 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
   };
 
   const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { name: e });
+    logImEXEvent("dashboard_add_component", { name: e.key });
     setState({
       ...state,
       items: [

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

@@ -92,6 +92,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
         rowKey="center"
         dataSource={allocationsSummary}
         locale={{ emptyText: t("dms.labels.refreshallocations") }}
+        scroll={{ x: true }}
         summary={() => {
           const totals =
             allocationsSummary &&

client/src/components/global-footer/global-footer.component.jsx

@@ -16,7 +16,7 @@ const mapStateToProps = createStructuredSelector({
 
 export function GlobalFooter({ isPartsEntry }) {
   const { t } = useTranslation();
-  
+
   if (isPartsEntry) {
     return (
       <Footer>
@@ -35,7 +35,6 @@ export function GlobalFooter({ isPartsEntry }) {
               rome: t("titles.romeonline")
             })} - ${import.meta.env.VITE_APP_GIT_SHA_DATE}`}
           </div>
-          <WssStatusDisplayComponent />
           <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
             Disclaimer & Notices
           </Link>

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -10,9 +10,12 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
+
+export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
+
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
-export function JobPartsQueueCount({ bodyshop, parts, style }) {
+export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
   const partsStatus = useMemo(() => {
     if (!parts) return null;
     return parts.reduce(
@@ -35,35 +38,34 @@ export function JobPartsQueueCount({ bodyshop, parts, style }) {
   }, [bodyshop, parts]);
 
   if (!parts) return null;
-
   return (
-    <Row style={style}>
-      <Col span={4}>
+    <Row>
+      <Col {...defaultColLayout}>
         <Tooltip title="Total">
           <Tag>{partsStatus.total}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title="No Status">
           <Tag color="gold">{partsStatus["null"]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
           <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_received}>
           <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_returned}>
           <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_bo}>
           <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
         </Tooltip>

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -233,7 +233,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

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

@@ -138,6 +138,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   <Switch />
                 </Form.Item>
               )}
+              {bodyshop.pbs_serialnumber && (
+                <Form.Item
+                  label={t("bodyshop.fields.dms.ro_posting")}
+                  valuePropName="checked"
+                  name={["pbs_configuration", "ro_posting"]}
+                >
+                  <Switch />
+                </Form.Item>
+              )}
               {bodyshop.pbs_serialnumber && (
                 <Form.Item
                   label={t("bodyshop.fields.dms.appostingaccount")}

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

@@ -147,7 +147,7 @@ export function SimplifiedPartsJobsListComponent({
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

client/src/index.jsx

@@ -27,7 +27,8 @@ registerSW({ immediate: true });
 Dinero.globalRoundingMode = "HALF_EVEN";
 
 amplitude.init("6228a598e57cd66875cfd41604f1f891", {
-  defaultTracking: true
+  defaultTracking: true,
+  serverUrl: import.meta.env.VITE_APP_AMP_URL
   //  {
   //     attribution: {
   //       excludeReferrers: true,

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

@@ -1,5 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd";
+import { useQuery } from "@apollo/client";
 import axios from "axios";
 import queryString from "query-string";
 import { useEffect, useState } from "react";
@@ -16,6 +17,7 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
+import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 
 const mapDispatchToProps = (dispatch) => ({
   setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
@@ -33,25 +35,22 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
   });
   const Templates = TemplateList("bill");
   const { t } = useTranslation();
+
+  const { data: vendorsData } = useQuery(QUERY_ALL_VENDORS);
+
   const columns = [
     {
       title: t("bills.fields.vendorname"),
       dataIndex: "vendorname",
       key: "vendorname",
-      // sortObject: (direction) => {
-      //   return {
-      //     vendor: {
-      //       name: direction
-      //         ? direction === "descend"
-      //           ? "desc"
-      //           : "asc"
-      //         : "desc",
-      //     },
-      //   };
-      // },
-      // sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
-      // sortOrder:
-      //   state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
+      sortObject: (order) => ({
+        vendor: { name: order === "descend" ? "desc" : "asc" }
+      }),
+      filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
+      filteredValue: state.filteredInfo.vendorname || null,
+      onFilter: (value, record) => record.vendorid === value,
+      sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
       render: (text, record) => <span>{record.vendor.name}</span>
     },
     {
@@ -65,20 +64,11 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      // sortObject: (direction) => {
-      //   return {
-      //     job: {
-      //       ro_number: direction
-      //         ? direction === "descend"
-      //           ? "desc"
-      //           : "asc"
-      //         : "desc",
-      //     },
-      //   };
-      // },
-      // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      // sortOrder:
-      //   state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      sortObject: (order) => ({
+        job: { ro_number: order === "descend" ? "desc" : "asc" }
+      }),
+      sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
       render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
     },
     {
@@ -175,7 +165,8 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    // Persist filters (including vendorname) and sorting
+    setState({ ...state, filteredInfo: { ...state.filteredInfo, ...filters }, sortedInfo: sorter });
     search.page = pagination.current;
     if (sorter && sorter.column && sorter.column.sortObject) {
       search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));

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

@@ -48,7 +48,7 @@ export const socket = SocketIO(
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
   const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState("DEBUG");
+  const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
   const history = useNavigate();
   const [logs, setLogs] = useState([]);
   const search = queryString.parse(useLocation().search);

client/src/translations/en_us/common.json

@@ -316,6 +316,7 @@
           "itc_local": "Local Tax is ITC?",
           "itc_state": "State Tax is ITC?",
           "mappingname": "DMS Mapping Name",
+          "ro_posting": "Create $0 RO?",
           "sendmaterialscosting": "Materials Cost as % of Sale",
           "srcco": "Source Company #/Dealer #"
         },

client/src/translations/es/common.json

@@ -316,6 +316,7 @@
           "itc_local": "",
           "itc_state": "",
           "mappingname": "",
+          "ro_posting": "",
           "sendmaterialscosting": "",
           "srcco": ""
         },

client/src/translations/fr/common.json

@@ -316,6 +316,7 @@
           "itc_local": "",
           "itc_state": "",
           "mappingname": "",
+          "ro_posting": "",
           "sendmaterialscosting": "",
           "srcco": ""
         },

server/accounting/pbs/pbs-constants.js

@@ -6,10 +6,6 @@ const PBS_CREDENTIALS = {
 };
 
 exports.PBS_CREDENTIALS = PBS_CREDENTIALS;
-// const cdkDomain =
-//   process.env.NODE_ENV === "production"
-//     ? "https://3pa.dmotorworks.com"
-//     : "https://uat-3pa.dmotorworks.com";
 
 const pbsDomain = `https://partnerhub.pbsdealers.com/json/reply`;
 exports.PBS_ENDPOINTS = {
@@ -18,5 +14,9 @@ exports.PBS_ENDPOINTS = {
   VehicleGet: `${pbsDomain}/VehicleGet`,
   AccountingPostingChange: `${pbsDomain}/AccountingPostingChange`,
   ContactChange: `${pbsDomain}/ContactChange`,
-  VehicleChange: `${pbsDomain}/VehicleChange`
+  VehicleChange: `${pbsDomain}/VehicleChange`,
+  RepairOrderChange: `${pbsDomain}/RepairOrderChange`, //TODO: Verify that this is correct. Docs have /reply/ in path. 
+  RepairOrderGet: `${pbsDomain}/RepairOrderGet`,
+  RepairOrderContactVehicleGet: `${pbsDomain}/RepairOrderContactVehicleGet`,
+  RepairOrderContactVehicleChange: `${pbsDomain}/RepairOrderContactVehicleChange`,
 };

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

@@ -19,12 +19,11 @@ axios.interceptors.request.use((x) => {
     ...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);
+  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${x.url
+    } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
+  //logRequestToFile(printable);
 
-  CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
 
   return x;
 });
@@ -32,23 +31,39 @@ axios.interceptors.request.use((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, "SILLY", `Raw Response: ${printable}`, x.data);
+  const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
+  //logRequestToFile(printable);
+  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);
 
   return x;
 });
 
+const fs = require('fs');
+const path = require("path");
+function logRequestToFile(printable) {
+  try {
+    const logDir = path.join(process.cwd(), "logs");
+    if (!fs.existsSync(logDir)) {
+      fs.mkdirSync(logDir, { recursive: true });
+    }
+    const logFile = path.join(logDir, "pbs-http.log");
+    fs.appendFileSync(logFile, `${printable}\n`);
+  } catch (err) {
+    console.error("Unexpected error in logRequestToFile:", err);
+  }
+}
+
+
 exports.default = async function (socket, { txEnvelope, jobid }) {
   socket.logEvents = [];
   socket.recordid = jobid;
   socket.txEnvelope = txEnvelope;
   try {
-    CdkBase.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);
+    CdkBase.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);
 
     const JobData = await QueryJobData(socket, jobid);
     socket.JobData = JobData;
-    CdkBase.createLogEvent(socket, "DEBUG", `Querying the DMS for the Vehicle Record.`);
+    CdkBase.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
     //Query for the Vehicle record to get the associated customer.
     socket.DmsVeh = await QueryVehicleFromDms(socket);
     //Todo: Need to validate the lines and methods below.
@@ -69,42 +84,52 @@ exports.default = async function (socket, { txEnvelope, jobid }) {
 
 exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
   try {
-    if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle === false) {
-      CdkBase.createLogEvent(socket, "DEBUG", `User selected customer ${selectedCustomerId || "NEW"}`);
+    socket.selectedCustomerId = selectedCustomerId;
+    if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
+      CdkBase.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);
 
       //Upsert the contact information as per Wafaa's Email.
       CdkBase.createLogEvent(
         socket,
-        "DEBUG",
-        `Upserting contact information to DMS for ${
-          socket.JobData.ownr_fn || ""
+        "INFO",
+        `Upserting contact information to DMS for ${socket.JobData.ownr_fn || ""
         } ${socket.JobData.ownr_ln || ""} ${socket.JobData.ownr_co_nm || ""}`
       );
       const ownerRef = await UpsertContactData(socket, selectedCustomerId);
-
-      CdkBase.createLogEvent(socket, "DEBUG", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
-      await UpsertVehicleData(socket, ownerRef.ReferenceId);
+      socket.ownerRef = ownerRef;
+      CdkBase.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
+      const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
+      socket.vehicleRef = vehicleRef;
     } else {
       CdkBase.createLogEvent(
         socket,
-        "DEBUG",
-        `Contact and Vehicle updates disabled. Skipping to accounting data insert.`
+        "INFO",
+        `Contact and Vehicle updates disabled. Querying data and skipping to accounting data insert.`
       );
+      //Must query for records to insert $0 RO. 
+      if (!socket.ownerRef) {
+        const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
+        socket.ownerRef = ownerRef;
+      }
+      const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
+      socket.vehicleRef = vehicleRef;
     }
-    CdkBase.createLogEvent(socket, "DEBUG", `Inserting account data.`);
-    CdkBase.createLogEvent(socket, "DEBUG", `Inserting accounting posting data..`);
+    CdkBase.createLogEvent(socket, "INFO", `Inserting accounting posting data..`);
     const insertResponse = await InsertAccountPostingData(socket);
 
     if (insertResponse.WasSuccessful) {
-      CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported.`);
-      await MarkJobExported(socket, socket.JobData.id);
+      if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {
 
+        await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef)
+      }
+      CdkBase.createLogEvent(socket, "INFO", `Marking job as exported.`);
+      await MarkJobExported(socket, socket.JobData.id);
       socket.emit("export-success", socket.JobData.id);
     } else {
       CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
     }
   } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
     await InsertFailedExportLog(socket, error);
   }
 };
@@ -112,22 +137,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
 // Was Successful
 async function CheckForErrors(socket, response) {
   if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
-    CdkBase.createLogEvent(socket, "DEBUG", `Successful response from DMS. ${response.Message || ""}`);
+    CdkBase.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
   } else {
     CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
-    CdkBase.createLogEvent(socket, "SILLY", `Error received from DMS: ${JSON.stringify(response)}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
   }
 }
 
 exports.CheckForErrors = CheckForErrors;
 
 async function QueryJobData(socket, jobid) {
-  CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
-  CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 
@@ -247,15 +272,15 @@ async function UpsertContactData(socket, selectedCustomerId) {
           Code: socket.JobData.owner.accountingid,
           ...(socket.JobData.ownr_co_nm
             ? {
-                //LastName: socket.JobData.ownr_ln,
-                FirstName: socket.JobData.ownr_co_nm,
-                IsBusiness: true
-              }
+              //LastName: socket.JobData.ownr_ln,
+              FirstName: socket.JobData.ownr_co_nm,
+              IsBusiness: true
+            }
             : {
-                LastName: socket.JobData.ownr_ln,
-                FirstName: socket.JobData.ownr_fn,
-                IsBusiness: false
-              }),
+              LastName: socket.JobData.ownr_ln,
+              FirstName: socket.JobData.ownr_fn,
+              IsBusiness: false
+            }),
 
           //Salutation: "String",
           //MiddleName: "String",
@@ -332,7 +357,7 @@ async function UpsertVehicleData(socket, ownerRef) {
           //FleetNumber: "String",
           //Status: "String",
           OwnerRef: ownerRef, // "00000000000000000000000000000000",
-          ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
+          // ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
           Make: socket.JobData.v_make_desc,
           Model: socket.JobData.v_model_desc,
           Trim: socket.JobData.vehicle && socket.JobData.vehicle.v_trimcode,
@@ -340,7 +365,7 @@ async function UpsertVehicleData(socket, ownerRef) {
           Year: socket.JobData.v_model_yr,
           Odometer: socket.JobData.kmout,
           ExteriorColor: {
-            Code: socket.JobData.v_color,
+            // Code: socket.JobData.v_color,
             Description: socket.JobData.v_color
           }
           // InteriorColor: { Code: "String", Description: "String" },
@@ -470,6 +495,57 @@ async function UpsertVehicleData(socket, ownerRef) {
   }
 }
 
+async function GetVehicleData(socket, ownerRef) {
+  try {
+    const { data: { Vehicles } } = await axios.post(
+      PBS_ENDPOINTS.VehicleGet,
+      {
+        SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
+        // "VehicleId": "00000000000000000000000000000000",
+        // "Year": "String",
+        // "YearFrom": "String",
+        // "YearTo": "String",
+        // "Make": "String",
+        // "Model": "String",
+        // "Trim": "String",
+        // "ModelNumber": "String",
+        // "StockNumber": "String",
+        VIN: socket.JobData.v_vin,
+        // "LicenseNumber": "String",
+        // "Lot": "String",
+        // "Status": "String",
+        // "StatusList": ["String"],
+        // "OwnerRef": "00000000000000000000000000000000",
+        // "ModifiedSince": "0001-01-01T00:00:00.0000000Z",
+        // "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
+        // "LastSaleSince": "0001-01-01T00:00:00.0000000Z",
+        // "VehicleIDList": ["00000000000000000000000000000000"],
+        // "IncludeInactive": false,
+        // "IncludeBuildVehicles": false,
+        // "IncludeBlankLot": false,
+        // "ShortVIN": "String",
+        // "ResultLimit": 0,
+        // "LotAccessDivisions": [0],
+        // "OdometerTo": 0,
+        // "OdometerFrom": 0
+      }
+      ,
+      { auth: PBS_CREDENTIALS, socket }
+    );
+    CheckForErrors(socket, Vehicles);
+    if (Vehicles.length === 1) {
+      return Vehicles[0];
+
+    } else {
+      CdkBase.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
+    }
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
+    throw new Error(error);
+  }
+}
+
+
 async function InsertAccountPostingData(socket) {
   try {
     const allocations = await CalculateAllocations(socket, socket.JobData.id);
@@ -572,7 +648,7 @@ async function InsertAccountPostingData(socket) {
 }
 
 async function MarkJobExported(socket, jobid) {
-  CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
@@ -618,3 +694,158 @@ async function InsertFailedExportLog(socket, error) {
     CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
   }
 }
+
+
+async function CreateRepairOrderInPBS(socket) {
+  try {
+    const { RepairOrders } = await RepairOrderGet(socket);
+    if (RepairOrders.length === 0) {
+      const InsertedRepairOrder = await RepairOrderChange(socket)
+      socket.InsertedRepairOrder = InsertedRepairOrder;
+      CdkBase.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
+
+    } else if (RepairOrders.length > 0) {
+      //Find out if it's a matching RO. 
+      //This logic is used because the integration will simply add another line to an open RO if it exists. 
+      const matchingRo = RepairOrders.find(ro => ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase()))
+      if (!matchingRo) {
+        CdkBase.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
+        const InsertedRepairOrder = await RepairOrderChange(socket)
+        socket.InsertedRepairOrder = InsertedRepairOrder;
+      } else {
+        CdkBase.createLogEvent(socket, "WARN", `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`);
+      }
+    }
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
+  }
+}
+
+async function RepairOrderGet(socket) {
+  try {
+    const { data: RepairOrderGet } = await axios.post(
+      PBS_ENDPOINTS.RepairOrderGet,
+      {
+        SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
+        //"RepairOrderId": "374728766",
+        //"RepairOrderNumber": "4" || socket.JobData.ro_number,
+        //"RawRepairOrderNumber": socket.JobData.ro_number,
+        // "Tag": "String",
+        //"ContactRef": socket.contactRef,
+        // "ContactRefList": ["00000000000000000000000000000000"],
+        "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
+        // "VehicleRefList": ["00000000000000000000000000000000"],
+        // "Status": "String",
+        // "CashieredSince": "0001-01-01T00:00:00.0000000Z",
+        // "CashieredUntil": "0001-01-01T00:00:00.0000000Z",
+        // "OpenDateSince": "0001-01-01T00:00:00.0000000Z",
+        // "OpenDateUntil": "0001-01-01T00:00:00.0000000Z",
+        //"ModifiedSince": "2025-01-01T00:00:00.0000000Z",
+        // "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
+        // "Shop": "String"
+      },
+      { auth: PBS_CREDENTIALS, socket }
+    );
+    CheckForErrors(socket, RepairOrderGet);
+    return RepairOrderGet;
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
+    throw new Error(error);
+  }
+}
+
+async function RepairOrderChange(socket) {
+  try {
+    const { data: RepairOrderChangeResponse } = await axios.post(
+      PBS_ENDPOINTS.RepairOrderChange,
+      { //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
+        "RepairOrderInfo": {
+          //"Id": "string/00000000-0000-0000-0000-000000000000",
+          //"RepairOrderId": "00000000000000000000000000000000",
+          SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
+          "RepairOrderNumber": "00000000000000000000000000000000", //This helps force a new RO. 
+          "RawRepairOrderNumber": "00000000000000000000000000000000",
+          // "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
+          // "RawRepairOrderNumber": socket.JobData.ro_number,
+          "DateOpened": moment(),
+          // "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
+          // "DateCashiered": "0001-01-01T00:00:00.0000000Z",
+          // "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
+          "DatePromised": socket.JobData.scheduled_completion,
+          // "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
+          "DateVehicleCompleted": socket.JobData.actual_completion,
+          // "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
+          // "CSR": "String",
+          // "CSRRef": "00000000000000000000000000000000",
+          // "BookingUser": "String",
+          // "BookingUserRef": "00000000000000000000000000000000",
+          "ContactRef": socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
+          "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
+          "MileageIn": socket.JobData.km_in,
+          "Tag": "BODYSHOP",
+          //"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
+          Requests: [
+            {
+              // "RepairOrderRequestRef": "b1842ecad62c4279bbc2fef4f6bf6cde",
+              // "RepairOrderRequestId": 1,
+              // "CSR": "PBS",
+              // "CSRRef": "1ce12ac692564e94bda955d529ee911a",
+              // "Skill": "GEN",
+              "RequestCode": "MISC",
+              "RequestDescription": `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
+              "Status": "Completed",
+              // "TechRef": "00000000000000000000000000000000",
+              "AllowedHours": 0,
+              "EstimateLabour": 0,
+              "EstimateParts": 0,
+              "ComeBack": false,
+              "AddedOperation": true,
+              "PartLines": [],
+              "PartRequestLines": [],
+              "LabourLines": [],
+              "SubletLines": [],
+              "TimePunches": [],
+              "Summary": {
+                "Labour": 0,
+                "Parts": 0,
+                "OilGas": 0,
+                "SubletTow": 0,
+                "Misc": 0,
+                "Environment": 0,
+                "ShopSupplies": 0,
+                "Freight": 0,
+                "WarrantyDeductible": 0,
+                "Discount": 0,
+                "SubTotal": 0,
+                "Tax1": 0,
+                "Tax2": 0,
+                "InvoiceTotal": 0,
+                "CustomerDeductible": 0,
+                "GrandTotal": 0,
+                "LabourDiscount": 0,
+                "PartDiscount": 0,
+                "ServiceFeeTotal": 0,
+                "OEMDiscount": 0
+              },
+              "LineType": "RequestLine",
+            },
+          ],
+
+          "Memo": socket.txEnvelope.story,
+
+        },
+        "IsAsynchronous": false,
+        // "UserRequest": "String",
+        // "UserRef": "00000000000000000000000000000000"
+      }
+
+      ,
+      { auth: PBS_CREDENTIALS, socket }
+    );
+    CheckForErrors(socket, RepairOrderChangeResponse);
+    return RepairOrderChangeResponse;
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
+    throw new Error(error);
+  }
+}

server/graphql-client/queries.js

@@ -420,6 +420,8 @@ query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
     v_make_desc
     v_color
     ca_customer_gst
+    scheduled_completion
+    actual_completion
     vehicle {
       v_trimcode
       v_makecode
@@ -2155,18 +2157,16 @@ exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $
 
 exports.INSERT_NEW_TRANSITION = (
   includeOldTransition
-) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${
-  includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
-}) {
+) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
+  }) {
   insert_transitions_one(object: $newTransition) {
     id
   }
-  ${
-    includeOldTransition
-      ? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
+  ${includeOldTransition
+    ? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
     affected_rows
   }`
-      : ""
+    : ""
   }
 }`;
 

server/integrations/partsManagement/endpoints/partsManagementDeprovisioning.js

@@ -88,7 +88,7 @@ const partsManagementDeprovisioning = async (req, res) => {
   const { logger } = req;
   const { shopId } = req.body;
 
-  if (process.env.NODE_ENV === "production") {
+  if (process.env.NODE_ENV === "production" || process.env.HOSTNAME?.endsWith("compute.internal")) {
     return res.status(403).json({ error: "Deprovisioning not allowed in production environment." });
   }
 

server/routes/intergrationRoutes.js

@@ -1,5 +1,6 @@
 const express = require("express");
 const router = express.Router();
+const logger = require("../../server/utils/logger");
 
 // Pull secrets from env
 const { VSSTA_INTEGRATION_SECRET, PARTS_MANAGEMENT_INTEGRATION_SECRET } = process.env;
@@ -11,7 +12,7 @@ if (typeof VSSTA_INTEGRATION_SECRET === "string" && VSSTA_INTEGRATION_SECRET.len
 
   router.post("/vssta", vsstaMiddleware, vsstaIntegration);
 } else {
-  console.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
+  logger.logger.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
 }
 
 // Only load Parts Management routes if that secret is set
@@ -45,14 +46,17 @@ if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_
   );
 
   // Deprovisioning route
-  router.post("/parts-management/deprovision", partsManagementIntegrationMiddleware, partsManagementDeprovisioning);
+  if (process.env.NODE_ENV !== "production" && !process.env.HOSTNAME?.endsWith("compute.internal")) {
+    logger.logger.warn("Parts Management Deprovisioning route has been loaded.");
+    router.post("/parts-management/deprovision", partsManagementIntegrationMiddleware, partsManagementDeprovisioning);
+  }
 
   /**
    * Route to handle Parts Management Provisioning
    */
   router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
 } else {
-  console.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
+  logger.logger.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
 }
 
 module.exports = router;