@medusajs/dashboard 3.0.0-snapshot-20251114155958 → 3.0.0-snapshot-20251126221441

package/src/i18n/translations/$schema.json

@@ -178,12 +178,6 @@
         },
         "noMoreData": {
           "type": "string"
-        },
-        "exclusive": {
-          "type": "string"
-        },
-        "global": {
-          "type": "string"
         }
       },
       "required": [
@@ -243,9 +237,7 @@
         "unsavedChangesDescription",
         "includesTaxTooltip",
         "excludesTaxTooltip",
-        "noMoreData",
-        "exclusive",
-        "global"
+        "noMoreData"
       ],
       "additionalProperties": false
     },
@@ -517,9 +509,6 @@
         },
         "cannotUndo": {
           "type": "string"
-        },
-        "manage": {
-          "type": "string"
         }
       },
       "required": [
@@ -566,8 +555,7 @@
         "hide",
         "export",
         "import",
-        "cannotUndo",
-        "manage"
+        "cannotUndo"
       ],
       "additionalProperties": false
     },
@@ -1704,9 +1692,6 @@
                   },
                   "required": ["label", "hint"],
                   "additionalProperties": false
-                },
-                "selectValuesHint": {
-                  "type": "string"
                 }
               },
               "required": [
@@ -1716,8 +1701,7 @@
                 "optionTitle",
                 "optionValues",
                 "productVariants",
-                "productOptions",
-                "selectValuesHint"
+                "productOptions"
               ],
               "additionalProperties": false
             },
@@ -2024,7 +2008,6 @@
             "uploadImagesLabel",
             "uploadImagesHint",
             "invalidFileType",
-            "fileTooLarge",
             "failedToUpload",
             "deleteWarning_one",
             "deleteWarning_other",
@@ -2668,39 +2651,11 @@
               "required": ["header", "successToast"],
               "additionalProperties": false
             },
-            "manage": {
-              "type": "object",
-              "properties": {
-                "header": {
-                  "type": "string"
-                },
-                "description": {
-                  "type": "string"
-                },
-                "label": {
-                  "type": "string"
-                },
-                "hint": {
-                  "type": "string"
-                },
-                "placeholder": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "header",
-                "description",
-                "label",
-                "hint",
-                "placeholder"
-              ],
-              "additionalProperties": false
-            },
             "deleteWarning": {
               "type": "string"
             }
           },
-          "required": ["header", "edit", "create", "manage", "deleteWarning"],
+          "required": ["header", "edit", "create", "deleteWarning"],
           "additionalProperties": false
         },
         "organization": {
@@ -3201,128 +3156,6 @@
       ],
       "additionalProperties": false
     },
