Add audit log to job close with bypass.

.prettierrc.js

@@ -9,10 +9,10 @@ const config = {
   arrowParens: "always",
   jsxSingleQuote: false,
   bracketSameLine: false,
-  endOfLine: "lf",
+  endOfLine: "lf"
-  importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
+  // importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
-  importOrderSeparation: true,
+  // importOrderSeparation: true,
-  importOrderSortSpecifiers: true
+  // importOrderSortSpecifiers: true
 };
 
 module.exports = config;

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -1789,6 +1789,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>jobclosedwithbypass</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>jobconverted</name>
                                         <definition_loaded>false</definition_loaded>
@@ -34201,6 +34222,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>profitbypassrequired</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>profits</name>
                                         <definition_loaded>false</definition_loaded>
@@ -34587,27 +34629,6 @@
                                     <folder_node>
                                         <name>ro_guard</name>
                                         <children>
-                                            <concept_node>
-                                                <name>eforce_profit</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
                                             <concept_node>
                                                 <name>enforce_ar</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -34713,6 +34734,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>enforce_profit</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>enforce_sublet</name>
                                                 <definition_loaded>false</definition_loaded>

client/src/components/job-bills-total/job-bills-total.component.jsx

@@ -1,11 +1,11 @@
-import { Alert,  Card, Col, Row, Space, Statistic, Tooltip, Typography  } from 'antd';
+import { Alert, Card, Col, Row, Space, Statistic, Tooltip, Typography } from "antd";
-import Dinero from 'dinero.js';
+import Dinero from "dinero.js";
-import React from 'react';
+import React from "react";
-import {  useTranslation  } from 'react-i18next';
+import { useTranslation } from "react-i18next";
-import InstanceRenderManager from '../../utils/instanceRenderMgr';
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import AlertComponent from '../alert/alert.component';
+import AlertComponent from "../alert/alert.component";
-import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import './job-bills-total.styles.scss';
+import "./job-bills-total.styles.scss";
 
 export default function JobBillsTotalComponent({
   loading,
@@ -13,16 +13,16 @@ export default function JobBillsTotalComponent({
   partsOrders,
   jobTotals,
   showWarning,
-  warningCallback,
+  warningCallback
 }) {
   const { t } = useTranslation();
 
   if (loading) return <LoadingSkeleton />;
   if (!!!jobTotals) {
-    if (showWarning && warningCallback && typeof warningCallback === 'function') {
+    if (showWarning && warningCallback && typeof warningCallback === "function") {
-      warningCallback({ key: 'bills', warning: t('jobs.errors.nofinancial') });
+      warningCallback({ key: "bills", warning: t("jobs.errors.nofinancial") });
     }
-    return <AlertComponent type="error" message={t('jobs.errors.nofinancial')} />;
+    return <AlertComponent type="error" message={t("jobs.errors.nofinancial")} />;
   }
 
   const totals = jobTotals;
@@ -109,64 +109,60 @@ export default function JobBillsTotalComponent({
   const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
   const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
 
-  if (showWarning && warningCallback && typeof warningCallback === 'function') {
+  if (showWarning && warningCallback && typeof warningCallback === "function") {
-    if (
+    if (discrepWithCms.getAmount() !== 0) {
-      discrepWithCms.getAmount() !== 0 ||
-      discrepWithLbrAdj.getAmount() !== 0 ||
-      discrepancy.getAmount() !== 0
-    ) {
       warningCallback({
-        key: 'bills',
+        key: "bills",
-        warning: t('jobs.labels.outstanding_reconciliation_discrep'),
+        warning: t("jobs.labels.outstanding_reconciliation_discrep")
       });
     }
     if (calculatedCreditsNotReceived.getAmount() > 0) {
-      warningCallback({ key: 'cm', warning: t('jobs.labels.outstanding_credit_memos') });
+      warningCallback({ key: "cm", warning: t("jobs.labels.outstanding_credit_memos") });
     }
   }
 
   return (
     <Row gutter={[16, 16]}>
       <Col md={24} lg={18}>
-        <Card title={t('jobs.labels.jobtotals')} style={{ height: '100%' }}>
+        <Card title={t("jobs.labels.jobtotals")} style={{ height: "100%" }}>
           <Space wrap size="large">
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.partstotal'),
+                    __html: t("jobs.labels.plitooltips.partstotal")
                   }}
                 />
               }
             >
-              <Statistic title={t('jobs.labels.rosaletotal')} value={totalPartsSublet.toFormat()} />
+              <Statistic title={t("jobs.labels.rosaletotal")} value={totalPartsSublet.toFormat()} />
             </Tooltip>
             <Typography.Title>-</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.billtotal'),
+                    __html: t("jobs.labels.plitooltips.billtotal")
                   }}
                 />
               }
             >
-              <Statistic title={t('bills.labels.retailtotal')} value={billTotals.toFormat()} />
+              <Statistic title={t("bills.labels.retailtotal")} value={billTotals.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.discrep1'),
+                    __html: t("jobs.labels.plitooltips.discrep1")
                   }}
                 />
               }
             >
               <Statistic
-                title={t('bills.labels.discrepancy')}
+                title={t("bills.labels.discrepancy")}
                 valueStyle={{
-                  color: discrepancy.getAmount() === 0 ? 'green' : 'red',
+                  color: discrepancy.getAmount() === 0 ? "green" : "red"
                 }}
                 value={discrepancy.toFormat()}
               />
@@ -176,27 +172,27 @@ export default function JobBillsTotalComponent({
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.laboradj'),
+                    __html: t("jobs.labels.plitooltips.laboradj")
                   }}
                 />
               }
             >
