@mercurjs/admin 2.2.0-canary.21 → 2.2.0-canary.22

package/dist/{add-campaign-promotions-EB2MYHMZ.js → add-campaign-promotions-2IOKLEMG.js}

@@ -1,11 +1,11 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-AH3KBVKC.js";
+} from "./chunk-7PAVVX2P.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";
-import "./chunk-G66KMUI5.js";
+import "./chunk-K7EOVKKV.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
@@ -18,7 +18,7 @@ import {
 import "./chunk-YN3FGNJM.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-634XVU3D.js";
-import "./chunk-5NQUJQXX.js";
+import "./chunk-FP6YPFKF.js";
 import "./chunk-TKGWSUEI.js";
 import {
   KeyboundForm

package/dist/{campaign-detail-EAARQB3E.js → campaign-detail-5WNSQVKG.js}

@@ -1,11 +1,11 @@
 import {
   CAMPAIGN_DETAIL_FIELDS,
   CampaignDetailPage
-} from "./chunk-6YPV4T3R.js";
-import "./chunk-AH3KBVKC.js";
+} from "./chunk-RXZZEPW3.js";
+import "./chunk-7PAVVX2P.js";
 import "./chunk-S2WEYEQR.js";
 import "./chunk-RK5N3XIX.js";
-import "./chunk-G66KMUI5.js";
+import "./chunk-K7EOVKKV.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
@@ -15,7 +15,7 @@ import "./chunk-NQEXDLYH.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-634XVU3D.js";
-import "./chunk-5NQUJQXX.js";
+import "./chunk-FP6YPFKF.js";
 import "./chunk-IQPN4PZJ.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-H6MYB7GB.js";

package/dist/{chunk-3LYOKDUA.js → chunk-2H3KXP53.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-RK5N3XIX.js";
 import {
   getPromotionStatus
-} from "./chunk-G66KMUI5.js";
+} from "./chunk-K7EOVKKV.js";
 import {
   formatPercentage
 } from "./chunk-QDPLZDMX.js";

package/dist/{chunk-KZB7LCF2.js → chunk-3EQOAHVG.js}

@@ -41,7 +41,7 @@ var CommissionValueFields = ({
             {
               ...field,
               value,
-              onValueChange: (_v, _n, values) => onChange(values?.float ?? 0)
+              onValueChange: (_v, _n, values) => onChange(values?.float)
             }
           ) }),
           /* @__PURE__ */ jsx(Form.ErrorMessage, {})

package/dist/{chunk-YUECTKEY.js → chunk-3ZCBTIIC.js}

@@ -10,7 +10,7 @@ import {
   decorateVariantsWithDefaultValues,
   generateVariantsFromAttributes,
   normalizeProductFormValues
-} from "./chunk-2KPITPB7.js";
+} from "./chunk-5PWXUMCA.js";
 import {
   HandleInput
 } from "./chunk-HJ56YXBU.js";

package/dist/{chunk-2KPITPB7.js → chunk-5PWXUMCA.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-AJLGY3LQ.js";
 import {
   i18n
-} from "./chunk-5NQUJQXX.js";
+} from "./chunk-FP6YPFKF.js";
 
 // src/pages/products/product-create/constants.ts
 import { z } from "zod";

package/dist/{chunk-AH3KBVKC.js → chunk-7PAVVX2P.js}

@@ -1,6 +1,6 @@
 import {
   getPromotionStatus
-} from "./chunk-G66KMUI5.js";
+} from "./chunk-K7EOVKKV.js";
 import {
   TextCell,
   TextHeader

package/dist/{chunk-JEJQKTZO.js → chunk-ASNNJIW7.js}

@@ -1,14 +1,14 @@
 import {
   useDeleteCommissionRuleAction,
   useScopeReferenceNames
-} from "./chunk-RXRDZ47F.js";
+} from "./chunk-BHJFT3ST.js";
 import {
   formatCommissionValue,
   getIsActiveProps,
   getScopeSummary,
   getScopeTypeLabel,
   referenceIds
-} from "./chunk-PN5C4AND.js";
+} from "./chunk-STPSVH3T.js";
 import {
   SectionRow
 } from "./chunk-3XPXUIK3.js";

package/dist/{chunk-RXRDZ47F.js → chunk-BHJFT3ST.js}

