@open-mercato/core 0.6.2-develop.3372.1.de9a169973 → 0.6.2-develop.3380.1.bb14509041

package/dist/modules/sales/widgets/notifications/SalesOrderCreatedRenderer.js

@@ -1,9 +1,10 @@
 "use client";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
-import { ShoppingCart, ExternalLink, DollarSign, User, Calendar } from "lucide-react";
+import { ShoppingCart, ExternalLink, Loader2, X } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Button } from "@open-mercato/ui/primitives/button";
+import { IconButton } from "@open-mercato/ui/primitives/icon-button";
 import { cn } from "@open-mercato/shared/lib/utils";
 import { formatRelativeTime } from "@open-mercato/shared/lib/time";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
@@ -44,12 +45,13 @@ function SalesOrderCreatedRenderer({
       setExecuting(false);
     }
   };
+  const timeAgo = formatRelativeTime(notification.createdAt, { translate: t }) ?? "";
   return /* @__PURE__ */ jsxs(
     "div",
     {
       className: cn(
-        "group relative px-4 py-3 hover:bg-muted/50 cursor-pointer transition-colors border-l-4 border-l-status-info-border",
-        isUnread && "bg-status-info-bg/50"
+        "group relative flex gap-4 items-start rounded-xl p-3 transition-colors hover:bg-muted/40 cursor-pointer",
+        isUnread && "bg-muted/20"
       ),
       onClick: handleView,
       onKeyDown: (e) => {
@@ -61,66 +63,86 @@ function SalesOrderCreatedRenderer({
       role: "button",
       tabIndex: 0,
       children: [
-        isUnread && /* @__PURE__ */ jsx("div", { className: "absolute left-1.5 top-1/2 -translate-y-1/2 h-2 w-2 rounded-full bg-primary" }),
-        /* @__PURE__ */ jsxs("div", { className: "flex gap-3", children: [
-          /* @__PURE__ */ jsx("div", { className: "flex-shrink-0 mt-0.5", children: /* @__PURE__ */ jsx("div", { className: "h-10 w-10 rounded-lg bg-status-info-bg flex items-center justify-center", children: /* @__PURE__ */ jsx(ShoppingCart, { className: "h-5 w-5 text-status-info-icon" }) }) }),
-          /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0", children: [
-            /* @__PURE__ */ jsxs("div", { className: "flex items-start justify-between gap-2", children: [
-              /* @__PURE__ */ jsxs("div", { children: [
-                /* @__PURE__ */ jsx("h4", { className: cn("text-sm font-medium", isUnread && "font-semibold"), children: notification.title }),
-                orderNumber && /* @__PURE__ */ jsx("div", { className: "flex items-center gap-1 mt-0.5", children: /* @__PURE__ */ jsxs("span", { className: "text-xs font-mono text-muted-foreground bg-muted px-1.5 py-0.5 rounded", children: [
-                  "#",
-                  orderNumber
-                ] }) })
+        /* @__PURE__ */ jsxs("div", { className: "relative shrink-0 flex size-10 items-center justify-center rounded-full bg-status-info-bg", children: [
+          /* @__PURE__ */ jsx(ShoppingCart, { className: "size-5 text-status-info-icon", "aria-hidden": "true" }),
+          isUnread ? /* @__PURE__ */ jsx(
+            "span",
+            {
+              className: "absolute -right-1 -top-1 size-3 rounded-full bg-accent-indigo ring-2 ring-background",
+              "aria-hidden": "true"
+            }
+          ) : null
+        ] }),
+        /* @__PURE__ */ jsxs("div", { className: "flex min-w-0 flex-1 flex-col gap-1", children: [
+          /* @__PURE__ */ jsx("p", { className: "truncate text-sm font-medium leading-5 tracking-tight text-foreground", children: notification.title }),
+          /* @__PURE__ */ jsxs("div", { className: "text-xs leading-4 text-muted-foreground", children: [
+            timeAgo ? /* @__PURE__ */ jsxs(Fragment, { children: [
+              /* @__PURE__ */ jsx("span", { className: "whitespace-nowrap", children: timeAgo }),
+              /* @__PURE__ */ jsx("span", { "aria-hidden": "true", className: "mx-1 text-text-disabled", children: "\xB7" })
+            ] }) : null,
+            orderNumber ? /* @__PURE__ */ jsxs(Fragment, { children: [
+              /* @__PURE__ */ jsxs("span", { className: "inline-flex items-center rounded bg-muted px-1.5 py-0.5 font-mono text-overline text-foreground", children: [
+                "#",
+                orderNumber
               ] }),
-              /* @__PURE__ */ jsxs("span", { className: "flex-shrink-0 text-xs text-muted-foreground flex items-center gap-1", children: [
-                /* @__PURE__ */ jsx(Calendar, { className: "h-3 w-3" }),
-                formatRelativeTime(notification.createdAt, { translate: t }) ?? ""
-              ] })
-            ] }),
-            /* @__PURE__ */ jsxs("div", { className: "mt-2 flex items-center gap-4 text-xs text-muted-foreground", children: [
-              currentTotal && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
-                /* @__PURE__ */ jsx(DollarSign, { className: "h-3 w-3" }),
-                /* @__PURE__ */ jsx("span", { className: "font-medium text-foreground", children: currentTotal })
-              ] }),
-              /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
-                /* @__PURE__ */ jsx(User, { className: "h-3 w-3" }),
-                /* @__PURE__ */ jsx("span", { children: t("sales.notifications.renderer.assignedToYou", "Assigned to you") })
-              ] })
-            ] }),
-            /* @__PURE__ */ jsxs("div", { className: "mt-3 flex gap-2", children: [
-              /* @__PURE__ */ jsxs(
-                Button,
-                {
-                  variant: "default",
-                  size: "sm",
-                  onClick: (e) => {
-                    e.stopPropagation();
-                    handleView();
-                  },
-                  disabled: executing || !viewAction && !notification.linkHref,
-                  className: "gap-1",
-                  children: [
-                    /* @__PURE__ */ jsx(ExternalLink, { className: "h-3 w-3" }),
-                    t("sales.notifications.renderer.viewOrder", "View Order")
-                  ]
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                Button,
-                {
-                  variant: "ghost",
-                  size: "sm",
-                  onClick: (e) => {
-                    e.stopPropagation();
-                    onDismiss();
-                  },
-                  children: t("notifications.actions.dismiss", "Dismiss")
-                }
-              )
-            ] })
+              /* @__PURE__ */ jsx("span", { "aria-hidden": "true", className: "mx-1 text-text-disabled", children: "\xB7" })
+            ] }) : null,
+            currentTotal ? /* @__PURE__ */ jsxs(Fragment, { children: [
+              /* @__PURE__ */ jsx("span", { className: "whitespace-nowrap font-medium text-foreground", children: currentTotal }),
+              /* @__PURE__ */ jsx("span", { "aria-hidden": "true", className: "mx-1 text-text-disabled", children: "\xB7" })
+            ] }) : null,
+            /* @__PURE__ */ jsx("span", { className: "whitespace-nowrap", children: t("sales.notifications.renderer.assignedToYou", "Assigned to you") })
+          ] }),
+          /* @__PURE__ */ jsxs("div", { className: "mt-2 flex items-center gap-2", children: [
+            /* @__PURE__ */ jsxs(
+              Button,
+              {
+                type: "button",
+                size: "sm",
+                className: "h-8 rounded-md px-2.5 bg-accent-indigo text-accent-indigo-foreground hover:bg-accent-indigo/90",
+                onClick: (e) => {
+                  e.stopPropagation();
+                  handleView();
+                },
+                disabled: executing || !viewAction && !notification.linkHref,
+                children: [
+                  /* @__PURE__ */ jsx(ExternalLink, { className: "size-3.5", "aria-hidden": "true" }),
+                  t("sales.notifications.renderer.viewOrder", "View Order"),
+                  executing ? /* @__PURE__ */ jsx(Loader2, { className: "ml-1 size-3 animate-spin" }) : null
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              Button,
+              {
+                type: "button",
+                variant: "outline",
+                size: "sm",
+                className: "h-8 rounded-md px-2.5",
+                onClick: (e) => {
+                  e.stopPropagation();
+                  onDismiss();
+                },
+                children: t("notifications.actions.dismiss", "Dismiss")
+              }
+            )
           ] })
-        ] })
+        ] }),
+        /* @__PURE__ */ jsx(
+          IconButton,
+          {
+            type: "button",
+            variant: "ghost",
+            size: "xs",
+            className: "absolute right-2 top-2 opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100",
+            onClick: (e) => {
+              e.stopPropagation();
+              onDismiss();
+            },
+            "aria-label": t("notifications.actions.dismiss", "Dismiss"),
+            children: /* @__PURE__ */ jsx(X, { className: "size-3.5" })
+          }
+        )
       ]
     }
   );

package/dist/modules/sales/widgets/notifications/SalesOrderCreatedRenderer.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/sales/widgets/notifications/SalesOrderCreatedRenderer.tsx"],
-  "sourcesContent": ["'use client'\n\nimport * as React from 'react'\nimport { ShoppingCart, ExternalLink, DollarSign, User, Calendar } from 'lucide-react'\nimport { useRouter } from 'next/navigation'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { cn } from '@open-mercato/shared/lib/utils'\nimport { formatRelativeTime } from '@open-mercato/shared/lib/time'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport type { NotificationRendererProps } from '@open-mercato/shared/modules/notifications/types'\nimport { formatMoney } from '../../components/documents/lineItemUtils'\nimport { useSalesDocumentTotals } from './useSalesDocumentTotals'\n\nfunction normalizeTotal(value?: string | null): string | null {\n  if (!value) return null\n  let trimmed = value.trim()\n  if (trimmed.startsWith('(') && trimmed.endsWith(')')) {\n    trimmed = trimmed.slice(1, -1).trim()\n  }\n  return trimmed.length ? trimmed : null\n}\n\nexport function SalesOrderCreatedRenderer({\n  notification,\n  onAction,\n  onDismiss,\n  actions = [],\n}: NotificationRendererProps) {\n  const t = useT()\n  const router = useRouter()\n  const [executing, setExecuting] = React.useState(false)\n  const isUnread = notification.status === 'unread'\n  const orderNumber = notification.bodyVariables?.orderNumber ?? notification.titleVariables?.orderNumber\n  const fallbackTotal =\n    normalizeTotal(notification.bodyVariables?.totalAmount ?? null) ??\n    normalizeTotal(notification.bodyVariables?.total ?? null)\n  const { totals } = useSalesDocumentTotals('order', notification.sourceEntityId)\n\n  const currentTotal =\n    totals && typeof totals.grandTotalGrossAmount === 'number'\n      ? formatMoney(totals.grandTotalGrossAmount, totals.currencyCode)\n      : fallbackTotal\n\n  const viewAction = actions.find((action) => action.id === 'view') ?? actions[0] ?? null\n\n  const handleView = async () => {\n    if (!viewAction) {\n      if (notification.linkHref) router.push(notification.linkHref)\n      return\n    }\n    setExecuting(true)\n    try {\n      await onAction(viewAction.id)\n    } finally {\n      setExecuting(false)\n    }\n  }\n\n  return (\n    <div\n      className={cn(\n        'group relative px-4 py-3 hover:bg-muted/50 cursor-pointer transition-colors border-l-4 border-l-status-info-border',\n        isUnread && 'bg-status-info-bg/50'\n      )}\n      onClick={handleView}\n      onKeyDown={(e) => {\n        if (e.key === 'Enter' || e.key === ' ') {\n          e.preventDefault()\n          handleView()\n        }\n      }}\n      role=\"button\"\n      tabIndex={0}\n    >\n      {isUnread && (\n        <div className=\"absolute left-1.5 top-1/2 -translate-y-1/2 h-2 w-2 rounded-full bg-primary\" />\n      )}\n\n      <div className=\"flex gap-3\">\n        <div className=\"flex-shrink-0 mt-0.5\">\n          <div className=\"h-10 w-10 rounded-lg bg-status-info-bg flex items-center justify-center\">\n            <ShoppingCart className=\"h-5 w-5 text-status-info-icon\" />\n          </div>\n        </div>\n\n        <div className=\"flex-1 min-w-0\">\n          <div className=\"flex items-start justify-between gap-2\">\n            <div>\n              <h4 className={cn('text-sm font-medium', isUnread && 'font-semibold')}>\n                {notification.title}\n              </h4>\n              {orderNumber && (\n                <div className=\"flex items-center gap-1 mt-0.5\">\n                  <span className=\"text-xs font-mono text-muted-foreground bg-muted px-1.5 py-0.5 rounded\">\n                    #{orderNumber}\n                  </span>\n                </div>\n              )}\n            </div>\n            <span className=\"flex-shrink-0 text-xs text-muted-foreground flex items-center gap-1\">\n              <Calendar className=\"h-3 w-3\" />\n              {formatRelativeTime(notification.createdAt, { translate: t }) ?? ''}\n            </span>\n          </div>\n\n          <div className=\"mt-2 flex items-center gap-4 text-xs text-muted-foreground\">\n            {currentTotal && (\n              <div className=\"flex items-center gap-1\">\n                <DollarSign className=\"h-3 w-3\" />\n                <span className=\"font-medium text-foreground\">{currentTotal}</span>\n              </div>\n            )}\n            <div className=\"flex items-center gap-1\">\n              <User className=\"h-3 w-3\" />\n              <span>{t('sales.notifications.renderer.assignedToYou', 'Assigned to you')}</span>\n            </div>\n          </div>\n\n          <div className=\"mt-3 flex gap-2\">\n            <Button\n              variant=\"default\"\n              size=\"sm\"\n              onClick={(e) => {\n                e.stopPropagation()\n                handleView()\n              }}\n              disabled={executing || (!viewAction && !notification.linkHref)}\n              className=\"gap-1\"\n            >\n              <ExternalLink className=\"h-3 w-3\" />\n              {t('sales.notifications.renderer.viewOrder', 'View Order')}\n            </Button>\n            <Button\n              variant=\"ghost\"\n              size=\"sm\"\n              onClick={(e) => {\n                e.stopPropagation()\n                onDismiss()\n              }}\n            >\n              {t('notifications.actions.dismiss', 'Dismiss')}\n            </Button>\n          </div>\n        </div>\n      </div>\n    </div>\n  )\n}\n\nexport default SalesOrderCreatedRenderer\n"],
-  "mappings": "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",
+  "sourcesContent": ["'use client'\n\nimport * as React from 'react'\nimport { ShoppingCart, ExternalLink, Loader2, X } from 'lucide-react'\nimport { useRouter } from 'next/navigation'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { IconButton } from '@open-mercato/ui/primitives/icon-button'\nimport { cn } from '@open-mercato/shared/lib/utils'\nimport { formatRelativeTime } from '@open-mercato/shared/lib/time'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport type { NotificationRendererProps } from '@open-mercato/shared/modules/notifications/types'\nimport { formatMoney } from '../../components/documents/lineItemUtils'\nimport { useSalesDocumentTotals } from './useSalesDocumentTotals'\n\nfunction normalizeTotal(value?: string | null): string | null {\n  if (!value) return null\n  let trimmed = value.trim()\n  if (trimmed.startsWith('(') && trimmed.endsWith(')')) {\n    trimmed = trimmed.slice(1, -1).trim()\n  }\n  return trimmed.length ? trimmed : null\n}\n\nexport function SalesOrderCreatedRenderer({\n  notification,\n  onAction,\n  onDismiss,\n  actions = [],\n}: NotificationRendererProps) {\n  const t = useT()\n  const router = useRouter()\n  const [executing, setExecuting] = React.useState(false)\n  const isUnread = notification.status === 'unread'\n  const orderNumber = notification.bodyVariables?.orderNumber ?? notification.titleVariables?.orderNumber\n  const fallbackTotal =\n    normalizeTotal(notification.bodyVariables?.totalAmount ?? null) ??\n    normalizeTotal(notification.bodyVariables?.total ?? null)\n  const { totals } = useSalesDocumentTotals('order', notification.sourceEntityId)\n\n  const currentTotal =\n    totals && typeof totals.grandTotalGrossAmount === 'number'\n      ? formatMoney(totals.grandTotalGrossAmount, totals.currencyCode)\n      : fallbackTotal\n\n  const viewAction = actions.find((action) => action.id === 'view') ?? actions[0] ?? null\n\n  const handleView = async () => {\n    if (!viewAction) {\n      if (notification.linkHref) router.push(notification.linkHref)\n      return\n    }\n    setExecuting(true)\n    try {\n      await onAction(viewAction.id)\n    } finally {\n      setExecuting(false)\n    }\n  }\n\n  const timeAgo = formatRelativeTime(notification.createdAt, { translate: t }) ?? ''\n\n  return (\n    <div\n      className={cn(\n        'group relative flex gap-4 items-start rounded-xl p-3 transition-colors hover:bg-muted/40 cursor-pointer',\n        isUnread && 'bg-muted/20',\n      )}\n      onClick={handleView}\n      onKeyDown={(e) => {\n        if (e.key === 'Enter' || e.key === ' ') {\n          e.preventDefault()\n          handleView()\n        }\n      }}\n      role=\"button\"\n      tabIndex={0}\n    >\n      {/* Avatar: indigo-tinted circle with shopping-cart icon */}\n      <div className=\"relative shrink-0 flex size-10 items-center justify-center rounded-full bg-status-info-bg\">\n        <ShoppingCart className=\"size-5 text-status-info-icon\" aria-hidden=\"true\" />\n        {isUnread ? (\n          <span\n            className=\"absolute -right-1 -top-1 size-3 rounded-full bg-accent-indigo ring-2 ring-background\"\n            aria-hidden=\"true\"\n          />\n        ) : null}\n      </div>\n\n      <div className=\"flex min-w-0 flex-1 flex-col gap-1\">\n        {/* Title row */}\n        <p className=\"truncate text-sm font-medium leading-5 tracking-tight text-foreground\">\n          {notification.title}\n        </p>\n\n        {/* Description row: time \u00B7 order# \u00B7 total \u00B7 assigned \u2014 inline so it wraps naturally per line */}\n        <div className=\"text-xs leading-4 text-muted-foreground\">\n          {timeAgo ? (\n            <>\n              <span className=\"whitespace-nowrap\">{timeAgo}</span>\n              <span aria-hidden=\"true\" className=\"mx-1 text-text-disabled\">\u00B7</span>\n            </>\n          ) : null}\n          {orderNumber ? (\n            <>\n              <span className=\"inline-flex items-center rounded bg-muted px-1.5 py-0.5 font-mono text-overline text-foreground\">\n                #{orderNumber}\n              </span>\n              <span aria-hidden=\"true\" className=\"mx-1 text-text-disabled\">\u00B7</span>\n            </>\n          ) : null}\n          {currentTotal ? (\n            <>\n              <span className=\"whitespace-nowrap font-medium text-foreground\">{currentTotal}</span>\n              <span aria-hidden=\"true\" className=\"mx-1 text-text-disabled\">\u00B7</span>\n            </>\n          ) : null}\n          <span className=\"whitespace-nowrap\">{t('sales.notifications.renderer.assignedToYou', 'Assigned to you')}</span>\n        </div>\n\n        {/* Actions row */}\n        <div className=\"mt-2 flex items-center gap-2\">\n          <Button\n            type=\"button\"\n            size=\"sm\"\n            className=\"h-8 rounded-md px-2.5 bg-accent-indigo text-accent-indigo-foreground hover:bg-accent-indigo/90\"\n            onClick={(e) => {\n              e.stopPropagation()\n              handleView()\n            }}\n            disabled={executing || (!viewAction && !notification.linkHref)}\n          >\n            <ExternalLink className=\"size-3.5\" aria-hidden=\"true\" />\n            {t('sales.notifications.renderer.viewOrder', 'View Order')}\n            {executing ? <Loader2 className=\"ml-1 size-3 animate-spin\" /> : null}\n          </Button>\n          <Button\n            type=\"button\"\n            variant=\"outline\"\n            size=\"sm\"\n            className=\"h-8 rounded-md px-2.5\"\n            onClick={(e) => {\n              e.stopPropagation()\n              onDismiss()\n            }}\n          >\n            {t('notifications.actions.dismiss', 'Dismiss')}\n          </Button>\n        </div>\n      </div>\n\n      <IconButton\n        type=\"button\"\n        variant=\"ghost\"\n        size=\"xs\"\n        className=\"absolute right-2 top-2 opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100\"\n        onClick={(e) => {\n          e.stopPropagation()\n          onDismiss()\n        }}\n        aria-label={t('notifications.actions.dismiss', 'Dismiss')}\n      >\n        <X className=\"size-3.5\" />\n      </IconButton>\n    </div>\n  )\n}\n\nexport default SalesOrderCreatedRenderer\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.2-develop.3372.1.de9a169973",
+  "version": "0.6.2-develop.3380.1.bb14509041",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -238,16 +238,16 @@
     "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.2-develop.3372.1.de9a169973",
-    "@open-mercato/shared": "0.6.2-develop.3372.1.de9a169973",
-    "@open-mercato/ui": "0.6.2-develop.3372.1.de9a169973",
+    "@open-mercato/ai-assistant": "0.6.2-develop.3380.1.bb14509041",
+    "@open-mercato/shared": "0.6.2-develop.3380.1.bb14509041",
+    "@open-mercato/ui": "0.6.2-develop.3380.1.bb14509041",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.2-develop.3372.1.de9a169973",
-    "@open-mercato/shared": "0.6.2-develop.3372.1.de9a169973",
-    "@open-mercato/ui": "0.6.2-develop.3372.1.de9a169973",
+    "@open-mercato/ai-assistant": "0.6.2-develop.3380.1.bb14509041",
+    "@open-mercato/shared": "0.6.2-develop.3380.1.bb14509041",
+    "@open-mercato/ui": "0.6.2-develop.3380.1.bb14509041",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/notifications/i18n/de.json

@@ -4,6 +4,7 @@
   "notifications.actions.markRead": "Als gelesen markieren",
   "notifications.actions.undo": "Rückgängig",
   "notifications.badge.unread": "{count} ungelesene Benachrichtigungen",
+  "notifications.close": "Benachrichtigungen schließen",
   "notifications.delivery.email.actionNotice": "Aktionen sind in Open Mercato verfügbar und in dieser E-Mail schreibgeschützt.",
   "notifications.delivery.email.bodyIntro": "Prüfen Sie die Benachrichtigung und führen Sie bei Bedarf Aktionen aus.",
   "notifications.delivery.email.footer": "Open Mercato Benachrichtigungen",
@@ -17,6 +18,9 @@
   "notifications.filters.actionRequired": "Aktion erforderlich",
   "notifications.filters.all": "Alle",
   "notifications.filters.unread": "Ungelesen",
+  "notifications.footer.manage": "Benachrichtigungen verwalten",
+  "notifications.footer.toNavigate": "zum Navigieren",
+  "notifications.footer.useHint": "Verwende",
   "notifications.markAllRead": "Alle als gelesen markieren",
   "notifications.nav.title": "Benachrichtigungen",
   "notifications.settings.core.appUrl": "Anwendungs-URL",
@@ -46,5 +50,6 @@
   "notifications.toast.actionError": "Aktion konnte nicht ausgeführt werden",
   "notifications.toast.actionSuccess": "Aktion erfolgreich ausgeführt",
   "notifications.toast.dismissed": "Benachrichtigung verworfen",
-  "notifications.toast.new": "Neue Benachrichtigung"
+  "notifications.toast.new": "Neue Benachrichtigung",
+  "notifications.unreadSummary": "{count} ungelesen"
 }

package/src/modules/notifications/i18n/en.json

@@ -4,6 +4,7 @@
   "notifications.actions.markRead": "Mark as read",
   "notifications.actions.undo": "Undo",
   "notifications.badge.unread": "{count} unread notifications",
+  "notifications.close": "Close notifications",
   "notifications.delivery.email.actionNotice": "Actions are available in Open Mercato and are read-only in this email.",
   "notifications.delivery.email.bodyIntro": "Review the notification details and take any required actions.",
   "notifications.delivery.email.footer": "Open Mercato notifications",
@@ -17,6 +18,9 @@
   "notifications.filters.actionRequired": "Action Required",
   "notifications.filters.all": "All",
   "notifications.filters.unread": "Unread",
+  "notifications.footer.manage": "Manage notifications",
+  "notifications.footer.toNavigate": "to navigate",
+  "notifications.footer.useHint": "Use",
   "notifications.markAllRead": "Mark all read",
   "notifications.nav.title": "Notifications",
   "notifications.settings.core.appUrl": "Application URL",
@@ -46,5 +50,6 @@
   "notifications.toast.actionError": "Failed to execute action",
   "notifications.toast.actionSuccess": "Action completed successfully",
   "notifications.toast.dismissed": "Notification dismissed",
-  "notifications.toast.new": "New notification"
+  "notifications.toast.new": "New notification",
+  "notifications.unreadSummary": "{count} unread"
 }

package/src/modules/notifications/i18n/es.json

@@ -4,6 +4,7 @@
   "notifications.actions.markRead": "Marcar como leída",
   "notifications.actions.undo": "Deshacer",
   "notifications.badge.unread": "{count} notificaciones no leídas",
+  "notifications.close": "Cerrar notificaciones",
   "notifications.delivery.email.actionNotice": "Las acciones están disponibles en Open Mercato y son de solo lectura en este correo.",
   "notifications.delivery.email.bodyIntro": "Revisa los detalles de la notificación y realiza las acciones necesarias.",
   "notifications.delivery.email.footer": "Notificaciones de Open Mercato",
@@ -17,6 +18,9 @@
   "notifications.filters.actionRequired": "Acción requerida",
   "notifications.filters.all": "Todas",
   "notifications.filters.unread": "No leídas",
+  "notifications.footer.manage": "Gestionar notificaciones",
+  "notifications.footer.toNavigate": "para navegar",
+  "notifications.footer.useHint": "Usa",
   "notifications.markAllRead": "Marcar todo como leído",
   "notifications.nav.title": "Notificaciones",
   "notifications.settings.core.appUrl": "URL de la aplicación",
@@ -46,5 +50,6 @@
   "notifications.toast.actionError": "No se pudo ejecutar la acción",
   "notifications.toast.actionSuccess": "Acción completada correctamente",
   "notifications.toast.dismissed": "Notificación descartada",
-  "notifications.toast.new": "Nueva notificación"
+  "notifications.toast.new": "Nueva notificación",
+  "notifications.unreadSummary": "{count} sin leer"
 }

package/src/modules/notifications/i18n/pl.json

@@ -4,6 +4,7 @@
   "notifications.actions.markRead": "Oznacz jako przeczytane",
   "notifications.actions.undo": "Cofnij",
   "notifications.badge.unread": "{count} nieprzeczytanych powiadomień",
+  "notifications.close": "Zamknij powiadomienia",
   "notifications.delivery.email.actionNotice": "Akcje są dostępne w Open Mercato i w tym e-mailu są tylko do odczytu.",
   "notifications.delivery.email.bodyIntro": "Sprawdź szczegóły powiadomienia i wykonaj wymagane działania.",
   "notifications.delivery.email.footer": "Powiadomienia Open Mercato",
@@ -17,6 +18,9 @@
   "notifications.filters.actionRequired": "Wymagana akcja",
   "notifications.filters.all": "Wszystkie",
   "notifications.filters.unread": "Nieprzeczytane",
+  "notifications.footer.manage": "Zarządzaj powiadomieniami",
+  "notifications.footer.toNavigate": "do nawigacji",
+  "notifications.footer.useHint": "Użyj",
   "notifications.markAllRead": "Oznacz wszystkie jako przeczytane",
   "notifications.nav.title": "Powiadomienia",
   "notifications.settings.core.appUrl": "URL aplikacji",
@@ -46,5 +50,6 @@
   "notifications.toast.actionError": "Nie udało się wykonać akcji",
   "notifications.toast.actionSuccess": "Akcja wykonana pomyślnie",
   "notifications.toast.dismissed": "Powiadomienie odrzucone",
-  "notifications.toast.new": "Nowe powiadomienie"
+  "notifications.toast.new": "Nowe powiadomienie",
+  "notifications.unreadSummary": "{count} nieprzeczytanych"
 }

