IO-2848 UPDATE_JOB query

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/.env.development.promanager

@@ -1,7 +1,7 @@
 VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
 VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
 VITE_APP_GA_CODE=231099835
-VITE_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+VITE_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
 VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
 VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
 VITE_APP_CLOUDINARY_API_KEY=957865933348715

client/src/App/App.jsx

@@ -7,9 +7,7 @@ import { connect } from "react-redux";
 import { Route, Routes } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import DocumentEditorContainer from "../components/document-editor/document-editor.container";
-import ErrorBoundary from "../components/error-boundary/error-boundary.component";
+import ErrorBoundary from "../components/error-boundary/error-boundary.component"; // Component Imports
-
-//Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
 import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
 import LandingPage from "../pages/landing/landing.page";
@@ -23,20 +21,21 @@ import "./App.styles.scss";
 import handleBeta from "../utils/betaHandler";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
-import { ProductFruits } from "react-product-fruits";
+import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
 
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
 const SignInPage = lazy(() => import("../pages/sign-in/sign-in.page"));
-
 const CsiPage = lazy(() => import("../pages/csi/csi.container.page"));
 const MobilePaymentContainer = lazy(() => import("../pages/mobile-payment/mobile-payment.container"));
+
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   online: selectOnline,
   bodyshop: selectBodyshop,
   currentEula: selectCurrentEula
 });
