admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final changes for RO closer.

Browse Source
This commit is contained in:
Patrick Fic
2024-04-03 14:18:45 -07:00
parent 815ada0516
commit 5e63ce7271
18 changed files with 1266 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

439
bodyshop_translations.babel
View File

@@ -6135,6 +6135,221 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<folder_node>
<name>md_ro_guard</name>
<children>
<concept_node>
<name>enabled</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>
<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_bills</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_cm</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_labor</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_ppd</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_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>
<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>masterbypass</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>totalgppercent_minimum</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>
</children>
</folder_node>
<folder_node> <folder_node>
<name>md_tasks_presets</name> <name>md_tasks_presets</name>
<children> <children>
@@ -10663,6 +10878,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>md_ro_guard</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> <concept_node>
<name>md_tasks_presets</name> <name>md_tasks_presets</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -11067,6 +11303,32 @@
</concept_node> </concept_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>roguard</name>
<children>
<concept_node>
<name>title</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>
</children>
</folder_node>
<concept_node> <concept_node>
<name>scheduling</name> <name>scheduling</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -21835,6 +22097,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>act_price_before_ppc</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> <concept_node>
<name>ah_detail_line</name> <name>ah_detail_line</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30775,6 +31058,27 @@
<folder_node> <folder_node>
<name>labels</name> <name>labels</name>
<children> <children>
<concept_node>
<name>accountsreceivable</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> <concept_node>
<name>act_price_ppc</name> <name>act_price_ppc</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -33089,6 +33393,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>masterbypass</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>
<folder_node> <folder_node>
<name>materials</name> <name>materials</name>
<children> <children>
@@ -33262,6 +33587,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>outstanding_ppd</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> <concept_node>
<name>outstanding_reconciliation_discrep</name> <name>outstanding_reconciliation_discrep</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -33514,6 +33860,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>performance</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> <concept_node>
<name>pimraryamountpayable</name> <name>pimraryamountpayable</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -33772,7 +34139,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>profileadjustments</name> <name>ppdnotexported</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -33793,7 +34160,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>profitbypassrequired</name> <name>profileadjustments</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -34175,6 +34542,74 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<folder_node>
<name>ro_guard</name>
<children>
<concept_node>
<name>enforce_validation</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>enforced</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>
</children>
</folder_node>
<concept_node>
<name>roguard</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> <concept_node>
<name>roguardwarnings</name> <name>roguardwarnings</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

142
client/src/components/job-bills-total/job-bills-total.component.jsx
View File

