@mercurjs/admin 2.2.0-canary.26 → 2.2.0-canary.27

package/dist/{global-commission-edit-3CEVUAAP.js → global-commission-edit-4HDRIZSC.js}

@@ -1,11 +1,11 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-3EQOAHVG.js";
+} from "./chunk-SINWGUXZ.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
-} from "./chunk-STPSVH3T.js";
+} from "./chunk-CGIVQ7D2.js";
 import "./chunk-MAEP2UCK.js";
 import {
   SwitchBox
@@ -38,12 +38,13 @@ import "./chunk-NBMM2TZK.js";
 
 // src/pages/commissions/global-commission-edit/global-commission-edit.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Heading, RadioGroup, toast } from "@medusajs/ui";
+import { Button, Heading, Input, Select, toast } from "@medusajs/ui";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditGlobalCommissionSchema = zod.object({
+  code: zod.string().min(1),
   type: zod.enum(["percentage", "fixed"]),
   value: zod.coerce.number().optional(),
   fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
@@ -65,6 +66,7 @@ var EditGlobalCommissionForm = ({ rate }) => {
   const { currencies } = useStoreCurrencies();
   const form = useForm({
     defaultValues: {
+      code: rate.code,
       type: rate.type,
       value: rate.value,
       fixed_values: fixedValuesFromRate(rate),
@@ -77,6 +79,7 @@ var EditGlobalCommissionForm = ({ rate }) => {
   const handleSubmit = form.handleSubmit(async (values) => {
     const isFixed = values.type === "fixed";
     const payload = {
+      code: values.code,
       type: values.type,
       value: isFixed ? 0 : values.value,
       ...isFixed ? { values: buildValuesPayload(currencies, values.fixed_values) } : {},
@@ -102,52 +105,46 @@ var EditGlobalCommissionForm = ({ rate }) => {
         Form.Field,
         {
           control: form.control,
-          name: "type",
-          render: ({ field: { onChange, ...rest } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
-            /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label", "Type") }),
-            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(
-              RadioGroup,
+          name: "code",
+          render: ({ field }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+            /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.code") }),
+            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsx(
+              Input,
               {
-                dir: direction,
-                onValueChange: onChange,
-                ...rest,
-                className: "grid grid-cols-1 gap-4 md:grid-cols-2",
-                "data-testid": "global-commission-type-radio-group",
-                children: [
-                  /* @__PURE__ */ jsx(
-                    RadioGroup.ChoiceBox,
-                    {
-                      value: "percentage",
-                      label: t(
-                        "commissions.fields.type.percentage",
-                        "Percentage"
-                      ),
-                      description: t(
-                        "commissions.fields.type.percentageHint",
-                        "Charge a percentage of the order total."
-                      ),
-                      "data-testid": "global-commission-type-option-percentage"
-                    }
-                  ),
-                  /* @__PURE__ */ jsx(
-                    RadioGroup.ChoiceBox,
-                    {
-                      value: "fixed",
-                      label: t("commissions.fields.type.fixed", "Fixed"),
-                      description: t(
-                        "commissions.fields.type.fixedHint",
-                        "Charge a fixed amount per order."
-                      ),
-                      "data-testid": "global-commission-type-option-fixed"
-                    }
-                  )
-                ]
+                autoComplete: "off",
+                "data-testid": "global-commission-code-input",
+                ...field
               }
             ) }),
             /* @__PURE__ */ jsx(Form.ErrorMessage, {})
           ] })
         }
       ),
+      /* @__PURE__ */ jsx(
+        Form.Field,
+        {
+          control: form.control,
+          name: "type",
+          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+            /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label") }),
+            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(Select, { ...field, onValueChange: onChange, dir: direction, children: [
+              /* @__PURE__ */ jsx(
+                Select.Trigger,
+                {
+                  ref,
+                  "data-testid": "global-commission-type-select",
+                  children: /* @__PURE__ */ jsx(Select.Value, {})
+                }
+              ),
+              /* @__PURE__ */ jsxs(Select.Content, { children: [
+                /* @__PURE__ */ jsx(Select.Item, { value: "percentage", children: t("commissions.fields.type.percentage") }),
+                /* @__PURE__ */ jsx(Select.Item, { value: "fixed", children: t("commissions.fields.type.fixed") })
+              ] })
+            ] }) }),
+            /* @__PURE__ */ jsx(Form.ErrorMessage, {})
+          ] })
+        }
+      ),
       /* @__PURE__ */ jsx(
         CommissionValueFields,
         {
@@ -161,11 +158,8 @@ var EditGlobalCommissionForm = ({ rate }) => {
         {
           control: form.control,
           name: "include_tax",
-          label: t("commissions.fields.taxIncluded", "Tax included"),
-          description: t(
-            "commissions.fields.taxIncludedHint",
-            "If checked, commission is calculated on the total including tax. If unchecked, tax is excluded and goes entirely to the store."
-          )
+          label: t("commissions.fields.taxIncluded"),
+          description: t("commissions.fields.taxIncludedHint")
         }
       ),
       /* @__PURE__ */ jsx(
@@ -173,14 +167,8 @@ var EditGlobalCommissionForm = ({ rate }) => {
         {
           control: form.control,
           name: "include_shipping",
-          label: t(
-            "commissions.fields.shippingIncluded",
-            "Shipping included"
-          ),
-          description: t(
-            "commissions.fields.shippingIncludedHint",
-            "If checked, commission is calculated on the total including shipping. If unchecked, shipping fees go entirely to the store."
-          )
+          label: t("commissions.fields.shippingIncluded"),
+          description: t("commissions.fields.shippingIncludedHint")
         }
       )
     ] }) }),
@@ -200,8 +188,8 @@ var GlobalCommissionEdit = () => {
   }
   return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
     /* @__PURE__ */ jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: t("commissions.global.edit.header", "Edit Global Commission") }) }),
-      /* @__PURE__ */ jsx(RouteDrawer.Description, { className: "sr-only", children: t("commissions.global.edit.header", "Edit Global Commission") })
+      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: t("commissions.global.edit.header") }) }),
+      /* @__PURE__ */ jsx(RouteDrawer.Description, { className: "sr-only", children: t("commissions.global.edit.header") })
     ] }),
     ready && /* @__PURE__ */ jsx(EditGlobalCommissionForm, { rate })
   ] });