-    "productOptions": {
-      "type": "object",
-      "properties": {
-        "domain": {
-          "type": "string"
-        },
-        "subtitle": {
-          "type": "string"
-        },
-        "values": {
-          "type": "object",
-          "properties": {
-            "header": {
-              "type": "string"
-            }
-          },
-          "required": ["header"],
-          "additionalProperties": false
-        },
-        "create": {
-          "type": "object",
-          "properties": {
-            "header": {
-              "type": "string"
-            },
-            "hint": {
-              "type": "string"
-            },
-            "successToast": {
-              "type": "string"
-            },
-            "tabs": {
-              "type": "object",
-              "properties": {
-                "details": {
-                  "type": "string"
-                },
-                "organize": {
-                  "type": "string"
-                }
-              },
-              "required": ["details", "organize"],
-              "additionalProperties": false
-            }
-          },
-          "required": ["header", "hint", "successToast", "tabs"],
-          "additionalProperties": false
-        },
-        "edit": {
-          "type": "object",
-          "properties": {
-            "header": {
-              "type": "string"
-            },
-            "description": {
-              "type": "string"
-            },
-            "successToast": {
-              "type": "string"
-            }
-          },
-          "required": ["header", "description", "successToast"],
-          "additionalProperties": false
-        },
-        "delete": {
-          "type": "object",
-          "properties": {
-            "confirmation": {
-              "type": "string"
-            },
-            "successToast": {
-              "type": "string"
-            }
-          },
-          "required": ["confirmation", "successToast"],
-          "additionalProperties": false
-        },
-        "fields": {
-          "type": "object",
-          "properties": {
-            "title": {
-              "type": "object",
-              "properties": {
-                "label": {
-                  "type": "string"
-                },
-                "placeholder": {
-                  "type": "string"
-                }
-              },
-              "required": ["label", "placeholder"],
-              "additionalProperties": false
-            },
-            "values": {
-              "type": "object",
-              "properties": {
-                "label": {
-                  "type": "string"
-                },
-                "placeholder": {
-                  "type": "string"
-                }
-              },
-              "required": ["label", "placeholder"],
-              "additionalProperties": false
-            }
-          },
-          "required": ["title", "values"],
-          "additionalProperties": false
-        }
-      },
-      "required": [
-        "domain",
-        "subtitle",
-        "values",
-        "create",
-        "edit",
-        "delete",
-        "fields"
-      ],
-      "additionalProperties": false
-    },
     "inventory": {
       "type": "object",
       "properties": {
@@ -12205,7 +12038,6 @@
     "products",
     "collections",
     "categories",
-    "productOptions",
     "inventory",
     "giftCards",
     "customers",

package/src/i18n/translations/en.json

@@ -57,9 +57,7 @@
     "unsavedChangesDescription": "You have unsaved changes that will be lost if you exit this form.",
     "includesTaxTooltip": "Prices in this column are tax inclusive.",
     "excludesTaxTooltip": "Prices in this column are tax exclusive.",
-    "noMoreData": "No more data",
-    "exclusive": "Product-specific",
-    "global": "Global"
+    "noMoreData": "No more data"
   },
   "json": {
     "header": "JSON",
@@ -143,8 +141,7 @@
     "hide": "Hide",
     "export": "Export",
     "import": "Import",
-    "cannotUndo": "This action cannot be undone",
-    "manage": "Manage"
+    "cannotUndo": "This action cannot be undone"
   },
   "operators": {
     "in": "In"
@@ -451,8 +448,7 @@
         "productOptions": {
           "label": "Product options",
           "hint": "Define the options for the product, e.g. color, size, etc."
-        },
-        "selectValuesHint": "Select which values to use for each option"
+        }
       },
       "successToast": "Product {{title}} was successfully created."
     },
@@ -709,13 +705,6 @@
         "header": "Create Option",
         "successToast": "Option {{title}} was successfully created."
       },
-      "manage": {
-        "header": "Manage Product Options",
-        "description": "Associate or disassociate product options from this product.",
-        "label": "Product Options",
-        "hint": "Select which options should be associated to this product.",
-        "placeholder": "Select options"
-      },
       "deleteWarning": "You are about to delete the product option: {{title}}. This action cannot be undone."
     },
     "organization": {
@@ -852,41 +841,6 @@
       }
     }
   },
-  "productOptions": {
-    "domain": "Options",
-    "subtitle": "Manage product options and their associated values.",
-    "values": {
-      "header": "Values"
-    },
-    "create": {
-      "header": "Create Product Option",
-      "hint": "Create a new product option and manage its values.",
-      "successToast": "Product option \"{{title}}\" was successfully created.",
-      "tabs": {
-        "details": "Details",
-        "organize": "Organize"
-      }
-    },
-    "edit": {
-      "header": "Edit Product Option",
-      "description": "Edit the product option to update its details and associated values.",
-      "successToast": "Product option \"{{title}}\" was successfully updated."
-    },
-    "delete": {
-      "confirmation": "You are about to delete the product option \"{{title}}\". This action cannot be undone.",
-      "successToast": "Product option was successfully deleted."
-    },
-    "fields": {
-      "title": {
-        "label": "Title",
-        "placeholder": "Size"
-      },
-      "values": {
-        "label": "Values",
-        "placeholder": "S, M, L"
-      }
-    }
-  },
   "inventory": {
     "domain": "Inventory",
     "subtitle": "Manage your inventory items",

package/src/routes/orders/order-create-edit/components/order-edit-create-form/order-edit-item.tsx

@@ -1,6 +1,11 @@
-import { ArrowUturnLeft, DocumentSeries, XCircle } from "@medusajs/icons"
+import {
+  ArrowUturnLeft,
+  DocumentSeries,
+  ReceiptPercent,
+  XCircle,
+} from "@medusajs/icons"
 import { AdminOrderLineItem } from "@medusajs/types"
-import { Badge, Input, Text, toast } from "@medusajs/ui"
+import { Badge, Input, Text, toast, Tooltip } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 
 import { ActionMenu } from "../../../../../components/common/action-menu"
@@ -45,6 +50,10 @@ function OrderEditItem({ item, currencyCode, orderId }: OrderEditItemProps) {
     return !!updateAction && item.quantity === item.detail.fulfilled_quantity
   }, [item])
 
