Merge release / update

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();
@@ -40,8 +41,4 @@ export default function AddToProduction(
                 }),
             });
         });
-
-    //insert the new job. call the callback with the returned ID when done.
-
-    return;
 }

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

@@ -48,8 +48,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 })),
     setEmailOptions: (e) => dispatch(setEmailOptions(e)),
     openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
     setMessage: (text) => dispatch(setMessage(text)),
@@ -240,6 +240,7 @@ export function JobsDetailHeaderActions({
                     insertAuditTrail({
                         jobid: job.id,
                         operation: AuditTrailMapping.jobvoid(),
+                        type: "jobvoid",
                     });
                     return;
                 }
@@ -461,6 +462,7 @@ export function JobsDetailHeaderActions({
                                 ? !job.production_vars.alert
                                 : true,
                     },
+                    type: "alertToggle",
                 },
             },
         });
@@ -490,6 +492,7 @@ export function JobsDetailHeaderActions({
       operation: AuditTrailMapping.jobsuspend(
         !!job.suspended ? !job.suspended : true
       ),
+      type: "jobsuspend",
     });
   };
 
@@ -521,6 +524,7 @@ export function JobsDetailHeaderActions({
                 jobid: job.id,
                 operation:
                     AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                type: "appointmentcancel",
             });
 
         }