Resolve ES Lint error.

Add contextRefect to payment export buttons.
Resolve payment refetch.
2024-04-08 11:05:12 -07:00 · 2024-04-08 09:48:39 -07:00 · 2024-04-05 12:52:26 -07:00 · 2024-04-04 20:42:17 -07:00 · 2024-04-04 20:01:47 -07:00 · 2024-04-04 12:56:09 -07:00
32 changed files with 323 additions and 337 deletions
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -9,10 +9,10 @@ const config = {
  arrowParens: "always",
  jsxSingleQuote: false,
  bracketSameLine: false,
-  endOfLine: "lf"
-  // importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
-  // importOrderSeparation: true,
-  // importOrderSortSpecifiers: true
+  endOfLine: "lf",
+  importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
+  importOrderSeparation: true,
+  importOrderSortSpecifiers: true
 };

 module.exports = config;
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
    <!--

    BabelEdit project file
@@ -1789,27 +1789,6 @@
                                            </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>
@@ -34222,27 +34201,6 @@
                                            </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>
@@ -34629,6 +34587,27 @@
                                    <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>
@@ -34734,27 +34713,6 @@
                                                    </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>
--- a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
+++ b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
@@ -1,9 +1,8 @@
-import React, { useState } from "react";
-import { Button, Form, InputNumber, Popover } from "antd";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { useTranslation } from "react-i18next";
 import { CalculatorFilled } from "@ant-design/icons";
