({
- insertAuditTrail: ({jobid, operation}) =>
- dispatch(insertAuditTrail({jobid, operation})),
+ insertAuditTrail: ({ jobid, operation }) =>
+ dispatch(insertAuditTrail({ jobid, operation })),
});
export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
-export function JobsAdminStatus({insertAuditTrail, bodyshop, job}) {
- const {t} = useTranslation();
+export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
+ const { t } = useTranslation();
- const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
- const updateJobStatus = (status) => {
- mutationUpdateJobstatus({
- variables: {jobId: job.id, status: status},
- })
- .then((r) => {
- notification["success"]({message: t("jobs.successes.save")});
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.admin_jobstatuschange(status),
- });
- // refetch();
- })
- .catch((error) => {
- notification["error"]({message: t("jobs.errors.saving")});
- });
- };
+ const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
+ const updateJobStatus = (status) => {
+ mutationUpdateJobstatus({
+ variables: { jobId: job.id, status: status },
+ })
+ .then((r) => {
+ notification["success"]({ message: t("jobs.successes.save") });
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.admin_jobstatuschange(status),
+ });
+ // refetch();
+ })
+ .catch((error) => {
+ notification["error"]({ message: t("jobs.errors.saving") });
+ });
+ };
- const statusMenu = {
- items: bodyshop.md_ro_statuses.statuses.map((item) => ({
- key: item,
- label: item,
- })),
- onClick: (e) => {
- updateJobStatus(e.key);
- },
- }
+ const statusMenu = {
+ items: bodyshop.md_ro_statuses.statuses.map((item) => ({
+ key: item,
+ label: item,
+ })),
+ onClick: (e) => {
+ updateJobStatus(e.key);
+ },
+ }
return (
<>
@@ -56,7 +56,7 @@ export function JobsAdminStatus({insertAuditTrail, bodyshop, job}) {
>
diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
index 5660b0aca..e95bba6d7 100644
--- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
+++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
@@ -76,7 +76,7 @@ export function JobAdminMarkReexport({
const result = await markJobExported({
variables: {
jobId: job.id,
- date_exported: moment(),
+ date_exported: dayjs(),
default_exported: bodyshop.md_ro_statuses.default_exported,
},
});
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index c15c1e217..8e54565f9 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -732,12 +732,7 @@ export function JobsDetailHeaderActions({
menuItems.push({
key: 'cccontract',
disabled: jobRO || !job.converted,
- label:
+ label:
{t("menus.jobsactions.newcccontract")}
});
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.taxes.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.taxes.component.jsx
index 0a6e85e3e..739d3a3f9 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.taxes.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.taxes.component.jsx
@@ -42,8 +42,13 @@ export function JobsDetailRatesTaxes({
})
);
}
- formItems.push(Space({children: section, wrap: true}));
- formItems.push(
);
+ formItems.push(<>
+
+ {section}
+
+
+ >)
+
}
return (
diff --git a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
index 59874e0d6..d5b69ec58 100644
--- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
+++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
@@ -220,12 +220,12 @@ export function PayableExportAll({
setLoading(false);
};
- if (bodyshop.pbs_serialnumber)
- return (
-
-
-
- );
+ if (bodyshop.pbs_serialnumber)
+ return (
+
+
+
+ );
return (