IO-3185 Job Drawer Suspend Job

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

client/.env.development.imex

@@ -9,6 +9,6 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/.env.development.rome

@@ -10,7 +10,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_COUNTRY=USA
 VITE_APP_INSTANCE=ROME

client/.env.test.imex

@@ -9,7 +9,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
 VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/src/components/header/header.component.jsx

@@ -1,15 +1,3 @@
-import { Badge, Layout, Menu, Spin } from "antd";
-import { useTranslation } from "react-i18next";
-import { useEffect, useRef, useState } from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { Link } from "react-router-dom";
-import { useQuery } from "@apollo/client";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
-import LockWrapper from "../lock-wrapper/lock-wrapper.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import {
   BankFilled,
   BarChartOutlined,
@@ -38,19 +26,31 @@ import {
   UnorderedListOutlined,
   UserOutlined
 } from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { Badge, Layout, Menu, Spin } from "antd";
+import { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
 import { FiLogOut } from "react-icons/fi";
 import { GiPayMoney, GiPlayerTime, GiSettingsKnobs } from "react-icons/gi";
 import { IoBusinessOutline } from "react-icons/io5";
 import { RiSurveyLine } from "react-icons/ri";
+import { connect } from "react-redux";
+import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import day from "../../utils/day.js";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapper from "../lock-wrapper/lock-wrapper.component";
+import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
 
 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -208,25 +208,14 @@ function Header({
       key: "allpayments",
       id: "header-accounting-allpayments",
       icon: <BankFilled />,
-      label: (
-        <Link to="/manage/payments">
-          <LockWrapper featureName="payments" bodyshop={bodyshop}>
-            {t("menus.header.allpayments")}
-          </LockWrapper>
-        </Link>
-      )
+      label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
     },
     {
       key: "enterpayments",
       id: "header-accounting-enterpayments",
       icon: <FaCreditCard />,
-      label: (
-        <LockWrapper featureName="payments" bodyshop={bodyshop}>
-          {t("menus.header.enterpayment")}
-        </LockWrapper>
-      ),
+      label: t("menus.header.enterpayment"),
       onClick: () =>
-        HasFeatureAccess({ featureName: "payments", bodyshop }) &&
         setPaymentContext({
           actions: {},
           context: null

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

@@ -1,17 +1,21 @@
-import { PrinterFilled } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
+import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons";
+import { useMutation, useQuery } from "@apollo/client";
 import { Button, Card, Col, Divider, Drawer, Grid, Row, Space } from "antd";
 import queryString from "query-string";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import AlertComponent from "../alert/alert.component";
 import JobSyncButton from "../job-sync-button/job-sync-button.component";
+import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import JobDetailCardsDamageComponent from "./job-detail-cards.damage.component";
@@ -21,15 +25,21 @@ import JobDetailCardsInsuranceComponent from "./job-detail-cards.insurance.compo
 import JobDetailCardsNotesComponent from "./job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "./job-detail-cards.parts.component";
 import JobDetailCardsTotalsComponent from "./job-detail-cards.totals.component";
-import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" }))
+  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 
 const span = {
@@ -38,8 +48,9 @@ const span = {
   xxl: { span: 8 }
 };
 
-export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
+export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTrail }) {
   const { scenarioNotificationsOn } = useSocket();
+  const [updateJob] = useMutation(UPDATE_JOB);
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -91,7 +102,29 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
           extra={
             <Space wrap>
               <JobSyncButton job={data.jobs_by_pk} />
-
+              <Button
+                onClick={() => {
+                  logImEXEvent("production_toggle_alert");
+                  updateJob({
+                    variables: {
+                      jobId: data.jobs_by_pk.id,
+                      job: {
+                        suspended: !data.jobs_by_pk.suspended
+                      }
+                    }
+                  });
+                  insertAuditTrail({
+                    jobid: data.jobs_by_pk.id,
+                    operation: AuditTrailMapping.jobsuspend(
+                      data.jobs_by_pk.suspended ? !data.jobs_by_pk.suspended : true
+                    ),
+                    type: "jobsuspend"
+                  });
+                }}
+                icon={data.jobs_by_pk.suspended ? <PlayCircleOutlined /> : <PauseCircleOutlined />}
+              >
+                {data.jobs_by_pk.suspended ? t("production.actions.unsuspend") : t("production.actions.suspend")}
+              </Button>
               <Button
                 onClick={() => {
                   setPrintCenterContext({
@@ -103,8 +136,8 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
                     }
                   });
                 }}
+                icon={<PrinterFilled />}
               >
-                <PrinterFilled />
                 {t("jobs.actions.printCenter")}
               </Button>
               <Link to={`/manage/jobs/${data.jobs_by_pk.id}?tab=repairdata`}>

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

@@ -28,11 +28,11 @@ import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -775,15 +775,14 @@ export function JobsDetailHeaderActions({
     key: "enterpayments",
     id: "job-actions-enterpayments",
     disabled: !job.converted,
-    label: <LockerWrapperComponent featureName="payments">{t("menus.header.enterpayment")}</LockerWrapperComponent>,
+    label: t("menus.header.enterpayment"),
     onClick: () => {
       logImEXEvent("job_header_enter_payment");
 
-      HasFeatureAccess({ featureName: "payments", bodyshop }) &&
-        setPaymentContext({
-          actions: {},
-          context: { jobid: job.id }
-        });
+      setPaymentContext({
+        actions: {},
+        context: { jobid: job.id }
+      });
     }
   });
 

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

@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
@@ -14,9 +15,8 @@ import JobsDetailRatesLabor from "./jobs-detail-rates.labor.component";
 import JobsDetailRatesMaterials from "./jobs-detail-rates.materials.component";
 import JobsDetailRatesOther from "./jobs-detail-rates.other.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
-import JobsDetailRatesTaxes from "./jobs-detail-rates.taxes.component";
 import JobsDetailRatesProfileOVerride from "./jobs-detail-rates.profile-override.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import JobsDetailRatesTaxes from "./jobs-detail-rates.taxes.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -66,14 +66,48 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           </Space>
         )}
         <Form.Item label={t("jobs.fields.auto_add_ats")} name="auto_add_ats" valuePropName="checked">
-          <Switch disabled={jobRO} />
+          <Switch
+            disabled={jobRO}
+            onChange={(checked) => {
+              if (checked) {
+                form.setFieldsValue({ flat_rate_ats: false });
+                form.setFieldsValue({ rate_ats: form.getFieldValue('rate_ats') || bodyshop.shoprates.rate_ats });
+              }
+            }}
+          />
         </Form.Item>
-
         <Form.Item noStyle shouldUpdate={(prev, cur) => prev.auto_add_ats !== cur.auto_add_ats}>
           {() => {
             if (form.getFieldValue("auto_add_ats"))
               return (
-                <Form.Item label={t("jobs.fields.rate_ats")} name="rate_ats" initialValue={bodyshop.shoprates.rate_atp}>
+                <Form.Item label={t("jobs.fields.rate_ats")} name="rate_ats">
+                  <CurrencyInput disabled={jobRO} />
+                </Form.Item>
+              );
+
+            return null;
+          }}
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.flat_rate_ats")} name="flat_rate_ats" valuePropName="checked">
+          <Switch
+            disabled={jobRO}
+            onChange={(checked) => {
+              if (checked) {
+                form.setFieldsValue({ auto_add_ats: false });
+                form.setFieldsValue({ rate_ats_flat: form.getFieldValue('rate_ats_flat') || bodyshop.shoprates.rate_ats_flat });
+
+              }
+            }}
+          />
+        </Form.Item>
+        <Form.Item noStyle shouldUpdate={(prev, cur) => prev.flat_rate_ats !== cur.flat_rate_ats}>
+          {() => {
+            if (form.getFieldValue("flat_rate_ats"))
+              return (
+                <Form.Item
+                  label={t("jobs.fields.rate_ats_flat")}
+                  name="rate_ats_flat"
+                >
                   <CurrencyInput disabled={jobRO} />
                 </Form.Item>
               );

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -1,17 +1,20 @@
-import { PrinterFilled } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
-import { Button, Descriptions, Drawer, Space } from "antd";
+import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
+import { useMutation, useQuery } from "@apollo/client";
+import { Button, Descriptions, Drawer, Space } from "antd";
 import queryString from "query-string";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
+import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
@@ -24,22 +27,29 @@ import JobDetailCardsPartsComponent from "../job-detail-cards/job-detail-cards.p
 import CardTemplate from "../job-detail-cards/job-detail-cards.template.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
+import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
-import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" }))
+  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ProductionListDetail);
 
-export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, technician }) {
+export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, technician, insertAuditTrail }) {
   const search = queryString.parse(useLocation().search);
   const history = useNavigate();
   const { selected } = search;
@@ -58,6 +68,7 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
+  const [updateJob] = useMutation(UPDATE_JOB);
 
   return (
     <Drawer
@@ -72,6 +83,29 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
           extra={
             <Space wrap>
               {!technician ? <ProductionRemoveButton jobId={theJob.id} /> : null}
+              {!technician && (
+                <Button
+                  onClick={() => {
+                    logImEXEvent("production_toggle_alert");
+                    updateJob({
+                      variables: {
+                        jobId: theJob.id,
+                        job: {
+                          suspended: !theJob.suspended
+                        }
+                      }
+                    });
+                    insertAuditTrail({
+                      jobid: theJob.id,
+                      operation: AuditTrailMapping.jobsuspend(theJob.suspended ? !theJob.suspended : true),
+                      type: "jobsuspend"
+                    });
+                  }}
+                  icon={theJob.suspended ? <PlayCircleOutlined /> : <PauseCircleOutlined />}
+                >
+                  {theJob.suspended ? t("production.actions.unsuspend") : t("production.actions.suspend")}
+                </Button>
+              )}
               <Button
                 onClick={() => {
                   setPrintCenterContext({
@@ -83,8 +117,8 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                     }
                   });
                 }}
+                icon={<PrinterFilled />}
               >
-                <PrinterFilled />
                 {t("jobs.actions.printCenter")}
               </Button>
               {!technician ? <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} /> : null}

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

@@ -1,6 +1,5 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input } from "antd";
-import React from "react";
+import { Button, Form, Input, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
@@ -10,326 +9,338 @@ export default function ShopInfoLaborRates({ form }) {
   const { t } = useTranslation();
 
   return (
-    <div>
-      <Form.List name={["md_labor_rates"]}>
-        {(fields, { add, remove, move }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key}>
-                  <LayoutFormRow>
-                    <Form.Item
-                      label={t("jobs.fields.labor_rate_desc")}
-                      key={`${index}rate_label`}
-                      name={[field.name, "rate_label"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_laa")}
-                      key={`${index}rate_laa`}
-                      name={[field.name, "rate_laa"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lab")}
-                      key={`${index}rate_lab`}
-                      name={[field.name, "rate_lab"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lad")}
-                      key={`${index}rate_lad`}
-                      name={[field.name, "rate_lad"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lae")}
-                      key={`${index}rate_lae`}
-                      name={[field.name, "rate_lae"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_laf")}
-                      key={`${index}rate_laf`}
-                      name={[field.name, "rate_laf"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lag")}
-                      key={`${index}rate_lag`}
-                      name={[field.name, "rate_lag"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lam")}
-                      key={`${index}rate_lam`}
-                      name={[field.name, "rate_lam"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lar")}
-                      key={`${index}rate_lar`}
-                      name={[field.name, "rate_lar"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_las")}
-                      key={`${index}rate_las`}
-                      name={[field.name, "rate_las"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la1")}
-                      key={`${index}rate_la1`}
-                      name={[field.name, "rate_la1"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la2")}
-                      key={`${index}rate_la2`}
-                      name={[field.name, "rate_la2"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la3")}
-                      key={`${index}rate_la3`}
-                      name={[field.name, "rate_la3"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la4")}
-                      key={`${index}rate_la4`}
-                      name={[field.name, "rate_la4"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mash")}
-                      key={`${index}rate_mash`}
-                      name={[field.name, "rate_mash"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mapa")}
-                      key={`${index}rate_mapa`}
-                      name={[field.name, "rate_mapa"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_ma2s")}
-                      key={`${index}rate_ma2s`}
-                      name={[field.name, "rate_ma2s"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_ma3s")}
-                      key={`${index}rate_ma3s`}
-                      name={[field.name, "rate_ma3s"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    {
-                      // <Form.Item
-                      //   label={t("jobs.fields.rate_mabl")}
-                      //   key={`${index}rate_mabl`}
-                      //   name={[field.name, "rate_mabl"]}
-                      //   rules={[
-                      //     {
-                      //       required: true,
-                      //       //message: t("general.validation.required"),
-                      //     },
-                      //   ]}
-                      // >
-                      //   <CurrencyInput min={0} />
-                      // </Form.Item>
-                      // <Form.Item
-                      //   label={t("jobs.fields.rate_macs")}
-                      //   key={`${index}rate_macs`}
-                      //   name={[field.name, "rate_macs"]}
-                      //   rules={[
-                      //     {
-                      //       required: true,
-                      //       //message: t("general.validation.required"),
-                      //     },
-                      //   ]}
-                      // >
-                      //   <CurrencyInput min={0} />
-                      // </Form.Item>
-                    }
-                    <Form.Item
-                      label={t("jobs.fields.rate_matd")}
-                      key={`${index}rate_matd`}
-                      name={[field.name, "rate_matd"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mahw")}
-                      key={`${index}rate_mahw`}
-                      name={[field.name, "rate_mahw"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
-                  </LayoutFormRow>
+    <>
+      <LayoutFormRow header={t("bodyshop.labels.shoprates")}>
+        <Form.Item label={t("jobs.fields.rate_ats")} name={["shoprates", "rate_ats"]}>
+          <CurrencyInput min={0} />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.rate_ats_flat")} name={["shoprates", "rate_ats_flat"]}>
+          <CurrencyInput min={0} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.laborrates")}>
+        <Form.List name={["md_labor_rates"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider={index === 0}>
+                      <Form.Item
+                        label={t("jobs.fields.labor_rate_desc")}
+                        key={`${index}rate_label`}
+                        name={[field.name, "rate_label"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_laa")}
+                        key={`${index}rate_laa`}
+                        name={[field.name, "rate_laa"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lab")}
+                        key={`${index}rate_lab`}
+                        name={[field.name, "rate_lab"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lad")}
+                        key={`${index}rate_lad`}
+                        name={[field.name, "rate_lad"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lae")}
+                        key={`${index}rate_lae`}
+                        name={[field.name, "rate_lae"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_laf")}
+                        key={`${index}rate_laf`}
+                        name={[field.name, "rate_laf"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lag")}
+                        key={`${index}rate_lag`}
+                        name={[field.name, "rate_lag"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lam")}
+                        key={`${index}rate_lam`}
+                        name={[field.name, "rate_lam"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lar")}
+                        key={`${index}rate_lar`}
+                        name={[field.name, "rate_lar"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_las")}
+                        key={`${index}rate_las`}
+                        name={[field.name, "rate_las"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la1")}
+                        key={`${index}rate_la1`}
+                        name={[field.name, "rate_la1"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la2")}
+                        key={`${index}rate_la2`}
+                        name={[field.name, "rate_la2"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la3")}
+                        key={`${index}rate_la3`}
+                        name={[field.name, "rate_la3"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la4")}
+                        key={`${index}rate_la4`}
+                        name={[field.name, "rate_la4"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_mash")}
+                        key={`${index}rate_mash`}
+                        name={[field.name, "rate_mash"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_mapa")}
+                        key={`${index}rate_mapa`}
+                        name={[field.name, "rate_mapa"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_ma2s")}
+                        key={`${index}rate_ma2s`}
+                        name={[field.name, "rate_ma2s"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_ma3s")}
+                        key={`${index}rate_ma3s`}
+                        name={[field.name, "rate_ma3s"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      {
+                        // <Form.Item
+                        //   label={t("jobs.fields.rate_mabl")}
+                        //   key={`${index}rate_mabl`}
+                        //   name={[field.name, "rate_mabl"]}
+                        //   rules={[
+                        //     {
+                        //       required: true,
+                        //       //message: t("general.validation.required"),
+                        //     },
+                        //   ]}
+                        // >
+                        //   <CurrencyInput min={0} />
+                        // </Form.Item>
+                        // <Form.Item
+                        //   label={t("jobs.fields.rate_macs")}
+                        //   key={`${index}rate_macs`}
+                        //   name={[field.name, "rate_macs"]}
+                        //   rules={[
+                        //     {
+                        //       required: true,
+                        //       //message: t("general.validation.required"),
+                        //     },
+                        //   ]}
+                        // >
+                        //   <CurrencyInput min={0} />
+                        // </Form.Item>
+                      }
+                      <Form.Item
+                        label={t("jobs.fields.rate_matd")}
+                        key={`${index}rate_matd`}
+                        name={[field.name, "rate_matd"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_mahw")}
+                        key={`${index}rate_mahw`}
+                        name={[field.name, "rate_mahw"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Space>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.newlaborrate")}
+                  </Button>
                 </Form.Item>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  onClick={() => {
-                    add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("bodyshop.actions.newlaborrate")}
-                </Button>
-              </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-    </div>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+    </>
   );
 }

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -1,11 +1,10 @@
-import { Alert, Form, Switch } from "antd";
-import React from "react";
+import { Alert, Form, Select, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -16,17 +15,17 @@ const mapDispatchToProps = () => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
 
 // noinspection JSUnusedLocalSymbols
-export function ShopInfoIntellipay({bodyshop, form}) {
-  const {t} = useTranslation();
+export function ShopInfoIntellipay({ bodyshop, form }) {
+  const { t } = useTranslation();
 
   return (
     <>
       <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
         {() => {
-          const {intellipay_config} = form.getFieldsValue();
+          const { intellipay_config } = form.getFieldsValue();
 
           if (intellipay_config?.enable_cash_discount)
-            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")}/>;
+            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")} />;
         }}
       </Form.Item>
 
@@ -36,7 +35,93 @@ export function ShopInfoIntellipay({bodyshop, form}) {
           valuePropName="checked"
           name={["intellipay_config", "enable_cash_discount"]}
         >
-          <Switch/>
+          <Switch />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.fields.intellipay_config.payment_type")}>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.visa")}
+          name={["intellipay_config", "payment_map", "visa"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.mast")}
+          name={["intellipay_config", "payment_map", "mast"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.amex")}
+          name={["intellipay_config", "payment_map", "amex"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.disc")}
+          name={["intellipay_config", "payment_map", "disc"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.dnrs")}
+          name={["intellipay_config", "payment_map", "dnrs"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.jcb")}
+          name={["intellipay_config", "payment_map", "jcb"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.intr")}
+          name={["intellipay_config", "payment_map", "intr"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
     </>

client/src/graphql/jobs.queries.js

@@ -509,6 +509,7 @@ export const GET_JOB_BY_PK = gql`
       est_ct_ln
       est_ea
       est_ph1
+      flat_rate_ats
       federal_tax_rate
       id
       inproduction
@@ -649,6 +650,7 @@ export const GET_JOB_BY_PK = gql`
       policy_no
       production_vars
       rate_ats
+      rate_ats_flat
       rate_la1
       rate_la2
       rate_la3

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -10,23 +10,17 @@ import PaymentsListPaginated from "../../components/payments-list-paginated/paym
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_PAYMENTS_PAGINATED } from "../../graphql/payments.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
-import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
-import { Card } from "antd";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
@@ -60,25 +54,15 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
-    <FeatureWrapperComponent
-      featureName="payments"
-      noauth={
-        <Card>
-          <UpsellComponent upsell={upsellEnum().payments.general} />
-        </Card>
-      }
-      z
-    >
-      <RbacWrapper action="payments:list">
-        <PaymentsListPaginated
-          refetch={refetch}
-          loading={loading}
-          searchParams={searchParams}
-          total={data ? data.payments_aggregate.aggregate.count : 0}
-          payments={data ? data.payments : []}
-        />
-      </RbacWrapper>
-    </FeatureWrapperComponent>
+    <RbacWrapper action="payments:list">
+      <PaymentsListPaginated
+        refetch={refetch}
+        loading={loading}
+        searchParams={searchParams}
+        total={data ? data.payments_aggregate.aggregate.count : 0}
+        payments={data ? data.payments : []}
+      />
+    </RbacWrapper>
   );
 }
 

hasura/metadata/tables.yaml

@@ -3695,6 +3695,7 @@
           - est_st
           - est_zip
           - federal_tax_rate
+          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -3789,6 +3790,7 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
+          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -3965,6 +3967,7 @@
           - est_st
           - est_zip
           - federal_tax_rate
+          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -4060,6 +4063,7 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
+          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -4247,6 +4251,7 @@
           - est_st
           - est_zip
           - federal_tax_rate
+          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -4342,6 +4347,7 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
+          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3

hasura/migrations/1742583400542_alter_table_public_jobs_add_column_flat_rate_ats/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"."jobs" add column "flat_rate_ats" boolean
+--  null default 'false';

hasura/migrations/1742583400542_alter_table_public_jobs_add_column_flat_rate_ats/up.sql

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

hasura/migrations/1742583433746_alter_table_public_jobs_add_column_rate_ats_flat/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"."jobs" add column "rate_ats_flat" numeric
+--  null;

hasura/migrations/1742583433746_alter_table_public_jobs_add_column_rate_ats_flat/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "rate_ats_flat" numeric
+ null;

server/graphql-client/queries.js

@@ -1485,6 +1485,8 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       materials
       auto_add_ats
       rate_ats
+      flat_rate_ats
+      rate_ats_flat
       joblines(where: { removed: { _eq: false } }){
         id
         line_no

server/intellipay/intellipay.js

@@ -371,6 +371,7 @@ exports.postback = async (req, res) => {
     iprequest: values,
     decodedComment
   };
+  const ipMapping = req.body?.bodyshop?.intellipay_config?.payment_map;
 
   logger.log("intellipay-postback-received", "DEBUG", req.user?.email, null, logResponseMeta);
 
@@ -417,7 +418,7 @@ exports.postback = async (req, res) => {
           amount: p.amount,
           transactionid: values.authcode,
           payer: "Customer",
-          type: values.cardtype,
+          type: ipMapping ? ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype : values.cardtype,
           jobid: p.jobid,
           date: moment(Date.now()),
           payment_responses: {
@@ -481,7 +482,7 @@ exports.postback = async (req, res) => {
           amount: values.total,
           transactionid: values.authcode,
           payer: "Customer",
-          type: values.cardtype,
+          type: ipMapping ? ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype : values.cardtype,
           jobid: values.invoice,
           date: moment(Date.now())
         }

server/job/job-totals-USA.js

@@ -1,7 +1,7 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-const adminClient = require("../graphql-client/graphql-client").client;
-const _ = require("lodash");
+// const adminClient = require("../graphql-client/graphql-client").client;
+// const _ = require("lodash");
 const logger = require("../utils/logger");
 const InstanceMgr = require("../utils/instanceMgr").default;
 
@@ -45,7 +45,9 @@ exports.totalsSsu = async function (req, res) {
       }
     });
 
-    res.status(200).send();
+    if (result) {
+      res.status(200).send();
+    }
   } catch (error) {
     logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
       jobid: id,
@@ -59,7 +61,7 @@ exports.totalsSsu = async function (req, res) {
 //IMPORTANT*** These two functions MUST be mirrrored.
 async function TotalsServerSide(req, res) {
   const { job, client } = req.body;
-  await AutoAddAtsIfRequired({ job: job, client: client });
+  await AtsAdjustmentsIfRequired({ job: job, client: client, user: req?.user });
 
   try {
     let ret = {
@@ -138,10 +140,11 @@ async function Totals(req, res) {
   const client = req.userGraphQLClient;
 
   logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, job.id, {
-    jobid: job.id
+    jobid: job.id,
+    id: id
   });
 
-  await AutoAddAtsIfRequired({ job, client });
+  await AtsAdjustmentsIfRequired({ job, client, user: req.user });
 
   try {
     let ret = {
@@ -153,7 +156,7 @@ async function Totals(req, res) {
 
     res.status(200).json(ret);
   } catch (error) {
-    logger.log("job-totals-USA-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, job.id, {
       jobid: job.id,
       error: error.message,
       stack: error.stack
@@ -162,40 +165,45 @@ async function Totals(req, res) {
   }
 }
 
-async function AutoAddAtsIfRequired({ job, client }) {
-  //Check if ATS should be automatically added.
-  if (job.auto_add_ats) {
-    //Get the total sum of hours that should be the ATS amount.
-    //Check to see if an ATS line exists.
+async function AtsAdjustmentsIfRequired({ job, client, user }) {
+  if (job.auto_add_ats || job.flat_rate_ats) {
+    let atsAmount = 0;
     let atsLineIndex = null;
-    const atsHours = job.joblines.reduce((acc, val, index) => {
-      if (val.line_desc && val.line_desc.toLowerCase() === "ats amount") {
-        atsLineIndex = index;
-      }
 
-      if (
-        val.mod_lbr_ty !== "LA1" &&
-        val.mod_lbr_ty !== "LA2" &&
-        val.mod_lbr_ty !== "LA3" &&
-        val.mod_lbr_ty !== "LA4" &&
-        val.mod_lbr_ty !== "LAU" &&
-        val.mod_lbr_ty !== "LAG" &&
-        val.mod_lbr_ty !== "LAS" &&
-        val.mod_lbr_ty !== "LAA"
-      ) {
-        acc = acc + val.mod_lb_hrs;
-      }
+    //Check if ATS should be automatically added.
+    if (job.auto_add_ats) {
+      const excludedLaborTypes = new Set(["LAA", "LAG", "LAS", "LAU", "LA1", "LA2", "LA3", "LA4"]);
 
-      return acc;
-    }, 0);
+      //Get the total sum of hours that should be the ATS amount.
+      //Check to see if an ATS line exists.
+      const atsHours = job.joblines.reduce((acc, val, index) => {
+        if (val.line_desc?.toLowerCase() === "ats amount") {
+          atsLineIndex = index;
+        }
 
-    const atsAmount = atsHours * (job.rate_ats || 0);
-    //If it does, update it in place, and make sure it is updated for local calculations.
+        if (!excludedLaborTypes.has(val.mod_lbr_ty)) {
+          acc = acc + val.mod_lb_hrs;
+        }
+
+        return acc;
+      }, 0);
+
+      atsAmount = atsHours * (job.rate_ats || 0);
+    }
+
+    //Check if a Flat Rate ATS should be added.
+    if (job.flat_rate_ats) {
+      atsLineIndex = ((i) => (i === -1 ? null : i))(
+        job.joblines.findIndex((line) => line.line_desc?.toLowerCase() === "ats amount")
+      );
+      atsAmount = job.rate_ats_flat || 0;
+    }
+
+    //If it does not, create one for local calculations and insert it.
     if (atsLineIndex === null) {
       const newAtsLine = {
         jobid: job.id,
         alt_partm: null,
-        line_no: 35,
         unq_seq: 0,
         line_ind: "E",
         line_desc: "ATS Amount",
@@ -220,19 +228,42 @@ async function AutoAddAtsIfRequired({ job, client }) {
         prt_dsmk_m: 0.0
       };
 
-      const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
-        lineInput: [newAtsLine]
-      });
+      try {
+        const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
+          lineInput: [newAtsLine]
+        });
 
-      job.joblines.push(newAtsLine);
+        if (result) {
+          job.joblines.push(newAtsLine);
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
-    //If it does not, create one for local calculations and insert it.
+    //If it does, update it in place, and make sure it is updated for local calculations.
     else {
-      const result = await client.request(queries.UPDATE_JOB_LINE, {
-        line: { act_price: atsAmount },
-        lineId: job.joblines[atsLineIndex].id
-      });
-      job.joblines[atsLineIndex].act_price = atsAmount;
+      try {
+        const result = await client.request(queries.UPDATE_JOB_LINE, {
+          line: { act_price: atsAmount },
+          lineId: job.joblines[atsLineIndex].id
+        });
+        if (result) {
+          job.joblines[atsLineIndex].act_price = atsAmount;
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          atsLineIndex: atsLineIndex,
+          atsAmount: atsAmount,
+          jobline: job.joblines[atsLineIndex],
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
   }
 }
@@ -314,7 +345,7 @@ async function CalculateRatesTotals({ job, client }) {
   let hasMashLine = false;
   let hasMahwLine = false;
   let hasCustomMahwLine;
-  let mapaOpCodes = ParseCalopCode(job.materials["MAPA"]?.cal_opcode);
+  // let mapaOpCodes = ParseCalopCode(job.materials["MAPA"]?.cal_opcode);
   let mashOpCodes = ParseCalopCode(job.materials["MASH"]?.cal_opcode);
 
   jobLines.forEach((item) => {
@@ -564,7 +595,7 @@ function CalculatePartsTotals(jobLines, parts_tax_rates, job) {
             }
           };
 
-        default:
+        default: {
           if (!value.part_type && value.db_ref !== "900510" && value.db_ref !== "900511") return acc;
 
           const discountAmount =
@@ -631,6 +662,7 @@ function CalculatePartsTotals(jobLines, parts_tax_rates, job) {
                 )
             }
           };
+        }
       }
     },
     {
@@ -652,7 +684,7 @@ function CalculatePartsTotals(jobLines, parts_tax_rates, job) {
   let adjustments = {};
   //Track all adjustments that need to be made.
 
-  const linesToAdjustForDiscount = [];
+  //const linesToAdjustForDiscount = [];
   Object.keys(parts_tax_rates).forEach((key) => {
     //Check if there's a discount or a mark up.
     let disc = Dinero(),
@@ -1019,7 +1051,9 @@ function CalculateTaxesTotals(job, otherTotals) {
       }
     } catch (error) {
       logger.log("job-totals-USA Key with issue", "error", null, job.id, {
-        key
+        key: key,
+        error: error.message,
+        stack: error.stack
       });
     }
   });
@@ -1157,6 +1191,7 @@ function CalculateTaxesTotals(job, otherTotals) {
 
 exports.default = Totals;
 
+//eslint-disable-next-line no-unused-vars
 function DiscountNotAlreadyCounted(jobline, joblines) {
   return false;
 }
@@ -1172,27 +1207,35 @@ function IsTrueOrYes(value) {
   return value === true || value === "Y" || value === "y";
 }
 
-async function UpdateJobLines(joblinesToUpdate) {
-  if (joblinesToUpdate.length === 0) return;
-  const updateQueries = joblinesToUpdate.map((line, index) =>
-    generateUpdateQuery(_.pick(line, ["id", "prt_dsmk_m", "prt_dsmk_p"]), index)
-  );
-  const query = `
-    mutation UPDATE_EST_LINES{
-      ${updateQueries}
-    }
-    `;
+// Function not in use from RO to IO Merger 02/05/2024
+// async function UpdateJobLines(joblinesToUpdate) {
+//   if (joblinesToUpdate.length === 0) return;
+//   const updateQueries = joblinesToUpdate.map((line, index) =>
+//     generateUpdateQuery(_.pick(line, ["id", "prt_dsmk_m", "prt_dsmk_p"]), index)
+//   );
+//   const query = `
+//     mutation UPDATE_EST_LINES{
+//       ${updateQueries}
+//     }
+//     `;
+//   try {
+//     const result = await adminClient.request(query);
+//     void result;
+//   } catch (error) {
+//     logger.log("update-job-lines", "error", null, null, {
+//       error: error.message,
+//       stack: error.stack
+//     });
+//   }
+// }
 
-  const result = await adminClient.request(query);
-}
-
-const generateUpdateQuery = (lineToUpdate, index) => {
-  return `
-  update_joblines${index}: update_joblines(where: { id: { _eq: "${
-    lineToUpdate.id
-  }" } }, _set: ${JSON.stringify(lineToUpdate).replace(/"(\w+)"\s*:/g, "$1:")}) {
-    returning {
-      id
-    }
-  }`;
-};
+// const generateUpdateQuery = (lineToUpdate, index) => {
+//   return `
+//   update_joblines${index}: update_joblines(where: { id: { _eq: "${
+//     lineToUpdate.id
+//   }" } }, _set: ${JSON.stringify(lineToUpdate).replace(/"(\w+)"\s*:/g, "$1:")}) {
+//     returning {
+//       id
+//     }
+//   }`;
+// };

server/job/job-totals.js

@@ -1,7 +1,5 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-const adminClient = require("../graphql-client/graphql-client").client;
-const _ = require("lodash");
 const logger = require("../utils/logger");
 
 //****************************************************** */
@@ -44,11 +42,16 @@ exports.totalsSsu = async function (req, res) {
       }
     });
 
+    if (!result) {
+      throw new Error("Failed to update job totals");
+    }
+
     res.status(200).send();
   } catch (error) {
     logger.log("job-totals-ssu-error", "ERROR", req.user.email, id, {
       jobid: id,
-      error
+      error: error.message,
+      stack: error.stack
     });
     res.status(503).send();
   }
@@ -57,7 +60,7 @@ exports.totalsSsu = async function (req, res) {
 //IMPORTANT*** These two functions MUST be mirrrored.
 async function TotalsServerSide(req, res) {
   const { job, client } = req.body;
-  await AutoAddAtsIfRequired({ job: job, client: client });
+  await AtsAdjustmentsIfRequired({ job: job, client: client, user: req?.user });
 
   try {
     let ret = {
@@ -71,7 +74,8 @@ async function TotalsServerSide(req, res) {
   } catch (error) {
     logger.log("job-totals-ssu-error", "ERROR", req?.user?.email, job.id, {
       jobid: job.id,
-      error
+      error: error.message,
+      stack: error.stack
     });
     res.status(400).send(JSON.stringify(error));
   }
@@ -83,13 +87,12 @@ async function Totals(req, res) {
   const logger = req.logger;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals", "DEBUG", req.user.email, job.id, {
-    jobid: job.id
+  logger.log("job-totals-ssu", "DEBUG", req.user.email, job.id, {
+    jobid: job.id,
+    id: id
   });
 
-  logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
-
-  await AutoAddAtsIfRequired({ job, client });
+  await AtsAdjustmentsIfRequired({ job, client, user: req.user });
 
   try {
     let ret = {
@@ -101,48 +104,54 @@ async function Totals(req, res) {
 
     res.status(200).json(ret);
   } catch (error) {
-    logger.log("job-totals-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-error", "ERROR", req.user.email, job.id, {
       jobid: job.id,
-      error
+      error: error.message,
+      stack: error.stack
     });
     res.status(400).send(JSON.stringify(error));
   }
 }
 
-async function AutoAddAtsIfRequired({ job, client }) {
-  //Check if ATS should be automatically added.
-  if (job.auto_add_ats) {
-    //Get the total sum of hours that should be the ATS amount.
-    //Check to see if an ATS line exists.
+async function AtsAdjustmentsIfRequired({ job, client, user }) {
+  if (job.auto_add_ats || job.flat_rate_ats) {
+    let atsAmount = 0;
     let atsLineIndex = null;
-    const atsHours = job.joblines.reduce((acc, val, index) => {
-      if (val.line_desc && val.line_desc.toLowerCase() === "ats amount") {
-        atsLineIndex = index;
-      }
 
-      if (
-        val.mod_lbr_ty !== "LA1" &&
-        val.mod_lbr_ty !== "LA2" &&
-        val.mod_lbr_ty !== "LA3" &&
-        val.mod_lbr_ty !== "LA4" &&
-        val.mod_lbr_ty !== "LAU" &&
-        val.mod_lbr_ty !== "LAG" &&
-        val.mod_lbr_ty !== "LAS" &&
-        val.mod_lbr_ty !== "LAA"
-      ) {
-        acc = acc + val.mod_lb_hrs;
-      }
+    //Check if ATS should be automatically added.
+    if (job.auto_add_ats) {
+      const excludedLaborTypes = new Set(["LAA", "LAG", "LAS", "LAU", "LA1", "LA2", "LA3", "LA4"]);
 
-      return acc;
-    }, 0);
+      //Get the total sum of hours that should be the ATS amount.
+      //Check to see if an ATS line exists.
+      const atsHours = job.joblines.reduce((acc, val, index) => {
+        if (val.line_desc?.toLowerCase() === "ats amount") {
+          atsLineIndex = index;
+        }
 
-    const atsAmount = atsHours * (job.rate_ats || 0);
-    //If it does, update it in place, and make sure it is updated for local calculations.
+        if (!excludedLaborTypes.has(val.mod_lbr_ty)) {
+          acc = acc + val.mod_lb_hrs;
+        }
+
+        return acc;
+      }, 0);
+
+      atsAmount = atsHours * (job.rate_ats || 0);
+    }
+
+    //Check if a Flat Rate ATS should be added.
+    if (job.flat_rate_ats) {
+      atsLineIndex = ((i) => (i === -1 ? null : i))(
+        job.joblines.findIndex((line) => line.line_desc?.toLowerCase() === "ats amount")
+      );
+      atsAmount = job.rate_ats_flat || 0;
+    }
+
+    //If it does not, create one for local calculations and insert it.
     if (atsLineIndex === null) {
       const newAtsLine = {
         jobid: job.id,
         alt_partm: null,
-        line_no: 35,
         unq_seq: 0,
         line_ind: "E",
         line_desc: "ATS Amount",
@@ -167,22 +176,43 @@ async function AutoAddAtsIfRequired({ job, client }) {
         prt_dsmk_m: 0.0
       };
 
-      const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
-        lineInput: [newAtsLine]
-      });
+      try {
+        const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
+          lineInput: [newAtsLine]
+        });
 
-      job.joblines.push(newAtsLine);
+        if (result) {
+          job.joblines.push(newAtsLine);
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
-    //If it does not, create one for local calculations and insert it.
+    //If it does, update it in place, and make sure it is updated for local calculations.
     else {
-      const result = await client.request(queries.UPDATE_JOB_LINE, {
-        line: { act_price: atsAmount },
-        lineId: job.joblines[atsLineIndex].id
-      });
-      job.joblines[atsLineIndex].act_price = atsAmount;
+      try {
+        const result = await client.request(queries.UPDATE_JOB_LINE, {
+          line: { act_price: atsAmount },
+          lineId: job.joblines[atsLineIndex].id
+        });
+        if (result) {
+          job.joblines[atsLineIndex].act_price = atsAmount;
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          atsLineIndex: atsLineIndex,
+          atsAmount: atsAmount,
+          jobline: job.joblines[atsLineIndex],
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
-
-    //console.log(job.jobLines);
   }
 }
 

server/opensearch/os-handler.js

@@ -248,7 +248,8 @@ async function OpenSearchSearchHandler(req, res) {
                           "*ownr_fn^8",
                           "*ownr_co_nm^8",
                           "*ownr_ph1^8",
-                          "*ownr_ph2^8"
+                          "*ownr_ph2^8",
+                          "*comment^6"
                           //  "*"
                         ]
                       }