-
+import { Button, Form, InputNumber, Popover, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function CABCpvrtCalculator({ disabled, form }) {
  const [visibility, setVisibility] = useState(false);

@@ -27,10 +26,14 @@ export default function CABCpvrtCalculator({ disabled, form }) {
        <Form.Item name="days" label={t("jobs.labels.ca_bc_pvrt.days")}>
          <InputNumber precision={0} min={0} />
        </Form.Item>
-        <Button type="primary" htmlType="submit">
-          {t("general.actions.calculate")}
-        </Button>
-        <Button onClick={() => setVisibility(false)}>Close</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" htmlType="submit">
+              {t("general.actions.calculate")}
+            </Button>
+            <Button onClick={() => setVisibility(false)}>Close</Button>
+          </Space>
+        </div>
      </Form>
    </div>
  );
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -11,11 +11,15 @@ import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel
 import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

-export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
+export default function CourtesyCarCreateFormComponent({
+  form,
+  saveLoading,
+  newCC,
+}) {
  const { t } = useTranslation();
  const client = useApolloClient();

@@ -30,7 +34,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
        }
      />

-      {/* <FormFieldsChanged form={form} /> */}
+      {newCC ? null : <FormFieldsChanged form={form} />}
      <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
        <Form.Item
          label={t("courtesycars.fields.year")}
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/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 Dinero from "dinero.js";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import AlertComponent from "../alert/alert.component";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import "./job-bills-total.styles.scss";
+import { Alert,  Card, Col, Row, Space, Statistic, Tooltip, Typography  } from 'antd';
+import Dinero from 'dinero.js';
+import React from 'react';
+import {  useTranslation  } from 'react-i18next';
+import InstanceRenderManager from '../../utils/instanceRenderMgr';
+import AlertComponent from '../alert/alert.component';
+import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
+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") {
-      warningCallback({ key: "bills", warning: t("jobs.errors.nofinancial") });
+    if (showWarning && warningCallback && typeof warningCallback === 'function') {
+      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,60 +109,64 @@ 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 (discrepWithCms.getAmount() !== 0) {
+  if (showWarning && warningCallback && typeof warningCallback === 'function') {
+    if (
+      discrepWithCms.getAmount() !== 0 ||
+      discrepWithLbrAdj.getAmount() !== 0 ||
+      discrepancy.getAmount() !== 0
+    ) {
      warningCallback({
-        key: "bills",
-        warning: t("jobs.labels.outstanding_reconciliation_discrep")
+        key: 'bills',
+        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()}
              />
@@ -172,27 +176,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()}
              />
@@ -202,27 +206,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()}
              />
@@ -234,40 +238,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
@@ -280,15 +284,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
@@ -299,7 +303,11 @@ export default function JobBillsTotalComponent({
            </Tooltip>
          </Space>
          {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
-            <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_credit_memos")} />
+            <Alert
+              style={{ margin: '8px 0px' }}
+              type="warning"
+              message={t('jobs.labels.outstanding_credit_memos')}
+            />
          )}
        </Card>
      </Col>
--- a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
+++ b/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 { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import AlertComponent from "../alert/alert.component";
-import LaborAllocationsTableComponent from "../labor-allocations-table/labor-allocations-table.component";
-import PayrollLaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.payroll.component";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import { useQuery } from '@apollo/client';
+import { useSplitTreatments } from '@splitsoftware/splitio-react';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { GET_LINE_TICKET_BY_PK } from '../../graphql/jobs-lines.queries';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import AlertComponent from '../alert/alert.component';
+import LaborAllocationsTableComponent from '../labor-allocations-table/labor-allocations-table.component';
+import PayrollLaborAllocationsTable from '../labor-allocations-table/labor-allocations-table.payroll.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",
-    nextFetchPolicy: "network-only"
+    fetchPolicy: 'network-only',
+    nextFetchPolicy: 'network-only',
  });
  const {
-    treatments: { Enhanced_Payroll }
+    treatments: { Enhanced_Payroll },
  } = useSplitTreatments({
    attributes: {},
-    names: ["Enhanced_Payroll"],
-    splitKey: bodyshop.imexshopid
+    names: ['Enhanced_Payroll'],
+    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 : []}
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx
+++ b/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 { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useMemo } from "react";
-import Dinero from "dinero.js";
-import DataLabel from "../data-label/data-label.component";
+import { Alert, Card } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import { useMemo } from 'react';
+import Dinero from 'dinero.js';
+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,21 +41,25 @@ 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%" }}>
-      <DataLabel label={t("payments.labels.totalpayments")}>{total.toFormat()}</DataLabel>
+    <Card title={t('jobs.labels.accountsreceivable')} style={{ height: '100%' }}>
+      <DataLabel label={t('payments.labels.totalpayments')}>{total.toFormat()}</DataLabel>
      <DataLabel
-        valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
-        label={t("payments.labels.balance")}
+        valueStyle={{ color: balance.getAmount() !== 0 ? 'red' : 'green' }}
+        label={t('payments.labels.balance')}
      >
        {balance.toFormat()}
      </DataLabel>
      {balance.getAmount() !== 0 && (
-        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_ar")} />
+        <Alert
+          style={{ margin: '8px 0px' }}
+          type="warning"
+          message={t('jobs.labels.outstanding_ar')}
+        />
      )}
    </Card>
  );
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
+++ b/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 { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import AlertComponent from "../alert/alert.component";
-import JobBillsTotalComponent from "../job-bills-total/job-bills-total.component";
+import { useQuery } from '@apollo/client';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { QUERY_BILLS_BY_JOBID } from '../../graphql/bills.queries';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import AlertComponent from '../alert/alert.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",
-    nextFetchPolicy: "network-only"
+    fetchPolicy: 'network-only',
+    nextFetchPolicy: 'network-only',
  });

  if (error) return <AlertComponent message={error.message} type="error" />;
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx
@@ -76,21 +76,20 @@ 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 job={job} form={form} warningCallback={warningCallback} />
+                  <JobCloseRoGuardProfit
+                    job={job}
+                    form={form} //warningCallback={warningCallback}
+                  />
                </Col>
                <Col span={24}>
                  <JobCloseRoGuardAr job={job} form={form} warningCallback={warningCallback} />
                </Col>
              </Row>
            </Col>
-            {InstanceRenderManager({
-              rome: (
-                <Col md={24} lg={8}>
-                  {/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */}
-                  <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
-                </Col>
-              )
-            })}
+            <Col className="ro-guard-col-50" md={24} lg={8}>
+              <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} />
+              {InstanceRenderManager({ rome: <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} /> })}
+            </Col>
            <Col className="ro-guard-col" md={24} lg={10}>
              <JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} />
            </Col>
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
@@ -1,19 +1,20 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState } from 'react';

