From 25a3581277b443162156d8622352611a8d7e30cd Mon Sep 17 00:00:00 2001
From: Aqib Nawab <aqib-nawab@users.noreply.github.com>
Date: Fri, 6 Nov 2026 18:23:52 +0500
Subject: [PATCH] fix(enrollment): apply organization discounts to assigned
 learners

---
 .../admin/organizations/[orgId]/page.tsx      | 19 ++++++--
 .../courses/[courseSlug]/checkout/page.tsx    | 16 +++----
 .../src/server/actions/admin/organizations.ts |  7 ++-
 frontend/src/shared/api/admin.ts              |  2 +
 frontend/src/shared/api/catalog.ts            |  2 +
 .../learning-ui/src/shared/api/catalog.ts     |  2 +
 server/prisma/schema.prisma                   |  2 +-
 server/src/controllers/admin.ts               |  6 +--
 server/src/services/coupons/issue.ts          | 28 +++++++++++
 server/src/services/coupons/pools.ts          | 47 +++++++++++++++++++
 server/src/services/enrollment/checkout.ts    | 19 ++++++--
 .../enrollment/create-self-enrollment.ts      |  6 +++
 .../enrollment/link-learner-profile.ts        | 45 +++++++++---------
 .../src/services/enrollment/manual-access.ts  |  3 ++
 .../pathment/cancel-pathment-enrollment.ts    |  2 +
 .../pathment/create-pathment-enrollment.ts    | 39 +++++++++++----
 server/src/services/teach/invites.ts          |  6 ++-
 server/src/shared/api/admin.ts                |  2 +
 server/src/shared/api/catalog.ts              |  2 +
 server/src/validations/admin.ts               |  5 +-
 .../services/enrollment/manual-access.test.ts |  2 +-
 .../cancel-pathment-enrollment.test.ts        |  2 +
 22 files changed, 205 insertions(+), 59 deletions(-)