-              <Statistic title={t('bills.labels.dedfromlbr')} value={lbrAdjustments.toFormat()} />
+              <Statistic title={t("bills.labels.dedfromlbr")} value={lbrAdjustments.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.discrep2'),
+                    __html: t("jobs.labels.plitooltips.discrep2")
                   }}
                 />
               }
             >
               <Statistic
-                title={t('bills.labels.discrepancy')}
+                title={t("bills.labels.discrepancy")}
                 valueStyle={{
-                  color: discrepWithLbrAdj.getAmount() === 0 ? 'green' : 'red',
+                  color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red"
                 }}
                 value={discrepWithLbrAdj.toFormat()}
               />
@@ -206,27 +202,27 @@ export default function JobBillsTotalComponent({
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.creditmemos'),
+                    __html: t("jobs.labels.plitooltips.creditmemos")
                   }}
                 />
               }
             >
-              <Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} />
+              <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.discrep3'),
+                    __html: t("jobs.labels.plitooltips.discrep3")
                   }}
                 />
               }
             >
               <Statistic
-                title={t('bills.labels.discrepancy')}
+                title={t("bills.labels.discrepancy")}
                 valueStyle={{
-                  color: discrepWithCms.getAmount() === 0 ? 'green' : 'red',
+                  color: discrepWithCms.getAmount() === 0 ? "green" : "red"
                 }}
                 value={discrepWithCms.toFormat()}
               />
@@ -238,40 +234,40 @@ export default function JobBillsTotalComponent({
               discrepWithLbrAdj.getAmount() !== 0 ||
               discrepancy.getAmount() !== 0) && (
               <Alert
-                style={{ margin: '8px 0px' }}
+                style={{ margin: "8px 0px" }}
                 type="warning"
-                message={t('jobs.labels.outstanding_reconciliation_discrep')}
+                message={t("jobs.labels.outstanding_reconciliation_discrep")}
               />
             )}
         </Card>
       </Col>
       <Col md={24} lg={6}>
-        <Card title={t('jobs.labels.returntotals')} style={{ height: '100%' }}>
+        <Card title={t("jobs.labels.returntotals")} style={{ height: "100%" }}>
           <Space wrap>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.totalreturns'),
+                    __html: t("jobs.labels.plitooltips.totalreturns")
                   }}
                 />
               }
             >
-              <Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} />
+              <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
             </Tooltip>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.calculatedcreditsnotreceived'),