+  const appliedPromoCodes = useMemo(() => {
+    return (item.adjustments || []).map((adjustment) => adjustment.code)
+  }, [item])
+
   /**
    * HANDLERS
    */
@@ -166,7 +175,7 @@ function OrderEditItem({ item, currencyCode, orderId }: OrderEditItemProps) {
           )}
         </div>
 
-        <div className="flex flex-1 justify-between">
+        <div className="flex flex-1 items-center justify-between">
           <div className="flex flex-grow items-center gap-2">
             <Input
               className="bg-ui-bg-base txt-small w-[67px] rounded-lg [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
@@ -186,6 +195,22 @@ function OrderEditItem({ item, currencyCode, orderId }: OrderEditItemProps) {
             <Text className="txt-small text-ui-fg-subtle">
               {t("fields.qty")}
             </Text>
+
+            {appliedPromoCodes.length > 0 && (
+              <div className="flex flex-shrink pt-[2px]">
+                <Tooltip
+                  content={
+                    <span className="text-pretty">
+                      {appliedPromoCodes.map((code) => (
+                        <div key={code}>{code}</div>
+                      ))}
+                    </span>
+                  }
+                >
+                  <ReceiptPercent className="text-ui-fg-subtle font-normal" />
+                </Tooltip>
+              </div>
+            )}
           </div>
 
           <div className="text-ui-fg-subtle txt-small mr-2 flex flex-shrink-0">

package/src/routes/orders/order-create-exchange/components/exchange-create-form/exchange-inbound-item.tsx

@@ -1,6 +1,12 @@
-import { ChatBubble, DocumentText, XCircle, XMark } from "@medusajs/icons"
+import {
+  ChatBubble,
+  DocumentText,
+  ReceiptPercent,
+  XCircle,
+  XMark,
+} from "@medusajs/icons"
 import { AdminOrderLineItem, HttpTypes } from "@medusajs/types"
-import { IconButton, Input, Text } from "@medusajs/ui"
+import { IconButton, Input, Text, Tooltip } from "@medusajs/ui"
 import { UseFormReturn } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 
@@ -39,13 +45,17 @@ function ExchangeInboundItem({
   const showReturnReason = typeof formItem.reason_id === "string"
   const showNote = typeof formItem.note === "string"
 
+  const appliedPromoCodes = (previewItem.adjustments || []).map(
+    (adjustment) => adjustment.code
+  )
+
   return (
     <div className="bg-ui-bg-subtle shadow-elevation-card-rest my-2 rounded-xl ">
-      <div className="flex flex-col items-center gap-x-2 gap-y-2 p-3 text-sm md:flex-row">
+      <div className="flex flex-col items-center gap-x-3 gap-y-2 p-3 text-sm md:flex-row">
         <div className="flex flex-1 items-center gap-x-3">
           <Thumbnail src={item.thumbnail} />
 
-          <div className="flex flex-col">
+          <div className="flex flex-grow flex-col">
             <div>
               <Text className="txt-small" as="span" weight="plus">
                 {item.title}{" "}
@@ -57,6 +67,21 @@ function ExchangeInboundItem({
               {item.product_title}
             </Text>
           </div>
+          {appliedPromoCodes.length > 0 && (
+            <div className="flex flex-shrink">
+              <Tooltip
+                content={
+                  <span className="text-pretty">
+                    {appliedPromoCodes.map((code) => (
+                      <div key={code}>{code}</div>
+                    ))}
+                  </span>
+                }
+              >
+                <ReceiptPercent className="text-ui-fg-subtle" />
+              </Tooltip>
+            </div>
+          )}
         </div>
 
         <div className="flex flex-1 justify-between">

package/src/routes/orders/order-create-exchange/components/exchange-create-form/exchange-outbound-item.tsx

@@ -1,6 +1,6 @@
-import { XCircle } from "@medusajs/icons"
+import { ReceiptPercent, XCircle } from "@medusajs/icons"
 import { AdminOrderLineItem, HttpTypes } from "@medusajs/types"
-import { Input, Text } from "@medusajs/ui"
+import { Input, Text, Tooltip } from "@medusajs/ui"
 import { UseFormReturn } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 
@@ -32,13 +32,17 @@ function ExchangeOutboundItem({
 }: ExchangeOutboundItemProps) {
   const { t } = useTranslation()
 
+  const appliedPromoCodes = (previewItem.adjustments || []).map(
+    (adjustment) => adjustment.code
+  )
+
   return (
     <div className="bg-ui-bg-subtle shadow-elevation-card-rest my-2 rounded-xl ">
-      <div className="flex flex-col items-center gap-x-2 gap-y-2 p-3 text-sm md:flex-row">
+      <div className="flex flex-col items-center gap-x-3 gap-y-2 p-3 text-sm md:flex-row">
         <div className="flex flex-1 items-center gap-x-3">
           <Thumbnail src={previewItem.thumbnail} />
 
-          <div className="flex flex-col">
+          <div className="flex flex-grow flex-col">
             <div>
               <Text className="txt-small" as="span" weight="plus">
                 {previewItem.title}{" "}
@@ -52,6 +56,21 @@ function ExchangeOutboundItem({
               {previewItem.subtitle}
             </Text>
           </div>
+          {appliedPromoCodes.length > 0 && (
+            <div className="flex flex-shrink">
+              <Tooltip
+                content={
+                  <span className="text-pretty">
+                    {appliedPromoCodes.map((code) => (
+                      <div key={code}>{code}</div>
+                    ))}
+                  </span>
+                }
+              >
+                <ReceiptPercent className="text-ui-fg-subtle" />
+              </Tooltip>
+            </div>
+          )}
         </div>
 
         <div className="flex flex-1 justify-between">

package/src/routes/orders/order-detail/constants.ts

@@ -5,6 +5,7 @@ const DEFAULT_PROPERTIES = [
   "canceled_at",
   "email",
   "display_id",
+  "custom_display_id",
   "currency_code",
   "metadata",
   // --- TOTALS ---

package/src/routes/orders/order-list/const.ts

@@ -4,6 +4,7 @@ export const DEFAULT_PROPERTIES = [
   "created_at",
   "email",
   "display_id",
+  "custom_display_id",
   "payment_status",
   "fulfillment_status",
   "total",

package/src/routes/price-lists/price-list-detail/components/price-list-general-section/price-list-general-section.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next"
 import { ActionMenu } from "../../../../../components/common/action-menu"
 import { useDeletePriceListAction } from "../../../common/hooks/use-delete-price-list-action"
 import { getPriceListStatus } from "../../../common/utils"
+import { usePriceListPrices } from "../../../../../hooks/api"
 
 type PriceListGeneralSectionProps = {
   priceList: HttpTypes.AdminPriceList
@@ -15,8 +16,11 @@ export const PriceListGeneralSection = ({
   priceList,
 }: PriceListGeneralSectionProps) => {
   const { t } = useTranslation()
+  const { count, isLoading, error } = usePriceListPrices(priceList.id, {
+    limit: 1,
+  })
 
-  const overrideCount = priceList.prices?.length || 0
+  const overrideCount = count
 
   const { color, text } = getPriceListStatus(t, priceList)
 
@@ -77,9 +81,11 @@ export const PriceListGeneralSection = ({
         <Text leading="compact" size="small" weight="plus">
           {t("priceLists.fields.priceOverrides.label")}
         </Text>
-        <Text size="small" className="text-pretty">
-          {overrideCount || "-"}
-        </Text>
+        {!isLoading && !error && (
+          <Text size="small" className="text-pretty">
+            {overrideCount || "-"}
+          </Text>
+        )}
       </div>
     </Container>
   )

package/src/routes/price-lists/price-list-list/components/price-list-list-table/price-count-cell.tsx

@@ -0,0 +1,19 @@
+import { usePriceListPrices } from "../../../../../hooks/api/price-lists"
+import { PlaceholderCell } from "../../../../../components/table/table-cells/common/placeholder-cell"
+import { TextCell } from "../../../../../components/table/table-cells/common/text-cell"
+
+type PriceCountCellProps = {
+  priceListId: string
+}
+
+export const PriceCountCell = ({ priceListId }: PriceCountCellProps) => {
+  const { count, isLoading } = usePriceListPrices(priceListId, {
+    limit: 1,
+  })
+
+  if (isLoading) {
+    return <PlaceholderCell />
+  }
+
+  return <TextCell text={count && count > 0 ? count.toString() : "-"} />
+}

package/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-columns.tsx

@@ -4,12 +4,10 @@ import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 
 import { StatusCell } from "../../../../../components/table/table-cells/common/status-cell"
-import {
-  TextCell,
-  TextHeader,
-} from "../../../../../components/table/table-cells/common/text-cell"
+import { TextHeader } from "../../../../../components/table/table-cells/common/text-cell"
 import { getPriceListStatus } from "../../../common/utils"
 import { PriceListListTableActions } from "./price-list-list-table-actions"
+import { PriceCountCell } from "./price-count-cell"
 
 const columnHelper = createColumnHelper<HttpTypes.AdminPriceList>()
 
@@ -30,9 +28,10 @@ export const usePricingTableColumns = () => {
           return <StatusCell color={color}>{text}</StatusCell>
         },
       }),
-      columnHelper.accessor("prices", {
+      columnHelper.display({
+        id: "price_overrides",
         header: t("priceLists.fields.priceOverrides.header"),
-        cell: (info) => <TextCell text={`${info.getValue()?.length || "-"}`} />,
+        cell: ({ row }) => <PriceCountCell priceListId={row.original.id} />,
       }),
       columnHelper.display({
         id: "actions",

package/src/routes/price-lists/price-list-prices-add/price-list-prices-add.tsx

@@ -7,7 +7,10 @@ import { PriceListPricesAddForm } from "./components/price-list-prices-add-form"
 export const PriceListProductsAdd = () => {
   const { id } = useParams<{ id: string }>()
 
-  const { price_list, isPending, isError, error } = usePriceList(id!)
+  const { price_list, isPending, isError, error } = usePriceList(id!, {
+    fields:
+      "*prices,prices.price_set.variant.id,prices.price_rules.attribute,prices.price_rules.value",
+  })
   const { currencies, regions, pricePreferences, isReady } =
     usePriceListCurrencyData()
 

package/src/routes/price-lists/price-list-prices-edit/price-list-prices-edit.tsx

@@ -10,7 +10,9 @@ export const PriceListPricesEdit = () => {
   const [searchParams] = useSearchParams()
   const ids = searchParams.get("ids[]")
 
-  const { price_list, isLoading, isError, error } = usePriceList(id!)
+  const { price_list, isLoading, isError, error } = usePriceList(id!, {
+    fields: "*prices,prices.price_set.variant.id,prices.price_rules.attribute,prices.price_rules.value",
+  })
   const productIds = ids?.split(",")
 
   const {

package/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-general-section/product-create-general-section.tsx

@@ -27,10 +27,7 @@ export const ProductCreateGeneralSection = ({
                 <Form.Item>
                   <Form.Label>{t("products.fields.title.label")}</Form.Label>
                   <Form.Control>
-                    <Input
-                      {...field}
-                      placeholder={t("products.fields.title.placeholder")}
-                    />
+                    <Input {...field} placeholder={t("products.fields.title.placeholder")} />
                   </Form.Control>
                 </Form.Item>
               )
@@ -46,10 +43,7 @@ export const ProductCreateGeneralSection = ({
                     {t("products.fields.subtitle.label")}
                   </Form.Label>
                   <Form.Control>
-                    <Input
-                      {...field}
-                      placeholder={t("products.fields.subtitle.placeholder")}
-                    />
+                    <Input {...field} placeholder={t("products.fields.subtitle.placeholder")} />
                   </Form.Control>
                 </Form.Item>
               )
@@ -68,10 +62,7 @@ export const ProductCreateGeneralSection = ({
                     {t("fields.handle")}
                   </Form.Label>
                   <Form.Control>
-                    <HandleInput
-                      {...field}
-                      placeholder={t("products.fields.handle.placeholder")}
-                    />
+                    <HandleInput {...field} placeholder={t("products.fields.handle.placeholder")} />
                   </Form.Control>
                 </Form.Item>
               )
@@ -89,10 +80,7 @@ export const ProductCreateGeneralSection = ({
                 {t("products.fields.description.label")}
               </Form.Label>
               <Form.Control>
-                <Textarea
-                  {...field}
-                  placeholder={t("products.fields.description.placeholder")}
-                />
+                <Textarea {...field} placeholder={t("products.fields.description.placeholder")} />
               </Form.Control>
             </Form.Item>
           )