Merge pull request #12006 from transcom/B-18328-Update-Too-Pickupdate

B 18328 update too pickupdate
transcom · Feb 23, 2024 · 3376227 · 3376227
2 parents ded6cbb + edce953
commit 3376227
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx
@@ -56,6 +56,7 @@ const ShipmentDetailsMain = ({
     requiredDeliveryDate,
     pickupAddress,
     destinationAddress,
+    ppmShipment,
     primeEstimatedWeight,
     primeActualWeight,
     counselorRemarks,
@@ -124,6 +125,7 @@ const ShipmentDetailsMain = ({
 
   let displayedPickupAddress;
   let displayedDeliveryAddress;
+  let actualMoveDate;
 
   switch (shipmentType) {
     case SHIPMENT_OPTIONS.HHG:
@@ -138,6 +140,9 @@ const ShipmentDetailsMain = ({
       displayedPickupAddress = storageFacility ? storageFacility.address : null;
       displayedDeliveryAddress = destinationAddress;
       break;
+    case SHIPMENT_OPTIONS.PPM:
+      actualMoveDate = ppmShipment.actualMoveDate;
+      break;
     default:
       displayedPickupAddress = pickupAddress;
       displayedDeliveryAddress = destinationAddress || destinationDutyLocationAddress;
@@ -182,6 +187,12 @@ const ShipmentDetailsMain = ({
           openConvertModalButton={openConvertModalButton}
         />
       )}
+      {shipmentType === SHIPMENT_OPTIONS.PPM && (
+        <ImportantShipmentDates
+          actualMoveDate={actualMoveDate ? formatDateWithUTC(actualMoveDate) : null}
+          actualDeliveryDate={actualMoveDate ? formatDateWithUTC(actualMoveDate) : null}
+        />
+      )}
       <ImportantShipmentDates
         requestedPickupDate={requestedPickupDate ? formatDateWithUTC(requestedPickupDate) : null}
         scheduledPickupDate={scheduledPickupDate ? formatDateWithUTC(scheduledPickupDate) : null}

diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx
@@ -5,7 +5,9 @@ import { futureSITShipment, noSITShipment, SITShipment } from '../ShipmentSITDis
 
 import ShipmentDetailsMain from './ShipmentDetailsMain';
 
+import { createPPMShipmentWithFinalIncentive } from 'utils/test/factories/ppmShipment';
 import { MockProviders } from 'testUtils';
+import { formatDateWithUTC } from 'shared/dates';
 
 const shipmentDetailsMainParams = {
   handleDivertShipment: () => {},
@@ -51,3 +53,22 @@ describe('Shipment Details Main', () => {
     expect(screen.queryByText('SIT (STORAGE IN TRANSIT)')).not.toBeInTheDocument();
   });
 });
+it('does display PPM shipment', () => {
+  const ppmShipment = createPPMShipmentWithFinalIncentive({
+    ppmShipment: {
+      expectedDepartureDate: '2024-01-01',
+      actualMoveDate: '2024-02-22',
+      estimatedWeight: 100,
+      shipment: {
+        estimatedIncentive: 2000,
+      },
+    },
+  });
+  render(
+    <MockProviders>
+      <ShipmentDetailsMain {...shipmentDetailsMainParams} shipment={ppmShipment} />
+    </MockProviders>,
+  );
+
+  expect(screen.queryByText(formatDateWithUTC('2-22-2024'))).toBeInTheDocument();
+});