diff --git a/CHANGELOG.md b/CHANGELOG.md index 4533b4f..5fe878b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixed + +- `isDelivered` function returns `false` when is not possible to tell whether an invoice is `input` or `output`. + ## [1.7.0] - 2023-06-01 ### Fixed diff --git a/react/components/ProgressBar/getOrderProgress.ts b/react/components/ProgressBar/getOrderProgress.ts index 7fe2a55..1235f82 100644 --- a/react/components/ProgressBar/getOrderProgress.ts +++ b/react/components/ProgressBar/getOrderProgress.ts @@ -51,6 +51,7 @@ function isCarrierHandling(packages: any) { export default function getOrderProgress(status: string, packages: any) { let progress = statusMap[status] const isPickup = isOrderPickUp(packages) + if (progress === FOURTH_STEP) { if ( isDelivered(packages) || @@ -60,5 +61,6 @@ export default function getOrderProgress(status: string, packages: any) { progress = FIFTH_STEP } } + return progress } diff --git a/react/components/ProgressBar/utils.ts b/react/components/ProgressBar/utils.ts index 3b6a52a..c9b68a7 100644 --- a/react/components/ProgressBar/utils.ts +++ b/react/components/ProgressBar/utils.ts @@ -56,9 +56,11 @@ export function isDelivered(packages: any) { } const isDelivered = !packages.some( - (pack: any) => - pack?.package?.type === OutputPackageType && - !pack?.package?.courierStatus?.finished + (pack: any) => { + if (!pack?.package) return true // In case you can't tell whether the invoice is input or output, the order as a whole should be considered as not delivered. + + return pack?.package?.type === OutputPackageType && + !pack?.package?.courierStatus?.finished} ) return isDelivered