fixed full check

acmucsd · Apr 29, 2024 · 7bc659e · 7bc659e
1 parent 5e4e696
commit 7bc659e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/services/MerchOrderService.ts b/services/MerchOrderService.ts
@@ -97,8 +97,8 @@ export default class MerchOrderService {
 
       // Verify that this order would not set the pickup event's order count
       // over the order limit
-      if (MerchOrderService.isLessThanTwoDaysBeforePickupEvent(pickupEvent)) {
-        throw new UserError('Cannot change order pickup to an event that starts in less than 2 days');
+      if (MerchOrderService.isPickupEventOrderLimitFull(pickupEvent)) {
+        throw new UserError('This merch pickup event is full! Please choose a different pickup event');
       }
 
       const totalCost = MerchOrderService.totalCost(originalOrder, itemOptions);

diff --git a/tests/merchOrder.test.ts b/tests/merchOrder.test.ts
@@ -1805,8 +1805,6 @@ describe('merch order pickup events', () => {
       pickupEvent: pickupEvent.uuid,
     };
 
-    console.log('PICKUP EVENT', pickupEvent);
-
     await expect(merchController.placeMerchOrder(placeMerchOrderRequest, member))
       .rejects
       .toThrow('This merch pickup event is full! Please choose a different pickup event');