Autohouse error fix.

release/2022-06-30

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -2063,6 +2063,32 @@
                                     </concept_node>
                                 </children>
                             </folder_node>
+                            <folder_node>
+                                <name>validation</name>
+                                <children>
+                                    <concept_node>
+                                        <name>atleastone</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>
+                                </children>
+                            </folder_node>
                         </children>
                     </folder_node>
                     <folder_node>
@@ -8138,6 +8164,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>default_quote</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>default_received</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -15374,6 +15421,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>sizelimit</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>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -17758,6 +17826,27 @@
                             <folder_node>
                                 <name>actions</name>
                                 <children>
+                                    <concept_node>
+                                        <name>converttolabor</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>new</name>
                                         <definition_loaded>false</definition_loaded>
@@ -18938,6 +19027,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>adjustmenttobeadded</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>billref</name>
                                         <definition_loaded>false</definition_loaded>
@@ -18959,6 +19069,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>convertedtolabor</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>edit</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33946,6 +34077,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>is_quote</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>mark_as_received</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40025,6 +40177,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>jobs_reconcile</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>lag_time</name>
                                         <definition_loaded>false</definition_loaded>
@@ -44929,6 +45102,27 @@
                                     <folder_node>
                                         <name>signinerror</name>
                                         <children>
+                                            <concept_node>
+                                                <name>auth/user-disabled</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>auth/user-not-found</name>
                                                 <definition_loaded>false</definition_loaded>

client/package.json

@@ -8,6 +8,7 @@
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^6.4.3",
     "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@jsreport/browser-client": "^3.1.0",
     "@sentry/react": "^7.1.1",
     "@sentry/tracing": "^7.1.1",
     "@splitsoftware/splitio-react": "^1.4.1",

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

