@7365admin1/core 3.50.1-staging.217 → 3.50.1-staging.218

package/dist/index.d.ts

@@ -4557,6 +4557,12 @@ type TVisitorTransaction = {
     createdBy?: string | ObjectId;
     updatedBy?: string | ObjectId;
     isMembersAdded?: boolean;
+    approval?: {
+        approvedBy?: string | ObjectId;
+        status?: VisitorStatus;
+        remarks?: string;
+        approvedAt?: string | Date;
+    };
 };
 declare const schemaVisitorTransaction: Joi.ObjectSchema<any>;
 /**

package/dist/index.js

@@ -19707,7 +19707,18 @@ var schemaUpdateVisTrans = import_joi21.default.object({
       contact: import_joi21.default.string().optional().allow(null, "")
     })
   ).optional().allow(null),
-  updatedBy: import_joi21.default.string().hex().length(24).optional()
+  updatedBy: import_joi21.default.string().hex().length(24).optional(),
+  // Audit trail for the Approve/Reject action on a self-service submission -
+  // `status` here drives the transition (and is mirrored onto the top-level
+  // `status` field by the controller, since that's what list/report queries
+  // filter on); `approvedBy`/`approvedAt`/`remarks` are kept nested so the
+  // "who/when/why" doesn't crowd the top-level document shape.
+  approval: import_joi21.default.object({
+    approvedBy: import_joi21.default.string().hex().length(24).optional().allow(null, ""),
+    status: import_joi21.default.string().valid("approved" /* APPROVED */, "rejected" /* REJECTED */).optional(),
+    remarks: import_joi21.default.string().optional().allow(null, ""),
+    approvedAt: import_joi21.default.date().iso().optional()
+  }).optional()
 });
 function MVisitorTransaction(value) {
   const { error } = schemaVisitorTransaction.validate(value, {
@@ -54634,10 +54645,13 @@ function useVisitorTransactionController() {
       return;
     }
     try {
-      const nextStatus = req.body.status;
+      const approval = req.body.approval;
+      const nextStatus = approval?.status ?? req.body.status;
+      const remarks = approval?.remarks ?? req.body.remarks;
       const isApprovalTransition = nextStatus === "approved" /* APPROVED */ || nextStatus === "rejected" /* REJECTED */;
       const current = isApprovalTransition ? await _getVisitorTransactionById(_id) : null;
-      await _updateVisitorTransactionById(_id, req.body);
+      const updateBody = approval ? { ...req.body, status: nextStatus } : req.body;
+      await _updateVisitorTransactionById(_id, updateBody);
       if (isApprovalTransition && current && current.type === "guest" /* GUEST */ && current.email && current.status !== nextStatus) {
         try {
           if (nextStatus === "approved" /* APPROVED */) {
@@ -54672,7 +54686,7 @@ function useVisitorTransactionController() {
               handlebar: "self-service-visitor-rejected",
               context: {
                 name: current.name,
-                remarks: req.body.remarks || ""
+                remarks: remarks || ""
               }
             });
             await sendEmail({