From 961ad4723e0d18ef47fde73ba49c5d96e4ae5e37 Mon Sep 17 00:00:00 2001 From: Oli Juhl <59018053+olivermrbl@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:13:07 +0100 Subject: [PATCH] fix(dashboard): Matching product profile with shipping profile (#11183) --- .../order-create-fulfillment-form.tsx | 2 +- packages/core/types/src/http/product/admin/entitites.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/admin/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx b/packages/admin/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx index fc69ea2610..b0967a2ec9 100644 --- a/packages/admin/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx +++ b/packages/admin/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx @@ -350,7 +350,7 @@ export function OrderCreateFulfillmentForm({ form={form} item={item} locationId={selectedLocationId} - disabled={isShippingProfileMatching} + disabled={!isShippingProfileMatching} itemReservedQuantitiesMap={ itemReservedQuantitiesMap } diff --git a/packages/core/types/src/http/product/admin/entitites.ts b/packages/core/types/src/http/product/admin/entitites.ts index c6533552ec..e578a23346 100644 --- a/packages/core/types/src/http/product/admin/entitites.ts +++ b/packages/core/types/src/http/product/admin/entitites.ts @@ -5,6 +5,7 @@ import { AdminProductCategory } from "../../product-category" import { AdminProductTag } from "../../product-tag" import { AdminProductType } from "../../product-type" import { AdminSalesChannel } from "../../sales-channel" +import { AdminShippingProfile } from "../../shipping-profile" import { BaseProduct, BaseProductImage, @@ -86,6 +87,10 @@ export interface AdminProduct * The sales channels that the product is available in. */ sales_channels?: AdminSalesChannel[] | null + /** + * The shipping profile that the product is available in. + */ + shipping_profile?: AdminShippingProfile | null /** * The product's variants. */