Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

feat(vendor): sync Reservations panel with Figma (MER-142) (#1334)

Viktor Holikf35ae7912928
diff --git a/apps/api/src/scripts/seed-reservations-sole-society.ts b/apps/api/src/scripts/seed-reservations-sole-society.ts
new file mode 100644
index 000000000..77614f1e6
--- /dev/null
+++ b/apps/api/src/scripts/seed-reservations-sole-society.ts
@@ -0,0 +1,125 @@
+import { ExecArgs } from "@medusajs/framework/types"
+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"
+import {
+ createInventoryLevelsWorkflow,
+ createReservationsWorkflow,
+} from "@medusajs/medusa/core-flows"
+
+/**
+ * Seeds reservations for a specific seller (default: Sole Society /
+ * [email protected]). Ensures each offer-backed inventory item has a stock
+ * level, then creates a few reservations per item so the vendor Reservations
+ * panel is populated with Title / SKU / Product data for that seller.
+ *
+ * Run: bunx medusa exec ./src/scripts/seed-reservations-sole-society.ts
+ */
+const TARGET_SELLER_NAME = "Sole Society"
+const RESERVATIONS_PER_ITEM = 3
+
+export default async function seedSellerReservations({ container }: ExecArgs) {
+ const logger = container.resolve(ContainerRegistrationKeys.LOGGER)
+ const query = container.resolve(ContainerRegistrationKeys.QUERY)
+
+ logger.info(`Seeding reservations for "${TARGET_SELLER_NAME}"…`)
+
+ const { data: items } = await query.graph({
+ entity: "inventory_item",
+ fields: [
+ "id",
+ "sku",
+ "title",
+ "seller.id",
+ "seller.name",
+ "location_levels.location_id",
+ "location_levels.stocked_quantity",
+ "location_levels.reserved_quantity",
+ "offers.product.title",
+ ],
+ pagination: { take: 5000 },
+ })
+
+ const mine = items.filter(
+ (it) =>
+ (it as { seller?: { name?: string } }).seller?.name ===
+ TARGET_SELLER_NAME
+ )
+
+ const offerItems = mine.filter((it) =>
+ ((it as { offers?: { product?: unknown }[] }).offers ?? []).some(
+ (o) => o?.product
+ )
+ )
+
+ logger.info(
+ `Found ${mine.length} inventory item(s) for the seller, ${offerItems.length} offer-backed.`
+ )
+
+ // A location this seller already uses (to attach stock levels where missing).
+ const fallbackLocationId = mine
+ .flatMap((it) => it.location_levels ?? [])
+ .map((l: { location_id?: string }) => l.location_id)
+ .find(Boolean)
+
+ const reservations: {
+ inventory_item_id: string
+ location_id: string
+ quantity: number
+ description?: string
+ }[] = []
+
+ for (const item of offerItems) {
+ let level = (item.location_levels ?? []).find(
+ (l: { stocked_quantity?: number; reserved_quantity?: number }) =>
+ (l.stocked_quantity ?? 0) - (l.reserved_quantity ?? 0) > 0
+ )
+
+ // No stock level with availability — create one so the item is reservable.
+ if (!level && fallbackLocationId) {
+ await createInventoryLevelsWorkflow(container).run({
+ input: {
+ inventory_levels: [
+ {
+ inventory_item_id: item.id as string,
+ location_id: fallbackLocationId,
+ stocked_quantity: 300,
+ },
+ ],
+ },
+ })
+ level = {
+ location_id: fallbackLocationId,
+ stocked_quantity: 300,
+ reserved_quantity: 0,
+ }
+ logger.info(`Added a stock level to ${item.sku ?? item.id}.`)
+ }
+
+ if (!level) continue
+
+ const productTitle =
+ (item as { offers?: { product?: { title?: string } }[] }).offers?.[0]
+ ?.product?.title ?? item.title
+
+ for (let n = 0; n < RESERVATIONS_PER_ITEM; n++) {
+ reservations.push({
+ inventory_item_id: item.id as string,
+ location_id: level.location_id as string,
+ quantity: 5 + n * 10, // 5, 15, 25
+ description: `Reserved stock for ${productTitle}`,
+ })
+ }
+ }
+
+ if (!reservations.length) {
+ logger.info("Nothing to seed (no offer-backed inventory items found).")
+ return
+ }
+
+ await createReservationsWorkflow(container).run({
+ input: { reservations },
+ })
+
+ logger.info(
+ `Created ${reservations.length} reservation(s) for "${TARGET_SELLER_NAME}".`
+ )
+}
diff --git a/apps/api/src/scripts/seed-reservations.ts b/apps/api/src/scripts/seed-reservations.ts
new file mode 100644
index 000000000..91ce4ed9e
--- /dev/null
+++ b/apps/api/src/scripts/seed-reservations.ts
@@ -0,0 +1,97 @@
+import { ExecArgs } from "@medusajs/framework/types"
+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"
+import { createReservationsWorkflow } from "@medusajs/medusa/core-flows"
+
+/**
+ * Seeds a handful of manual reservations against sellers' existing
+ * offer-backed inventory items so the vendor Reservations panel has data with
+ * populated Title / SKU / Product columns.
+ *
+ * Run: bunx medusa exec ./src/scripts/seed-reservations.ts
+ */
+export default async function seedReservations({ container }: ExecArgs) {
+ const logger = container.resolve(ContainerRegistrationKeys.LOGGER)
+ const query = container.resolve(ContainerRegistrationKeys.QUERY)
+
+ logger.info("Seeding demo reservations…")
+
+ const { data: items } = await query.graph({
+ entity: "inventory_item",
+ fields: [
+ "id",
+ "sku",
+ "title",
+ "seller.id",
+ "seller.name",
+ "location_levels.location_id",
+ "location_levels.stocked_quantity",
+ "location_levels.reserved_quantity",
+ "offers.product.title",
+ ],
+ pagination: { take: 500 },
+ })
+
+ // Items already carrying a reservation — skip them so re-runs stay idempotent.
+ const { data: existing } = await query.graph({
+ entity: "reservation",
+ fields: ["id", "inventory_item_id"],
+ pagination: { take: 1000 },
+ })
+ const alreadyReserved = new Set(
+ existing.map((r) => r.inventory_item_id as string)
+ )
+
+ const MAX_PER_SELLER = 5
+ const perSeller = new Map<string, number>()
+ const input: {
+ inventory_item_id: string
+ location_id: string
+ quantity: number
+ description?: string
+ }[] = []
+
+ for (const item of items) {
+ const sellerId = (item as { seller?: { id?: string } }).seller?.id
+ if (!sellerId) continue
+ if (alreadyReserved.has(item.id as string)) continue
+
+ const level = (item.location_levels ?? []).find(
+ (l: { stocked_quantity?: number; reserved_quantity?: number }) =>
+ (l.stocked_quantity ?? 0) - (l.reserved_quantity ?? 0) > 0
+ )
+ if (!level) continue
+
+ const used = perSeller.get(sellerId) ?? 0
+ if (used >= MAX_PER_SELLER) continue
+ perSeller.set(sellerId, used + 1)
+
+ const productTitle =
+ (item as { offers?: { product?: { title?: string } }[] }).offers?.[0]
+ ?.product?.title
+ const quantity = 3 + ((input.length % 5) * 2) // 3,5,7,9,11,3,…
+
+ input.push({
+ inventory_item_id: item.id as string,
+ location_id: level.location_id as string,
+ quantity,
+ description: productTitle
+ ? `Reserved stock for ${productTitle}`
+ : `Reserved stock for ${item.title ?? item.sku ?? item.id}`,
+ })
+ }
+
+ if (!input.length) {
+ logger.info(
+ "No un-reserved offer-backed inventory items found — nothing to seed."
+ )
+ return
+ }
+
+ await createReservationsWorkflow(container).run({
+ input: { reservations: input },
+ })
+
+ logger.info(
+ `Created ${input.length} reservation(s) across ${perSeller.size} seller(s).`
+ )
+}
diff --git a/integration-tests/http/reservations/vendor/reservations.spec.ts b/integration-tests/http/reservations/vendor/reservations.spec.ts
index 702ca0879..7556681a1 100644
--- a/integration-tests/http/reservations/vendor/reservations.spec.ts
+++ b/integration-tests/http/reservations/vendor/reservations.spec.ts
@@ -206,6 +206,62 @@ medusaIntegrationTestRunner({
expect(res.data.count).toBe(1)
})
+ it("resolves the product behind each reservation's inventory item", async () => {
+ const a = await seedSellerWithReservation({
+ email: "[email protected]",
+ name: "Resv Store P",
+ offerSku: "RESV-OF-P",
+ })
+
+ const res = await api.get(`/vendor/reservations`, a.headers)
+ expect(res.status).toEqual(200)
+
+ const row = (
+ res.data.reservations as Array<{
+ inventory_item_id: string
+ inventory_item?: {
+ sku?: string
+ offers?: Array<{ product?: { id?: string; title?: string } }>
+ }
+ }>
+ ).find((r) => r.inventory_item_id === a.itemId)
+
+ expect(row?.inventory_item?.sku).toBe("RESV-OF-P")
+ // Product column data must resolve through the offer link.
+ expect(row?.inventory_item?.offers?.[0]?.product?.id).toBeTruthy()
+ expect(row?.inventory_item?.offers?.[0]?.product?.title).toBeTruthy()
+ })
+
+ it("filters the list by sku, scoped to the caller", async () => {
+ const a = await seedSellerWithReservation({
+ email: "[email protected]",
+ name: "Resv Store G",
+ offerSku: "RESV-OF-G",
+ })
+ await seedSellerWithReservation({
+ email: "[email protected]",
+ name: "Resv Store H",
+ offerSku: "RESV-OF-H",
+ })
+
+ // A's own sku returns A's reservation.
+ const match = await api.get(
+ `/vendor/reservations?sku=RESV-OF-G`,
+ a.headers
+ )
+ expect(match.status).toEqual(200)
+ expect(match.data.count).toBe(1)
+ expect(match.data.reservations[0].inventory_item_id).toBe(a.itemId)
+
+ // B's sku, queried by A, never leaks B's reservation.
+ const leak = await api.get(
+ `/vendor/reservations?sku=RESV-OF-H`,
+ a.headers
+ )
+ expect(leak.status).toEqual(200)
+ expect(leak.data.count).toBe(0)
+ })
+
it("returns empty when filtering by another seller's inventory item", async () => {
const a = await seedSellerWithReservation({
diff --git a/packages/admin/src/pages/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx b/packages/admin/src/pages/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx
index 96d0114e0..f228404b0 100644
--- a/packages/admin/src/pages/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx
+++ b/packages/admin/src/pages/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx
@@ -1,5 +1,5 @@
import { AdminReservationResponse } from "@medusajs/types"
-import { Container, Heading } from "@medusajs/ui"
+import { Container, Heading, Text } from "@medusajs/ui"
import { DisplayExtensionZone, DisplayField } from "@mercurjs/dashboard-shared"
import { ActionMenu } from "../../../../../components/common/action-menu"
@@ -108,7 +108,11 @@ export const ReservationGeneralSection = ({
>
<SectionRow
title={t("inventory.reservation.inStockAtLocation")}
- value={locationLevel?.stocked_quantity}
+ value={
+ <Text size="small" leading="compact">
+ {locationLevel?.stocked_quantity ?? "-"}
+ </Text>
+ }
/>
</DisplayField>
<DisplayField
@@ -119,7 +123,11 @@ export const ReservationGeneralSection = ({
>
<SectionRow
title={t("inventory.reservation.availableAtLocation")}
- value={locationLevel?.available_quantity}
+ value={
+ <Text size="small" leading="compact">
+ {locationLevel?.available_quantity ?? "-"}
+ </Text>
+ }
/>
</DisplayField>
<DisplayField
@@ -130,7 +138,11 @@ export const ReservationGeneralSection = ({
>
<SectionRow
title={t("inventory.reservation.reservedAtLocation")}
- value={locationLevel?.reserved_quantity}
+ value={
+ <Text size="small" leading="compact">
+ {locationLevel?.reserved_quantity ?? "-"}
+ </Text>
+ }
/>
</DisplayField>
<DisplayExtensionZone
diff --git a/packages/core/src/api/vendor/reservations/middlewares.ts b/packages/core/src/api/vendor/reservations/middlewares.ts
index ace4fe977..649cbc03b 100644
--- a/packages/core/src/api/vendor/reservations/middlewares.ts
+++ b/packages/core/src/api/vendor/reservations/middlewares.ts
@@ -55,6 +55,45 @@ const getSellerInventoryItemIds = async (
)
}
+// The list exposes a free-text SKU filter; SKU lives on the linked inventory
+// item, which the reservation query can't filter through a nested relation
+// path. Resolve the matching inventory item ids and narrow the query by
+// `inventory_item_id`. Runs before the seller scope so a sku query is
+// intersected with the seller's own items rather than replacing it.
+const maybeApplyInventoryItemSkuFilter = async (
+ req: AuthenticatedMedusaRequest,
+ _res: MedusaResponse,
+ next: MedusaNextFunction
+) => {
+ const sku = req.filterableFields?.sku as string | undefined
+ if (!sku) {
+ return next()
+ }
+
+ delete req.filterableFields.sku
+
+ const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)
+ const { data: inventoryItems } = await query.graph({
+ entity: "inventory_item",
+ fields: ["id"],
+ filters: { sku },
+ })
+
+ const matchedIds = inventoryItems.map((item) => item.id as string)
+ const existing = req.filterableFields.inventory_item_id
+
+ if (existing) {
+ const existingIds = Array.isArray(existing) ? existing : [existing]
+ req.filterableFields.inventory_item_id = existingIds.filter((id) =>
+ matchedIds.includes(id as string)
+ )
+ } else {
+ req.filterableFields.inventory_item_id = matchedIds
+ }
+
+ return next()
+}
+
const applySellerReservationsFilter = async (
req: AuthenticatedMedusaRequest,
_res: MedusaResponse,
@@ -152,6 +191,7 @@ export const vendorReservationsMiddlewares: MiddlewareRoute[] = [
VendorGetReservationsParams,
vendorReservationQueryConfig.list
),
+ maybeApplyInventoryItemSkuFilter,
applySellerReservationsFilter,
],
},
diff --git a/packages/core/src/api/vendor/reservations/query-config.ts b/packages/core/src/api/vendor/reservations/query-config.ts
index ff920adf5..29ba83fb2 100644
--- a/packages/core/src/api/vendor/reservations/query-config.ts
+++ b/packages/core/src/api/vendor/reservations/query-config.ts
@@ -27,6 +27,11 @@ export const defaultVendorReservationFields = [
"created_at",
"updated_at",
...defaultVendorInventoryItemFields.map((f) => `inventory_item.${f}`),
+ // Product column: inventory is offer-scoped in Mercur, so the product is
+ // reached through the offer (offer-product-link alias `product`).
+ "inventory_item.offers.id",
+ "inventory_item.offers.product.id",
+ "inventory_item.offers.product.title",
]
export const retrieveTransformQueryConfig = {
diff --git a/packages/core/src/api/vendor/reservations/validators.ts b/packages/core/src/api/vendor/reservations/validators.ts
index 734e8cffb..a71d17213 100644
--- a/packages/core/src/api/vendor/reservations/validators.ts
+++ b/packages/core/src/api/vendor/reservations/validators.ts
@@ -19,6 +19,9 @@ export const VendorGetReservationsParams = createFindParams({
}).merge(
z.object({
q: z.string().optional(),
+ // Free-text SKU filter from the list toolbar. SKU lives on the linked
+ // inventory item, so the middleware reshapes it into `inventory_item_id`.
+ sku: z.string().optional(),
location_id: z.union([z.string(), z.array(z.string())]).optional(),
inventory_item_id: z.union([z.string(), z.array(z.string())]).optional(),
line_item_id: z.union([z.string(), z.array(z.string())]).optional(),
diff --git a/packages/vendor/src/components/inputs/combobox/combobox.tsx b/packages/vendor/src/components/inputs/combobox/combobox.tsx
index f6e7055eb..e3e852e88 100644
--- a/packages/vendor/src/components/inputs/combobox/combobox.tsx
+++ b/packages/vendor/src/components/inputs/combobox/combobox.tsx
@@ -15,7 +15,7 @@ import {
TrianglesMini,
XMarkMini,
} from "@medusajs/icons"
-import { clx, Text } from "@medusajs/ui"
+import { Badge, clx, Text } from "@medusajs/ui"
import { matchSorter } from "match-sorter"
import {
ComponentPropsWithoutRef,
@@ -38,6 +38,7 @@ import { genericForwardRef } from "../../utilities/generic-forward-ref"
type ComboboxOption = {
value: string
label: string
+ secondaryLabel?: string
disabled?: boolean
}
@@ -367,7 +368,7 @@ const ComboboxImpl = <T extends Value = string>(
}}
aria-busy={isPending}
>
- {results.map(({ value, label, disabled }) => (
+ {results.map(({ value, label, secondaryLabel, disabled }) => (
<PrimitiveComboboxItem
key={value}
value={value}
@@ -385,9 +386,14 @@ const ComboboxImpl = <T extends Value = string>(
<PrimitiveComboboxItemCheck className="flex !size-5 shrink-0 items-center justify-center">
{isArrayValue ? <CheckMini /> : <EllipseMiniSolid />}
</PrimitiveComboboxItemCheck>
- <PrimitiveComboboxItemValue className="txt-compact-small truncate">
+ <PrimitiveComboboxItemValue className="txt-compact-small flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
{label}
</PrimitiveComboboxItemValue>
+ {secondaryLabel && (
+ <Badge size="2xsmall" className="ml-auto shrink-0">
+ {secondaryLabel}
+ </Badge>
+ )}
</PrimitiveComboboxItem>
))}
{!!fetchNextPage && <div ref={lastOptionRef} className="w-px" />}
diff --git a/packages/vendor/src/components/layout/main-layout/main-layout.tsx b/packages/vendor/src/components/layout/main-layout/main-layout.tsx
index 3ee09037d..e5f87a14c 100644
--- a/packages/vendor/src/components/layout/main-layout/main-layout.tsx
+++ b/packages/vendor/src/components/layout/main-layout/main-layout.tsx
@@ -318,7 +318,12 @@ export const useCoreRoutes = (): Omit<INavItem, "pathname">[] => {
icon: <Buildings />,
label: t("inventory.domain"),
to: "/inventory",
- items: [],
+ items: [
+ {
+ label: t("reservations.domain"),
+ to: "/reservations",
+ },
+ ],
},
{
icon: <Users />,
diff --git a/packages/vendor/src/extension-targets.d.ts b/packages/vendor/src/extension-targets.d.ts
index 08a78265b..711dcc28d 100644
--- a/packages/vendor/src/extension-targets.d.ts
+++ b/packages/vendor/src/extension-targets.d.ts
@@ -141,6 +141,7 @@ declare module "@mercurjs/dashboard-sdk" {
"price-lists": true
"products": true
"promotions": true
+ "reservations": true
"reviews": true
}
@@ -238,7 +239,7 @@ declare module "@mercurjs/dashboard-sdk" {
formZones: "edit"
formTabs: Record<string, string>
displayZones: "general"
- displayFieldIds: "available_quantity" | "description" | "line_item_id" | "location" | "reserved_quantity" | "stocked_quantity" | "title"
+ displayFieldIds: "available_quantity" | "description" | "item_id" | "location" | "reserved_quantity" | "stocked_quantity" | "title"
}
"seller": {
formZones: "address" | "edit" | "onboarding" | "payment-details" | "professional-details"
diff --git a/packages/vendor/src/i18n/translations/$schema.json b/packages/vendor/src/i18n/translations/$schema.json
index e765b8238..a3faf5524 100644
--- a/packages/vendor/src/i18n/translations/$schema.json
+++ b/packages/vendor/src/i18n/translations/$schema.json
@@ -4458,6 +4458,9 @@
},
"enterQuantity": {
"type": "string"
+ },
+ "pleaseEnterQuantity": {
+ "type": "string"
}
},
"required": [
@@ -4465,7 +4468,8 @@
"quantityOutOfRange",
"idRequired",
"selectLocation",
- "enterQuantity"
+ "enterQuantity",
+ "pleaseEnterQuantity"
],
"additionalProperties": false
},
@@ -4483,6 +4487,18 @@
},
"locationPlaceholder": {
"type": "string"
+ },
+ "itemId": {
+ "type": "string"
+ },
+ "goToInventoryItem": {
+ "type": "string"
+ },
+ "reserved": {
+ "type": "string"
+ },
+ "itemPlaceholder": {
+ "type": "string"
}
},
"required": [
@@ -4508,7 +4524,11 @@
"deleteDescription",
"deleteBlockedDescription",
"gotIt",
- "locationPlaceholder"
+ "locationPlaceholder",
+ "itemId",
+ "goToInventoryItem",
+ "reserved",
+ "itemPlaceholder"
],
"additionalProperties": false
},
@@ -13699,12 +13719,71 @@
},
"deleteWarning": {
"type": "string"
+ },
+ "list": {
+ "type": "object",
+ "properties": {
+ "noRecordsTitle": {
+ "type": "string"
+ },
+ "noRecordsMessage": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "noRecordsTitle",
+ "noRecordsMessage"
+ ],
+ "additionalProperties": false
+ },
+ "delete": {
+ "type": "object",
+ "properties": {
+ "title": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ },
+ "lockedTitle": {
+ "type": "string"
+ },
+ "lockedDescription": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "title",
+ "description",
+ "lockedTitle",
+ "lockedDescription"
+ ],
+ "additionalProperties": false
+ },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "lockedTitle": {
+ "type": "string"
+ },
+ "lockedDescription": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "lockedTitle",
+ "lockedDescription"
+ ],
+ "additionalProperties": false
}
},
"required": [
"domain",
"subtitle",
- "deleteWarning"
+ "deleteWarning",
+ "list",
+ "delete",
+ "edit"
],
"additionalProperties": false
},
diff --git a/packages/vendor/src/i18n/translations/en.json b/packages/vendor/src/i18n/translations/en.json
index e02a01b12..51a3c0a1f 100644
--- a/packages/vendor/src/i18n/translations/en.json
+++ b/packages/vendor/src/i18n/translations/en.json
@@ -1054,7 +1054,7 @@
"deleteWarning": "You are about to delete an inventory item. This action cannot be undone.",
"editItemDetails": "Edit item details",
"quantityAcrossLocations": "{{quantity}} across {{locations}} locations",
- "levelDeleted": "Inventory level was successfully deleted.",
+ "levelDeleted": "Inventory level deleted successfully.",
"create": {
"title": "Create Inventory Item",
"details": "Details",
@@ -1089,17 +1089,22 @@
"updateSuccessToast": "Reservation was successfully updated.",
"deleteSuccessToast": "Reservation was successfully deleted.",
"errors": {
- "noAvaliableQuantity": "Stock location doesn't have available quantity.",
+ "noAvaliableQuantity": "Stock location doesn't have available quantity",
"quantityOutOfRange": "Minimum quantity is 1 and maximum quantity is {{max}}",
- "idRequired": "Please select an item to reserve",
+ "idRequired": "Inventory item is required",
"selectLocation": "Please select a location",
- "enterQuantity": "Please enter a quantity"
+ "enterQuantity": "Please enter a quantity",
+ "pleaseEnterQuantity": "Please enter quantity"
},
"deleteTitle": "Delete reservation",
"deleteDescription": "You are about to delete a reservation. This action cannot be undone.",
"deleteBlockedDescription": "This reservation cannot be deleted because it's linked to an unfulfilled order.",
"gotIt": "Got it",
- "locationPlaceholder": "Select location"
+ "locationPlaceholder": "Select location",
+ "itemId": "Item ID",
+ "goToInventoryItem": "Go to inventory item",
+ "reserved": "Reserved",
+ "itemPlaceholder": "Select item"
},
"adjustInventory": {
"errors": {
@@ -1108,9 +1113,9 @@
}
},
"toast": {
- "updateLocations": "Locations were successfully updated.",
- "updateLevel": "Inventory level was successfully updated.",
- "updateItem": "Inventory item was successfully updated.",
+ "updateLocations": "Locations updated successfully.",
+ "updateLevel": "Inventory level updated successfully.",
+ "updateItem": "Inventory item updated successfully.",
"deleteItem": "Inventory item was successfully deleted."
},
"stock": {
@@ -1121,7 +1126,7 @@
"disablePrompt_one": "You are about to disable {{count}} location level. This action cannot be undone.",
"disablePrompt_other": "You are about to disable {{count}} location levels. This action cannot be undone.",
"disabledToggleTooltip": "Cannot disable: clear incoming and/or reserved quantity before disabling.",
- "successToast": "Stock levels were successfully updated."
+ "successToast": "Inventory levels updated successfully."
},
"associatedOffers": "Associated offers",
"attributes": {
@@ -3460,7 +3465,21 @@
"reservations": {
"domain": "Reservations",
"subtitle": "Manage the reserved quantity of inventory items.",
- "deleteWarning": "You are about to delete a reservation. This action cannot be undone."
+ "deleteWarning": "You are about to delete a reservation. This action cannot be undone.",
+ "list": {
+ "noRecordsTitle": "No reservations yet",
+ "noRecordsMessage": "Create reservations to manage the reserved quantity of inventory items"
+ },
+ "delete": {
+ "title": "Delete reservation",
+ "description": "You are about to delete a reservation. This action cannot be undone.",
+ "lockedTitle": "Delete reservation",
+ "lockedDescription": "This reservation cannot be deleted because it's linked to an unfulfilled order."
+ },
+ "edit": {
+ "lockedTitle": "Edit reservation",
+ "lockedDescription": "This reservation cannot be edited because it's linked to an unfulfilled order."
+ }
},
"salesChannels": {
"domain": "Sales Channels",
diff --git a/packages/vendor/src/pages/reservations/[id]/_components/edit-reservation/components/edit-reservation-form.tsx b/packages/vendor/src/pages/reservations/[id]/_components/edit-reservation/components/edit-reservation-form.tsx
index ab6516e0c..6f1c51255 100644
--- a/packages/vendor/src/pages/reservations/[id]/_components/edit-reservation/components/edit-reservation-form.tsx
+++ b/packages/vendor/src/pages/reservations/[id]/_components/edit-reservation/components/edit-reservation-form.tsx
@@ -21,7 +21,7 @@ type EditReservationFormProps = {
const EditReservationSchema = z.object({
location_id: z.string(),
description: z.string().optional(),
- quantity: z.number().min(1),
+ quantity: z.number().nullable(),
})
const AttributeGridRow = ({
@@ -71,18 +71,6 @@ export const EditReservationForm = ({
const { mutateAsync } = useUpdateReservationItem(reservation.id)
- const handleSubmit = form.handleSubmit(async (values) => {
- mutateAsync(values as any, {
- onSuccess: () => {
- toast.success(t("inventory.reservation.updateSuccessToast"))
- handleSuccess()
- },
- onError: (e) => {
- toast.error(e.message)
- },
- })
- })
-
const reservedQuantity = form.watch("quantity")
const locationId = form.watch("location_id")
@@ -90,6 +78,58 @@ export const EditReservationForm = ({
(level: HttpTypes.AdminInventoryLevel) => level.location_id === locationId
)
+ // The reservation's own quantity is already counted in the level's reserved
+ // amount, so it is available to this edit — add it back to the ceiling.
+ const maxQuantity =
+ (level?.available_quantity ?? 0) + (reservation.quantity ?? 0)
+
+ const handleSubmit = form.handleSubmit(async (values) => {
+ // A location with no available stock wins over the empty-field message,
+ // matching the Figma error states.
+ if (maxQuantity < 1) {
+ form.setError("quantity", {
+ type: "manual",
+ message: t("inventory.reservation.errors.noAvaliableQuantity"),
+ })
+ return
+ }
+
+ if (values.quantity === null || values.quantity === undefined) {
+ form.setError("quantity", {
+ type: "manual",
+ message: t("inventory.reservation.errors.pleaseEnterQuantity"),
+ })
+ return
+ }
+
+ if (values.quantity < 1 || values.quantity > maxQuantity) {
+ form.setError("quantity", {
+ type: "manual",
+ message: t("inventory.reservation.errors.quantityOutOfRange", {
+ max: maxQuantity,
+ }),
+ })
+ return
+ }
+
+ const { additional_data: _additionalData, ...payload } = values as z.infer<
+ typeof EditReservationSchema
+ > & { additional_data?: Record<string, unknown> }
+
+ mutateAsync(
+ { ...payload, quantity: values.quantity },
+ {
+ onSuccess: () => {
+ toast.success(t("inventory.reservation.updateSuccessToast"))
+ handleSuccess()
+ },
+ onError: (e) => {
+ toast.error(e.message)
+ },
+ }
+ )
+ })
+
return (
<RouteDrawer.Form form={form}>
<KeyboundForm
@@ -144,7 +184,7 @@ export const EditReservationForm = ({
value={
level!.stocked_quantity -
(level!.reserved_quantity - reservation.quantity) -
- reservedQuantity
+ (reservedQuantity ?? 0)
}
/>
</div>
@@ -155,17 +195,14 @@ export const EditReservationForm = ({
return (
<Form.Item>
<Form.Label>
- {t("inventory.reservation.reservedAmount")}
+ {t("inventory.reservation.reserved")}
</Form.Label>
<Form.Control>
<Input
type="number"
min={0}
- max={
- (level!.available_quantity || 0) +
- (reservation.quantity || 0)
- }
- value={value || ""}
+ max={maxQuantity}
+ value={value ?? ""}
onChange={(e) => {
const value = e.target.value
diff --git a/packages/vendor/src/pages/reservations/[id]/_components/index.ts b/packages/vendor/src/pages/reservations/[id]/_components/index.ts
index d11e483be..7bd2003e3 100644
--- a/packages/vendor/src/pages/reservations/[id]/_components/index.ts
+++ b/packages/vendor/src/pages/reservations/[id]/_components/index.ts
@@ -1,2 +1,3 @@
export * from "./edit-reservation"
export * from "./reservation-general-section"
+export * from "./reservation-inventory-section"
diff --git a/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx b/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx
index 1d70af6b0..4d54dfd26 100644
--- a/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx
+++ b/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx
@@ -1,5 +1,5 @@
import { AdminReservationResponse, HttpTypes } from "@medusajs/types"
-import { Container, Heading } from "@medusajs/ui"
+import { Container, Heading, Text } from "@medusajs/ui"
import { ActionMenu } from "@components/common/action-menu"
import { DisplayExtensionZone, DisplayField } from "@mercurjs/dashboard-shared"
@@ -56,10 +56,10 @@ export const ReservationGeneralSection = ({
]}
/>
</div>
- <DisplayField model="reservation" zone="general" id="line_item_id" data={reservation}>
+ <DisplayField model="reservation" zone="general" id="item_id" data={reservation}>
<SectionRow
- title={t("inventory.reservation.lineItemId")}
- value={reservation.line_item_id} // TODO fetch order instead + add link
+ title={t("inventory.reservation.itemId")}
+ value={inventoryItem?.sku ?? inventoryItem?.id}
/>
</DisplayField>
<DisplayField model="reservation" zone="general" id="description" data={reservation}>
@@ -77,19 +77,31 @@ export const ReservationGeneralSection = ({
<DisplayField model="reservation" zone="general" id="stocked_quantity" data={reservation}>
<SectionRow
title={t("inventory.reservation.inStockAtLocation")}
- value={locationLevel?.stocked_quantity}
+ value={
+ <Text size="small" leading="compact">
+ {locationLevel?.stocked_quantity ?? "-"}
+ </Text>
+ }
/>
</DisplayField>
<DisplayField model="reservation" zone="general" id="available_quantity" data={reservation}>
<SectionRow
title={t("inventory.reservation.availableAtLocation")}
- value={locationLevel?.available_quantity}
+ value={
+ <Text size="small" leading="compact">
+ {locationLevel?.available_quantity ?? "-"}
+ </Text>
+ }
/>
</DisplayField>
<DisplayField model="reservation" zone="general" id="reserved_quantity" data={reservation}>
<SectionRow
title={t("inventory.reservation.reservedAtLocation")}
- value={locationLevel?.reserved_quantity}
+ value={
+ <Text size="small" leading="compact">
+ {locationLevel?.reserved_quantity ?? "-"}
+ </Text>
+ }
/>
</DisplayField>
<DisplayExtensionZone
@@ -98,7 +110,7 @@ export const ReservationGeneralSection = ({
data={reservation}
builtInFieldIds={[
"title",
- "line_item_id",
+ "item_id",
"description",
"location",
"stocked_quantity",
diff --git a/packages/vendor/src/pages/reservations/[id]/_components/reservation-inventory-section/index.ts b/packages/vendor/src/pages/reservations/[id]/_components/reservation-inventory-section/index.ts
new file mode 100644
index 000000000..1722509a6
--- /dev/null
+++ b/packages/vendor/src/pages/reservations/[id]/_components/reservation-inventory-section/index.ts
@@ -0,0 +1 @@
+export * from "./reservation-inventory-section"
diff --git a/packages/vendor/src/pages/reservations/[id]/_components/reservation-inventory-section/reservation-inventory-section.tsx b/packages/vendor/src/pages/reservations/[id]/_components/reservation-inventory-section/reservation-inventory-section.tsx
new file mode 100644
index 000000000..1457c84fe
--- /dev/null
+++ b/packages/vendor/src/pages/reservations/[id]/_components/reservation-inventory-section/reservation-inventory-section.tsx
@@ -0,0 +1,81 @@
+import { Container, Heading } from "@medusajs/ui"
+import { BuildingStorefront } from "@medusajs/icons"
+import { HttpTypes } from "@medusajs/types"
+import { useTranslation } from "react-i18next"
+import { ActionMenu } from "@components/common/action-menu"
+import { SectionRow } from "@components/common/section"
+
+type ReservationInventorySectionProps = {
+ inventoryItem: HttpTypes.AdminInventoryItemResponse["inventory_item"]
+}
+
+export const ReservationInventorySection = ({
+ inventoryItem,
+}: ReservationInventorySectionProps) => {
+ const { t } = useTranslation()
+
+ const stockedQuantity =
+ inventoryItem.location_levels?.reduce(
+ (acc, level) => acc + level.stocked_quantity,
+ 0
+ ) ?? 0
+ const reservedQuantity =
+ inventoryItem.location_levels?.reduce(
+ (acc, level) => acc + level.reserved_quantity,
+ 0
+ ) ?? 0
+ const availableQuantity = stockedQuantity - reservedQuantity
+
+ const getQuantityFormat = (quantity: number) =>
+ t("inventory.quantityAcrossLocations", {
+ quantity,
+ locations: inventoryItem.location_levels?.length ?? 0,
+ })
+
+ return (
+ <Container
+ className="divide-y p-0"
+ data-testid="reservation-inventory-section"
+ >
+ <div className="flex items-center justify-between px-6 py-4">
+ <Heading data-testid="reservation-inventory-title">
+ {inventoryItem.title ?? inventoryItem.sku}
+ </Heading>
+ <ActionMenu
+ groups={[
+ {
+ actions: [
+ {
+ icon: <BuildingStorefront />,
+ label: t("inventory.reservation.goToInventoryItem"),
+ to: `/inventory/${inventoryItem.id}`,
+ },
+ ],
+ },
+ ]}
+ data-testid="reservation-inventory-action-menu"
+ />
+ </div>
+ <SectionRow
+ title={t("fields.sku")}
+ value={inventoryItem.sku ?? "-"}
+ data-testid="reservation-inventory-sku-row"
+ />
+ <SectionRow
+ title={t("fields.inStock")}
+ value={getQuantityFormat(stockedQuantity)}
+ data-testid="reservation-inventory-in-stock-row"
+ />
+ <SectionRow
+ title={t("inventory.reserved")}
+ value={getQuantityFormat(reservedQuantity)}
+ data-testid="reservation-inventory-reserved-row"
+ />
+ <SectionRow
+ title={t("inventory.available")}
+ value={getQuantityFormat(availableQuantity)}
+ data-testid="reservation-inventory-available-row"
+ />
+ </Container>
+ )
+}
diff --git a/packages/vendor/src/pages/reservations/[id]/index.tsx b/packages/vendor/src/pages/reservations/[id]/index.tsx
index e1b9c94e7..cacc40d52 100644
--- a/packages/vendor/src/pages/reservations/[id]/index.tsx
+++ b/packages/vendor/src/pages/reservations/[id]/index.tsx
@@ -8,7 +8,7 @@ import { useLinkQuery, WidgetZone } from "@mercurjs/dashboard-shared"
import { useReservationItem } from "@hooks/api/reservations"
import { useInventoryItem } from "@hooks/api"
import { ReservationGeneralSection } from "./_components/reservation-general-section"
-import { InventoryItemGeneralSection } from "../../inventory/[id]/_components/inventory-item-general-section"
+import { ReservationInventorySection } from "./_components/reservation-inventory-section"
type ReservationDetailBreadcrumbProps =
UIMatch<HttpTypes.AdminReservationResponse>
@@ -58,7 +58,7 @@ export const Component = () => {
}
return (
- <TwoColumnPage data={reservation}>
+ <TwoColumnPage data={reservation} showJSON showMetadata>
<TwoColumnPage.Main>
<WidgetZone id="reservations.detail.main" data={reservation}>
<ReservationGeneralSection reservation={reservation} />
@@ -67,7 +67,7 @@ export const Component = () => {
<TwoColumnPage.Sidebar>
<WidgetZone id="reservations.detail.side" data={reservation}>
{inventory_item && (
- <InventoryItemGeneralSection inventoryItem={inventory_item!} />
+ <ReservationInventorySection inventoryItem={inventory_item!} />
)}
</WidgetZone>
</TwoColumnPage.Sidebar>
diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx
index 256328ce1..86c63c3ab 100644
--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx
+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx
@@ -3,8 +3,9 @@ import { PencilSquare, Trash } from "@medusajs/icons"
import { ActionMenu } from "@components/common/action-menu"
import { useDeleteReservationItem } from "@hooks/api/reservations"
import { toast, usePrompt } from "@medusajs/ui"
+import { useNavigate } from "react-router-dom"
import { useTranslation } from "react-i18next"
-import { ExtendedReservationItem } from "../../../../inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns"
+import { ExtendedReservationItem } from "../../../inventory/[id]/_components/reservations-table/use-reservation-list-table-columns"
export const ReservationActions = ({
reservation,
@@ -12,13 +13,47 @@ export const ReservationActions = ({
reservation: ExtendedReservationItem
}) => {
const { t } = useTranslation()
+ const navigate = useNavigate()
const prompt = usePrompt()
const { mutateAsync } = useDeleteReservationItem(reservation.id)
+ // Reservations linked to an unfulfilled order cannot be edited or deleted.
+ // A fulfilled order auto-removes its reservation, so a still-present
+ // line-item link means the order is unfulfilled.
+ const isLocked = !!reservation.line_item_id
+
+ const showLockedPrompt = (title: string, description: string) =>
+ prompt({
+ title,
+ description,
+ confirmText: t("inventory.reservation.gotIt"),
+ cancelText: t("actions.cancel"),
+ })
+
+ const handleEdit = async () => {
+ if (isLocked) {
+ await showLockedPrompt(
+ t("reservations.edit.lockedTitle"),
+ t("reservations.edit.lockedDescription")
+ )
+ return
+ }
+
+ navigate(`${reservation.id}/edit`)
+ }
+
const handleDelete = async () => {
+ if (isLocked) {
+ await showLockedPrompt(
+ t("reservations.delete.lockedTitle"),
+ t("reservations.delete.lockedDescription")
+ )
+ return
+ }
+
const res = await prompt({
- title: t("general.areYouSure"),
- description: t("reservations.deleteWarning"),
+ title: t("reservations.delete.title"),
+ description: t("reservations.delete.description"),
confirmText: t("actions.delete"),
cancelText: t("actions.cancel"),
})
@@ -44,7 +79,7 @@ export const ReservationActions = ({
actions: [
{
label: t("actions.edit"),
- to: `${reservation.id}/edit`,
+ onClick: handleEdit,
icon: <PencilSquare />,
},
],
diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx
index 3ec565c8e..c22f33966 100644
--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx
+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx
@@ -45,7 +45,7 @@ const useColumns = () => {
export const ReservationListTable = () => {
const { t } = useTranslation()
- const { searchParams } = useReservationTableQuery({
+ const { searchParams, raw } = useReservationTableQuery({
pageSize: PAGE_SIZE,
})
@@ -91,9 +91,25 @@ export const ReservationListTable = () => {
count={count}
isLoading={isPending}
filters={filters}
+ queryObject={raw}
pagination
+ search
+ orderBy={[
+ { key: "inventory_item.title", label: t("fields.title") },
+ { key: "inventory_item.sku", label: t("fields.sku") },
+ { key: "created_at", label: t("fields.createdAt") },
+ { key: "updated_at", label: t("fields.updatedAt") },
+ ]}
+ defaultOrderBy="inventory_item.title"
navigateTo={(row) => row.id}
- search={false}
+ noRecords={{
+ title: t("reservations.list.noRecordsTitle"),
+ message: t("reservations.list.noRecordsMessage"),
+ action: {
+ to: "create",
+ label: t("actions.create"),
+ },
+ }}
/>
</Container>
)
diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-columns.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-columns.tsx
index 663296a0d..5b1ee7ce6 100644
--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-columns.tsx
+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-columns.tsx
@@ -1,95 +1,70 @@
import { createColumnHelper } from "@tanstack/react-table"
import { useMemo } from "react"
import { useTranslation } from "react-i18next"
+import { OfferDTO } from "@mercurjs/types"
import { DateCell } from "@components/table/table-cells/common/date-cell"
import { PlaceholderCell } from "@components/table/table-cells/common/placeholder-cell"
-import { ExtendedReservationItem } from "../../../../inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns"
+import { ExtendedReservationItem } from "../../../inventory/[id]/_components/reservations-table/use-reservation-list-table-columns"
const columnHelper = createColumnHelper<ExtendedReservationItem>()
+const TruncatedTextCell = ({ value }: { value?: string | null }) => {
+ if (!value) {
+ return <PlaceholderCell />
+ }
+
+ return (
+ <div className="flex size-full items-center overflow-hidden">
+ <span className="truncate">{value}</span>
+ </div>
+ )
+}
+
+// Inventory is offer-scoped in Mercur, so the product is reached through the
+// offer: inventory_item -> offers -> product. Read defensively and fall back
+// to a placeholder when the link isn't populated.
+const getProductTitle = (reservation: ExtendedReservationItem) => {
+ const item = reservation.inventory_item as
+ | { offers?: OfferDTO[] | null }
+ | undefined
+ return item?.offers?.[0]?.product?.title ?? undefined
+}
+
export const useReservationTableColumns = () => {
const { t } = useTranslation()
return useMemo(
() => [
- columnHelper.accessor("inventory_item", {
+ columnHelper.accessor("inventory_item.title", {
+ header: t("fields.title"),
+ cell: ({ getValue }) => <TruncatedTextCell value={getValue()} />,
+ }),
+ columnHelper.accessor("inventory_item.sku", {
header: t("fields.sku"),
- cell: ({ getValue }) => {
- const inventoryItem = getValue()
-
- if (!inventoryItem || !inventoryItem.sku) {
- return <PlaceholderCell />
- }
-
- return (
- <div className="flex size-full items-center overflow-hidden">
- <span className="truncate">{inventoryItem.sku}</span>
- </div>
- )
- },
+ cell: ({ getValue }) => <TruncatedTextCell value={getValue()} />,
+ }),
+ columnHelper.display({
+ id: "product",
+ header: t("fields.product"),
+ cell: ({ row }) => (
+ <TruncatedTextCell value={getProductTitle(row.original)} />
+ ),
}),
- /**
- * TEMP: hide this column until a link is added
- */
- // columnHelper.accessor("line_item", {
- // header: t("fields.order"),
- // cell: ({ getValue }) => {
- // const inventoryItem = getValue()
- //
- // if (!inventoryItem || !inventoryItem.order?.display_id) {
- // return <PlaceholderCell />
- // }
- //
- // return (
- // <div className="flex size-full items-center overflow-hidden">
- // <LinkButton to={`/orders/${inventoryItem.order.id}`}>
- // <span className="truncate">
- // #{inventoryItem.order.display_id}
- // </span>
- // </LinkButton>
- // </div>
- // )
- // },
- // }),
columnHelper.accessor("description", {
header: t("fields.description"),
- cell: ({ getValue }) => {
- const description = getValue()
-
- if (!description) {
- return <PlaceholderCell />
- }
-
- return (
- <div className="flex size-full items-center overflow-hidden">
- <span className="truncate">{description}</span>
- </div>
- )
- },
- }),
- columnHelper.accessor("created_at", {
- header: t("fields.created"),
- cell: ({ getValue }) => {
- const created = getValue()
-
- return <DateCell date={created} />
- },
+ cell: ({ getValue }) => <TruncatedTextCell value={getValue()} />,
}),
columnHelper.accessor("quantity", {
- header: () => (
- <div className="flex size-full items-center justify-end overflow-hidden text-right">
- <span className="truncate">{t("fields.quantity")}</span>
+ header: t("fields.quantity"),
+ cell: ({ getValue }) => (
+ <div className="flex size-full items-center overflow-hidden">
+ <span className="truncate">{getValue()}</span>
</div>
),
- cell: ({ getValue }) => {
- const quantity = getValue()
-
- return (
- <div className="flex size-full items-center justify-end overflow-hidden text-right">
- <span className="truncate">{quantity}</span>
- </div>
- )
- },
+ }),
+ columnHelper.accessor("created_at", {
+ header: t("fields.date"),
+ cell: ({ getValue }) => <DateCell date={getValue()} />,
}),
],
[t]
diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-filters.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-filters.tsx
index 9483c993e..6a517f1f0 100644
--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-filters.tsx
+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-filters.tsx
@@ -10,6 +10,12 @@ export const useReservationTableFilters = () => {
const filters: Filter[] = []
+ filters.push({
+ type: "string",
+ key: "sku",
+ label: t("fields.sku"),
+ })
+
if (stock_locations) {
const stockLocationFilter: Filter = {
type: "select",
diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-query.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-query.tsx
index 6d0aa79d2..a083cff30 100644
--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-query.tsx
+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/use-reservation-table-query.tsx
@@ -9,11 +9,20 @@ export const useReservationTableQuery = ({
prefix?: string
}) => {
const raw = useQueryParams(
- ["location_id", "offset", "created_at", "quantity", "updated_at", "order"],
+ [
+ "q",
+ "sku",
+ "location_id",
+ "offset",
+ "created_at",
+ "quantity",
+ "updated_at",
+ "order",
+ ],
prefix
)
- const { location_id, created_at, updated_at, offset, ...rest } = raw
+ const { location_id, created_at, updated_at, order, offset, ...rest } = raw
const searchParams: HttpTypes.AdminGetReservationsParams = {
limit: pageSize,
@@ -21,6 +30,7 @@ export const useReservationTableQuery = ({
location_id: location_id,
created_at: created_at ? JSON.parse(created_at) : undefined,
updated_at: updated_at ? JSON.parse(updated_at) : undefined,
+ order: order ?? "inventory_item.title",
...rest,
}
diff --git a/packages/vendor/src/pages/reservations/create/reservation-create-from/reservation-create-from.tsx b/packages/vendor/src/pages/reservations/create/reservation-create-from/reservation-create-from.tsx
index f6ddf98ab..ae8103b0f 100644
--- a/packages/vendor/src/pages/reservations/create/reservation-create-from/reservation-create-from.tsx
+++ b/packages/vendor/src/pages/reservations/create/reservation-create-from/reservation-create-from.tsx
@@ -8,6 +8,7 @@ import {
import { zodResolver } from "@hookform/resolvers/zod"
import { HttpTypes } from "@medusajs/types"
+import { OfferDTO } from "@mercurjs/types"
import React from "react"
import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
@@ -18,20 +19,6 @@ import { useInventoryItems } from "@hooks/api/inventory"
import { useCreateReservationItem } from "@hooks/api/reservations"
import { useStockLocations } from "@hooks/api/stock-locations"
-const buildCreateReservationSchema = (t: (key: string) => string) =>
- zod.object({
- inventory_item_id: zod
- .string()
- .min(1, t("inventory.reservation.errors.idRequired")),
- location_id: zod
- .string()
- .min(1, t("inventory.reservation.errors.selectLocation")),
- quantity: zod
- .number()
- .min(1, t("inventory.reservation.errors.enterQuantity")),
- description: zod.string().optional(),
- })
-
const AttributeGridRow = ({
title,
value,
@@ -51,6 +38,30 @@ const AttributeGridRow = ({
)
}
+// Inventory is offer-scoped in Mercur, so the product shown as a badge next to
+// each variant title is reached through the offer: inventory_item -> offers ->
+// product.
+const getProductTitle = (
+ inventoryItem: HttpTypes.AdminInventoryItem
+): string | undefined => {
+ const item = inventoryItem as { offers?: OfferDTO[] | null }
+ return item.offers?.[0]?.product?.title ?? undefined
+}
+
+const buildCreateReservationSchema = (t: (key: string) => string) =>
+ zod.object({
+ inventory_item_id: zod
+ .string()
+ .min(1, t("inventory.reservation.errors.idRequired")),
+ location_id: zod
+ .string()
+ .min(1, t("inventory.reservation.errors.selectLocation")),
+ quantity: zod
+ .number()
+ .min(1, t("inventory.reservation.errors.enterQuantity")),
+ description: zod.string().optional(),
+ })
+
export const ReservationCreateForm = (props: { inventoryItemId?: string }) => {
const { t } = useTranslation()
const { handleSuccess } = useRouteModal()
@@ -71,8 +82,11 @@ export const ReservationCreateForm = (props: { inventoryItemId?: string }) => {
})
const { inventory_items: searchedItems } = useInventoryItems({
- fields: "*location_levels",
- q: inventorySearch ?? undefined,
+ fields: "id,sku,title,*location_levels,offers.product.title",
+ // Only send `q` when there is an actual search term. Passing `undefined`
+ // serializes to the literal `q=undefined`, which the backend treats as a
+ // search for "undefined" and returns nothing.
+ ...(inventorySearch ? { q: inventorySearch } : {}),
})
// The preselected item (from `?item_id=`) may not be in the search results,
@@ -80,7 +94,7 @@ export const ReservationCreateForm = (props: { inventoryItemId?: string }) => {
const { inventory_items: presetItems } = useInventoryItems(
{
id: props.inventoryItemId ? [props.inventoryItemId] : undefined,
- fields: "id,sku,title,*location_levels",
+ fields: "id,sku,title,*location_levels,offers.product.title",
},
{ enabled: !!props.inventoryItemId }
)
@@ -191,10 +205,14 @@ export const ReservationCreateForm = (props: { inventoryItemId?: string }) => {
onChange(v)
}}
{...field}
+ placeholder={t(
+ "inventory.reservation.itemPlaceholder"
+ )}
disabled={!!props.inventoryItemId}
options={(inventory_items ?? []).map(
(inventoryItem) => ({
label: inventoryItem.title ?? inventoryItem.sku!,
+ secondaryLabel: getProductTitle(inventoryItem),
value: inventoryItem.id,
})
)}
@@ -220,10 +238,10 @@ export const ReservationCreateForm = (props: { inventoryItemId?: string }) => {
onChange(v)
}}
{...field}
- disabled={!inventoryItemId}
placeholder={t(
"inventory.reservation.locationPlaceholder"
)}
+ disabled={!inventoryItemId}
options={(stock_locations ?? []).map(
(stockLocation) => ({
label: stockLocation.name,