RO into IO merge as of 02/05/2024.

This commit is contained in:
Patrick Fic
2024-02-12 12:22:05 -08:00
211 changed files with 31134 additions and 25729 deletions

View File

@@ -43,5 +43,4 @@ export default function AddToProduction(
//insert the new job. call the callback with the returned ID when done.
return;
}

View File

@@ -50,6 +50,8 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(setModalContext({context: context, modal: "cardPayment"})),
insertAuditTrail: ({jobid, operation}) =>
dispatch(insertAuditTrail({jobid, operation})),
setTimeTicketTaskContext: (context) =>
dispatch(setModalContext({context: context, modal: "timeTicketTask"})),
setEmailOptions: (e) => dispatch(setEmailOptions(e)),
openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
setMessage: (text) => dispatch(setMessage(text)),
@@ -70,7 +72,8 @@ export function JobsDetailHeaderActions({
insertAuditTrail,
setEmailOptions,
openChatByPhone,
setMessage
setMessage,
setTimeTicketTaskContext,
}) {
const {t} = useTranslation();
const client = useApolloClient();
@@ -678,7 +681,23 @@ export function JobsDetailHeaderActions({
},
});
}
},
}];
if (bodyshop.md_tasks_presets.enable_tasks) {
menuItems.push({
key: 'claimtimetickettasks',
disabled: !job.converted || (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced),
onClick: () => {
setTimeTicketTaskContext({
actions: {},
context: {jobid: job.id},
});
},
label: t("timetickets.actions.claimtasks")
});
}
menuItems.push(
{
key: 'enterpayments',
disabled: !job.converted,
@@ -691,7 +710,7 @@ export function JobsDetailHeaderActions({
context: {jobid: job.id},
});
}
}];
});
if (ImEXPay.treatment === "on") {
menuItems.push({

View File

@@ -59,7 +59,7 @@ export default async function DuplicateJob(
//insert the new job. call the callback with the returned ID when done.
return;
return;
}
export async function CreateIouForJob(