@@ -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({ export default function JobBillsTotalComponent({
loading, loading,
@@ -13,19 +13,16 @@ export default function JobBillsTotalComponent({
partsOrders, partsOrders,
jobTotals, jobTotals,
showWarning, showWarning,
warningCallback warningCallback,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
if (loading) return <LoadingSkeleton />; if (loading) return <LoadingSkeleton />;
if (!!!jobTotals) { if (!!!jobTotals) {
if (showWarning && warningCallback && typeof warningCallback === 'function') { if (showWarning && warningCallback && typeof warningCallback === 'function') {
warningCallback(t("jobs.errors.nofinancial")) warningCallback({ key: 'bills', warning: t('jobs.errors.nofinancial') });
} }
return ( return <AlertComponent type="error" message={t('jobs.errors.nofinancial')} />;
<AlertComponent type="error" message={t("jobs.errors.nofinancial")}/>
);
} }
const totals = jobTotals; const totals = jobTotals;
@@ -97,7 +94,13 @@ if(showWarning && warningCallback && typeof warningCallback === 'function'){
.add(Dinero(totals.parts.sublets.total)) .add(Dinero(totals.parts.sublets.total))
.add(Dinero(totals.additional.shipping)) .add(Dinero(totals.additional.shipping))
.add(Dinero(totals.additional.towing)) .add(Dinero(totals.additional.towing))
.add( InstanceRenderManager({imex: Dinero(), rome: Dinero(totals.additional.additionalCosts),promanager: "USE_ROME" })) ; // Additional costs were captured for Rome, but not imex. .add(
InstanceRenderManager({
imex: Dinero(),
rome: Dinero(totals.additional.additionalCosts),
promanager: 'USE_ROME',
})
); // Additional costs were captured for Rome, but not imex.
const discrepancy = totalPartsSublet.subtract(billTotals); const discrepancy = totalPartsSublet.subtract(billTotals);
@@ -106,69 +109,64 @@ if(showWarning && warningCallback && typeof warningCallback === 'function'){
const discrepWithCms = discrepWithLbrAdj.add(totalReturns); const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number. 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 || discrepWithLbrAdj.getAmount() !== 0 ||
discrepancy.getAmount() !== 0 discrepancy.getAmount() !== 0
) { ) {
warningCallback(t('jobs.labels.outstanding_reconciliation_discrep')); warningCallback({
key: 'bills',
warning: t('jobs.labels.outstanding_reconciliation_discrep'),
});
} }
if (calculatedCreditsNotReceived.getAmount() > 0) { if (calculatedCreditsNotReceived.getAmount() > 0) {
warningCallback(t('jobs.labels.outstanding_credit_memos')); warningCallback({ key: 'cm', warning: t('jobs.labels.outstanding_credit_memos') });
} }
} }
return ( return (
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>
<Col md={24} lg={18}> <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"> <Space wrap size="large">
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.partstotal"), __html: t('jobs.labels.plitooltips.partstotal'),
}} }}
/> />
} }
> >
<Statistic <Statistic title={t('jobs.labels.rosaletotal')} value={totalPartsSublet.toFormat()} />
title={t("jobs.labels.rosaletotal")}
value={totalPartsSublet.toFormat()}
/>
</Tooltip> </Tooltip>
<Typography.Title>-</Typography.Title> <Typography.Title>-</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.billtotal"), __html: t('jobs.labels.plitooltips.billtotal'),
}} }}
/> />
} }
> >
<Statistic <Statistic title={t('bills.labels.retailtotal')} value={billTotals.toFormat()} />
title={t("bills.labels.retailtotal")}
value={billTotals.toFormat()}
/>
</Tooltip> </Tooltip>
<Typography.Title>=</Typography.Title> <Typography.Title>=</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.discrep1"), __html: t('jobs.labels.plitooltips.discrep1'),
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t("bills.labels.discrepancy")} title={t('bills.labels.discrepancy')}
valueStyle={{ valueStyle={{
color: discrepancy.getAmount() === 0 ? "green" : "red", color: discrepancy.getAmount() === 0 ? 'green' : 'red',
}} }}
value={discrepancy.toFormat()} value={discrepancy.toFormat()}
/> />
@@ -178,30 +176,27 @@ if(showWarning && warningCallback && typeof warningCallback === 'function'){
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.laboradj"), __html: t('jobs.labels.plitooltips.laboradj'),
}} }}
/> />
} }
> >
<Statistic <Statistic title={t('bills.labels.dedfromlbr')} value={lbrAdjustments.toFormat()} />
title={t("bills.labels.dedfromlbr")}
value={lbrAdjustments.toFormat()}
/>
</Tooltip> </Tooltip>
<Typography.Title>=</Typography.Title> <Typography.Title>=</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.discrep2"), __html: t('jobs.labels.plitooltips.discrep2'),
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t("bills.labels.discrepancy")} title={t('bills.labels.discrepancy')}
valueStyle={{ valueStyle={{
color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red", color: discrepWithLbrAdj.getAmount() === 0 ? 'green' : 'red',
}} }}
value={discrepWithLbrAdj.toFormat()} value={discrepWithLbrAdj.toFormat()}
/> />
@@ -211,78 +206,72 @@ if(showWarning && warningCallback && typeof warningCallback === 'function'){
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.creditmemos"), __html: t('jobs.labels.plitooltips.creditmemos'),
}} }}
/> />
} }
> >
<Statistic <Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} />
title={t("bills.labels.totalreturns")}
value={totalReturns.toFormat()}
/>
</Tooltip> </Tooltip>
<Typography.Title>=</Typography.Title> <Typography.Title>=</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.discrep3"), __html: t('jobs.labels.plitooltips.discrep3'),
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t("bills.labels.discrepancy")} title={t('bills.labels.discrepancy')}
valueStyle={{ valueStyle={{
color: discrepWithCms.getAmount() === 0 ? "green" : "red", color: discrepWithCms.getAmount() === 0 ? 'green' : 'red',
}} }}
value={discrepWithCms.toFormat()} value={discrepWithCms.toFormat()}
/> />
</Tooltip> </Tooltip>
</Space> </Space>
{showWarning && ( {showWarning &&
discrepWithCms.getAmount() !== 0 || (discrepWithCms.getAmount() !== 0 ||
discrepWithLbrAdj.getAmount() !== 0 || discrepWithLbrAdj.getAmount() !== 0 ||
discrepancy.getAmount() !== 0 discrepancy.getAmount() !== 0) && (
) && <Alert style={{margin: "8px 0px"}} type="warning" message={t("jobs.labels.outstanding_reconciliation_discrep")}/>} <Alert
style={{ margin: '8px 0px' }}
type="warning"
message={t('jobs.labels.outstanding_reconciliation_discrep')}
/>
)}
</Card> </Card>
</Col> </Col>
<Col md={24} lg={6}> <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> <Space wrap>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.totalreturns"), __html: t('jobs.labels.plitooltips.totalreturns'),
}} }}
/> />
} }
> >
<Statistic <Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} />
title={t("bills.labels.totalreturns")}
value={totalReturns.toFormat()}
/>
</Tooltip> </Tooltip>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t( __html: t('jobs.labels.plitooltips.calculatedcreditsnotreceived'),
"jobs.labels.plitooltips.calculatedcreditsnotreceived"
),
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t("bills.labels.calculatedcreditsnotreceived")} title={t('bills.labels.calculatedcreditsnotreceived')}
valueStyle={{ valueStyle={{
color: color: calculatedCreditsNotReceived.getAmount() <= 0 ? 'green' : 'red',
calculatedCreditsNotReceived.getAmount() <= 0
? "green"
: "red",
}} }}
value={ value={
calculatedCreditsNotReceived.getAmount() >= 0 calculatedCreditsNotReceived.getAmount() >= 0
@@ -295,18 +284,15 @@ if(showWarning && warningCallback && typeof warningCallback === 'function'){
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t("jobs.labels.plitooltips.creditsnotreceived"), __html: t('jobs.labels.plitooltips.creditsnotreceived'),
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t("bills.labels.creditsnotreceived")} title={t('bills.labels.creditsnotreceived')}
valueStyle={{ valueStyle={{
color: color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? 'green' : 'red',
totalReturnsMarkedNotReceived.getAmount() <= 0
? "green"
: "red",
}} }}
value={ value={
totalReturnsMarkedNotReceived.getAmount() >= 0 totalReturnsMarkedNotReceived.getAmount() >= 0
@@ -316,9 +302,13 @@ if(showWarning && warningCallback && typeof warningCallback === 'function'){
/> />
</Tooltip> </Tooltip>
</Space> </Space>
{showWarning && ( {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
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> </Card>
</Col> </Col>
</Row> </Row>

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

@@ -1,4 +1,4 @@
import React 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';
@@ -20,7 +20,7 @@ const mapDispatchToProps = (dispatch) => ({
}); });
export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardProfit); export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardProfit);
export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form }) { export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallback }) {
const { t } = useTranslation(); const { t } = useTranslation();
const total = useMemo(() => { const total = useMemo(() => {
@@ -39,6 +39,12 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form }) {
return Dinero({ amount: 0 }).subtract(total); return Dinero({ amount: 0 }).subtract(total);
}, [job, total]); }, [job, total]);
useEffect(() => {
if (balance.getAmount !== 0) {
warningCallback({ key: 'ar', warning: t('jobs.labels.outstanding_ar') });
}
}, [balance, t, warningCallback]);
return ( 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>
@@ -49,7 +55,11 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form }) {
{balance.toFormat()} {balance.toFormat()}
</DataLabel> </DataLabel>
{balance.getAmount !== 0 && ( {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> </Card>
); );

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

@@ -1,6 +1,6 @@
import React, { useCallback, useState } from 'react'; import React, { useCallback, useState } from 'react';
import { LockOutlined } from '@ant-design/icons';
import { Badge, Card, Col, Collapse, Row, Space } from 'antd'; import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } 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';
@@ -25,16 +25,20 @@ const mapDispatchToProps = (dispatch) => ({
}); });
export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardContainer); export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardContainer);
const colSpans = {
md: 24,
lg: 12,
xl: 8,
};
export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) { export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [warnings, setWarnings] = useState([]); const [warnings, setWarnings] = useState([]);
const warningCallback = useCallback((warning) => setWarnings((state) => [...state, warning]), []); const warningCallback = useCallback(
({ key, warning }) =>
setWarnings((state) => {
if (state.find((s) => s.key === key)) return state;
return [...state, { key, warning }];
}),
[]
);
if (!bodyshop?.md_ro_guard?.enabled) return null;
return ( return (
<> <>
@@ -48,8 +52,15 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
} }
> >
<ul> <ul>
{warnings.map((warning, index) => ( {warnings.map((w, index) => (
<li key={index}>{warning}</li> <li key={index}>
{bodyshop.md_ro_guard[`enforce_${w.key}`] && (
<Tooltip title={t('jobs.labels.ro_guard.enforced')}>
<LockOutlined style={{ color: 'tomato', marginRight: '8px' }} />
</Tooltip>
)}
{w.warning}
</li>
))} ))}
</ul> </ul>
</Card> </Card>
@@ -72,16 +83,135 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
</Col> </Col>
</Row> </Row>
</Col> </Col>
<Col className="ro-guard-col" md={24} lg={8}> <Col className="ro-guard-col-50" md={24} lg={8}>
<JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} />
<JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
</Col> </Col>
<Col className="ro-guard-col" md={24} lg={10}> <Col className="ro-guard-col" md={24} lg={10}>
<JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} /> <JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} />
</Col> </Col>
<Col className="ro-guard-col" {...colSpans}>
<JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
</Col>
</Row> </Row>
<Form.Item
name="masterbypass"
label={t('jobs.labels.masterbypass')}
rules={[
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_bills &&
warnings.find((w) => w.key === 'bills')
) {
return Promise.reject(t('jobs.labels.ro_guard.enforce_bills'));
}
return Promise.resolve();
},
}),
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_cm &&
warnings.find((w) => w.key === 'cm')
) {
return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', {
message: t('jobs.labels.ro_guard.enforce_cm'),
})
);
}
return Promise.resolve();
},
}),
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_profit &&
warnings.find((w) => w.key === 'profit')
) {
return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', {
message: t('jobs.labels.ro_guard.enforce_profit'),
})
);
}
return Promise.resolve();
},
}),
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_ar &&
warnings.find((w) => w.key === 'ar')
) {
return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', {
message: t('jobs.labels.ro_guard.enforce_ar'),
})
);
}
return Promise.resolve();
},
}),
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_sublet &&
warnings.find((w) => w.key === 'sublet')
) {
return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', {
message: t('jobs.labels.ro_guard.enforce_sublet'),
})
);
}
return Promise.resolve();
},
}),
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_ppd &&
warnings.find((w) => w.key === 'ppd')
) {
return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', {
message: t('jobs.labels.ro_guard.enforce_ppd'),
})
);
}
return Promise.resolve();
},
}),
({ getFieldValue }) => ({
validator(_, value) {
if (
!PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_labor &&
warnings.find((w) => w.key === 'labor')
) {
return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', {
message: t('jobs.labels.ro_guard.enforce_labor'),
})
);
}
return Promise.resolve();
},
}),
]}
>
<Input
prefix={<LockOutlined />}
type="password"
placeholder="Password"
disabled={jobRO}
/>
</Form.Item>
</Collapse.Panel> </Collapse.Panel>
<Collapse.Panel header={t('jobs.labels.performance')}> <Collapse.Panel header={t('jobs.labels.performance')}>
@@ -95,3 +225,7 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
</> </>
); );
} }
function PasswordCheck({ bodyshop, value }) {
return value === bodyshop?.md_ro_guard?.masterbypass;
}

