Merge branch 'master-beta' into master-AIO

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -29,6 +29,7 @@ export default function AddToProduction(
                 insertAuditTrail({
                     jobid: jobId,
                     operation: AuditTrailMapping.jobinproductionchange(!remove),
+                    type: "jobinproductionchange",
                 })
             );
             if (completionCallback) completionCallback();

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -50,8 +50,8 @@ const mapDispatchToProps = (dispatch) => ({
         dispatch(setModalContext({context: context, modal: "timeTicket"})),
     setCardPaymentContext: (context) =>
         dispatch(setModalContext({context: context, modal: "cardPayment"})),
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({ jobid, operation, type }) =>
+        dispatch(insertAuditTrail({ jobid, operation, type })),
     setTimeTicketTaskContext: (context) =>
         dispatch(setModalContext({context: context, modal: "timeTicketTask"})),
     setEmailOptions: (e) => dispatch(setEmailOptions(e)),
@@ -242,6 +242,11 @@ export function JobsDetailHeaderActions({
                             message: JSON.stringify(result.errors),
                         }),
                     });
+                    insertAuditTrail({
+                        jobid: job.id,
+                        operation: AuditTrailMapping.jobvoid(),
+                        type: "jobvoid",
+                    });
                     return;
                 }
                 if (e.key === "email")
@@ -356,6 +361,11 @@ export function JobsDetailHeaderActions({
             notification["success"]({
                 message: t("jobs.successes.voided"),
             });
+            insertAuditTrail({
+                jobid: job.id,
+                operation: AuditTrailMapping.jobvoid(),
+                type: "jobvoid",
+            });
             //go back to jobs list.
             history(`/manage/`);
         } else {
@@ -472,9 +482,29 @@ export function JobsDetailHeaderActions({
                     ? !job.production_vars.alert
                     : true
             ),
+            type: "alertToggle",
         });
     };
 
+  const handleSuspend = (e) => {
+    logImEXEvent("production_toggle_alert");
+    //e.stopPropagation();
+    updateJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          suspended: !job.suspended,
+        },
+      },
+    });
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobsuspend(
+        !!job.suspended ? !job.suspended : true
+      ),
+      type: "jobsuspend",
+    });
+  };
 
     // Function to handle OK
     const handleCancelScheduleOK = async () => {
@@ -504,24 +534,12 @@ export function JobsDetailHeaderActions({
                 jobid: job.id,
                 operation:
                     AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                type: "appointmentcancel",
             });
 
         }
     };
 
-    const handleSuspend = (e) => {
-        logImEXEvent("production_toggle_alert");
-        //e.stopPropagation();
-        updateJob({
-            variables: {
-                jobId: job.id,
-                job: {
-                    suspended: !job.suspended,
-                },
-            },
-        });
-    };
-
     const popOverContent = (
         <Card>
             <div>