Merge pull request #85 from mediocre/dhl-status-startswith

Match status on startsWith rather than exact match
mediocre · Jun 6, 2024 · a15f547 · a15f547
2 parents dc964f6 + c00ef33
commit a15f547
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/carriers/dhl.js b/carriers/dhl.js
@@ -167,11 +167,11 @@ function DHL(options) {
                             _event.details = event.remark;
                         }
 
-                        if (!results.deliveredAt && _event.description && DELIVERED_TRACKING_DESCRIPTIONS.includes(_event.description.toUpperCase())) {
+                        if (!results.deliveredAt && _event.description && DELIVERED_TRACKING_DESCRIPTIONS.find(desc => _event.description.toUpperCase().startsWith(desc))) {
                             results.deliveredAt = _event.date;
                         }
 
-                        if (!results.shippedAt && _event.description && SHIPPED_TRACKING_DESCRIPTIONS.includes(_event.description.toUpperCase())) {
+                        if (!results.shippedAt && _event.description && SHIPPED_TRACKING_DESCRIPTIONS.find(desc => _event.description.toUpperCase().startsWith(desc))) {
                             results.shippedAt = _event.date;
                         }
 

diff --git a/carriers/dhlEcommerceSolutions.js b/carriers/dhlEcommerceSolutions.js
@@ -172,11 +172,11 @@ function DhlEcommerceSolutions(options) {
                     _event.details = event.secondaryEventDescription;
                 }
 
-                if (!results.deliveredAt && _event.description && DELIVERED_TRACKING_DESCRIPTIONS.includes(_event.description.toUpperCase())) {
+                if (!results.deliveredAt && _event.description && DELIVERED_TRACKING_DESCRIPTIONS.find(desc => _event.description.toUpperCase().startsWith(desc))) {
                     results.deliveredAt = _event.date;
                 }
 
-                if (!results.shippedAt && _event.description && SHIPPED_TRACKING_DESCRIPTIONS.includes(_event.description.toUpperCase())) {
+                if (!results.shippedAt && _event.description && SHIPPED_TRACKING_DESCRIPTIONS.find(desc => _event.description.toUpperCase().startsWith(desc))) {
                     results.shippedAt = _event.date;
                 }