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(dashboard): manage offer conditions in admin and pick them in vendor (#1657)

Viktor Holikf96cb9a191e6
diff --git a/packages/admin/src/components/layout/settings-layout/settings-layout.tsx b/packages/admin/src/components/layout/settings-layout/settings-layout.tsx
index 3f0339c66..b0849a77a 100644
--- a/packages/admin/src/components/layout/settings-layout/settings-layout.tsx
+++ b/packages/admin/src/components/layout/settings-layout/settings-layout.tsx
@@ -101,6 +101,10 @@ const useSettingRoutes = (): INavItem[] => {
label: t("refundReasons.domain"),
to: "/settings/refund-reasons",
},
+ {
+ label: t("offerConditions.domain"),
+ to: "/settings/offer-conditions",
+ },
{
label: t("salesChannels.domain"),
to: "/settings/sales-channels",
diff --git a/packages/admin/src/extension-targets.d.ts b/packages/admin/src/extension-targets.d.ts
index af2051a58..bf2e98d93 100644
--- a/packages/admin/src/extension-targets.d.ts
+++ b/packages/admin/src/extension-targets.d.ts
@@ -58,6 +58,8 @@ declare module "@mercurjs/dashboard-sdk" {
"locations.list.item.before": true
"marketplace.detail.main.after": true
"marketplace.detail.main.before": true
+ "offer-conditions.list.after": true
+ "offer-conditions.list.before": true
"offer-variants.detail.main.after": true
"offer-variants.detail.main.before": true
"offer-variants.detail.side.after": true
@@ -179,6 +181,7 @@ declare module "@mercurjs/dashboard-sdk" {
"settings/commissions": true
"settings/locations": true
"settings/marketplace": true
+ "settings/offer-conditions": true
"settings/product-tags": true
"settings/product-types": true
"settings/profile": true
diff --git a/packages/admin/src/get-route-map.tsx b/packages/admin/src/get-route-map.tsx
index 65c8efa64..f5a12bce2 100644
--- a/packages/admin/src/get-route-map.tsx
+++ b/packages/admin/src/get-route-map.tsx
@@ -2380,6 +2380,40 @@ export function getRouteMap({
},
],
},
+ {
+ path: "offer-conditions",
+ element: <Outlet />,
+ handle: {
+ breadcrumb: () => t("offerConditions.domain"),
+ permissions: "offers:view",
+ },
+ children: [
+ {
+ path: "",
+ lazy: () =>
+ import("./pages/offer-conditions/offer-condition-list").then(withLoaderPermission("offers:view")),
+ children: [
+ {
+ path: "create",
+ handle: { permissions: "offers:manage" },
+ lazy: () =>
+ import("./pages/offer-conditions/offer-condition-create"),
+ },
+ {
+ path: ":id",
+ children: [
+ {
+ path: "edit",
+ handle: { permissions: "offers:manage" },
+ lazy: () =>
+ import("./pages/offer-conditions/offer-condition-edit"),
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
],
customSettingsRoutes?.[0]?.children || [],
),
diff --git a/packages/admin/src/hooks/api/index.ts b/packages/admin/src/hooks/api/index.ts
index 8a4c66053..d7f11fc2e 100644
--- a/packages/admin/src/hooks/api/index.ts
+++ b/packages/admin/src/hooks/api/index.ts
@@ -22,6 +22,7 @@ export * from "./price-lists";
export * from "./product-types";
export * from "./products";
export * from "./promotions";
+export * from "./offer-conditions";
export * from "./refund-reasons";
export * from "./regions";
export * from "./reservations";
diff --git a/packages/admin/src/hooks/api/offer-conditions.tsx b/packages/admin/src/hooks/api/offer-conditions.tsx
new file mode 100644
index 000000000..22be2c065
--- /dev/null
+++ b/packages/admin/src/hooks/api/offer-conditions.tsx
@@ -0,0 +1,140 @@
+import {
+ ClientError,
+ InferClientInput,
+ InferClientOutput,
+} from "@mercurjs/client"
+import { queryKeysFactory } from "@mercurjs/dashboard-shared"
+import {
+ QueryKey,
+ UseMutationOptions,
+ UseQueryOptions,
+ useMutation,
+ useQuery,
+} from "@tanstack/react-query"
+
+import { sdk } from "../../lib/client"
+import { queryClient } from "../../lib/query-client"
+
+const OFFER_CONDITIONS_QUERY_KEY = "offer_conditions" as const
+export const offerConditionsQueryKeys = queryKeysFactory(
+ OFFER_CONDITIONS_QUERY_KEY
+)
+
+export const useOfferConditions = (
+ query?: InferClientInput<typeof sdk.admin.offerConditions.query>,
+ options?: Omit<
+ UseQueryOptions<
+ InferClientOutput<typeof sdk.admin.offerConditions.query>,
+ ClientError,
+ InferClientOutput<typeof sdk.admin.offerConditions.query>,
+ QueryKey
+ >,
+ "queryFn" | "queryKey"
+ >
+) => {
+ const { data, ...rest } = useQuery({
+ queryFn: () => sdk.admin.offerConditions.query({ ...query }),
+ queryKey: offerConditionsQueryKeys.list(query),
+ ...options,
+ })
+
+ return { ...data, ...rest }
+}
+
+export const useOfferCondition = (
+ id: string,
+ query?: Omit<
+ InferClientInput<typeof sdk.admin.offerConditions.$id.query>,
+ "$id"
+ >,
+ options?: Omit<
+ UseQueryOptions<
+ InferClientOutput<typeof sdk.admin.offerConditions.$id.query>,
+ ClientError,
+ InferClientOutput<typeof sdk.admin.offerConditions.$id.query>,
+ QueryKey
+ >,
+ "queryFn" | "queryKey"
+ >
+) => {
+ const { data, ...rest } = useQuery({
+ queryFn: () =>
+ sdk.admin.offerConditions.$id.query({ $id: id, ...query }),
+ queryKey: offerConditionsQueryKeys.detail(id),
+ ...options,
+ })
+
+ return { ...data, ...rest }
+}
+
+export const useCreateOfferCondition = (
+ options?: UseMutationOptions<
+ InferClientOutput<typeof sdk.admin.offerConditions.mutate>,
+ ClientError,
+ InferClientInput<typeof sdk.admin.offerConditions.mutate>
+ >
+) => {
+ return useMutation({
+ mutationFn: (payload) => sdk.admin.offerConditions.mutate(payload),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({
+ queryKey: offerConditionsQueryKeys.lists(),
+ })
+
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
+
+export const useUpdateOfferCondition = (
+ id: string,
+ options?: UseMutationOptions<
+ InferClientOutput<typeof sdk.admin.offerConditions.$id.mutate>,
+ ClientError,
+ Omit<
+ InferClientInput<typeof sdk.admin.offerConditions.$id.mutate>,
+ "$id"
+ >
+ >
+) => {
+ return useMutation({
+ mutationFn: (payload) =>
+ sdk.admin.offerConditions.$id.mutate({ $id: id, ...payload }),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({
+ queryKey: offerConditionsQueryKeys.lists(),
+ })
+ queryClient.invalidateQueries({
+ queryKey: offerConditionsQueryKeys.detail(id),
+ })
+
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
+
+export const useDeleteOfferConditionLazy = (
+ options?: UseMutationOptions<
+ InferClientOutput<typeof sdk.admin.offerConditions.$id.delete>,
+ ClientError,
+ string
+ >
+) => {
+ return useMutation({
+ mutationFn: (id: string) =>
+ sdk.admin.offerConditions.$id.delete({ $id: id }),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({
+ queryKey: offerConditionsQueryKeys.lists(),
+ })
+ queryClient.invalidateQueries({
+ queryKey: offerConditionsQueryKeys.details(),
+ })
+
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
diff --git a/packages/admin/src/hooks/table/columns/index.ts b/packages/admin/src/hooks/table/columns/index.ts
index a03165b27..7234f480a 100644
--- a/packages/admin/src/hooks/table/columns/index.ts
+++ b/packages/admin/src/hooks/table/columns/index.ts
@@ -2,6 +2,7 @@ export * from "./use-campaign-table-columns"
export * from "./use-collection-table-columns"
export * from "./use-customer-group-table-columns"
export * from "./use-customer-table-columns"
+export * from "./use-offer-condition-table-columns"
export * from "./use-order-table-columns"
export * from "./use-product-table-columns"
export * from "./use-product-tag-table-columns"
diff --git a/packages/admin/src/hooks/table/columns/use-offer-condition-table-columns.tsx b/packages/admin/src/hooks/table/columns/use-offer-condition-table-columns.tsx
new file mode 100644
index 000000000..bdb212527
--- /dev/null
+++ b/packages/admin/src/hooks/table/columns/use-offer-condition-table-columns.tsx
@@ -0,0 +1,55 @@
+import { useMemo } from "react"
+
+import { createDataTableColumnHelper, DataTableColumnDef } from "@medusajs/ui"
+import { HttpTypes } from "@mercurjs/types"
+import { useTranslation } from "react-i18next"
+
+import { DataTableStatusCell } from "../../../components/data-table/components/data-table-status-cell/data-table-status-cell"
+
+type OfferCondition = HttpTypes.AdminOfferConditionResponse["offer_condition"]
+
+const columnHelper = createDataTableColumnHelper<OfferCondition>()
+
+export const useOfferConditionTableColumns = (): DataTableColumnDef<
+ OfferCondition
+>[] => {
+ const { t } = useTranslation()
+
+ return useMemo(
+ () => [
+ columnHelper.accessor("label", {
+ header: () => t("fields.label"),
+ enableSorting: true,
+ sortLabel: t("fields.label"),
+ sortAscLabel: t("filters.sorting.alphabeticallyAsc"),
+ sortDescLabel: t("filters.sorting.alphabeticallyDesc"),
+ }),
+ columnHelper.accessor("code", {
+ header: () => t("fields.code"),
+ enableSorting: true,
+ sortLabel: t("fields.code"),
+ sortAscLabel: t("filters.sorting.alphabeticallyAsc"),
+ sortDescLabel: t("filters.sorting.alphabeticallyDesc"),
+ }),
+ columnHelper.accessor("rank", {
+ header: () => t("offerConditions.fields.rank.label"),
+ enableSorting: true,
+ sortLabel: t("offerConditions.fields.rank.label"),
+ sortAscLabel: t("general.ascending"),
+ sortDescLabel: t("general.descending"),
+ }),
+ columnHelper.accessor("is_active", {
+ header: () => t("fields.status"),
+ cell: ({ getValue }) => {
+ const value = getValue()
+ return (
+ <DataTableStatusCell color={value ? "green" : "grey"}>
+ {value ? t("general.enabled") : t("general.disabled")}
+ </DataTableStatusCell>
+ )
+ },
+ }),
+ ],
+ [t]
+ )
+}
diff --git a/packages/admin/src/hooks/table/query/index.ts b/packages/admin/src/hooks/table/query/index.ts
index 1c5618993..e6bb9a041 100644
--- a/packages/admin/src/hooks/table/query/index.ts
+++ b/packages/admin/src/hooks/table/query/index.ts
@@ -2,6 +2,7 @@ export * from "./use-campaign-table-query";
export * from "./use-collection-table-query";
export * from "./use-customer-group-table-query";
export * from "./use-customer-table-query";
+export * from "./use-offer-condition-table-query";
export * from "./use-order-table-query";
export * from "./use-product-table-query";
export * from "./use-product-tag-table-query";
diff --git a/packages/admin/src/hooks/table/query/use-offer-condition-table-query.tsx b/packages/admin/src/hooks/table/query/use-offer-condition-table-query.tsx
new file mode 100644
index 000000000..03db25787
--- /dev/null
+++ b/packages/admin/src/hooks/table/query/use-offer-condition-table-query.tsx
@@ -0,0 +1,30 @@
+import { InferClientInput } from "@mercurjs/client"
+
+import { sdk } from "../../../lib/client"
+import { useQueryParams } from "../../use-query-params"
+
+type UseOfferConditionTableQueryProps = {
+ prefix?: string
+ pageSize?: number
+}
+
+export const useOfferConditionTableQuery = ({
+ prefix,
+ pageSize = 20,
+}: UseOfferConditionTableQueryProps) => {
+ const queryObject = useQueryParams(["offset", "q", "order"], prefix)
+
+ const { offset, q, order } = queryObject
+ const searchParams: InferClientInput<typeof sdk.admin.offerConditions.query> =
+ {
+ limit: pageSize,
+ offset: offset ? Number(offset) : 0,
+ ...(order ? { order } : {}),
+ ...(q ? { q } : {}),
+ }
+
+ return {
+ searchParams,
+ raw: queryObject,
+ }
+}
diff --git a/packages/admin/src/i18n/translations/$schema.json b/packages/admin/src/i18n/translations/$schema.json
index cd7ee4ff5..1c3f8146c 100644
--- a/packages/admin/src/i18n/translations/$schema.json
+++ b/packages/admin/src/i18n/translations/$schema.json
@@ -13485,6 +13485,141 @@
],
"additionalProperties": false
},
+ "offerConditions": {
+ "type": "object",
+ "properties": {
+ "domain": {
+ "type": "string"
+ },
+ "subtitle": {
+ "type": "string"
+ },
+ "enabledHint": {
+ "type": "string"
+ },
+ "create": {
+ "type": "object",
+ "properties": {
+ "header": {
+ "type": "string"
+ },
+ "subtitle": {
+ "type": "string"
+ },
+ "successToast": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "header",
+ "subtitle",
+ "successToast"
+ ],
+ "additionalProperties": false
+ },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": {
+ "type": "string"
+ },
+ "subtitle": {
+ "type": "string"
+ },
+ "successToast": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "header",
+ "subtitle",
+ "successToast"
+ ],
+ "additionalProperties": false
+ },
+ "delete": {
+ "type": "object",
+ "properties": {
+ "confirmation": {
+ "type": "string"
+ },
+ "successToast": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "confirmation",
+ "successToast"
+ ],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "label": {
+ "type": "object",
+ "properties": {
+ "placeholder": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "placeholder"
+ ],
+ "additionalProperties": false
+ },
+ "code": {
+ "type": "object",
+ "properties": {
+ "placeholder": {
+ "type": "string"
+ },
+ "hint": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "placeholder",
+ "hint"
+ ],
+ "additionalProperties": false
+ },
+ "rank": {
+ "type": "object",
+ "properties": {
+ "label": {
+ "type": "string"
+ },
+ "hint": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "label",
+ "hint"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "required": [
+ "label",
+ "code",
+ "rank"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "required": [
+ "domain",
+ "subtitle",
+ "enabledHint",
+ "create",
+ "edit",
+ "delete",
+ "fields"
+ ],
+ "additionalProperties": false
+ },
"refundReasons": {
"type": "object",
"properties": {
@@ -16752,6 +16887,7 @@
"salesChannels",
"apiKeyManagement",
"returnReasons",
+ "offerConditions",
"refundReasons",
"login",
"invite",
diff --git a/packages/admin/src/i18n/translations/en.json b/packages/admin/src/i18n/translations/en.json
index 7c756063b..9b7eb795b 100644
--- a/packages/admin/src/i18n/translations/en.json
+++ b/packages/admin/src/i18n/translations/en.json
@@ -3568,6 +3568,38 @@
}
}
},
+ "offerConditions": {
+ "domain": "Offer Conditions",
+ "subtitle": "Manage the conditions sellers can list their offers under.",
+ "enabledHint": "Sellers can only list new offers under enabled conditions. Existing offers keep their condition.",
+ "create": {
+ "header": "Create Offer Condition",
+ "subtitle": "Define a condition sellers can list their offers under, e.g. new or refurbished.",
+ "successToast": "Offer condition {{label}} was successfully created."
+ },
+ "edit": {
+ "header": "Edit Offer Condition",
+ "subtitle": "Edit the offer condition details.",
+ "successToast": "Offer condition {{label}} was successfully updated."
+ },
+ "delete": {
+ "confirmation": "You are about to delete the offer condition \"{{label}}\". This action cannot be undone.",
+ "successToast": "Offer condition was successfully deleted."
+ },
+ "fields": {
+ "label": {
+ "placeholder": "Refurbished"
+ },
+ "code": {
+ "placeholder": "refurbished",
+ "hint": "Sellers and integrations reference the condition by this code."
+ },
+ "rank": {
+ "label": "Rank",
+ "hint": "Conditions with a lower rank are listed first."
+ }
+ }
+ },
"refundReasons": {
"domain": "Refund Reasons",
"subtitle": "Manage reasons for issuing refunds.",
diff --git a/packages/admin/src/lib/permissions/route-permissions.ts b/packages/admin/src/lib/permissions/route-permissions.ts
index 4a4081669..b90f28e9c 100644
--- a/packages/admin/src/lib/permissions/route-permissions.ts
+++ b/packages/admin/src/lib/permissions/route-permissions.ts
@@ -41,6 +41,7 @@ export const ROUTE_PERMISSIONS: Record<string, Permission | Permission[]> = {
"/settings/shipping-option-types": "shipping_options:view",
"/settings/return-reasons": "return_reasons:view",
"/settings/refund-reasons": "refund_reasons:view",
+ "/settings/offer-conditions": "offers:view",
"/settings/tax-regions": "tax_regions:view",
"/settings/publishable-api-keys": "api_keys:view",
"/settings/secret-api-keys": "api_keys:view",
diff --git a/packages/admin/src/pages/index.ts b/packages/admin/src/pages/index.ts
index 7c4b429a6..dbe9c6c82 100644
--- a/packages/admin/src/pages/index.ts
+++ b/packages/admin/src/pages/index.ts
@@ -9,6 +9,7 @@ export * from "./customers"
export * from "./inventory"
export * from "./locations"
export * from "./marketplace"
+export * from "./offer-conditions"
export * from "./orders"
export * from "./payouts"
export * from "./price-lists"
diff --git a/packages/admin/src/pages/offer-conditions/index.ts b/packages/admin/src/pages/offer-conditions/index.ts
new file mode 100644
index 000000000..943b2df91
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/index.ts
@@ -0,0 +1 @@
+export { OfferConditionList } from "./offer-condition-list/offer-condition-list"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-create/components/offer-condition-create-form/index.ts b/packages/admin/src/pages/offer-conditions/offer-condition-create/components/offer-condition-create-form/index.ts
new file mode 100644
index 000000000..6f60e4101
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-create/components/offer-condition-create-form/index.ts
@@ -0,0 +1 @@
+export { OfferConditionCreateForm } from "./offer-condition-create-form"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-create/components/offer-condition-create-form/offer-condition-create-form.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-create/components/offer-condition-create-form/offer-condition-create-form.tsx
new file mode 100644
index 000000000..5be1c093d
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-create/components/offer-condition-create-form/offer-condition-create-form.tsx
@@ -0,0 +1,219 @@
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Button, Heading, Input, Switch, Text, toast } from "@medusajs/ui"
+import {
+ Form,
+ KeyboundForm,
+ RouteFocusModal,
+ useRouteModal,
+} from "@mercurjs/dashboard-shared"
+import { useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import { z } from "zod"
+
+import { useCreateOfferCondition } from "../../../../../hooks/api"
+
+const OfferConditionCreateSchema = z.object({
+ label: z.string().min(1),
+ code: z.string().min(1),
+ rank: z.number().int().min(0).optional(),
+ is_active: z.boolean(),
+})
+
+const generateCodeFromLabel = (label: string) =>
+ label
+ .toLowerCase()
+ .replace(/[^a-z0-9]/g, "_")
+ .replace(/_+/g, "_")
+ .replace(/^_|_$/g, "")
+
+export const OfferConditionCreateForm = () => {
+ const { t } = useTranslation()
+ const { handleSuccess } = useRouteModal()
+
+ const form = useForm<z.infer<typeof OfferConditionCreateSchema>>({
+ defaultValues: {
+ label: "",
+ code: "",
+ rank: 0,
+ is_active: true,
+ },
+ resolver: zodResolver(OfferConditionCreateSchema),
+ })
+
+ const { mutateAsync, isPending } = useCreateOfferCondition()
+
+ const handleSubmit = form.handleSubmit(async (data) => {
+ await mutateAsync(data, {
+ onSuccess: ({ offer_condition }) => {
+ toast.success(
+ t("offerConditions.create.successToast", {
+ label: offer_condition.label,
+ })
+ )
+ handleSuccess("../")
+ },
+ onError: (error) => {
+ toast.error(error.message)
+ },
+ })
+ })
+
+ return (
+ <RouteFocusModal.Form form={form} data-testid="offer-condition-create-form">
+ <KeyboundForm
+ className="flex size-full flex-col overflow-hidden"
+ onSubmit={handleSubmit}
+ >
+ <RouteFocusModal.Header data-testid="offer-condition-create-form-header" />
+ <RouteFocusModal.Body
+ className="flex flex-1 justify-center overflow-auto px-6 py-16"
+ data-testid="offer-condition-create-form-body"
+ >
+ <div className="flex w-full max-w-[720px] flex-col gap-y-8">
+ <div className="flex flex-col gap-y-1">
+ <RouteFocusModal.Title asChild>
+ <Heading data-testid="offer-condition-create-form-heading">
+ {t("offerConditions.create.header")}
+ </Heading>
+ </RouteFocusModal.Title>
+ <RouteFocusModal.Description asChild>
+ <Text
+ size="small"
+ className="text-ui-fg-subtle"
+ data-testid="offer-condition-create-form-subtitle"
+ >
+ {t("offerConditions.create.subtitle")}
+ </Text>
+ </RouteFocusModal.Description>
+ </div>
+ <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+ <Form.Field
+ control={form.control}
+ name="label"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label>{t("fields.label")}</Form.Label>
+ <Form.Control>
+ <Input
+ {...field}
+ placeholder={t(
+ "offerConditions.fields.label.placeholder"
+ )}
+ data-testid="offer-condition-create-form-label-input"
+ onChange={(e) => {
+ if (
+ !form.getFieldState("code").isTouched ||
+ !form.getValues("code")
+ ) {
+ form.setValue(
+ "code",
+ generateCodeFromLabel(e.target.value)
+ )
+ }
+ field.onChange(e)
+ }}
+ />
+ </Form.Control>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="code"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label>{t("fields.code")}</Form.Label>
+ <Form.Control>
+ <Input
+ {...field}
+ placeholder={t(
+ "offerConditions.fields.code.placeholder"
+ )}
+ data-testid="offer-condition-create-form-code-input"
+ />
+ </Form.Control>
+ <Form.Hint>{t("offerConditions.fields.code.hint")}</Form.Hint>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="rank"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label optional>
+ {t("offerConditions.fields.rank.label")}
+ </Form.Label>
+ <Form.Control>
+ <Input
+ {...field}
+ type="number"
+ min={0}
+ value={field.value ?? ""}
+ onChange={(e) =>
+ field.onChange(
+ e.target.value === "" ? undefined : Number(e.target.value)
+ )
+ }
+ data-testid="offer-condition-create-form-rank-input"
+ />
+ </Form.Control>
+ <Form.Hint>{t("offerConditions.fields.rank.hint")}</Form.Hint>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ </div>
+ <Form.Field
+ control={form.control}
+ name="is_active"
+ render={({ field: { onChange, value, ...field } }) => (
+ <Form.Item>
+ <div className="flex items-center justify-between">
+ <Form.Label>{t("general.enabled")}</Form.Label>
+ <Form.Control>
+ <Switch
+ dir="ltr"
+ className="rtl:rotate-180"
+ onCheckedChange={onChange}
+ checked={value}
+ {...field}
+ data-testid="offer-condition-create-form-enabled-switch"
+ />
+ </Form.Control>
+ </div>
+ <Form.Hint>{t("offerConditions.enabledHint")}</Form.Hint>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ </div>
+ </RouteFocusModal.Body>
+ <RouteFocusModal.Footer data-testid="offer-condition-create-form-footer">
+ <div className="flex items-center justify-end gap-2">
+ <RouteFocusModal.Close asChild>
+ <Button
+ size="small"
+ variant="secondary"
+ type="button"
+ data-testid="offer-condition-create-form-cancel-button"
+ >
+ {t("actions.cancel")}
+ </Button>
+ </RouteFocusModal.Close>
+ <Button
+ size="small"
+ type="submit"
+ isLoading={isPending}
+ data-testid="offer-condition-create-form-save-button"
+ >
+ {t("actions.save")}
+ </Button>
+ </div>
+ </RouteFocusModal.Footer>
+ </KeyboundForm>
+ </RouteFocusModal.Form>
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-create/index.ts b/packages/admin/src/pages/offer-conditions/offer-condition-create/index.ts
new file mode 100644
index 000000000..2a53ae873
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-create/index.ts
@@ -0,0 +1 @@
+export { OfferConditionCreate as Component } from "./offer-condition-create"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-create/offer-condition-create.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-create/offer-condition-create.tsx
new file mode 100644
index 000000000..281b504e4
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-create/offer-condition-create.tsx
@@ -0,0 +1,11 @@
+import { RouteFocusModal } from "@mercurjs/dashboard-shared"
+
+import { OfferConditionCreateForm } from "./components/offer-condition-create-form"
+
+export const OfferConditionCreate = () => {
+ return (
+ <RouteFocusModal data-testid="offer-condition-create-modal">
+ <OfferConditionCreateForm />
+ </RouteFocusModal>
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-edit/components/offer-condition-edit-form/index.ts b/packages/admin/src/pages/offer-conditions/offer-condition-edit/components/offer-condition-edit-form/index.ts
new file mode 100644
index 000000000..f15a84a37
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-edit/components/offer-condition-edit-form/index.ts
@@ -0,0 +1 @@
+export { OfferConditionEditForm } from "./offer-condition-edit-form"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-edit/components/offer-condition-edit-form/offer-condition-edit-form.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-edit/components/offer-condition-edit-form/offer-condition-edit-form.tsx
new file mode 100644
index 000000000..831895680
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-edit/components/offer-condition-edit-form/offer-condition-edit-form.tsx
@@ -0,0 +1,179 @@
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Button, Input, Switch, toast } from "@medusajs/ui"
+import {
+ Form,
+ KeyboundForm,
+ RouteDrawer,
+ useRouteModal,
+} from "@mercurjs/dashboard-shared"
+import { HttpTypes } from "@mercurjs/types"
+import { useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import { z } from "zod"
+
+import { useUpdateOfferCondition } from "../../../../../hooks/api"
+
+type OfferConditionEditFormProps = {
+ offerCondition: HttpTypes.AdminOfferConditionResponse["offer_condition"]
+}
+
+const OfferConditionEditSchema = z.object({
+ label: z.string().min(1),
+ code: z.string().min(1),
+ rank: z.number().int().min(0).optional(),
+ is_active: z.boolean(),
+})
+
+export const OfferConditionEditForm = ({
+ offerCondition,
+}: OfferConditionEditFormProps) => {
+ const { t } = useTranslation()
+ const { handleSuccess } = useRouteModal()
+
+ const form = useForm<z.infer<typeof OfferConditionEditSchema>>({
+ defaultValues: {
+ label: offerCondition.label,
+ code: offerCondition.code,
+ rank: offerCondition.rank,
+ is_active: offerCondition.is_active,
+ },
+ resolver: zodResolver(OfferConditionEditSchema),
+ })
+
+ const { mutateAsync, isPending } = useUpdateOfferCondition(offerCondition.id)
+
+ const handleSubmit = form.handleSubmit(async (data) => {
+ await mutateAsync(data, {
+ onSuccess: ({ offer_condition }) => {
+ toast.success(
+ t("offerConditions.edit.successToast", {
+ label: offer_condition.label,
+ })
+ )
+ handleSuccess()
+ },
+ onError: (error) => {
+ toast.error(error.message)
+ },
+ })
+ })
+
+ return (
+ <RouteDrawer.Form form={form} data-testid="offer-condition-edit-form">
+ <KeyboundForm
+ className="flex size-full flex-col overflow-hidden"
+ onSubmit={handleSubmit}
+ >
+ <RouteDrawer.Body className="flex flex-1 flex-col gap-y-4 overflow-auto">
+ <Form.Field
+ control={form.control}
+ name="label"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label>{t("fields.label")}</Form.Label>
+ <Form.Control>
+ <Input
+ {...field}
+ placeholder={t("offerConditions.fields.label.placeholder")}
+ data-testid="offer-condition-edit-form-label-input"
+ />
+ </Form.Control>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="code"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label>{t("fields.code")}</Form.Label>
+ <Form.Control>
+ <Input
+ {...field}
+ placeholder={t("offerConditions.fields.code.placeholder")}
+ data-testid="offer-condition-edit-form-code-input"
+ />
+ </Form.Control>
+ <Form.Hint>{t("offerConditions.fields.code.hint")}</Form.Hint>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="rank"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label optional>
+ {t("offerConditions.fields.rank.label")}
+ </Form.Label>
+ <Form.Control>
+ <Input
+ {...field}
+ type="number"
+ min={0}
+ value={field.value ?? ""}
+ onChange={(e) =>
+ field.onChange(
+ e.target.value === "" ? undefined : Number(e.target.value)
+ )
+ }
+ data-testid="offer-condition-edit-form-rank-input"
+ />
+ </Form.Control>
+ <Form.Hint>{t("offerConditions.fields.rank.hint")}</Form.Hint>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="is_active"
+ render={({ field: { onChange, value, ...field } }) => (
+ <Form.Item>
+ <div className="flex items-center justify-between">
+ <Form.Label>{t("general.enabled")}</Form.Label>
+ <Form.Control>
+ <Switch
+ dir="ltr"
+ className="rtl:rotate-180"
+ onCheckedChange={onChange}
+ checked={value}
+ {...field}
+ data-testid="offer-condition-edit-form-enabled-switch"
+ />
+ </Form.Control>
+ </div>
+ <Form.Hint>{t("offerConditions.enabledHint")}</Form.Hint>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ </RouteDrawer.Body>
+ <RouteDrawer.Footer data-testid="offer-condition-edit-form-footer">
+ <div className="flex items-center justify-end gap-x-2">
+ <RouteDrawer.Close asChild>
+ <Button
+ variant="secondary"
+ size="small"
+ type="button"
+ data-testid="offer-condition-edit-form-cancel-button"
+ >
+ {t("actions.cancel")}
+ </Button>
+ </RouteDrawer.Close>
+ <Button
+ size="small"
+ type="submit"
+ isLoading={isPending}
+ data-testid="offer-condition-edit-form-save-button"
+ >
+ {t("actions.save")}
+ </Button>
+ </div>
+ </RouteDrawer.Footer>
+ </KeyboundForm>
+ </RouteDrawer.Form>
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-edit/index.ts b/packages/admin/src/pages/offer-conditions/offer-condition-edit/index.ts
new file mode 100644
index 000000000..042df228e
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-edit/index.ts
@@ -0,0 +1 @@
+export { OfferConditionEdit as Component } from "./offer-condition-edit"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-edit/offer-condition-edit.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-edit/offer-condition-edit.tsx
new file mode 100644
index 000000000..73b35ee94
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-edit/offer-condition-edit.tsx
@@ -0,0 +1,36 @@
+import { Heading } from "@medusajs/ui"
+import { RouteDrawer } from "@mercurjs/dashboard-shared"
+import { useTranslation } from "react-i18next"
+import { useParams } from "react-router-dom"
+
+import { useOfferCondition } from "../../../hooks/api/offer-conditions"
+import { OfferConditionEditForm } from "./components/offer-condition-edit-form"
+
+export const OfferConditionEdit = () => {
+ const { id } = useParams()
+ const { t } = useTranslation()
+
+ const { offer_condition, isPending, isError, error } = useOfferCondition(id!)
+
+ const ready = !isPending && !!offer_condition
+
+ if (isError) {
+ throw error
+ }
+
+ return (
+ <RouteDrawer data-testid="offer-condition-edit-drawer">
+ <RouteDrawer.Header data-testid="offer-condition-edit-drawer-header">
+ <RouteDrawer.Title asChild>
+ <Heading data-testid="offer-condition-edit-drawer-heading">
+ {t("offerConditions.edit.header")}
+ </Heading>
+ </RouteDrawer.Title>
+ <RouteDrawer.Description className="sr-only">
+ {t("offerConditions.edit.subtitle")}
+ </RouteDrawer.Description>
+ </RouteDrawer.Header>
+ {ready && <OfferConditionEditForm offerCondition={offer_condition} />}
+ </RouteDrawer>
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/index.ts b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/index.ts
new file mode 100644
index 000000000..ee5a802a4
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/index.ts
@@ -0,0 +1 @@
+export * from "./offer-condition-list-table"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-data-table.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-data-table.tsx
new file mode 100644
index 000000000..9949eac89
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-data-table.tsx
@@ -0,0 +1,145 @@
+import { useCallback, useMemo } from "react"
+
+import { PencilSquare, Trash } from "@medusajs/icons"
+import {
+ Container,
+ createDataTableColumnHelper,
+ toast,
+ usePrompt,
+} from "@medusajs/ui"
+import { DataTable, usePermissions } from "@mercurjs/dashboard-shared"
+import { HttpTypes } from "@mercurjs/types"
+import { keepPreviousData } from "@tanstack/react-query"
+import { useTranslation } from "react-i18next"
+import { useNavigate } from "react-router-dom"
+
+import {
+ useDeleteOfferConditionLazy,
+ useOfferConditions,
+} from "../../../../../hooks/api"
+import { useOfferConditionTableColumns } from "../../../../../hooks/table/columns"
+import { useOfferConditionTableQuery } from "../../../../../hooks/table/query"
+
+type OfferCondition = HttpTypes.AdminOfferConditionResponse["offer_condition"]
+
+const PAGE_SIZE = 20
+
+export const OfferConditionListDataTable = () => {
+ const { t } = useTranslation()
+ const { searchParams } = useOfferConditionTableQuery({
+ pageSize: PAGE_SIZE,
+ })
+
+ const { offer_conditions, count, isLoading, isError, error } =
+ useOfferConditions(searchParams, {
+ placeholderData: keepPreviousData,
+ })
+
+ const columns = useColumns()
+
+ if (isError) {
+ throw error
+ }
+
+ return (
+ <Container className="divide-y px-0 py-0">
+ <DataTable
+ data={offer_conditions}
+ columns={columns}
+ rowCount={count}
+ pageSize={PAGE_SIZE}
+ getRowId={(row) => row.id}
+ heading={t("offerConditions.domain")}
+ subHeading={t("offerConditions.subtitle")}
+ emptyState={{
+ empty: {
+ heading: t("general.noRecordsMessage"),
+ },
+ filtered: {
+ heading: t("general.noRecordsMessage"),
+ description: t("general.noRecordsMessageFiltered"),
+ },
+ }}
+ actions={[
+ {
+ permission: "offers:manage",
+ label: t("actions.create"),
+ to: "create",
+ },
+ ]}
+ isLoading={isLoading}
+ enableSearch={true}
+ />
+ </Container>
+ )
+}
+
+const columnHelper = createDataTableColumnHelper<OfferCondition>()
+
+const useColumns = () => {
+ const { t } = useTranslation()
+ const { can } = usePermissions()
+ const prompt = usePrompt()
+ const navigate = useNavigate()
+ const base = useOfferConditionTableColumns()
+
+ const { mutateAsync } = useDeleteOfferConditionLazy()
+
+ const handleDelete = useCallback(
+ async (offerCondition: OfferCondition) => {
+ const confirm = await prompt({
+ title: t("general.areYouSure"),
+ description: t("offerConditions.delete.confirmation", {
+ label: offerCondition.label,
+ }),
+ confirmText: t("actions.delete"),
+ cancelText: t("actions.cancel"),
+ })
+
+ if (!confirm) {
+ return
+ }
+
+ await mutateAsync(offerCondition.id, {
+ onSuccess: () => {
+ toast.success(t("offerConditions.delete.successToast"))
+ },
+ onError: (e) => {
+ toast.error(e.message)
+ },
+ })
+ },
+ [t, prompt, mutateAsync]
+ )
+
+ return useMemo(
+ () => [
+ ...base,
+ columnHelper.action({
+ actions: (ctx) =>
+ !can("offers", "manage")
+ ? []
+ : [
+ [
+ {
+ icon: <PencilSquare />,
+ label: t("actions.edit"),
+ onClick: () =>
+ navigate(
+ `/settings/offer-conditions/${ctx.row.original.id}/edit`
+ ),
+ },
+ ],
+ [
+ {
+ icon: <Trash />,
+ label: t("actions.delete"),
+ onClick: () => handleDelete(ctx.row.original),
+ },
+ ],
+ ],
+ }),
+ ],
+ [base, handleDelete, navigate, t, can]
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-header.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-header.tsx
new file mode 100644
index 000000000..0da8460b1
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-header.tsx
@@ -0,0 +1,45 @@
+import { Children, ReactNode } from "react"
+
+import { Heading, Text } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+
+export const OfferConditionListTitle = () => {
+ const { t } = useTranslation()
+ return (
+ <div>
+ <Heading>{t("offerConditions.domain")}</Heading>
+ <Text className="text-ui-fg-subtle" size="small">
+ {t("offerConditions.subtitle")}
+ </Text>
+ </div>
+ )
+}
+
+export const OfferConditionListActions = ({
+ children,
+}: {
+ children?: ReactNode
+}) => {
+ return (
+ <div className="flex items-center justify-center gap-x-2">{children}</div>
+ )
+}
+
+export const OfferConditionListHeader = ({
+ children,
+}: {
+ children?: ReactNode
+}) => {
+ return (
+ <div className="flex items-center justify-between px-6 py-4">
+ {Children.count(children) > 0 ? (
+ children
+ ) : (
+ <>
+ <OfferConditionListTitle />
+ <OfferConditionListActions />
+ </>
+ )}
+ </div>
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-table.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-table.tsx
new file mode 100644
index 000000000..aaa2f642a
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/components/offer-condition-list-table/offer-condition-list-table.tsx
@@ -0,0 +1,22 @@
+import { Children, ReactNode } from "react"
+
+import { OfferConditionListDataTable } from "./offer-condition-list-data-table"
+
+export { OfferConditionListDataTable } from "./offer-condition-list-data-table"
+export {
+ OfferConditionListActions,
+ OfferConditionListHeader,
+ OfferConditionListTitle,
+} from "./offer-condition-list-header"
+
+export const OfferConditionListTable = ({
+ children,
+}: {
+ children?: ReactNode
+}) => {
+ return Children.count(children) > 0 ? (
+ <>{children}</>
+ ) : (
+ <OfferConditionListDataTable />
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/index.ts b/packages/admin/src/pages/offer-conditions/offer-condition-list/index.ts
new file mode 100644
index 000000000..940dc026a
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/index.ts
@@ -0,0 +1,2 @@
+export { offerConditionListLoader as loader } from "./loader"
+export { OfferConditionList as Component } from "./offer-condition-list"
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/loader.ts b/packages/admin/src/pages/offer-conditions/offer-condition-list/loader.ts
new file mode 100644
index 000000000..19c5c29f2
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/loader.ts
@@ -0,0 +1,16 @@
+import { offerConditionsQueryKeys } from "../../../hooks/api"
+import { sdk } from "../../../lib/client"
+import { queryClient } from "../../../lib/query-client"
+
+const offerConditionListQuery = () => ({
+ queryKey: offerConditionsQueryKeys.list(),
+ queryFn: async () => sdk.admin.offerConditions.query({}),
+})
+
+export const offerConditionListLoader = async () => {
+ const query = offerConditionListQuery()
+ return (
+ queryClient.getQueryData(query.queryKey) ??
+ (await queryClient.fetchQuery(query))
+ )
+}
diff --git a/packages/admin/src/pages/offer-conditions/offer-condition-list/offer-condition-list.tsx b/packages/admin/src/pages/offer-conditions/offer-condition-list/offer-condition-list.tsx
new file mode 100644
index 000000000..ec8819584
--- /dev/null
+++ b/packages/admin/src/pages/offer-conditions/offer-condition-list/offer-condition-list.tsx
@@ -0,0 +1,29 @@
+import { Children, ReactNode } from "react"
+
+import { SingleColumnPage, WidgetZone } from "@mercurjs/dashboard-shared"
+
+import {
+ OfferConditionListActions,
+ OfferConditionListDataTable,
+ OfferConditionListHeader,
+ OfferConditionListTable,
+ OfferConditionListTitle,
+} from "./components/offer-condition-list-table"
+
+const Root = ({ children }: { children?: ReactNode }) => {
+ return (
+ <SingleColumnPage showMetadata={false} showJSON={false} hasOutlet>
+ <WidgetZone id="offer-conditions.list">
+ {Children.count(children) > 0 ? children : <OfferConditionListTable />}
+ </WidgetZone>
+ </SingleColumnPage>
+ )
+}
+
+export const OfferConditionList = Object.assign(Root, {
+ Table: OfferConditionListTable,
+ Header: OfferConditionListHeader,
+ HeaderTitle: OfferConditionListTitle,
+ HeaderActions: OfferConditionListActions,
+ DataTable: OfferConditionListDataTable,
+})
diff --git a/packages/vendor/src/hooks/api/index.ts b/packages/vendor/src/hooks/api/index.ts
index 79b1f9795..41a4e3878 100644
--- a/packages/vendor/src/hooks/api/index.ts
+++ b/packages/vendor/src/hooks/api/index.ts
@@ -11,6 +11,7 @@ export * from "./fulfillment-providers"
export * from "./fulfillment-sets"
export * from "./inventory"
export * from "./invites"
+export * from "./offer-conditions"
export * from "./offers"
export * from "./orders"
export * from "./payments"
diff --git a/packages/vendor/src/hooks/api/offer-conditions.tsx b/packages/vendor/src/hooks/api/offer-conditions.tsx
new file mode 100644
index 000000000..58374b46f
--- /dev/null
+++ b/packages/vendor/src/hooks/api/offer-conditions.tsx
@@ -0,0 +1,30 @@
+import { ClientError, InferClientInput, InferClientOutput } from "@mercurjs/client"
+import { useQuery, UseQueryOptions } from "@tanstack/react-query"
+
+import { sdk } from "../../lib/client"
+import { queryKeysFactory } from "../../lib/query-key-factory"
+
+const OFFER_CONDITIONS_QUERY_KEY = "offer_conditions" as const
+export const offerConditionsQueryKeys = queryKeysFactory(
+ OFFER_CONDITIONS_QUERY_KEY
+)
+
+export const useOfferConditions = (
+ query?: InferClientInput<typeof sdk.vendor.offerConditions.query>,
+ options?: Omit<
+ UseQueryOptions<
+ unknown,
+ ClientError,
+ InferClientOutput<typeof sdk.vendor.offerConditions.query>
+ >,
+ "queryKey" | "queryFn"
+ >
+) => {
+ const { data, ...rest } = useQuery({
+ queryFn: () => sdk.vendor.offerConditions.query({ ...query }),
+ queryKey: offerConditionsQueryKeys.list(query),
+ ...options,
+ })
+
+ return { ...data, ...rest }
+}
diff --git a/packages/vendor/src/i18n/translations/$schema.json b/packages/vendor/src/i18n/translations/$schema.json
index ae5361d43..d62e984eb 100644
--- a/packages/vendor/src/i18n/translations/$schema.json
+++ b/packages/vendor/src/i18n/translations/$schema.json
@@ -5135,6 +5135,9 @@
"shippingProfile": {
"type": "string"
},
+ "condition": {
+ "type": "string"
+ },
"ean": {
"type": "string"
},
@@ -5200,6 +5203,7 @@
"sku",
"variant",
"shippingProfile",
+ "condition",
"ean",
"upc",
"requiredQuantity",
diff --git a/packages/vendor/src/i18n/translations/en.json b/packages/vendor/src/i18n/translations/en.json
index 52614328d..0b677d41d 100644
--- a/packages/vendor/src/i18n/translations/en.json
+++ b/packages/vendor/src/i18n/translations/en.json
@@ -1252,6 +1252,7 @@
"sku": "SKU",
"variant": "Master variant",
"shippingProfile": "Shipping Profile",
+ "condition": "Condition",
"ean": "EAN",
"upc": "UPC",
"requiredQuantity": "Required quantity",
diff --git a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx
index 622c1d590..7633e39c1 100644
--- a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx
+++ b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx
@@ -10,6 +10,7 @@ import { SectionRow } from "../../../../../../components/common/section"
export type OfferVariantData = {
id: string
sku?: string | null
+ condition?: { label: string } | null
product_variant?: {
title?: string | null
options?: Array<{
@@ -24,8 +25,8 @@ export type OfferVariantData = {
/**
* General section of the Offer Variant detail (Figma `40016491:703365`):
* variant title heading + "Offer Variant" sub-label + Edit Details kebab
- * (SKU only — no manage-inventory / allow-backorders toggles), then SKU
- * and one row per product option.
+ * (SKU only — no manage-inventory / allow-backorders toggles), then SKU,
+ * condition and one row per product option.
*/
export const OfferVariantGeneralSection = ({
offer,
@@ -63,6 +64,10 @@ export const OfferVariantGeneralSection = ({
</div>
<SectionRow title={t("offers.fields.sku")} value={offer.sku ?? "-"} />
+ <SectionRow
+ title={t("offers.fields.condition")}
+ value={offer.condition?.label ?? "-"}
+ />
{options.map((opt) => (
<SectionRow
diff --git a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/edit/index.tsx b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/edit/index.tsx
index 0bc9c0a94..c8a288315 100644
--- a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/edit/index.tsx
+++ b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/edit/index.tsx
@@ -1,5 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import { Button, Heading, Input, Switch, toast } from "@medusajs/ui"
+import { Button, Heading, Input, Select, Switch, toast } from "@medusajs/ui"
import { useForm, useWatch } from "react-hook-form"
import { useTranslation } from "react-i18next"
import { useParams } from "react-router-dom"
@@ -10,12 +10,15 @@ import { useLinkQuery } from "@mercurjs/dashboard-shared"
import { Form } from "../../../../../../components/common/form"
import { RouteDrawer, useRouteModal } from "../../../../../../components/modals"
import { KeyboundForm } from "../../../../../../components/utilities/keybound-form"
+import { useOfferConditions } from "../../../../../../hooks/api/offer-conditions"
import { useOffer, useUpdateOffer } from "../../../../../../hooks/api/offers"
+import { useDocumentDirection } from "../../../../../../hooks/use-document-direction"
import { OFFER_VARIANT_DETAIL_FIELDS } from "../../../../common/constants"
import { OfferDetail } from "../../../../common/types"
const Schema = z.object({
sku: z.string().max(64).optional(),
+ condition_id: z.string().optional(),
manage_inventory: z.boolean(),
allow_backorder: z.boolean(),
})
@@ -23,10 +26,13 @@ type Values = z.infer<typeof Schema>
const EditOfferVariantForm = ({ offer }: { offer: OfferDetail }) => {
const { t } = useTranslation()
+ const dir = useDocumentDirection()
const { handleSuccess } = useRouteModal()
+ const { offer_conditions } = useOfferConditions()
const form = useForm<Values>({
defaultValues: {
sku: offer.sku ?? "",
+ condition_id: offer.condition_id ?? "",
manage_inventory: offer.manage_inventory ?? true,
allow_backorder: offer.allow_backorder ?? false,
},
@@ -43,9 +49,14 @@ const EditOfferVariantForm = ({ offer }: { offer: OfferDetail }) => {
// SKU is optional: leave the offer's SKU untouched when the field is blank
// rather than sending an empty string (the API rejects "" on update).
const sku = values.sku?.trim()
+ // Only send a changed condition: the current one may since have been
+ // disabled, and the API rejects assigning an inactive condition.
+ const conditionChanged =
+ !!values.condition_id && values.condition_id !== offer.condition_id
await mutateAsync(
{
...(sku ? { sku } : {}),
+ ...(conditionChanged ? { condition_id: values.condition_id } : {}),
manage_inventory: values.manage_inventory,
allow_backorder: values.manage_inventory
? values.allow_backorder
@@ -83,6 +94,34 @@ const EditOfferVariantForm = ({ offer }: { offer: OfferDetail }) => {
)}
/>
+ <Form.Field
+ control={form.control}
+ name="condition_id"
+ render={({ field: { ref, onChange, ...field } }) => (
+ <Form.Item>
+ <Form.Label>{t("offers.fields.condition")}</Form.Label>
+ <Form.Control>
+ <Select {...field} onValueChange={onChange} dir={dir}>
+ <Select.Trigger
+ ref={ref}
+ data-testid="offer-variant-edit-form-condition-select"
+ >
+ <Select.Value placeholder={offer.condition?.label} />
+ </Select.Trigger>
+ <Select.Content>
+ {(offer_conditions ?? []).map((condition) => (
+ <Select.Item key={condition.id} value={condition.id}>
+ {condition.label}
+ </Select.Item>
+ ))}
+ </Select.Content>
+ </Select>
+ </Form.Control>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+
<Form.Field
control={form.control}
name="manage_inventory"
diff --git a/packages/vendor/src/pages/offers/common/constants.ts b/packages/vendor/src/pages/offers/common/constants.ts
index 44b59d95a..08036437a 100644
--- a/packages/vendor/src/pages/offers/common/constants.ts
+++ b/packages/vendor/src/pages/offers/common/constants.ts
@@ -60,11 +60,15 @@ export const OFFER_VARIANT_DETAIL_FIELDS = [
"variant_id",
"seller_id",
"shipping_profile_id",
+ "condition_id",
"manage_inventory",
"allow_backorder",
"metadata",
"created_at",
"updated_at",
+ "condition.id",
+ "condition.code",
+ "condition.label",
"product_variant.id",
"product_variant.title",
"product_variant.sku",
diff --git a/packages/vendor/src/pages/offers/common/types.ts b/packages/vendor/src/pages/offers/common/types.ts
index 438b2b33f..775dcd6e8 100644
--- a/packages/vendor/src/pages/offers/common/types.ts
+++ b/packages/vendor/src/pages/offers/common/types.ts
@@ -58,12 +58,14 @@ export type OfferDetail = OfferStockShape & {
variant_id?: string | null
seller_id?: string | null
shipping_profile_id?: string | null
+ condition_id?: string | null
manage_inventory?: boolean | null
allow_backorder?: boolean | null
metadata?: Record<string, unknown> | null
created_at?: string | null
updated_at?: string | null
deleted_at?: string | null
+ condition?: { id: string; code: string; label: string } | null
product_variant?: {
id?: string | null
title?: string | null
diff --git a/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-form.tsx b/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-form.tsx
index b05f13dbf..f591a4448 100644
--- a/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-form.tsx
+++ b/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-form.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
import { RouteFocusModal, useRouteModal } from "../../../../components/modals";
import { TabbedForm } from "../../../../components/tabbed-form/tabbed-form";
+import { useOfferConditions } from "../../../../hooks/api/offer-conditions";
import { useBulkCreateOffers } from "../../../../hooks/api/offers";
import { castNumber } from "../../../../lib/cast-number";
import { useProducts } from "../../../../hooks/api/products";
@@ -77,6 +78,9 @@ export const CreateOfferForm = () => {
{ enabled: canViewLocations }
);
+ const { offer_conditions } = useOfferConditions();
+ const defaultConditionId = offer_conditions?.[0]?.id ?? "";
+
const locationIds = (stock_locations ?? []).map((l) => l.id);
const selectedProductIds = form.watch("selected_product_ids") ?? [];
@@ -127,6 +131,7 @@ export const CreateOfferForm = () => {
// didn't know about (e.g. store data arrived after build).
next.push({
...previous,
+ condition_id: previous.condition_id || defaultConditionId,
prices: { ...emptyPrices, ...(previous.prices ?? {}) },
inventory: { ...emptyInventory, ...(previous.inventory ?? {}) },
});
@@ -141,6 +146,7 @@ export const CreateOfferForm = () => {
variant_sku: variant.sku ?? null,
sku: variant.sku ?? "",
shipping_profile_id: "",
+ condition_id: defaultConditionId,
prices: { ...emptyPrices },
inventory: { ...emptyInventory },
});
@@ -156,6 +162,7 @@ export const CreateOfferForm = () => {
fetchedProducts,
currency_code,
locationsKey,
+ defaultConditionId,
form,
]);
@@ -246,6 +253,7 @@ export const CreateOfferForm = () => {
sku,
variant_id: row.variant_id,
shipping_profile_id: row.shipping_profile_id,
+ ...(row.condition_id ? { condition_id: row.condition_id } : {}),
prices,
inventory_items: [
{
diff --git a/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-stock-levels-and-prices.tsx b/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-stock-levels-and-prices.tsx
index c25ee0017..6369dfbf4 100644
--- a/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-stock-levels-and-prices.tsx
+++ b/packages/vendor/src/pages/offers/create/create-offer-form/create-offer-stock-levels-and-prices.tsx
@@ -14,12 +14,14 @@ import { Thumbnail } from "../../../../components/common/thumbnail";
import { useRouteModal } from "../../../../components/modals";
import { defineTabMeta } from "../../../../components/tabbed-form/types";
import { usePricePreferences } from "../../../../hooks/api/price-preferences";
+import { useOfferConditions } from "../../../../hooks/api/offer-conditions";
import { useCurrentSeller } from "../../../../hooks/api/sellers";
import { useShippingProfiles } from "../../../../hooks/api/shipping-profiles";
import { useStockLocations } from "../../../../hooks/api/stock-locations";
import { CreateOfferFormValues, OfferVariantRow } from "./schema";
type ShippingProfileLite = { id: string; name?: string | null };
+type OfferConditionLite = { id: string; label: string };
/**
* The grid interleaves a non-editable product "group" row above each
@@ -58,6 +60,7 @@ const Root = () => {
) as {
shipping_profiles?: ShippingProfileLite[];
};
+ const { offer_conditions } = useOfferConditions();
const { price_preferences: pricePreferences } = usePricePreferences(
{},
{ enabled: can("price_preferences") }
@@ -91,6 +94,7 @@ const Root = () => {
| HttpTypes.AdminStockLocation[]
| undefined,
shippingProfiles: shipping_profiles ?? [],
+ offerConditions: offer_conditions ?? [],
pricePreferences,
});
@@ -113,6 +117,7 @@ type ColumnArgs = {
currencyCode?: string;
stockLocations?: HttpTypes.AdminStockLocation[];
shippingProfiles?: ShippingProfileLite[];
+ offerConditions?: OfferConditionLite[];
pricePreferences?: HttpTypes.AdminPricePreference[];
};
@@ -122,6 +127,7 @@ const useColumns = ({
currencyCode,
stockLocations = [],
shippingProfiles = [],
+ offerConditions = [],
pricePreferences = [],
}: ColumnArgs) => {
const { t } = useTranslation();
@@ -131,6 +137,10 @@ const useColumns = ({
value: p.id,
label: p.name ?? p.id,
}));
+ const conditionOptions = offerConditions.map((c) => ({
+ value: c.id,
+ label: c.label,
+ }));
const currencies = currencyCode ? [currencyCode] : [];
return [
@@ -203,6 +213,26 @@ const useColumns = ({
/>
),
}),
+ columnHelper.column({
+ id: "condition",
+ name: t("offers.fields.condition"),
+ header: t("offers.fields.condition"),
+ field: (context) => {
+ const row = context.row.original;
+ return isGroup(row) ? null : `variants.${row.__formIndex}.condition_id`;
+ },
+ type: "select",
+ cell: (context) =>
+ isGroup(context.row.original) ? (
+ <DataGrid.ReadonlyCell context={context} />
+ ) : (
+ <DataGrid.SelectCell
+ context={context}
+ options={conditionOptions}
+ placeholder=""
+ />
+ ),
+ }),
...createDataGridLocationStockColumns<GridRow, CreateOfferFormValues>({
stockLocations,
isReadyOnly: (context) => isGroup(context.row.original),
@@ -230,7 +260,14 @@ const useColumns = ({
t,
}),
];
- }, [t, currencyCode, stockLocations, shippingProfiles, pricePreferences]);
+ }, [
+ t,
+ currencyCode,
+ stockLocations,
+ shippingProfiles,
+ offerConditions,
+ pricePreferences,
+ ]);
};
Root._tabMeta = defineTabMeta<CreateOfferFormValues>({
diff --git a/packages/vendor/src/pages/offers/create/create-offer-form/schema.ts b/packages/vendor/src/pages/offers/create/create-offer-form/schema.ts
index ede41b47f..6ce036b8f 100644
--- a/packages/vendor/src/pages/offers/create/create-offer-form/schema.ts
+++ b/packages/vendor/src/pages/offers/create/create-offer-form/schema.ts
@@ -12,6 +12,7 @@ const VariantRowSchema = z.object({
variant_sku: z.string().nullish(),
sku: z.string().max(64).default(""),
shipping_profile_id: z.string().default(""),
+ condition_id: z.string().default(""),
prices: z.record(z.string(), optionalFloat).default({}),
inventory: z
.record(