-
General
-
-
-
-
-
+
+
+
-
-
-
Manage inventory
- {
- return
- }}
- />
-
-
- When checked Medusa will regulate the inventory when orders and
- returns are made.
-
-
-
-
- Allow backorders
-
- {
- return
- }}
- />
-
-
- When checked the product will be available for purchase despite
- the product being sold out
-
-
-
Quantity
- {!isLoading && locations && (
-
-
- {selectedLocations.map((level, i) => {
- const locationDetails = locationsMap.get(level.location_id)
- const locationLevel = levelMap.get(level.location_id)
-
- return (
-
-
-
-
-
- {locationDetails?.name}
-
-
-
-
- {`${locationLevel!.reserved_quantity} reserved`}
-
- {`${
- locationLevel!.stocked_quantity! -
- locationLevel!.reserved_quantity!
- } available`}
-
-
-
-
- )
- })}
-
- )}
-
-
+
+
+ Allow backorders
+
+ {
+ return (
+
+ )
+ }}
+ />
+
+
+ When checked the product will be available for purchase
+ despite the product being sold out
+
+
+
Quantity
+ {!isLoading && locations && (
+
+
+ {selectedLocations.map((level, i) => {
+ const locationDetails = locationsMap.get(
+ level.location_id
+ )
+ const locationLevel = levelMap.get(level.location_id)
+
+ return (
+
+
+
+
+
+ {locationDetails?.name}
+
+
+
+
+ {`${locationLevel!.reserved_quantity} reserved`}
+
+ {`${
+ locationLevel!.stocked_quantity! -
+ locationLevel!.reserved_quantity!
+ } available`}
+
+
+
+
+ )
+ })}
+
+ )}
+
+
+
+
+ )}
+
+
+
+
+ Shipping information can be required depending on your shipping
+ provider, and whether or not you are shipping internationally.
+
+
+
Dimensions
+
+ Configure to calculate the most accurate shipping rates.
+
+
+
+
Customs
+
+ Configure if you are shipping internationally.
+
+
+
+
)
}
diff --git a/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx
index 7bdb0919ef..254bbfe42d 100644
--- a/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx
@@ -14,12 +14,13 @@ import {
import Button from "../../fundamentals/button"
import { InventoryLevelDTO } from "@medusajs/types"
import Modal from "../../molecules/modal"
-import { createUpdatePayload } from "./edit-variants-modal/edit-variant-screen"
import { queryClient } from "../../../constants/query-client"
import { removeNullish } from "../../../utils/remove-nullish"
import { useContext } from "react"
import useEditProductActions from "../../../hooks/use-edit-product-actions"
import { useForm } from "react-hook-form"
+import { countries } from "../../../utils/countries"
+import { Option } from "../../../types/shared"
type Props = {
onClose: () => void
@@ -44,19 +45,41 @@ const EditVariantInventoryModal = ({ onClose, product, variant }: Props) => {
const { onUpdateVariant, updatingVariant } = useEditProductActions(product.id)
+ const createUpdateInventoryItemPayload = (
+ data: Partial
+ ) => {
+ const updateDimensions = data.dimensions || {}
+ const updateCustoms = data.customs || {}
+ const originCountry = data.customs?.origin_country?.value
+
+ delete data.dimensions
+ delete data.customs
+ delete data.ean
+ delete data.barcode
+ delete data.upc
+
+ return removeNullish({
+ ...updateDimensions,
+ ...updateCustoms,
+ ...data,
+ ...(originCountry && { origin_country: originCountry }),
+ })
+ }
+
const onSubmit = async (data: EditFlowVariantFormType) => {
- const locationLevels = data.stock.location_levels || []
- const manageInventory = data.stock.manage_inventory
+ const locationLevels = data.location_levels || []
+ const manageInventory = data.manage_inventory
const variantInventoryItem = variantInventory?.inventory?.[0]
const itemId = variantInventoryItem?.id
- delete data.stock.manage_inventory
- delete data.stock.location_levels
+ delete data.manage_inventory
+ delete data.location_levels
let inventoryItemId: string | undefined = itemId
- const upsertPayload = removeNullish(data.stock)
+ const { ean, barcode, upc } = data
+ const upsertPayload = createUpdateInventoryItemPayload(data)
let shouldInvalidateCache = false
if (variantInventoryItem) {
@@ -135,14 +158,27 @@ const EditVariantInventoryModal = ({ onClose, product, variant }: Props) => {
}
}
+ const { dimensions, customs, ...stock } = data
+
// @ts-ignore
- onUpdateVariant(variant.id, createUpdatePayload(data), () => {
- refetch()
- if (shouldInvalidateCache) {
- queryClient.invalidateQueries(adminInventoryItemsKeys.lists())
+ onUpdateVariant(
+ variant.id,
+ removeNullish({
+ ...dimensions,
+ ...customs,
+ ...stock,
+ ean,
+ barcode,
+ upc,
+ }),
+ () => {
+ refetch()
+ if (shouldInvalidateCache) {
+ queryClient.invalidateQueries(adminInventoryItemsKeys.lists())
+ }
+ handleClose()
}
- handleClose()
- })
+ )
}
return (
@@ -154,6 +190,7 @@ const EditVariantInventoryModal = ({ onClose, product, variant }: Props) => {
void
isLoadingInventory: boolean
handleClose: () => void
@@ -178,7 +217,7 @@ const StockForm = ({
}) => {
const form = useForm({
// @ts-ignore
- defaultValues: getEditVariantDefaultValues(variantInventory),
+ defaultValues: getEditVariantDefaultValues(variantInventory, variant),
})
const {
@@ -231,34 +270,68 @@ const StockForm = ({
}
export const getEditVariantDefaultValues = (
- variantInventory?: any
+ variantInventory?: any,
+ variant?: ProductVariant
): EditFlowVariantFormType => {
const inventoryItem = variantInventory?.inventory[0]
if (!inventoryItem) {
return {
- stock: {
- sku: null,
- ean: null,
- inventory_quantity: null,
- manage_inventory: false,
- allow_backorder: false,
- barcode: null,
- upc: null,
- location_levels: null,
+ sku: null,
+ ean: variant?.ean || null,
+ barcode: variant?.barcode || null,
+ upc: variant?.upc || null,
+ inventory_quantity: null,
+ manage_inventory: false,
+ allow_backorder: false,
+ location_levels: null,
+ dimensions: {
+ height: null,
+ length: null,
+ width: null,
+ weight: null,
+ },
+ customs: {
+ origin_country: null,
+ mid_code: null,
+ hs_code: null,
},
}
}
+ let originCountry: Option | null = null
+ if (inventoryItem.origin_country) {
+ const country = countries.find(
+ (c) =>
+ c.alpha2 === inventoryItem.origin_country ||
+ c.alpha3 === inventoryItem.origin_country
+ )
+ if (country) {
+ originCountry = {
+ label: country?.name,
+ value: country?.alpha2,
+ }
+ }
+ }
+
return {
- stock: {
- sku: inventoryItem.sku,
- ean: inventoryItem.ean,
- inventory_quantity: inventoryItem.inventory_quantity,
- manage_inventory: !!inventoryItem,
- allow_backorder: inventoryItem.allow_backorder,
- barcode: inventoryItem.barcode,
- upc: inventoryItem.upc,
- location_levels: inventoryItem.location_levels,
+ sku: inventoryItem.sku,
+ ean: variant?.ean || null,
+ barcode: variant?.barcode || null,
+ upc: variant?.upc || null,
+ inventory_quantity: inventoryItem.inventory_quantity,
+ manage_inventory: !!inventoryItem,
+ allow_backorder: inventoryItem.allow_backorder,
+ location_levels: inventoryItem.location_levels,
+ dimensions: {
+ height: inventoryItem.height,
+ length: inventoryItem.length,
+ width: inventoryItem.width,
+ weight: inventoryItem.weight,
+ },
+ customs: {
+ origin_country: originCountry,
+ mid_code: inventoryItem.mid_code,
+ hs_code: inventoryItem.hs_code,
},
}
}