Merge pull request #797 from DTS-STN/ken/purolator-content

Ken/purolator content
DTS-STN · Dec 9, 2024 · c1f26bd · c1f26bd
2 parents dcb934b + 0fcb593
commit c1f26bd
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 38 deletions.
diff --git a/public/locales/en/status.json b/public/locales/en/status.json
@@ -77,28 +77,35 @@
   },
   "reset": "Check the status of another application",
   "shipped-canada-post": {
+    "delivery-not-available": "If delivery is not available, an agent will reach out to you to coordinate delivery.",
     "header": "Your passport has been printed and mailed",
-    "mailing": "We're mailing it to you by Canada Post",
+    "mailing": "We're mailing it to you",
     "remote-area": "If you live in a northern or remote area, it may take up to 8 business days to arrive.",
     "supporting-documents": "We may send your supporting documents back separately.",
     "take-up-to": "It can take up to 2 to 3 business days to arrive."
   },
   "shipped-fedex": {
-    "contact-us": "If you don't receive your passport and supporting documents, <Link>contact us</Link>.",
     "header": "Your passport has been printed and mailed to you",
-    "mailing": "We're sending it to you by FedEx",
-    "supporting-documents": "You'll receive your passport and supporting documents in the same envelope.",
+    "country-canada": {
+      "header": "Information for clients whose passport is being mailed within Canada",
+      "mailing": "We're sending it to you by Purolator"
+    },
+    "country-us": {
+      "header": "Information for clients whose passport is being mailed to the United States",
+      "mailing": "We're sending it to you by FedEx"
+    },
+    "supporting-documents": "We may send your supporting documents back separately.",
     "take-up-to": "It can take up to 5 to 7 business days to arrive."
   },
-  "status-check-call": "<Link>Contact us</Link> if you don't receive your documents within 6 weeks of receiving your passport.",
   "status-check-contact": {
     "service-standard-href": "https://www.canada.ca/en/immigration-refugees-citizenship/services/canadian-passports/processing-times.html"
   },
   "status-check-tracking": {
     "can-track": "You can <Link>track the package online</Link>.",
     "link": {
       "canada-post": "https://www.canadapost-postescanada.ca/track-reperage/en#/details/{{trackingNumber}}",
-      "fedex": "https://www.fedex.com/fedextrack/?action=track&cntry_code=ca&locale=en_ca&trackingnumber={{trackingNumber}}"
+      "fedex": "https://www.fedex.com/fedextrack/?action=track&cntry_code=ca&locale=en_ca&trackingnumber={{trackingNumber}}",
+      "purolator": "https://www.purolator.com/en/shipping/tracker?pin={{trackingNumber}}"
     },
     "number": "Your tracking number is <strong>{{trackingNumber}}</strong>."
   },

diff --git a/public/locales/fr/status.json b/public/locales/fr/status.json
@@ -77,28 +77,35 @@
   },
   "reset": "Vérifier l'état d'une autre demande",
   "shipped-canada-post": {
-    "header": "Votre passeport a été imprimé et envoyé par la poste",
-    "mailing": "Nous vous l'envoyons par Postes Canada.",
-    "remote-area": "Si vous vivez dans une région au nord ou éloignée, cela pourrait prendre jusqu'à 8 jours ouvrables pour arriver.",
+    "delivery-not-available": "Si la livraison n'est pas disponible, un agent vous contactera pour coordonner la livraison.",
+    "header": "Votre passeport a été imprimé et envoyé",
+    "mailing": "Nous vous l'envoyons par courrier.",
+    "remote-area": "Si vous vivez dans une région au nord ou éloignée, cela pourrait prendre jusqu'à 8 jours ouvrables.",
     "supporting-documents": "Nous pourrions renvoyer vos documents fournis en support de la demande séparément.",
     "take-up-to": "Cela peut prendre jusqu'à 2 à 3 jours ouvrables pour arriver."
   },
   "shipped-fedex": {
-    "contact-us": "Si vous ne recevez pas votre passeport et vos documents, <Link>veuillez nous contacter</Link>.",
     "header": "Votre passeport a été imprimé et envoyé par la poste",
-    "mailing": "Nous vous l'envoyons par FedEx",
+    "country-canada": {
+      "header": "Informations pour les clients dont le passeport est envoyé par la poste au Canada",
+      "mailing": "Nous vous l'envoyons par Purolator"
+    },
+    "country-us": {
+      "header": "Informations pour les clients dont le passeport est envoyé aux États-Unis",
+      "mailing": "Nous vous l'envoyons par FedEx"
+    },
     "supporting-documents": "Vous recevrez le passeport et les documents justificatifs dans la même enveloppe.",
     "take-up-to": "Cela peut prendre jusqu'à 5 à 7 jours ouvrables pour arriver."
   },