+                    __html: t("jobs.labels.plitooltips.calculatedcreditsnotreceived")
                   }}
                 />
               }
             >
               <Statistic
-                title={t('bills.labels.calculatedcreditsnotreceived')}
+                title={t("bills.labels.calculatedcreditsnotreceived")}
                 valueStyle={{
-                  color: calculatedCreditsNotReceived.getAmount() <= 0 ? 'green' : 'red',
+                  color: calculatedCreditsNotReceived.getAmount() <= 0 ? "green" : "red"
                 }}
                 value={
                   calculatedCreditsNotReceived.getAmount() >= 0
@@ -284,15 +280,15 @@ export default function JobBillsTotalComponent({
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t('jobs.labels.plitooltips.creditsnotreceived'),
+                    __html: t("jobs.labels.plitooltips.creditsnotreceived")
                   }}
                 />
               }
             >
               <Statistic
-                title={t('bills.labels.creditsnotreceived')}
+                title={t("bills.labels.creditsnotreceived")}
                 valueStyle={{
-                  color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? 'green' : 'red',
+                  color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? "green" : "red"
                 }}
                 value={
                   totalReturnsMarkedNotReceived.getAmount() >= 0
@@ -303,11 +299,7 @@ export default function JobBillsTotalComponent({
             </Tooltip>
           </Space>
           {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
-            <Alert
+            <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_credit_memos")} />
-              style={{ margin: '8px 0px' }}
-              type="warning"
-              message={t('jobs.labels.outstanding_credit_memos')}
-            />
           )}
         </Card>
       </Col>

client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx

@@ -1,20 +1,20 @@
-import React from 'react';
+import React from "react";
 
-import { useQuery } from '@apollo/client';
+import { useQuery } from "@apollo/client";
-import { useSplitTreatments } from '@splitsoftware/splitio-react';
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { connect } from 'react-redux';
+import { connect } from "react-redux";
-import { createStructuredSelector } from 'reselect';
+import { createStructuredSelector } from "reselect";
-import { GET_LINE_TICKET_BY_PK } from '../../graphql/jobs-lines.queries';
+import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from '../../redux/user/user.selectors';
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import AlertComponent from '../alert/alert.component';
+import AlertComponent from "../alert/alert.component";
-import LaborAllocationsTableComponent from '../labor-allocations-table/labor-allocations-table.component';
+import LaborAllocationsTableComponent from "../labor-allocations-table/labor-allocations-table.component";
-import PayrollLaborAllocationsTable from '../labor-allocations-table/labor-allocations-table.payroll.component';
+import PayrollLaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.payroll.component";
-import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -24,21 +24,21 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardLabor
 export function JobCloseRoGuardLabor({ job, jobRO, bodyshop, form, warningCallback }) {
   const { loading, error, data, refetch } = useQuery(GET_LINE_TICKET_BY_PK, {
     variables: { id: job.id },
-    fetchPolicy: 'network-only',
+    fetchPolicy: "network-only",
-    nextFetchPolicy: 'network-only',
+    nextFetchPolicy: "network-only"
   });
   const {
-    treatments: { Enhanced_Payroll },
+    treatments: { Enhanced_Payroll }
   } = useSplitTreatments({
     attributes: {},
-    names: ['Enhanced_Payroll'],
+    names: ["Enhanced_Payroll"],
-    splitKey: bodyshop.imexshopid,
+    splitKey: bodyshop.imexshopid
   });
 
   if (loading) return <LoadingSkeleton />;
   if (error) return <AlertComponent message={error.message} type="error" />;
 
-  return Enhanced_Payroll.treatment === 'on' ? (
+  return Enhanced_Payroll.treatment === "on" ? (
     <PayrollLaborAllocationsTable
       jobId={job.id}
       timetickets={data ? data.timetickets : []}

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

@@ -1,19 +1,19 @@
-import React, { useEffect } from 'react';
+import React, { useEffect } from "react";
 
-import { Alert, Card } from 'antd';
+import { Alert, Card } from "antd";
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from "react-i18next";
-import { connect } from 'react-redux';
+import { connect } from "react-redux";
-import { createStructuredSelector } from 'reselect';
+import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from '../../redux/user/user.selectors';
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useMemo } from 'react';
+import { useMemo } from "react";
-import Dinero from 'dinero.js';
+import Dinero from "dinero.js";
-import DataLabel from '../data-label/data-label.component';
+import DataLabel from "../data-label/data-label.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -41,25 +41,21 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
 
   useEffect(() => {
     if (balance.getAmount() !== 0) {
-      warningCallback({ key: 'ar', warning: t('jobs.labels.outstanding_ar') });
+      warningCallback({ key: "ar", warning: t("jobs.labels.outstanding_ar") });
     }
   }, [balance, t, warningCallback]);
 
   return (
-    <Card title={t('jobs.labels.accountsreceivable')} style={{ height: '100%' }}>
+    <Card title={t("jobs.labels.accountsreceivable")} style={{ height: "100%" }}>
-      <DataLabel label={t('payments.labels.totalpayments')}>{total.toFormat()}</DataLabel>
+      <DataLabel label={t("payments.labels.totalpayments")}>{total.toFormat()}</DataLabel>
       <DataLabel
-        valueStyle={{ color: balance.getAmount() !== 0 ? 'red' : 'green' }}
+        valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
-        label={t('payments.labels.balance')}
+        label={t("payments.labels.balance")}
       >
         {balance.toFormat()}
       </DataLabel>
       {balance.getAmount() !== 0 && (
-        <Alert
+        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_ar")} />
-          style={{ margin: '8px 0px' }}
-          type="warning"
-          message={t('jobs.labels.outstanding_ar')}
-        />
       )}
     </Card>
   );

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

@@ -1,17 +1,17 @@
-import React from 'react';
+import React from "react";
 
-import { useQuery } from '@apollo/client';
+import { useQuery } from "@apollo/client";
-import { connect } from 'react-redux';
+import { connect } from "react-redux";
-import { createStructuredSelector } from 'reselect';
+import { createStructuredSelector } from "reselect";
-import { QUERY_BILLS_BY_JOBID } from '../../graphql/bills.queries';
+import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from '../../redux/user/user.selectors';
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import AlertComponent from '../alert/alert.component';
+import AlertComponent from "../alert/alert.component";
-import JobBillsTotalComponent from '../job-bills-total/job-bills-total.component';
+import JobBillsTotalComponent from "../job-bills-total/job-bills-total.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -21,8 +21,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardBills
 export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) {
   const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, {
     variables: { jobid: job.id },
-    fetchPolicy: 'network-only',
+    fetchPolicy: "network-only",
-    nextFetchPolicy: 'network-only',
+    nextFetchPolicy: "network-only"
   });
 
   if (error) return <AlertComponent message={error.message} type="error" />;

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

@@ -76,20 +76,21 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
             <Col className="ro-guard-col-multiple" md={24} lg={6}>
               <Row gutter={[32, 32]} style={{ height: "100%" }}>
                 <Col span={24}>
-                  <JobCloseRoGuardProfit
+                  <JobCloseRoGuardProfit job={job} form={form} warningCallback={warningCallback} />
-                    job={job}
-                    form={form} //warningCallback={warningCallback}
-                  />
                 </Col>
                 <Col span={24}>
                   <JobCloseRoGuardAr job={job} form={form} warningCallback={warningCallback} />
                 </Col>
               </Row>
             </Col>
-            <Col className="ro-guard-col-50" md={24} lg={8}>
+            {InstanceRenderManager({
-              <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} />
+              rome: (
-              {InstanceRenderManager({ rome: <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} /> })}
+                <Col md={24} lg={8}>
-            </Col>
+                  {/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */}
+                  <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
+                </Col>
+              )
+            })}
             <Col className="ro-guard-col" md={24} lg={10}>
               <JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} />
             </Col>

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