package/src/modules/sales/api/order-adjustments/route.ts

@@ -4,7 +4,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { SalesOrderAdjustment } from '../../data/entities'
 import {
-  enforceReturnAdjustmentSign,
+  enforceAdjustmentSign,
   orderAdjustmentCreateSchema,
 } from '../../data/validators'
 import { createPagedListResponseSchema, createSalesCrudOpenApi, defaultOkResponseSchema } from '../openapi'
@@ -34,7 +34,7 @@ const routeMetadata = {
 
 const upsertSchema = orderAdjustmentCreateSchema
   .extend({ id: z.string().uuid().optional() })
-  .superRefine(enforceReturnAdjustmentSign)
+  .superRefine(enforceAdjustmentSign)
 
 const deleteSchema = z.object({
   id: z.string().uuid(),

package/src/modules/sales/api/quote-adjustments/route.ts

@@ -4,7 +4,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { SalesQuoteAdjustment } from '../../data/entities'
 import {
-  enforceReturnAdjustmentSign,
+  enforceAdjustmentSign,
   quoteAdjustmentCreateSchema,
 } from '../../data/validators'
 import { createPagedListResponseSchema, createSalesCrudOpenApi, defaultOkResponseSchema } from '../openapi'
@@ -34,7 +34,7 @@ const routeMetadata = {
 
 const upsertSchema = quoteAdjustmentCreateSchema
   .extend({ id: z.string().uuid().optional() })
-  .superRefine(enforceReturnAdjustmentSign)
+  .superRefine(enforceAdjustmentSign)
 
 const deleteSchema = z.object({
   id: z.string().uuid(),

package/src/modules/sales/commands/documents.ts

@@ -66,7 +66,7 @@ import {
   CustomerPersonProfile,
 } from "../../customers/data/entities";
 import {
-  enforceReturnAdjustmentSign,
+  enforceAdjustmentSign,
   quoteCreateSchema,
   quoteLineCreateSchema,
   quoteAdjustmentCreateSchema,
@@ -6304,7 +6304,7 @@ const orderAdjustmentUpsertSchema = orderAdjustmentCreateSchema
   .extend({
     id: z.string().uuid().optional(),
   })
-  .superRefine(enforceReturnAdjustmentSign);
+  .superRefine(enforceAdjustmentSign);
 
 const orderAdjustmentDeleteSchema = z.object({
   id: z.string().uuid(),
@@ -6315,7 +6315,7 @@ const quoteAdjustmentUpsertSchema = quoteAdjustmentCreateSchema
   .extend({
     id: z.string().uuid().optional(),
   })
-  .superRefine(enforceReturnAdjustmentSign);
+  .superRefine(enforceAdjustmentSign);
 
 const quoteAdjustmentDeleteSchema = z.object({
   id: z.string().uuid(),

package/src/modules/sales/data/validators.ts

@@ -419,13 +419,37 @@ export const quoteLineUpdateSchema = z
   })
   .merge(quoteLineCreateSchema.partial())
 
-// A `return` adjustment must never increase the grand total. The calculation
-// engine is defensively normalized to negative, but the API edge also rejects
-// positive amounts so bad input is caught before it reaches storage. See #1705.
+// Each adjustment kind has an intrinsic sign convention so the grand total
+// stays semantically correct regardless of operator input. The calculation
+// engine normalizes signs defensively, but the API edge rejects values that
+// would invert the kind's meaning so bad data never reaches storage.
+//
+// - `return`: non-positive — returns reduce the total (see #1705).
+// - `discount`: non-negative — discounts reduce the total.
+// - `surcharge`/`shipping`/`tax`: non-negative — they add to the total.
+// - `custom` and unknown kinds: unconstrained (operator-controlled).
+//
+// See #1905.
 export const RETURN_ADJUSTMENT_POSITIVE_NET_MESSAGE =
   'Return adjustments must use a non-positive amountNet (returns reduce the total).'
 export const RETURN_ADJUSTMENT_POSITIVE_GROSS_MESSAGE =
   'Return adjustments must use a non-positive amountGross (returns reduce the total).'
+export const DISCOUNT_ADJUSTMENT_NEGATIVE_NET_MESSAGE =
+  'Discount adjustments must use a non-negative amountNet (discounts reduce the total).'
+export const DISCOUNT_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE =
+  'Discount adjustments must use a non-negative amountGross (discounts reduce the total).'
+export const SURCHARGE_ADJUSTMENT_NEGATIVE_NET_MESSAGE =
+  'Surcharge adjustments must use a non-negative amountNet (surcharges add to the total).'
+export const SURCHARGE_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE =
+  'Surcharge adjustments must use a non-negative amountGross (surcharges add to the total).'
+export const SHIPPING_ADJUSTMENT_NEGATIVE_NET_MESSAGE =
+  'Shipping adjustments must use a non-negative amountNet (shipping adds to the total).'
+export const SHIPPING_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE =
+  'Shipping adjustments must use a non-negative amountGross (shipping adds to the total).'
+export const TAX_ADJUSTMENT_NEGATIVE_NET_MESSAGE =
+  'Tax adjustments must use a non-negative amountNet (taxes add to the total).'
+export const TAX_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE =
+  'Tax adjustments must use a non-negative amountGross (taxes add to the total).'
 
 type AdjustmentSignInput = {
   kind?: string
@@ -433,27 +457,72 @@ type AdjustmentSignInput = {
   amountGross?: number
 }
 
-export const enforceReturnAdjustmentSign = (
+const NON_NEGATIVE_SIGN_MESSAGES: Record<string, { net: string; gross: string }> = {
+  discount: {
+    net: DISCOUNT_ADJUSTMENT_NEGATIVE_NET_MESSAGE,
+    gross: DISCOUNT_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE,
+  },
+  surcharge: {
+    net: SURCHARGE_ADJUSTMENT_NEGATIVE_NET_MESSAGE,
+    gross: SURCHARGE_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE,
+  },
+  shipping: {
+    net: SHIPPING_ADJUSTMENT_NEGATIVE_NET_MESSAGE,
+    gross: SHIPPING_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE,
+  },
+  tax: {
+    net: TAX_ADJUSTMENT_NEGATIVE_NET_MESSAGE,
+    gross: TAX_ADJUSTMENT_NEGATIVE_GROSS_MESSAGE,
+  },
+}
+
+export const enforceAdjustmentSign = (
   value: AdjustmentSignInput,
   ctx: z.RefinementCtx
 ) => {
-  if (value.kind !== 'return') return
-  if (typeof value.amountNet === 'number' && value.amountNet > 0) {
+  if (!value.kind) return
+  if (value.kind === 'return') {
+    if (typeof value.amountNet === 'number' && value.amountNet > 0) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: RETURN_ADJUSTMENT_POSITIVE_NET_MESSAGE,
+        path: ['amountNet'],
+      })
+    }
+    if (typeof value.amountGross === 'number' && value.amountGross > 0) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: RETURN_ADJUSTMENT_POSITIVE_GROSS_MESSAGE,
+        path: ['amountGross'],
+      })
+    }
+    return
+  }
+  const messages = NON_NEGATIVE_SIGN_MESSAGES[value.kind]
+  if (!messages) return
+  if (typeof value.amountNet === 'number' && value.amountNet < 0) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: RETURN_ADJUSTMENT_POSITIVE_NET_MESSAGE,
+      message: messages.net,
       path: ['amountNet'],
     })
   }
-  if (typeof value.amountGross === 'number' && value.amountGross > 0) {
+  if (typeof value.amountGross === 'number' && value.amountGross < 0) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: RETURN_ADJUSTMENT_POSITIVE_GROSS_MESSAGE,
+      message: messages.gross,
       path: ['amountGross'],
     })
   }
 }
 
+/**
+ * @deprecated Use `enforceAdjustmentSign` — it enforces the sign convention
+ * for every adjustment kind, not just `return`. Kept for backward compatibility
+ * with third-party code that imported the original helper.
+ */
+export const enforceReturnAdjustmentSign = enforceAdjustmentSign
+
 export const orderAdjustmentCreateSchema = scoped.extend({
   orderId: uuid(),
   orderLineId: uuid().optional(),

package/src/modules/sales/lib/calculations.ts

@@ -151,13 +151,26 @@ function buildBaseDocumentResult(params: {
   )
 
   for (const adj of scopedAdjustments) {
-    const net = toNumber(adj.amountNet, toNumber(adj.amountGross))
-    const gross = toNumber(adj.amountGross, net)
+    const rawNet = toNumber(adj.amountNet, toNumber(adj.amountGross))
+    const rawGross = toNumber(adj.amountGross, rawNet)
+    // Each adjustment kind has an intrinsic sign convention. The API edge
+    // (enforceAdjustmentSign) rejects values that would invert the kind's
+    // semantic effect, but the calculation engine normalizes defensively so
+    // direct DB writes or seeded data can't inflate the grand total either.
+    // See #1905 (mirrors the existing return normalization a few lines below
+    // introduced for #1705).
+    const isNonNegativeKind =
+      adj.kind === 'discount' ||
+      adj.kind === 'surcharge' ||
+      adj.kind === 'shipping' ||
+      adj.kind === 'tax'
+    const net = isNonNegativeKind ? Math.abs(rawNet) : rawNet
+    const gross = isNonNegativeKind ? Math.abs(rawGross) : rawGross
     const taxRate = extractAdjustmentTaxRate(adj)
     const taxPortion = taxRate !== null ? round(gross - net) : 0
     switch (adj.kind) {
       case 'discount':
-        discountTotal += Math.abs(net)
+        discountTotal += net
         subtotalNet = Math.max(subtotalNet - net, 0)
         subtotalGross = Math.max(subtotalGross - gross, 0)
         if (taxPortion) {