From 84ef131640f6dec0e86105fbe8b7105f9cc18837 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 27 Jun 2026 16:13:22 -0400
Subject: [PATCH 01/15] polished darker signup/login styling

---
 apps/frontend/src/containers/loginPage.tsx  | 13 ++++++++++---
 apps/frontend/src/containers/signupPage.tsx | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/apps/frontend/src/containers/loginPage.tsx b/apps/frontend/src/containers/loginPage.tsx
index cc08a821e..7b0c38954 100644
--- a/apps/frontend/src/containers/loginPage.tsx
+++ b/apps/frontend/src/containers/loginPage.tsx
@@ -307,11 +307,18 @@ const LoginPage: React.FC = () => {
 
           {step === 'login' && (
             <>
-              <Text textStyle="p" color="neutral.800" textAlign="center" mt={6}>
+              <Text
+                textStyle="p2"
+                color="neutral.900"
+                fontWeight={500}
+                textAlign="center"
+                mt={6}
+              >
                 Don't have an account?{' '}
                 <Link
-                  textStyle="p"
-                  color="neutral.800"
+                  textStyle="p2"
+                  color="neutral.900"
+                  fontWeight={500}
                   onClick={() => navigate(ROUTES.SIGNUP)}
                   variant="underline"
                   textDecorationColor="neutral.300"
diff --git a/apps/frontend/src/containers/signupPage.tsx b/apps/frontend/src/containers/signupPage.tsx
index 745cebcdf..1374151d3 100644
--- a/apps/frontend/src/containers/signupPage.tsx
+++ b/apps/frontend/src/containers/signupPage.tsx
@@ -72,11 +72,18 @@ const SignupPage: React.FC = () => {
               Food Manufacturer (Donor) Partner
             </Button>
           </VStack>
-          <Text textStyle="p" color="neutral.800" textAlign="center" mt={24}>
+          <Text
+            textStyle="p2"
+            color="neutral.900"
+            fontWeight={500}
+            textAlign="center"
+            mt={24}
+          >
             Already have an account?{' '}
             <Link
-              textStyle="p"
-              color="neutral.800"
+              textStyle="p2"
+              color="neutral.900"
+              fontWeight={500}
               onClick={() => navigate(ROUTES.LOGIN)}
               variant="underline"
               textDecorationColor="neutral.300"

From 266be6b233d991a2d5964ef0854d598472d2e84c Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 27 Jun 2026 16:13:52 -0400
Subject: [PATCH 02/15] remove last question as requested

---
 .../forms/manufacturerApplicationForm.tsx        | 16 ----------------
 .../components/forms/pantryApplicationForm.tsx   | 15 ---------------
 2 files changed, 31 deletions(-)

diff --git a/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx b/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
index 34ad1bb5b..6b4c30024 100644
--- a/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
@@ -594,22 +594,6 @@ const ManufacturerApplicationForm: React.FC = () => {
               </Checkbox.Label>
             </Checkbox.Root>
           </Field.Root>
-          <Field.Root required mb="4em">
-            <Checkbox.Root>
-              <Checkbox.HiddenInput required />
-              <Checkbox.Control
-                border="1px solid"
-                borderColor="neutral.100"
-                _checked={{ bg: 'neutral.800' }}
-              />
-              <Checkbox.Label {...fieldHeaderStyles}>
-                By submitting this form, you agree to receive automated emails
-                from Securing Safe Food (SSF) Corp. should your food
-                manufacturer be enrolled in our program.{' '}
-                <Field.RequiredIndicator color="red" />
-              </Checkbox.Label>
-            </Checkbox.Root>
-          </Field.Root>
           <Box display="flex" gap={2} justifyContent="flex-end" mb={6}>
             <Button
               border="1px solid"
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index 580982c98..69e3cc63f 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -1159,21 +1159,6 @@ const PantryApplicationForm: React.FC = () => {
               </Checkbox.Label>
             </Checkbox.Root>
           </Field.Root>
-          <Field.Root required mb="4em">
-            <Checkbox.Root>
-              <Checkbox.HiddenInput required />
-              <Checkbox.Control
-                border="1px solid"
-                borderColor="neutral.100"
-                _checked={{ bg: 'neutral.800' }}
-              />
-              <Checkbox.Label {...fieldHeaderStyles}>
-                By submitting this form, you agree to receive automated emails
-                from Securing Safe Food (SSF) Corp. should your pantry be
-                enrolled in our program. <Field.RequiredIndicator color="red" />
-              </Checkbox.Label>
-            </Checkbox.Root>
-          </Field.Root>
           <Box display="flex" gap={2} justifyContent="flex-end" mb={6}>
             <Button
               border="1px solid"

From ec5c24896e25c6de38a0b2aef83133688780d35e Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 18:57:44 -0400
Subject: [PATCH 03/15] Track shipping cost paid by SSF across orders and
 pantry stats

Add a shippingCostPaidBySsf flag to orders (migration + entity + bulk
tracking DTO) and surface it through manufacturer donation details and
pantry stats. SSF-paid shipping is now excluded from totalShippingCost
and reported separately as totalShippingCostPaidBySsf. Also adds the
foodRescueLbs pantry stat.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/backend/src/config/migrations.ts         |  2 +
 .../dtos/donation-details-dto.ts              |  1 +
 .../manufacturers.controller.spec.ts          |  1 +
 .../manufacturers.service.ts                  |  1 +
 .../1782613537327-AddShippingCostPaidBySsf.ts | 19 ++++++
 .../dtos/bulk-update-tracking-cost.dto.ts     |  5 ++
 apps/backend/src/orders/order.entity.ts       |  7 +++
 apps/backend/src/orders/order.service.spec.ts | 24 ++++++++
 apps/backend/src/orders/order.service.ts      |  3 +
 .../src/pantries/pantries.controller.spec.ts  | 12 +++-
 .../src/pantries/pantries.service.spec.ts     | 32 ++++++++++
 apps/backend/src/pantries/pantries.service.ts | 39 +++++++++---
 apps/backend/src/pantries/types.ts            |  2 +
 .../forms/fmCompleteRequiredActionsModal.tsx  | 48 +++++++++++++--
 .../src/containers/adminDonationStats.tsx     | 60 ++++++++++++++++---
 apps/frontend/src/types/types.ts              |  5 ++
 16 files changed, 240 insertions(+), 21 deletions(-)
 create mode 100644 apps/backend/src/migrations/1782613537327-AddShippingCostPaidBySsf.ts

diff --git a/apps/backend/src/config/migrations.ts b/apps/backend/src/config/migrations.ts
index 108a248d5..e40b6077a 100644
--- a/apps/backend/src/config/migrations.ts
+++ b/apps/backend/src/config/migrations.ts
@@ -44,6 +44,7 @@ import { OrdersVolunteerActions1774883880543 } from '../migrations/1774883880543
 import { UpdatePantryFMApplicationInfo1780913024514 } from '../migrations/1780913024514-UpdatePantryFMApplicationInfo';
 import { AddUserActiveField1780531200000 } from '../migrations/1780531200000-AddUserActiveField';
 import { MakeDonationItemDetailsRequired1782000000000 } from '../migrations/1782000000000-MakeDonationItemDetailsRequired';
+import { AddShippingCostPaidBySsf1782613537327 } from '../migrations/1782613537327-AddShippingCostPaidBySsf';
 
 const schemaMigrations = [
   User1725726359198,
@@ -92,6 +93,7 @@ const schemaMigrations = [
   UpdatePantryFMApplicationInfo1780913024514,
   AddUserActiveField1780531200000,
   MakeDonationItemDetailsRequired1782000000000,
+  AddShippingCostPaidBySsf1782613537327,
 ];
 
 export default schemaMigrations;
diff --git a/apps/backend/src/foodManufacturers/dtos/donation-details-dto.ts b/apps/backend/src/foodManufacturers/dtos/donation-details-dto.ts
index 0b11f304e..163803e7b 100644
--- a/apps/backend/src/foodManufacturers/dtos/donation-details-dto.ts
+++ b/apps/backend/src/foodManufacturers/dtos/donation-details-dto.ts
@@ -24,6 +24,7 @@ export class DonationOrderDetailsDto {
   pantryName!: string;
   trackingLink!: string | null;
   shippingCost!: number | null;
+  shippingCostPaidBySsf!: boolean;
   items!: PendingOrderItemDto[];
 }
 
diff --git a/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts b/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts
index 6fbb043d6..5bcfd16eb 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts
@@ -113,6 +113,7 @@ describe('FoodManufacturersController', () => {
               pantryName: 'Community Food Pantry',
               trackingLink: null,
               shippingCost: null,
+              shippingCostPaidBySsf: false,
               items: [],
             },
           ],
diff --git a/apps/backend/src/foodManufacturers/manufacturers.service.ts b/apps/backend/src/foodManufacturers/manufacturers.service.ts
index 845be4f8a..51dece03d 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.service.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.service.ts
@@ -133,6 +133,7 @@ export class FoodManufacturersService {
                 pantryName: order.request.pantry.pantryName,
                 trackingLink: order.trackingLink,
                 shippingCost: order.shippingCost,
+                shippingCostPaidBySsf: order.shippingCostPaidBySsf,
                 items: [],
               });
             }
diff --git a/apps/backend/src/migrations/1782613537327-AddShippingCostPaidBySsf.ts b/apps/backend/src/migrations/1782613537327-AddShippingCostPaidBySsf.ts
new file mode 100644
index 000000000..9f2c59dfa
--- /dev/null
+++ b/apps/backend/src/migrations/1782613537327-AddShippingCostPaidBySsf.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddShippingCostPaidBySsf1782613537327
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE orders
+        ADD COLUMN shipping_cost_paid_by_ssf boolean NOT NULL DEFAULT false;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE orders
+        DROP COLUMN shipping_cost_paid_by_ssf;
+    `);
+  }
+}
diff --git a/apps/backend/src/orders/dtos/bulk-update-tracking-cost.dto.ts b/apps/backend/src/orders/dtos/bulk-update-tracking-cost.dto.ts
index 8f9cea09f..53f726c29 100644
--- a/apps/backend/src/orders/dtos/bulk-update-tracking-cost.dto.ts
+++ b/apps/backend/src/orders/dtos/bulk-update-tracking-cost.dto.ts
@@ -1,5 +1,6 @@
 import {
   IsArray,
+  IsBoolean,
   IsInt,
   IsNumber,
   IsOptional,
@@ -31,6 +32,10 @@ export class OrderTrackingCostEntryDto {
   )
   @Min(0, { message: 'Shipping cost cannot be negative' })
   shippingCost?: number;
+
+  @IsOptional()
+  @IsBoolean()
+  shippingCostPaidBySsf?: boolean;
 }
 
 export class BulkUpdateTrackingCostDto {
diff --git a/apps/backend/src/orders/order.entity.ts b/apps/backend/src/orders/order.entity.ts
index 9a891507d..396d72bf0 100644
--- a/apps/backend/src/orders/order.entity.ts
+++ b/apps/backend/src/orders/order.entity.ts
@@ -101,6 +101,13 @@ export class Order {
   })
   shippingCost!: number | null;
 
+  @Column({
+    name: 'shipping_cost_paid_by_ssf',
+    type: 'boolean',
+    default: false,
+  })
+  shippingCostPaidBySsf!: boolean;
+
   @ManyToOne(() => User, { nullable: false, onDelete: 'RESTRICT' })
   @JoinColumn({ name: 'assignee_id' })
   assignee!: User;
diff --git a/apps/backend/src/orders/order.service.spec.ts b/apps/backend/src/orders/order.service.spec.ts
index 88d465602..fa8f462d1 100644
--- a/apps/backend/src/orders/order.service.spec.ts
+++ b/apps/backend/src/orders/order.service.spec.ts
@@ -1540,6 +1540,30 @@ ${request.pantry.shipmentAddressCity}, ${request.pantry.shipmentAddressState} ${
       expect(after2.shippedAt).toBeDefined();
     });
 
+    it('persists the shippingCostPaidBySsf flag when provided', async () => {
+      const donationId = await insertMatchedDonation();
+      const itemId = await insertDonationItem(donationId);
+      await insertAllocation(4, itemId);
+
+      const before = await service.findOne(4);
+      expect(before.shippingCostPaidBySsf).toBe(false);
+
+      await service.bulkUpdateTrackingCostInfo({
+        donationId,
+        orders: [
+          {
+            orderId: 4,
+            shippingCost: 5.0,
+            shippingCostPaidBySsf: true,
+          },
+        ],
+      });
+
+      const after = await service.findOne(4);
+      expect(after.shippingCost).toEqual(5.0);
+      expect(after.shippingCostPaidBySsf).toBe(true);
+    });
+
     it('updates only tracking link when no shipping cost is provided, order stays PENDING', async () => {
       const donationId = await insertMatchedDonation();
       const itemId = await insertDonationItem(donationId);
diff --git a/apps/backend/src/orders/order.service.ts b/apps/backend/src/orders/order.service.ts
index 2a726fa1f..42cff2e71 100644
--- a/apps/backend/src/orders/order.service.ts
+++ b/apps/backend/src/orders/order.service.ts
@@ -739,6 +739,9 @@ ${request.pantry.shipmentAddressCity}, ${request.pantry.shipmentAddressState} ${
         if (entry.shippingCost !== undefined) {
           order.shippingCost = entry.shippingCost;
         }
+        if (entry.shippingCostPaidBySsf !== undefined) {
+          order.shippingCostPaidBySsf = entry.shippingCostPaidBySsf;
+        }
         if (order.trackingLink !== null && order.shippingCost !== null) {
           order.status = OrderStatus.SHIPPED;
           order.shippedAt = new Date();
diff --git a/apps/backend/src/pantries/pantries.controller.spec.ts b/apps/backend/src/pantries/pantries.controller.spec.ts
index e943c5d28..5ada04732 100644
--- a/apps/backend/src/pantries/pantries.controller.spec.ts
+++ b/apps/backend/src/pantries/pantries.controller.spec.ts
@@ -465,8 +465,10 @@ describe('PantriesController', () => {
           totalLbs: 100,
           totalDonatedFoodValue: 500,
           totalShippingCost: 50,
+          totalShippingCostPaidBySsf: 20,
           totalValue: 550,
-          percentageFoodRescueItems: 80,
+          percentageFoodRescueItems: 40,
+          foodRescueLbs: 80,
         },
       ];
 
@@ -505,8 +507,10 @@ describe('PantriesController', () => {
         totalLbs: 500,
         totalDonatedFoodValue: 2500,
         totalShippingCost: 200,
+        totalShippingCostPaidBySsf: 80,
         totalValue: 2700,
-        percentageFoodRescueItems: 75,
+        percentageFoodRescueItems: 30,
+        foodRescueLbs: 75,
       };
 
       mockPantriesService.getTotalStats.mockResolvedValueOnce(mockTotalStats);
@@ -524,8 +528,10 @@ describe('PantriesController', () => {
         totalLbs: 500,
         totalDonatedFoodValue: 2500,
         totalShippingCost: 200,
+        totalShippingCostPaidBySsf: 80,
         totalValue: 2700,
-        percentageFoodRescueItems: 75,
+        percentageFoodRescueItems: 30,
+        foodRescueLbs: 75,
       };
 
       mockPantriesService.getTotalStats.mockResolvedValueOnce(mockTotalStats);
diff --git a/apps/backend/src/pantries/pantries.service.spec.ts b/apps/backend/src/pantries/pantries.service.spec.ts
index 9548b6cf4..fbcba5cc3 100644
--- a/apps/backend/src/pantries/pantries.service.spec.ts
+++ b/apps/backend/src/pantries/pantries.service.spec.ts
@@ -526,6 +526,34 @@ describe('PantriesService', () => {
       expect(stats.totalDonatedFoodValue).toBeCloseTo(625.0, 2);
       expect(stats.totalValue).toBeCloseTo(645.0, 2);
       expect(stats.percentageFoodRescueItems).toBe(0);
+      expect(stats.foodRescueLbs).toBe(0);
+      // No orders are flagged SSF-paid in the seed data
+      expect(stats.totalShippingCostPaidBySsf).toBe(0);
+    });
+
+    it('only sums SSF-paid orders into totalShippingCostPaidBySsf', async () => {
+      // Capture the pantry's shipping before flagging anything as SSF-paid.
+      const before = (
+        await service.getPantryStats(['Community Food Pantry Downtown'])
+      )[0];
+      expect(before.totalShippingCost).toBeGreaterThan(0);
+
+      // Flag every order as paid by SSF. SSF-paid shipping is excluded from
+      // totalShippingCost, so that total should drop to zero while the SSF-paid
+      // total picks up the entire shipping amount.
+      await testDataSource.query(
+        `UPDATE public.orders SET shipping_cost_paid_by_ssf = true`,
+      );
+
+      const stats = (
+        await service.getPantryStats(['Community Food Pantry Downtown'])
+      )[0];
+
+      expect(stats.totalShippingCost).toBe(0);
+      expect(stats.totalShippingCostPaidBySsf).toBeCloseTo(
+        before.totalShippingCost,
+        2,
+      );
     });
 
     it('throws NotFoundException for a non-approved (denied) pantry', async () => {
@@ -564,6 +592,7 @@ describe('PantriesService', () => {
       expect(stats.totalShippingCost).toBe(0);
       expect(stats.totalValue).toBe(0);
       expect(stats.percentageFoodRescueItems).toBe(0);
+      expect(stats.foodRescueLbs).toBe(0);
     });
 
     it('respects year filter and returns zeros for a non-matching year', async () => {
@@ -579,6 +608,7 @@ describe('PantriesService', () => {
       expect(stats.totalShippingCost).toBe(0);
       expect(stats.totalValue).toBe(0);
       expect(stats.percentageFoodRescueItems).toBe(0);
+      expect(stats.foodRescueLbs).toBe(0);
     });
   });
 
@@ -814,6 +844,7 @@ describe('PantriesService', () => {
       expect(totalEmpty.totalShippingCost).toBe(0);
       expect(totalEmpty.totalValue).toBe(0);
       expect(totalEmpty.percentageFoodRescueItems).toBe(0);
+      expect(totalEmpty.foodRescueLbs).toBe(0);
     });
 
     it('returns all zeros when no approved pantries exist', async () => {
@@ -828,6 +859,7 @@ describe('PantriesService', () => {
       expect(total.totalShippingCost).toBe(0);
       expect(total.totalValue).toBe(0);
       expect(total.percentageFoodRescueItems).toBe(0);
+      expect(total.foodRescueLbs).toBe(0);
     });
 
     it('excludes a pantry set to pending from the totals', async () => {
diff --git a/apps/backend/src/pantries/pantries.service.ts b/apps/backend/src/pantries/pantries.service.ts
index e8b42e2ea..55962a366 100644
--- a/apps/backend/src/pantries/pantries.service.ts
+++ b/apps/backend/src/pantries/pantries.service.ts
@@ -65,15 +65,17 @@ export class PantriesService {
     totalLbs: 0,
     totalDonatedFoodValue: 0,
     totalShippingCost: 0,
+    totalShippingCostPaidBySsf: 0,
     totalValue: 0,
     percentageFoodRescueItems: 0,
+    foodRescueLbs: 0,
   };
 
   private async aggregateStats(
     pantryIds: number[],
     years?: number[],
   ): Promise<Omit<PantryStats, 'pantryName'>[]> {
-    // Query 1: aggregate item stats (totalItems, totalOz, totalDonatedFoodValue, totalFoodRescueItems)
+    // Query 1: aggregate item stats (totalItems, totalOz, totalDonatedFoodValue, foodRescueItems, foodRescueOz)
     const itemsQb = this.orderRepo
       .createQueryBuilder('order')
       .leftJoin('order.request', 'request')
@@ -91,7 +93,11 @@ export class PantriesService {
       )
       .addSelect(
         `COALESCE(SUM(CASE WHEN item.foodRescue = true THEN allocation.allocatedQuantity ELSE 0 END), 0)`,
-        'totalFoodRescueItems',
+        'foodRescueItems',
+      )
+      .addSelect(
+        `COALESCE(SUM(CASE WHEN item.foodRescue = true THEN COALESCE(item.ozPerItem, 0) * allocation.allocatedQuantity ELSE 0 END), 0)`,
+        'foodRescueOz',
       )
       .where('request.pantryId IN (:...pantryIds)', { pantryIds })
       .groupBy('request.pantryId');
@@ -107,7 +113,14 @@ export class PantriesService {
       .createQueryBuilder('order')
       .leftJoin('order.request', 'request')
       .select('request.pantryId', 'pantryId')
-      .addSelect('COALESCE(SUM(order.shippingCost), 0)', 'totalShippingCost')
+      .addSelect(
+        `COALESCE(SUM(CASE WHEN order.shippingCostPaidBySsf = true THEN 0 ELSE order.shippingCost END), 0)`,
+        'totalShippingCost',
+      )
+      .addSelect(
+        `COALESCE(SUM(CASE WHEN order.shippingCostPaidBySsf = true THEN order.shippingCost ELSE 0 END), 0)`,
+        'totalShippingCostPaidBySsf',
+      )
       .where('request.pantryId IN (:...pantryIds)', { pantryIds })
       .groupBy('request.pantryId');
 
@@ -126,7 +139,10 @@ export class PantriesService {
     const shippingMap = new Map(
       shippingRows.map((r) => [
         Number(r.pantryId),
-        Number(r.totalShippingCost),
+        {
+          totalShippingCost: Number(r.totalShippingCost),
+          totalShippingCostPaidBySsf: Number(r.totalShippingCostPaidBySsf),
+        },
       ]),
     );
 
@@ -134,8 +150,12 @@ export class PantriesService {
       const totalItems = Number(row.totalItems);
       const totalOz = Number(row.totalOz);
       const totalDonatedFoodValue = Number(row.totalDonatedFoodValue);
-      const totalShippingCost = shippingMap.get(Number(row.pantryId)) ?? 0;
-      const totalFoodRescueItems = Number(row.totalFoodRescueItems);
+      const shipping = shippingMap.get(Number(row.pantryId));
+      const totalShippingCost = shipping?.totalShippingCost ?? 0;
+      const totalShippingCostPaidBySsf =
+        shipping?.totalShippingCostPaidBySsf ?? 0;
+      const foodRescueItems = Number(row.foodRescueItems);
+      const foodRescueOz = Number(row.foodRescueOz);
 
       return {
         pantryId: Number(row.pantryId),
@@ -144,11 +164,13 @@ export class PantriesService {
         totalLbs: parseFloat((totalOz / 16).toFixed(2)),
         totalDonatedFoodValue,
         totalShippingCost,
+        totalShippingCostPaidBySsf,
         totalValue: totalDonatedFoodValue + totalShippingCost,
         percentageFoodRescueItems:
           totalItems > 0
-            ? parseFloat(((totalFoodRescueItems / totalItems) * 100).toFixed(2))
+            ? parseFloat(((foodRescueItems / totalItems) * 100).toFixed(2))
             : 0,
+        foodRescueLbs: parseFloat((foodRescueOz / 16).toFixed(2)),
       } satisfies Omit<PantryStats, 'pantryName'>;
     });
   }
@@ -242,12 +264,15 @@ export class PantriesService {
       totalStats.totalOz += s.totalOz;
       totalStats.totalDonatedFoodValue += s.totalDonatedFoodValue;
       totalStats.totalShippingCost += s.totalShippingCost;
+      totalStats.totalShippingCostPaidBySsf += s.totalShippingCostPaidBySsf;
       totalStats.totalValue += s.totalValue;
+      totalStats.foodRescueLbs += s.foodRescueLbs;
       totalFoodRescueItems +=
         (s.percentageFoodRescueItems / 100) * s.totalItems;
     }
 
     totalStats.totalLbs = parseFloat((totalStats.totalOz / 16).toFixed(2));
+    totalStats.foodRescueLbs = parseFloat(totalStats.foodRescueLbs.toFixed(2));
     totalStats.percentageFoodRescueItems =
       totalStats.totalItems > 0
         ? parseFloat(
diff --git a/apps/backend/src/pantries/types.ts b/apps/backend/src/pantries/types.ts
index 543f6883c..ed47e1c53 100644
--- a/apps/backend/src/pantries/types.ts
+++ b/apps/backend/src/pantries/types.ts
@@ -90,8 +90,10 @@ export type PantryStats = {
   totalLbs: number;
   totalDonatedFoodValue: number;
   totalShippingCost: number;
+  totalShippingCostPaidBySsf: number;
   totalValue: number;
   percentageFoodRescueItems: number;
+  foodRescueLbs: number;
 };
 
 // Make new type that is just a list of PantryStats with pantryId and pantryName omitted
diff --git a/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx b/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
index 1fc65adc4..b8ad09b97 100644
--- a/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
+++ b/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
@@ -46,6 +46,7 @@ interface FmCompleteRequiredActionsModalProps {
 interface OrderFormData {
   shippingCost: string;
   trackingLink: string;
+  shippingCostPaidBySsf: boolean;
 }
 
 interface ItemFormData {
@@ -137,6 +138,7 @@ const FmCompleteRequiredActionsModal: React.FC<
         {
           shippingCost: o.shippingCost?.toString() ?? '',
           trackingLink: o.trackingLink ?? '',
+          shippingCostPaidBySsf: o.shippingCostPaidBySsf,
         },
       ]),
     ),
@@ -179,7 +181,7 @@ const FmCompleteRequiredActionsModal: React.FC<
   const updateOrderField = (
     orderId: number,
     field: keyof OrderFormData,
-    value: string,
+    value: string | boolean,
   ) => {
     setOrderFormData((prev) => ({
       ...prev,
@@ -255,11 +257,19 @@ const FmCompleteRequiredActionsModal: React.FC<
       // Only include orders where the user actually changed a value from the original prop values
       const ordersToUpdate = orders
         .filter((order) => {
-          const { trackingLink, shippingCost } = orderFormData[order.orderId];
+          const { trackingLink, shippingCost, shippingCostPaidBySsf } =
+            orderFormData[order.orderId];
           const originalTracking = order.trackingLink ?? '';
           const originalCost = order.shippingCost?.toString() ?? '';
+          // The paid-by-SSF flag is only meaningful alongside a shipping cost,
+          // so only treat a flag change as a change when a cost is present.
+          const flagChanged =
+            shippingCost !== '' &&
+            shippingCostPaidBySsf !== order.shippingCostPaidBySsf;
           return (
-            trackingLink !== originalTracking || shippingCost !== originalCost
+            trackingLink !== originalTracking ||
+            shippingCost !== originalCost ||
+            flagChanged
           );
         })
         .map(
@@ -269,13 +279,16 @@ const FmCompleteRequiredActionsModal: React.FC<
             orderId: number;
             trackingLink?: string;
             shippingCost?: number;
+            shippingCostPaidBySsf?: boolean;
           } => {
-            const { trackingLink, shippingCost } = orderFormData[order.orderId];
+            const { trackingLink, shippingCost, shippingCostPaidBySsf } =
+              orderFormData[order.orderId];
             return {
               orderId: order.orderId,
               ...(trackingLink.trim() !== '' && { trackingLink }),
               ...(shippingCost !== '' && {
                 shippingCost: parseFloat(shippingCost),
+                shippingCostPaidBySsf,
               }),
             };
           },
@@ -373,6 +386,33 @@ const FmCompleteRequiredActionsModal: React.FC<
                       )
                     }
                   />
+                  <Checkbox.Root
+                    mt={3}
+                    checked={
+                      orderFormData[currentOrder.orderId].shippingCostPaidBySsf
+                    }
+                    size="sm"
+                    borderRadius="2px"
+                    onCheckedChange={(e: { checked: boolean }) =>
+                      updateOrderField(
+                        currentOrder.orderId,
+                        'shippingCostPaidBySsf',
+                        !!e.checked,
+                      )
+                    }
+                  >
+                    <Checkbox.HiddenInput />
+                    <Checkbox.Control borderRadius="2px" borderColor="#E4E4E7">
+                      <Checkbox.Indicator />
+                    </Checkbox.Control>
+                    <Checkbox.Label
+                      fontWeight="400"
+                      fontSize="sm"
+                      color="neutral.800"
+                    >
+                      Shipping cost paid by SSF
+                    </Checkbox.Label>
+                  </Checkbox.Root>
                 </Box>
 
                 <Box mt={4}>
diff --git a/apps/frontend/src/containers/adminDonationStats.tsx b/apps/frontend/src/containers/adminDonationStats.tsx
index 58e3bb908..91c9c8566 100644
--- a/apps/frontend/src/containers/adminDonationStats.tsx
+++ b/apps/frontend/src/containers/adminDonationStats.tsx
@@ -367,15 +367,23 @@ const AdminDonationStats: React.FC = () => {
               borderRightColor="neutral.100"
               width="15%"
             >
-              Value of Donated Food
+              Fair Market Value of Food Donation
             </Table.ColumnHeader>
             <Table.ColumnHeader
               {...tableHeaderStyles}
               borderRight="1px solid"
               borderRightColor="neutral.100"
-              width="15%"
+              width="13%"
             >
-              Shipping Cost/Tax
+              Shipping/ Delivery Expenses
+            </Table.ColumnHeader>
+            <Table.ColumnHeader
+              {...tableHeaderStyles}
+              borderRight="1px solid"
+              borderRightColor="neutral.100"
+              width="13%"
+            >
+              Shipping Paid by SSF
             </Table.ColumnHeader>
             <Table.ColumnHeader
               {...tableHeaderStyles}
@@ -385,8 +393,16 @@ const AdminDonationStats: React.FC = () => {
             >
               Total Value
             </Table.ColumnHeader>
-            <Table.ColumnHeader {...tableHeaderStyles} width="25%">
-              % of Food Rescue
+            <Table.ColumnHeader
+              {...tableHeaderStyles}
+              borderRight="1px solid"
+              borderRightColor="neutral.100"
+              width="10%"
+            >
+              % Food Rescue
+            </Table.ColumnHeader>
+            <Table.ColumnHeader {...tableHeaderStyles} width="10%">
+              Lbs Food Rescue
             </Table.ColumnHeader>
           </Table.Row>
         </Table.Header>
@@ -441,6 +457,14 @@ const AdminDonationStats: React.FC = () => {
               >
                 ${(totalStats?.totalShippingCost ?? 0).toFixed(2)}
               </Table.Cell>
+              <Table.Cell
+                textStyle="p2"
+                borderRight="1px solid"
+                borderRightColor="neutral.100"
+                bg="yellow.100"
+              >
+                ${(totalStats?.totalShippingCostPaidBySsf ?? 0).toFixed(2)}
+              </Table.Cell>
               <Table.Cell
                 textStyle="p2"
                 borderRight="1px solid"
@@ -449,9 +473,17 @@ const AdminDonationStats: React.FC = () => {
               >
                 ${(totalStats?.totalValue ?? 0).toFixed(2)}
               </Table.Cell>
-              <Table.Cell textStyle="p2" bg="yellow.100">
+              <Table.Cell
+                textStyle="p2"
+                borderRight="1px solid"
+                borderRightColor="neutral.100"
+                bg="yellow.100"
+              >
                 {(totalStats?.percentageFoodRescueItems ?? 0).toFixed(2)}%
               </Table.Cell>
+              <Table.Cell textStyle="p2" bg="yellow.100">
+                {(totalStats?.foodRescueLbs ?? 0).toFixed(2)}
+              </Table.Cell>
             </Table.Row>
           )}
           {pantryStats.map((stat) => (
@@ -499,6 +531,13 @@ const AdminDonationStats: React.FC = () => {
               >
                 ${stat.totalShippingCost.toFixed(2)}
               </Table.Cell>
+              <Table.Cell
+                textStyle="p2"
+                borderRight="1px solid"
+                borderRightColor="neutral.100"
+              >
+                ${stat.totalShippingCostPaidBySsf.toFixed(2)}
+              </Table.Cell>
               <Table.Cell
                 textStyle="p2"
                 borderRight="1px solid"
@@ -506,9 +545,16 @@ const AdminDonationStats: React.FC = () => {
               >
                 ${stat.totalValue.toFixed(2)}
               </Table.Cell>
-              <Table.Cell textStyle="p2">
+              <Table.Cell
+                textStyle="p2"
+                borderRight="1px solid"
+                borderRightColor="neutral.100"
+              >
                 {stat.percentageFoodRescueItems.toFixed(2)}%
               </Table.Cell>
+              <Table.Cell textStyle="p2">
+                {stat.foodRescueLbs.toFixed(2)}
+              </Table.Cell>
             </Table.Row>
           ))}
         </Table.Body>
diff --git a/apps/frontend/src/types/types.ts b/apps/frontend/src/types/types.ts
index 07e299ce4..b8aaf4edd 100644
--- a/apps/frontend/src/types/types.ts
+++ b/apps/frontend/src/types/types.ts
@@ -215,6 +215,7 @@ export interface DonationOrderDetails {
   pantryName: string;
   trackingLink: string | null;
   shippingCost: number | null;
+  shippingCostPaidBySsf: boolean;
   items: OrderItemDetails[];
 }
 
@@ -462,6 +463,7 @@ export interface UpdateFoodRequestBody {
 }
 
 export interface CreateDonationDto {
+  foodManufacturerId: number;
   recurrenceFreq?: number;
   recurrence: RecurrenceEnum;
   repeatOnDays?: RepeatOnState;
@@ -570,8 +572,10 @@ export interface PantryStats {
   totalLbs: number;
   totalDonatedFoodValue: number;
   totalShippingCost: number;
+  totalShippingCostPaidBySsf: number;
   totalValue: number;
   percentageFoodRescueItems: number;
+  foodRescueLbs: number;
 }
 
 export type TotalStats = Omit<PantryStats, 'pantryId' | 'pantryName'>;
@@ -592,6 +596,7 @@ export interface BulkUpdateTrackingCostDto {
     orderId: number;
     trackingLink?: string;
     shippingCost?: number;
+    shippingCostPaidBySsf?: boolean;
   }[];
 }
 

From 6e9b8a3e11578629c18cb1fe674940f20b679172 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 18:58:05 -0400
Subject: [PATCH 04/15] Require foodManufacturerId when creating a donation

Add foodManufacturerId to CreateDonationDto and pass it from the new
donation and resubmit donation forms. Also tweaks the fair-market-value
column header copy on the new donation form.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/backend/src/donations/dtos/create-donation.dto.ts    | 4 ++++
 .../src/components/forms/newDonationFormModal.tsx         | 8 ++++++--
 .../src/components/forms/resubmitDonationModal.tsx        | 1 +
 .../src/containers/foodManufacturerDonationManagement.tsx | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/backend/src/donations/dtos/create-donation.dto.ts b/apps/backend/src/donations/dtos/create-donation.dto.ts
index 04e7b2b25..eff77278f 100644
--- a/apps/backend/src/donations/dtos/create-donation.dto.ts
+++ b/apps/backend/src/donations/dtos/create-donation.dto.ts
@@ -65,6 +65,10 @@ export class RepeatOnDaysDto {
 }
 
 export class CreateDonationDto {
+  @IsInt()
+  @IsNotEmpty()
+  foodManufacturerId!: number;
+
   @IsNotEmpty()
   @IsEnum(RecurrenceEnum)
   recurrence!: RecurrenceEnum;
diff --git a/apps/frontend/src/components/forms/newDonationFormModal.tsx b/apps/frontend/src/components/forms/newDonationFormModal.tsx
index 90c9a7dcd..efe3db85f 100644
--- a/apps/frontend/src/components/forms/newDonationFormModal.tsx
+++ b/apps/frontend/src/components/forms/newDonationFormModal.tsx
@@ -36,6 +36,7 @@ interface NewDonationFormModalProps {
   onDonationSuccess: () => void;
   isOpen: boolean;
   onClose: () => void;
+  foodManufacturerId: number;
 }
 
 interface DonationRow {
@@ -113,6 +114,7 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
   onDonationSuccess,
   isOpen,
   onClose,
+  foodManufacturerId,
 }) => {
   useModalBodyCleanup();
   const [rows, setRows] = useState<DonationRow[]>([
@@ -217,6 +219,7 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
     }
 
     const donationBody: CreateDonationDto = {
+      foodManufacturerId,
       recurrenceFreq: isRecurring ? parseInt(repeatEvery) : undefined,
       recurrence: isRecurring ? repeatInterval : RecurrenceEnum.NONE,
       repeatOnDays:
@@ -382,8 +385,9 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
                       </Text>
                     </Table.ColumnHeader>
                     <Table.ColumnHeader width="14%">
-                      <Text>Donation Value</Text>
-                      (Fair Market Value of Food Only)
+                      Fair Market Value
+                      <br />
+                      of Food Donation
                       <Text as="span" color="red">
                         *
                       </Text>
diff --git a/apps/frontend/src/components/forms/resubmitDonationModal.tsx b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
index dbd716631..0cf0074d1 100644
--- a/apps/frontend/src/components/forms/resubmitDonationModal.tsx
+++ b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
@@ -112,6 +112,7 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
     setIsSubmitting(true);
     try {
       const dto: CreateDonationDto = {
+        foodManufacturerId,
         recurrence: RecurrenceEnum.NONE,
         items: items.map((item) => ({
           itemName: item.itemName,
diff --git a/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx b/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
index 4e4780874..f5dd24942 100644
--- a/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
+++ b/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
@@ -235,6 +235,7 @@ const FoodManufacturerDonationManagement: React.FC = () => {
           onDonationSuccess={() => fetchDonations(manufacturerId)}
           isOpen={isLogDonationOpen}
           onClose={() => setIsLogDonationOpen(false)}
+          foodManufacturerId={manufacturerId}
         />
       )}
 

From 41b21e7bce1dd222a0459b1a36d5c3a279b42a68 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 18:58:24 -0400
Subject: [PATCH 05/15] Show recurring reminder schedule in donation details

Display the recurring-reminders indicator and the list of upcoming
reminder email dates for recurring donations in the donation details
modal.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../components/forms/donationDetailsModal.tsx | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/apps/frontend/src/components/forms/donationDetailsModal.tsx b/apps/frontend/src/components/forms/donationDetailsModal.tsx
index 198e72fdf..dce434bda 100644
--- a/apps/frontend/src/components/forms/donationDetailsModal.tsx
+++ b/apps/frontend/src/components/forms/donationDetailsModal.tsx
@@ -1,12 +1,24 @@
 import React, { useState, useEffect } from 'react';
-import { Box, Text, VStack, Dialog, CloseButton } from '@chakra-ui/react';
+import {
+  Box,
+  Text,
+  VStack,
+  Dialog,
+  CloseButton,
+  Checkbox,
+} from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { Donation, DonationItem, FoodType } from 'types/types';
 import { formatDate } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
-import { AlertStatus } from '../../types/types';
+import {
+  AlertStatus,
+  Donation,
+  DonationItem,
+  FoodType,
+  RecurrenceEnum,
+} from '../../types/types';
 
 interface DonationDetailsModalProps {
   donation: Donation;
@@ -139,6 +151,34 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
                 </Box>
               ))}
             </VStack>
+
+            {donation.recurrence !== RecurrenceEnum.NONE && (
+              <Box mt={6} color="neutral.800" fontSize="sm">
+                <Checkbox.Root checked readOnly pointerEvents="none" mb={3}>
+                  <Checkbox.HiddenInput />
+                  <Checkbox.Control borderRadius="2px" borderColor="#E4E4E7">
+                    <Checkbox.Indicator />
+                  </Checkbox.Control>
+                  <Checkbox.Label color="neutral.700" fontWeight={400}>
+                    Make Donation Recurring Reminders
+                  </Checkbox.Label>
+                </Checkbox.Root>
+
+                {donation.nextDonationDates &&
+                  donation.nextDonationDates.length > 0 && (
+                    <Box>
+                      <Text fontWeight={600} mb={2}>
+                        Upcoming reminder emails
+                      </Text>
+                      <Text color="neutral.700">
+                        {donation.nextDonationDates
+                          .map((date) => formatDate(date))
+                          .join(', ')}
+                      </Text>
+                    </Box>
+                  )}
+              </Box>
+            )}
           </Dialog.Body>
         </Dialog.Content>
       </Dialog.Positioner>

From 7cb9f44a2f0eb84813247c01f0a4f71e5d6cda14 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 18:58:27 -0400
Subject: [PATCH 06/15] Fix admin dashboard pantry application link

Route pending pantry applications to PANTRY_APPLICATION_DETAILS
(keyed by applicationId) instead of PANTRY_MANAGEMENT_DETAILS, which
expected a pantryId and was being given an application id.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/frontend/src/containers/adminDashboard.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/containers/adminDashboard.tsx b/apps/frontend/src/containers/adminDashboard.tsx
index 24a148a86..00f86ccb4 100644
--- a/apps/frontend/src/containers/adminDashboard.tsx
+++ b/apps/frontend/src/containers/adminDashboard.tsx
@@ -176,8 +176,8 @@ const AdminDashboard: React.FC = () => {
                   onLinkClick={() => {
                     navigate(
                       application.type === 'pantry'
-                        ? ROUTES.PANTRY_MANAGEMENT_DETAILS.replace(
-                            ':pantryId',
+                        ? ROUTES.PANTRY_APPLICATION_DETAILS.replace(
+                            ':applicationId',
                             application.id.toString(),
                           )
                         : ROUTES.FOOD_MANUFACTURER_APPLICATION_DETAILS.replace(

From e75079623e89ba1960f64860ee34eb8294a633a3 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 18:58:31 -0400
Subject: [PATCH 07/15] Allow admins to fetch a volunteer's pantries

Add Role.ADMIN to the /volunteers/:id/pantries endpoint so admins can
read a volunteer's assigned pantries.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/backend/src/volunteers/volunteers.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/backend/src/volunteers/volunteers.controller.ts b/apps/backend/src/volunteers/volunteers.controller.ts
index 70f05e3c8..6d24ded53 100644
--- a/apps/backend/src/volunteers/volunteers.controller.ts
+++ b/apps/backend/src/volunteers/volunteers.controller.ts
@@ -30,7 +30,7 @@ export class VolunteersController {
     idParam: 'id',
     resolver: resolveVolunteerAuthorizedUserIds,
   })
-  @Roles(Role.VOLUNTEER)
+  @Roles(Role.VOLUNTEER, Role.ADMIN)
   @Get('/:id/pantries')
   async getVolunteerPantries(
     @Param('id', ParseIntPipe) id: number,

From b621dd7114a186e74ebacd3939edd99e160f58ea Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 18:58:34 -0400
Subject: [PATCH 08/15] update email script

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/backend/src/emails/emailTemplates.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/backend/src/emails/emailTemplates.ts b/apps/backend/src/emails/emailTemplates.ts
index b1d2e1f2c..261c4ed23 100644
--- a/apps/backend/src/emails/emailTemplates.ts
+++ b/apps/backend/src/emails/emailTemplates.ts
@@ -219,6 +219,10 @@ export const emailTemplates = {
           .map((item) => `<li>${item.quantity} of ${item.product}</li>`)
           .join('')}
       </ul>
+      <p>
+      We strongly recommend that clients read all ingredients and allergen labels before consuming any foods. 
+      Any questions or issues should be directed to the manufacturer(s) and/or their healthcare provider(s).
+      </p>
       <p>
         To view full order details, delivery updates, and any notes from the coordinating volunteer or food manufacturer, please <a href="${EMAIL_REDIRECT_URL}/login">log in to the platform</a>.
       </p>

From 6d774040b7457acb554599a16e5d03c74e405a2d Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sat, 4 Jul 2026 19:07:26 -0400
Subject: [PATCH 09/15] fixed test

---
 apps/backend/src/donations/donations.service.spec.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/backend/src/donations/donations.service.spec.ts b/apps/backend/src/donations/donations.service.spec.ts
index e4e2bad24..4cfadbaad 100644
--- a/apps/backend/src/donations/donations.service.spec.ts
+++ b/apps/backend/src/donations/donations.service.spec.ts
@@ -1126,6 +1126,7 @@ describe('DonationService', () => {
     it('successfully creates a donation with items', async () => {
       const donation = await service.create(
         {
+          foodManufacturerId: 1,
           recurrence: RecurrenceEnum.NONE,
           items: validItems,
         },
@@ -1164,6 +1165,7 @@ describe('DonationService', () => {
 
       const donation = await service.create(
         {
+          foodManufacturerId: 1,
           recurrence: RecurrenceEnum.MONTHLY,
           recurrenceFreq: 1,
           occurrencesRemaining: 3,
@@ -1203,6 +1205,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
+            foodManufacturerId: 1,
             recurrence: RecurrenceEnum.NONE,
             items: validItems,
           },
@@ -1219,6 +1222,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
+            foodManufacturerId: 1,
             recurrence: RecurrenceEnum.WEEKLY,
             repeatOnDays: {
               Sunday: false,
@@ -1250,6 +1254,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
+            foodManufacturerId: 1,
             recurrence: RecurrenceEnum.NONE,
             items: [
               ...validItems,
@@ -1275,6 +1280,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
+            foodManufacturerId: 1,
             recurrence: RecurrenceEnum.NONE,
             items: validItems,
           },

From 5a84a1d5fa31777ae178a4c7557cde446a43165f Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Sun, 5 Jul 2026 18:45:21 -0400
Subject: [PATCH 10/15] Address review: drop unused foodManufacturerId,
 simplify recurring UI

- Remove foodManufacturerId from CreateDonationDto and its create-endpoint
  CheckOwnership. donations.service.create resolves the manufacturer from
  the authenticated user (req.user.id), so the body id and the ownership
  check were dead weight; @Roles(FOODMANUFACTURER) already gates it. Also
  collapses a duplicate @Roles decorator on the create handler.
- Drop foodManufacturerId from the frontend CreateDonationDto type and the
  new/resubmit donation forms and their container props.
- Replace the read-only "Make Donation Recurring Reminders" checkbox in the
  donation details modal with a bold "Recurring Donation" label.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/donations/donations.controller.ts     | 21 -------------------
 .../src/donations/dtos/create-donation.dto.ts |  4 ----
 .../components/forms/donationDetailsModal.tsx | 13 +++---------
 .../components/forms/newDonationFormModal.tsx |  3 ---
 .../forms/resubmitDonationModal.tsx           |  3 ---
 .../foodManufacturerDonationManagement.tsx    |  2 --
 apps/frontend/src/types/types.ts              |  1 -
 7 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/apps/backend/src/donations/donations.controller.ts b/apps/backend/src/donations/donations.controller.ts
index 3bd34c73f..671203ad8 100644
--- a/apps/backend/src/donations/donations.controller.ts
+++ b/apps/backend/src/donations/donations.controller.ts
@@ -25,8 +25,6 @@ import {
   OwnerIdResolver,
   pipeNullable,
 } from '../auth/ownership.decorator';
-import { FoodManufacturersService } from '../foodManufacturers/manufacturers.service';
-import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { AuthenticatedRequest } from '../auth/authenticated-request';
 
 const resolveDonationAuthorizedUserIds: OwnerIdResolver = ({
@@ -40,19 +38,6 @@ const resolveDonationAuthorizedUserIds: OwnerIdResolver = ({
     ],
   );
 
-// For creating a donation, the foodManufacturerId comes from the request body
-// and the only authorized non-admin caller is the manufacturer representative.
-const resolveCreateDonationAuthorizedUserIds: OwnerIdResolver = ({
-  entityId,
-  services,
-}) =>
-  pipeNullable(
-    () => services.get(FoodManufacturersService).findOne(entityId),
-    (manufacturer: FoodManufacturer) => [
-      manufacturer.foodManufacturerRepresentative.id,
-    ],
-  );
-
 @Controller('donations')
 export class DonationsController {
   constructor(private donationService: DonationService) {}
@@ -64,11 +49,6 @@ export class DonationsController {
   }
 
   @Roles(Role.FOODMANUFACTURER)
-  @CheckOwnership({
-    idParam: 'foodManufacturerId',
-    idSource: 'body',
-    resolver: resolveCreateDonationAuthorizedUserIds,
-  })
   @Post()
   @ApiBody({
     description: 'Details for creating a donation',
@@ -116,7 +96,6 @@ export class DonationsController {
       },
     },
   })
-  @Roles(Role.FOODMANUFACTURER)
   async createDonation(
     @Req() req: AuthenticatedRequest,
     @Body() body: CreateDonationDto,
diff --git a/apps/backend/src/donations/dtos/create-donation.dto.ts b/apps/backend/src/donations/dtos/create-donation.dto.ts
index eff77278f..04e7b2b25 100644
--- a/apps/backend/src/donations/dtos/create-donation.dto.ts
+++ b/apps/backend/src/donations/dtos/create-donation.dto.ts
@@ -65,10 +65,6 @@ export class RepeatOnDaysDto {
 }
 
 export class CreateDonationDto {
-  @IsInt()
-  @IsNotEmpty()
-  foodManufacturerId!: number;
-
   @IsNotEmpty()
   @IsEnum(RecurrenceEnum)
   recurrence!: RecurrenceEnum;
diff --git a/apps/frontend/src/components/forms/donationDetailsModal.tsx b/apps/frontend/src/components/forms/donationDetailsModal.tsx
index dce434bda..1e9217ca3 100644
--- a/apps/frontend/src/components/forms/donationDetailsModal.tsx
+++ b/apps/frontend/src/components/forms/donationDetailsModal.tsx
@@ -5,7 +5,6 @@ import {
   VStack,
   Dialog,
   CloseButton,
-  Checkbox,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
 import { formatDate } from '@utils/utils';
@@ -154,15 +153,9 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
 
             {donation.recurrence !== RecurrenceEnum.NONE && (
               <Box mt={6} color="neutral.800" fontSize="sm">
-                <Checkbox.Root checked readOnly pointerEvents="none" mb={3}>
-                  <Checkbox.HiddenInput />
-                  <Checkbox.Control borderRadius="2px" borderColor="#E4E4E7">
-                    <Checkbox.Indicator />
-                  </Checkbox.Control>
-                  <Checkbox.Label color="neutral.700" fontWeight={400}>
-                    Make Donation Recurring Reminders
-                  </Checkbox.Label>
-                </Checkbox.Root>
+                <Text fontWeight={600} color="neutral.700" mb={3}>
+                  Recurring Donation
+                </Text>
 
                 {donation.nextDonationDates &&
                   donation.nextDonationDates.length > 0 && (
diff --git a/apps/frontend/src/components/forms/newDonationFormModal.tsx b/apps/frontend/src/components/forms/newDonationFormModal.tsx
index efe3db85f..92b8092c7 100644
--- a/apps/frontend/src/components/forms/newDonationFormModal.tsx
+++ b/apps/frontend/src/components/forms/newDonationFormModal.tsx
@@ -36,7 +36,6 @@ interface NewDonationFormModalProps {
   onDonationSuccess: () => void;
   isOpen: boolean;
   onClose: () => void;
-  foodManufacturerId: number;
 }
 
 interface DonationRow {
@@ -114,7 +113,6 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
   onDonationSuccess,
   isOpen,
   onClose,
-  foodManufacturerId,
 }) => {
   useModalBodyCleanup();
   const [rows, setRows] = useState<DonationRow[]>([
@@ -219,7 +217,6 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
     }
 
     const donationBody: CreateDonationDto = {
-      foodManufacturerId,
       recurrenceFreq: isRecurring ? parseInt(repeatEvery) : undefined,
       recurrence: isRecurring ? repeatInterval : RecurrenceEnum.NONE,
       repeatOnDays:
diff --git a/apps/frontend/src/components/forms/resubmitDonationModal.tsx b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
index 0cf0074d1..3db11c9f5 100644
--- a/apps/frontend/src/components/forms/resubmitDonationModal.tsx
+++ b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
@@ -29,7 +29,6 @@ interface ResubmitDonationModalProps {
   onClose: () => void;
   onSuccess: () => void;
   donations: DonationDetails[];
-  foodManufacturerId: number;
   initialDonationId?: number | null;
   onSelect: (donationId: number) => void;
 }
@@ -46,7 +45,6 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
   onClose,
   onSuccess,
   donations,
-  foodManufacturerId,
   initialDonationId,
   onSelect,
 }) => {
@@ -112,7 +110,6 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
     setIsSubmitting(true);
     try {
       const dto: CreateDonationDto = {
-        foodManufacturerId,
         recurrence: RecurrenceEnum.NONE,
         items: items.map((item) => ({
           itemName: item.itemName,
diff --git a/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx b/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
index f5dd24942..b189e4ccb 100644
--- a/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
+++ b/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
@@ -235,7 +235,6 @@ const FoodManufacturerDonationManagement: React.FC = () => {
           onDonationSuccess={() => fetchDonations(manufacturerId)}
           isOpen={isLogDonationOpen}
           onClose={() => setIsLogDonationOpen(false)}
-          foodManufacturerId={manufacturerId}
         />
       )}
 
@@ -245,7 +244,6 @@ const FoodManufacturerDonationManagement: React.FC = () => {
           onClose={handleResubmitClose}
           onSuccess={() => fetchDonations(manufacturerId)}
           donations={Object.values(statusDonations).flat()}
-          foodManufacturerId={manufacturerId}
           initialDonationId={
             resubmitDonationId ? parseInt(resubmitDonationId, 10) : null
           }
diff --git a/apps/frontend/src/types/types.ts b/apps/frontend/src/types/types.ts
index b8aaf4edd..e429a7010 100644
--- a/apps/frontend/src/types/types.ts
+++ b/apps/frontend/src/types/types.ts
@@ -463,7 +463,6 @@ export interface UpdateFoodRequestBody {
 }
 
 export interface CreateDonationDto {
-  foodManufacturerId: number;
   recurrenceFreq?: number;
   recurrence: RecurrenceEnum;
   repeatOnDays?: RepeatOnState;

From feefaadf3ab87b69cd2a7e8bb2842a6ee16e49c2 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Mon, 6 Jul 2026 02:41:39 -0400
Subject: [PATCH 11/15] Drop foodManufacturerId from donation create specs

Follows the DTO field removal so donations.service.spec compiles.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/donations/donations.service.spec.ts        | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/backend/src/donations/donations.service.spec.ts b/apps/backend/src/donations/donations.service.spec.ts
index 5ddec6deb..8628dfbb2 100644
--- a/apps/backend/src/donations/donations.service.spec.ts
+++ b/apps/backend/src/donations/donations.service.spec.ts
@@ -1179,7 +1179,6 @@ describe('DonationService', () => {
     it('successfully creates a donation with items', async () => {
       const donation = await service.create(
         {
-          foodManufacturerId: 1,
           recurrence: RecurrenceEnum.NONE,
           items: validItems,
         },
@@ -1218,7 +1217,6 @@ describe('DonationService', () => {
 
       const donation = await service.create(
         {
-          foodManufacturerId: 1,
           recurrence: RecurrenceEnum.MONTHLY,
           recurrenceFreq: 1,
           occurrencesRemaining: 3,
@@ -1258,8 +1256,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-            foodManufacturerId: 1,
-            recurrence: RecurrenceEnum.NONE,
+              recurrence: RecurrenceEnum.NONE,
             items: validItems,
           },
           1,
@@ -1275,8 +1272,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-            foodManufacturerId: 1,
-            recurrence: RecurrenceEnum.WEEKLY,
+              recurrence: RecurrenceEnum.WEEKLY,
             repeatOnDays: {
               Sunday: false,
               Monday: true,
@@ -1307,8 +1303,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-            foodManufacturerId: 1,
-            recurrence: RecurrenceEnum.NONE,
+              recurrence: RecurrenceEnum.NONE,
             items: [
               ...validItems,
               {
@@ -1333,8 +1328,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-            foodManufacturerId: 1,
-            recurrence: RecurrenceEnum.NONE,
+              recurrence: RecurrenceEnum.NONE,
             items: validItems,
           },
           5,

From 65c53356a0f9cbcde8cdb714e176b7cb9d9ce9f8 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Mon, 6 Jul 2026 07:29:55 -0400
Subject: [PATCH 12/15] food request empty page

---
 .../src/components/foodRequestManagement.tsx  | 360 +++++++++---------
 1 file changed, 184 insertions(+), 176 deletions(-)

diff --git a/apps/frontend/src/components/foodRequestManagement.tsx b/apps/frontend/src/components/foodRequestManagement.tsx
index e03e33d88..a0e9d42fa 100644
--- a/apps/frontend/src/components/foodRequestManagement.tsx
+++ b/apps/frontend/src/components/foodRequestManagement.tsx
@@ -15,6 +15,7 @@ import { ArrowDownUp, ChevronRight, ChevronLeft, Funnel } from 'lucide-react';
 import { capitalize, formatDate } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
 import { FoodRequestStatus, FoodRequestSummaryDto } from '../types/types';
+import TableEmptyState from '@components/tableEmptyState';
 import RequestDetailsModal from '@components/forms/requestDetailsModal';
 import PantryDeleteRequestActionModal from '@components/forms/pantryDeleteRequestModal';
 import VolunteerCloseRequestActionModal from '@components/forms/volunteerCloseRequestModal';
@@ -253,209 +254,216 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
           Sort
         </Button>
       </Box>
-      <Table.Root>
-        <Table.Header>
-          <Table.Row>
-            <Table.ColumnHeader
-              {...tableHeaderStyles}
-              borderRight="1px solid"
-              borderRightColor="neutral.100"
-              width="15%"
-            >
-              Request #
-            </Table.ColumnHeader>
-            <Table.ColumnHeader
-              {...tableHeaderStyles}
-              borderRight="1px solid"
-              borderRightColor="neutral.100"
-              width="15%"
-            >
-              Status
-            </Table.ColumnHeader>
-            <Table.ColumnHeader
-              {...tableHeaderStyles}
-              borderRight="1px solid"
-              borderRightColor="neutral.100"
-              width={enableVolunteerActions ? '20%' : '40%'}
-            >
-              Pantry
-            </Table.ColumnHeader>
-            <Table.ColumnHeader
-              {...tableHeaderStyles}
-              textAlign="right"
-              borderRight={enableVolunteerActions ? '1px solid' : undefined}
-              borderRightColor="neutral.100"
-              width={enableVolunteerActions ? '20%' : '30%'}
-            >
-              Date Requested
-            </Table.ColumnHeader>
-            {enableVolunteerActions && (
+      {paginatedRequests.length === 0 ? (
+        <TableEmptyState
+          title="No Food Requests"
+          subtitle="You have no food requests at this time."
+        />
+      ) : (
+        <Table.Root>
+          <Table.Header>
+            <Table.Row>
               <Table.ColumnHeader
                 {...tableHeaderStyles}
-                textAlign="right"
-                width="30%"
-              >
-                Action Required
-              </Table.ColumnHeader>
-            )}
-          </Table.Row>
-        </Table.Header>
-        <Table.Body>
-          {paginatedRequests.map((request) => (
-            <Table.Row key={request.requestId} _hover={{ bg: 'neutral.50' }}>
-              <Table.Cell
-                {...tableCellStyles}
                 borderRight="1px solid"
                 borderRightColor="neutral.100"
+                width="15%"
               >
-                <Link
-                  textDecorationColor="black"
-                  variant="underline"
-                  onClick={() => setSelectedViewDetailsRequest(request)}
-                >
-                  {request.requestId}
-                </Link>
-              </Table.Cell>
-              <Table.Cell
-                {...tableCellStyles}
+                Request #
+              </Table.ColumnHeader>
+              <Table.ColumnHeader
+                {...tableHeaderStyles}
                 borderRight="1px solid"
                 borderRightColor="neutral.100"
+                width="15%"
               >
-                <Box
-                  borderRadius="md"
-                  bg={
-                    request.status === FoodRequestStatus.ACTIVE
-                      ? 'teal.200'
-                      : 'neutral.300'
-                  }
-                  color={
-                    request.status === FoodRequestStatus.ACTIVE
-                      ? 'teal.hover'
-                      : 'black'
-                  }
-                  display="inline-block"
-                  fontWeight="500"
-                  fontSize="12px"
-                  my={3}
-                  py={0.5}
-                  px={3}
-                >
-                  {capitalize(request.status)}
-                </Box>
-              </Table.Cell>
-              <Table.Cell
-                {...tableCellStyles}
+                Status
+              </Table.ColumnHeader>
+              <Table.ColumnHeader
+                {...tableHeaderStyles}
                 borderRight="1px solid"
                 borderRightColor="neutral.100"
+                width={enableVolunteerActions ? '20%' : '40%'}
               >
-                {request.pantry.pantryName}
-              </Table.Cell>
-              <Table.Cell
-                {...tableCellStyles}
+                Pantry
+              </Table.ColumnHeader>
+              <Table.ColumnHeader
+                {...tableHeaderStyles}
                 textAlign="right"
                 borderRight={enableVolunteerActions ? '1px solid' : undefined}
                 borderRightColor="neutral.100"
-                color="neutral.700"
+                width={enableVolunteerActions ? '20%' : '30%'}
               >
-                {formatDate(request.requestedAt)}
-              </Table.Cell>
+                Date Requested
+              </Table.ColumnHeader>
               {enableVolunteerActions && (
+                <Table.ColumnHeader
+                  {...tableHeaderStyles}
+                  textAlign="right"
+                  width="30%"
+                >
+                  Action Required
+                </Table.ColumnHeader>
+              )}
+            </Table.Row>
+          </Table.Header>
+          <Table.Body>
+            {paginatedRequests.map((request) => (
+              <Table.Row key={request.requestId} _hover={{ bg: 'neutral.50' }}>
+                <Table.Cell
+                  {...tableCellStyles}
+                  borderRight="1px solid"
+                  borderRightColor="neutral.100"
+                >
+                  <Link
+                    textDecorationColor="black"
+                    variant="underline"
+                    onClick={() => setSelectedViewDetailsRequest(request)}
+                  >
+                    {request.requestId}
+                  </Link>
+                </Table.Cell>
+                <Table.Cell
+                  {...tableCellStyles}
+                  borderRight="1px solid"
+                  borderRightColor="neutral.100"
+                >
+                  <Box
+                    borderRadius="md"
+                    bg={
+                      request.status === FoodRequestStatus.ACTIVE
+                        ? 'teal.200'
+                        : 'neutral.300'
+                    }
+                    color={
+                      request.status === FoodRequestStatus.ACTIVE
+                        ? 'teal.hover'
+                        : 'black'
+                    }
+                    display="inline-block"
+                    fontWeight="500"
+                    fontSize="12px"
+                    my={3}
+                    py={0.5}
+                    px={3}
+                  >
+                    {capitalize(request.status)}
+                  </Box>
+                </Table.Cell>
+                <Table.Cell
+                  {...tableCellStyles}
+                  borderRight="1px solid"
+                  borderRightColor="neutral.100"
+                >
+                  {request.pantry.pantryName}
+                </Table.Cell>
                 <Table.Cell
                   {...tableCellStyles}
-                  bgColor={
-                    request.status !== FoodRequestStatus.ACTIVE
-                      ? 'neutral.50'
-                      : 'white'
-                  }
                   textAlign="right"
+                  borderRight={enableVolunteerActions ? '1px solid' : undefined}
+                  borderRightColor="neutral.100"
                   color="neutral.700"
-                  pr={0}
                 >
-                  {request.status === FoodRequestStatus.ACTIVE && (
-                    <Button
-                      variant="plain"
-                      fontWeight="400"
-                      textDecoration="underline"
-                      color="neutral.700"
-                      onClick={() => setSelectedActionRequest(request)}
-                    >
-                      Complete Required Action
-                    </Button>
-                  )}
+                  {formatDate(request.requestedAt)}
                 </Table.Cell>
-              )}
-            </Table.Row>
-          ))}
+                {enableVolunteerActions && (
+                  <Table.Cell
+                    {...tableCellStyles}
+                    bgColor={
+                      request.status !== FoodRequestStatus.ACTIVE
+                        ? 'neutral.50'
+                        : 'white'
+                    }
+                    textAlign="right"
+                    color="neutral.700"
+                    pr={0}
+                  >
+                    {request.status === FoodRequestStatus.ACTIVE && (
+                      <Button
+                        variant="plain"
+                        fontWeight="400"
+                        textDecoration="underline"
+                        color="neutral.700"
+                        onClick={() => setSelectedActionRequest(request)}
+                      >
+                        Complete Required Action
+                      </Button>
+                    )}
+                  </Table.Cell>
+                )}
+              </Table.Row>
+            ))}
 
-          {selectedViewDetailsRequest && (
-            <RequestDetailsModal
-              request={selectedViewDetailsRequest}
-              isOpen={selectedViewDetailsRequest !== null}
-              onClose={() => {
-                setSelectedViewDetailsRequest(null);
-                if (initialRequestId) {
-                  navigate(location.pathname, { replace: true });
-                }
-              }}
-              onSuccess={loadRequests}
-              onDelete={() => setDeleteRequest(selectedViewDetailsRequest)}
-            />
-          )}
+            {selectedViewDetailsRequest && (
+              <RequestDetailsModal
+                request={selectedViewDetailsRequest}
+                isOpen={selectedViewDetailsRequest !== null}
+                onClose={() => {
+                  setSelectedViewDetailsRequest(null);
+                  if (initialRequestId) {
+                    navigate(location.pathname, { replace: true });
+                  }
+                }}
+                onSuccess={loadRequests}
+                onDelete={() => setDeleteRequest(selectedViewDetailsRequest)}
+              />
+            )}
 
-          {deleteRequest && (
-            <PantryDeleteRequestActionModal
-              request={deleteRequest}
-              isOpen={deleteRequest !== null}
-              onClose={() => setDeleteRequest(null)}
-              onSuccess={() => {
-                setAlertMessage(
-                  'Successfully deleted food request.',
-                  AlertStatus.INFO,
-                );
-                loadRequests();
-                setSelectedViewDetailsRequest(null);
-              }}
-            />
-          )}
+            {deleteRequest && (
+              <PantryDeleteRequestActionModal
+                request={deleteRequest}
+                isOpen={deleteRequest !== null}
+                onClose={() => setDeleteRequest(null)}
+                onSuccess={() => {
+                  setAlertMessage(
+                    'Successfully deleted food request.',
+                    AlertStatus.INFO,
+                  );
+                  loadRequests();
+                  setSelectedViewDetailsRequest(null);
+                }}
+              />
+            )}
 
-          {selectedActionRequest && (
-            <VolunteerRequestActionRequiredModal
-              isOpen={true}
-              onClose={clearActionRequest}
-              onCloseRequest={() => {
-                setSelectedCloseRequestAction(selectedActionRequest);
-              }}
-              onCreateOrder={() => {
-                setSelectedCreateOrderRequest(selectedActionRequest);
-              }}
-            />
-          )}
+            {selectedActionRequest && (
+              <VolunteerRequestActionRequiredModal
+                isOpen={true}
+                onClose={clearActionRequest}
+                onCloseRequest={() => {
+                  setSelectedCloseRequestAction(selectedActionRequest);
+                }}
+                onCreateOrder={() => {
+                  setSelectedCreateOrderRequest(selectedActionRequest);
+                }}
+              />
+            )}
 
-          {selectedCloseRequestAction && (
-            <VolunteerCloseRequestActionModal
-              request={selectedCloseRequestAction}
-              isOpen={true}
-              onClose={clearCloseRequest}
-              onSuccess={() => {
-                setAlertMessage('Request Closed', AlertStatus.INFO);
-                loadRequests();
-              }}
-            />
-          )}
+            {selectedCloseRequestAction && (
+              <VolunteerCloseRequestActionModal
+                request={selectedCloseRequestAction}
+                isOpen={true}
+                onClose={clearCloseRequest}
+                onSuccess={() => {
+                  setAlertMessage('Request Closed', AlertStatus.INFO);
+                  loadRequests();
+                }}
+              />
+            )}
 
-          {selectedCreateOrderRequest && (
-            <CreateNewOrderModal
-              request={selectedCreateOrderRequest}
-              isOpen={true}
-              onClose={clearCreateOrder}
-              onSuccess={() => {
-                setAlertMessage('Order Created', AlertStatus.INFO);
-                loadRequests();
-              }}
-            />
-          )}
-        </Table.Body>
-      </Table.Root>
+            {selectedCreateOrderRequest && (
+              <CreateNewOrderModal
+                request={selectedCreateOrderRequest}
+                isOpen={true}
+                onClose={clearCreateOrder}
+                onSuccess={() => {
+                  setAlertMessage('Order Created', AlertStatus.INFO);
+                  loadRequests();
+                }}
+              />
+            )}
+          </Table.Body>
+        </Table.Root>
+      )}
 
       {totalPages > 1 && (
         <Pagination.Root

From f431c67548a3d48bb26bdfc35f907979a659ed9a Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Mon, 6 Jul 2026 08:33:42 -0400
Subject: [PATCH 13/15] Fix indentation in donation create specs

Prettier cleanup of the over-indented recurrence lines left behind by
dropping foodManufacturerId from CreateDonationDto.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 apps/backend/src/donations/donations.service.spec.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/backend/src/donations/donations.service.spec.ts b/apps/backend/src/donations/donations.service.spec.ts
index 8628dfbb2..86a219ad3 100644
--- a/apps/backend/src/donations/donations.service.spec.ts
+++ b/apps/backend/src/donations/donations.service.spec.ts
@@ -1256,7 +1256,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-              recurrence: RecurrenceEnum.NONE,
+            recurrence: RecurrenceEnum.NONE,
             items: validItems,
           },
           1,
@@ -1272,7 +1272,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-              recurrence: RecurrenceEnum.WEEKLY,
+            recurrence: RecurrenceEnum.WEEKLY,
             repeatOnDays: {
               Sunday: false,
               Monday: true,
@@ -1303,7 +1303,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-              recurrence: RecurrenceEnum.NONE,
+            recurrence: RecurrenceEnum.NONE,
             items: [
               ...validItems,
               {
@@ -1328,7 +1328,7 @@ describe('DonationService', () => {
       await expect(
         service.create(
           {
-              recurrence: RecurrenceEnum.NONE,
+            recurrence: RecurrenceEnum.NONE,
             items: validItems,
           },
           5,

From 75c6c62ed69d00788d1161d9e88dfca17a87a606 Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Mon, 6 Jul 2026 09:14:39 -0400
Subject: [PATCH 14/15] updated recurring donation reminder wording in donation
 details modal

---
 apps/frontend/src/components/forms/donationDetailsModal.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/frontend/src/components/forms/donationDetailsModal.tsx b/apps/frontend/src/components/forms/donationDetailsModal.tsx
index 230d07482..2561db55a 100644
--- a/apps/frontend/src/components/forms/donationDetailsModal.tsx
+++ b/apps/frontend/src/components/forms/donationDetailsModal.tsx
@@ -222,14 +222,14 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
 
             {!isEditing && donation.recurrence !== RecurrenceEnum.NONE && (
               <Box mt={6} color="neutral.800" fontSize="sm">
-                <Text fontWeight={600} color="neutral.700" mb={3}>
-                  Recurring Donation
+                <Text fontWeight={600} mb={3}>
+                  Donation sets up recurring reminders
                 </Text>
 
                 {donation.nextDonationDates &&
                   donation.nextDonationDates.length > 0 && (
                     <Box>
-                      <Text fontWeight={600} mb={2}>
+                      <Text fontWeight={600} color="neutral.700" mb={2}>
                         Upcoming reminder emails
                       </Text>
                       <Text color="neutral.700">

From 0c185cee1c562101f05bd72de3ce4d33e8d1fc6a Mon Sep 17 00:00:00 2001
From: yurikakan <kan.yu@northeastern.edu>
Date: Mon, 6 Jul 2026 09:15:13 -0400
Subject: [PATCH 15/15] new: empty state component for food request page

---
 .../src/components/foodRequestManagement.tsx  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/frontend/src/components/foodRequestManagement.tsx b/apps/frontend/src/components/foodRequestManagement.tsx
index a0e9d42fa..d7ba543d5 100644
--- a/apps/frontend/src/components/foodRequestManagement.tsx
+++ b/apps/frontend/src/components/foodRequestManagement.tsx
@@ -15,7 +15,8 @@ import { ArrowDownUp, ChevronRight, ChevronLeft, Funnel } from 'lucide-react';
 import { capitalize, formatDate } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
 import { FoodRequestStatus, FoodRequestSummaryDto } from '../types/types';
-import TableEmptyState from '@components/tableEmptyState';
+import { ROUTES } from '../routes';
+import PageEmptyState from '@components/pageEmptyState';
 import RequestDetailsModal from '@components/forms/requestDetailsModal';
 import PantryDeleteRequestActionModal from '@components/forms/pantryDeleteRequestModal';
 import VolunteerCloseRequestActionModal from '@components/forms/volunteerCloseRequestModal';
@@ -159,6 +160,16 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
   const clearCloseRequest = () => setSelectedCloseRequestAction(null);
   const clearCreateOrder = () => setSelectedCreateOrderRequest(null);
 
+  const emptyStatePrimary = enableVolunteerActions
+    ? {
+        text: 'View Assigned Pantries',
+        link: ROUTES.VOLUNTEER_ASSIGNED_PANTRIES,
+      }
+    : { text: 'View Orders', link: ROUTES.ADMIN_ORDER_MANAGEMENT };
+  const emptyStateSecondary = enableVolunteerActions
+    ? { text: 'View Orders', link: ROUTES.VOLUNTEER_ORDER_MANAGEMENT }
+    : { text: 'View Dashboard', link: ROUTES.ADMIN_DASHBOARD };
+
   return (
     <Box p={12}>
       <Heading textStyle="h1" color="gray.600" mb={6}>
@@ -255,9 +266,12 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
         </Button>
       </Box>
       {paginatedRequests.length === 0 ? (
-        <TableEmptyState
-          title="No Food Requests"
-          subtitle="You have no food requests at this time."
+        <PageEmptyState
+          entity="food requests"
+          primaryButtonText={emptyStatePrimary.text}
+          primaryButtonLink={emptyStatePrimary.link}
+          secondaryButtonText={emptyStateSecondary.text}
+          secondaryButtonLink={emptyStateSecondary.link}
         />
       ) : (
         <Table.Root>