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

RO Closer bug fixes.

Browse Source
This commit is contained in:
Patrick Fic
2024-04-04 20:41:39 -07:00
parent c4d39cf3d3
commit 96242a555a
10 changed files with 340 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
bodyshop_translations.babel
View File

@@ -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 BabelEdit project file
@@ -34201,6 +34201,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>profits</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>prt_dsmk_total</name> <name>prt_dsmk_total</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -34566,6 +34587,153 @@
<folder_node> <folder_node>
<name>ro_guard</name> <name>ro_guard</name>
<children> <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>
<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_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> <concept_node>
<name>enforce_validation</name> <name>enforce_validation</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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

@@ -56,6 +56,7 @@ export function JobCloseRoGuardLabor({ job, jobRO, bodyshop, form, warningCallba
adjustments={data ? data.jobs_by_pk.lbr_adjustments : []} adjustments={data ? data.jobs_by_pk.lbr_adjustments : []}
showWarning showWarning
warningCallback={warningCallback} warningCallback={warningCallback}
disabled={true}
/> />
); );
} }

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

@@ -40,7 +40,7 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
}, [job, total]); }, [job, total]);
useEffect(() => { useEffect(() => {
if (balance.getAmount !== 0) { 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]); }, [balance, t, warningCallback]);
@@ -54,7 +54,7 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
> >
{balance.toFormat()} {balance.toFormat()}
</DataLabel> </DataLabel>
{balance.getAmount !== 0 && ( {balance.getAmount() !== 0 && (
<Alert <Alert
style={{ margin: '8px 0px' }} style={{ margin: '8px 0px' }}
type="warning" type="warning"

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

@@ -1,24 +1,25 @@
import React, { useCallback, useState } from 'react'; import React, { useCallback, useState } from "react";
import { LockOutlined } from '@ant-design/icons'; import { LockOutlined } from "@ant-design/icons";
import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } 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";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from '../../redux/user/user.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import JobCloseRoGuardLabor from './job-close-ro-gaurd.labor'; import JobCloseRoGuardLabor from "./job-close-ro-gaurd.labor";
import JobCloseRoGuardAr from './job-close-ro-guard.ar'; import JobCloseRoGuardAr from "./job-close-ro-guard.ar";
import JobCloseRoGuardBills from './job-close-ro-guard.bills'; import JobCloseRoGuardBills from "./job-close-ro-guard.bills";
import JobCloseRoGuardPpd from './job-close-ro-guard.ppd'; import JobCloseRoGuardPpd from "./job-close-ro-guard.ppd";
import JobCloseRoGuardProfit from './job-close-ro-guard.profit'; import JobCloseRoGuardProfit from "./job-close-ro-guard.profit";
import './job-close-ro-guard.styles.scss'; import "./job-close-ro-guard.styles.scss";
import JobCloseRoGuardSublet from './job-close-ro-guard.sublet'; import JobCloseRoGuardSublet from "./job-close-ro-guard.sublet";
import JobCloseRoGuardTtLifecycle from './job-close-ro-guard.tt-lifecycle'; import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -47,7 +48,7 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
title={ title={
<Space size="small"> <Space size="small">
<Badge count={warnings.length} /> <Badge count={warnings.length} />
{t('jobs.labels.roguardwarnings')} {t("jobs.labels.roguardwarnings")}
</Space> </Space>
} }
> >
@@ -55,8 +56,8 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
{warnings.map((w, index) => ( {warnings.map((w, index) => (
<li key={index}> <li key={index}>
{bodyshop.md_ro_guard[`enforce_${w.key}`] && ( {bodyshop.md_ro_guard[`enforce_${w.key}`] && (
<Tooltip title={t('jobs.labels.ro_guard.enforced')}> <Tooltip title={t("jobs.labels.ro_guard.enforced")}>
<LockOutlined style={{ color: 'tomato', marginRight: '8px' }} /> <LockOutlined style={{ color: "tomato", marginRight: "8px" }} />
</Tooltip> </Tooltip>
)} )}
{w.warning} {w.warning}
@@ -67,11 +68,13 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
)} )}
<Collapse> <Collapse>
<Collapse.Panel forceRender key="roguard" header={t('jobs.labels.roguard')}> <Collapse.Panel forceRender key="roguard" header={t("jobs.labels.roguard")}>
<Row gutter={[32, 32]}> <Row gutter={[32, 32]}>
<JobCloseRoGuardBills job={job} form={form} warningCallback={warningCallback} /> <Col span={24}>
<JobCloseRoGuardBills job={job} form={form} warningCallback={warningCallback} />
</Col>
<Col className="ro-guard-col-multiple" md={24} lg={6}> <Col className="ro-guard-col-multiple" md={24} lg={6}>
<Row gutter={[32, 32]} style={{ height: '100%' }}> <Row gutter={[32, 32]} style={{ height: "100%" }}>
<Col span={24}> <Col span={24}>
<JobCloseRoGuardProfit <JobCloseRoGuardProfit
job={job} job={job}
@@ -85,7 +88,7 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
</Col> </Col>
<Col className="ro-guard-col-50" 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} /> {InstanceRenderManager({ rome: <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} />
@@ -93,128 +96,127 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
</Row> </Row>
<Form.Item <Form.Item
name="masterbypass" name="masterbypass"
label={t('jobs.labels.masterbypass')} label={t("jobs.labels.masterbypass")}
rules={[ rules={[
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_bills && bodyshop.md_ro_guard.enforce_bills &&
warnings.find((w) => w.key === 'bills') warnings.find((w) => w.key === "bills")
) { ) {
return Promise.reject(t('jobs.labels.ro_guard.enforce_bills')); return Promise.reject(
t("jobs.labels.ro_guard.enforce_validation", {
message: t("jobs.labels.ro_guard.enforce_bills")
})
);
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_cm && bodyshop.md_ro_guard.enforce_cm &&
warnings.find((w) => w.key === 'cm') warnings.find((w) => w.key === "cm")
) { ) {
return Promise.reject( return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', { t("jobs.labels.ro_guard.enforce_validation", {
message: t('jobs.labels.ro_guard.enforce_cm'), message: t("jobs.labels.ro_guard.enforce_cm")
}) })
); );
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_profit && bodyshop.md_ro_guard.enforce_profit &&
warnings.find((w) => w.key === 'profit') warnings.find((w) => w.key === "profit")
) { ) {
return Promise.reject( return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', { t("jobs.labels.ro_guard.enforce_validation", {
message: t('jobs.labels.ro_guard.enforce_profit'), message: t("jobs.labels.ro_guard.enforce_profit")
}) })
); );
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_ar && bodyshop.md_ro_guard.enforce_ar &&
warnings.find((w) => w.key === 'ar') warnings.find((w) => w.key === "ar")
) { ) {
return Promise.reject( return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', { t("jobs.labels.ro_guard.enforce_validation", {
message: t('jobs.labels.ro_guard.enforce_ar'), message: t("jobs.labels.ro_guard.enforce_ar")
}) })
); );
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_sublet && bodyshop.md_ro_guard.enforce_sublet &&
warnings.find((w) => w.key === 'sublet') warnings.find((w) => w.key === "sublet")
) { ) {
return Promise.reject( return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', { t("jobs.labels.ro_guard.enforce_validation", {
message: t('jobs.labels.ro_guard.enforce_sublet'), message: t("jobs.labels.ro_guard.enforce_sublet")
}) })
); );
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_ppd && bodyshop.md_ro_guard.enforce_ppd &&
warnings.find((w) => w.key === 'ppd') warnings.find((w) => w.key === "ppd")
) { ) {
return Promise.reject( return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', { t("jobs.labels.ro_guard.enforce_validation", {
message: t('jobs.labels.ro_guard.enforce_ppd'), message: t("jobs.labels.ro_guard.enforce_ppd")
}) })
); );
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(_, value) { validator(_, value) {
if ( if (
!PasswordCheck({ bodyshop, value }) && !PasswordCheck({ bodyshop, value }) &&
bodyshop.md_ro_guard.enforce_labor && bodyshop.md_ro_guard.enforce_labor &&
warnings.find((w) => w.key === 'labor') warnings.find((w) => w.key === "labor")
) { ) {
return Promise.reject( return Promise.reject(
t('translation.jobs.labels.ro_guard.enforce_validation', { t("jobs.labels.ro_guard.enforce_validation", {
message: t('jobs.labels.ro_guard.enforce_labor'), message: t("jobs.labels.ro_guard.enforce_labor")
}) })
); );
} }
return Promise.resolve(); return Promise.resolve();
}, }
}), })
]} ]}
> >
<Input <Input prefix={<LockOutlined />} type="password" placeholder="Password" disabled={jobRO} />
prefix={<LockOutlined />}
type="password"
placeholder="Password"
disabled={jobRO}
/>
</Form.Item> </Form.Item>
</Collapse.Panel> </Collapse.Panel>
<Collapse.Panel header={t('jobs.labels.performance')}> <Collapse.Panel header={t("jobs.labels.performance")}>
<Row gutter={[32, 32]}> <Row gutter={[32, 32]}>
<Col className="ro-guard-col" span={24}> <Col className="ro-guard-col" span={24}>
<JobCloseRoGuardTtLifecycle job={job} /> <JobCloseRoGuardTtLifecycle job={job} />

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

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

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