@@ -1,20 +1,19 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState } from "react";
 
-import { LockOutlined } from '@ant-design/icons';
+import { Alert, Card } from "antd";
-import { Card, Form, Input } from 'antd';
+import axios from "axios";
-import axios from 'axios';
+import { useTranslation } from "react-i18next";
-import { useTranslation } from 'react-i18next';
+import { connect } from "react-redux";
-import { connect } from 'react-redux';
+import { createStructuredSelector } from "reselect";
-import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import { selectBodyshop } from '../../redux/user/user.selectors';
+import JobCostingStatistics from "../job-costing-statistics/job-costing-statistics.component";
-import JobCostingStatistics from '../job-costing-statistics/job-costing-statistics.component';
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -31,7 +30,7 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
       try {
         if (job.id) {
           setLoading(true);
-          const { data } = await axios.post('/job/costing', { jobid: job.id });
+          const { data } = await axios.post("/job/costing", { jobid: job.id });
           setCostingData(data);
         }
       } catch (error) {}
@@ -45,16 +44,19 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
     parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum;
 
   useEffect(() => {
-    if (enforceProfitPassword && typeof warningCallback === 'function') {
+    if (enforceProfitPassword && typeof warningCallback === "function") {
-      warningCallback({ key: 'profit', warning: t('jobs.labels.profitbypassrequired') });
+      warningCallback({ key: "profit", warning: t("jobs.labels.profitbypassrequired") });
     }
   }, [enforceProfitPassword, t, warningCallback]);
 
   if (loading || !costingData) return <LoadingSkeleton />;
 
   return (
-    <Card title={t('jobs.labels.profits')} style={{ height: '100%' }}>
+    <Card title={t("jobs.labels.profits")} style={{ height: "100%" }}>
       <JobCostingStatistics summaryData={costingData?.summaryData} onlyGP />
+      {enforceProfitPassword && (
+        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.profitbypassrequired")} />
+      )}
     </Card>
   );
 }

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

