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

feature/IO-3255-simplified-parts-management - Bug Fixes

Browse Source
This commit is contained in:
Dave
2025-08-15 13:20:17 -04:00
parent 5e90504e56
commit cc232eac93
2 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -322,19 +322,17 @@ export function JobLinesComponent({
render: (text, record) => ( render: (text, record) => (
<Space> <Space>
{(record.manual_line || jobIsPrivate) && !technician && ( {(record.manual_line || jobIsPrivate) && !technician && (
<> <Button
<Button disabled={jobRO}
disabled={jobRO} onClick={() => {
onClick={() => { setJobLineEditContext({
setJobLineEditContext({ actions: { refetch: refetch, submit: form && form.submit },
actions: { refetch: refetch, submit: form && form.submit }, context: { ...record, jobid: job.id }
context: { ...record, jobid: job.id } });
}); }}
}} >
> <EditFilled />
<EditFilled /> </Button>
</Button>
</>
)} )}
<Button <Button
title={t("tasks.buttons.create")} title={t("tasks.buttons.create")}
@@ -350,31 +348,29 @@ export function JobLinesComponent({
<FaTasks /> <FaTasks />
</Button> </Button>
{(record.manual_line || jobIsPrivate) && !technician && ( {(record.manual_line || jobIsPrivate) && !technician && (
<> <Button
<Button disabled={jobRO}
disabled={jobRO} onClick={async () => {
onClick={async () => { await deleteJobLine({
await deleteJobLine({ variables: { joblineId: record.id },
variables: { joblineId: record.id }, update(cache) {
update(cache) { cache.modify({
cache.modify({ fields: {
fields: { joblines(existingJobLines, { readField }) {
joblines(existingJobLines, { readField }) { return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
}
} }
}); }
} });
}); }
await axios.post("/job/totalsssu", { });
id: job.id await axios.post("/job/totalsssu", {
}); id: job.id
refetch && refetch(); });
}} if (refetch) refetch();
> }}
<DeleteFilled /> >
</Button> <DeleteFilled />
</> </Button>
)} )}
</Space> </Space>
) )

16
client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
View File

@@ -14,16 +14,26 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
import { selectTechnician } from "../../redux/tech/tech.selectors"; import { selectTechnician } from "../../redux/tech/tech.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings"; import AuditTrailMapping from "../../utils/AuditTrailMappings";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
technician: selectTechnician technician: selectTechnician,
isPartsEntry: selectIsPartsEntry
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type })) insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
}); });
export default connect(mapStateToProps, mapDispatchToProps)(JobLineConvertToLabor); export default connect(mapStateToProps, mapDispatchToProps)(JobLineConvertToLabor);
export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail, technician, ...otherBtnProps }) { export function JobLineConvertToLabor({
children,
jobline,
job,
insertAuditTrail,
technician,
isPartsEntry,
...otherBtnProps
}) {
const { t } = useTranslation(); const { t } = useTranslation();
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
@@ -168,7 +178,7 @@ export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail
return ( return (
<> <>
{children} {children}
{jobline.act_price !== 0 && !technician && ( {!isPartsEntry && jobline.act_price !== 0 && !technician && (
<Popover disabled={jobline.convertedtolbr} content={overlay} open={visibility} placement="bottom"> <Popover disabled={jobline.convertedtolbr} content={overlay} open={visibility} placement="bottom">
<Tooltip title={t("joblines.actions.converttolabor")}> <Tooltip title={t("joblines.actions.converttolabor")}>
<Button <Button