From 5e7c3f1bb4b5f8bfecd05af796e9fcaa0c89e911 Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Tue, 6 Oct 2020 17:39:28 +0200 Subject: [PATCH] hotfix(webshipper): delete orders that can be deleted --- .../src/services/webshipper-fulfillment.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/medusa-fulfillment-webshipper/src/services/webshipper-fulfillment.js b/packages/medusa-fulfillment-webshipper/src/services/webshipper-fulfillment.js index 0463516398..02c4330289 100644 --- a/packages/medusa-fulfillment-webshipper/src/services/webshipper-fulfillment.js +++ b/packages/medusa-fulfillment-webshipper/src/services/webshipper-fulfillment.js @@ -248,13 +248,17 @@ class WebshipperFulfillmentService extends FulfillmentService { data = data[0] } - const order = await this.client_.orders.retrieve(data.id) + const order = await this.client_.orders + .retrieve(data.id) + .catch(() => undefined) - if (order.attributes.status !== "pending") { - if (order.attributes.status === "cancelled") { - return Promise.resolve(order) + if (order) { + if (order.data.attributes.status !== "pending") { + if (order.data.attributes.status === "cancelled") { + return Promise.resolve(order) + } + throw new Error("Cannot cancel order") } - throw new Error("Cannot cancel order") } return this.client_.orders.delete(data.id)