@@ -1,17 +1,17 @@
-import React, { useEffect } from 'react';
+import React, { useEffect } from "react";
 
-import { Alert, Card, Table } from 'antd';
+import { Alert, Card, Table } from "antd";
-import { t } from 'i18next';
+import { t } from "i18next";
-import { connect } from 'react-redux';
+import { connect } from "react-redux";
-import { createStructuredSelector } from 'reselect';
+import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from '../../redux/user/user.selectors';
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import CurrencyFormatter from '../../utils/CurrencyFormatter';
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from '../../utils/sorters';
+import { alphaSort } from "../../utils/sorters";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -20,69 +20,56 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardSublet
 
 export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallback }) {
   const subletsNotDone = job?.joblines.filter(
-    (j) =>
+    (j) => (j.part_type === "PAS" || j.part_type === "PASL") && (!j.sublet_completed || !j.sublet_ignored)
-      (j.part_type === 'PAS' || j.part_type === 'PASL') &&
-      (!j.sublet_completed || !j.sublet_ignored)
   );
 
   const columns = [
     {
-      title: t('joblines.fields.line_desc'),
+      title: t("joblines.fields.line_desc"),
-      dataIndex: 'line_desc',
+      dataIndex: "line_desc",
-      fixed: 'left',
+      fixed: "left",
-      key: 'line_desc',
+      key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       onCell: (record) => ({
-        className: record.manual_line && 'job-line-manual',
+        className: record.manual_line && "job-line-manual",
         style: {
-          ...(record.critical ? { boxShadow: ' -.5em 0 0 #FFC107' } : {}),
+          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {})
-        },
+        }
       }),
-      ellipsis: true,
+      ellipsis: true
     },
     {
-      title: t('joblines.fields.act_price'),
+      title: t("joblines.fields.act_price"),
-      dataIndex: 'act_price',
+      dataIndex: "act_price",
-      key: 'act_price',
+      key: "act_price",
       sorter: (a, b) => a.act_price - b.act_price,
 
       ellipsis: true,
-      render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>,
+      render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
     },
     {
-      title: t('joblines.fields.part_qty'),
+      title: t("joblines.fields.part_qty"),
-      dataIndex: 'part_qty',
+      dataIndex: "part_qty",
-      key: 'part_qty',
+      key: "part_qty"
     },
     {
-      title: t('joblines.fields.notes'),
+      title: t("joblines.fields.notes"),
-      dataIndex: 'notes',
+      dataIndex: "notes",
-      key: 'notes',
+      key: "notes"
-    },
+    }
   ];
 
   useEffect(() => {
     if (subletsNotDone.length > 0) {
-      warningCallback({ key: 'sublet', warning: t('jobs.labels.outstanding_sublets') });
+      warningCallback({ key: "sublet", warning: t("jobs.labels.outstanding_sublets") });
     }
   }, [subletsNotDone.length, warningCallback]);
 
   return (
-    <Card title={t('jobs.labels.subletsnotcompleted')}>
+    <Card title={t("jobs.labels.subletsnotcompleted")}>
-      <Table
+      <Table dataSource={subletsNotDone} columns={columns} pagination={false} rowKey="id" bordered size="small" />
-        dataSource={subletsNotDone}
-        columns={columns}
-        pagination={false}
-        rowKey="id"
-        bordered
-        size="small"
-      />
       {subletsNotDone.length > 0 && (
-        <Alert
+        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_sublets")} />
-          style={{ margin: '8px 0px' }}
-          type="warning"
-          message={t('jobs.labels.outstanding_sublets')}
-        />
       )}
     </Card>
   );

