Bug fix for reused FedEx tracking numbers

mediocre · Dec 2, 2020 · 7aa0c22 · 7aa0c22
1 parent 74a7aba
commit 7aa0c22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/carriers/fedEx.js b/carriers/fedEx.js
@@ -125,14 +125,6 @@ function FedEx(options) {
                     return;
                 }
 
-                if (DELIVERED_TRACKING_STATUS_CODES.includes(e.EventType)) {
-                    results.deliveredAt = new Date(e.Timestamp);
-                }
-
-                if (SHIPPED_TRACKING_STATUS_CODES.includes(e.EventType)) {
-                    results.shippedAt = new Date(e.Timestamp);
-                }
-
                 const event = {
                     address: {
                         city: e.Address.City,
@@ -158,6 +150,14 @@ function FedEx(options) {
                     event.address.city = event.address.city.replace(CITY_BLACKLIST, '').trim();
                 }
 
+                if (DELIVERED_TRACKING_STATUS_CODES.includes(e.EventType)) {
+                    results.deliveredAt = new Date(e.Timestamp);
+                }
+
+                if (SHIPPED_TRACKING_STATUS_CODES.includes(e.EventType)) {
+                    results.shippedAt = new Date(e.Timestamp);
+                }
+
                 results.events.push(event);
             });
 

diff --git a/package.json b/package.json
@@ -39,5 +39,5 @@
         "type": "git",
         "url": "https://github.com/mediocre/bloodhound.git"
     },
-    "version": "1.7.3"
+    "version": "1.7.4"
 }