+
 const mapDispatchToProps = (dispatch) => ({
   checkUserSession: () => dispatch(checkUserSession()),
   setOnline: (isOnline) => dispatch(setOnline(isOnline))
@@ -60,11 +59,11 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
 
   // Associate event listeners, memoize to prevent multiple listeners being added
   useEffect(() => {
-    const offlineListener = (e) => {
+    const offlineListener = () => {
       setOnline(false);
     };
 
-    const onlineListener = (e) => {
+    const onlineListener = () => {
       setOnline(true);
     };
 
@@ -111,24 +110,20 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
 
   handleBeta();
 
-  if (!online)
+  if (!online) {
     return (
       <Result
         status="warning"
         title={t("general.labels.nointernet")}
         subTitle={t("general.labels.nointernet_sub")}
         extra={
-          <Button
+          <Button type="primary" onClick={() => window.location.reload()}>
-            type="primary"
-            onClick={() => {
-              window.location.reload();
-            }}
-          >
             {t("general.actions.refresh")}
           </Button>
         }
       />
     );
+  }
 
   if (currentEula && !currentUser.eulaIsAccepted) {
     return <Eula />;
@@ -147,18 +142,13 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         />
       }
     >
-      <ProductFruits
+      <ProductFruitsWrapper
+        currentUser={currentUser}
         workspaceCode={InstanceRenderMgr({
           imex: null,
           rome: "9BkbEseqNqxw8jUH",
           promanager: "aoJoEifvezYI0Z0P"
         })}
-        debug
-        language="en"
-        user={{
-          email: currentUser.email,
-          username: currentUser.email
-        }}
       />
 
       <Routes>

client/src/App/ProductFruitsWrapper.jsx

@@ -0,0 +1,32 @@
+import React from "react";
+import { ProductFruits } from "react-product-fruits";
+import PropTypes from "prop-types";
+
+const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
+  return (
+    workspaceCode &&
+    currentUser?.authorized === true &&
+    currentUser?.email && (
+      <ProductFruits
+        lifeCycle="unmount"
+        workspaceCode={workspaceCode}
+        debug
+        language="en"
+        user={{
+          email: currentUser.email,
+          username: currentUser.email
+        }}
+      />
+    )
+  );
+});
+
+export default ProductFruitsWrapper;
+
+ProductFruitsWrapper.propTypes = {
+  currentUser: PropTypes.shape({
+    authorized: PropTypes.bool,
+    email: PropTypes.string
+  }).isRequired,
+  workspaceCode: PropTypes.string.isRequired
+};

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -14,7 +14,6 @@ import {
   Typography
 } from "antd";
 import Dinero from "dinero.js";
-import dayjs from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -22,6 +21,7 @@ import { createStructuredSelector } from "reselect";
 import { determineDmsType } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import i18n from "../../translations/i18n";
+import dayjs from "../../utils/day";
 import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
@@ -89,7 +89,7 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
             job.area_of_damage && job.area_of_damage.impact1
               ? " " +
                 t("jobs.labels.dms.damageto", {
-                  area_of_damage: (job.area_of_damage && job.area_of_damage.impact1) || "UNKNOWN"
+                  area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
                 })
               : ""
           }`.slice(0, 239),

client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx

@@ -1,6 +1,6 @@
-import React, { useCallback, useState } from "react";
 import { LockOutlined } from "@ant-design/icons";
 import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } from "antd";
+import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -12,9 +12,9 @@ import JobCloseRoGuardBills from "./job-close-ro-guard.bills";
 import JobCloseRoGuardPpd from "./job-close-ro-guard.ppd";
 import JobCloseRoGuardProfit from "./job-close-ro-guard.profit";
 import "./job-close-ro-guard.styles.scss";
-import JobCloseRoGuardSublet from "./job-close-ro-guard.sublet";
+// import JobCloseRoGuardSublet from "./job-close-ro-guard.sublet";
-import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser

client/src/components/job-detail-cards/job-detail-cards.damage.component.jsx

@@ -1,14 +1,21 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import CardTemplate from "./job-detail-cards.template.component";
 import Car from "../job-damage-visual/job-damage-visual.component";
+import CardTemplate from "./job-detail-cards.template.component";
 
 export default function JobDetailCardsDamageComponent({ loading, data }) {
   const { t } = useTranslation();
   const { area_of_damage } = data;
   return (
     <CardTemplate loading={loading} title={t("jobs.labels.cards.damage")}>
-      {area_of_damage ? <Car dmg1={area_of_damage.impact1} dmg2={area_of_damage.impact2} /> : t("jobs.errors.nodamage")}
+      {area_of_damage ? (
+        <Car
+          dmg1={area_of_damage.impact1 && area_of_damage.impact1.padStart(2, "0")}
+          dmg2={area_of_damage.impact2 && area_of_damage.impact2.padStart(2, "0")}
+        />
+      ) : (
+        t("jobs.errors.nodamage")
+      )}
     </CardTemplate>
   );
 }

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -26,6 +26,16 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
   const { t } = useTranslation();
   const { joblines_status } = data;
 
+  const filteredJobLines = data.joblines.filter(
+    (j) =>
+      j.part_type !== null &&
+      j.part_type !== "PAE" &&
+      j.part_type !== "PAS" &&
+      j.part_type !== "PASL" &&
+      j.part_qty !== 0 &&
+      j.act_price !== 0
+  );
+//TODO: Correct jobline_statuses view by including the part_qty !== 0 and act_price !== 0
   const columns = [
     {
       title: t("joblines.fields.line_desc"),
@@ -95,7 +105,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={data ? data.joblines : []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
       </CardTemplate>
     </div>
   );

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

@@ -189,7 +189,10 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Col>
         <Col {...lossColDamage}>
           {job.area_of_damage ? (
-            <Car dmg1={job.area_of_damage.impact1} dmg2={job.area_of_damage.impact2} />
+            <Car
+              dmg1={job.area_of_damage.impact1 && job.area_of_damage.impact1.padStart(2, "0")}
+              dmg2={job.area_of_damage.impact2 && job.area_of_damage.impact2.padStart(2, "0")}
+            />
           ) : (
             t("jobs.errors.nodamage")
           )}

client/src/components/shop-employees/shop-employees-list.component.jsx

@@ -63,7 +63,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
           value: false
         }
       ],
-      onFilter: (value, record) => value === record.flate_rate,
+      onFilter: (value, record) => value === record.flat_rate,
       render: (text, record) =>
         record.flat_rate ? t("employees.labels.flat_rate") : t("employees.labels.straight_time")
     },

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

@@ -1,17 +1,17 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input, InputNumber, Select, Space, Switch, Typography } from "antd";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import styled from "styled-components";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import DataLabel from "../data-label/data-label.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import styled from "styled-components";
-import ShopInfoResponsibilitycentersTaxesComponent from "./shop-info.responsibilitycenters.taxes.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import DataLabel from "../data-label/data-label.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import ShopInfoResponsibilitycentersTaxesComponent from "./shop-info.responsibilitycenters.taxes.component";
 
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
@@ -214,7 +214,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                               </Select.Option>
                             </Select>
                           </Form.Item>
-
                           <Space align="center">
                             <DeleteFilled
                               onClick={() => {
@@ -274,7 +273,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           >
                             <Input />
                           </Form.Item>
-
                           <DeleteFilled
                             onClick={() => {
                               remove(field.name);
@@ -386,7 +384,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                       >
                         <Input onBlur={handleBlur} />
                       </Form.Item> */}
-
                       {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
                         <Form.Item
                           label={t("bodyshop.fields.dms.dms_acctnumber")}
@@ -451,7 +448,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-
       <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.profits")} id="profits">
         <Form.List name={["md_responsibility_centers", "profits"]}>
           {(fields, { add, remove, move }) => {
@@ -579,10 +575,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-
       <SelectorDiv>
         {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <>
+            <LayoutFormRow id="mappingname" header={t("bodyshop.labels.dms.dms_allocations")}>
               <Form.List name={["md_responsibility_centers", "dms_defaults"]}>
                 {(fields, { add, remove, move }) => {
                   return (
@@ -590,7 +586,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                       {fields.map((field, index) => (
                         <Form.Item key={field.key}>
                           <div>
-                          <LayoutFormRow id="mappingname">
+                            <LayoutFormRow id="mappingname" noDivider={index > 0 ? false : true}>
                               <Form.Item
                                 label={t("bodyshop.fields.dms.mappingname")}
                                 key={`${index}name`}
@@ -616,7 +612,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 }}
                               />
                             </LayoutFormRow>
-                          <LayoutFormRow header={t("bodyshop.labels.defaultcostsmapping")} id="defaultcostsmapping">
+                            <LayoutFormRow header={t("bodyshop.labels.dms.costsmapping")} id="costsmapping">
                               <Form.Item
                                 label={t("bodyshop.fields.responsibilitycenters.ats")}
                                 rules={[
@@ -1401,7 +1397,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 </Select>
                               </Form.Item>
                             </LayoutFormRow>
-                          <LayoutFormRow header={t("bodyshop.labels.defaultprofitsmapping")}>
+                            <LayoutFormRow header={t("bodyshop.labels.dms.profitsmapping")} id="profitsmapping">
                               <Form.Item
                                 label={t("bodyshop.fields.responsibilitycenters.ats")}
                                 rules={[
@@ -2204,6 +2200,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   );
                 }}
               </Form.List>
+            </LayoutFormRow>
           </>
         )}
 
@@ -3720,7 +3717,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       </SelectorDiv>
-
       <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.tax_accounts")} id="tax_accounts">
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.federal_tax")}
@@ -4354,14 +4350,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <Typography.Title level={4}>{t("bodyshop.labels.responsibilitycenters.sales_tax_codes")}</Typography.Title>
+      <LayoutFormRow id="mappingname" header={t("bodyshop.labels.responsibilitycenters.sales_tax_codes")}>
         <Form.List name={["md_responsibility_centers", "sales_tax_codes"]}>
           {(fields, { add, remove }) => {
             return (
               <div>
                 {fields.map((field, index) => (
                   <Form.Item key={field.key}>
-                  <LayoutFormRow id="sales_tax_codes">
+                    <LayoutFormRow id="sales_tax_codes" noDivider={index > 0 ? false : true}>
                       <Form.Item
                         label={t("bodyshop.fields.responsibilitycenters.sales_tax_codes.description")}
                         key={`${index}description`}
@@ -4435,6 +4431,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             );
           }}
         </Form.List>
+      </LayoutFormRow>
     </div>
   );
 }

client/src/graphql/jobs.queries.js

@@ -905,7 +905,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       }
 
       joblines(
-        where: { removed: { _eq: false }, part_type: { _is_null: false, _nin: ["PAE", "PAS", "PASL"] } }
+        where: { removed: { _eq: false } }
         order_by: { line_no: asc }
       ) {
         id
@@ -1149,6 +1149,7 @@ export const UPDATE_JOB = gql`
         suspended
         queued_for_parts
         scheduled_completion
+        scheduled_delivery
         actual_in
         date_repairstarted
         date_void

client/src/translations/en_us/common.json

@@ -647,7 +647,10 @@
 						"payers": "Payers"
 					},
 					"cdk_dealerid": "CDK Dealer ID",
+          "costsmapping": "Costs Mapping",
+          "dms_allocations": "DMS Allocations",
 					"pbs_serialnumber": "PBS Serial Number",
+          "profitsmapping": "Profits Mapping",
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
@@ -2917,7 +2920,8 @@
 				"parts_not_recieved_vendor": "Parts Not Received by Vendor",
 				"parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
 				"payments_by_date": "Payments by Date",
-				"payments_by_date_type": "Payments by Date and Type",
+        "payments_by_date_payment": "Payments by Date and Payment Type",
+				"payments_by_date_type": "Payments by Date and Customer Type",
 				"production_by_category": "Production by Category",
 				"production_by_category_one": "Production filtered by Category",
 				"production_by_csr": "Production by CSR",

client/src/translations/es/common.json

@@ -647,7 +647,10 @@
 						"payers": ""
 					},
 					"cdk_dealerid": "",
+          "costsmapping": "",
+          "dms_allocations": "",
 					"pbs_serialnumber": "",
+          "profitsmapping": "",
 					"title": ""
 				},
 				"emaillater": "",