@@ -26,7 +26,8 @@ export function LaborAllocationsTable({
adjustments, adjustments,
technician, technician,
showWarning, showWarning,
warningCallback warningCallback,
disabled
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [totals, setTotals] = useState([]); const [totals, setTotals] = useState([]);
@@ -82,7 +83,7 @@ export function LaborAllocationsTable({
render: (text, record) => ( render: (text, record) => (
<Space wrap> <Space wrap>
{record.adjustments.toFixed(1)} {record.adjustments.toFixed(1)}
{!technician && ( {!technician && !disabled && (
<LaborAllocationsAdjustmentEdit <LaborAllocationsAdjustmentEdit
jobId={jobId} jobId={jobId}
adjustments={adjustments} adjustments={adjustments}

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

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

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

@@ -2003,6 +2003,7 @@
"ppc": "This line contains a part price change.", "ppc": "This line contains a part price change.",
"ppdnotexported": "PPDs not Exported", "ppdnotexported": "PPDs not Exported",
"profileadjustments": "Profile Disc./Mkup", "profileadjustments": "Profile Disc./Mkup",
"profits": "Job Profits",
"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",
@@ -2023,6 +2024,13 @@
"remove_from_ar": "Remove from AR", "remove_from_ar": "Remove from AR",
"returntotals": "Return Totals", "returntotals": "Return Totals",
"ro_guard": { "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_sublet": "Sublet completion enforced.",
"enforce_validation": "Master Bypass Required: {{message}}", "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." "enforced": "This check has been enforced by your shop manager. Enter the master bypass password to close the Job."
}, },

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

@@ -2003,6 +2003,7 @@
"ppc": "", "ppc": "",
"ppdnotexported": "", "ppdnotexported": "",
"profileadjustments": "", "profileadjustments": "",
"profits": "",
"prt_dsmk_total": "", "prt_dsmk_total": "",
"rates": "Tarifas", "rates": "Tarifas",
"rates_subtotal": "", "rates_subtotal": "",
@@ -2023,6 +2024,13 @@
"remove_from_ar": "", "remove_from_ar": "",
"returntotals": "", "returntotals": "",
"ro_guard": { "ro_guard": {
"eforce_profit": "",
"enforce_ar": "",
"enforce_bills": "",
"enforce_cm": "",
"enforce_labor": "",
"enforce_ppd": "",
"enforce_sublet": "",
"enforce_validation": "", "enforce_validation": "",
"enforced": "" "enforced": ""
}, },

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

@@ -2003,6 +2003,7 @@
"ppc": "", "ppc": "",
"ppdnotexported": "", "ppdnotexported": "",
"profileadjustments": "", "profileadjustments": "",
"profits": "",
"prt_dsmk_total": "", "prt_dsmk_total": "",
"rates": "Les taux", "rates": "Les taux",
"rates_subtotal": "", "rates_subtotal": "",
@@ -2023,6 +2024,13 @@
"remove_from_ar": "", "remove_from_ar": "",
"returntotals": "", "returntotals": "",
"ro_guard": { "ro_guard": {
"eforce_profit": "",
"enforce_ar": "",
"enforce_bills": "",
"enforce_cm": "",
"enforce_labor": "",
"enforce_ppd": "",
"enforce_sublet": "",
"enforce_validation": "", "enforce_validation": "",
"enforced": "" "enforced": ""
}, },