25
client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
View File

@@ -1,6 +1,6 @@
import React from 'react'; import React, { useEffect } from 'react';
import { 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';
@@ -18,11 +18,17 @@ const mapDispatchToProps = (dispatch) => ({
}); });
export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardPpd); export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardPpd);
export function JobCloseRGuardPpd({ job, jobRO, bodyshop, form }) { export function JobCloseRGuardPpd({ job, jobRO, bodyshop, form, warningCallback }) {
const subletsNotDone = job?.joblines.filter( const linesWithPPD = job?.joblines.filter(
(j) => j.act_price_before_ppc !== 0 && j.act_price_before_ppc !== null (j) => j.act_price_before_ppc !== 0 && j.act_price_before_ppc !== null
); );
useEffect(() => {
if (linesWithPPD.length > 0) {
warningCallback({ key: 'ppd', warning: t('jobs.labels.outstanding_sublets') });
}
}, [linesWithPPD.length, warningCallback]);
const columns = [ const columns = [
{ {
title: t('joblines.fields.line_desc'), title: t('joblines.fields.line_desc'),
@@ -71,15 +77,22 @@ export function JobCloseRGuardPpd({ job, jobRO, bodyshop, form }) {
]; ];
return ( return (
<Card title={t('jobs.labels.subletsnotcompleted')}> <Card title={t('jobs.labels.ppdnotexported')}>
<Table <Table
dataSource={subletsNotDone} dataSource={linesWithPPD}
columns={columns} columns={columns}
pagination={false} pagination={false}
rowKey="id" rowKey="id"
bordered bordered
size="small" size="small"
/> />
{linesWithPPD.length > 0 && (
<Alert
style={{ margin: '8px 0px' }}
type="warning"
message={t('jobs.labels.outstanding_ppd')}
/>
)}
</Card> </Card>
); );
} }

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

@@ -42,11 +42,11 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
}, [job.id]); }, [job.id]);
const enforceProfitPassword = const enforceProfitPassword =
parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum; //TODO Add bodyshop related values. parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum;
useEffect(() => { useEffect(() => {
if (enforceProfitPassword && typeof warningCallback === 'function') { if (enforceProfitPassword && typeof warningCallback === 'function') {
warningCallback(t('jobs.labels.profitbypassrequired')); warningCallback({ key: 'profit', warning: t('jobs.labels.profitbypassrequired') });
} }
}, [enforceProfitPassword, t, warningCallback]); }, [enforceProfitPassword, t, warningCallback]);
@@ -55,32 +55,6 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
return ( return (
<Card title={t('jobs.labels.profits')} style={{ height: '100%' }}> <Card title={t('jobs.labels.profits')} style={{ height: '100%' }}>
<JobCostingStatistics summaryData={costingData?.summaryData} onlyGP /> <JobCostingStatistics summaryData={costingData?.summaryData} onlyGP />
{enforceProfitPassword && (
<Form.Item
name="profitbypasspassword"
label={t('jobs.labels.profitbypasspassword')}
rules={[
{
required: enforceProfitPassword,
},
({ getFieldValue }) => ({
validator(_, value) {
if (
parseFloat(costingData?.summaryData.gppercent) <
bodyshop?.md_ro_guard?.totalgppercent_minimum &&
value !== bodyshop.md_ro_guard.profitbypasspassword
) {
return Promise.reject(t('jobs.labels.profitbypassrequired'));
}
return Promise.resolve();
},
}),
]}
>
<Input prefix={<LockOutlined />} type="password" placeholder="Password" />
</Form.Item>
)}
</Card> </Card>
); );
} }