@@ -2917,6 +2920,7 @@
 				"parts_not_recieved_vendor": "",
 				"parts_received_not_scheduled": "",
 				"payments_by_date": "",
+        "payments_by_date_payment": "",
 				"payments_by_date_type": "",
 				"production_by_category": "",
 				"production_by_category_one": "",

client/src/translations/fr/common.json

@@ -647,7 +647,10 @@
 						"payers": ""
 					},
 					"cdk_dealerid": "",
+          "costsmapping": "",
+          "dms_allocations": "",
 					"pbs_serialnumber": "",
+          "profitsmapping": "",
 					"title": ""
 				},
 				"emaillater": "",
@@ -2917,6 +2920,7 @@
 				"parts_not_recieved_vendor": "",
 				"parts_received_not_scheduled": "",
 				"payments_by_date": "",
+        "payments_by_date_payment": "",
 				"payments_by_date_type": "",
 				"production_by_category": "",
 				"production_by_category_one": "",

client/src/utils/TemplateConstants.js

@@ -1194,6 +1194,17 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
+          payments_by_date_payment: {
+            title: i18n.t("reportcenter.templates.payments_by_date_payment"),
+            subject: i18n.t("reportcenter.templates.payments_by_date_payment"),
+            key: "payments_by_date_payment",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date")
+            },
+            group: "customers"
+          },
           schedule: {
             title: i18n.t("reportcenter.templates.schedule"),
             subject: i18n.t("reportcenter.templates.schedule"),

hasura/migrations/1720712957502_run_sql_migration/down.sql

@@ -0,0 +1,10 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE VIEW "public"."joblines_status" AS
+--  SELECT j.jobid,
+--     j.status,
+--     count(1) AS count,
+--     j.part_type
+--    FROM joblines j
+--   WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.part_type <> 'PAS'::text) AND (j.part_type <> 'PASL'::text) AND (j.part_qty <> 0) AND (j.act_price <> 0) AND (j.removed IS FALSE))
+--   GROUP BY j.jobid, j.status, j.part_type;