diff --git a/frontend/src/app/(admin)/admin/organizations/[orgId]/page.tsx b/frontend/src/app/(admin)/admin/organizations/[orgId]/page.tsx
index 1e26bf05b..d4e14a05b 100644
--- a/frontend/src/app/(admin)/admin/organizations/[orgId]/page.tsx
+++ b/frontend/src/app/(admin)/admin/organizations/[orgId]/page.tsx
@@ -271,7 +271,7 @@ export default async function AdminOrganizationDetailPage({
 
       <AdminSection
         title="Coupon pools"
-        description="Limited seats this organization can grant. Course-specific pools first; general pools cover any allocated course. Assigning or Pathment enroll consumes a seat and shows the learner a free/discount banner."
+        description="Discount seats reserved for organization assignments. Course-specific pools are used before general pools. Partial discounts leave a payment balance for admin confirmation."
         className="mt-12"
       >
         <AdminPanel className="mb-6">
@@ -307,8 +307,8 @@ export default async function AdminOrganizationDetailPage({
                 <input name="percentOff" type="number" min={1} max={100} defaultValue={100} className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm" />
               </label>
               <label className="text-sm">
-                <span className="mb-1 block font-medium">Code (optional)</span>
-                <input name="code" maxLength={64} placeholder="DW-LIFETIME" className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm" />
+                <span className="mb-1 block font-medium">Internal reference (optional)</span>
+                <input name="code" maxLength={64} placeholder="Pathment cohort 2026" className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm" />
               </label>
               <label className="text-sm">
                 <span className="mb-1 block font-medium">Expires (optional)</span>
@@ -323,7 +323,7 @@ export default async function AdminOrganizationDetailPage({
             <tr>
               <AdminTableHeaderCell>Pool</AdminTableHeaderCell>
               <AdminTableHeaderCell>Scope</AdminTableHeaderCell>
-              <AdminTableHeaderCell align="right">Used / max</AdminTableHeaderCell>
+              <AdminTableHeaderCell align="right">Seats</AdminTableHeaderCell>
               <AdminTableHeaderCell>Status</AdminTableHeaderCell>
               <AdminTableHeaderCell>Actions</AdminTableHeaderCell>
             </tr>
@@ -348,12 +348,14 @@ export default async function AdminOrganizationDetailPage({
                   </AdminTableCell>
                   <AdminTableCell align="right" className="tabular-nums">
                     {pool.redemptionCount} / {pool.maxRedemptions}
+                    <span className="mt-1 block text-xs text-muted-foreground">{pool.reservedCount} reserved · {pool.redeemedCount} redeemed</span>
                   </AdminTableCell>
                   <AdminTableCell>
                     {pool.active ? <Badge variant="secondary">Active</Badge> : <Badge variant="outline">Off</Badge>}
                   </AdminTableCell>
                   <AdminTableCell>
-                    <form action={setOrganizationCouponPoolActiveAction}>
+                    <div className="flex flex-col items-start gap-2">
+                    <form action={setOrganizationCouponPoolActiveAction} className="flex items-center gap-2">
                       <input type="hidden" name="organizationId" value={org.id} />
                       <input type="hidden" name="poolId" value={pool.id} />
                       <input type="hidden" name="active" value={pool.active ? "false" : "true"} />
@@ -361,6 +363,13 @@ export default async function AdminOrganizationDetailPage({
                         {pool.active ? "Turn off" : "Turn on"}
                       </Button>
                     </form>
+                    <form action={setOrganizationCouponPoolActiveAction} className="flex items-center gap-2">
+                      <input type="hidden" name="organizationId" value={org.id} />
+                      <input type="hidden" name="poolId" value={pool.id} />
+                      <input name="maxRedemptions" type="number" min={pool.maxRedemptions} max={1_000_000} defaultValue={pool.maxRedemptions} aria-label={`Seat limit for ${pool.label}`} className="h-8 w-24 rounded-md border border-input bg-background px-2 text-xs" />
+                      <Button type="submit" size="sm" variant="outline">Update seats</Button>
+                    </form>
+                    </div>
                   </AdminTableCell>
                 </AdminTableRow>
               ))
diff --git a/frontend/src/app/(learn)/courses/[courseSlug]/checkout/page.tsx b/frontend/src/app/(learn)/courses/[courseSlug]/checkout/page.tsx
index 0e3d64152..6113d70ab 100644
--- a/frontend/src/app/(learn)/courses/[courseSlug]/checkout/page.tsx
+++ b/frontend/src/app/(learn)/courses/[courseSlug]/checkout/page.tsx
@@ -22,7 +22,7 @@ export default async function CourseCheckoutPage({
   const { courseSlug } = await params;
   const { requested, request_failed, email_unavailable: emailUnavailable, coupon_error: couponError } = await searchParams;
   await requireVerifiedUser();
-  const { course, enrollment, state, automaticDiscount } = await serverApiFetchOrNotFound<Checkout>(
+  const { course, enrollment, state, automaticDiscount, organizationDiscount, amountDueCents } = await serverApiFetchOrNotFound<Checkout>(
     `/api/v1/courses/${encodeURIComponent(courseSlug)}/checkout`
   );
   if (state === "already_paid") {
@@ -33,10 +33,7 @@ export default async function CourseCheckoutPage({
     redirect(`/catalog/${course.slug}`);
   }
 
-  const discountedPriceCents = automaticDiscount
-    ? Math.round(course.priceCents * (100 - automaticDiscount.percentOff) / 100)
-    : course.priceCents;
-  const priceLabel = formatPriceCents(discountedPriceCents, course.currency);
+  const priceLabel = formatPriceCents(amountDueCents, course.currency);
 
   return (
     <div className="mx-auto flex min-h-dvh max-w-lg flex-col justify-center px-6 py-16">
@@ -45,11 +42,12 @@ export default async function CourseCheckoutPage({
       </Link>
 
       <h1 className="mt-6 text-2xl font-semibold tracking-tight">Enroll in {course.title}</h1>
-      <p className="mt-2 text-sm text-muted-foreground">Use a discount code or request access after arranging payment with an administrator.</p>
+      <p className="mt-2 text-sm text-muted-foreground">{organizationDiscount ? "Your organization assigned a course discount. Request access after arranging the remaining payment with an administrator." : "Use a discount code or request access after arranging payment with an administrator."}</p>
       {automaticDiscount ? <p className="mt-4 rounded-lg border border-primary/30 bg-primary/5 p-3 text-sm"><strong>{automaticDiscount.percentOff}% discount applied:</strong> {automaticDiscount.label}. Your adjusted price is {priceLabel}.</p> : null}
+      {organizationDiscount ? <p className="mt-4 rounded-lg border border-primary/30 bg-primary/5 p-3 text-sm"><strong>{organizationDiscount.percentOff}% organization discount applied:</strong> {organizationDiscount.label}. The discount is reserved for your assignment; amount remaining is {priceLabel}.</p> : null}
 
       <div className="mt-8 space-y-5">
-        <section className="rounded-2xl border bg-card p-6">
+        {!organizationDiscount ? <section className="rounded-2xl border bg-card p-6">
           <h2 className="font-semibold">Have a discount code?</h2>
           <p className="mt-1 text-sm text-muted-foreground">Enter a discount code, or use an automatic discount when one is available. A full discount gives immediate access; an administrator will confirm any remaining payment.</p>
           {couponError ? <p role="alert" className="mt-3 text-sm text-destructive">{couponError === "COUPON_EXHAUSTED" ? "This code has no redemptions remaining." : couponError === "COUPON_NOT_APPLICABLE" ? "This code cannot be used for this course." : "This code is invalid or expired."}</p> : null}
@@ -59,13 +57,13 @@ export default async function CourseCheckoutPage({
             <Input name="couponCode" required minLength={3} maxLength={32} placeholder="Enter coupon code" aria-label="Coupon code" className="sm:flex-1" />
             <Button type="submit">Apply discount</Button>
           </form>
-        </section>
+        </section> : null}
 
         <section className="rounded-2xl border bg-card p-6">
           <h2 className="font-semibold">Request access</h2>
           <p className="mt-1 text-sm text-muted-foreground">No online payment is collected here. The administrators will contact you to arrange direct payment and grant course access.</p>
           <div className="mt-4 flex items-baseline justify-between gap-4 border-t pt-4">
-            <span className="text-sm text-muted-foreground">Amount due{automaticDiscount ? ` · ${automaticDiscount.percentOff}% off` : ""}</span>
+            <span className="text-sm text-muted-foreground">Amount due{organizationDiscount ? ` · ${organizationDiscount.percentOff}% off` : automaticDiscount ? ` · ${automaticDiscount.percentOff}% off` : ""}</span>
             <span className="text-2xl font-semibold tabular-nums">{priceLabel}</span>
           </div>
           {request_failed === "1" && <p role="alert" className="mt-4 text-sm text-destructive">We couldn’t send your request. Please try again or contact an administrator.</p>}
diff --git a/frontend/src/server/actions/admin/organizations.ts b/frontend/src/server/actions/admin/organizations.ts
index 54b1d136a..e271a7324 100644
--- a/frontend/src/server/actions/admin/organizations.ts
+++ b/frontend/src/server/actions/admin/organizations.ts
@@ -124,9 +124,14 @@ export async function setOrganizationCouponPoolActiveAction(formData: FormData):
   const organizationId = String(formData.get("organizationId") ?? "");
   const poolId = String(formData.get("poolId") ?? "");
   if (!organizationId || !poolId) throw new Error("Missing organization or coupon pool.");
+  const maxRedemptions = String(formData.get("maxRedemptions") ?? "").trim();
+  const active = String(formData.get("active") ?? "").trim();
   await adminCall(
     `/api/v1/admin/organizations/${encodeURIComponent(organizationId)}/coupons/${encodeURIComponent(poolId)}`,
-    { method: "PATCH", json: { active: formData.get("active") === "true" } }
+    { method: "PATCH", json: {
+      ...(active ? { active: active === "true" } : {}),
+      ...(maxRedemptions ? { maxRedemptions: Number(maxRedemptions) } : {}),
+    } }
   );
   revalidatePath(`/admin/organizations/${organizationId}`);
 }
diff --git a/frontend/src/shared/api/admin.ts b/frontend/src/shared/api/admin.ts
index 1fab2c3ec..e92babda5 100644
--- a/frontend/src/shared/api/admin.ts
+++ b/frontend/src/shared/api/admin.ts
@@ -102,6 +102,8 @@ export type AdminCouponPoolRow = {
   percentOff: number;
   maxRedemptions: number;
   redemptionCount: number;
+  reservedCount: number;
+  redeemedCount: number;
   remaining: number;
   active: boolean;
   expiresAt: string | null;
diff --git a/frontend/src/shared/api/catalog.ts b/frontend/src/shared/api/catalog.ts
index 428fac902..fd5488aa5 100644
--- a/frontend/src/shared/api/catalog.ts
+++ b/frontend/src/shared/api/catalog.ts
@@ -80,6 +80,8 @@ export type CourseOverview = {
 export type Checkout = {
   course: { id: string; slug: string; title: string; pricingType: CoursePricingType; priceCents: number; currency: string };
   automaticDiscount: { percentOff: number; label: string } | null;
+  organizationDiscount: { percentOff: number; label: string; amountDueCents: number } | null;
+  amountDueCents: number;
   enrollment: { id: string; lifecycle: EnrollmentLifecycle } | null;
   state: "no_enrollment" | "payment_required" | "already_paid";
 };
diff --git a/packages/learning-ui/src/shared/api/catalog.ts b/packages/learning-ui/src/shared/api/catalog.ts
index 428fac902..fd5488aa5 100644
--- a/packages/learning-ui/src/shared/api/catalog.ts
+++ b/packages/learning-ui/src/shared/api/catalog.ts
@@ -80,6 +80,8 @@ export type CourseOverview = {
 export type Checkout = {
   course: { id: string; slug: string; title: string; pricingType: CoursePricingType; priceCents: number; currency: string };
   automaticDiscount: { percentOff: number; label: string } | null;
+  organizationDiscount: { percentOff: number; label: string; amountDueCents: number } | null;
+  amountDueCents: number;
   enrollment: { id: string; lifecycle: EnrollmentLifecycle } | null;
   state: "no_enrollment" | "payment_required" | "already_paid";
 };
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 5eeee6521..c459f6749 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -788,7 +788,7 @@ model InstructorCouponRedemption {
 }
 
 /// One reserved seat from a pool, created when a mentor/Pathment assigns the course.
-/// Marked redeemed when the learner first opens the course (banner + audit).
+/// Marked redeemed when access is granted (immediately for full discounts, after manual approval for partial discounts).
 model CouponUsage {
   id             String            @id @default(cuid())
   poolId         String
diff --git a/server/src/controllers/admin.ts b/server/src/controllers/admin.ts
index 138a67583..653a90b05 100644
--- a/server/src/controllers/admin.ts
+++ b/server/src/controllers/admin.ts
@@ -154,9 +154,9 @@ export async function createCouponPool(req: Request, res: Response) {
 
 // PATCH /api/v1/admin/organizations/:orgId/coupons/:poolId
 export async function setCouponPoolActive(req: Request, res: Response) {
-  const { active } = req.body as { active: boolean };
-  const { setCouponPoolActive: setActive } = await import("../services/coupons/pools.js");
-  await setActive(param(req, "orgId"), param(req, "poolId"), active);
+  const body = req.body as { active?: boolean; maxRedemptions?: number };
+  const { updateCouponPool } = await import("../services/coupons/pools.js");
+  await updateCouponPool(param(req, "orgId"), param(req, "poolId"), body);
   noContent(res);
 }
 
diff --git a/server/src/services/coupons/issue.ts b/server/src/services/coupons/issue.ts
index d291797cd..1f4823116 100644
--- a/server/src/services/coupons/issue.ts
+++ b/server/src/services/coupons/issue.ts
@@ -75,3 +75,31 @@ export async function issueCouponForEnrollmentStandalone(input: IssueCouponInput
 export function couponUnlocksContent(percentOff: number) {
   return percentOff >= 100;
 }
+
+export function discountedAmountCents(amountCents: number, percentOff: number) {
+  return Math.max(0, Math.round(amountCents * (100 - percentOff) / 100));
+}
+
+/** Return an unused reservation when an assignment is cancelled before access is granted. */
+export async function cancelIssuedCouponUsage(tx: Prisma.TransactionClient, enrollmentId: string) {
+  const usage = await tx.couponUsage.findUnique({ where: { enrollmentId } });
+  if (!usage || usage.status !== "ISSUED") return false;
+  const cancelled = await tx.couponUsage.updateMany({
+    where: { id: usage.id, status: "ISSUED" },
+    data: { status: "CANCELLED", cancelledAt: new Date() },
+  });
+  if (!cancelled.count) return false;
+  await tx.organizationCouponPool.updateMany({
+    where: { id: usage.poolId, redemptionCount: { gt: 0 } },
+    data: { redemptionCount: { decrement: 1 } },
+  });
+  return true;
+}
+
+/** A coupon reservation becomes consumed once manual payment/access is approved. */
+export async function redeemCouponUsage(tx: Prisma.TransactionClient, enrollmentId: string) {
+  await tx.couponUsage.updateMany({
+    where: { enrollmentId, status: "ISSUED" },
+    data: { status: "REDEEMED", redeemedAt: new Date() },
+  });
+}
diff --git a/server/src/services/coupons/pools.ts b/server/src/services/coupons/pools.ts
index 84b617607..e945c6b62 100644
--- a/server/src/services/coupons/pools.ts
+++ b/server/src/services/coupons/pools.ts
@@ -75,6 +75,18 @@ export async function listCouponPools(organizationId: string) {
       course: { select: { id: true, slug: true, title: true } },
     },
   });
+  const counts = pools.length ? await prisma.couponUsage.groupBy({
+    by: ["poolId", "status"],
+    where: { poolId: { in: pools.map((pool) => pool.id) } },
+    _count: { _all: true },
+  }) : [];
+  const countByPool = new Map<string, { reserved: number; redeemed: number }>();
+  for (const row of counts) {
+    const current = countByPool.get(row.poolId) ?? { reserved: 0, redeemed: 0 };
+    if (row.status === "ISSUED") current.reserved = row._count._all;
+    if (row.status === "REDEEMED") current.redeemed = row._count._all;
+    countByPool.set(row.poolId, current);
+  }
   return pools.map((pool) => ({
     id: pool.id,
     label: pool.label,
@@ -82,6 +94,8 @@ export async function listCouponPools(organizationId: string) {
     percentOff: pool.percentOff,
     maxRedemptions: pool.maxRedemptions,
     redemptionCount: pool.redemptionCount,
+    reservedCount: countByPool.get(pool.id)?.reserved ?? 0,
+    redeemedCount: countByPool.get(pool.id)?.redeemed ?? 0,
     remaining: Math.max(0, pool.maxRedemptions - pool.redemptionCount),
     active: pool.active,
     expiresAt: pool.expiresAt?.toISOString() ?? null,
@@ -99,6 +113,39 @@ export async function setCouponPoolActive(organizationId: string, poolId: string
   if (updated.count === 0) throw new NotFoundError("Coupon pool not found");
 }
 
+/** Change pool state and/or add capacity without invalidating already issued seats. */
+export async function updateCouponPool(
+  organizationId: string,
+  poolId: string,
+  input: { active?: boolean; maxRedemptions?: number }
+) {
+  const pool = await prisma.organizationCouponPool.findFirst({ where: { id: poolId, organizationId } });
+  if (!pool) throw new NotFoundError("Coupon pool not found");
+  if (input.maxRedemptions !== undefined) {
+    if (input.maxRedemptions < pool.maxRedemptions) {
+      throw new UnprocessableError("Coupon pool capacity can only be increased.", "VALIDATION_ERROR");
+    }
+    if (input.maxRedemptions < pool.redemptionCount) {
+      throw new UnprocessableError("Capacity cannot be lower than seats already reserved or redeemed.", "VALIDATION_ERROR");
+    }
+  }
+  const result = await prisma.organizationCouponPool.updateMany({
+    where: {
+      id: poolId,
+      organizationId,
+      ...(input.maxRedemptions !== undefined ? {
+        redemptionCount: { lte: input.maxRedemptions },
+        maxRedemptions: { lte: input.maxRedemptions },
+      } : {}),
+    },
+    data: {
+      ...(input.active !== undefined ? { active: input.active } : {}),
+      ...(input.maxRedemptions !== undefined ? { maxRedemptions: input.maxRedemptions } : {}),
+    },
+  });
+  if (!result.count) throw new UnprocessableError("Capacity changed; refresh and try again.", "VALIDATION_ERROR");
+}
+
 /** Course-specific pool first, then a general (courseId null) pool with remaining seats. */
 export async function findAvailableCouponPool(
   tx: Prisma.TransactionClient,
diff --git a/server/src/services/enrollment/checkout.ts b/server/src/services/enrollment/checkout.ts
index 23f07b844..72fab9cb3 100644
--- a/server/src/services/enrollment/checkout.ts
+++ b/server/src/services/enrollment/checkout.ts
@@ -13,10 +13,11 @@ export async function loadCheckout(courseSlug: string, userId: string): Promise<
 
   const enrollment = await prisma.enrollment.findUnique({
     where: { courseId_userId: { courseId: course.id, userId } },
-    select: { id: true, lifecycle: true, payment: { select: { amountCents: true } }, instructorCouponRedemption: { select: { id: true } } },
+    select: { id: true, lifecycle: true, payment: { select: { amountCents: true } }, instructorCouponRedemption: { select: { id: true } }, couponUsage: { select: { status: true, percentOff: true, displayLabel: true } } },
   });
   const enrollmentView = enrollment ? { id: enrollment.id, lifecycle: enrollment.lifecycle } : null;
-  const automaticCoupon = (!enrollment || (enrollment.lifecycle === "PAYMENT_REQUIRED" && !enrollment.instructorCouponRedemption)) && course.pricingType === "PAID"
+  const activeOrganizationCoupon = enrollment?.couponUsage && enrollment.couponUsage.status !== "CANCELLED" ? enrollment.couponUsage : null;
+  const automaticCoupon = (!activeOrganizationCoupon && (!enrollment || (enrollment.lifecycle === "PAYMENT_REQUIRED" && !enrollment.instructorCouponRedemption))) && course.pricingType === "PAID"
     ? await prisma.instructorCoupon.findMany({
         where: { courseId: course.id, active: true, autoApply: true, redemptionCount: { lt: 1000000 }, OR: [{ expiresAt: null }, { expiresAt: { gt: new Date() } }] },
         orderBy: [{ percentOff: "desc" }, { createdAt: "asc" }],
@@ -26,10 +27,18 @@ export async function loadCheckout(courseSlug: string, userId: string): Promise<
         return coupon ? { percentOff: coupon.percentOff, label: coupon.label } : null;
       })
     : null;
-  if (!enrollment) return { course: courseFields, enrollment: null, state: "no_enrollment", automaticDiscount: automaticCoupon };
+  const amountDueCents = activeOrganizationCoupon
+    ? enrollment?.payment?.amountCents ?? Math.max(0, Math.round(course.priceCents * (100 - activeOrganizationCoupon.percentOff) / 100))
+    : enrollment?.payment?.amountCents ?? (automaticCoupon ? Math.round(course.priceCents * (100 - automaticCoupon.percentOff) / 100) : course.priceCents);
+  const organizationDiscount = activeOrganizationCoupon ? {
+    percentOff: activeOrganizationCoupon.percentOff,
+    label: activeOrganizationCoupon.displayLabel,
+    amountDueCents,
+  } : null;
+  if (!enrollment) return { course: courseFields, enrollment: null, state: "no_enrollment", automaticDiscount: automaticCoupon, organizationDiscount: null, amountDueCents };
   if (enrollmentGrantsContentAccess(enrollment.lifecycle)) {
-    return { course: courseFields, enrollment: enrollmentView, state: "already_paid", automaticDiscount: null };
+    return { course: courseFields, enrollment: enrollmentView, state: "already_paid", automaticDiscount: null, organizationDiscount, amountDueCents: 0 };
   }
   if (enrollment.lifecycle !== "PAYMENT_REQUIRED") throw new NotFoundError("Enrollment is not awaiting payment");
-  return { course: { ...courseFields, priceCents: enrollment.payment?.amountCents ?? course.priceCents }, enrollment: enrollmentView, state: "payment_required", automaticDiscount: automaticCoupon };
+  return { course: courseFields, enrollment: enrollmentView, state: "payment_required", automaticDiscount: activeOrganizationCoupon ? null : automaticCoupon, organizationDiscount, amountDueCents };
 }
diff --git a/server/src/services/enrollment/create-self-enrollment.ts b/server/src/services/enrollment/create-self-enrollment.ts
index 3c8f7b3b6..07042ceef 100644
--- a/server/src/services/enrollment/create-self-enrollment.ts
+++ b/server/src/services/enrollment/create-self-enrollment.ts
@@ -55,6 +55,12 @@ export async function createSelfEnrollment(
       where: { courseId_userId: { courseId: course.id, userId: input.userId } },
       include: { payment: true },
     });
+    if (existing) {
+      const organizationCoupon = await tx.couponUsage.findUnique({ where: { enrollmentId: existing.id }, select: { status: true } });
+      if (organizationCoupon && organizationCoupon.status !== "CANCELLED") {
+        throw new SelfEnrollmentError("COUPON_NOT_APPLICABLE", "This enrollment already has an organization discount assigned.");
+      }
+    }
     if (existing && existing.lifecycle !== "PAYMENT_REQUIRED") {
       throw new SelfEnrollmentError("ALREADY_ENROLLED", "You are already enrolled in this course.");
     }
diff --git a/server/src/services/enrollment/link-learner-profile.ts b/server/src/services/enrollment/link-learner-profile.ts
index d60932fd2..4afdb7466 100644
--- a/server/src/services/enrollment/link-learner-profile.ts
+++ b/server/src/services/enrollment/link-learner-profile.ts
@@ -1,5 +1,6 @@
 import type { PrismaClient } from "../../generated/prisma/index.js";
 import { lifecycleForSignedInEnrollment } from "./lifecycle.js";
+import { couponUnlocksContent, discountedAmountCents, redeemCouponUsage } from "../coupons/issue.js";
 
 /** After verified signup/login, attach pending Pathment enrollments for the same email. */
 export async function linkLearnerProfileToUser(db: PrismaClient, userId: string, email: string) {
@@ -17,30 +18,32 @@ export async function linkLearnerProfileToUser(db: PrismaClient, userId: string,
       learnerProfileId: profile.id,
       userId: null,
     },
-    include: { course: true },
+    include: { course: true, couponUsage: true },
   });
 
   for (const enrollment of pending) {
-    const lifecycle = lifecycleForSignedInEnrollment(enrollment.course.pricingType);
-    await db.enrollment.update({
-      where: { id: enrollment.id },
-      data: {
-        userId,
-        lifecycle,
-        status: lifecycle === "ACTIVE" ? "IN_PROGRESS" : enrollment.status,
-      },
-    });
-    if (lifecycle === "PAYMENT_REQUIRED") {
-      await db.payment.upsert({
-        where: { enrollmentId: enrollment.id },
-        create: {
-          enrollmentId: enrollment.id,
-          amountCents: enrollment.course.priceCents,
-          currency: enrollment.course.currency,
-          status: "PENDING",
-        },
-        update: {},
+    await db.$transaction(async (tx) => {
+      const coupon = enrollment.couponUsage?.status !== "CANCELLED" ? enrollment.couponUsage : null;
+      const lifecycle = coupon && couponUnlocksContent(coupon.percentOff)
+        ? "ACTIVE"
+        : lifecycleForSignedInEnrollment(enrollment.course.pricingType);
+      await tx.enrollment.update({
+        where: { id: enrollment.id },
+        data: { userId, lifecycle, status: lifecycle === "ACTIVE" ? "IN_PROGRESS" : enrollment.status, startedAt: lifecycle === "ACTIVE" ? new Date() : null },
       });
-    }
+      if (lifecycle === "PAYMENT_REQUIRED") {
+        const amountCents = coupon
+          ? discountedAmountCents(enrollment.course.priceCents, coupon.percentOff)
+          : enrollment.course.priceCents;
+        await tx.payment.upsert({
+          where: { enrollmentId: enrollment.id },
+          create: { enrollmentId: enrollment.id, amountCents, currency: enrollment.course.currency, status: "PENDING" },
+          update: coupon ? { amountCents, status: "PENDING", provider: null, paidAt: null } : {},
+        });
+      } else if (coupon) {
+        await tx.payment.updateMany({ where: { enrollmentId: enrollment.id, status: "PENDING" }, data: { amountCents: 0, status: "SUCCEEDED", provider: "coupon", paidAt: new Date() } });
+        await redeemCouponUsage(tx, enrollment.id);
+      }
+    });
   }
 }
diff --git a/server/src/services/enrollment/manual-access.ts b/server/src/services/enrollment/manual-access.ts
index 0e8c5bc1a..c90330583 100644
--- a/server/src/services/enrollment/manual-access.ts
+++ b/server/src/services/enrollment/manual-access.ts
@@ -3,6 +3,7 @@ import { prisma } from "../../db/prisma.js";
 import { ConflictError, NotFoundError } from "../../utils/errors.js";
 import { appBaseUrl, sendEmail } from "../email/send.js";
 import { escapeHtml } from "../email/format.js";
+import { cancelIssuedCouponUsage, redeemCouponUsage } from "../coupons/issue.js";
 
 /** The enrollment is the durable request. Sending can be retried if email fails. */
 export async function requestManualAccess(enrollmentId: string, userId: string) {
@@ -30,6 +31,7 @@ export async function approveManualAccess(enrollmentId: string, actor: AdminActo
       instructorShareCents: Math.floor(enrollment.payment.amountCents / 2),
       instructorPayoutStatus: enrollment.payment.amountCents > 0 ? "PENDING" : "NOT_DUE",
     } });
+    await redeemCouponUsage(tx, enrollmentId);
     await recordAdminAction(tx, { actor, action: ADMIN_AUDIT_ACTIONS.MANUAL_ACCESS_APPROVE, targetType: "Enrollment", targetId: enrollmentId, summary: "Confirmed manual payment and granted course access." });
   });
 }
@@ -46,6 +48,7 @@ export async function rejectManualAccess(enrollmentId: string, actor: AdminActor
       data: { lifecycle: "CANCELLED", status: "DROPPED" },
     });
     if (!updated.count) throw new ConflictError("This enrollment is no longer awaiting access.");
+    await cancelIssuedCouponUsage(tx, enrollmentId);
     await tx.payment.updateMany({
       where: { enrollmentId, status: "PENDING" },
       data: { status: "FAILED" },
diff --git a/server/src/services/integrations/pathment/cancel-pathment-enrollment.ts b/server/src/services/integrations/pathment/cancel-pathment-enrollment.ts
index 51b3c3a45..406a69957 100644
--- a/server/src/services/integrations/pathment/cancel-pathment-enrollment.ts
+++ b/server/src/services/integrations/pathment/cancel-pathment-enrollment.ts
@@ -2,6 +2,7 @@ import type { Enrollment, PrismaClient } from "../../../generated/prisma/index.j
 import { releaseEnrollmentSlot } from "../allocation.js";
 import { pathmentAssignmentId } from "./enrollment-idempotency.js";
 import { PathmentEnrollmentError } from "./create-pathment-enrollment.js";
+import { cancelIssuedCouponUsage } from "../../coupons/issue.js";
 
 export type CancelPathmentEnrollmentInput = {
   organizationId: string;
@@ -142,6 +143,7 @@ export async function cancelPathmentEnrollment(
     if (enrollment.source === "PATHMENT") {
       await releaseEnrollmentSlot(tx, input.organizationId, input.courseId);
     }
+    await cancelIssuedCouponUsage(tx, enrollment.id);
     return tx.enrollment.update({
       where: { id: enrollment.id },
       data: {
diff --git a/server/src/services/integrations/pathment/create-pathment-enrollment.ts b/server/src/services/integrations/pathment/create-pathment-enrollment.ts
index 608520483..2de987d82 100644
--- a/server/src/services/integrations/pathment/create-pathment-enrollment.ts
+++ b/server/src/services/integrations/pathment/create-pathment-enrollment.ts
@@ -10,7 +10,7 @@ import {
   pathmentEnrollmentPatch,
   shouldAttachPathmentOrg,
 } from "./attach-org-enrollment.js";
-import { couponUnlocksContent, issueCouponForEnrollment } from "../../coupons/issue.js";
+import { couponUnlocksContent, discountedAmountCents, issueCouponForEnrollment, redeemCouponUsage } from "../../coupons/issue.js";
 
 export type PathmentEnrollmentInput = {
   organizationId: string;
@@ -94,14 +94,32 @@ export async function createPathmentEnrollment(
         !byUser.externalAssignmentId ||
         byUser.externalAssignmentId !== assignmentId
       ) {
-        const updated = await db.enrollment.update({
-          where: { id: byUser.id },
-          data: pathmentEnrollmentPatch({
-            organizationId: input.organizationId,
-            mentorId: input.mentorId,
-            assignmentId,
-          }),
-          include: { course: true, learnerProfile: true },
+        const updated = await db.$transaction(async (tx) => {
+          let row = await tx.enrollment.update({
+            where: { id: byUser.id },
+            data: pathmentEnrollmentPatch({ organizationId: input.organizationId, mentorId: input.mentorId, assignmentId }),
+            include: { course: true, learnerProfile: true },
+          });
+          if (row.lifecycle === "PAYMENT_REQUIRED") {
+            const coupon = await issueCouponForEnrollment(tx, {
+              organizationId: input.organizationId, courseId: input.courseId, enrollmentId: row.id,
+              userId: linkedUser.id, learnerEmail: email, assignedById: input.mentorId?.trim() || null,
+            });
+            if (coupon) {
+              if (couponUnlocksContent(coupon.percentOff)) {
+                row = await tx.enrollment.update({ where: { id: row.id }, data: { lifecycle: "ACTIVE", status: "IN_PROGRESS", startedAt: new Date() }, include: { course: true, learnerProfile: true } });
+                await tx.payment.updateMany({ where: { enrollmentId: row.id, status: "PENDING" }, data: { amountCents: 0, status: "SUCCEEDED", provider: "coupon", paidAt: new Date() } });
+                await redeemCouponUsage(tx, row.id);
+              } else {
+                await tx.payment.upsert({
+                  where: { enrollmentId: row.id },
+                  create: { enrollmentId: row.id, amountCents: discountedAmountCents(course.priceCents, coupon.percentOff), currency: course.currency, status: "PENDING" },
+                  update: { amountCents: discountedAmountCents(course.priceCents, coupon.percentOff), status: "PENDING", provider: null, paidAt: null },
+                });
+              }
+            }
+          }
+          return row;
         });
         return { enrollment: updated, created: false as const };
       }
@@ -164,6 +182,7 @@ export async function createPathmentEnrollment(
         data: { lifecycle: "ACTIVE", status: "IN_PROGRESS", startedAt: new Date() },
         include: { course: true, learnerProfile: true },
       });
+      await redeemCouponUsage(tx, enrollment.id);
       return { enrollment: unlocked, created: true as const };
     }
 
@@ -171,7 +190,7 @@ export async function createPathmentEnrollment(
       await tx.payment.create({
         data: {
           enrollmentId: enrollment.id,
-          amountCents: course.priceCents,
+          amountCents: coupon ? discountedAmountCents(course.priceCents, coupon.percentOff) : course.priceCents,
           currency: course.currency,
           status: "PENDING",
         },
diff --git a/server/src/services/teach/invites.ts b/server/src/services/teach/invites.ts
index 45973060c..9edc27ee1 100644
--- a/server/src/services/teach/invites.ts
+++ b/server/src/services/teach/invites.ts
@@ -10,7 +10,7 @@ import { notifyMenteeCourseEnrollment, notifyMentorNewEnrollment } from "../noti
 import { dispatchNotification } from "../notifications/service.js";
 import { lifecycleForSignedInEnrollment } from "../enrollment/lifecycle.js";
 import { assignmentForNewEnrollment } from "../courses/variant-assignment.js";
-import { couponUnlocksContent, issueCouponForEnrollment } from "../coupons/issue.js";
+import { couponUnlocksContent, discountedAmountCents, issueCouponForEnrollment, redeemCouponUsage } from "../coupons/issue.js";
 import { resolveCouponOrganizationForCourse } from "../coupons/resolve-org.js";
 import { inviteAcceptUrl, sendEmail } from "../email/send.js";
 import { requireCourseById, type OwnedCourse } from "./access.js";
@@ -110,10 +110,12 @@ export async function assignByEmails(user: SessionUser, courseId: string, emails
               where: { id: created.id },
               data: { lifecycle: "ACTIVE", status: "IN_PROGRESS", startedAt: new Date() },
             });
+            await redeemCouponUsage(tx, created.id);
           }
         }
         if (lifecycle === "PAYMENT_REQUIRED" && !coveredByCoupon) {
-          await tx.payment.create({ data: { enrollmentId: created.id, amountCents: pricing.priceCents, currency: pricing.currency, status: "PENDING" } });
+          const issuedCoupon = await tx.couponUsage.findUnique({ where: { enrollmentId: created.id }, select: { percentOff: true, status: true } });
+          await tx.payment.create({ data: { enrollmentId: created.id, amountCents: issuedCoupon && issuedCoupon.status !== "CANCELLED" ? discountedAmountCents(pricing.priceCents, issuedCoupon.percentOff) : pricing.priceCents, currency: pricing.currency, status: "PENDING" } });
         }
         return created;
       });
diff --git a/server/src/shared/api/admin.ts b/server/src/shared/api/admin.ts
index 81393b4fd..881a7e1a0 100644
--- a/server/src/shared/api/admin.ts
+++ b/server/src/shared/api/admin.ts
@@ -101,6 +101,8 @@ export type AdminCouponPoolRow = {
   percentOff: number;
   maxRedemptions: number;
   redemptionCount: number;
+  reservedCount: number;
+  redeemedCount: number;
   remaining: number;
   active: boolean;
   expiresAt: string | null;
diff --git a/server/src/shared/api/catalog.ts b/server/src/shared/api/catalog.ts
index 4aa7e45b4..cc54281f9 100644
--- a/server/src/shared/api/catalog.ts
+++ b/server/src/shared/api/catalog.ts
@@ -79,6 +79,8 @@ export type CourseOverview = {
 export type Checkout = {
   course: { id: string; slug: string; title: string; pricingType: CoursePricingType; priceCents: number; currency: string };
   automaticDiscount: { percentOff: number; label: string } | null;
+  organizationDiscount: { percentOff: number; label: string; amountDueCents: number } | null;
+  amountDueCents: number;
   enrollment: { id: string; lifecycle: EnrollmentLifecycle } | null;
   state: "no_enrollment" | "payment_required" | "already_paid";
 };
diff --git a/server/src/validations/admin.ts b/server/src/validations/admin.ts
index 71fe07dd8..c49830be0 100644
--- a/server/src/validations/admin.ts
+++ b/server/src/validations/admin.ts
@@ -97,7 +97,10 @@ export const createCouponPoolBody = z.object({
 export type CreateCouponPoolBody = z.infer<typeof createCouponPoolBody>;
 
 export const couponPoolParams = z.object({ orgId: id, poolId: id });
-export const couponPoolActiveBody = z.object({ active: z.boolean() });
+export const couponPoolActiveBody = z.object({
+  active: z.boolean().optional(),
+  maxRedemptions: z.coerce.number().int().min(1).max(1_000_000).optional(),
+}).refine((body) => body.active !== undefined || body.maxRedemptions !== undefined);
 
 export const suspendUserBody = z.object({
   note: z.string().trim().max(240).optional(),
diff --git a/server/tests/unit/services/enrollment/manual-access.test.ts b/server/tests/unit/services/enrollment/manual-access.test.ts
index bf522121b..e5602695f 100644
--- a/server/tests/unit/services/enrollment/manual-access.test.ts
+++ b/server/tests/unit/services/enrollment/manual-access.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-const db = vi.hoisted(() => ({ enrollment: { findFirst: vi.fn(), findUnique: vi.fn(), updateMany: vi.fn() }, user: { findMany: vi.fn() }, payment: { update: vi.fn() }, adminAuditLog: { create: vi.fn() }, $transaction: vi.fn() }));
+const db = vi.hoisted(() => ({ enrollment: { findFirst: vi.fn(), findUnique: vi.fn(), updateMany: vi.fn() }, user: { findMany: vi.fn() }, payment: { update: vi.fn() }, couponUsage: { updateMany: vi.fn() }, adminAuditLog: { create: vi.fn() }, $transaction: vi.fn() }));
 const sendEmail = vi.hoisted(() => vi.fn());
 vi.mock("../../../../src/db/prisma.js", () => ({ prisma: db }));
 vi.mock("../../../../src/config/env.js", () => ({ env: { ADMIN_NOTIFY_EMAIL: ["ops@example.com"] } }));
diff --git a/server/tests/unit/services/integrations/pathment/cancel-pathment-enrollment.test.ts b/server/tests/unit/services/integrations/pathment/cancel-pathment-enrollment.test.ts
index 27d4b2e2a..fd8e93580 100644
--- a/server/tests/unit/services/integrations/pathment/cancel-pathment-enrollment.test.ts
+++ b/server/tests/unit/services/integrations/pathment/cancel-pathment-enrollment.test.ts
@@ -37,6 +37,8 @@ function mockDb(overrides: {
         }
       ),
     },
+    couponUsage: { findUnique: vi.fn().mockResolvedValue(null) },
+    organizationCouponPool: { updateMany: vi.fn() },
     $executeRaw: vi.fn().mockResolvedValue(1),
   };
   return {