@@ -22,10 +22,10 @@ var useDeleteCommissionRuleAction = (rule) => {
   const { mutateAsync } = useDeleteCommissionRule(rule.id);
   return async () => {
     const confirmed = await prompt({
-      title: t("general.areYouSure"),
+      title: t("commissions.delete.title", "Delete commission rule"),
       description: t("commissions.delete.description", {
         name: rule.name,
-        defaultValue: `Are you sure you want to delete the commission rule "${rule.name}"?`
+        defaultValue: `You are about to delete commission rule ${rule.name}. This action cannot be undone.`
       }),
       confirmText: t("actions.delete"),
       cancelText: t("actions.cancel")
@@ -37,7 +37,7 @@ var useDeleteCommissionRuleAction = (rule) => {
       onSuccess: () => {
         toast.success(
           t("commissions.delete.successToast", {
-            defaultValue: "Commission rule deleted"
+            defaultValue: "Commission rule was successfully deleted."
           })
         );
         navigate("/settings/commissions");

package/dist/{chunk-5NQUJQXX.js → chunk-FP6YPFKF.js}

@@ -12673,15 +12673,20 @@ var en_default = {
       header: "Create Commission Rule",
       details: "Details",
       commission: "Commission",
-      successToast: "Commission rule created"
+      successToast: "Commission rule was successfully created."
     },
     edit: {
       header: "Edit Commission Rule",
-      successToast: "Commission rule updated"
+      successToast: "Commission rule was successfully updated."
+    },
+    commissionEdit: {
+      header: "Edit Commission",
+      successToast: "Commission was successfully updated."
     },
     delete: {
-      description: "Are you sure you want to delete this commission rule?",
-      successToast: "Commission rule deleted"
+      title: "Delete commission rule",
+      description: "You are about to delete commission rule {{name}}. This action cannot be undone.",
+      successToast: "Commission rule was successfully deleted."
     },
     fields: {
       code: "Code",
@@ -12698,7 +12703,9 @@ var en_default = {
       type: {
         label: "Type",
         percentage: "Percentage",
-        fixed: "Fixed"
+        fixed: "Fixed",
+        percentageHint: "Charge a percentage of the order total.",
+        fixedHint: "Charge a fixed amount per order."
       },
       scopeType: {
         label: "Type",
@@ -12706,7 +12713,12 @@ var en_default = {
         productType: "Product Type",
         category: "Category",
         storeProductType: "Store + Product Type",
-        storeCategory: "Store + Category"
+        storeCategory: "Store + Category",
+        storeHint: "Apply to specific stores.",
+        productTypeHint: "Apply to specific product types.",
+        categoryHint: "Apply to specific categories.",
+        storeProductTypeHint: "Apply to product types within specific stores.",
+        storeCategoryHint: "Apply to categories within specific stores."
       }
     },
     global: {
@@ -12720,7 +12732,7 @@ var en_default = {
       notIncluded: "Not included in commission",
       edit: {
         header: "Edit Global Commission",
-        successToast: "Global commission updated"
+        successToast: "Global commission was successfully updated."
       }
     },
     rules: {
@@ -12731,6 +12743,10 @@ var en_default = {
         type: "Type",
         value: "Value",
         status: "Status"
+      },
+      empty: {
+        heading: "No commission rules yet",
+        description: "Create a commission rule to override the global commission for specific stores, product types, or categories."
       }
     },
     status: {

package/dist/{chunk-G66KMUI5.js → chunk-K7EOVKKV.js}

@@ -1,6 +1,6 @@
 import {
   i18n
-} from "./chunk-5NQUJQXX.js";
+} from "./chunk-FP6YPFKF.js";
 
 // src/lib/promotions.ts
 var getPromotionStatusMap = () => ({

package/dist/{chunk-EG45GIE3.js → chunk-PAGH4K4C.js}

@@ -1,17 +1,20 @@
 import {
   useDeleteCommissionRuleAction,
   useScopeReferenceNames
-} from "./chunk-RXRDZ47F.js";
+} from "./chunk-BHJFT3ST.js";
 import {
   formatCommissionValue,
   getIsActiveProps,
   getScopeSummary,
   getScopeTypeLabel
-} from "./chunk-PN5C4AND.js";
+} from "./chunk-STPSVH3T.js";
 import {
   TextCell,
   TextHeader
 } from "./chunk-JHIMVLB2.js";
+import {
+  StatusCell
+} from "./chunk-DB6ANJBO.js";
 import {
   _DataTable,
   useDataTable
@@ -130,7 +133,6 @@ import { Container as Container2 } from "@medusajs/ui";
 
 // src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-data-table.tsx
 import { PencilSquare as PencilSquare2, Trash } from "@medusajs/icons";
-import { StatusBadge } from "@medusajs/ui";
 import { keepPreviousData } from "@tanstack/react-query";
 import { createColumnHelper } from "@tanstack/react-table";
 import { useMemo as useMemo2 } from "react";
@@ -144,18 +146,39 @@ var useCommissionRulesFilters = () => {
   return useMemo(
     () => [
       {
-        key: "type",
-        label: t("commissions.fields.type.label", "Type"),
+        key: "scope_type",
+        label: t("commissions.fields.scopeType.label", "Type"),
         type: "select",
         multiple: true,
         options: [
           {
-            label: t("commissions.fields.type.percentage", "Percentage"),
-            value: "percentage"
+            label: t("commissions.fields.scopeType.store", "Store"),
+            value: "store"
+          },
+          {
+            label: t(
+              "commissions.fields.scopeType.productType",
+              "Product Type"
+            ),
+            value: "product_type"
+          },
+          {
+            label: t("commissions.fields.scopeType.category", "Category"),
+            value: "category"
           },
           {
-            label: t("commissions.fields.type.fixed", "Fixed"),
-            value: "fixed"
+            label: t(
+              "commissions.fields.scopeType.storeProductType",
+              "Store + Product Type"
+            ),
+            value: "store_product_type"
+          },
+          {
+            label: t(
+              "commissions.fields.scopeType.storeCategory",
+              "Store + Category"
+            ),
+            value: "store_category"
           }
         ]
       },
@@ -182,17 +205,17 @@ var useCommissionRulesQuery = ({
   pageSize = 20
 } = {}) => {
   const queryObject = useQueryParams(
-    ["offset", "q", "order", "is_enabled", "type"],
+    ["offset", "q", "order", "is_enabled", "scope_type"],
     prefix
   );
-  const { offset, q, order, is_enabled, type } = queryObject;
+  const { offset, q, order, is_enabled, scope_type } = queryObject;
   const searchParams = {
     limit: pageSize,
     offset: offset ? Number(offset) : 0,
     order: order || void 0,
     q: q || void 0,
     is_enabled: is_enabled ? is_enabled === "true" : void 0,
-    type: type ? type.split(",") : void 0
+    scope_type: scope_type ? scope_type.split(",") : void 0
   };
   return { searchParams, raw: queryObject };
 };
@@ -220,7 +243,10 @@ var CommissionRulesDataTable = () => {
       placeholderData: keepPreviousData
     }
   );
-  const data = commission_rates ?? [];
+  const data = useMemo2(
+    () => commission_rates ?? [],
+    [commission_rates]
+  );
   const allRules = useMemo2(
     () => data.flatMap((rate) => rate.rules ?? []),
     [data]
@@ -249,6 +275,13 @@ var CommissionRulesDataTable = () => {
       queryObject: raw,
       filters,
       navigateTo: (row) => `${row.original.id}`,
+      noRecords: {
+        title: t("commissions.rules.empty.heading", "No commission rules yet"),
+        message: t(
+          "commissions.rules.empty.description",
+          "Create a commission rule to override the global commission for specific stores, product types, or categories."
+        )
+      },
       pagination: true,
       search: true,
       orderBy: [
@@ -316,7 +349,7 @@ var useColumns = (names) => {
         header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t("commissions.rules.columns.status", "Status") }),
         cell: ({ getValue }) => {
           const props = getIsActiveProps(getValue(), t);
-          return /* @__PURE__ */ jsx2(StatusBadge, { color: props.color, children: props.label });
+          return /* @__PURE__ */ jsx2(StatusCell, { color: props.color, children: props.label });
         }
       }),
       columnHelper.display({

package/dist/{chunk-6YPV4T3R.js → chunk-RXZZEPW3.js}

@@ -1,7 +1,7 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-AH3KBVKC.js";
+} from "./chunk-7PAVVX2P.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";

package/dist/{chunk-PN5C4AND.js → chunk-STPSVH3T.js}

@@ -89,7 +89,7 @@ var getIsActiveProps = (isEnabled, t) => isEnabled ? {
   color: "green",
   label: t("commissions.status.enabled", "Active")
 } : {
-  color: "grey",
+  color: "red",
   label: t("commissions.status.disabled", "Inactive")
 };
 var buildValuesPayload = (currencies, fixedValues = {}) => currencies.map((code) => ({

package/dist/{chunk-JAPKOO4T.js → chunk-ZIIZGCTQ.js}

@@ -1,7 +1,7 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-AH3KBVKC.js";
+} from "./chunk-7PAVVX2P.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";

package/dist/{commission-rule-commission-edit-TA3H3EEN.js → commission-rule-commission-edit-EAOSJNA2.js}

@@ -1,11 +1,11 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-KZB7LCF2.js";
+} from "./chunk-3EQOAHVG.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
-} from "./chunk-PN5C4AND.js";
+} from "./chunk-STPSVH3T.js";
 import "./chunk-MAEP2UCK.js";
 import {
   SwitchBox
@@ -81,7 +81,7 @@ var EditCommissionForm = ({ rule }) => {
         onSuccess: () => {
           toast.success(
             t("commissions.commissionEdit.successToast", {
-              defaultValue: "Commission updated"
+              defaultValue: "Commission was successfully updated."
             })
           );
           handleSuccess();