MHV-65010: Synced dispensed date for web and print view (#33673)

* MHV-65010: Synced dispensed date for web and print view * synced "shipped on" date * missed null check in txt config
department-of-veterans-affairs · Dec 24, 2024 · 62bb22d · 62bb22d
1 parent dd4e28f
commit 62bb22d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/applications/mhv-medications/components/PrescriptionDetails/PrescriptionPrintOnly.jsx b/src/applications/mhv-medications/components/PrescriptionDetails/PrescriptionPrintOnly.jsx
@@ -15,6 +15,7 @@ import VaPharmacyText from '../shared/VaPharmacyText';
 const PrescriptionPrintOnly = props => {
   const { rx, hideLineBreak, refillHistory, isDetailsRx } = props;
   const pharmacyPhone = pharmacyPhoneNumber(rx);
+  const latestTrackingStatus = rx?.trackingList?.[0];
 
   const activeNonVaContent = pres => (
     <div className="print-only-rx-details-container vads-u-margin-top--1p5">
@@ -87,7 +88,7 @@ const PrescriptionPrintOnly = props => {
           <div className="print-only-rx-details-container">
             <p>
               <strong>Last filled on:</strong>{' '}
-              {dateFormat(rx.dispensedDate, 'MMMM D, YYYY')}
+              {dateFormat(rx.sortedDispensedDate, 'MMMM D, YYYY')}
             </p>
             <p>
               <strong>Status:</strong>{' '}
@@ -192,9 +193,7 @@ const PrescriptionPrintOnly = props => {
                       </p>
                       <p>
                         <strong>Shipped on:</strong>{' '}
-                        {entry?.trackingList?.[0]?.completeDateTime
-                          ? dateFormat(entry.trackingList[0].completeDateTime)
-                          : EMPTY_FIELD}
+                        {dateFormat(latestTrackingStatus?.completeDateTime)}
                       </p>
                       <p className="vads-u-margin--0">
                         <strong>Medication description: </strong>

diff --git a/src/applications/mhv-medications/util/pdfConfigs.js b/src/applications/mhv-medications/util/pdfConfigs.js
@@ -137,7 +137,7 @@ export const buildPrescriptionsPDFList = prescriptions => {
           items: [
             {
               title: 'Last filled on',
-              value: dateFormat(rx.dispensedDate, 'MMMM D, YYYY'),
+              value: dateFormat(rx.sortedDispensedDate, 'MMMM D, YYYY'),
               inline: true,
             },
             {
@@ -497,9 +497,9 @@ ${backImprint ? `* Back marking: ${backImprint}` : ''}`
                 },
                 {
                   title: `Shipped on`,
-                  value: entry?.trackingList?.[0]?.completeDateTime
-                    ? dateFormat(entry.trackingList[0].completeDateTime)
-                    : 'None noted',
+                  value: dateFormat(
+                    prescription?.trackingList?.[0]?.completeDateTime,
+                  ),
                   inline: true,
                 },
               ];

diff --git a/src/applications/mhv-medications/util/txtConfigs.js b/src/applications/mhv-medications/util/txtConfigs.js
@@ -77,7 +77,7 @@ export const buildPrescriptionsTXT = prescriptions => {
     result += `
 ${rx.prescriptionName}
 
-Last filled on: ${dateFormat(rx.dispensedDate, 'MMMM D, YYYY')}
+Last filled on: ${dateFormat(rx.sortedDispensedDate, 'MMMM D, YYYY')}
 
 Status: ${validateField(rx.dispStatus)}
 ${(pdfStatusDefinitions[rx.refillStatus] || pdfDefaultStatusDefinition).reduce(
@@ -256,11 +256,7 @@ Filled by pharmacy on: ${
       entry?.dispensedDate ? dateFormat(entry.dispensedDate) : 'None noted'
     }
 
-Shipped on: ${
-      entry?.trackingList?.[0]?.completeDateTime
-        ? dateFormat(entry.trackingList[0].completeDateTime)
-        : 'None noted'
-    }
+Shipped on: ${dateFormat(prescription?.trackingList?.[0]?.completeDateTime)}
 
 Description: ${description}