updated shipping cost conditional render & complete action fields update

Author: Yurika-Kan

apps/backend/src/foodManufacturers/manufacturers.service.spec.ts

@@ -578,7 +578,7 @@ describe('FoodManufacturersService', () => {
       expect(result['Donations']).toBe('2');
       expect(result['Value Donated']).toBe('$925');
       expect(result['Items Donated']).toBe('225');
-      expect(result['lbs Donated']).toBe('225.03125');
+      expect(result['lbs Donated']).toBe('225.03');
     });
 
     it('throws NotFoundException for non-existent manufacturer', async () => {

apps/backend/src/foodManufacturers/manufacturers.service.ts

@@ -475,7 +475,7 @@ export class FoodManufacturersService {
       Donations: String(result.donations),
       'Value Donated': `$${Number(result.total_value)}`,
       'Items Donated': String(result.total_items),
-      'lbs Donated': `${Number(result.total_lbs)}`,
+      'lbs Donated': `${Number(result.total_lbs).toFixed(2)}`,
     };
   }
 }

apps/backend/src/orders/dtos/bulk-update-tracking-cost.dto.ts

@@ -23,15 +23,15 @@ export class OrderTrackingCostEntryDto {
     },
     { message: 'Tracking link must be a valid HTTP/HTTPS URL' },
   )
-  trackingLink?: string;
+  trackingLink?: string | null;
 
   @IsOptional()
   @IsNumber(
     { maxDecimalPlaces: 2 },
     { message: 'Shipping cost must have at most 2 decimal places' },
   )
   @Min(0, { message: 'Shipping cost cannot be negative' })
-  shippingCost?: number;
+  shippingCost?: number | null;
 
   @IsOptional()
   @IsBoolean()

apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx

@@ -261,38 +261,24 @@ const FmCompleteRequiredActionsModal: React.FC<
             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 ||
-            flagChanged
+            shippingCostPaidBySsf !== order.shippingCostPaidBySsf
           );
         })
-        .map(
-          (
-            order,
-          ): {
-            orderId: number;
-            trackingLink?: string;
-            shippingCost?: number;
-            shippingCostPaidBySsf?: boolean;
-          } => {
-            const { trackingLink, shippingCost, shippingCostPaidBySsf } =
-              orderFormData[order.orderId];
-            return {
-              orderId: order.orderId,
-              ...(trackingLink.trim() !== '' && { trackingLink }),
-              ...(shippingCost !== '' && {
-                shippingCost: parseFloat(shippingCost),
-                shippingCostPaidBySsf,
-              }),
-            };
-          },
-        );
+        // Send every field, using null for cleared values so removing a
+        // previously saved cost or link actually persists
+        .map((order) => {
+          const { trackingLink, shippingCost, shippingCostPaidBySsf } =
+            orderFormData[order.orderId];
+          return {
+            orderId: order.orderId,
+            trackingLink: trackingLink.trim() !== '' ? trackingLink : null,
+            shippingCost: shippingCost !== '' ? parseFloat(shippingCost) : null,
+            shippingCostPaidBySsf,
+          };
+        });
 
       if (ordersToUpdate.length > 0) {
         await ApiClient.bulkUpdateTrackingCostInfo({
@@ -378,19 +364,31 @@ const FmCompleteRequiredActionsModal: React.FC<
                     min={0}
                     step={0.01}
                     value={orderFormData[currentOrder.orderId].shippingCost}
-                    onChange={(e) =>
+                    onChange={(e) => {
                       updateOrderField(
                         currentOrder.orderId,
                         'shippingCost',
                         e.target.value,
-                      )
-                    }
+                      );
+                      // The paid-by-SSF flag is only meaningful alongside a
+                      // shipping cost, so clear it when the cost is cleared
+                      if (e.target.value === '') {
+                        updateOrderField(
+                          currentOrder.orderId,
+                          'shippingCostPaidBySsf',
+                          false,
+                        );
+                      }
+                    }}
                   />
                   <Checkbox.Root
                     mt={3}
                     checked={
                       orderFormData[currentOrder.orderId].shippingCostPaidBySsf
                     }
+                    disabled={
+                      orderFormData[currentOrder.orderId].shippingCost === ''
+                    }
                     size="sm"
                     borderRadius="2px"
                     onCheckedChange={(e: { checked: boolean }) =>