hasura/migrations/1720712957502_run_sql_migration/up.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE VIEW "public"."joblines_status" AS 
+ SELECT j.jobid,
+    j.status,
+    count(1) AS count,
+    j.part_type
+   FROM joblines j
+  WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.part_type <> 'PAS'::text) AND (j.part_type <> 'PASL'::text) AND (j.part_qty <> 0) AND (j.act_price <> 0) AND (j.removed IS FALSE))
+  GROUP BY j.jobid, j.status, j.part_type;

hasura/migrations/1720713022389_run_sql_migration/down.sql

@@ -0,0 +1,10 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE VIEW "public"."joblines_status" AS
+--  SELECT j.jobid,
+--     j.status,
+--     count(1) AS count,
+--     j.part_type
+--    FROM joblines j
+--   WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.part_type <> 'PAS'::text) AND (j.part_type <> 'PASL'::text) AND (j.part_qty <> (0)::numeric) AND (j.act_price <> (0)::numeric) AND (j.removed IS FALSE))
+--   GROUP BY j.jobid, j.status, j.part_type;

hasura/migrations/1720713022389_run_sql_migration/up.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE VIEW "public"."joblines_status" AS 
+ SELECT j.jobid,
+    j.status,
+    count(1) AS count,
+    j.part_type
+   FROM joblines j
+  WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.part_type <> 'PAS'::text) AND (j.part_type <> 'PASL'::text) AND (j.part_qty <> (0)::numeric) AND (j.act_price <> (0)::numeric) AND (j.removed IS FALSE))
+  GROUP BY j.jobid, j.status, j.part_type;

server/accounting/qb-receivables-lines.js

@@ -632,7 +632,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
       }
     }
 