5
client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss
View File

@@ -3,3 +3,8 @@
height: 100%; height: 100%;
} }
} }
.ro-guard-col-50 {
.ant-card {
height: 50%;
}
}

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

@@ -63,7 +63,7 @@ export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallba
useEffect(() => { useEffect(() => {
if (subletsNotDone.length > 0) { if (subletsNotDone.length > 0) {
warningCallback(t('jobs.labels.outstanding_sublets')); warningCallback({ key: 'sublet', warning: t('jobs.labels.outstanding_sublets') });
} }
}, [subletsNotDone.length, warningCallback]); }, [subletsNotDone.length, warningCallback]);

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

@@ -18,7 +18,6 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardTTLif
export function JobCloseRoGuardTTLifeCycle({ job, jobRO, bodyshop, form }) { export function JobCloseRoGuardTTLifeCycle({ job, jobRO, bodyshop, form }) {
return ( return (
<div> <div>
//TODO Add Touch Time
<JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} /> <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} />
</div> </div>
); );

2
client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
View File

@@ -205,7 +205,7 @@ export function LaborAllocationsTable({
); );
if (summary.difference !== 0 && typeof warningCallback === 'function') { if (summary.difference !== 0 && typeof warningCallback === 'function') {
warningCallback(t('jobs.labels.outstandinghours')); warningCallback({key: 'labor',warning: t('jobs.labels.outstandinghours')});
} }

2
client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
View File