-import { Alert, Card } from "antd";
-import axios from "axios";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import JobCostingStatistics from "../job-costing-statistics/job-costing-statistics.component";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import { LockOutlined } from '@ant-design/icons';
+import { Card, Form, Input } from 'antd';
+import axios from 'axios';
+import { useTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import JobCostingStatistics from '../job-costing-statistics/job-costing-statistics.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))
@@ -30,7 +31,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) {}
@@ -44,19 +45,16 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
    parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum;

  useEffect(() => {
-    if (enforceProfitPassword && typeof warningCallback === "function") {
-      warningCallback({ key: "profit", warning: t("jobs.labels.profitbypassrequired") });
+    if (enforceProfitPassword && typeof warningCallback === 'function') {
+      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>
  );
 }
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
+++ b/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 { t } from "i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+import { Alert, Card, Table } from 'antd';
+import { t } from 'i18next';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import CurrencyFormatter from '../../utils/CurrencyFormatter';
+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,56 +20,69 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardSublet

 export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallback }) {
  const subletsNotDone = job?.joblines.filter(
-    (j) => (j.part_type === "PAS" || j.part_type === "PASL") && (!j.sublet_completed || !j.sublet_ignored)
+    (j) =>
+      (j.part_type === 'PAS' || j.part_type === 'PASL') &&
+      (!j.sublet_completed || !j.sublet_ignored)
  );

  const columns = [
    {
-      title: t("joblines.fields.line_desc"),
-      dataIndex: "line_desc",
-      fixed: "left",
-      key: "line_desc",
+      title: t('joblines.fields.line_desc'),
+      dataIndex: 'line_desc',
+      fixed: 'left',
+      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"),
-      dataIndex: "act_price",
-      key: "act_price",
+      title: t('joblines.fields.act_price'),
+      dataIndex: '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"),
-      dataIndex: "part_qty",
-      key: "part_qty"
+      title: t('joblines.fields.part_qty'),
+      dataIndex: 'part_qty',
+      key: 'part_qty',
    },
    {
-      title: t("joblines.fields.notes"),
-      dataIndex: "notes",
-      key: "notes"
-    }
+      title: t('joblines.fields.notes'),
+      dataIndex: '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")}>
-      <Table dataSource={subletsNotDone} columns={columns} pagination={false} rowKey="id" bordered size="small" />
+    <Card title={t('jobs.labels.subletsnotcompleted')}>
+      <Table
+        dataSource={subletsNotDone}
+        columns={columns}
+        pagination={false}
+        rowKey="id"
+        bordered
+        size="small"
+      />
      {subletsNotDone.length > 0 && (
-        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_sublets")} />
+        <Alert
+          style={{ margin: '8px 0px' }}
+          type="warning"
+          message={t('jobs.labels.outstanding_sublets')}
+        />
      )}
    </Card>
  );
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx
+++ b/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 { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import JobLifecycleComponent from "../job-lifecycle/job-lifecycle.component";
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+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))
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -97,7 +97,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
              : [
                  {
                    key: "no-orders",
-                    children: t("parts_orders.labels.notyetordered")
+                    children: t("bills.labels.nobilllines")
                  }
                ]
          }
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -592,32 +592,35 @@ function ResolveCCCLineIssues(estData, bodyshop) {
  //Group by line no
  // For everything but the first one, strip out the price number in

-  // InstanceRenderManager({executeFunction:true, args:[], promanager: () => {
-  // const groupedByLineRef = _.groupBy(estData.joblines.data, "line_ref");
-  // Object.keys(groupedByLineRef).forEach((lineRef) => {
-  //   let index0ActPrice;
-  //   groupedByLineRef[lineRef].forEach((line, index) => {
-  //     //Let the first one keep it
-  //     if (index === 0){
-  //       index0ActPrice = line.act_price;
-  //       return;}
-  //     //Web Est seems to have additional costs with UNQ_SEQ 0. Keep them all?
-  //     if (line.unq_seq === 0) return;
-  //     if(index0ActPrice !== line.act_price){
-  //       line.notes += ` | Price override.`;
-  //       return;
-  //     }
-  //     const indexInEstData = estData.joblines.data.findIndex(
-  //       (l) => l.unq_seq === line.unq_seq
-  //     );
-  //     estData.joblines.data[
-  //       indexInEstData
-  //     ].notes += ` | Scrubbed due to the line_ref issue. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
-  //     estData.joblines.data[indexInEstData].act_price = 0;
-  //     estData.joblines.data[indexInEstData].db_price = 0;
-  //   });
-  // })
-  // }})
+  InstanceRenderManager({
+    executeFunction: true,
+    args: [],
+    promanager: () => {
+      const groupedByLineRef = _.groupBy(estData.joblines.data, "line_ref");
+      Object.keys(groupedByLineRef).forEach((lineRef) => {
+        let index0ActPrice;
+        groupedByLineRef[lineRef].forEach((line, index) => {
+          //Let the first one keep it
+          if (index === 0) {
+            index0ActPrice = line.act_price;
+            return;
+          }
+          //Web Est seems to have additional costs with UNQ_SEQ 0. Keep them all?
+          if (line.unq_seq === 0) return;
+          if (index0ActPrice !== line.act_price) {
+            line.notes += ` | Price override.`;
+            return;
+          }
+          const indexInEstData = estData.joblines.data.findIndex((l) => l.unq_seq === line.unq_seq);
+          estData.joblines.data[
+            indexInEstData
+          ].notes += ` | Scrubbed due to the line_ref issue. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
+          estData.joblines.data[indexInEstData].act_price = 0;
+          estData.joblines.data[indexInEstData].db_price = 0;
+        });
+      });
+    }
+  });

  InstanceRenderManager({
    executeFunction: true,
--- a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx
+++ b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx
@@ -8,16 +8,18 @@ import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectPayment } from "../../redux/modals/modals.selectors";

 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
+  paymentModal: selectPayment
 });

 const mapDispatchToProps = (dispatch) => ({
  setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" }))
 });

-const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser }) => {
+const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser, paymentModal }) => {
  const { t } = useTranslation();
  const [insertExportLog, { loading: exportLogLoading }] = useMutation(INSERT_EXPORT_LOG);
  const [updatePayment, { loading: updatePaymentLoading }] = useMutation(UPDATE_PAYMENT);
@@ -56,16 +58,19 @@ const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentCont
          refetch
        },
        context: {
+          ...paymentModal.context,
          ...payment,
          exportedat: today
        }
      });

-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(paymentUpdateResponse && paymentUpdateResponse.data.update_payments.returning[0]);
+        } else {
+          refetch();
+        }
+      }
    } else {
      notification["error"]({
        message: t("payments.errors.exporting", {
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client";
-
 import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -91,7 +90,13 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop, cur
        }
      }

-      if (actions.refetch) actions.refetch(updatedPayment && updatedPayment.data.update_payments.returning[0]);
+      if (actions.refetch) {
+        if (context.refetchRequiresContext) {
+          actions.refetch(updatedPayment && updatedPayment.data.update_payments.returning[0]);
+        } else {
+          actions.refetch();
+        }
+      }

      if (enterAgain) {
        const prev = form.getFieldsValue(["date"]);
@@ -166,13 +171,7 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop, cur
        </Space>
      )}

-      <Form
-        onFinish={handleFinish}
-        autoComplete={"off"}
-        form={form}
-        layout="vertical"
-        disabled={context?.exportedat}
-      >
+      <Form onFinish={handleFinish} autoComplete={"off"} form={form} layout="vertical" disabled={context?.exportedat}>
        <PaymentForm form={form} />
      </Form>
    </Modal>
--- a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx
+++ b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx
@@ -5,12 +5,18 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
+import { createStructuredSelector } from "reselect";
+
+const mapStateToProps = createStructuredSelector({
+  paymentModal: selectPayment
+});

 const mapDispatchToProps = (dispatch) => ({
  setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" }))
 });

-const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
+const PaymentReexportButton = ({ paymentModal, payment, refetch, setPaymentContext }) => {
  const { t } = useTranslation();
  const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);

@@ -34,15 +40,19 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
          refetch
        },
        context: {
+          ...paymentModal.context,
          ...payment,
          exportedat: null
        }
      });
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(paymentUpdateResponse && paymentUpdateResponse.data.update_payments.returning[0]);
+        } else {
+          refetch();
+        }
+      }
    } else {
      notification["error"]({
        message: t("payments.errors.exporting", {
@@ -59,4 +69,4 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
  );
 };

-export default connect(null, mapDispatchToProps)(PaymentReexportButton);
+export default connect(mapStateToProps, mapDispatchToProps)(PaymentReexportButton);
--- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -171,7 +171,7 @@ export function PaymentsListPaginated({
                      }
                    : refetch
                },
-                context: apolloResults ? apolloResults : record
+                context: { ...(apolloResults ? apolloResults : record), refetchRequiresContext: true }
              });
            }}
          >
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -41,7 +41,7 @@ export const QUERY_AVAILABLE_CC = gql`
 `;

 export const CHECK_CC_FLEET_NUMBER = gql`
-  query CHECK_VENDOR_NAME($name: String!) {
+  query CHECK_CC_FLEET_NUMBER($name: String!) {
    courtesycars_aggregate(where: { fleetnumber: { _ilike: $name } }) {
      aggregate {
        count
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -216,7 +216,7 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
      extra={
        <Space wrap>
          {search.search && (
-            <>
+            <Space align="center">
              <Typography.Title level={4}>
                {t("general.labels.searchresults", { search: search.search })}
              </Typography.Title>
@@ -229,7 +229,7 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
              >
                {t("general.actions.clear")}
              </Button>
-            </>
+            </Space>
          )}
          <Button onClick={() => refetch()}>
            <SyncOutlined />
--- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
+++ b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
@@ -72,7 +72,11 @@ export function CourtesyCarCreateContainer({ bodyshop, setBreadcrumbs, setSelect
    <RbacWrapper action="courtesycar:create">
      <FeatureWrapperComponent featureName="courtesycars">
        <Form form={form} autoComplete="new-password" onFinish={handleFinish} layout="vertical">
-          <CourtesyCarFormComponent form={form} saveLoading={loading} />
+          <CourtesyCarFormComponent
+          form={form}
+          saveLoading={loading}
+          newCC={true}
+        />
        </Form>
      </FeatureWrapperComponent>
    </RbacWrapper>
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/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,13 +120,6 @@ 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);
@@ -191,7 +184,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")} />}
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -116,7 +116,6 @@
 				"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": "",
@@ -224,8 +223,9 @@
 				"markexported": "Mark Exported",
 				"markforreexport": "Mark for Re-export",
 				"new": "New Bill",
+				"nobilllines": "This part has not yet been recieved.",
 				"noneselected": "No bill selected.",
-				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced,  exported,  or voided.",
+				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
 				"printlabels": "Print Labels",
 				"retailtotal": "Bills Retail Total",
 				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
@@ -1975,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?",
@@ -2004,7 +2004,6 @@
 				"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",
@@ -2026,12 +2025,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."
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -116,7 +116,6 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
-				"jobclosedwithbypass": "",
 				"jobconverted": "",
 				"jobdelivery": "",
 				"jobexported": "",
@@ -2004,7 +2003,6 @@
 				"ppc": "",
 				"ppdnotexported": "",
 				"profileadjustments": "",
-				"profitbypassrequired": "",
 				"profits": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
@@ -2026,12 +2024,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": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -116,7 +116,6 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
-				"jobclosedwithbypass": "",
 				"jobconverted": "",
 				"jobdelivery": "",
 				"jobexported": "",
@@ -2004,7 +2003,6 @@
 				"ppc": "",
 				"ppdnotexported": "",
 				"profileadjustments": "",
-				"profitbypassrequired": "",
 				"profits": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
@@ -2026,12 +2024,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": ""
--- a/client/src/utils/AuditTrailMappings.js
+++ b/client/src/utils/AuditTrailMappings.js
@@ -24,7 +24,6 @@ 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"),
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -969,6 +969,7 @@
          - md_rbac
          - md_referral_sources
          - md_responsibility_centers
+          - md_ro_guard
          - md_ro_statuses
          - md_tasks_presets
          - md_to_emails
@@ -1068,6 +1069,7 @@
          - md_rbac
          - md_referral_sources
          - md_responsibility_centers
+          - md_ro_guard
          - md_ro_statuses
          - md_tasks_presets
          - md_to_emails
--- a/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql
+++ b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/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"."bodyshops" add column "md_ro_guard" jsonb
+--  null default jsonb_build_object();
--- a/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql
+++ b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_ro_guard" jsonb
+ null default jsonb_build_object();
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,7 +56,6 @@
      "devDependencies": {
        "@trivago/prettier-plugin-sort-imports": "^4.3.0",
        "concurrently": "^8.2.2",
-        "prettier": "^3.2.5",
        "source-map-explorer": "^2.5.2"
      },
      "engines": {
@@ -5901,21 +5900,6 @@
        "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",
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
  "devDependencies": {
    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
    "concurrently": "^8.2.2",
-    "prettier": "^3.2.5",
    "source-map-explorer": "^2.5.2"
  }
 }
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -770,7 +770,7 @@ const getAdditionalCostCenter = (jl, profitCenters) => {
      return profitCenters["TOW"];
    } else if (jl.act_price > 0) {
      //TODO:AIO Ensure that this is tested.
-      ret.profitcenter_part = defaults.profits["PAO"];
+      return profitCenters["PAO"];
    } else {
      return null;
    }
Author	SHA1	Message	Date
Patrick Fic	b8e4520366	Resolve ES Lint error.	2024-04-08 11:05:12 -07:00
Patrick Fic	a2a7c1c58c	Add contextRefect to payment export buttons.	2024-04-08 09:48:39 -07:00
Patrick Fic	1469960643	Resolve payment refetch.	2024-04-05 12:52:26 -07:00
Patrick Fic	d7caaecaf7	Merge branch 'feature/IO-2458-RO-Closer' into test-AIO	2024-04-04 20:42:17 -07:00
Patrick Fic	7ece1256f2	Uncomment ProManager calculations.	2024-04-04 20:01:47 -07:00
Patrick Fic	a43134511b	Merge branch 'release/2024-04-05' into test-AIO	2024-04-04 12:56:09 -07:00
Patrick Fic	b188cce3ea	Merge branch 'test-AIO' of bitbucket.org:snaptsoft/bodyshop into test-AIO	2024-04-04 12:52:02 -07:00
Patrick Fic	39d4f56812	Merge branch 'hotfix/AIO/2024-04-04' into test-AIO	2024-04-04 11:32:01 -07:00
Patrick Fic	f85e3d8d60	Resolve job costing.	2024-04-04 11:31:37 -07:00
Patrick Fic	c33eaa6c68	Merged in feature/IO-2458-RO-Closer (pull request #1390 ) Feature/IO-2458 RO Closer	2024-04-04 18:14:11 +00:00
Patrick Fic	37196e65c3	Add schema changes for RO Guard to bodyshop table.	2024-04-03 09:46:52 -07:00
Allan Carr	b20c605c85	Merged in feature/IO-2568-Payment-Modal-Button-Spacing (pull request #1384 ) IO-2568 Payment Modal Button Spacing Approved-by: Dave Richer	2024-04-02 19:03:49 +00:00
Allan Carr	d8ac708536	Merged in feature/IO-2552-PVRT-Button-Spacing (pull request #1386 ) IO-2552 PVRT Button Spacing and Alignment Approved-by: Dave Richer	2024-04-02 19:03:36 +00:00
Allan Carr	8a32fe50f3	Merged in feature/IO-2730-Bill-Search-Result-Align (pull request #1383 ) IO-2730 Bill Search Result Align Approved-by: Dave Richer	2024-04-02 19:03:06 +00:00
Allan Carr	7897a490bd	Merged in feature/IO-2563-Repair-Line-Expander-Bills-Transaltion (pull request #1385 ) IO-2563 Repair LIne Expander Bills Translation Approved-by: Dave Richer	2024-04-02 19:02:50 +00:00
Allan Carr	17d73fc6d7	Merged in feature/IO-2553-Edit-CC-Unsaved-Changes (pull request #1388 ) IO-2553 Unsaved Changes on Edit CC Approved-by: Dave Richer	2024-04-02 19:02:28 +00:00
Allan Carr	7d1910086e	IO-2553 Unsaved Changes on Edit CC Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-04-02 10:39:41 -07:00
Allan Carr	817c41afb9	IO-2552 PVRT Button Spacing and Alignment Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-04-01 14:27:25 -07:00
Allan Carr	04315a9045	IO-2563 Repair LIne Expander Bills Translation Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-04-01 14:07:58 -07:00
Allan Carr	d0871ffe21	IO-2568 Payment Modal Button Spacing Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-04-01 13:52:25 -07:00
Allan Carr	dca587d6e0	IO-2730 Bill Search Result Align Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-04-01 13:20:30 -07:00
Allan Carr	19ec4cb021	Merged in release/2024-03-28 (pull request #1382 ) Release/2024 03 28	2024-03-28 21:15:25 +00:00