From 0e5b6c4d33ffd0c02bbc4f2800418ce824aad29e Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Mon, 15 Aug 2022 10:15:16 +0200 Subject: [PATCH 1/3] fix(medusa): join tracking links to swap and claim fulfillments in admin/orders --- packages/medusa/src/api/routes/admin/orders/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/medusa/src/api/routes/admin/orders/index.ts b/packages/medusa/src/api/routes/admin/orders/index.ts index 5da324572209c..e2a34f283856c 100644 --- a/packages/medusa/src/api/routes/admin/orders/index.ts +++ b/packages/medusa/src/api/routes/admin/orders/index.ts @@ -258,6 +258,7 @@ export const defaultAdminOrdersRelations = [ "claims.shipping_address", "claims.additional_items", "claims.fulfillments", + "claims.fulfillments.tracking_links", "claims.claim_items", "claims.claim_items.item", "claims.claim_items.images", @@ -269,6 +270,7 @@ export const defaultAdminOrdersRelations = [ "swaps.shipping_address", "swaps.additional_items", "swaps.fulfillments", + "swaps.fulfillments.tracking_links", ] export const defaultAdminOrdersFields = [ From 7249f49d7a7fd1bfc4243aa3526aa976612627bf Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Mon, 15 Aug 2022 10:16:48 +0200 Subject: [PATCH 2/3] Create cyan-years-complain.md --- .changeset/cyan-years-complain.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cyan-years-complain.md diff --git a/.changeset/cyan-years-complain.md b/.changeset/cyan-years-complain.md new file mode 100644 index 0000000000000..321c100b16a89 --- /dev/null +++ b/.changeset/cyan-years-complain.md @@ -0,0 +1,5 @@ +--- +"@medusajs/medusa": patch +--- + +Join tracking links to all fulfillments in admin/orders From e76163507cdca9a95b3a499e826eada098ff2035 Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Mon, 15 Aug 2022 10:58:31 +0200 Subject: [PATCH 3/3] fix: update unit tests --- .../medusa/src/api/routes/admin/orders/__tests__/get-order.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js index 3c75a6a93fa87..a6d1810a8cda5 100644 --- a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js +++ b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js @@ -27,6 +27,7 @@ const defaultRelations = [ "claims.shipping_address", "claims.additional_items", "claims.fulfillments", + "claims.fulfillments.tracking_links", "claims.claim_items", "claims.claim_items.item", "claims.claim_items.images", @@ -37,6 +38,7 @@ const defaultRelations = [ "swaps.shipping_address", "swaps.additional_items", "swaps.fulfillments", + "swaps.fulfillments.tracking_links", ] const defaultFields = [