client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx

@@ -1,14 +1,14 @@
-import React from 'react';
+import React from "react";
 
-import { connect } from 'react-redux';
+import { connect } from "react-redux";
-import { createStructuredSelector } from 'reselect';
+import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from '../../redux/user/user.selectors';
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import JobLifecycleComponent from '../job-lifecycle/job-lifecycle.component';
+import JobLifecycleComponent from "../job-lifecycle/job-lifecycle.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -41,7 +41,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import JobCloseRoGuardContainer from '../../components/job-close-ro-guard/job-close-ro-guard.container';
+import JobCloseRoGuardContainer from "../../components/job-close-ro-guard/job-close-ro-guard.container";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -120,6 +120,13 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
         operation: AuditTrailMapping.jobinvoiced(),
         type: "jobinvoiced"
       });
+      if (values.masterbypass) {
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.jobclosedwithbypass(),
+          type: "jobclosedwithbypass"
+        });
+      }
       // history(`/manage/jobs/${job.id}`);
     } else {
       setLoading(false);
@@ -184,7 +191,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
             </Space>
           }
         />
-     <JobCloseRoGuardContainer form={form} job={job} />
+        <JobCloseRoGuardContainer form={form} job={job} />
         <Space wrap direction="vertical" style={{ width: "100%" }}>
           <FormsFieldChanged form={form} />
           {!job.actual_in && job.scheduled_in && <Alert type="warning" message={t("jobs.labels.actual_in_inferred")} />}

client/src/translations/en_us/common.json

@@ -116,6 +116,7 @@
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
+				"jobclosedwithbypass": "Job was invoiced using the master bypass password. ",
 				"jobconverted": "Job converted and assigned number {{ro_number}}.",
 				"jobdelivery": "Job intake completed. Status set to {{status}}. Actual completion is {{actual_completion}}.",
 				"jobexported": "",
@@ -1974,7 +1975,7 @@
 				"outstanding_ar": "A balance is outstanding on this RO. Payments can still be entered when the job is closed. ",
 				"outstanding_credit_memos": "Outstanding credit memos have not been entered against this job. Credit Memos may still be posted once the job is closed.",
 				"outstanding_ppd": "There are outstanding PPDs that may not have been synced back to the estimate.",
-				"outstanding_reconciliation_discrep": "At least one discrepancy is not 0. This may indicate that this job is not properly reconciled and should not be closed.",
+				"outstanding_reconciliation_discrep": "At least one discrepancy is not $0. This may indicate that this job is not properly reconciled and should not be closed.",
 				"outstanding_sublets": "There are sublet lines on the job which have not been marked as completed. ",
 				"outstandinghours": "There are outstanding hours on the job that have not been paid or have been overpaid.",
 				"override_header": "Override estimate header on import?",