-  "status-check-call": "<Link>Communiquez avec nous</Link> seulement si vous ne recevez pas vos documents dans les six semaines suivant la réception de votre passeport.",
   "status-check-contact": {
     "service-standard-href": "https://www.canada.ca/fr/immigration-refugies-citoyennete/services/passeports-canadiens/delais-traitement.html"
   },
   "status-check-tracking": {
     "can-track": "Vous pouvez <Link>suivre en ligne la livraison de votre colis</Link>.",
     "link": {
       "canada-post": "https://www.canadapost-postescanada.ca/track-reperage/fr#/details/{{trackingNumber}}",
-      "fedex": "https://www.fedex.com/fedextrack/?action=track&cntry_code=ca&locale=fr_ca&trackingnumber={{trackingNumber}}"
+      "fedex": "https://www.fedex.com/fedextrack/?action=track&cntry_code=ca&locale=fr_ca&trackingnumber={{trackingNumber}}",
+      "purolator": "https://www.purolator.com/fr/expedition/faire-le-suivi-dun-envoi?pin={{trackingNumber}}"
     },
     "number": "Votre numéro de repérage est <strong>{{trackingNumber}}</strong>."
   },

diff --git a/src/components/check-status-responses/CheckStatusShippingCanadaPost.tsx b/src/components/check-status-responses/CheckStatusShippingCanadaPost.tsx
@@ -59,20 +59,12 @@ export const CheckStatusShippingCanadaPost = ({
           <>
             <p>{t('shipped-canada-post.take-up-to')}</p>
             <p>{t('shipped-canada-post.remote-area')}</p>
+            <p>{t('shipped-canada-post.delivery-not-available')}</p>
           </>
         )}
       </AlertSection>
-      <h2 className="h3 mb-2 mt-6">
-        {t('shipped-canada-post.supporting-documents')}
-      </h2>
-      <p>
-        <Trans
-          i18nKey="status-check-call"
-          ns="status"
-          components={{
-            Link: <ExternalLink href={t('common:contact-us-link')} />,
-          }}
-        />
+      <p className="h3 mt-6">
+        <strong>{t('shipped-canada-post.supporting-documents')}</strong>
       </p>
     </>
   )

diff --git a/src/components/check-status-responses/CheckStatusShippingFedex.tsx b/src/components/check-status-responses/CheckStatusShippingFedex.tsx
@@ -24,10 +24,46 @@ export const CheckStatusShippingFedex = ({
         {t('shipped-fedex.header')}
       </h1>
       <p>{t('shipped-fedex.header')}.</p>
+      <h2 className="h2">{t('shipped-fedex.country-canada.header')}</h2>
       <AlertSection type="success">
-        <h2 data-testid="shipped-fedex-mailing" className="h2 mt-0">
-          {t('shipped-fedex.mailing')}
-        </h2>
+        <h3 data-testid="shipped-purolator-mailing" className="h2 mt-0">
+          {t('shipped-fedex.country-canada.mailing')}
+        </h3>
+        {trackingNumber ? (
+          <>
+            <p>
+              <Trans
+                i18nKey="status-check-tracking.number"
+                ns="status"
+                tOptions={{ trackingNumber }}
+              />
+            </p>
+            <p>
+              <Trans
+                i18nKey={'status-check-tracking.can-track'}
+                ns="status"
+                components={{
+                  Link: (
+                    <ExternalLink
+                      data-gc-analytics-exempt={true}
+                      href={t('status-check-tracking.link.purolator', {
+                        trackingNumber: encodeURIComponent(trackingNumber),
+                      })}
+                    />
+                  ),
+                }}
+              />
+            </p>
+          </>
+        ) : (
+          <p>{t('shipped-fedex.take-up-to')}</p>
+        )}
+      </AlertSection>
+      <h2 className="h2">{t('shipped-fedex.country-us.header')}</h2>
+      <AlertSection type="success">
+        <h3 data-testid="shipped-fedex-mailing" className="h2 mt-0">
+          {t('shipped-fedex.country-us.mailing')}
+        </h3>
         {trackingNumber ? (
           <>
             <p>
@@ -58,17 +94,8 @@ export const CheckStatusShippingFedex = ({
           <p>{t('shipped-fedex.take-up-to')}</p>
         )}
       </AlertSection>
-      <h2 className="h3 mb-2 mt-6">
-        {t('shipped-fedex.supporting-documents')}
-      </h2>
-      <p>
-        <Trans
-          i18nKey="shipped-fedex.contact-us"
-          ns="status"
-          components={{
-            Link: <ExternalLink href={t('common:contact-us-link')} />,
-          }}
-        />
+      <p className="h3 mb-2 mt-6">
+        <strong>{t('shipped-fedex.supporting-documents')}</strong>
       </p>
     </>
   )