diff --git a/App/pelagia-portal/lib/notifier.ts b/App/pelagia-portal/lib/notifier.ts index 1b7f0c5..7878734 100644 --- a/App/pelagia-portal/lib/notifier.ts +++ b/App/pelagia-portal/lib/notifier.ts @@ -72,68 +72,48 @@ function buildInAppBody( switch (event) { case "PO_SUBMITTED": - // Manager sees who submitted; submitter gets a confirmation return recipient.id === po.submitterId - ? `Your PO ${pn} has been submitted for review` - : `${submitter} submitted PO ${pn} for your review`; + ? `${pn} submitted for review` + : `${submitter} submitted ${pn} for your review`; case "PO_APPROVED": case "PO_APPROVED_WITH_NOTE": return recipient.id === po.submitterId - ? `Your PO ${pn} has been approved` - : `PO ${pn} approved — ready for payment`; + ? `${pn} approved` + : `${pn} approved — ready for payment`; case "PO_REJECTED": - return `Your PO ${pn} has been rejected`; + return `${pn} rejected`; case "EDITS_REQUESTED": - return `Edits requested on your PO ${pn}`; + return `Edits requested on ${pn}`; case "VENDOR_ID_REQUESTED": - return `Vendor ID needed before PO ${pn} can be approved`; + return `Vendor ID needed before ${pn} can be approved`; case "VENDOR_ID_PROVIDED": - return `Vendor ID provided for PO ${pn} — ready to review`; + return `Vendor ID provided for ${pn} — ready to review`; case "PAYMENT_PROCESSING": - return `Payment is being processed for PO ${pn}`; + return `Payment processing for ${pn}`; case "PAYMENT_SENT": - return `Payment confirmed for PO ${pn} — please confirm receipt`; + return `Payment confirmed for ${pn} — please confirm receipt`; case "RECEIPT_CONFIRMED": - return `Receipt confirmed — PO ${pn} is now closed`; + return `Receipt confirmed — ${pn} closed`; default: - return `Update on PO ${pn}`; + return `Update on ${pn}`; } } function buildInAppLink( - event: NotificationEvent, + _event: NotificationEvent, po: PurchaseOrder & { submitter: User }, - recipient: User + _recipient: User ): string { - switch (event) { - case "PO_SUBMITTED": - return recipient.id === po.submitterId ? `/po/${po.id}` : `/approvals/${po.id}`; - case "PO_APPROVED": - case "PO_APPROVED_WITH_NOTE": - return recipient.id === po.submitterId ? `/po/${po.id}` : `/payments`; - case "PO_REJECTED": - case "EDITS_REQUESTED": - case "VENDOR_ID_REQUESTED": - return `/po/${po.id}`; - case "VENDOR_ID_PROVIDED": - return `/approvals/${po.id}`; - case "PAYMENT_PROCESSING": - case "RECEIPT_CONFIRMED": - return `/po/${po.id}`; - case "PAYMENT_SENT": - return `/po/${po.id}/receipt`; - default: - return `/po/${po.id}`; - } + return `/po/${po.id}`; } // ── Email subject ─────────────────────────────────────────────────────────────