@@ -2003,6 +2004,7 @@
 				"ppc": "This line contains a part price change.",
 				"ppdnotexported": "PPDs not Exported",
 				"profileadjustments": "Profile Disc./Mkup",
+				"profitbypassrequired": "Minimum gross profit requirements have not been met.",
 				"profits": "Job Profits",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
@@ -2024,12 +2026,12 @@
 				"remove_from_ar": "Remove from AR",
 				"returntotals": "Return Totals",
 				"ro_guard": {
-					"eforce_profit": "Profit margins enforced.",
 					"enforce_ar": "AR collection enforced.",
 					"enforce_bills": "Bill discrepancy enforced.",
 					"enforce_cm": "Credit memo entry enforced.",
 					"enforce_labor": "Labor allocations enforced.",
 					"enforce_ppd": "PPD sync enforced.",
+					"enforce_profit": "Profit margins enforced.",
 					"enforce_sublet": "Sublet completion enforced.",
 					"enforce_validation": "Master Bypass Required: {{message}}",
 					"enforced": "This check has been enforced by your shop manager. Enter the master bypass password to close the Job."

client/src/translations/es/common.json

@@ -116,6 +116,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobclosedwithbypass": "",
 				"jobconverted": "",
 				"jobdelivery": "",
 				"jobexported": "",
@@ -2003,6 +2004,7 @@
 				"ppc": "",
 				"ppdnotexported": "",
 				"profileadjustments": "",
+				"profitbypassrequired": "",
 				"profits": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
@@ -2024,12 +2026,12 @@
 				"remove_from_ar": "",
 				"returntotals": "",
 				"ro_guard": {
-					"eforce_profit": "",
 					"enforce_ar": "",
 					"enforce_bills": "",
 					"enforce_cm": "",
 					"enforce_labor": "",
 					"enforce_ppd": "",
+					"enforce_profit": "",
 					"enforce_sublet": "",
 					"enforce_validation": "",
 					"enforced": ""

client/src/translations/fr/common.json

@@ -116,6 +116,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobclosedwithbypass": "",
 				"jobconverted": "",
 				"jobdelivery": "",
 				"jobexported": "",
@@ -2003,6 +2004,7 @@
 				"ppc": "",
 				"ppdnotexported": "",
 				"profileadjustments": "",
+				"profitbypassrequired": "",
 				"profits": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
@@ -2024,12 +2026,12 @@
 				"remove_from_ar": "",
 				"returntotals": "",
 				"ro_guard": {
-					"eforce_profit": "",
 					"enforce_ar": "",
 					"enforce_bills": "",
 					"enforce_cm": "",
 					"enforce_labor": "",
 					"enforce_ppd": "",
+					"enforce_profit": "",
 					"enforce_sublet": "",
 					"enforce_validation": "",
 					"enforced": ""

client/src/utils/AuditTrailMappings.js

@@ -24,6 +24,7 @@ const AuditTrailMapping = {
   jobimported: () => i18n.t("audit_trail.messages.jobimported"),
   jobinproductionchange: (inproduction) => i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
   jobinvoiced: () => i18n.t("audit_trail.messages.jobinvoiced"),
+  jobclosedwithbypass: () => i18n.t("audit_trail.messages.jobclosedwithbypass"),
   jobmodifylbradj: ({ mod_lbr_ty, hours }) => i18n.t("audit_trail.messages.jobmodifylbradj", { mod_lbr_ty, hours }),
   jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"),
   jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),

package-lock.json

@@ -56,6 +56,7 @@
       "devDependencies": {
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "concurrently": "^8.2.2",
+        "prettier": "^3.2.5",
         "source-map-explorer": "^2.5.2"
       },
       "engines": {
@@ -5900,6 +5901,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",

package.json

@@ -66,6 +66,7 @@
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "concurrently": "^8.2.2",
+    "prettier": "^3.2.5",
     "source-map-explorer": "^2.5.2"
   }
 }