IO-2258 Scoreboard Chart

Add in target paint and body to the overall calculation to bump the start value up to the target instead of zero.

client/.env.production

@@ -1,3 +1,4 @@
+GENERATE_SOURCEMAP=false
 REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
 REACT_APP_GA_CODE=231103507

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -109,8 +109,8 @@ export function JobsConvertButton({
           ]}
         >
           <Select>
-            {bodyshop.md_ins_cos.map((s) => (
-              <Select.Option key={s.name} value={s.name}>
+            {bodyshop.md_ins_cos.map((s, i) => (
+              <Select.Option key={i} value={s.name}>
                 {s.name}
               </Select.Option>
             ))}

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

@@ -29,7 +29,10 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
     })
     .filter(
       (temp) =>
-        !temp.regions || (temp.regions && temp.regions[bodyshop.region_config])
+        !temp.regions ||
+        (temp.regions && temp.regions[bodyshop.region_config]) ||
+        (temp.regions &&
+          bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
     );
 
   const filteredJobsReportsList =

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

@@ -0,0 +1,51 @@
+import { Col, List, Space, Typography } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+const CardColorLegend = ({ bodyshop }) => {
+  const { t } = useTranslation();
+  const data = bodyshop.ssbuckets.map((bucket) => {
+    let color = { r: 255, g: 255, b: 255 };
+
+    if (bucket.color) {
+      color = bucket.color;
+
+      if (bucket.color.rgb) {
+        color = bucket.color.rgb;
+      }
+    }
+
+    return {
+      label: bucket.label,
+      color,
+    };
+  });
+
+  return (
+    <Col>
+      <Typography>{t("production.labels.legend")}</Typography>
+      <List
+        grid={{
+          gutter: 16,
+        }}
+        dataSource={data}
+        renderItem={(item) => (
+          <List.Item>
+            <Space>
+              <div
+                style={{
+                  width: "1.5rem",
+                  aspectRatio: "1/1",
+                  backgroundColor: `rgba(${item.color.r},${item.color.g},${item.color.b},${item.color.a})`,
+                }}
+              ></div>
+              <div>{item.label}</div>
+            </Space>
+          </List.Item>
+        )}
+      />
+    </Col>
+  );
+};
+
+export default CardColorLegend;

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

@@ -18,6 +18,31 @@ import moment from "moment";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 
+const cardColor = (ssbuckets, totalHrs) => {
+  const bucket = ssbuckets.filter(
+    (bucket) =>
+      bucket.gte <= totalHrs && (!!bucket.lt ? bucket.lt > totalHrs : true)
+  )[0];
+
+  let color = { r: 255, g: 255, b: 255 };
+
+  if (bucket && bucket.color) {
+    color = bucket.color;
+
+    if (bucket.color.rgb) {
+      color = bucket.color.rgb;
+    }
+  }
+
+  return color;
+};
+
+function getContrastYIQ(bgColor) {
+  const yiq = (bgColor.r * 299 + bgColor.g * 587 + bgColor.b * 114) / 1000;
+
+  return yiq >= 128 ? "black" : "white";
+}
+
 export default function ProductionBoardCard(
   technician,
   card,
@@ -54,10 +79,22 @@ export default function ProductionBoardCard(
         .isSame(moment(card.scheduled_completion), "day") &&
         "production-completion-soon"));
 
+  const totalHrs =
+    card.labhrs.aggregate.sum.mod_lb_hrs + card.larhrs.aggregate.sum.mod_lb_hrs;
+  const bgColor = cardColor(bodyshop.ssbuckets, totalHrs);
+
   return (
     <Card
       className="react-kanban-card imex-kanban-card"
       size="small"
+      style={{
+        backgroundColor:
+          cardSettings &&
+          cardSettings.cardcolor &&
+          `rgba(${bgColor.r},${bgColor.g},${bgColor.b},${bgColor.a})`,
+        color:
+          cardSettings && cardSettings.cardcolor && getContrastYIQ(bgColor),
+      }}
       title={
         <Space>
           <ProductionAlert record={card} key="alert" />

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

@@ -104,6 +104,13 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.cardcolor")}
+                name="cardcolor"
+              >
+                <Switch />
+              </Form.Item>
             </Col>
             <Col span={12}>
               <Form.Item
@@ -166,7 +173,7 @@ export default function ProductionBoardKanbanCardSettings({
     </div>
   );
   return (
-    <Popover content={overlay} visible={visible}>
+    <Popover content={overlay} visible={visible} placement="topRight">
       <Button loading={loading} onClick={() => setVisible(true)}>
         {t("production.labels.cardsettings")}
       </Button>

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

@@ -22,6 +22,7 @@ import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-se
 //import "@asseinfo/react-kanban/dist/styles.css";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
+import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -221,6 +222,7 @@ export function ProductionBoardKanbanComponent({
           employeeassignments: true,
           scheduled_completion: true,
           stickyheader: false,
+          cardcolor: false,
         };
 
   return (
@@ -256,6 +258,11 @@ export function ProductionBoardKanbanComponent({
           </Space>
         }
       />
+
+      {cardSettings.cardcolor && (
+        <CardColorLegend cardSettings={cardSettings} bodyshop={bodyshop} />
+      )}
+
       <ProductionListDetailComponent jobs={data} />
       <StickyContainer>
         <Board

client/src/components/scoreboard-chart/scoreboard-chart.component.jsx

@@ -1,5 +1,6 @@
-import Dinero from "dinero.js";
 import { Card } from "antd";
+import Dinero from "dinero.js";
+import _ from "lodash";
 import moment from "moment";
 import React from "react";
 import { connect } from "react-redux";
@@ -18,7 +19,6 @@ import {
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
-import _ from "lodash";
 import CustomTooltip from "./chart-custom-tooltip";
 
 const graphProps = {
@@ -71,7 +71,9 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
           bodyshop.scoreboard_target.dailyBodyTarget +
             bodyshop.scoreboard_target.dailyPaintTarget,
           val
-        ),
+        ) +
+          bodyshop.scoreboard_target.dailyBodyTarget +
+          bodyshop.scoreboard_target.dailyPaintTarget,
         1
       ),
       accHrs: _.round(

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

@@ -396,7 +396,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
   );
 }
 
-const ColorPicker = ({ value, onChange, style, ...restProps }) => {
+export const ColorPicker = ({ value, onChange, style, ...restProps }) => {
   const handleChange = (color) => {
     if (onChange) onChange(color.rgb);
   };

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

@@ -15,6 +15,7 @@ import { useTranslation } from "react-i18next";
 import ColorpickerFormItemComponent from "../form-items-formatted/colorpicker-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { ColorPicker } from "./shop-info.rostatus.component";
 
 export default function ShopInfoSchedulingComponent({ form }) {
   const { t } = useTranslation();
@@ -277,17 +278,50 @@ export default function ShopInfoSchedulingComponent({ form }) {
                       >
                         <InputNumber />
                       </Form.Item>
-                      <Space wrap>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
+
+                      <Space direction="horizontal">
+                        <Form.Item
+                          label={
+                            <Space>
+                              {t("bodyshop.fields.ssbuckets.color")}
+                              <Button
+                                size="small"
+                                onClick={() => {
+                                  form.setFieldValue([
+                                    "ssbuckets",
+                                    field.name,
+                                    "color",
+                                  ]);
+
+                                  form.setFields([
+                                    {
+                                      name: ["ssbuckets", field.name, "color"],
+                                      touched: true,
+                                    },
+                                  ]);
+                                }}
+                              >
+                                Reset
+                              </Button>
+                            </Space>
+                          }
+                          key={`${index}color`}
+                          name={[field.name, "color"]}
+                        >
+                          <ColorPicker />
+                        </Form.Item>
+                        <Space wrap>
+                          <DeleteFilled
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                          <FormListMoveArrows
+                            move={move}
+                            index={index}
+                            total={fields.length}
+                          />
+                        </Space>
                       </Space>
                     </LayoutFormRow>
                   </Form.Item>

client/src/translations/en_us/common.json

@@ -508,7 +508,8 @@
 					"id": "ID",
 					"label": "Label",
 					"lt": "Less than (hrs)",
-					"target": "Target (count)"
+					"target": "Target (count)",
+					"color": "Job Color"
 				},
 				"state": "Province/State",
 				"state_tax_id": "Provincial/State Tax ID (PST,  QST)",
@@ -2385,7 +2386,9 @@
 				"sublets": "Sublets",
 				"totalhours": "Total Hrs ",
 				"touchtime": "T/T",
-				"viewname": "View Name"
+				"viewname": "View Name",
+				"legend": "Legend:",
+				"cardcolor": "Card Colors"
 			},
 			"successes": {
 				"removed": "Job removed from production."

client/src/utils/RenderTemplate.js

@@ -1,6 +1,5 @@
 import { gql } from "@apollo/client";
 import { notification } from "antd";
-import axios from "axios";
 import jsreport from "@jsreport/browser-client";
 import _ from "lodash";
 import moment from "moment";
@@ -9,7 +8,8 @@ import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
 import { TemplateList } from "./TemplateConstants";
-
+import cleanAxios from "./CleanAxios";
+import axios from "axios";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -26,10 +26,14 @@ export default async function RenderTemplate(
   if (window.jsr3) {
     jsreport.serverUrl = "https://reports3.test.imex.online/";
   }
+  const jsrAuth = (await axios.post("/utils/jsr")).data;
+
+  jsreport.headers["Authorization"] = jsrAuth;
 
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let { contextData, useShopSpecificTemplate } = await fetchContextData(
-    templateObject
+    templateObject,
+    jsrAuth
   );
 
   const { ignoreCustomMargins } = Templates[templateObject.name];
@@ -137,11 +141,15 @@ export async function RenderTemplates(
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let unsortedTemplatesAndData = [];
   let proms = [];
+  const jsrAuth = (await axios.post("/utils/jsr")).data;
+  jsreport.headers["Authorization"] = jsrAuth;
+
   templateObjects.forEach((template) => {
     proms.push(
       (async () => {
         let { contextData, useShopSpecificTemplate } = await fetchContextData(
-          template
+          template,
+          jsrAuth
         );
         unsortedTemplatesAndData.push({
           templateObject: template,
@@ -298,19 +306,22 @@ export const GenerateDocuments = async (templates) => {
   await RenderTemplates(templates, bodyshop);
 };
 
-const fetchContextData = async (templateObject) => {
+const fetchContextData = async (templateObject, jsrAuth) => {
   const bodyshop = store.getState().user.bodyshop;
 
-  jsreport.headers["Authorization"] =
+  jsreport.headers["FirebaseAuthorization"] =
     "Bearer " + (await auth.currentUser.getIdToken());
 
-  const folders = await axios.get(`${server}/odata/folders`);
+  const folders = await cleanAxios.get(`${server}/odata/folders`, {
+    headers: { Authorization: jsrAuth },
+  });
   const shopSpecificFolder = folders.data.value.find(
     (f) => f.name === bodyshop.imexshopid
   );
 
-  const jsReportQueries = await axios.get(
-    `${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`
+  const jsReportQueries = await cleanAxios.get(
+    `${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`,
+    { headers: { Authorization: jsrAuth } }
   );
 
   let templateQueryToExecute;

client/src/utils/TemplateConstants.js

@@ -7,22 +7,24 @@ export const EmailSettings = {
 
 export const TemplateList = (type, context) => {
   //const { bodyshop } = store.getState().user;
-
   return {
     //If there's no type or the type is job, send it back.
     ...(!type || type === "job"
       ? {
           casl_authorization: {
             title: i18n.t("printcenter.jobs.casl_authorization"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.casl_authorization"),
             key: "casl_authorization",
             disabled: false,
             group: "authorization",
+            regions: {
+              CA: true,
+            },
           },
           fippa_authorization: {
             title: i18n.t("printcenter.jobs.fippa_authorization"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.fippa_authorization"),
             key: "fippa_authorization",
             disabled: false,
@@ -30,7 +32,7 @@ export const TemplateList = (type, context) => {
           },
           diagnostic_authorization: {
             title: i18n.t("printcenter.jobs.diagnostic_authorization"),
-            description: "Diagnostic Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.diagnostic_authorization"),
             key: "diagnostic_authorization",
             disabled: false,
@@ -38,7 +40,7 @@ export const TemplateList = (type, context) => {
           },
           mechanical_authorization: {
             title: i18n.t("printcenter.jobs.mechanical_authorization"),
-            description: "Diagnostic Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.mechanical_authorization"),
             key: "mechanical_authorization",
             disabled: false,
@@ -46,7 +48,7 @@ export const TemplateList = (type, context) => {
           },
           appointment_reminder: {
             title: i18n.t("printcenter.jobs.appointment_reminder"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.appointment_reminder"),
             key: "appointment_reminder",
             disabled: false,
@@ -54,7 +56,7 @@ export const TemplateList = (type, context) => {
           },
           estimate_followup: {
             title: i18n.t("printcenter.jobs.estimate_followup"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.estimate_followup"),
             key: "estimate_followup",
             disabled: false,
@@ -62,7 +64,7 @@ export const TemplateList = (type, context) => {
           },
           express_repair_checklist: {
             title: i18n.t("printcenter.jobs.express_repair_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.express_repair_checklist"),
             key: "express_repair_checklist",
             disabled: false,
@@ -70,7 +72,7 @@ export const TemplateList = (type, context) => {
           },
           glass_express_checklist: {
             title: i18n.t("printcenter.jobs.glass_express_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.glass_express_checklist"),
             key: "glass_express_checklist",
             disabled: false,
@@ -78,7 +80,7 @@ export const TemplateList = (type, context) => {
           },
           stolen_recovery_checklist: {
             title: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
             key: "stolen_recovery_checklist",
             disabled: false,
@@ -86,7 +88,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_check_in: {
             title: i18n.t("printcenter.jobs.vehicle_check_in"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.vehicle_check_in"),
             key: "vehicle_check_in",
             disabled: false,
@@ -94,7 +96,7 @@ export const TemplateList = (type, context) => {
           },
           parts_order_history: {
             title: i18n.t("printcenter.jobs.parts_order_history"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.parts_order_history"),
             key: "parts_order_history",
             disabled: false,
@@ -102,7 +104,7 @@ export const TemplateList = (type, context) => {
           },
           job_notes: {
             title: i18n.t("printcenter.jobs.job_notes"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.job_notes"),
             key: "job_notes",
             disabled: false,
@@ -110,7 +112,7 @@ export const TemplateList = (type, context) => {
           },
           ro_with_description: {
             title: i18n.t("printcenter.jobs.ro_with_description"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.ro_with_description"),
             key: "ro_with_description",
             disabled: false,
@@ -118,7 +120,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag: {
             title: i18n.t("printcenter.jobs.window_tag"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.window_tag"),
             key: "window_tag",
             disabled: false,
@@ -126,7 +128,7 @@ export const TemplateList = (type, context) => {
           },
           supplement_request: {
             title: i18n.t("printcenter.jobs.supplement_request"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.supplement_request"),
             key: "supplement_request",
             disabled: false,
@@ -134,7 +136,7 @@ export const TemplateList = (type, context) => {
           },
           estimate: {
             title: i18n.t("printcenter.jobs.estimate"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.estimate"),
             key: "estimate",
             disabled: false,
@@ -142,7 +144,7 @@ export const TemplateList = (type, context) => {
           },
           parts_list: {
             title: i18n.t("printcenter.jobs.parts_list"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.parts_list"),
             key: "parts_list",
             disabled: false,
@@ -150,7 +152,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_portrait: {
             title: i18n.t("printcenter.jobs.coversheet_portrait"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.coversheet_portrait"),
             key: "coversheet_portrait",
             disabled: false,
@@ -158,7 +160,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_landscape: {
             title: i18n.t("printcenter.jobs.coversheet_landscape"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.coversheet_landscape"),
             key: "coversheet_landscape",
             disabled: false,
@@ -166,7 +168,7 @@ export const TemplateList = (type, context) => {
           },
           key_tag: {
             title: i18n.t("printcenter.jobs.key_tag"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.key_tag"),
             key: "key_tag",
             disabled: false,
@@ -174,7 +176,7 @@ export const TemplateList = (type, context) => {
           },
           paint_grid: {
             title: i18n.t("printcenter.jobs.paint_grid"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.paint_grid"),
             key: "paint_grid",
             disabled: false,
@@ -182,7 +184,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_by_line_number: {
             title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             key: "worksheet_by_line_number",
             disabled: false,
@@ -192,7 +194,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
@@ -202,7 +204,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_sorted_by_operation: {
             title: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
             key: "worksheet_sorted_by_operation",
             disabled: false,
@@ -212,7 +214,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
@@ -224,7 +226,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
@@ -234,7 +236,7 @@ export const TemplateList = (type, context) => {
           },
           payments_by_job: {
             title: i18n.t("printcenter.jobs.payments_by_job"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.payments_by_job"),
             key: "payments_by_job",
             disabled: false,
@@ -242,7 +244,7 @@ export const TemplateList = (type, context) => {
           },
           final_invoice: {
             title: i18n.t("printcenter.jobs.final_invoice"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.final_invoice"),
             key: "final_invoice",
             disabled: false,
@@ -250,7 +252,7 @@ export const TemplateList = (type, context) => {
           },
           payment_request: {
             title: i18n.t("printcenter.jobs.payment_request"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.payment_request"),
             key: "payment_request",
             disabled: false,
@@ -258,7 +260,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_total_payable: {
             title: i18n.t("printcenter.jobs.invoice_total_payable"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.invoice_total_payable"),
             key: "invoice_total_payable",
             disabled: false,
@@ -266,7 +268,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_customer_payable: {
             title: i18n.t("printcenter.jobs.invoice_customer_payable"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.invoice_customer_payable"),
             key: "invoice_customer_payable",
             disabled: false,
@@ -274,7 +276,7 @@ export const TemplateList = (type, context) => {
           },
           ro_totals: {
             title: i18n.t("printcenter.jobs.ro_totals"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.ro_totals"),
             key: "ro_totals",
             disabled: false,
@@ -282,7 +284,7 @@ export const TemplateList = (type, context) => {
           },
           job_costing_ro: {
             title: i18n.t("printcenter.jobs.job_costing_ro"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.job_costing_ro"),
             key: "job_costing_ro",
             disabled: false,
@@ -290,7 +292,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_detail: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
             key: "purchases_by_ro_detail",
             disabled: false,
@@ -298,7 +300,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_summary: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
             key: "purchases_by_ro_summary",
             disabled: false,
@@ -306,7 +308,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_portrait: {
             title: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
             key: "filing_coversheet_portrait",
             disabled: false,
@@ -314,7 +316,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_landscape: {
             title: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
             key: "filing_coversheet_landscape",
             disabled: false,
@@ -322,7 +324,7 @@ export const TemplateList = (type, context) => {
           },
           qc_sheet: {
             title: i18n.t("printcenter.jobs.qc_sheet"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.qc_sheet"),
             key: "qc_sheet",
             disabled: false,
@@ -330,7 +332,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_delivery_check: {
             title: i18n.t("printcenter.jobs.vehicle_delivery_check"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.vehicle_delivery_check"),
             key: "vehicle_delivery_check",
             disabled: false,
@@ -338,7 +340,7 @@ export const TemplateList = (type, context) => {
           },
           guarantee: {
             title: i18n.t("printcenter.jobs.guarantee"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.guarantee"),
             key: "guarantee",
             disabled: false,
@@ -346,7 +348,7 @@ export const TemplateList = (type, context) => {
           },
           csi_invitation: {
             title: i18n.t("printcenter.jobs.csi_invitation"),
-            description: "CSI invite",
+            description: "",
             key: "csi_invitation",
             subject: i18n.t("printcenter.jobs.csi_invitation"),
             disabled: false,
@@ -354,7 +356,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag_sublet: {
             title: i18n.t("printcenter.jobs.window_tag_sublet"),
-            description: "Window Tag Sublet",
+            description: "",
             key: "window_tag_sublet",
             subject: i18n.t("printcenter.jobs.window_tag_sublet"),
             disabled: false,
@@ -362,7 +364,7 @@ export const TemplateList = (type, context) => {
           },
           thank_you_ro: {
             title: i18n.t("printcenter.jobs.thank_you_ro"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "thank_you_ro",
             subject: i18n.t("printcenter.jobs.thank_you_ro"),
             disabled: false,
@@ -370,7 +372,7 @@ export const TemplateList = (type, context) => {
           },
           parts_label_single: {
             title: i18n.t("printcenter.jobs.parts_label_single"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "parts_label_single",
             subject: i18n.t("printcenter.jobs.parts_label_single"),
             disabled: false,
@@ -379,7 +381,7 @@ export const TemplateList = (type, context) => {
           },
           envelope_return_address: {
             title: i18n.t("printcenter.jobs.envelope_return_address"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.envelope_return_address"),
             key: "envelope_return_address",
             disabled: false,
@@ -388,7 +390,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_certificate_of_repairs: {
             title: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "sgi_certificate_of_repairs",
             subject: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
             disabled: false,
@@ -399,7 +401,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_windshield_auth: {
             title: i18n.t("printcenter.jobs.sgi_windshield_auth"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "sgi_windshield_auth",
             subject: i18n.t("printcenter.jobs.sgi_windshield_auth"),
             disabled: false,
@@ -410,7 +412,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_final_acct_sheet: {
             title: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_final_acct_sheet",
             subject: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
             disabled: false,
@@ -421,7 +423,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_eglass_auth: {
             title: i18n.t("printcenter.jobs.mpi_eglass_auth"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_eglass_auth",
             subject: i18n.t("printcenter.jobs.mpi_eglass_auth"),
             disabled: false,
@@ -432,7 +434,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_animal_checklist: {
             title: i18n.t("printcenter.jobs.mpi_animal_checklist"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_animal_checklist",
             subject: i18n.t("printcenter.jobs.mpi_animal_checklist"),
             disabled: false,
@@ -443,7 +445,7 @@ export const TemplateList = (type, context) => {
           },
           ab_proof_of_loss: {
             title: i18n.t("printcenter.jobs.ab_proof_of_loss"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "ab_proof_of_loss",
             subject: i18n.t("printcenter.jobs.ab_proof_of_loss"),
             disabled: false,
@@ -454,7 +456,7 @@ export const TemplateList = (type, context) => {
           },
           // parts_label_multi: {
           //   title: i18n.t("printcenter.jobs.parts_label_multi"),
-          //   description: "Thank You Letter by RO",
+          //   description: "",
           //   key: "parts_label_multi",
           //   subject: i18n.t("printcenter.jobs.parts_label_multi"),
           //   disabled: false,
@@ -462,7 +464,7 @@ export const TemplateList = (type, context) => {
           // },
           iou_form: {
             title: i18n.t("printcenter.jobs.iou_form"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.iou_form"),
             key: "iou_form",
             disabled: false,
@@ -470,7 +472,7 @@ export const TemplateList = (type, context) => {
           },
           lag_time_ro: {
             title: i18n.t("printcenter.jobs.lag_time_ro"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.lag_time_ro"),
             key: "lag_time_ro",
             disabled: false,
@@ -478,7 +480,7 @@ export const TemplateList = (type, context) => {
           },
           rental_reservation: {
             title: i18n.t("printcenter.jobs.rental_reservation"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.rental_reservation"),
             key: "rental_reservation",
             disabled: false,
@@ -486,7 +488,7 @@ export const TemplateList = (type, context) => {
           },
           timetickets_ro: {
             title: i18n.t("printcenter.jobs.timetickets_ro"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.timetickets_ro"),
             key: "timetickets_ro",
             disabled: false,
@@ -494,7 +496,7 @@ export const TemplateList = (type, context) => {
           },
           dms_posting_sheet: {
             title: i18n.t("printcenter.jobs.dms_posting_sheet"),
-            description: "DMS Posting Sheet",
+            description: "",
             subject: i18n.t("printcenter.jobs.dms_posting_sheet"),
             key: "dms_posting_sheet",
             disabled: false,
@@ -506,39 +508,39 @@ export const TemplateList = (type, context) => {
       ? {
           special_thirdpartypayer: {
             title: i18n.t("printcenter.jobs.thirdpartypayer"),
-            description: "CSI invite",
+            description: "",
             key: "special_thirdpartypayer",
             disabled: false,
           },
           folder_label_multiple: {
             title: i18n.t("printcenter.jobs.folder_label_multiple"),
-            description: "Folder Label Multiple",
+            description: "",
             key: "folder_label_multiple",
             disabled: false,
           },
           parts_label_multiple: {
             title: i18n.t("printcenter.jobs.parts_label_multiple"),
-            description: "Parts Label Multiple",
+            description: "",
             key: "parts_label_multiple",
             disabled: false,
           },
           parts_invoice_label_single: {
             title: i18n.t("printcenter.jobs.parts_invoice_label_single"),
-            description: "Parts Label Multiple",
+            description: "",
             key: "parts_invoice_label_single",
             disabled: false,
             ignoreCustomMargins: true,
           },
           csi_invitation_action: {
             title: i18n.t("printcenter.jobs.csi_invitation_action"),
-            description: "CSI invite",
+            description: "",
             key: "csi_invitation_action",
             subject: i18n.t("printcenter.jobs.csi_invitation_action"),
             disabled: false,
           },
           individual_job_note: {
             title: i18n.t("printcenter.jobs.individual_job_note"),
-            description: "CSI invite",
+            description: "",
             key: "individual_job_note",
             subject: i18n.t("printcenter.jobs.individual_job_note", {
               ro_number: (context && context.ro_number) || "",
@@ -551,7 +553,7 @@ export const TemplateList = (type, context) => {
       ? {
           appointment_confirmation: {
             title: i18n.t("printcenter.appointments.appointment_confirmation"),
-            description: "Appointment Confirmation",
+            description: "",
             subject: i18n.t(
               "printcenter.appointments.appointment_confirmation"
             ),
@@ -564,7 +566,7 @@ export const TemplateList = (type, context) => {
       ? {
           parts_order: {
             title: i18n.t("printcenter.jobs.parts_order"),
-            description: "Parts Order",
+            description: "",
             key: "parts_order",
             subject: i18n.t("printcenter.subjects.jobs.parts_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -578,7 +580,7 @@ export const TemplateList = (type, context) => {
           },
           sublet_order: {
             title: i18n.t("printcenter.jobs.sublet_order"),
-            description: "Parts Order",
+            description: "",
             key: "sublet_order",
             subject: i18n.t("printcenter.subjects.jobs.sublet_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -593,7 +595,7 @@ export const TemplateList = (type, context) => {
           parts_return_slip: {
             title: i18n.t("printcenter.jobs.parts_return_slip"),
             subject: i18n.t("printcenter.jobs.parts_return_slip"),
-            description: "Parts Return",
+            description: "",
             key: "parts_return_slip",
             disabled: false,
           },
@@ -603,7 +605,7 @@ export const TemplateList = (type, context) => {
       ? {
           payment_receipt: {
             title: i18n.t("printcenter.jobs.payment_receipt"),
-            description: "Payment Receipt",
+            description: "",
             subject: i18n.t("printcenter.jobs.payment_receipt"),
             key: "payment_receipt",
             disabled: false,
@@ -1891,7 +1893,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
@@ -1900,7 +1902,7 @@ export const TemplateList = (type, context) => {
           },
           courtesy_car_terms: {
             title: i18n.t("printcenter.courtesycarcontract.courtesy_car_terms"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_terms"
             ),
@@ -1911,7 +1913,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
@@ -1926,7 +1928,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
@@ -1939,7 +1941,7 @@ export const TemplateList = (type, context) => {
       ? {
           inhouse_invoice: {
             title: i18n.t("printcenter.bills.inhouse_invoice"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.bills.inhouse_invoice"),
             key: "inhouse_invoice",
             disabled: false,
@@ -1950,7 +1952,7 @@ export const TemplateList = (type, context) => {
       ? {
           // timetickets: {
           //   title: i18n.t("printcenter.timetickets.timetickets"),
-          //   description: "Est Detail",
+          //   description: "",
           //   subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
           //     context && context.job && context.job.ro_number
           //   }`,
@@ -1963,14 +1965,14 @@ export const TemplateList = (type, context) => {
       ? {
           purchases_by_vendor_detailed: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
             key: "purchases_by_vendor_detailed",
             disabled: false,
           },
           purchases_by_vendor_summary: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
             key: "purchases_by_vendor_summary",
             disabled: false,
@@ -2043,21 +2045,21 @@ export const TemplateList = (type, context) => {
       ? {
           ca_bc_etf_table: {
             title: i18n.t("printcenter.payments.ca_bc_etf_table"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.payments.ca_bc_etf_table"),
             key: "ca_bc_etf_table",
             disabled: false,
           },
           exported_payroll: {
             title: i18n.t("printcenter.payments.exported_payroll"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.payments.exported_payroll"),
             key: "exported_payroll",
             disabled: false,
           },
           attendance_detail_csv: {
             title: i18n.t("printcenter.special.attendance_detail_csv"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.special.attendance_detail_csv"),
             key: "attendance_detail_csv",
             disabled: false,

hasura/migrations/1682703406197_run_sql_migration/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_associations_active_true ON associations(active) WHERE active = true;

hasura/migrations/1682703406197_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_associations_active_true ON associations(active) WHERE active = true;

hasura/migrations/1682703475365_create_index_idx_associations_shopid_user/down.sql

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

hasura/migrations/1682703475365_create_index_idx_associations_shopid_user/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_associations_shopid_user" on
+  "public"."associations" using btree ("shopid", "useremail", "active");

server.js

@@ -123,7 +123,11 @@ app.post(
   twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" }),
   smsStatus.status
 );
-app.post("/sms/markConversationRead", smsStatus.markConversationRead);
+app.post(
+  "/sms/markConversationRead",
+  fb.validateFirebaseIdToken,
+  smsStatus.markConversationRead
+);
 
 var job = require("./server/job/job");
 app.post("/job/totals", fb.validateFirebaseIdToken, job.totals);
@@ -147,11 +151,11 @@ app.post("/scheduling/job", fb.validateFirebaseIdToken, scheduling.job);
 var inlineCss = require("./server/render/inlinecss");
 app.post("/render/inlinecss", fb.validateFirebaseIdToken, inlineCss.inlinecss);
 
-app.post(
-  "/notifications/send",
+// app.post(
+//   "/notifications/send",
 
-  fb.sendNotification
-);
+//   fb.sendNotification
+// );
 app.post("/notifications/subscribe", fb.validateFirebaseIdToken, fb.subscribe);
 app.post(
   "/notifications/unsubscribe",
@@ -188,13 +192,13 @@ app.post(
 );
 
 //Stripe Processing
-var stripe = require("./server/stripe/payment");
-app.post("/stripe/payment", fb.validateFirebaseIdToken, stripe.payment);
-app.post(
-  "/stripe/mobilepayment",
-  fb.validateFirebaseIdToken,
-  stripe.mobile_payment
-);
+// var stripe = require("./server/stripe/payment");
+// app.post("/stripe/payment", fb.validateFirebaseIdToken, stripe.payment);
+// app.post(
+//   "/stripe/mobilepayment",
+//   fb.validateFirebaseIdToken,
+//   stripe.mobile_payment
+// );
 
 //Tech Console
 var tech = require("./server/tech/tech");
@@ -202,7 +206,7 @@ app.post("/tech/login", fb.validateFirebaseIdToken, tech.techLogin);
 
 var utils = require("./server/utils/utils");
 app.post("/utils/time", utils.servertime);
-
+app.post("/utils/jsr", fb.validateFirebaseIdToken, utils.jsrAuth);
 var qbo = require("./server/accounting/qbo/qbo");
 app.post("/qbo/authorize", fb.validateFirebaseIdToken, qbo.authorize);
 app.get("/qbo/callback", qbo.callback);
@@ -215,7 +219,7 @@ app.post("/data/ah", data.autohouse);
 app.post("/record-handler/arms", data.arms);
 
 var taskHandler = require("./server/tasks/tasks");
-app.post("/taskHandler", taskHandler.taskHandler);
+app.post("/taskHandler", fb.validateFirebaseIdToken, taskHandler.taskHandler);
 
 var mixdataUpload = require("./server/mixdata/mixdata");
 
@@ -228,10 +232,10 @@ app.post(
 
 var ioevent = require("./server/ioevent/ioevent");
 app.post("/ioevent", ioevent.default);
-app.post("/newlog", (req, res) => {
-  const { message, type, user, record, object } = req.body;
-  logger.log(message, type, user, record, object);
-});
+// app.post("/newlog", (req, res) => {
+//   const { message, type, user, record, object } = req.body;
+//   logger.log(message, type, user, record, object);
+// });
 
 var os = require("./server/opensearch/os-handler");
 app.post(

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

@@ -164,7 +164,7 @@ async function PbsCalculateAllocationsAp(socket, billids) {
 
       let APAmount = Dinero();
       Object.keys(billHash).map((key) => {
-        if (billHash[key].Amount.getAmount() > 0) {
+        if (billHash[key].Amount.getAmount() > 0 || billHash[key].Amount.getAmount() < 0) {
           transactionObject.Posting.Lines.push({
             ...billHash[key],
             Amount: billHash[key].Amount.toFormat("0.00"),

server/data/arms.js

@@ -50,7 +50,7 @@ async function getEntegralShopData() {
 }
 
 exports.default = async (req, res) => {
-  res.sendStatus(200);
+  res.sendStatus(401);
   return;
   //Query for the List of Bodyshop Clients.
   const job = req.body.event.data.new;

server/data/autohouse.js

@@ -40,6 +40,10 @@ exports.default = async (req, res) => {
 
   const specificShopIds = req.body.bodyshopIds; // ['uuid]
   const { start, end, skipUpload } = req.body; //YYYY-MM-DD
+  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
+    res.sendStatus(401);
+    return;
+  }
   const allxmlsToUpload = [];
   const allErrors = [];
   try {
@@ -261,20 +265,20 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         }${job.est_ct_fn ? job.est_ct_fn : ""}`,
       },
       CustomerInformation: {
-        FirstName: job.ownr_fn || "",
-        LastName: job.ownr_ln || "",
-        Street: job.ownr_addr1 || "",
-        City: job.ownr_city || "",
-        State: job.ownr_st || "",
+        FirstName: "",
+        LastName: "",
+        Street: "",
+        City: "",
+        State: "",
         Zip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
-        Phone1: job.ownr_ph1 || "",
+        Phone1: "",
         Phone2: null,
         Phone2Extension: null,
         Phone3: null,
         Phone3Extension: null,
         FileComments: null,
         Source: null,
-        Email: job.ownr_ea || "",
+        Email: "",
         RetWhsl: null,
         Cat: null,
         InsuredorClaimantFlag: null,
@@ -758,7 +762,12 @@ const CreateCosts = (job) => {
   }, {});
 
   //If the hourly rates for job costing are set, add them in.
-  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
+  if (
+    job.bodyshop.jc_hourly_rates &&
+    (job.bodyshop.jc_hourly_rates.mapa ||
+      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
+      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
+  ) {
     if (
       !billTotalsByCostCenters[
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
@@ -772,7 +781,9 @@ const CreateCosts = (job) => {
         billTotalsByCostCenters[
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ] = Dinero({
-          amount: (job.mixdata[0] && job.mixdata[0].totalliquidcost * 100) || 0,
+          amount: Math.round(
+            ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100
+          ),
         });
       } else {
         billTotalsByCostCenters[
@@ -799,7 +810,7 @@ const CreateCosts = (job) => {
             (job.bodyshop.jc_hourly_rates &&
               job.bodyshop.jc_hourly_rates.mapa * 100) ||
             0,
-        }).multiply(materialsHours.mapaHrs)
+        }).multiply(job.job_totals.rates.mapa.hours)
       );
     }
   }

server/email/sendemail.js

@@ -28,7 +28,7 @@ exports.sendServerEmail = async function ({ subject, text }) {
     transporter.sendMail(
       {
         from: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
-        to: ["patrick@imexsystems.ca"],
+        to: ["patrick@imexsystems.ca", "support@thinkimex.com"],
         subject: subject,
         text: text,
         ses: {

server/job/job-costing.js

@@ -612,7 +612,12 @@ function GenerateCostingData(job) {
 
   //If the hourly rates for job costing are set, add them in.
 
-  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
+  if (
+    job.bodyshop.jc_hourly_rates &&
+    (job.bodyshop.jc_hourly_rates.mapa ||
+      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
+      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
+  ) {
     if (
       !billTotalsByCostCenters.additionalCosts[
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
@@ -626,7 +631,9 @@ function GenerateCostingData(job) {
         billTotalsByCostCenters.additionalCosts[
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ] = Dinero({
-          amount: (job.mixdata[0] && job.mixdata[0].totalliquidcost * 100) || 0,
+          amount: Math.round(
+            ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100
+          ),
         });
       } else {
         billTotalsByCostCenters.additionalCosts[

server/job/job-status-transition.js

@@ -17,7 +17,7 @@ require("dotenv").config({
 });
 async function StatusTransition(req, res) {
   if (req.headers["event-secret"] !== process.env.EVENT_SECRET) {
-    res.status(403).send("Unauthorized");
+    res.status(401).send("Unauthorized");
     return;
   }
   res.sendStatus(200);

server/opensearch/os-handler.js

@@ -45,6 +45,10 @@ const getClient = async () => {
 };
 
 async function OpenSearchUpdateHandler(req, res) {
+  if (req.headers["event-secret"] !== process.env.EVENT_SECRET) {
+    res.status(401).send("Unauthorized");
+    return;
+  }
   try {
     var osClient = await getClient();
     // const osClient = new Client({

server/utils/utils.js

@@ -1,3 +1,12 @@
 exports.servertime = (req, res) => {
   res.status(200).send(new Date());
 };
+
+exports.jsrAuth = async (req, res) => {
+  res.send(
+    "Basic " +
+      Buffer.from(
+        `${process.env.JSR_USER}:${process.env.JSR_PASSWORD}`
+      ).toString("base64")
+  );
+};