fix(core-flows, dashboard): adjust stock levels when doing partial fulfilments (#9736)
* fix: correctly update stock location when partial fulfillemnt is created * fix: update test * fix: count reserved quantity of the item as available quantity for fulfillment * fix: refresh reservations when order fulfillment is created * feat: add check for reservation quantity * feat: add a test case
This commit is contained in:
+15
-3
@@ -1,5 +1,5 @@
|
||||
import { zodResolver } from "@hookform/resolvers/zod"
|
||||
import { useEffect, useState } from "react"
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { useTranslation } from "react-i18next"
|
||||
import * as zod from "zod"
|
||||
|
||||
@@ -8,7 +8,6 @@ import { Alert, Button, Select, Switch, toast } from "@medusajs/ui"
|
||||
import { useForm, useWatch } from "react-hook-form"
|
||||
|
||||
import { OrderLineItemDTO } from "@medusajs/types"
|
||||
import { useSearchParams } from "react-router-dom"
|
||||
import { Form } from "../../../../../components/common/form"
|
||||
import {
|
||||
RouteFocusModal,
|
||||
@@ -20,6 +19,7 @@ import { useStockLocations } from "../../../../../hooks/api/stock-locations"
|
||||
import { getFulfillableQuantity } from "../../../../../lib/order-item"
|
||||
import { CreateFulfillmentSchema } from "./constants"
|
||||
import { OrderCreateFulfillmentItem } from "./order-create-fulfillment-item"
|
||||
import { useReservationItems } from "../../../../../hooks/api"
|
||||
|
||||
type OrderCreateFulfillmentFormProps = {
|
||||
order: AdminOrder
|
||||
@@ -32,11 +32,20 @@ export function OrderCreateFulfillmentForm({
|
||||
}: OrderCreateFulfillmentFormProps) {
|
||||
const { t } = useTranslation()
|
||||
const { handleSuccess } = useRouteModal()
|
||||
const [searchParams] = useSearchParams()
|
||||
|
||||
const { mutateAsync: createOrderFulfillment, isPending: isMutating } =
|
||||
useCreateOrderFulfillment(order.id)
|
||||
|
||||
const { reservations } = useReservationItems({
|
||||
line_item_id: order.items.map((i) => i.id),
|
||||
})
|
||||
|
||||
const itemReservedQuantitiesMap = useMemo(
|
||||
() =>
|
||||
new Map((reservations || []).map((r) => [r.line_item_id, r.quantity])),
|
||||
[reservations]
|
||||
)
|
||||
|
||||
const [fulfillableItems, setFulfillableItems] = useState(() =>
|
||||
(order.items || []).filter(
|
||||
(item) =>
|
||||
@@ -246,6 +255,9 @@ export function OrderCreateFulfillmentForm({
|
||||
form={form}
|
||||
item={item}
|
||||
locationId={selectedLocationId}
|
||||
itemReservedQuantitiesMap={
|
||||
itemReservedQuantitiesMap
|
||||
}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
|
||||
+8
-2
@@ -10,12 +10,14 @@ import { Thumbnail } from "../../../../../components/common/thumbnail/index"
|
||||
import { useProductVariant } from "../../../../../hooks/api/products"
|
||||
import { getFulfillableQuantity } from "../../../../../lib/order-item"
|
||||
import { CreateFulfillmentSchema } from "./constants"
|
||||
import { useReservationItems } from "../../../../../hooks/api/reservations"
|
||||
|
||||
type OrderEditItemProps = {
|
||||
item: HttpTypes.AdminOrderLineItem
|
||||
currencyCode: string
|
||||
locationId?: string
|
||||
onItemRemove: (itemId: string) => void
|
||||
itemReservedQuantitiesMap: Map<string, number>
|
||||
form: UseFormReturn<zod.infer<typeof CreateFulfillmentSchema>>
|
||||
}
|
||||
|
||||
@@ -23,6 +25,7 @@ export function OrderCreateFulfillmentItem({
|
||||
item,
|
||||
form,
|
||||
locationId,
|
||||
itemReservedQuantitiesMap,
|
||||
}: OrderEditItemProps) {
|
||||
const { t } = useTranslation()
|
||||
|
||||
@@ -49,11 +52,14 @@ export function OrderCreateFulfillmentItem({
|
||||
return {}
|
||||
}
|
||||
|
||||
const reservedQuantityForItem = itemReservedQuantitiesMap.get(item.id) ?? 0
|
||||
|
||||
return {
|
||||
availableQuantity: locationInventory.available_quantity,
|
||||
availableQuantity:
|
||||
locationInventory.available_quantity + reservedQuantityForItem,
|
||||
inStockQuantity: locationInventory.stocked_quantity,
|
||||
}
|
||||
}, [variant, locationId])
|
||||
}, [variant, locationId, itemReservedQuantitiesMap])
|
||||
|
||||
const minValue = 0
|
||||
const maxValue = Math.min(
|
||||
|
||||
Reference in New Issue
Block a user