@@ -219,7 +219,7 @@ export function PayrollLaborAllocationsTable({
); );
if (summary.difference !== 0 && typeof warningCallback === 'function') { if (summary.difference !== 0 && typeof warningCallback === 'function') {
warningCallback(t('jobs.labels.outstandinghours')); warningCallback({key: 'labor', warning: t('jobs.labels.outstandinghours')});
} }
return ( return (

135
client/src/components/shop-info/shop-info.component.jsx
View File

@@ -1,24 +1,25 @@
import {useSplitTreatments} from "@splitsoftware/splitio-react"; import { useSplitTreatments } from '@splitsoftware/splitio-react';
import {Button, Card, Tabs} from "antd"; import { Button, Card, Tabs } from 'antd';
import React from "react"; import React from 'react';
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 {selectBodyshop} from "../../redux/user/user.selectors"; import { selectBodyshop } from '../../redux/user/user.selectors';
import ShopInfoGeneral from "./shop-info.general.component"; import ShopInfoGeneral from './shop-info.general.component';
import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component"; import ShopInfoIntakeChecklistComponent from './shop-info.intake.component';
import ShopInfoLaborRates from "./shop-info.laborrates.component"; import ShopInfoLaborRates from './shop-info.laborrates.component';
import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component"; import ShopInfoOrderStatusComponent from './shop-info.orderstatus.component';
import ShopInfoPartsScan from "./shop-info.parts-scan"; import ShopInfoPartsScan from './shop-info.parts-scan';
import ShopInfoRbacComponent from "./shop-info.rbac.component"; import ShopInfoRbacComponent from './shop-info.rbac.component';
import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component"; import ShopInfoResponsibilityCenterComponent from './shop-info.responsibilitycenters.component';
import ShopInfoROStatusComponent from "./shop-info.rostatus.component"; import ShopInfoROStatusComponent from './shop-info.rostatus.component';
import ShopInfoSchedulingComponent from "./shop-info.scheduling.component"; import ShopInfoSchedulingComponent from './shop-info.scheduling.component';
import ShopInfoSpeedPrint from "./shop-info.speedprint.component"; import ShopInfoSpeedPrint from './shop-info.speedprint.component';
import {useLocation, useNavigate} from "react-router-dom"; import { useLocation, useNavigate } from 'react-router-dom';
import ShopInfoTaskPresets from "./shop-info.task-presets.component"; import ShopInfoTaskPresets from './shop-info.task-presets.component';
import queryString from "query-string"; import queryString from 'query-string';
import InstanceRenderManager from "../../utils/instanceRenderMgr"; import InstanceRenderManager from '../../utils/instanceRenderMgr';
import ShopInfoRoGuard from './shop-info.roguard.component';
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -29,10 +30,11 @@ const mapDispatchToProps = (dispatch) => ({
export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent); export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
export function ShopInfoComponent({ bodyshop, form, saveLoading }) { export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
const {
const {treatments: {CriticalPartsScanning, Enhanced_Payroll}} = useSplitTreatments({ treatments: { CriticalPartsScanning, Enhanced_Payroll },
} = useSplitTreatments({
attributes: {}, attributes: {},
names: ["CriticalPartsScanning","Enhanced_Payroll"], names: ['CriticalPartsScanning', 'Enhanced_Payroll'],
splitKey: bodyshop.imexshopid, splitKey: bodyshop.imexshopid,
}); });
@@ -43,76 +45,91 @@ export function ShopInfoComponent({bodyshop, form, saveLoading}) {
const tabItems = [ const tabItems = [
{ {
key: "general", key: 'general',
label: t("bodyshop.labels.shopinfo"), label: t('bodyshop.labels.shopinfo'),
children: <ShopInfoGeneral form={form} />, children: <ShopInfoGeneral form={form} />,
}, },
{ {
key: "speedprint", key: 'speedprint',
label: t("bodyshop.labels.speedprint"), label: t('bodyshop.labels.speedprint'),
children: <ShopInfoSpeedPrint form={form} />, children: <ShopInfoSpeedPrint form={form} />,
}, },
{ {
key: "rbac", key: 'rbac',
label: t("bodyshop.labels.rbac"), label: t('bodyshop.labels.rbac'),
children: <ShopInfoRbacComponent form={form} />, children: <ShopInfoRbacComponent form={form} />,
}, },
{ {
key: "roStatus", key: 'roStatus',
label: t("bodyshop.labels.jobstatuses"), label: t('bodyshop.labels.jobstatuses'),
children: <ShopInfoROStatusComponent form={form} />, children: <ShopInfoROStatusComponent form={form} />,
}, },
{ {
key: "scheduling", key: 'scheduling',
label: t("bodyshop.labels.scheduling"), label: t('bodyshop.labels.scheduling'),
children: <ShopInfoSchedulingComponent form={form} />, children: <ShopInfoSchedulingComponent form={form} />,
}, },
{ {
key: "orderStatus", key: 'orderStatus',
label: t("bodyshop.labels.orderstatuses"), label: t('bodyshop.labels.orderstatuses'),
children: <ShopInfoOrderStatusComponent form={form} />, children: <ShopInfoOrderStatusComponent form={form} />,
}, },
{ {
key: "responsibilityCenters", key: 'responsibilityCenters',
label: t("bodyshop.labels.responsibilitycenters.title"), label: t('bodyshop.labels.responsibilitycenters.title'),
children: <ShopInfoResponsibilityCenterComponent form={form} />, children: <ShopInfoResponsibilityCenterComponent form={form} />,
}, },
...InstanceRenderManager({imex: [ { ...InstanceRenderManager({
key: "checklists", imex: [
label: t("bodyshop.labels.checklists"),
children: <ShopInfoIntakeChecklistComponent form={form}/>,
}], rome: "USE_IMEX", promanager:[]})
,
{ {
key: "laborrates", key: 'checklists',
label: t("bodyshop.labels.laborrates"), label: t('bodyshop.labels.checklists'),
children: <ShopInfoIntakeChecklistComponent form={form} />,
},
],
rome: 'USE_IMEX',
promanager: [],
}),
{
key: 'laborrates',
label: t('bodyshop.labels.laborrates'),
children: <ShopInfoLaborRates form={form} />, children: <ShopInfoLaborRates form={form} />,
}, },
...(CriticalPartsScanning.treatment === "on" ...(CriticalPartsScanning.treatment === 'on'
? [ ? [
{ {
key: "partsscan", key: 'partsscan',
label: t("bodyshop.labels.partsscan"), label: t('bodyshop.labels.partsscan'),
children: <ShopInfoPartsScan form={form} />, children: <ShopInfoPartsScan form={form} />,
}, },
] ]
: []), : []),
...Enhanced_Payroll.treatment === "on" ? [ ...(Enhanced_Payroll.treatment === 'on'
? [
{ {
key: 'task-presets', key: 'task-presets',
label: t("bodyshop.labels.task-presets"), label: t('bodyshop.labels.task-presets'),
children: <ShopInfoTaskPresets form={form}/> children: <ShopInfoTaskPresets form={form} />,
}]: [] },
]
: []),
...InstanceRenderManager({
imex: [
{
key: 'roguard',
label: t('bodyshop.labels.roguard.title'),
children: <ShopInfoRoGuard form={form} />,
},
],
rome: 'USE_IMEX',
promanager: [],
}),
]; ];
return ( return (
<Card <Card
extra={ extra={
<Button <Button type="primary" loading={saveLoading} onClick={() => form.submit()}>
type="primary" {t('general.actions.save')}
loading={saveLoading}
onClick={() => form.submit()}
>
{t("general.actions.save")}
</Button> </Button>
} }
> >

111
client/src/components/shop-info/shop-info.roguard.component.jsx Normal file
View File

@@ -0,0 +1,111 @@
import { Form, Input, InputNumber, Switch } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
import LayoutFormRow from '../layout-form-row/layout-form-row.component';
export default function ShopInfoRoGuard({ form }) {
const { t } = useTranslation();
return (
<div>
<LayoutFormRow header={t('bodyshop.labels.md_ro_guard')}>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enabled')}
name={['md_ro_guard', 'enabled']}
valuePropName="checked"
>
<Switch />
</Form.Item>
</LayoutFormRow>
<Form.Item noStyle dependencies={[['md_ro_guard', 'enabled']]}>
{() => {
const disabled = !form.getFieldValue(['md_ro_guard', 'enabled']);
return (
<LayoutFormRow noDivider>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.totalgppercent_minimum')}
name={['md_ro_guard', 'totalgppercent_minimum']}
rules={[
{
required: !disabled,
//message: t("general.validation.required"),
},
]}
>
<InputNumber min={0} max={100} precision={1} disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.masterbypass')}
name={['md_ro_guard', 'masterbypass']}
rules={[
{
required: !disabled,
//message: t("general.validation.required"),
},
]}
>
<Input type="password" allowClear disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_bills')}
name={['md_ro_guard', 'enforce_bills']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_cm')}
name={['md_ro_guard', 'enforce_cm']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_profit')}
name={['md_ro_guard', 'enforce_profit']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_ar')}
name={['md_ro_guard', 'enforce_ar']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_sublet')}
name={['md_ro_guard', 'enforce_sublet']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_ppd')}
name={['md_ro_guard', 'enforce_ppd']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
<Form.Item
label={t('bodyshop.fields.md_ro_guard.enforce_labor')}
name={['md_ro_guard', 'enforce_labor']}
valuePropName="checked"
>
<Switch disabled={disabled} />
</Form.Item>
</LayoutFormRow>
);
}}
</Form.Item>
</div>
);
}

2
client/src/graphql/bodyshop.queries.js
View File

@@ -136,6 +136,7 @@ export const QUERY_BODYSHOP = gql`
tt_enforce_hours_for_tech_console tt_enforce_hours_for_tech_console
md_tasks_presets md_tasks_presets
use_paint_scale_data use_paint_scale_data
md_ro_guard
employee_teams( employee_teams(
order_by: { name: asc } order_by: { name: asc }
where: { active: { _eq: true } } where: { active: { _eq: true } }
@@ -266,6 +267,7 @@ export const UPDATE_SHOP = gql`
enforce_conversion_category enforce_conversion_category
tt_enforce_hours_for_tech_console tt_enforce_hours_for_tech_console
md_tasks_presets md_tasks_presets
md_ro_guard
employee_teams( employee_teams(
order_by: { name: asc } order_by: { name: asc }
where: { active: { _eq: true } } where: { active: { _eq: true } }

28
client/src/translations/en_us/common.json
View File

@@ -367,6 +367,18 @@
}, },
"md_payment_types": "Payment Types", "md_payment_types": "Payment Types",
"md_referral_sources": "Referral Sources", "md_referral_sources": "Referral Sources",
"md_ro_guard": {
"enabled": "RO Guard Enabled?",
"enforce_ar": "Enforce AR Balance",
"enforce_bills": "Enforce Bill Discrepancy",
"enforce_cm": "Enforce Credit Memo Entry",
"enforce_labor": "Enforce Labor Allocation",
"enforce_ppd": "Enforce PPD Sync",
"enforce_profit": "Enforce Profit Requirement",
"enforce_sublet": "Enforce Sublet Completion",
"masterbypass": "Master Bypass Password (not encrypted)",
"totalgppercent_minimum": "Minimum Total Gross Profit %"
},
"md_tasks_presets": { "md_tasks_presets": {
"enable_tasks": "Enable Hour Flagging", "enable_tasks": "Enable Hour Flagging",
"hourstype": "Hour Types", "hourstype": "Hour Types",
@@ -639,6 +651,7 @@
"laborrates": "Labor Rates", "laborrates": "Labor Rates",
"licensing": "Licensing", "licensing": "Licensing",
"md_parts_scan": "Parts Scan Rules", "md_parts_scan": "Parts Scan Rules",
"md_ro_guard": "RO Guard",
"md_tasks_presets": "Tasks Presets", "md_tasks_presets": "Tasks Presets",
"md_to_emails": "Preset To Emails", "md_to_emails": "Preset To Emails",
"md_to_emails_emails": "Emails", "md_to_emails_emails": "Emails",
@@ -660,6 +673,9 @@
"tax_accounts": "Tax Accounts", "tax_accounts": "Tax Accounts",
"title": "Responsibility Centers" "title": "Responsibility Centers"
}, },
"roguard": {
"title": "RO Guard"
},
"scheduling": "SMART Scheduling", "scheduling": "SMART Scheduling",
"scoreboardsetup": "Scoreboard Setup", "scoreboardsetup": "Scoreboard Setup",
"shopinfo": "Shop Information", "shopinfo": "Shop Information",
@@ -1356,6 +1372,7 @@
}, },
"fields": { "fields": {
"act_price": "Retail Price", "act_price": "Retail Price",
"act_price_before_ppc": "Original Part Price",
"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)", "ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
"assigned_team": "Team", "assigned_team": "Team",
"assigned_team_name": "Team {{name}}", "assigned_team_name": "Team {{name}}",
@@ -1824,6 +1841,7 @@
"scheddates": "Schedule Dates" "scheddates": "Schedule Dates"
}, },
"labels": { "labels": {
"accountsreceivable": "Accounts Receivable",
"act_price_ppc": "New Part Price", "act_price_ppc": "New Part Price",
"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).", "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).", "actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
@@ -1943,6 +1961,7 @@
"mapa": "Paint Materials", "mapa": "Paint Materials",
"markforreexport": "Mark for Re-export", "markforreexport": "Mark for Re-export",
"mash": "Shop Materials", "mash": "Shop Materials",
"masterbypass": "Master Bypass Password",
"materials": { "materials": {
"mapa": "" "mapa": ""
}, },
@@ -1953,6 +1972,7 @@
"othertotal": "Other Totals", "othertotal": "Other Totals",
"outstanding_ar": "A balance is outstanding on this RO. Payments can still be entered when the job is closed. ", "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_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. ", "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.", "outstandinghours": "There are outstanding hours on the job that have not been paid or have been overpaid.",
@@ -1965,6 +1985,7 @@
"partsfilter": "Parts Only", "partsfilter": "Parts Only",
"partssubletstotal": "Parts & Sublets Total", "partssubletstotal": "Parts & Sublets Total",
"partstotal": "Parts Total (ex. Taxes)", "partstotal": "Parts Total (ex. Taxes)",
"performance": "Performance",
"pimraryamountpayable": "Total Primary Payable", "pimraryamountpayable": "Total Primary Payable",
"plitooltips": { "plitooltips": {
"billtotal": "The total amount of all bill lines that have been posted against this RO (not including credits, taxes, or labor adjustments).", "billtotal": "The total amount of all bill lines that have been posted against this RO (not including credits, taxes, or labor adjustments).",
@@ -1979,8 +2000,8 @@
"totalreturns": "The total <b>retail</b> amount of returns created for this job." "totalreturns": "The total <b>retail</b> amount of returns created for this job."
}, },
"ppc": "This line contains a part price change.", "ppc": "This line contains a part price change.",
"ppdnotexported": "PPDs not Exported",
"profileadjustments": "Profile Disc./Mkup", "profileadjustments": "Profile Disc./Mkup",
"profitbypassrequired": "Profit margin requirements not met. Bypass password required.",
"prt_dsmk_total": "Line Item Adjustment", "prt_dsmk_total": "Line Item Adjustment",
"rates": "Rates", "rates": "Rates",
"rates_subtotal": "All Rates Subtotal", "rates_subtotal": "All Rates Subtotal",
@@ -2000,6 +2021,11 @@
"relatedros": "Related ROs", "relatedros": "Related ROs",
"remove_from_ar": "Remove from AR", "remove_from_ar": "Remove from AR",
"returntotals": "Return Totals", "returntotals": "Return Totals",
"ro_guard": {
"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."
},
"roguard": "RO Guard",
"roguardwarnings": "RO Guard Warnings", "roguardwarnings": "RO Guard Warnings",
"rosaletotal": "RO Parts Total", "rosaletotal": "RO Parts Total",
"sale_additional": "Sales - Additional", "sale_additional": "Sales - Additional",

28
client/src/translations/es/common.json
View File

@@ -367,6 +367,18 @@
}, },
"md_payment_types": "", "md_payment_types": "",
"md_referral_sources": "", "md_referral_sources": "",
"md_ro_guard": {
"enabled": "",
"enforce_ar": "",
"enforce_bills": "",
"enforce_cm": "",
"enforce_labor": "",
"enforce_ppd": "",
"enforce_profit": "",
"enforce_sublet": "",
"masterbypass": "",
"totalgppercent_minimum": ""
},
"md_tasks_presets": { "md_tasks_presets": {
"enable_tasks": "", "enable_tasks": "",
"hourstype": "", "hourstype": "",
@@ -639,6 +651,7 @@
"laborrates": "", "laborrates": "",
"licensing": "", "licensing": "",
"md_parts_scan": "", "md_parts_scan": "",
"md_ro_guard": "",
"md_tasks_presets": "", "md_tasks_presets": "",
"md_to_emails": "", "md_to_emails": "",
"md_to_emails_emails": "", "md_to_emails_emails": "",
@@ -660,6 +673,9 @@
"tax_accounts": "", "tax_accounts": "",
"title": "" "title": ""
}, },
"roguard": {
"title": ""
},
"scheduling": "", "scheduling": "",
"scoreboardsetup": "", "scoreboardsetup": "",
"shopinfo": "", "shopinfo": "",
@@ -1356,6 +1372,7 @@
}, },
"fields": { "fields": {
"act_price": "Precio actual", "act_price": "Precio actual",
"act_price_before_ppc": "",
"ah_detail_line": "", "ah_detail_line": "",
"assigned_team": "", "assigned_team": "",
"assigned_team_name": "", "assigned_team_name": "",
@@ -1824,6 +1841,7 @@
"scheddates": "" "scheddates": ""
}, },
"labels": { "labels": {
"accountsreceivable": "",
"act_price_ppc": "", "act_price_ppc": "",
"actual_completion_inferred": "", "actual_completion_inferred": "",
"actual_delivery_inferred": "", "actual_delivery_inferred": "",
@@ -1943,6 +1961,7 @@
"mapa": "", "mapa": "",
"markforreexport": "", "markforreexport": "",
"mash": "", "mash": "",
"masterbypass": "",
"materials": { "materials": {
"mapa": "" "mapa": ""
}, },
@@ -1953,6 +1972,7 @@
"othertotal": "", "othertotal": "",
"outstanding_ar": "", "outstanding_ar": "",
"outstanding_credit_memos": "", "outstanding_credit_memos": "",
"outstanding_ppd": "",
"outstanding_reconciliation_discrep": "", "outstanding_reconciliation_discrep": "",
"outstanding_sublets": "", "outstanding_sublets": "",
"outstandinghours": "", "outstandinghours": "",
@@ -1965,6 +1985,7 @@
"partsfilter": "", "partsfilter": "",
"partssubletstotal": "", "partssubletstotal": "",
"partstotal": "", "partstotal": "",
"performance": "",
"pimraryamountpayable": "", "pimraryamountpayable": "",
"plitooltips": { "plitooltips": {
"billtotal": "", "billtotal": "",
@@ -1979,8 +2000,8 @@
"totalreturns": "" "totalreturns": ""
}, },
"ppc": "", "ppc": "",
"ppdnotexported": "",
"profileadjustments": "", "profileadjustments": "",
"profitbypassrequired": "",
"prt_dsmk_total": "", "prt_dsmk_total": "",
"rates": "Tarifas", "rates": "Tarifas",
"rates_subtotal": "", "rates_subtotal": "",
@@ -2000,6 +2021,11 @@
"relatedros": "", "relatedros": "",
"remove_from_ar": "", "remove_from_ar": "",
"returntotals": "", "returntotals": "",
"ro_guard": {
"enforce_validation": "",
"enforced": ""
},
"roguard": "",
"roguardwarnings": "", "roguardwarnings": "",
"rosaletotal": "", "rosaletotal": "",
"sale_additional": "", "sale_additional": "",

28
client/src/translations/fr/common.json
View File

@@ -367,6 +367,18 @@
}, },
"md_payment_types": "", "md_payment_types": "",
"md_referral_sources": "", "md_referral_sources": "",
"md_ro_guard": {
"enabled": "",
"enforce_ar": "",
"enforce_bills": "",
"enforce_cm": "",
"enforce_labor": "",
"enforce_ppd": "",
"enforce_profit": "",
"enforce_sublet": "",
"masterbypass": "",
"totalgppercent_minimum": ""
},
"md_tasks_presets": { "md_tasks_presets": {
"enable_tasks": "", "enable_tasks": "",
"hourstype": "", "hourstype": "",
@@ -639,6 +651,7 @@
"laborrates": "", "laborrates": "",
"licensing": "", "licensing": "",
"md_parts_scan": "", "md_parts_scan": "",
"md_ro_guard": "",
"md_tasks_presets": "", "md_tasks_presets": "",
"md_to_emails": "", "md_to_emails": "",
"md_to_emails_emails": "", "md_to_emails_emails": "",
@@ -660,6 +673,9 @@
"tax_accounts": "", "tax_accounts": "",
"title": "" "title": ""
}, },
"roguard": {
"title": ""
},
"scheduling": "", "scheduling": "",
"scoreboardsetup": "", "scoreboardsetup": "",
"shopinfo": "", "shopinfo": "",
@@ -1356,6 +1372,7 @@
}, },
"fields": { "fields": {
"act_price": "Prix actuel", "act_price": "Prix actuel",
"act_price_before_ppc": "",
"ah_detail_line": "", "ah_detail_line": "",
"assigned_team": "", "assigned_team": "",
"assigned_team_name": "", "assigned_team_name": "",
@@ -1824,6 +1841,7 @@
"scheddates": "" "scheddates": ""
}, },
"labels": { "labels": {
"accountsreceivable": "",
"act_price_ppc": "", "act_price_ppc": "",
"actual_completion_inferred": "", "actual_completion_inferred": "",
"actual_delivery_inferred": "", "actual_delivery_inferred": "",
@@ -1943,6 +1961,7 @@
"mapa": "", "mapa": "",
"markforreexport": "", "markforreexport": "",
"mash": "", "mash": "",
"masterbypass": "",
"materials": { "materials": {
"mapa": "" "mapa": ""
}, },
@@ -1953,6 +1972,7 @@
"othertotal": "", "othertotal": "",
"outstanding_ar": "", "outstanding_ar": "",
"outstanding_credit_memos": "", "outstanding_credit_memos": "",
"outstanding_ppd": "",
"outstanding_reconciliation_discrep": "", "outstanding_reconciliation_discrep": "",
"outstanding_sublets": "", "outstanding_sublets": "",
"outstandinghours": "", "outstandinghours": "",
@@ -1965,6 +1985,7 @@
"partsfilter": "", "partsfilter": "",
"partssubletstotal": "", "partssubletstotal": "",
"partstotal": "", "partstotal": "",
"performance": "",
"pimraryamountpayable": "", "pimraryamountpayable": "",
"plitooltips": { "plitooltips": {
"billtotal": "", "billtotal": "",
@@ -1979,8 +2000,8 @@
"totalreturns": "" "totalreturns": ""
}, },
"ppc": "", "ppc": "",
"ppdnotexported": "",
"profileadjustments": "", "profileadjustments": "",
"profitbypassrequired": "",
"prt_dsmk_total": "", "prt_dsmk_total": "",
"rates": "Les taux", "rates": "Les taux",
"rates_subtotal": "", "rates_subtotal": "",
@@ -2000,6 +2021,11 @@
"relatedros": "", "relatedros": "",
"remove_from_ar": "", "remove_from_ar": "",
"returntotals": "", "returntotals": "",
"ro_guard": {
"enforce_validation": "",
"enforced": ""
},
"roguard": "",
"roguardwarnings": "", "roguardwarnings": "",
"rosaletotal": "", "rosaletotal": "",
"sale_additional": "", "sale_additional": "",

6
client/src/utils/instanceRenderMgr.js
View File

@@ -25,7 +25,11 @@ export default function InstanceRenderManager({
propToReturn = imex; propToReturn = imex;
break; break;
case 'ROME': case 'ROME':
propToReturn = rome; //TODO:AIO Implement USE_IMEX if (rome === 'USE_IMEX') {
propToReturn = imex;
} else {
propToReturn = rome;
}
break; break;
case 'PROMANAGER': case 'PROMANAGER':
//Return the rome prop if USE_ROME. //Return the rome prop if USE_ROME.