@open-mercato/core 0.8.1-develop.7296.1.2111d779db → 0.8.1-develop.7441.1.b42958b98c

package/src/modules/sales/components/documents/LineItemDialog.tsx

@@ -48,7 +48,11 @@ import {
 import { E } from "#generated/entities.ids.generated";
 import { useT, useLocale } from "@open-mercato/shared/lib/i18n/context";
 import { useOrganizationScopeDetail } from "@open-mercato/shared/lib/frontend/useOrganizationScope";
-import { formatMoney, normalizeNumber } from "./lineItemUtils";
+import {
+  formatMoney,
+  normalizeNumber,
+  resolveCatalogPriceAmount,
+} from "./lineItemUtils";
 import type { SalesLineRecord } from "./lineItemTypes";
 import { prepareShippedLineUpdatePayload } from "./lineItemShipmentLock";
 import {
@@ -540,6 +544,7 @@ export function LineItemDialog({
   const [, setLineStatusLoading] = React.useState(false);
   const productOptionsRef = React.useRef<Map<string, ProductOption>>(new Map());
   const variantOptionsRef = React.useRef<Map<string, VariantOption>>(new Map());
+  const selectedProductIdRef = React.useRef<string | null>(null);
   const taxRatesRef = React.useRef<TaxRateOption[]>([]);
   const defaultTaxRateRef = React.useRef<TaxRateOption | null>(null);
   const dialogContentRef = React.useRef<HTMLDivElement | null>(null);
@@ -645,6 +650,7 @@ export function LineItemDialog({
       }
       setInitialValues(base);
       setLineMode(base.lineMode);
+      selectedProductIdRef.current = null;
       setProductOption(null);
       setVariantOption(null);
       setPriceOptions([]);
@@ -1108,7 +1114,15 @@ export function LineItemDialog({
               scopeTags: tags,
             } as PriceOption;
           })
-          .filter((entry): entry is PriceOption => Boolean(entry));
+          .filter((entry): entry is PriceOption => Boolean(entry))
+          .filter(
+            (entry) =>
+              resolveCatalogPriceAmount(
+                entry.amountNet,
+                entry.amountGross,
+                entry.displayMode === "excluding-tax" ? "net" : "gross",
+              ) !== null,
+          );
         setPriceOptions(mapped);
         return mapped;
       } catch (err) {
@@ -1198,9 +1212,11 @@ export function LineItemDialog({
         const mode =
           selected.displayMode === "excluding-tax" ? "net" : "gross";
         const amountPerBaseUnit =
-          mode === "net"
-            ? (selected.amountNet ?? selected.amountGross ?? 0)
-            : (selected.amountGross ?? selected.amountNet ?? 0);
+          resolveCatalogPriceAmount(
+            selected.amountNet,
+            selected.amountGross,
+            mode,
+          ) ?? 0;
         const factor = resolveUnitPriceFactor(options?.quantityUnit ?? null);
         const amount = Number.isFinite(amountPerBaseUnit * factor)
           ? amountPerBaseUnit * factor
@@ -1223,6 +1239,125 @@ export function LineItemDialog({
     [currencyCode, findTaxRateIdByValue, resolveTaxSelection, resolveUnitPriceFactor],
   );
 
+  const commitVariantSelection = React.useCallback(
+    ({
+      variantId,
+      productId,
+      product,
+      values,
+      setFormValue,
+    }: {
+      variantId: string | null;
+      productId: string | null;
+      product: ProductOption | null;
+      values: Record<string, unknown> | undefined;
+      setFormValue: ((id: string, value: unknown) => void) | undefined;
+    }) => {
+      const selectedOption = variantId
+        ? (variantOptionsRef.current.get(variantId) ?? null)
+        : null;
+      setVariantOption(selectedOption);
+      setFormValue?.("variantId", variantId);
+      const existingName = typeof values?.name === "string" ? values.name : "";
+      if (!existingName.trim()) {
+        setFormValue?.(
+          "name",
+          selectedOption?.title ?? product?.title ?? existingName,
+        );
+      }
+      const taxSource = hasTaxMetadata(selectedOption)
+        ? selectedOption
+        : hasTaxMetadata(product)
+          ? product
+          : null;
+      if (taxSource) {
+        const taxSelection = resolveTaxSelection(taxSource);
+        setFormValue?.("taxRate", taxSelection.taxRate ?? null);
+        setFormValue?.("taxRateId", taxSelection.taxRateId ?? null);
+      }
+      const prevSnapshot =
+        typeof values?.catalogSnapshot === "object" && values.catalogSnapshot
+          ? (values.catalogSnapshot as Record<string, unknown>)
+          : null;
+      if (variantId) {
+        setFormValue?.("catalogSnapshot", {
+          ...(prevSnapshot ?? {}),
+          variant: {
+            id: variantId,
+            title: selectedOption?.title ?? null,
+            sku: selectedOption?.sku ?? null,
+            thumbnailUrl: selectedOption?.thumbnailUrl ?? null,
+          },
+        });
+      } else if (prevSnapshot) {
+        const snapshot = { ...prevSnapshot };
+        if ("variant" in snapshot)
+          delete (snapshot as CatalogSnapshotRecord).variant;
+        setFormValue?.(
+          "catalogSnapshot",
+          Object.keys(snapshot).length ? snapshot : null,
+        );
+      } else {
+        setFormValue?.("catalogSnapshot", null);
+      }
+      if (productId) {
+        const currentQuantity =
+          typeof values?.quantity === "string" ? values.quantity : 1;
+        const currentQuantityUnit =
+          typeof values?.quantityUnit === "string" ? values.quantityUnit : null;
+        void loadPrices(
+          productId,
+          variantId,
+          currentQuantity,
+          currentQuantityUnit,
+        );
+      }
+    },
+    [hasTaxMetadata, loadPrices, resolveTaxSelection],
+  );
+
+  const autoSelectSoleVariant = React.useCallback(
+    async ({
+      productId,
+      product,
+      values,
+      setFormValue,
+    }: {
+      productId: string;
+      product: ProductOption | null;
+      values: Record<string, unknown>;
+      setFormValue: ((id: string, value: unknown) => void) | undefined;
+    }) => {
+      let variants: LookupSelectItem[] = [];
+      try {
+        variants = await loadVariantOptions(
+          productId,
+          product?.thumbnailUrl ?? null,
+        );
+      } catch (err) {
+        logger.error('sales.document.items.autoSelectVariant', { err });
+      }
+      if (selectedProductIdRef.current !== productId) return;
+      if (variants.length === 1) {
+        commitVariantSelection({
+          variantId: variants[0].id,
+          productId,
+          product,
+          values,
+          setFormValue,
+        });
+        return;
+      }
+      void loadPrices(
+        productId,
+        null,
+        typeof values.quantity === "string" ? values.quantity : 1,
+        typeof values.quantityUnit === "string" ? values.quantityUnit : null,
+      );
+    },
+    [commitVariantSelection, loadPrices, loadVariantOptions],
+  );
+
   const loadLineStatuses = React.useCallback(async (): Promise<
     StatusOption[]
   > => {
@@ -1671,6 +1806,7 @@ export function LineItemDialog({
           const switchMode = (next: "catalog" | "custom") => {
             if (next === mode) return;
             setValue(next);
+            selectedProductIdRef.current = null;
             setLineMode(next);
             if (next === "custom") {
               setProductOption(null);
@@ -1795,18 +1931,17 @@ export function LineItemDialog({
                       selectedOption?.defaultUnit ??
                       null;
                     setFormValue?.("quantityUnit", defaultQuantityUnit);
-                    if (
+                    const defaultQuantity =
                       typeof selectedOption?.defaultSalesUnitQuantity ===
                         "number" &&
                       Number.isFinite(
                         selectedOption.defaultSalesUnitQuantity,
                       ) &&
                       selectedOption.defaultSalesUnitQuantity > 0
-                    ) {
-                      setFormValue?.(
-                        "quantity",
-                        String(selectedOption.defaultSalesUnitQuantity),
-                      );
+                        ? String(selectedOption.defaultSalesUnitQuantity)
+                        : null;
+                    if (defaultQuantity) {
+                      setFormValue?.("quantity", defaultQuantity);
                     }
                     const taxSelection = selectedOption
                       ? resolveTaxSelection(selectedOption)
@@ -1818,33 +1953,38 @@ export function LineItemDialog({
                     if (!existingName.trim() && selectedOption?.title) {
                       setFormValue?.("name", selectedOption.title);
                     }
-                    setFormValue?.(
-                      "catalogSnapshot",
-                      next
-                        ? {
-                            product: {
-                              id: next,
-                              title: selectedOption?.title ?? null,
-                              sku: selectedOption?.sku ?? null,
-                              thumbnailUrl:
-                                selectedOption?.thumbnailUrl ?? null,
-                              defaultUnit: selectedOption?.defaultUnit ?? null,
-                              defaultSalesUnit:
-                                selectedOption?.defaultSalesUnit ?? null,
-                            },
-                          }
-                        : null,
-                    );
+                    const productSnapshot = next
+                      ? {
+                          product: {
+                            id: next,
+                            title: selectedOption?.title ?? null,
+                            sku: selectedOption?.sku ?? null,
+                            thumbnailUrl:
+                              selectedOption?.thumbnailUrl ?? null,
+                            defaultUnit: selectedOption?.defaultUnit ?? null,
+                            defaultSalesUnit:
+                              selectedOption?.defaultSalesUnit ?? null,
+                          },
+                        }
+                      : null;
+                    setFormValue?.("catalogSnapshot", productSnapshot);
+                    selectedProductIdRef.current = next ?? null;
                     if (next) {
                       void loadProductUnits(next, selectedOption);
-                      void loadPrices(
-                        next,
-                        null,
-                        typeof values?.quantity === "string"
-                          ? values.quantity
-                          : 1,
-                        defaultQuantityUnit,
-                      );
+                      const valuesAfterProductChange = {
+                        ...values,
+                        name:
+                          existingName.trim() || selectedOption?.title || "",
+                        catalogSnapshot: productSnapshot,
+                        quantity: defaultQuantity ?? values?.quantity,
+                        quantityUnit: defaultQuantityUnit,
+                      };
+                      void autoSelectSoleVariant({
+                        productId: next,
+                        product: selectedOption,
+                        values: valuesAfterProductChange,
+                        setFormValue,
+                      });
                     }
                   }}
                   fetchItems={loadProductOptions}
@@ -1921,76 +2061,14 @@ export function LineItemDialog({
                     key={productId ?? "no-product"}
                     value={typeof value === "string" ? value : null}
                     onChange={(next) => {
-                      const selectedOption = next
-                        ? (variantOptionsRef.current.get(next) ?? null)
-                        : null;
-                      setVariantOption(selectedOption);
                       setValue(next ?? null);
-                      const existingName =
-                        typeof values?.name === "string" ? values.name : "";
-                      if (!existingName.trim()) {
-                        setFormValue?.(
-                          "name",
-                          selectedOption?.title ??
-                            productOption?.title ??
-                            existingName,
-                        );
-                      }
-                      const taxSource = hasTaxMetadata(selectedOption)
-                        ? selectedOption
-                        : hasTaxMetadata(productOption)
-                          ? productOption
-                          : null;
-                      if (taxSource) {
-                        const taxSelection = resolveTaxSelection(taxSource);
-                        setFormValue?.("taxRate", taxSelection.taxRate ?? null);
-                        setFormValue?.(
-                          "taxRateId",
-                          taxSelection.taxRateId ?? null,
-                        );
-                      }
-                      const prevSnapshot =
-                        typeof values?.catalogSnapshot === "object" &&
-                        values.catalogSnapshot
-                          ? (values.catalogSnapshot as Record<string, unknown>)
-                          : null;
-                      if (next) {
-                        setFormValue?.("catalogSnapshot", {
-                          ...(prevSnapshot ?? {}),
-                          variant: {
-                            id: next,
-                            title: selectedOption?.title ?? null,
-                            sku: selectedOption?.sku ?? null,
-                            thumbnailUrl: selectedOption?.thumbnailUrl ?? null,
-                          },
-                        });
-                      } else if (prevSnapshot) {
-                        const snapshot = { ...prevSnapshot };
-                        if ("variant" in snapshot)
-                          delete (snapshot as CatalogSnapshotRecord).variant;
-                        setFormValue?.(
-                          "catalogSnapshot",
-                          Object.keys(snapshot).length ? snapshot : null,
-                        );
-                      } else {
-                        setFormValue?.("catalogSnapshot", null);
-                      }
-                      if (productId) {
-                        const currentQuantity =
-                          typeof values?.quantity === "string"
-                            ? values.quantity
-                            : 1;
-                        const currentQuantityUnit =
-                          typeof values?.quantityUnit === "string"
-                            ? values.quantityUnit
-                            : null;
-                        void loadPrices(
-                          productId,
-                          next,
-                          currentQuantity,
-                          currentQuantityUnit,
-                        );
-                      }
+                      commitVariantSelection({
+                        variantId: next ?? null,
+                        productId,
+                        product: productOption,
+                        values,
+                        setFormValue,
+                      });
                     }}
                     fetchItems={async (query) => {
                       if (!productId) return [];
@@ -2355,9 +2433,10 @@ export function LineItemDialog({
             event: React.ChangeEvent<HTMLSelectElement>,
           ) => {
             const nextId = event.target.value || null;
-            const option = nextId ? (taxRateMap.get(nextId) ?? null) : null;
+            if (!nextId) return;
+            const option = taxRateMap.get(nextId) ?? null;
             setValue(nextId);
-            const rate = normalizeNumber(option?.rate);
+            const rate = normalizeNumber(option?.rate, Number.NaN);
             setFormValue?.("taxRate", Number.isFinite(rate) ? rate : null);
           };
           return (
@@ -2672,6 +2751,8 @@ export function LineItemDialog({
     ];
   }, [
     applyPriceSelection,
+    autoSelectSoleVariant,
+    commitVariantSelection,
     convertUnitPriceForUnitChange,
     currencyCode,
     findTaxRateIdByValue,
@@ -2716,6 +2797,7 @@ export function LineItemDialog({
       return;
     }
     let cancelled = false;
+    selectedProductIdRef.current = null;
     setDeletedCatalogReference(false);
     setEditingId(initialLine.id);
     const nextForm = defaultForm(initialLine.currencyCode ?? currencyCode);
@@ -2778,10 +2860,11 @@ export function LineItemDialog({
         ? metaRec.taxRateId
         : null;
     const fallbackTaxRateId = findTaxRateIdByValue(nextForm.taxRate);
-    nextForm.taxRateId =
-      metaTaxRateId ??
-      fallbackTaxRateId ??
-      (defaultTaxRateRef.current ? defaultTaxRateRef.current.id : null);
+    const defaultTaxRateId =
+      !Number.isFinite(nextForm.taxRate) && defaultTaxRateRef.current
+        ? defaultTaxRateRef.current.id
+        : null;
+    nextForm.taxRateId = metaTaxRateId ?? fallbackTaxRateId ?? defaultTaxRateId;
     if (!Number.isFinite(nextForm.taxRate) && nextForm.taxRateId) {
       const matched = taxRatesRef.current.find(
         (rate) => rate.id === nextForm.taxRateId,

package/src/modules/sales/components/documents/lineItemUtils.ts

@@ -9,6 +9,24 @@ export function normalizeNumber(value: unknown, fallback = 0): number {
   return fallback
 }
 
+/**
+ * A catalog price is only usable on a line when it carries a positive amount, because line
+ * submission rejects a unit price of zero. Returns the amount for the requested mode, falling
+ * back to the other mode only when the requested amount is missing, or `null` when the price
+ * has no positive amount to use.
+ */
+export function resolveCatalogPriceAmount(
+  amountNet: number | null | undefined,
+  amountGross: number | null | undefined,
+  mode: 'net' | 'gross',
+): number | null {
+  const isPresent = (value: number | null | undefined): value is number =>
+    typeof value === 'number' && Number.isFinite(value)
+  const [preferred, fallback] = mode === 'net' ? [amountNet, amountGross] : [amountGross, amountNet]
+  const amount = isPresent(preferred) ? preferred : isPresent(fallback) ? fallback : null
+  return amount !== null && amount > 0 ? amount : null
+}
+
 /**
  * Pass `locale` to format in the application locale (`useLocale()` in client components).
  * Omitting it keeps the runtime default, which varies per machine and is therefore not

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

@@ -845,6 +845,8 @@
   "sales.documents.errors.number_generate_failed": "Dokumentnummer konnte nicht generiert werden.",
   "sales.documents.errors.organization_required": "Organisationskontext ist erforderlich.",
   "sales.documents.errors.unauthorized": "Nicht autorisiert",
+  "sales.documents.errors.undoStaleOrder": "Diese Änderung kann nicht mehr rückgängig gemacht werden, da der Auftrag danach geändert wurde.",
+  "sales.documents.errors.undoStaleQuote": "Diese Änderung kann nicht mehr rückgängig gemacht werden, da das Angebot danach geändert wurde.",
   "sales.documents.form.address.city": "Stadt",
   "sales.documents.form.address.company": "Firma (optional)",
   "sales.documents.form.address.country": "Land",

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

@@ -845,6 +845,8 @@
   "sales.documents.errors.number_generate_failed": "Failed to generate document number.",
   "sales.documents.errors.organization_required": "Organization context is required.",
   "sales.documents.errors.unauthorized": "Unauthorized",
+  "sales.documents.errors.undoStaleOrder": "This change can no longer be undone because the order was changed afterwards.",
+  "sales.documents.errors.undoStaleQuote": "This change can no longer be undone because the quote was changed afterwards.",
   "sales.documents.form.address.city": "City",
   "sales.documents.form.address.company": "Company (optional)",
   "sales.documents.form.address.country": "Country",

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

@@ -845,6 +845,8 @@
   "sales.documents.errors.number_generate_failed": "No se pudo generar el número de documento.",
   "sales.documents.errors.organization_required": "Se requiere contexto de organización.",
   "sales.documents.errors.unauthorized": "No autorizado",
+  "sales.documents.errors.undoStaleOrder": "Este cambio ya no se puede deshacer porque el pedido se modificó después.",
+  "sales.documents.errors.undoStaleQuote": "Este cambio ya no se puede deshacer porque la cotización se modificó después.",
   "sales.documents.form.address.city": "Ciudad",
   "sales.documents.form.address.company": "Empresa (opcional)",
   "sales.documents.form.address.country": "País",

package/src/modules/sales/i18n/ko.json

@@ -845,6 +845,8 @@
   "sales.documents.errors.number_generate_failed": "문서 번호를 생성하지 못했습니다.",
   "sales.documents.errors.organization_required": "조직 컨텍스트가 필요합니다.",
   "sales.documents.errors.unauthorized": "권한이 없습니다",
+  "sales.documents.errors.undoStaleOrder": "이후에 주문이 변경되어 이 변경 사항을 더 이상 실행 취소할 수 없습니다.",
+  "sales.documents.errors.undoStaleQuote": "이후에 견적이 변경되어 이 변경 사항을 더 이상 실행 취소할 수 없습니다.",
   "sales.documents.form.address.city": "도시",
   "sales.documents.form.address.company": "회사명 (선택)",
   "sales.documents.form.address.country": "국가",

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

@@ -845,6 +845,8 @@
   "sales.documents.errors.number_generate_failed": "Nie udało się wygenerować numeru dokumentu.",
   "sales.documents.errors.organization_required": "Wymagany jest kontekst organizacji.",
   "sales.documents.errors.unauthorized": "Brak autoryzacji",
+  "sales.documents.errors.undoStaleOrder": "Tej zmiany nie można już cofnąć, ponieważ zamówienie zostało później zmienione.",
+  "sales.documents.errors.undoStaleQuote": "Tej zmiany nie można już cofnąć, ponieważ oferta została później zmieniona.",
   "sales.documents.form.address.city": "Miasto",
   "sales.documents.form.address.company": "Firma (opcjonalnie)",
   "sales.documents.form.address.country": "Kraj",

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

@@ -138,3 +138,39 @@ export function resolveUpsertTotalsOrigin(
   if (callerTotalNetAmount !== null && callerTotalNetAmount !== undefined) return {}
   return existingSnapshot != null ? { totalsFromStoredRow: true } : {}
 }
+
+/** Reuse stored tax/gross only while the edited line's pricing inputs are unchanged. */
+export function resolveUpsertCalculatedAmounts(
+  caller: Pick<SalesLineSnapshot, 'taxAmount' | 'totalGrossAmount'>,
+  nextSnapshot: SalesLineSnapshot,
+  existingSnapshot: SalesLineSnapshot | null,
+): Pick<SalesLineSnapshot, 'taxAmount' | 'totalGrossAmount'> {
+  const pricingFields = [
+    'quantity',
+    'unitPriceNet',
+    'unitPriceGross',
+    'taxRate',
+  ] as const
+  const nextDiscountAmount = nextSnapshot.discountAmount ?? 0
+  const nextDiscountLineAmount = nextSnapshot.discountAmountFromStoredRow === true ||
+    nextSnapshot.discountAmountBasis === 'line'
+    ? nextDiscountAmount
+    : nextDiscountAmount * nextSnapshot.quantity
+  const discountChanged =
+    (nextSnapshot.discountPercent ?? 0) !== (existingSnapshot?.discountPercent ?? 0) ||
+    ((nextSnapshot.discountPercent ?? 0) === 0 &&
+      Math.round((nextDiscountLineAmount + Number.EPSILON) * 1e4) / 1e4 !==
+        (existingSnapshot?.discountAmount ?? 0))
+  const pricingChanged = existingSnapshot === null || discountChanged ||
+    pricingFields.some((field) => (nextSnapshot[field] ?? 0) !== (existingSnapshot[field] ?? 0))
+  const grossChanged = caller.totalGrossAmount !== undefined && caller.totalGrossAmount !== null &&
+    caller.totalGrossAmount !== existingSnapshot?.totalGrossAmount
+  const taxChanged = caller.taxAmount !== undefined && caller.taxAmount !== null &&
+    caller.taxAmount !== existingSnapshot?.taxAmount
+  return {
+    taxAmount: caller.taxAmount ??
+      (pricingChanged || grossChanged ? null : existingSnapshot?.taxAmount ?? null),
+    totalGrossAmount: caller.totalGrossAmount ??
+      (pricingChanged || taxChanged ? null : existingSnapshot?.totalGrossAmount ?? null),
+  }
+}

package/src/modules/sales/setup.ts

@@ -2,10 +2,6 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
 import { SalesSettings, SalesDocumentSequence, SalesTaxRate } from './data/entities'
 import { DEFAULT_ORDER_NUMBER_FORMAT, DEFAULT_QUOTE_NUMBER_FORMAT } from './lib/documentNumberTokens'
-import { seedSalesStatusDictionaries, seedSalesAdjustmentKinds } from './lib/dictionaries'
-import { seedSalesChannelsToggle } from './lib/salesChannelsToggleSeed'
-import { ensureExampleShippingMethods, ensureExamplePaymentMethods } from './seed/examples-data'
-import { seedSalesExamples } from './seed/examples'
 import { createDocumentSequence } from './services/salesDocumentNumberGenerator'
 
 type SeedScope = { tenantId: string; organizationId: string }
@@ -123,6 +119,9 @@ export const setup: ModuleSetupConfig = {
   },
 
   async seedDefaults({ em, tenantId, organizationId }) {
+    const { seedSalesStatusDictionaries, seedSalesAdjustmentKinds } = await import('./lib/dictionaries')
+    const { ensureExampleShippingMethods, ensureExamplePaymentMethods } = await import('./seed/examples-data')
+    const { seedSalesChannelsToggle } = await import('./lib/salesChannelsToggleSeed')
     const scope = { tenantId, organizationId }
     await seedSalesTaxRates(em, scope)
     await seedSalesStatusDictionaries(em, scope)
@@ -133,6 +132,7 @@ export const setup: ModuleSetupConfig = {
   },
 
   async seedExamples({ em, container, tenantId, organizationId }) {
+    const { seedSalesExamples } = await import('./seed/examples')
     const scope = { tenantId, organizationId }
     await seedSalesExamples(em, container, scope)
   },

package/src/modules/sales/widgets/notifications/SalesOrderCreatedRenderer.tsx

@@ -46,7 +46,7 @@ export function SalesOrderCreatedRenderer({
   const viewAction = actions.find((action) => action.id === 'view') ?? actions[0] ?? null
 
   const handleView = async () => {
-    if (!viewAction) {
+    if (!viewAction || notification.status === 'actioned') {
       if (notification.linkHref) router.push(notification.linkHref)
       return
     }
@@ -128,7 +128,7 @@ export function SalesOrderCreatedRenderer({
               e.stopPropagation()
               handleView()
             }}
-            disabled={executing || (!viewAction && !notification.linkHref)}
+            disabled={executing || (!viewAction && !notification.linkHref) || (notification.status === 'actioned' && !notification.linkHref)}
           >
             <ExternalLink className="size-3.5" aria-hidden="true" />
             {t('sales.notifications.renderer.viewOrder', 'View Order')}

package/src/modules/sales/widgets/notifications/SalesQuoteCreatedRenderer.tsx

@@ -45,7 +45,7 @@ export function SalesQuoteCreatedRenderer({
   const viewAction = actions.find((action) => action.id === 'view') ?? actions[0] ?? null
 
   const handleView = async () => {
-    if (!viewAction) {
+    if (!viewAction || notification.status === 'actioned') {
       if (notification.linkHref) router.push(notification.linkHref)
       return
     }
@@ -125,7 +125,7 @@ export function SalesQuoteCreatedRenderer({
                 e.stopPropagation()
                 handleView()
               }}
-              disabled={executing || (!viewAction && !notification.linkHref)}
+              disabled={executing || (!viewAction && !notification.linkHref) || (notification.status === 'actioned' && !notification.linkHref)}
               className="gap-1"
             >
               <ExternalLink className="h-3 w-3" />

package/src/modules/staff/api/leave-requests/accept/route.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import type { CommandRuntimeContext, CommandBus } from '@open-mercato/shared/lib/commands'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -35,7 +36,7 @@ async function buildContext(
     container,
     auth,
     organizationScope: scope,
-    selectedOrganizationId: scope?.selectedId ?? auth.orgId ?? null,
+    selectedOrganizationId: resolveSingleOrganizationIdOrDeny(scope, auth) ?? null,
     organizationIds: scope?.filterIds ?? (auth.orgId ? [auth.orgId] : null),
     request: req,
   }

package/src/modules/staff/api/leave-requests/reject/route.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import type { CommandRuntimeContext, CommandBus } from '@open-mercato/shared/lib/commands'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -35,7 +36,7 @@ async function buildContext(
     container,
     auth,
     organizationScope: scope,
-    selectedOrganizationId: scope?.selectedId ?? auth.orgId ?? null,
+    selectedOrganizationId: resolveSingleOrganizationIdOrDeny(scope, auth) ?? null,
     organizationIds: scope?.filterIds ?? (auth.orgId ? [auth.orgId] : null),
     request: req,
   }

package/src/modules/staff/api/leave-requests.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import { makeCrudRoute, type CrudCtx } from '@open-mercato/shared/lib/crud/factory'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -92,7 +93,7 @@ async function resolveLeaveRequestAccess(ctx: any): Promise<LeaveRequestAccess>
     return { canManage: false, canSend: false, canView: false, memberId: null }
   }
   const tenantId = ctx.organizationScope?.tenantId ?? auth.tenantId ?? null
-  const organizationId = ctx.selectedOrganizationId ?? ctx.organizationScope?.selectedId ?? auth.orgId ?? null
+  const organizationId = ctx.selectedOrganizationId ?? resolveSingleOrganizationIdOrDeny(ctx.organizationScope, auth) ?? null
   const rbac = (ctx.container.resolve('rbacService') as RbacService)
   const [canManage, canSendLegacy, canSendSelf, canViewSelf] = await Promise.all([
     rbac.userHasAllFeatures(auth.sub, [MANAGE_FEATURE], { tenantId, organizationId }),