asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(admin): display correct items in the timeline after OE (#3895)

Browse Source
This commit is contained in:
Frane Polić
2023-04-23 13:28:15 +02:00
committed by GitHub
parent 0be6816578
commit 88a224e42a
2 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/admin-ui/ui/src/hooks/use-build-timeline.tsx
+44 -11
View File
@@ -323,7 +323,9 @@ export const useBuildTimeline = (orderId: string) => {
id: event.id,
time: event.created_at,
type: "fulfilled",
items: event.items.map((item) => getFulfilmentItem(allItems, item)),
items: event.items.map((item) =>
getFulfilmentItem(allItems, edits, item)
),
noNotification: event.no_notification,
orderId: order.id,
locationName: getLocationNameById(event.location_id),
@@ -334,7 +336,9 @@ export const useBuildTimeline = (orderId: string) => {
id: event.id,
time: event.shipped_at,
type: "shipped",
items: event.items.map((item) => getFulfilmentItem(allItems, item)),
items: event.items.map((item) =>
getFulfilmentItem(allItems, edits, item)
),
noNotification: event.no_notification,
orderId: order.id,
locationName: getLocationNameById(event.location_id),
@@ -346,8 +350,8 @@ export const useBuildTimeline = (orderId: string) => {
events.push({
id: event.id,
items: event.items
.map((i) => getReturnItems(allItems, i))
// After order edit is confirmed, line item that was returned can be deleted
.map((i) => getReturnItems(allItems, edits, i))
// Can be undefined while `edits` is loading
.filter((i) => !!i),
status: event.status,
currentStatus: event.status,
@@ -364,8 +368,8 @@ export const useBuildTimeline = (orderId: string) => {
events.push({
id: event.id,
items: event.items
.map((i) => getReturnItems(allItems, i))
// After order edit is confirmed, line item that was returned can be deleted
.map((i) => getReturnItems(allItems, edits, i))
// Can be undefined while `edits` is loading
.filter((i) => !!i),
status: "requested",
time: event.created_at,
@@ -391,7 +395,7 @@ export const useBuildTimeline = (orderId: string) => {
type: "exchange",
newItems: event.additional_items.map((i) => getSwapItem(i)),
returnItems: event.return_order.items.map((i) =>
getReturnItems(allItems, i)
getReturnItems(allItems, edits, i)
),
exchangeCartId:
event.payment_status !== "captured" ? event.cart_id : undefined,
@@ -557,8 +561,32 @@ function getLineItem(allItems, itemId) {
}
}
function getReturnItems(allItems, item) {
const line = allItems.find((li) => li.id === item.item_id)
function findOriginalItemId(edits, originalId) {
let currentId = originalId
edits = edits
.filter((e) => !!e.confirmed_at) // only confirmed OEs are cloning line items
.sort((a, b) => new Date(a.confirmed_at) - new Date(b.confirmed_at))
for (const edit of edits) {
const clonedItem = edit.items.find((e) => e.original_item_id === currentId)
if (clonedItem) {
currentId = clonedItem.id
} else {
break
}
}
return currentId
}
function getReturnItems(allItems, edits, item) {
let id = item.item_id
if (edits) {
id = findOriginalItemId(edits, id)
}
const line = allItems.find((li) => li.id === id)
if (!line) {
return
@@ -606,8 +634,13 @@ function getWasRefundClaim(claimId, order) {
return claim.type === "refund"
}
function getFulfilmentItem(allItems, item) {
const line = allItems.find((line) => line.id === item.item_id)
function getFulfilmentItem(allItems, edits, item) {
let id = item.item_id
if (edits) {
id = findOriginalItemId(edits, id)
}
const line = allItems.find((line) => line.id === id)
if (!line) {
return