@7365admin1/core 3.52.1-staging.230 → 3.52.1-staging.231

package/dist/index.d.ts

@@ -4664,6 +4664,7 @@ type TVisitorTransaction = {
     status?: VisitorStatus;
     nric?: string;
     remarks?: string;
+    invitationNote?: string;
     org?: string | ObjectId;
     site?: string | ObjectId;
     plateNumber?: string;
@@ -4743,6 +4744,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     checkOut: string | Date | null | undefined;
     status: VisitorStatus | undefined;
     remarks: string | undefined;
+    invitationNote: string | undefined;
     deliveryType: string | undefined;
     attachments: string[] | undefined;
     snapshotEntryImage: string | undefined;
@@ -7023,6 +7025,10 @@ interface AdditionalSettings {
             vendorId: string | null | number;
             productId: string | null | number;
         };
+        invitationNote?: {
+            isEnabled: boolean;
+            text: string;
+        };
     };
 }
 type TAccessMngmntSettings = {

package/dist/index.js

@@ -19589,6 +19589,7 @@ var schemaVisitorTransaction = import_joi21.default.object({
   deliveryType: import_joi21.default.string().optional().allow(null, ""),
   status: import_joi21.default.string().optional().valid(...Object.values(VisitorStatus)).default("registered" /* REGISTERED */),
   remarks: import_joi21.default.string().optional().allow(null, ""),
+  invitationNote: import_joi21.default.string().optional().allow(null, ""),
   members: import_joi21.default.array().items(
     import_joi21.default.object({
       name: import_joi21.default.string().optional().allow(null, ""),
@@ -19899,6 +19900,7 @@ function MVisitorTransaction(value) {
     checkOut: value.checkOut,
     status: value.status,
     remarks: value.remarks,
+    invitationNote: value.invitationNote,
     deliveryType: value.deliveryType,
     attachments: value.attachments,
     snapshotEntryImage: value.snapshotEntryImage,
@@ -20842,6 +20844,7 @@ function useVisitorTransactionRepo() {
             arrivalTime: 1,
             duration: 1,
             purpose: 1,
+            invitationNote: 1,
             checkIn: 1
           }
         }
@@ -50609,6 +50612,7 @@ function useVisitorTransactionService() {
           type: type2,
           company: company2,
           remarks,
+          invitationNote,
           contractorType,
           unitName
         } = value;
@@ -50655,6 +50659,10 @@ function useVisitorTransactionService() {
                   type: type2,
                   company: company2,
                   remarks,
+                  // Every member holds their OWN invitation/pass link, so the
+                  // site's note has to ride along to each of them - otherwise
+                  // only the lead contractor ever sees it.
+                  invitationNote,
                   contractorType,
                   checkIn: start,
                   visitorPass: preparedVisitorPass,
@@ -51324,7 +51332,7 @@ function useVisitorTransactionService() {
   }
   async function createInvitedMemberDocuments(leadId, status) {
     const lead = await _getVisitorTransactionById(String(leadId));
-    if (!lead?.inviterId)
+    if (!lead)
       return [];
     const members = Array.isArray(lead.members) ? lead.members : [];
     if (members.length === 0)
@@ -51353,8 +51361,13 @@ function useVisitorTransactionService() {
         duration: lead.duration,
         isOvernightParking: lead.isOvernightParking,
         numberOfPassengers: lead.numberOfPassengers,
+        // Site-configured note from the self-service settings. Each member
+        // holds their own pass link, so the note has to ride along to all of
+        // them - the same thing the creation-time fan-out does. Absent on
+        // resident invitations, which never set it.
+        invitationNote: lead.invitationNote,
         status,
-        inviterId: String(lead.inviterId),
+        ...lead.inviterId ? { inviterId: String(lead.inviterId) } : {},
         leadId: String(lead._id),
         // Explicit - MVisitorTransaction defaults an undefined checkIn to now,
         // and an approved invitation hasn't arrived yet.
@@ -55446,12 +55459,17 @@ function useVisitorTransactionController() {
         return;
       }
       const leadId = new import_mongodb88.ObjectId();
+      const invitationNote = value.type === "contractor" /* CONTRACTOR */ && onboardingSettings?.invitationNote?.isEnabled === true ? String(onboardingSettings.invitationNote.text ?? "").trim() : "";
+      const members = Array.isArray(value.members) ? value.members : [];
+      const deferMembers = value.type === "contractor" /* CONTRACTOR */ && members.length > 0 && status !== "approved" /* APPROVED */;
+      const { members: _deferredMembers, ...valueWithoutMembers } = value;
       const insertedId = await _add({
-        ...value,
+        ...deferMembers ? valueWithoutMembers : value,
         _id: leadId.toString(),
         org: site.orgId.toString(),
         site: siteId,
         status,
+        ...invitationNote ? { invitationNote } : {},
         // MVisitorTransaction() defaults checkIn to "now" whenever it's
         // undefined - correct for the staff "walk-in" flow, where creating
         // the record IS the check-in event, but wrong here: a self-service
@@ -55460,8 +55478,10 @@ function useVisitorTransactionController() {
         // checked in later (inline button / Guests-tab action menu).
         checkIn: null
       });
-      const members = Array.isArray(value.members) ? value.members : [];
-      if (value.type === "contractor" /* CONTRACTOR */ && members.length) {
+      if (deferMembers) {
+        await _patchFields(insertedId, { members });
+      }
+      if (!deferMembers && value.type === "contractor" /* CONTRACTOR */ && members.length) {
         await Promise.all(
           members.filter((m) => m._id).map((m) => _patchFields(m._id, { checkIn: null, status }))
         );
@@ -55546,6 +55566,11 @@ function useVisitorTransactionController() {
           arrivalTime: data.arrivalTime || null,
           duration: data.duration ?? null,
           purpose: data.purpose || null,
+          // Set by the site, not the registrant - see the Invitation Note
+          // block in `createSelfServiceVisitor`. Safe to hand back here:
+          // this is exactly the invitation link the note was written for,
+          // and it's only reachable by someone already holding the ID.
+          invitationNote: data.invitationNote || null,
           // Public response exposes whether check-in happened, not the raw
           // timestamp - the preview page needs it to know an already-arrived
           // visitor's lapsed arrival window isn't the same thing as an
@@ -55707,7 +55732,7 @@ function useVisitorTransactionController() {
       const remarks = approval?.remarks ?? req.body.remarks;
       const isApprovalTransition = nextStatus === "approved" /* APPROVED */ || nextStatus === "rejected" /* REJECTED */;
       const current = isApprovalTransition ? await _getVisitorTransactionById(_id) : null;
-      const needsMemberFanOut = nextStatus === "approved" /* APPROVED */ && !!current?.inviterId && Array.isArray(current.members) && current.members.length > 0 && current.members.every((member) => !member._id);
+      const needsMemberFanOut = nextStatus === "approved" /* APPROVED */ && (!!current?.inviterId || current?.type === "contractor" /* CONTRACTOR */) && Array.isArray(current?.members) && current.members.length > 0 && current.members.every((member) => !member._id);
       const { members: _unusedMembers, ...bodyWithoutMembers } = req.body;
       const baseBody = needsMemberFanOut ? bodyWithoutMembers : req.body;
       const updateBody = approval ? { ...baseBody, status: nextStatus } : baseBody;
@@ -55726,7 +55751,7 @@ function useVisitorTransactionController() {
           });
         }
       }
-      for (const insertedId of invitedMemberIds) {
+      for (const insertedId of current?.inviterId ? invitedMemberIds : []) {
         resendEmailInvitedResident(
           String(insertedId),
           String(current?.inviterId)
@@ -68061,7 +68086,14 @@ function useAccessManagementController() {
         return res.status(400).json({ message: error.message });
       }
       const result = await getOnboardingSettingsSvc(site);
-      return res.status(200).json({ message: "Success", data: result });
+      return res.status(200).json({
+        message: "Success",
+        data: {
+          enabled: result?.enabled ?? false,
+          header: result?.header ?? "",
+          subText: result?.subText ?? ""
+        }
+      });
     } catch (error) {
       return res.status(500).json({
         data: null,