@@ -5,7 +5,6 @@ import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-it
 import "./bill-cm-returns-table.styles.scss";
 export default function BillCmdReturnsTableComponent({
   form,
-  loadOutstandingReturns,
   returnLoading,
   returnData,
 }) {

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

@@ -144,6 +144,14 @@ function BillEnterModalContainer({
       adjKeys.forEach((key) => {
         newAdjustments[key] =
           (newAdjustments[key] || 0) + adjustmentsToInsert[key];
+
+        insertAuditTrail({
+          jobid: values.jobid,
+          operation: AuditTrailMapping.jobmodifylbradj({
+            mod_lbr_ty: key,
+            hours: adjustmentsToInsert[key].toFixed(1),
+          }),
+        });
       });
 
       const jobUpdate = client.mutate({
@@ -161,10 +169,6 @@ function BillEnterModalContainer({
         });
         return;
       }
-      insertAuditTrail({
-        jobid: values.jobid,
-        operation: AuditTrailMapping.jobmodifylbradj(),
-      });
     }
 
     const markPolReceived =

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

@@ -58,6 +58,7 @@ export function BillFormComponent({
     {},
     bodyshop.imexshopid
   );
+
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
 
@@ -140,13 +141,14 @@ export function BillFormComponent({
             onBlur={() => {
               if (form.getFieldValue("jobid") !== null) {
                 loadLines({ variables: { id: form.getFieldValue("jobid") } });
-                if (form.getFieldValue("vendorid") !== null)
+                if (form.getFieldValue("vendorid") !== null) {
                   loadOutstandingReturns({
                     variables: {
                       jobId: form.getFieldValue("jobid"),
                       vendorId: form.getFieldValue("vendorid"),
                     },
                   });
+                }
               }
             }}
           />
@@ -273,12 +275,13 @@ export function BillFormComponent({
                   getFieldValue("jobid") &&
                   getFieldValue("vendorid")
                 ) {
-                  loadOutstandingReturns({
-                    variables: {
-                      jobId: form.getFieldValue("jobid"),
-                      vendorId: form.getFieldValue("vendorid"),
-                    },
-                  });
+                  //Removed as this would cause an additional reload when validating the form on submit and clear the values.
+                  // loadOutstandingReturns({
+                  //   variables: {
+                  //     jobId: form.getFieldValue("jobid"),
+                  //     vendorId: form.getFieldValue("vendorid"),
+                  //   },
+                  // });
                 }
 
                 if (

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

@@ -63,7 +63,6 @@ export function BillFormContainer({
       {!billEdit && (
         <BillCmdReturnsTableComponent
           form={form}
-          loadOutstandingReturns={loadOutstandingReturns}
           returnLoading={returnLoading}
           returnData={returnData}
         />

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

@@ -552,7 +552,20 @@ export function BillEnterModalLinesComponent({
     });
 
   return (
-    <Form.List name="billlines">
+    <Form.List
+      name="billlines"
+      rules={[
+        {
+          validator: async (_, billlines) => {
+            if (!billlines || billlines.length < 1) {
+              return Promise.reject(
+                new Error(t("billlines.validation.atleastone"))
+              );
+            }
+          },
+        },
+      ]}
+    >
       {(fields, { add, remove, move }) => {
         return (
           <>

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

@@ -54,7 +54,7 @@ export const uploadToCloudinary = async (
   //Set variables for getting the signed URL.
   let timestamp = Math.floor(Date.now() / 1000);
   let public_id = key;
-  let tags = `${bodyshop.textid},${
+  let tags = `${bodyshop.imexshopid},${
     tagsArray ? tagsArray.map((tag) => `${tag},`) : ""
   }`;
   //  let eager = process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS;

client/src/components/email-documents/email-documents.component.jsx

@@ -45,6 +45,12 @@ export function EmailDocumentsComponent({
       {selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
         <div style={{ color: "red" }}>{t("messaging.labels.maxtenimages")}</div>
       ) : null}
+      {selectedMedia &&
+      selectedMedia
+        .filter((s) => s.isSelected)
+        .reduce((acc, val) => (acc = acc + val.size), 0) >= 9961472 ? (
+        <div style={{ color: "red" }}>{t("general.errors.sizelimit")}</div>
+      ) : null}
       {data && (
         <JobDocumentsGalleryExternal
           data={data ? data.documents : []}

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

@@ -180,6 +180,23 @@ export function EmailOverlayComponent({
               }
               return e && e.fileList;
             }}
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  const totalSize = value.reduce(
+                    (acc, val) => (acc = acc + val.size),
+                    0
+                  );
+
+                  const limit = 9961472;
+
+                  if (totalSize > limit) {
+                    return Promise.reject(t("general.errors.sizelimit"));
+                  }
+                  return Promise.resolve();
+                },
+              }),
+            ]}
           >
             <Upload.Dragger
               beforeUpload={Upload.LIST_IGNORE}

client/src/components/error-boundary/error-boundary.component.jsx

@@ -30,6 +30,7 @@ class ErrorBoundary extends React.Component {
 
   static getDerivedStateFromError(error) {
     console.log("ErrorBoundary -> getDerivedStateFromError -> error", error);
+
     return { hasErrored: true, error: error };
   }
 

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

@@ -44,6 +44,7 @@ import JobCreateIOU from "../job-create-iou/job-create-iou.component";
 import JobLinesExpander from "./job-lines-expander.component";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import moment from "moment";
+import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -175,7 +176,7 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <>
+        <JobLineConvertToLabor jobline={record} job={job}>
           <CurrencyFormatter>
             {record.db_ref === "900510" || record.db_ref === "900511"
               ? record.prt_dsmk_m
@@ -188,7 +189,7 @@ export function JobLinesComponent({
           ) : (
             <></>
           )}
-        </>
+        </JobLineConvertToLabor>
       ),
     },
     {
@@ -295,9 +296,9 @@ export function JobLinesComponent({
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <div>
+        <Space>
           {(record.manual_line || jobIsPrivate) && (
-            <Space>
+            <>
               <Button
                 disabled={jobRO}
                 onClick={() => {
@@ -334,9 +335,9 @@ export function JobLinesComponent({
               >
                 <DeleteFilled />
               </Button>
-            </Space>
+            </>
           )}
-        </div>
+        </Space>
       ),
     },
   ];

client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -0,0 +1,252 @@
+import { ClockCircleOutlined } from "@ant-design/icons";
+import { useApolloClient } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Form,
+  notification,
+  Popover,
+  Select,
+  Space,
+  Tooltip,
+} from "antd";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import {
+  QUERY_JOB_LBR_ADJUSTMENTS,
+  UPDATE_JOB,
+} from "../../graphql/jobs.queries";
+
+import _ from "lodash";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobLineConvertToLabor);
+
+export function JobLineConvertToLabor({
+  children,
+  jobline,
+  job,
+  insertAuditTrail,
+  ...otherBtnProps
+}) {
+  const { t } = useTranslation();
+
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [visibility, setVisibility] = useState(false);
+  const client = useApolloClient();
+
+  const handleFinish = async (values) => {
+    const { mod_lbr_ty } = values;
+    logImEXEvent("job_convert_dollar_to_labor");
+
+    setLoading(true);
+
+    const existingAdjustments = await client.query({
+      query: QUERY_JOB_LBR_ADJUSTMENTS,
+      variables: {
+        id: job.id,
+      },
+    });
+
+    const newAdjustments = _.cloneDeep(
+      existingAdjustments.data.jobs_by_pk.lbr_adjustments
+    );
+
+    newAdjustments[mod_lbr_ty] =
+      (newAdjustments[mod_lbr_ty] || 0) +
+      calculateAdjustment({ mod_lbr_ty, job, jobline });
+
+    const jobUpdate = client.mutate({
+      mutation: UPDATE_JOB,
+      variables: {
+        jobId: job.id,
+        job: { lbr_adjustments: newAdjustments },
+      },
+    });
+
+    const lineUpdate = client.mutate({
+      mutation: UPDATE_JOB_LINE,
+      variables: {
+        lineId: jobline.id,
+        line: { convertedtolbr: true },
+      },
+    });
+
+    if (!!jobUpdate.errors) {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          message: JSON.stringify(jobUpdate.errors),
+        }),
+      });
+      return;
+    }
+    if (!!lineUpdate.errors) {
+      notification["error"]({
+        message: t("joblines.errors.saving", {
+          message: JSON.stringify(lineUpdate.errors),
+        }),
+      });
+      return;
+    }
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobmodifylbradj({
+        hours: calculateAdjustment({ mod_lbr_ty, job, jobline }).toFixed(1),
+        mod_lbr_ty,
+      }),
+    });
+    setLoading(false);
+    setVisibility(false);
+  };
+
+  const overlay = (
+    <Card>
+      <Form form={form} layout="vertical" onFinish={handleFinish}>
+        <Form.Item
+          label={t("joblines.fields.mod_lbr_ty")}
+          name="mod_lbr_ty"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Select allowClear optionFilterProp="children" showSearch>
+            <Select.Option value="LAA">
+              {t("joblines.fields.lbr_types.LAA")}
+            </Select.Option>
+            <Select.Option value="LAB">
+              {t("joblines.fields.lbr_types.LAB")}
+            </Select.Option>
+            <Select.Option value="LAD">
+              {t("joblines.fields.lbr_types.LAD")}
+            </Select.Option>
+            <Select.Option value="LAE">
+              {t("joblines.fields.lbr_types.LAE")}
+            </Select.Option>
+            <Select.Option value="LAF">
+              {t("joblines.fields.lbr_types.LAF")}
+            </Select.Option>
+            <Select.Option value="LAG">
+              {t("joblines.fields.lbr_types.LAG")}
+            </Select.Option>
+            <Select.Option value="LAM">
+              {t("joblines.fields.lbr_types.LAM")}
+            </Select.Option>
+            <Select.Option value="LAR">
+              {t("joblines.fields.lbr_types.LAR")}
+            </Select.Option>
+            <Select.Option value="LAS">
+              {t("joblines.fields.lbr_types.LAS")}
+            </Select.Option>
+            <Select.Option value="LAU">
+              {t("joblines.fields.lbr_types.LAU")}
+            </Select.Option>
+            <Select.Option value="LA1">
+              {t("joblines.fields.lbr_types.LA1")}
+            </Select.Option>
+            <Select.Option value="LA2">
+              {t("joblines.fields.lbr_types.LA2")}
+            </Select.Option>
+            <Select.Option value="LA3">
+              {t("joblines.fields.lbr_types.LA3")}
+            </Select.Option>
+            <Select.Option value="LA4">
+              {t("joblines.fields.lbr_types.LA4")}
+            </Select.Option>
+          </Select>
+        </Form.Item>
+
+        <Form.Item shouldUpdate>
+          {() => {
+            const { mod_lbr_ty } = form.getFieldsValue();
+            return t("joblines.labels.adjustmenttobeadded", {
+              adjustment: calculateAdjustment({
+                mod_lbr_ty,
+                job,
+                jobline,
+              }).toFixed(1),
+            });
+          }}
+        </Form.Item>
+
+        <Space wrap>
+          <Button
+            type="primary"
+            disabled={jobline.convertedtolbr}
+            htmlType="submit"
+          >
+            {t("general.actions.save")}
+          </Button>
+          <Button onClick={() => setVisibility(false)}>
+            {t("general.actions.cancel")}
+          </Button>
+        </Space>
+      </Form>
+    </Card>
+  );
+
+  const handleClick = (e) => {
+    setLoading(true);
+
+    form.setFieldsValue({
+      //   date: new moment(),
+      //   bodyhrs: Math.round(v.bodyhrs * 10) / 10,
+      //   painthrs: Math.round(v.painthrs * 10) / 10,
+    });
+    setVisibility(true);
+    setLoading(false);
+  };
+
+  return (
+    <>
+      {children}
+      {jobline.act_price !== 0 && (
+        <Popover
+          disabled={jobline.convertedtolbr}
+          content={overlay}
+          visible={visibility}
+          placement="bottom"
+        >
+          <Tooltip title={t("joblines.actions.converttolabor")}>
+            <Button
+              type="link"
+              disabled={jobline.convertedtolbr}
+              loading={loading}
+              onClick={handleClick}
+              {...otherBtnProps}
+            >
+              <ClockCircleOutlined />
+            </Button>
+          </Tooltip>
+        </Popover>
+      )}
+    </>
+  );
+}
+
+function calculateAdjustment({ mod_lbr_ty, job, jobline }) {
+  if (!mod_lbr_ty) return 0;
+  const rate = job[`rate_${mod_lbr_ty.toLowerCase()}`];
+
+  if (rate === 0 || rate === null || rate === undefined) return 0;
+  const adj = jobline.act_price / job[`rate_${mod_lbr_ty.toLowerCase()}`];
+
+  return adj;
+}

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -1,4 +1,4 @@
-import { Form, Select } from "antd";
+import { Form, Select, Space, Tooltip } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,6 +8,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component";
 import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component";
 import ReadOnlyFormItem from "../form-items-formatted/read-only-form-item.component";
+import { WarningOutlined } from "@ant-design/icons";
 import "./jobs-close-lines.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -62,14 +63,23 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                       </Form.Item>
                     </td>
                     <td>
-                      <Form.Item
-                        span={2}
-                        //  label={t("joblines.fields.act_price")}
-                        key={`${index}act_price`}
-                        name={[field.name, "act_price"]}
-                      >
-                        <ReadOnlyFormItem type="currency" />
-                      </Form.Item>
+                      <Space>
+                        <Form.Item
+                          span={2}
+                          //  label={t("joblines.fields.act_price")}
+                          key={`${index}act_price`}
+                          name={[field.name, "act_price"]}
+                        >
+                          <ReadOnlyFormItem type="currency" />
+                        </Form.Item>
+                        <Form.Item
+                          noStyle
+                          key={`${index}convertedtolbr`}
+                          name={[field.name, "convertedtolbr"]}
+                        >
+                          <HasBeenConvertedTolabor />
+                        </Form.Item>
+                      </Space>
                     </td>
                     <td>
                       <Form.Item
@@ -192,3 +202,14 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
   );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseLines);
+
+const HasBeenConvertedTolabor = ({ value }) => {
+  const { t } = useTranslation();
+  console.log(value);
+  if (!value) return null;
+  return (
+    <Tooltip title={t("joblines.labels.convertedtolabor")}>
+      <WarningOutlined style={{ color: "tomato" }} />
+    </Tooltip>
+  );
+};

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

@@ -217,21 +217,31 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <JobsRelatedRos jobid={job.id} job={job} />
             </DataLabel>
             {job.vehicle && job.vehicle.notes && (
-              <DataLabel label={t("vehicles.fields.notes")}>
-                <span style={{ whiteSpace: "pre" }}>{job.vehicle.notes}</span>
+              <DataLabel
+                label={t("vehicles.fields.notes")}
+                valueStyle={{ whiteSpace: "pre-wrap" }}
+              >
+                {job.vehicle.notes}
+              </DataLabel>
+            )}
+            {job.vehicle && job.vehicle.v_paint_codes && (
+              <DataLabel
+                label={t("vehicles.fields.v_paint_codes", { number: "" })}
+              >
+                <span style={{ whiteSpace: "pre" }}>
+                  {Object.keys(job.vehicle.v_paint_codes)
+                    .filter(
+                      (key) =>
+                        job.vehicle.v_paint_codes[key] !== "" &&
+                        job.vehicle.v_paint_codes[key] !== null &&
+                        job.vehicle.v_paint_codes[key] !== undefined
+                    )
+                    .map((key, idx) => (
+                      <Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
+                    ))}
+                </span>
               </DataLabel>
             )}
-            {
-              //   job.vehicle && job.vehicle.v_paint_codes && (
-              //   <DataLabel label={t("vehicles.fields.v_paint_codes")}>
-              //     <span style={{ whiteSpace: "pre" }}>
-              //       {Object.keys(job.vehicle.v_paint_codes).map((key, idx) => (
-              //         <Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
-              //       ))}
-              //     </span>
-              //   </DataLabel>
-              // )
-            }
           </div>
         </Card>
       </Col>

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

@@ -25,6 +25,7 @@ function JobsDocumentGalleryExternal({
           id: value.id,
           type: value.type,
           tags: [{ value: value.type, title: value.type }],
+          size: value.size,
         });
       }
 

client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx

@@ -12,7 +12,24 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
-export default function LaborAllocationsAdjustmentEdit({
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LaborAllocationsAdjustmentEdit);
+
+export function LaborAllocationsAdjustmentEdit({
+  insertAuditTrail,
   jobId,
   mod_lbr_ty,
   adjustments,
@@ -51,6 +68,15 @@ export default function LaborAllocationsAdjustmentEdit({
       notification["success"]({
         message: t("jobs.successes.save"),
       });
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.jobmodifylbradj({
+          mod_lbr_ty: values.mod_lbr_ty,
+          hours:
+            values.hours -
+            ((adjustments && adjustments[mod_lbr_ty]) || 0).toFixed(1),
+        }),
+      });
     }
     setLoading(false);
     setVisible(false);

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -31,7 +31,7 @@ export default function OwnerFindModalContainer({
 
   useEffect(() => {
     if (modalProps.visible && owner) {
-      const s = OwnerNameDisplayFunction(owner);
+      const s = OwnerNameDisplayFunction(owner, true);
 
       setSearchText(s.trim());
       callSearchowners({ variables: { search: s.trim() } });

client/src/components/owner-name-display/owner-name-display.component.jsx

@@ -27,7 +27,7 @@ export function OwnerNameDisplay({ bodyshop, ownerObject }) {
   }`.trim();
 }
 
-export function OwnerNameDisplayFunction(ownerObject) {
+export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) {
   const emptyTest =
     ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm;
 
@@ -36,7 +36,7 @@ export function OwnerNameDisplayFunction(ownerObject) {
 
   const rdxStore = store.getState();
 
-  if (rdxStore.user.bodyshop.last_name_first)
+  if (rdxStore.user.bodyshop.last_name_first && !forceFirstLast)
     return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${
       ownerObject.ownr_co_nm || ""
     }`.trim();

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

@@ -124,6 +124,15 @@ export function PartsOrderModalComponent({
             <Checkbox />
           </Form.Item>
         )}
+        {OEConnection.treatment === "on" && !isReturn && (
+          <Form.Item
+            name="is_quote"
+            label={t("parts_orders.labels.is_quote")}
+            valuePropName="checked"
+          >
+            <Checkbox />
+          </Form.Item>
+        )}
       </LayoutFormRow>
       <Divider orientation="left">
         {t("parts_orders.labels.inthisorder")}
@@ -291,17 +300,32 @@ export function PartsOrderModalComponent({
         <Input.TextArea rows={3} />
       </Form.Item>
 
-      <Radio.Group
-        defaultValue={sendType}
-        onChange={(e) => setSendType(e.target.value)}
-      >
-        <Radio value={"none"}>{t("general.labels.none")}</Radio>
-        <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
-        <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
-        {OEConnection.treatment === "on" && !isReturn && (
-          <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
-        )}
-      </Radio.Group>
+      <Form.Item noStyle shouldUpdate>
+        {() => {
+          const is_quote = form.getFieldValue("is_quote");
+          if (is_quote) setSendType("oec");
+          return (
+            <Radio.Group
+              defaultValue={sendType}
+              value={sendType}
+              onChange={(e) => setSendType(e.target.value)}
+            >
+              <Radio disabled={is_quote} value={"none"}>
+                {t("general.labels.none")}
+              </Radio>
+              <Radio disabled={is_quote} value={"e"}>
+                {t("parts_orders.labels.email")}
+              </Radio>
+              <Radio disabled={is_quote} value={"p"}>
+                {t("parts_orders.labels.print")}
+              </Radio>
+              {OEConnection.treatment === "on" && !isReturn && (
+                <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
+              )}
+            </Radio.Group>
+          );
+        }}
+      </Form.Item>
     </div>
   );
 }

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

@@ -93,31 +93,53 @@ export function PartsOrderModalContainer({
   const [updateJobLines] = useMutation(UPDATE_JOB_LINE_STATUS);
   const [updateJob] = useMutation(UPDATE_JOB);
 
-  const handleFinish = async ({ removefrompartsqueue, ...values }) => {
+  const handleFinish = async ({
+    removefrompartsqueue,
+    is_quote,
+    ...values
+  }) => {
     logImEXEvent("parts_order_insert");
     setSaving(true);
-    const insertResult = await insertPartOrder({
-      variables: {
-        po: [
-          {
-            ...values,
-            order_date: moment().format("YYYY-MM-DD"),
-            orderedby: currentUser.email,
-            jobid: jobId,
-            user_email: currentUser.email,
-            return: isReturn,
-            status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
-          },
-        ],
-      },
-      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
-    });
-    if (!!insertResult.error) {
-      notification["error"]({
-        message: t("parts_orders.errors.creating"),
-        description: JSON.stringify(insertResult.error),
+    let insertResult;
+    if (!is_quote) {
+      insertResult = await insertPartOrder({
+        variables: {
+          po: [
+            {
+              ...values,
+              order_date: moment().format("YYYY-MM-DD"),
+              orderedby: currentUser.email,
+              jobid: jobId,
+              user_email: currentUser.email,
+              return: isReturn,
+              status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
+            },
+          ],
+        },
+        refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+      });
+      if (!!insertResult.error) {
+        notification["error"]({
+          message: t("parts_orders.errors.creating"),
+          description: JSON.stringify(insertResult.error),
+        });
+        return;
+      }
+      notification["success"]({
+        message: values.isReturn
+          ? t("parts_orders.successes.return_created")
+          : t("parts_orders.successes.created"),
+      });
+      insertAuditTrail({
+        jobid: jobId,
+        operation: isReturn
+          ? AuditTrailMapping.jobspartsreturn(
+              insertResult.data.insert_parts_orders.returning[0].order_number
+            )
+          : AuditTrailMapping.jobspartsorder(
+              insertResult.data.insert_parts_orders.returning[0].order_number
+            ),
       });
-      return;
     }
 
     const jobLinesResult = await updateJobLines({
@@ -127,6 +149,8 @@ export function PartsOrderModalContainer({
           .map((item) => item.job_line_id),
         status: isReturn
           ? bodyshop.md_order_statuses.default_returned || "Returned*"
+          : is_quote
+          ? bodyshop.md_order_statuses.default_quote || "Quote"
           : bodyshop.md_order_statuses.default_ordered || "Ordered*",
       },
     });
@@ -142,17 +166,6 @@ export function PartsOrderModalContainer({
       });
     }
 
-    insertAuditTrail({
-      jobid: jobId,
-      operation: isReturn
-        ? AuditTrailMapping.jobspartsreturn(
-            insertResult.data.insert_parts_orders.returning[0].order_number
-          )
-        : AuditTrailMapping.jobspartsorder(
-            insertResult.data.insert_parts_orders.returning[0].order_number
-          ),
-    });
-
     if (!!jobLinesResult.errors) {
       notification["error"]({
         message: t("parts_orders.errors.creating"),
@@ -160,12 +173,6 @@ export function PartsOrderModalContainer({
       });
     }
 
-    notification["success"]({
-      message: values.isReturn
-        ? t("parts_orders.successes.return_created")
-        : t("parts_orders.successes.created"),
-    });
-
     if (values.vendorid === bodyshop.inhousevendorid) {
       setBillEnterContext({
         actions: { refetch: refetch },

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

@@ -2,7 +2,6 @@ import { PauseCircleOutlined } from "@ant-design/icons";
 import { Space } from "antd";
 import i18n from "i18next";
 import moment from "moment";
-import React from "react";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
@@ -530,6 +529,27 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         <JobPartsQueueCount parts={record.joblines_status} record={record} />
       ),
     },
+    //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
+    // {
+    //   title: i18n.t("vehicles.fields.v_paint_codes", { number: "" }),
+    //   dataIndex: "v_paint_codes",
+    //   key: "v_paint_codes",
+    //   render: (text, record) =>
+    //     record.vehicle?.v_paint_codes ? (
+    //       <span style={{ whiteSpace: "pre" }}>
+    //         {Object.keys(record.vehicle.v_paint_codes)
+    //           .filter(
+    //             (key) =>
+    //               record.vehicle.v_paint_codes[key] !== "" &&
+    //               record.vehicle.v_paint_codes[key] !== null &&
+    //               record.vehicle.v_paint_codes[key] !== undefined
+    //           )
+    //           .map((key, idx) => (
+    //             <Tag key={idx}>{record.vehicle.v_paint_codes[key]}</Tag>
+    //           ))}
+    //       </span>
+    //     ) : null,
+    // },
   ];
 };
 export default r;

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

@@ -15,6 +15,7 @@ import {
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
 import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
 const mapStateToProps = createStructuredSelector({
@@ -66,6 +67,9 @@ export function ScheduleCalendarHeaderComponent({
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
                 </td>
+                <td>
+                  <OwnerNameDisplay ownerObject={j} />
+                </td>
                 <td>
                   {`(${(
                     j.labhrs.aggregate.sum.mod_lb_hrs +
@@ -99,6 +103,9 @@ export function ScheduleCalendarHeaderComponent({
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
                 </td>
+                <td>
+                  <OwnerNameDisplay ownerObject={j} />
+                </td>
                 <td>
                   {`(${(
                     j.labhrs.aggregate.sum.mod_lb_hrs +

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

@@ -2,9 +2,28 @@ import { Form, Input } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-export default function ShopInfoOrderStatusComponent({ form }) {
-  const { t } = useTranslation();
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTreatments } from "@splitsoftware/splitio-react";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ShopInfoOrderStatusComponent);
 
+export function ShopInfoOrderStatusComponent({ bodyshop, form }) {
+  const { t } = useTranslation();
+  const { OEConnection } = useTreatments(
+    ["OEConnection"],
+    {},
+    bodyshop.imexshopid
+  );
   return (
     <LayoutFormRow header={t("bodyshop.labels.orderstatuses")}>
       <Form.Item
@@ -56,6 +75,20 @@ export default function ShopInfoOrderStatusComponent({ form }) {
       >
         <Input />
       </Form.Item>
+      {OEConnection.treatment === "on" && (
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_quote")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_order_statuses", "default_quote"]}
+        >
+          <Input />
+        </Form.Item>
+      )}
     </LayoutFormRow>
   );
 }

client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx

@@ -146,7 +146,8 @@ const JobRelatedTicketsTable = ({
       title: t("employees.labels.name"),
       dataIndex: "empname",
       key: "empname",
-      sorter: (a, b) => alphaSort(a.empname, b.empname),
+      sorter: (a, b) =>
+        alphaSort(a.item.employee.last_name, b.item.employee.last_name),
       sortOrder:
         state.sortedInfo.columnKey === "empname" && state.sortedInfo.order,
       render: (text, record) =>
@@ -172,7 +173,9 @@ const JobRelatedTicketsTable = ({
       title: t("timetickets.fields.efficiency"),
       dataIndex: "total",
       key: "total",
-      sorter: (a, b) => a.total - b.total,
+      sorter: (a, b) =>
+        (a.actHrs === 0 || !a.actHrs ? 0 : (a.prodHrs / a.actHrs) * 100) -
+        (b.actHrs === 0 || !b.actHrs ? 0 : (b.prodHrs / b.actHrs) * 100),
       sortOrder:
         state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
       render: (text, record) =>

client/src/graphql/appointments.queries.js

@@ -324,6 +324,9 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       ro_number
       scheduled_completion
       actual_completion
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
@@ -352,6 +355,9 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       id
       scheduled_in
       ro_number
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {

client/src/graphql/jobs-lines.queries.js

@@ -177,6 +177,7 @@ export const UPDATE_JOB_LINE = gql`
         location
         status
         removed
+        convertedtolbr
       }
     }
   }

client/src/graphql/jobs.queries.js

@@ -702,6 +702,7 @@ export const GET_JOB_BY_PK = gql`
         prt_dsmk_p
         prt_dsmk_m
         ioucreated
+        convertedtolbr
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           id
           quantity
@@ -1905,6 +1906,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
         profitcenter_labor
         profitcenter_part
         prt_dsmk_p
+        convertedtolbr
       }
     }
   }

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

@@ -24,6 +24,8 @@ import {
   selectBodyshop,
   selectInstanceConflict,
 } from "../../redux/user/user.selectors";
+import * as Sentry from "@sentry/react";
+
 import "./manage.page.styles.scss";
 
 const ManageRootPage = lazy(() =>
@@ -407,7 +409,10 @@ export function Manage({ match, conflict, bodyshop }) {
 
         <Content className="content-container">
           <PartnerPingComponent />
-          <ErrorBoundary>{PageContent}</ErrorBoundary>
+          <Sentry.ErrorBoundary fallback={<ErrorBoundary />} showDialog>
+            {PageContent}
+          </Sentry.ErrorBoundary>
+
           <BackTop />
           <Footer>
             <div

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

@@ -17,6 +17,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { onlyUnique } from "../../utils/arrayHelper";
 import { DateTimeFormatter, TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -31,6 +32,7 @@ export function PartsQueuePageComponent({ bodyshop }) {
     statusFilters,
   } = searchParams;
   const history = useHistory();
+  const [filter, setFilter] = useLocalStorage("filter_parts_queue", null);
 
   const { loading, error, data, refetch } = useQuery(QUERY_PARTS_QUEUE, {
     fetchPolicy: "network-only",
@@ -92,7 +94,7 @@ export function PartsQueuePageComponent({ bodyshop }) {
     //  searchParams.page = pagination.current;
     searchParams.sortcolumn = sorter.columnKey;
     searchParams.sortorder = sorter.order;
-
+    setFilter(filters);
     history.push({ search: queryString.stringify(searchParams) });
   };
 
@@ -247,6 +249,7 @@ export function PartsQueuePageComponent({ bodyshop }) {
       key: "queued_for_parts",
       sorter: (a, b) => a.queued_for_parts - b.queued_for_parts,
       sortOrder: sortcolumn === "queued_for_parts" && sortorder,
+      filteredValue: filter?.queued_for_parts || null,
       filters: [
         {
           text: "Queued",

client/src/translations/en_us/common.json

@@ -103,7 +103,7 @@
 				"jobimported": "Job imported.",
 				"jobinproductionchange": "Job production status set to {{inproduction}}",
 				"jobioucreated": "IOU Created.",
-				"jobmodifylbradj": "Labor adjustments modified.",
+				"jobmodifylbradj": "Labor adjustments modified {{mod_lbr_ty}} / {{hours}}.",
 				"jobnoteadded": "Note added to job.",
 				"jobnotedeleted": "Note deleted from job.",
 				"jobnoteupdated": "Note updated on job.",
@@ -136,6 +136,9 @@
 				"other": "-- Not On Estimate --",
 				"reconciled": "Reconciled!",
 				"unreconciled": "Unreconciled"
+			},
+			"validation": {
+				"atleastone": "At least one bill line must be entered."
 			}
 		},
 		"bills": {
@@ -502,6 +505,7 @@
 					"default_imported": "Default Imported Status",
 					"default_invoiced": "Default Invoiced Status",
 					"default_ordered": "Default Ordered Status",
+					"default_quote": "Default Quote Status",
 					"default_received": "Default Received Status",
 					"default_returned": "Default Returned",
 					"default_scheduled": "Default Scheduled Status",
@@ -961,7 +965,8 @@
 			},
 			"errors": {
 				"fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
-				"notfound": "No record was found."
+				"notfound": "No record was found.",
+				"sizelimit": "The selected items exceed the size limit."
 			},
 			"itemtypes": {
 				"contract": "CC Contract",
@@ -1109,6 +1114,7 @@
 		},
 		"joblines": {
 			"actions": {
+				"converttolabor": "Convert amount to Labor.",
 				"new": "New Line"
 			},
 			"errors": {
@@ -1174,7 +1180,9 @@
 				"unq_seq": "Seq #"
 			},
 			"labels": {
+				"adjustmenttobeadded": "Adjustment to be added: {{adjustment}}",
 				"billref": "Latest Bill",
+				"convertedtolabor": "This line has been converted to labor. Ensure you adjust the profit center for the amount accordingly.",
 				"edit": "Edit Line",
 				"ioucreated": "IOU",
 				"new": "New Line",
@@ -2012,6 +2020,7 @@
 				"confirmdelete": "Are you sure you want to delete this item? It cannot be recovered.  Job line statuses will not be updated and may require manual review. ",
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
+				"is_quote": "Parts Quote?",
 				"mark_as_received": "Mark as Received?",
 				"newpartsorder": "New Parts Order",
 				"notyetordered": "This part has not yet been ordered.",
@@ -2379,6 +2388,7 @@
 				"job_costing_ro_date_summary": "Job Costing by RO - Summary",
 				"job_costing_ro_estimator": "Job Costing by Estimator",
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
+				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
@@ -2668,6 +2678,7 @@
 		"users": {
 			"errors": {
 				"signinerror": {
+					"auth/user-disabled": "User account disabled. ",
 					"auth/user-not-found": "A user with this email does not exist.",
 					"auth/wrong-password": "The email and password combination you provided is incorrect."
 				}

client/src/translations/es/common.json

@@ -136,6 +136,9 @@
 				"other": "",
 				"reconciled": "",
 				"unreconciled": ""
+			},
+			"validation": {
+				"atleastone": ""
 			}
 		},
 		"bills": {
@@ -502,6 +505,7 @@
 					"default_imported": "",
 					"default_invoiced": "",
 					"default_ordered": "",
+					"default_quote": "",
 					"default_received": "",
 					"default_returned": "",
 					"default_scheduled": "",
@@ -961,7 +965,8 @@
 			},
 			"errors": {
 				"fcm": "",
-				"notfound": ""
+				"notfound": "",
+				"sizelimit": ""
 			},
 			"itemtypes": {
 				"contract": "",
@@ -1109,6 +1114,7 @@
 		},
 		"joblines": {
 			"actions": {
+				"converttolabor": "",
 				"new": ""
 			},
 			"errors": {
@@ -1174,7 +1180,9 @@
 				"unq_seq": "Seq #"
 			},
 			"labels": {
+				"adjustmenttobeadded": "",
 				"billref": "",
+				"convertedtolabor": "",
 				"edit": "Línea de edición",
 				"ioucreated": "",
 				"new": "Nueva línea",
@@ -2012,6 +2020,7 @@
 				"confirmdelete": "",
 				"email": "Enviar por correo electrónico",
 				"inthisorder": "Partes en este pedido",
+				"is_quote": "",
 				"mark_as_received": "",
 				"newpartsorder": "",
 				"notyetordered": "",
@@ -2379,6 +2388,7 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
@@ -2668,6 +2678,7 @@
 		"users": {
 			"errors": {
 				"signinerror": {
+					"auth/user-disabled": "",
 					"auth/user-not-found": "",
 					"auth/wrong-password": ""
 				}

client/src/translations/fr/common.json

@@ -136,6 +136,9 @@
 				"other": "",
 				"reconciled": "",
 				"unreconciled": ""
+			},
+			"validation": {
+				"atleastone": ""
 			}
 		},
 		"bills": {
@@ -502,6 +505,7 @@
 					"default_imported": "",
 					"default_invoiced": "",
 					"default_ordered": "",
+					"default_quote": "",
 					"default_received": "",
 					"default_returned": "",
 					"default_scheduled": "",
@@ -961,7 +965,8 @@
 			},
 			"errors": {
 				"fcm": "",
-				"notfound": ""
+				"notfound": "",
+				"sizelimit": ""
 			},
 			"itemtypes": {
 				"contract": "",
@@ -1109,6 +1114,7 @@
 		},
 		"joblines": {
 			"actions": {
+				"converttolabor": "",
 				"new": ""
 			},
 			"errors": {
@@ -1174,7 +1180,9 @@
 				"unq_seq": "Seq #"
 			},
 			"labels": {
+				"adjustmenttobeadded": "",
 				"billref": "",
+				"convertedtolabor": "",
 				"edit": "Ligne d'édition",
 				"ioucreated": "",
 				"new": "Nouvelle ligne",
@@ -2012,6 +2020,7 @@
 				"confirmdelete": "",
 				"email": "Envoyé par email",
 				"inthisorder": "Pièces dans cette commande",
+				"is_quote": "",
 				"mark_as_received": "",
 				"newpartsorder": "",
 				"notyetordered": "",
@@ -2379,6 +2388,7 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
@@ -2668,6 +2678,7 @@
 		"users": {
 			"errors": {
 				"signinerror": {
+					"auth/user-disabled": "",
 					"auth/user-not-found": "",
 					"auth/wrong-password": ""
 				}

client/src/utils/AuditTrailMappings.js

@@ -18,7 +18,8 @@ const AuditTrailMapping = {
     i18n.t("audit_trail.messages.jobspartsorder", { order_number }),
   jobspartsreturn: (order_number) =>
     i18n.t("audit_trail.messages.jobspartsreturn", { order_number }),
-  jobmodifylbradj: () => i18n.t("audit_trail.messages.jobmodifylbradj", {}),
+  jobmodifylbradj: ({ mod_lbr_ty, hours }) =>
+    i18n.t("audit_trail.messages.jobmodifylbradj", { mod_lbr_ty, hours }),
   billposted: (invoice_number) =>
     i18n.t("audit_trail.messages.billposted", { invoice_number }),
   billupdated: (invoice_number) =>

client/src/utils/RenderTemplate.js

@@ -1,7 +1,7 @@
 import { gql } from "@apollo/client";
 import { notification } from "antd";
 import axios from "axios";
-import jsreport from "jsreport-browser-client-dist";
+import jsreport from "@jsreport/browser-client";
 import _ from "lodash";
 import moment from "moment";
 import { auth } from "../firebase/firebase.utils";
@@ -9,7 +9,9 @@ import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
 import { TemplateList } from "./TemplateConstants";
+
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
+
 jsreport.serverUrl = server;
 
 const Templates = TemplateList();
@@ -21,6 +23,10 @@ export default async function RenderTemplate(
   renderAsExcel = false,
   renderAsText = false
 ) {
+  if (window.jsr3) {
+    jsreport.serverUrl = "https://reports3.test.imex.online/";
+  }
+
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let { contextData, useShopSpecificTemplate } = await fetchContextData(
     templateObject
@@ -69,7 +75,7 @@ export default async function RenderTemplate(
   };
 
   try {
-    const render = await jsreport.renderAsync(reportRequest);
+    const render = await jsreport.render(reportRequest);
 
     if (!renderAsHtml) {
       render.download(
@@ -103,17 +109,18 @@ export default async function RenderTemplate(
             }),
           },
         };
-        console.log("PDFREQ", pdfRequest);
-        const pdfRender = await jsreport.renderAsync(pdfRequest);
-        pdf = pdfRender.toDataURI();
+
+        const pdfRender = await jsreport.render(pdfRequest);
+        pdf = await pdfRender.toDataURI();
       }
+      const html = await render.toString();
       return new Promise((resolve, reject) => {
         resolve({
           pdf,
           filename:
             Templates[templateObject.name] &&
             Templates[templateObject.name].title,
-          html: render.toString(),
+          html,
         });
       });
     }
@@ -152,6 +159,9 @@ export async function RenderTemplates(
   //     (template) => template.name === item.templateObject.name
   //   );
   // });
+  if (window.jsr3) {
+    jsreport.serverUrl = "https://reports3.test.imex.online/";
+  }
 
   unsortedTemplatesAndData.sort(function (a, b) {
     return (
@@ -242,13 +252,11 @@ export async function RenderTemplates(
   };
 
   try {
-    const render = await jsreport.renderAsync(reportRequest);
+    const render = await jsreport.render(reportRequest);
     if (!renderAsHtml) {
       render.download("Speed Print");
     } else {
-      return new Promise((resolve, reject) => {
-        resolve(render.toString());
-      });
+      return render.toString();
     }
   } catch (error) {
     notification["error"]({ message: JSON.stringify(error) });

client/src/utils/TemplateConstants.js

@@ -1534,6 +1534,18 @@ export const TemplateList = (type, context) => {
             },
             group: "purchases",
           },
+          jobs_reconcile: {
+            title: i18n.t("reportcenter.templates.jobs_reconcile"),
+            subject: i18n.t("reportcenter.templates.jobs_reconcile"),
+            key: "jobs_reconcile",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

client/src/utils/fcm-handler.js

@@ -23,9 +23,9 @@ export default async function FcmHandler({ client, payload }) {
           updated_at(oldupdated0) {
             return new Date();
           },
-          messages_aggregate(cached) {
-            return { aggregate: { count: cached.aggregate.count + 1 } };
-          },
+          // messages_aggregate(cached) {
+          //   return { aggregate: { count: cached.aggregate.count + 1 } };
+          // },
         },
       });
       break;

client/src/utils/useLocalStorage.js

@@ -0,0 +1,40 @@
+import { useState } from "react";
+
+export default function useLocalStorage(key, initialValue) {
+  // State to store our value
+  // Pass initial state function to useState so logic is only executed once
+  const [storedValue, setStoredValue] = useState(() => {
+    if (typeof window === "undefined") {
+      return initialValue;
+    }
+    try {
+      // Get from local storage by key
+      const item = window.localStorage.getItem(key);
+      // Parse stored json or if none return initialValue
+      return item ? JSON.parse(item) : initialValue;
+    } catch (error) {
+      // If error also return initialValue
+      console.log(error);
+      return initialValue;
+    }
+  });
+  // Return a wrapped version of useState's setter function that ...
+  // ... persists the new value to localStorage.
+  const setValue = (value) => {
+    try {
+      // Allow value to be a function so we have same API as useState
+      const valueToStore =
+        value instanceof Function ? value(storedValue) : value;
+      // Save state
+      setStoredValue(valueToStore);
+      // Save to local storage
+      if (typeof window !== "undefined") {
+        window.localStorage.setItem(key, JSON.stringify(valueToStore));
+      }
+    } catch (error) {
+      // A more advanced implementation would handle the error case
+      console.log(error);
+    }
+  };
+  return [storedValue, setValue];
+}

client/yarn.lock

@@ -1918,6 +1918,11 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@jsreport/browser-client@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jsreport/browser-client/-/browser-client-3.1.0.tgz#a84011087ca8a29a6dc6a852fa05ffaf1983a679"
+  integrity sha512-ZElwn2KRIzkUzAyD5UKGxULZUhokWuPOlMzrmiur4WirqH3yoiHlOJEdnRGkjjE/fhZzCR8gBFZ/TuOW/fsOIw==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"

firebase/readme.md

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

hasura/config.yaml

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

hasura/metadata/tables.yaml

@@ -2384,6 +2384,7 @@
           - bett_tax
           - bett_type
           - cert_part
+          - convertedtolbr
           - created_at
           - db_hrs
           - db_price
@@ -2447,6 +2448,7 @@
           - bett_tax
           - bett_type
           - cert_part
+          - convertedtolbr
           - created_at
           - db_hrs
           - db_price
@@ -2521,6 +2523,7 @@
           - bett_tax
           - bett_type
           - cert_part
+          - convertedtolbr
           - created_at
           - db_hrs
           - db_price

hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/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"."joblines" add column "convertedtolbr" boolean
+--  not null default 'false';

hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "convertedtolbr" boolean
+ not null default 'false';

server.js

@@ -157,7 +157,21 @@ app.post(
   fb.unsubscribe
 );
 app.post("/adm/updateuser", fb.validateFirebaseIdToken, fb.updateUser);
+app.post("/adm/getuser", fb.validateFirebaseIdToken, fb.getUser);
 app.post("/adm/createuser", fb.validateFirebaseIdToken, fb.createUser);
+const adm = require("./server/admin/adminops");
+app.post(
+  "/adm/createassociation",
+  fb.validateFirebaseIdToken,
+  fb.validateAdmin,
+  adm.createAssociation
+);
+app.post(
+  "/adm/createshop",
+  fb.validateFirebaseIdToken,
+  fb.validateAdmin,
+  adm.createShop
+);
 
 //Stripe Processing
 var stripe = require("./server/stripe/payment");
@@ -216,7 +230,7 @@ server.listen(port, (error) => {
   if (error) throw error;
   logger.log(
     `[${process.env.NODE_ENV || "DEVELOPMENT"}] Server running on port ${port}`,
-    "DEBUG",
+    "INFO",
     "api"
   );
 });

server/accounting/qbo/qbo-payments.js

@@ -179,7 +179,6 @@ exports.default = async (req, res) => {
         ret.push({ paymentid: payment.id, success: true });
       } catch (error) {
         logger.log("qbo-payment-create-error", "ERROR", req.user.email, {
-          
           error:
             (error && error.authResponse && error.authResponse.body) ||
             (error && error.message),
@@ -217,7 +216,10 @@ exports.default = async (req, res) => {
     res.status(200).json(ret);
   } catch (error) {
     console.log(error);
-    logger.log("qbo-payment-create-error", "ERROR", req.user.email,  { error: error.message, stack: error.stack });
+    logger.log("qbo-payment-create-error", "ERROR", req.user.email, {
+      error: error.message,
+      stack: error.stack,
+    });
     res.status(400).json(error);
   }
 };
@@ -240,7 +242,7 @@ async function InsertPayment(
 
   if (invoices && invoices.length !== 1) {
     throw new Error(
-      `More than 1 invoice with DocNumber ${payment.ro_number} found.`
+      `More than 1 invoice with DocNumber ${payment.job.ro_number} found.`
     );
   }
 

server/admin/adminops.js

@@ -0,0 +1,68 @@
+const path = require("path");
+
+const _ = require("lodash");
+const logger = require("../utils/logger");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+
+const client = require("../graphql-client/graphql-client").client;
+
+exports.createAssociation = async (req, res) => {
+  logger.log("admin-create-association", "ADMIN", req.user.email, null, {
+    request: req.body,
+    ioadmin: true,
+  });
+  const { shopid, authlevel, useremail } = req.body;
+
+  const result = await client.request(
+    `mutation INSERT_ASSOCIATION($assoc: associations_insert_input!){
+  insert_associations_one(object:$assoc){
+    id
+    authlevel
+    useremail
+    active
+  }
+}`,
+    {
+      assoc: { shopid, authlevel, useremail, active: false },
+    }
+  );
+  res.json(result);
+};
+exports.createShop = async (req, res) => {
+  logger.log("admin-create-shop", "ADMIN", req.user.email, null, {
+    request: req.body,
+    ioadmin: true,
+  });
+  const { bodyshop, ronum } = req.body;
+
+  try {
+    const result = await client.request(
+      `mutation INSERT_BODYSHOPS($bs: bodyshops_insert_input!){
+  insert_bodyshops_one(object:$bs){
+    id
+   
+  }
+}`,
+      {
+        bs: {
+          ...bodyshop,
+          counters: {
+            data: [
+              { countertype: "ronum", count: ronum },
+              { countertype: "ihbnum", count: 1 },
+              { countertype: "paymentnum", count: 1 },
+            ],
+          },
+        },
+      }
+    );
+    res.json(result);
+  } catch (error) {
+    res.status(500).json(error);
+  }
+};

server/data/autohouse.js

@@ -39,7 +39,7 @@ exports.default = async (req, res) => {
   const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS);
 
   const specificShopIds = req.body.bodyshopIds; // ['uuid]
-  const { start, end } = req.body; //YYYY-MM-DD
+  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
   const allxmlsToUpload = [];
   const allErrors = [];
   try {
@@ -107,12 +107,13 @@ exports.default = async (req, res) => {
       } catch (error) {
         //Error at the shop level.
         logger.log("autohouse-error-shop", "ERROR", "api", bodyshop.id, {
-          error,
+          ...error,
         });
 
         allErrors.push({
           bodyshopid: bodyshop.id,
           imexshopid: bodyshop.imexshopid,
+          autuhouseid: bodyshop.autuhouseid,
           fatal: true,
           errors: [error.toString()],
         });
@@ -120,22 +121,39 @@ exports.default = async (req, res) => {
         allErrors.push({
           bodyshopid: bodyshop.id,
           imexshopid: bodyshop.imexshopid,
-          errors: erroredJobs,
+          autohouseid: bodyshop.autohouseid,
+          errors: erroredJobs.map((ej) => ({
+            ro_number: ej.job?.ro_number,
+            jobid: ej.job?.id,
+            error: ej.error,
+          })),
         });
       }
     }
 
-    // for (const xmlObj of allxmlsToUpload) {
-    //   fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-    // }
+    if (skipUpload) {
+      for (const xmlObj of allxmlsToUpload) {
+        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+      }
 
-    // res.json(allxmlsToUpload);
-    // return;
+      res.json(allxmlsToUpload);
+      sendServerEmail({
+        subject: `Autohouse Report ${moment().format("MM-DD-YY")}`,
+        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `,
+      });
+      return;
+    }
 
     let sftp = new Client();
     sftp.on("error", (errors) =>
       logger.log("autohouse-sftp-error", "ERROR", "api", null, {
-        errors,
+        ...errors,
       })
     );
     try {
@@ -160,7 +178,7 @@ exports.default = async (req, res) => {
       //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
     } catch (error) {
       logger.log("autohouse-sftp-error", "ERROR", "api", null, {
-        error,
+        ...error,
       });
     } finally {
       sftp.end();
@@ -169,7 +187,7 @@ exports.default = async (req, res) => {
       subject: `Autohouse Report ${moment().format("MM-DD-YY")}`,
       text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
       Uploaded: ${JSON.stringify(
-        allxmlsToUpload.map((x) => x.filename),
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
         null,
         2
       )}
@@ -185,7 +203,12 @@ const CreateRepairOrderTag = (job, errorCallback) => {
   //Level 2
 
   if (!job.job_totals) {
-    errorCallback({ job, error: { toString: () => "No job totals for RO." } });
+    errorCallback({
+      jobid: job.id,
+      job: job,
+      ro_number: job.ro_number,
+      error: { toString: () => "No job totals for RO." },
+    });
     return {};
   }
 
@@ -658,13 +681,14 @@ const CreateRepairOrderTag = (job, errorCallback) => {
       error,
     });
 
-    errorCallback({ job, error });
+    errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };
 
 const CreateCosts = (job) => {
   //Create a mapping based on AH Requirements
 
+  //For DMS, the keys in the object below are the CIECA part types.
   const billTotalsByCostCenters = job.bills.reduce((bill_acc, bill_val) => {
     //At the bill level.
     bill_val.billlines.map((line_val) => {
@@ -731,7 +755,7 @@ const CreateCosts = (job) => {
       }).multiply(job.job_totals.rates.mash.hours)
     );
   }
-
+  //Uses CIECA Labor types.
   const ticketTotalsByCostCenter = job.timetickets.reduce(
     (ticket_acc, ticket_val) => {
       //At the invoice level.
@@ -750,7 +774,43 @@ const CreateCosts = (job) => {
     },
     {}
   );
-  const defaultCosts = job.bodyshop.md_responsibility_centers.defaults.costs;
+  //CIECA STANDARD MAPPING OBJECT.
+
+  const ciecaObj = {
+    ATS: "ATS",
+    LA1: "LA1",
+    LA2: "LA2",
+    LA3: "LA3",
+    LA4: "LA4",
+    LAA: "LAA",
+    LAB: "LAB",
+    LAD: "LAD",
+    LAE: "LAE",
+    LAF: "LAF",
+    LAG: "LAG",
+    LAM: "LAM",
+    LAR: "LAR",
+    LAS: "LAS",
+    LAU: "LAU",
+    PAA: "PAA",
+    PAC: "PAC",
+    PAG: "PAG",
+    PAL: "PAL",
+    PAM: "PAM",
+    PAN: "PAN",
+    PAO: "PAO",
+    PAP: "PAP",
+    PAR: "PAR",
+    PAS: "PAS",
+    TOW: "TOW",
+    MAPA: "MAPA",
+    MASH: "MASH",
+    PASL: "PASL",
+  };
+  const defaultCosts =
+    job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber
+      ? ciecaObj
+      : job.bodyshop.md_responsibility_centers.defaults.costs;
 
   return {
     PartsTotalCost: Object.keys(billTotalsByCostCenters).reduce((acc, key) => {
@@ -852,7 +912,9 @@ const GenerateDetailLines = (job, line, statuses) => {
     OriginalCost: null,
     OriginalInvoiceNumber: null,
     PriceEach: line.act_price || 0,
-    PartNumber: _.escape(line.oem_partno),
+    PartNumber: line.oem_partno
+      ? line.oem_partno.replace(/[^\x00-\x7F]/g, "")
+      : "",
     ProfitPercent: null,
     PurchaseOrderNumber: null,
     Qty: line.part_qty || 0,

server/email/sendemail.js

@@ -10,7 +10,8 @@ let nodemailer = require("nodemailer");
 let aws = require("aws-sdk");
 const logger = require("../utils/logger");
 const ses = new aws.SES({
-  apiVersion: "2010-12-01",
+  apiVersion: "latest",
+
   region: "ca-central-1",
 });
 
@@ -43,6 +44,7 @@ exports.sendServerEmail = async function ({ subject, text }) {
   } catch (error) {
     console.log(error);
     logger.log("server-email-failure", "error", null, null, error);
+    res.status(500).json(error);
   }
 };
 exports.sendTaskEmail = async function ({ to, subject, text, attachments }) {
@@ -153,7 +155,7 @@ exports.sendEmail = async (req, res) => {
           error: err,
         });
 
-        res.json({ success: false, error: err });
+        res.status(500).json({ success: false, error: err });
       }
     }
   );

server/firebase/firebase-handler.js

@@ -1,13 +1,14 @@
 var admin = require("firebase-admin");
 const logger = require("../utils/logger");
 const path = require("path");
+const { auth } = require("firebase-admin");
 require("dotenv").config({
   path: path.resolve(
     process.cwd(),
     `.env.${process.env.NODE_ENV || "development"}`
   ),
 });
-
+const client = require("../graphql-client/graphql-client").client;
 var serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON);
 
 admin.initializeApp({
@@ -19,54 +20,61 @@ exports.admin = admin;
 
 const adminEmail = [
   "patrick@imex.dev",
-  "patrick@imex.text",
+  //"patrick@imex.test",
   "patrick@imex.prod",
   "patrick@imexsystems.ca",
   "patrick@thinkimex.com",
 ];
 
-exports.createUser = (req, res) => {
-  logger.log("admin-create-user", "WARN", req.user.email, null, {
+exports.createUser = async (req, res) => {
+  logger.log("admin-create-user", "ADMIN", req.user.email, null, {
     request: req.body,
+    ioadmin: true,
   });
-  if (!adminEmail.includes(req.user.email)) {
-    logger.log(
-      "admin-create-user-unauthorized",
-      "ERROR",
-      req.user.email,
-      null,
+
+  const { email, displayName, password, shopid, authlevel } = req.body;
+  try {
+    const userRecord = await admin
+      .auth()
+      .createUser({ email, displayName, password });
+
+    // See the UserRecord reference doc for the contents of userRecord.
+
+    const result = await client.request(
+      `
+        mutation INSERT_USER($user: users_insert_input!) {
+          insert_users_one(object: $user) {
+            email
+          }
+        }
+      `,
       {
-        request: req.body,
-        user: req.user,
+        user: {
+          email,
+          authid: userRecord.uid,
+          associations: {
+            data: [{ shopid, authlevel, active: true }],
+          },
+        },
       }
     );
-    res.sendStatus(404);
-  }
-  const { email, displayName, password } = req.body;
-  admin
-    .auth()
-    .createUser({ email, displayName, password })
-    .then((userRecord) => {
-      // See the UserRecord reference doc for the contents of userRecord.
 
-      logger.log("admin-update-user-success", "DEBUG", req.user.email, null, {
-        userRecord,
-      });
-      res.json(userRecord);
-    })
-    .catch((error) => {
-      logger.log("admin-update-user-error", "ERROR", req.user.email, null, {
-        error,
-      });
-      res.status(500).json(error);
+    res.json({ userRecord, result });
+  } catch (error) {
+    logger.log("admin-update-user-error", "ERROR", req.user.email, null, {
+      error,
     });
+    res.status(500).json(error);
+  }
 };
 
 exports.updateUser = (req, res) => {
-  logger.log("admin-update-user", "WARN", req.user.email, null, {
+  logger.log("admin-update-user", "ADMIN", req.user.email, null, {
     request: req.body,
+    ioadmin: true,
   });
-  if (!adminEmail.includes(req.user.email)) {
+
+  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
     logger.log(
       "admin-update-user-unauthorized",
       "ERROR",
@@ -78,6 +86,7 @@ exports.updateUser = (req, res) => {
       }
     );
     res.sendStatus(404);
+    return;
   }
 
   admin
@@ -98,8 +107,9 @@ exports.updateUser = (req, res) => {
     .then((userRecord) => {
       // See the UserRecord reference doc for the contents of userRecord.
 
-      logger.log("admin-update-user-success", "DEBUG", req.user.email, null, {
+      logger.log("admin-update-user-success", "ADMIN", req.user.email, null, {
         userRecord,
+        ioadmin: true,
       });
       res.json(userRecord);
     })
@@ -111,6 +121,41 @@ exports.updateUser = (req, res) => {
     });
 };
 
+exports.getUser = (req, res) => {
+  logger.log("admin-get-user", "ADMIN", req.user.email, null, {
+    request: req.body,
+    ioadmin: true,
+  });
+
+  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
+    logger.log(
+      "admin-update-user-unauthorized",
+      "ERROR",
+      req.user.email,
+      null,
+      {
+        request: req.body,
+        user: req.user,
+      }
+    );
+    res.sendStatus(404);
+    return;
+  }
+
+  admin
+    .auth()
+    .getUser(req.body.uid)
+    .then((userRecord) => {
+      res.json(userRecord);
+    })
+    .catch((error) => {
+      logger.log("admin-get-user-error", "ERROR", req.user.email, null, {
+        error,
+      });
+      res.status(500).json(error);
+    });
+};
+
 exports.sendNotification = async (req, res) => {
   setTimeout(() => {
     // Send a message to the device corresponding to the provided
@@ -212,12 +257,46 @@ exports.validateFirebaseIdToken = async (req, res, next) => {
     return;
   } catch (error) {
     logger.log("api-unauthorized-call", "WARN", null, null, {
-      req,
+      path: req.path,
+      body: req.body,
+
       type: "unauthroized",
-      error,
+      ...error,
     });
 
-    res.status(403).send("Unauthorized");
+    res.status(401).send("Unauthorized");
     return;
   }
 };
+
+exports.validateAdmin = async (req, res, next) => {
+  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
+    logger.log("admin-validation-failed", "ERROR", req.user.email, null, {
+      request: req.body,
+      user: req.user,
+    });
+    res.sendStatus(404);
+    return;
+  } else {
+    next();
+    return;
+  }
+};
+
+//Admin claims code.
+// const uid = "JEqqYlsadwPEXIiyRBR55fflfko1";
+
+// admin
+//   .auth()
+//   .getUser(uid)
+//   .then((user) => {
+//     console.log(user);
+//     admin.auth().setCustomUserClaims(uid, {
+//       ioadmin: true,
+//       "https://hasura.io/jwt/claims": {
+//         "x-hasura-default-role": "admin",
+//         "x-hasura-allowed-roles": ["admin"],
+//         "x-hasura-user-id": uid,
+//       },
+//     });
+//   });

server/graphql-client/queries.js

@@ -611,6 +611,8 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       autohouseid
       md_responsibility_centers
       jc_hourly_rates
+      cdk_dealerid
+      pbs_serialnumber
     timezone
   }
   jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {updated_at: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {

server/mixdata/mixdata.js

@@ -32,6 +32,8 @@ exports.mixdataUpload = async (req, res) => {
         explicitArray: false,
       });
 
+      logger.log("job-mixdata-parse", "DEBUG", req.user.email, inboundRequest);
+
       const ScaleType = DetermineScaleType(inboundRequest);
       const RoNumbersFromInboundRequest = GetListOfRos(
         inboundRequest,
@@ -76,6 +78,7 @@ exports.mixdataUpload = async (req, res) => {
     res.status(500).JSON(error);
     logger.log("job-mixdata-upload-error", "ERROR", null, null, {
       error: error.message,
+      ...error,
     });
   }
 };

server/utils/logger.js

@@ -5,7 +5,7 @@ const logger = new graylog2.graylog({
 });
 
 function log(message, type, user, record, object) {
-  if (type !== "ioevent")
+  if (type !== "ioevent" && type !== "DEBUG")
     console.log(message, {
       type,
       env: process.env.NODE_ENV || "development",
@@ -13,7 +13,7 @@ function log(message, type, user, record, object) {
       record,
       ...object,
     });
-  logger.log(message, {
+  logger.log(message, message, {
     type,
     env: process.env.NODE_ENV || "development",
     user,

setadmin.js

@@ -0,0 +1,23 @@
+var { admin } = require("./server/firebase/firebase-handler");
+
+const uidToMakeAdmin = "yTvpfkcNnGckLd1JnoXC7bTdvtu1";
+
+admin
+  .auth()
+  .getUser(uidToMakeAdmin)
+  .then((user) => {
+    admin
+      .auth()
+      .setCustomUserClaims(uidToMakeAdmin, {
+        ...user.customClaims,
+        "https://hasura.io/jwt/claims": {
+          "x-hasura-default-role": "admin",
+          "x-hasura-allowed-roles": ["admin"],
+          "x-hasura-user-id": uidToMakeAdmin,
+        },
+        ioadmin: true,
+      })
+      .then(() => console.log("Success."))
+      .catch((error) => console.log("Error updating claims.", error));
+  })
+  .catch((error) => console.log("Error fetching user.", error));