-    //QB USA with GST
+    //QB USA with GST and PST
     //This was required for the No. 1 Collision Group.
     if (
       bodyshop.accountingconfig &&
@@ -651,6 +651,17 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
           Qty: 1
         }
       });
+      InvoiceLineAdd.push({
+        DetailType: "SalesItemLineDetail",
+        Amount: Dinero(jobs_by_pk.job_totals.totals.state_tax).toFormat(DineroQbFormat),
+        SalesItemLineDetail: {
+          ...(jobs_by_pk.class ? { ClassRef: { value: classes[jobs_by_pk.class] } } : {}),
+          ItemRef: {
+            value: items[bodyshop.md_responsibility_centers.taxes.state.accountitem]
+          },
+          Qty: 1
+        }
+      });
     }
   } else {
     //Handle insurance profile adjustments

server/cdk/cdk-calculate-allocations.js

@@ -16,10 +16,37 @@ const { DiscountNotAlreadyCounted } = InstanceManager({
   promanager: "USE_ROME"
 });
 
+exports.defaultRoute = async function (req, res) {
+  try {
+    CdkBase.createLogEvent(req, "DEBUG", `Received request to calculate allocations for ${req.body.jobid}`);
+    const jobData = await QueryJobData(req, req.BearerToken, req.body.jobid);
+    return res.status(200).json({ data: calculateAllocations(req, jobData) });
+  } catch (error) {
+    console.log(error);
+    CdkBase.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
+    res.status(500).json({ error: `Error encountered in CdkCalculateAllocations. ${error}` });
+  }
+};
+
 exports.default = async function (socket, jobid) {
   try {
-    CdkBase.createLogEvent(socket, "DEBUG", `Received request to calculate allocations for ${jobid}`);
+    const jobData = await QueryJobData(socket, "Bearer " + socket.handshake.auth.token, jobid);
-    const job = await QueryJobData(socket, jobid);
+    return calculateAllocations(socket, jobData);
+  } catch (error) {
+    console.log(error);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
+  }
+};
+
+async function QueryJobData(connectionData, token, jobid) {
+  CdkBase.createLogEvent(connectionData, "DEBUG", `Querying job data for id ${jobid}`);
+  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
+  const result = await client.setHeaders({ Authorization: token }).request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
+  CdkBase.createLogEvent(connectionData, "TRACE", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  return result.jobs_by_pk;
+}
+
+function calculateAllocations(connectionData, job) {
   const { bodyshop } = job;
 
   const taxAllocations = InstanceManager({
@@ -145,7 +172,7 @@ exports.default = async function (socket, jobid) {
     (d) => d.name === job.dms_allocation
   );
   CdkBase.createLogEvent(
-      socket,
+    connectionData,
     "DEBUG",
     `Using DMS Allocation ${selectedDmsAllocationConfig && selectedDmsAllocationConfig.name} for cost export.`
   );
@@ -225,10 +252,10 @@ exports.default = async function (socket, jobid) {
       //  console.log("NO MASH ACCOUNT FOUND!!");
     }
   }
-    console.log(
+  // console.log(
-      Number.isInteger(bodyshop?.cdk_configuration?.sendmaterialscosting),
+  //   Number.isInteger(bodyshop?.cdk_configuration?.sendmaterialscosting),
-      typeof Number.isInteger(bodyshop?.cdk_configuration?.sendmaterialscosting)
+  //   typeof Number.isInteger(bodyshop?.cdk_configuration?.sendmaterialscosting)
-    );
+  // );
   if (!!bodyshop?.cdk_configuration?.sendmaterialscosting) {
     //Manually send the percentage of the costing.
 
@@ -236,34 +263,22 @@ exports.default = async function (socket, jobid) {
     const mapaAccountName = selectedDmsAllocationConfig.costs.MAPA;
     const mapaAccount = bodyshop.md_responsibility_centers.costs.find((c) => c.name === mapaAccountName);
     if (mapaAccount) {
-        if (!costCenterHash[mapaAccountName])
+      if (!costCenterHash[mapaAccountName]) costCenterHash[mapaAccountName] = Dinero();
-          costCenterHash[mapaAccountName] = Dinero();
       if (job.bodyshop.use_paint_scale_data === true) {
         if (job.mixdata.length > 0) {
-            costCenterHash[mapaAccountName] = costCenterHash[
+          costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
-              mapaAccountName
-            ].add(
             Dinero({
-                amount: Math.round(
+              amount: Math.round(((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100)
-                  ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) *
-                    100
-                ),
             })
           );
         } else {
-            costCenterHash[mapaAccountName] = costCenterHash[
+          costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
-              mapaAccountName
+            Dinero(job.job_totals.rates.mapa.total).percentage(bodyshop?.cdk_configuration?.sendmaterialscosting)
-            ].add(
-              Dinero(job.job_totals.rates.mapa.total).percentage(
-                bodyshop?.cdk_configuration?.sendmaterialscosting
-              )
           );
         }
       } else {
         costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
-            Dinero(job.job_totals.rates.mapa.total).percentage(
+          Dinero(job.job_totals.rates.mapa.total).percentage(bodyshop?.cdk_configuration?.sendmaterialscosting)
-              bodyshop?.cdk_configuration?.sendmaterialscosting
-            )
         );
       }
     } else {
@@ -289,9 +304,7 @@ exports.default = async function (socket, jobid) {
     //   (c) => c.name === mashAccountName
     // );
 
-      taxAllocations.state.sale = taxAllocations.state.sale.add(
+    taxAllocations.state.sale = taxAllocations.state.sale.add(Dinero({ amount: Math.round((ca_bc_pvrt || 0) * 100) }));
-        Dinero({ amount: Math.round((ca_bc_pvrt || 0) * 100) })
-      );
   }
 
   if (job.towing_payable && job.towing_payable !== 0) {
@@ -361,7 +374,7 @@ exports.default = async function (socket, jobid) {
         );
       } else {
         CdkBase.createLogEvent(
-            socket,
+          connectionData,
           "ERROR",
           `Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
         );
@@ -401,18 +414,4 @@ exports.default = async function (socket, jobid) {
         }
       })
   ];
-  } catch (error) {
-    console.log(error);
-    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
-  }
-};
-
-async function QueryJobData(socket, jobid) {
-  CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-  const result = await client
-    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
-    .request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
-  CdkBase.createLogEvent(socket, "TRACE", `Job data query result ${JSON.stringify(result, null, 2)}`);
-  return result.jobs_by_pk;
 }

server/data/kaizen.js

@@ -244,6 +244,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
       },
       InsuranceCompany: job.ins_co_nm || "",
       Claim: job.clm_no || "",
+      DMSAllocation: job.dms_allocation || "",
       Contacts: {
         CSR: job.employee_csr_rel
           ? `${
@@ -643,7 +644,8 @@ const CreateJobLines = (joblines) => {
       part_qty: jobline.part_qty,
       part_price: jobline.act_price,
       labor_type: jobline.mod_lbr_ty,
-      labor_hours: jobline.mod_lb_hrs
+      labor_hours: jobline.mod_lb_hrs,
+      labor_sale: jobline.lbr_amt
     });
   });
   return repairLines;
@@ -660,7 +662,10 @@ const CreateTimeTickets = (timetickets) => {
         .trim(),
       productive_hrs: ticket.productivehrs,
       actual_hrs: ticket.actualhrs,
-      cost_center: ticket.cost_center
+      cost_center: ticket.cost_center,
+      flat_rate: ticket.flat_rate,
+      rate: ticket.rate,
+      ticket_cost: ticket.flat_rate ? ticket.rate * ticket.productive_hrs : ticket.rate * ticket.actual_hrs
     });
   });
   return timeTickets;

server/graphql-client/queries.js

@@ -1139,6 +1139,7 @@ exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uu
     date_open
     date_repairstarted
     date_void
+    dms_allocation
     employee_body_rel {
       first_name
       last_name
@@ -1184,6 +1185,7 @@ exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uu
       }
       db_price
       id
+      lbr_amt
       lbr_op
       line_desc
       line_ind

server/routes/cdkRoutes.js

@@ -1,11 +1,13 @@
 const express = require("express");
 const router = express.Router();
 const cdkGetMake = require("../cdk/cdk-get-makes");
+const cdkCalculateAllocations = require("../cdk/cdk-calculate-allocations");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 const withUserGraphQLClientMiddleware = require("../middleware/withUserGraphQLClientMiddleware");
 
 router.use(validateFirebaseIdTokenMiddleware);
 
 router.post("/getvehicles", withUserGraphQLClientMiddleware, cdkGetMake.default);
+router.post("/calculate-allocations", withUserGraphQLClientMiddleware, cdkCalculateAllocations.defaultRoute);
 
 module.exports = router;