@open-mercato/core 0.6.3-develop.3525.2.cc18b8a43f → 0.6.3-develop.3562.1.71049275ff

package/src/modules/auth/backend/users/roleOptions.ts

@@ -7,6 +7,7 @@ type RoleListResponse = {
 
 type FetchRoleOptionsParams = {
   tenantId?: string | null
+  includeSuperAdmin?: boolean
 }
 
 export async function fetchRoleOptions(query?: string, params?: FetchRoleOptionsParams): Promise<CrudFieldOption[]> {
@@ -28,7 +29,7 @@ export async function fetchRoleOptions(query?: string, params?: FetchRoleOptions
         const id = typeof item?.id === 'string' ? item.id.trim() : ''
         const name = typeof item?.name === 'string' ? item?.name.trim() : ''
         if (!id || !name) return null
-        if (name === 'superadmin') return null
+        if (name === 'superadmin' && !params?.includeSuperAdmin) return null
         return { value: id, label: name }
       })
       .filter((opt): opt is CrudFieldOption => !!opt)

package/src/modules/auth/commands/roles.ts

@@ -235,6 +235,14 @@ const updateRoleCommand: CommandHandler<Record<string, unknown>, Role> = {
         }
       }
     }
+    const wantsTenantChange = parsed.tenantId !== undefined && parsed.tenantId !== current.tenantId
+    if (wantsTenantChange) {
+      const assignments = await em.count(UserRole, { role: current, deletedAt: null })
+      if (assignments > 0) {
+        throw new CrudHttpError(400, { error: 'Role cannot be moved to another tenant while users are assigned' })
+      }
+      await em.nativeDelete(RoleAcl, { role: parsed.id as unknown as Role })
+    }
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     const role = await de.updateOrmEntity({
       entity: Role,

package/src/modules/auth/components/AclEditor.tsx

@@ -100,6 +100,7 @@ export function AclEditor({
   userRoles,
   currentUserIsSuperAdmin,
   tenantId,
+  preserveOnTenantChange = false,
 }: {
   kind: 'user' | 'role'
   targetId: string
@@ -109,6 +110,7 @@ export function AclEditor({
   userRoles?: string[]
   currentUserIsSuperAdmin?: boolean
   tenantId?: string | null
+  preserveOnTenantChange?: boolean
 }) {
   const actorIsSuperAdmin = !!currentUserIsSuperAdmin
   const [loading, setLoading] = React.useState(true)
@@ -142,8 +144,33 @@ export function AclEditor({
     [actorSanitizeFeatures],
   )
 
+  const tenantIdRef = React.useRef(tenantId)
+  React.useEffect(() => { tenantIdRef.current = tenantId }, [tenantId])
+  const hasMountedRef = React.useRef(false)
+
+  const fetchAclState = React.useCallback(async (forTenantId: string | null | undefined, cancelledRef: { current: boolean }) => {
+    try {
+      const aclQuery = new URLSearchParams()
+      aclQuery.set(kind === 'user' ? 'userId' : 'roleId', targetId)
+      if (forTenantId) aclQuery.set('tenantId', forTenantId)
+      const aclQueryString = aclQuery.toString()
+      const aclJson = await readJsonOr<AclPayload>(
+        `/api/auth/${kind === 'user' ? 'users' : 'roles'}/acl${aclQueryString ? `?${aclQueryString}` : ''}`,
+        undefined,
+        { hasCustomAcl: true, isSuperAdmin: false, features: [], organizations: null },
+      )
+      if (cancelledRef.current) return
+      const customAclExists = aclJson.hasCustomAcl !== false
+      setHasCustomAcl(customAclExists)
+      setOverrideEnabled(customAclExists)
+      setIsSuperAdmin(!!aclJson.isSuperAdmin)
+      setGranted(actorSanitizeFeatures(aclJson.features))
+      setOrganizations(aclJson.organizations == null ? null : Array.isArray(aclJson.organizations) ? aclJson.organizations : [])
+    } catch {}
+  }, [kind, targetId, actorSanitizeFeatures])
+
   React.useEffect(() => {
-    let cancelled = false
+    const cancelled = { current: false }
     async function load() {
       setLoading(true)
       try {
@@ -152,30 +179,30 @@ export function AclEditor({
           undefined,
           { items: [], modules: [] },
         )
-        if (!cancelled) {
+        if (!cancelled.current) {
           setFeatures(fJson.items || [])
           setModules(fJson.modules || [])
         }
       } catch {}
-      try {
-        const aclQuery = new URLSearchParams()
-        aclQuery.set(kind === 'user' ? 'userId' : 'roleId', targetId)
-        if (tenantId) aclQuery.set('tenantId', tenantId)
-        const aclQueryString = aclQuery.toString()
-        const aclJson = await readJsonOr<AclPayload>(
-          `/api/auth/${kind === 'user' ? 'users' : 'roles'}/acl${aclQueryString ? `?${aclQueryString}` : ''}`,
-          undefined,
-          { hasCustomAcl: true, isSuperAdmin: false, features: [], organizations: null },
-        )
-        if (!cancelled) {
-          const customAclExists = aclJson.hasCustomAcl !== false
-          setHasCustomAcl(customAclExists)
-          setOverrideEnabled(customAclExists)
-          setIsSuperAdmin(!!aclJson.isSuperAdmin)
-          setGranted(actorSanitizeFeatures(aclJson.features))
-          setOrganizations(aclJson.organizations == null ? null : Array.isArray(aclJson.organizations) ? aclJson.organizations : [])
-        }
-      } catch {}
+      await fetchAclState(tenantIdRef.current, cancelled)
+      hasMountedRef.current = true
+      if (!cancelled.current) setLoading(false)
+    }
+    load()
+    return () => { cancelled.current = true }
+  }, [kind, targetId, fetchAclState])
+
+  React.useEffect(() => {
+    if (!hasMountedRef.current) return
+    if (preserveOnTenantChange) return
+    const cancelled = { current: false }
+    fetchAclState(tenantId, cancelled)
+    return () => { cancelled.current = true }
+  }, [tenantId, preserveOnTenantChange, fetchAclState])
+
+  React.useEffect(() => {
+    let cancelled = false
+    async function loadTenantScoped() {
       if (canEditOrganizations) {
         try {
           const orgQuery = new URLSearchParams()
@@ -206,11 +233,10 @@ export function AclEditor({
           }
         } catch {}
       }
-      if (!cancelled) setLoading(false)
     }
-    load()
+    loadTenantScoped()
     return () => { cancelled = true }
-  }, [kind, targetId, canEditOrganizations, userRoles, actorSanitizeFeatures, tenantId])
+  }, [kind, canEditOrganizations, userRoles, tenantId])
 
   // Notify parent of changes
   React.useEffect(() => {

package/src/modules/dashboards/components/WidgetVisibilityEditor.tsx

@@ -32,6 +32,7 @@ type UserResponse = {
 type BaseProps = {
   tenantId?: string | null
   organizationId?: string | null
+  preserveOnTenantChange?: boolean
 }
 
 type RoleProps = BaseProps & {
@@ -92,7 +93,7 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
     (widget: WidgetCatalogItem) => resolveWidgetText(t, widget.id, 'description', widget.description || ''),
     [t],
   )
-  const { kind, targetId, tenantId, organizationId } = props
+  const { kind, targetId, tenantId, organizationId, preserveOnTenantChange = false } = props
   const [catalog, setCatalog] = React.useState<WidgetCatalogItem[]>([])
   const [loading, setLoading] = React.useState(true)
   const [saving, setSaving] = React.useState(false)
@@ -136,10 +137,16 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
     setCatalog(mapped)
   }, [])
 
-  const loadRoleData = React.useCallback(async () => {
+  const tenantIdRef = React.useRef(tenantId)
+  React.useEffect(() => { tenantIdRef.current = tenantId }, [tenantId])
+  const organizationIdRef = React.useRef(organizationId)
+  React.useEffect(() => { organizationIdRef.current = organizationId }, [organizationId])
+  const hasMountedRef = React.useRef(false)
+
+  const loadRoleData = React.useCallback(async (forTenantId: string | null | undefined, forOrganizationId: string | null | undefined) => {
     const params = new URLSearchParams({ roleId: targetId })
-    if (tenantId) params.set('tenantId', tenantId)
-    if (organizationId) params.set('organizationId', organizationId)
+    if (forTenantId) params.set('tenantId', forTenantId)
+    if (forOrganizationId) params.set('organizationId', forOrganizationId)
     const data = await readApiResultOrThrow<RoleResponse>(
       `/api/dashboards/roles/widgets?${params.toString()}`,
       undefined,
@@ -151,12 +158,12 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
     setMode('override')
     setOriginalMode('override')
     setEffective(ids)
-  }, [organizationId, targetId, tenantId])
+  }, [targetId])
 
-  const loadUserData = React.useCallback(async () => {
+  const loadUserData = React.useCallback(async (forTenantId: string | null | undefined, forOrganizationId: string | null | undefined) => {
     const params = new URLSearchParams({ userId: targetId })
-    if (tenantId) params.set('tenantId', tenantId)
-    if (organizationId) params.set('organizationId', organizationId)
+    if (forTenantId) params.set('tenantId', forTenantId)
+    if (forOrganizationId) params.set('organizationId', forOrganizationId)
     const data = await readApiResultOrThrow<UserResponse>(
       `/api/dashboards/users/widgets?${params.toString()}`,
       undefined,
@@ -168,7 +175,7 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
     setMode(data.mode || 'inherit')
     setOriginalMode(data.mode || 'inherit')
     setEffective(Array.isArray(data.effectiveWidgetIds) ? data.effectiveWidgetIds : [])
-  }, [organizationId, targetId, tenantId])
+  }, [targetId])
 
   React.useEffect(() => {
     let cancelled = false
@@ -177,21 +184,40 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
       setError(null)
       try {
         await loadCatalog()
-        if (kind === 'role') await loadRoleData()
-        else await loadUserData()
+        if (kind === 'role') await loadRoleData(tenantIdRef.current, organizationIdRef.current)
+        else await loadUserData(tenantIdRef.current, organizationIdRef.current)
       } catch (err) {
         console.error('Failed to load widget visibility data', err)
         if (!cancelled) {
           setError(tRef.current('dashboards.widgets.error.load', 'Unable to load widget configuration.'))
         }
       } finally {
-        if (!cancelled) setLoading(false)
+        if (!cancelled) {
+          setLoading(false)
+          hasMountedRef.current = true
+        }
       }
     }
     load()
     return () => { cancelled = true }
   }, [kind, loadCatalog, loadRoleData, loadUserData])
 
+  React.useEffect(() => {
+    if (!hasMountedRef.current) return
+    if (preserveOnTenantChange) return
+    let cancelled = false
+    async function refetch() {
+      try {
+        if (kind === 'role') await loadRoleData(tenantId, organizationId)
+        else await loadUserData(tenantId, organizationId)
+      } catch (err) {
+        console.error('Failed to reload widget visibility data', err)
+      }
+    }
+    refetch()
+    return () => { cancelled = true }
+  }, [tenantId, organizationId, kind, loadRoleData, loadUserData, preserveOnTenantChange])
+
   const toggle = React.useCallback((id: string) => {
     setSelected((prev) => (prev.includes(id) ? prev.filter((value) => value !== id) : [...prev, id]))
   }, [])

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

@@ -67,6 +67,9 @@ import {
 } from "../../customers/data/entities";
 import {
   enforceAdjustmentSign,
+  validateReturnAdjustmentWithinRemaining,
+  RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE,
+  RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE,
   quoteCreateSchema,
   quoteLineCreateSchema,
   quoteAdjustmentCreateSchema,
@@ -7384,6 +7387,63 @@ const orderAdjustmentUpsertCommand: CommandHandler<
       shippingMethodCode: order.shippingMethodCode ?? null,
       paymentMethodCode: order.paymentMethodCode ?? null,
     });
+    const effectiveAdjustment = nextAdjustments.find(
+      (adj) => adj.id === adjustmentId,
+    );
+    if (effectiveAdjustment?.kind === "return") {
+      const baselineAdjustments = nextAdjustments.filter(
+        (adj) => adj.id !== adjustmentId,
+      );
+      const baselineCalculation =
+        await salesCalculationService.calculateDocumentTotals({
+          documentKind: "order",
+          lines: calcLines,
+          adjustments: baselineAdjustments,
+          context: calculationContext,
+          existingTotals: resolveExistingPaymentTotals(order),
+        });
+      const issues = validateReturnAdjustmentWithinRemaining({
+        kind: "return",
+        amountNet:
+          effectiveAdjustment.amountNet ?? effectiveAdjustment.amountGross ?? 0,
+        amountGross:
+          effectiveAdjustment.amountGross ?? effectiveAdjustment.amountNet ?? 0,
+        remainingNet: Number(
+          baselineCalculation.totals?.grandTotalNetAmount ?? 0,
+        ),
+        remainingGross: Number(
+          baselineCalculation.totals?.grandTotalGrossAmount ?? 0,
+        ),
+      });
+      if (issues.length > 0) {
+        const { translate } = await resolveTranslations();
+        const grossIssue = issues.find((issue) => issue.path === "amountGross");
+        const netIssue = issues.find((issue) => issue.path === "amountNet");
+        const fieldErrors: Record<string, string> = {};
+        if (grossIssue) {
+          fieldErrors.amountGross = translate(
+            "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE,
+          );
+        }
+        if (netIssue) {
+          fieldErrors.amountNet = translate(
+            "sales.adjustments.error.returnExceedsRemainingGrandTotalNet",
+            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE,
+          );
+        }
+        throw new CrudHttpError(400, {
+          error:
+            fieldErrors.amountGross ??
+            fieldErrors.amountNet ??
+            translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE,
+            ),
+          fieldErrors,
+        });
+      }
+    }
     const calculation = await salesCalculationService.calculateDocumentTotals({
       documentKind: "order",
       lines: calcLines,
@@ -7766,6 +7826,62 @@ const quoteAdjustmentUpsertCommand: CommandHandler<
       shippingMethodCode: quote.shippingMethodCode ?? null,
       paymentMethodCode: quote.paymentMethodCode ?? null,
     });
+    const effectiveAdjustment = nextAdjustments.find(
+      (adj) => adj.id === adjustmentId,
+    );
+    if (effectiveAdjustment?.kind === "return") {
+      const baselineAdjustments = nextAdjustments.filter(
+        (adj) => adj.id !== adjustmentId,
+      );
+      const baselineCalculation =
+        await salesCalculationService.calculateDocumentTotals({
+          documentKind: "quote",
+          lines: calcLines,
+          adjustments: baselineAdjustments,
+          context: calculationContext,
+        });
+      const issues = validateReturnAdjustmentWithinRemaining({
+        kind: "return",
+        amountNet:
+          effectiveAdjustment.amountNet ?? effectiveAdjustment.amountGross ?? 0,
+        amountGross:
+          effectiveAdjustment.amountGross ?? effectiveAdjustment.amountNet ?? 0,
+        remainingNet: Number(
+          baselineCalculation.totals?.grandTotalNetAmount ?? 0,
+        ),
+        remainingGross: Number(
+          baselineCalculation.totals?.grandTotalGrossAmount ?? 0,
+        ),
+      });
+      if (issues.length > 0) {
+        const { translate } = await resolveTranslations();
+        const grossIssue = issues.find((issue) => issue.path === "amountGross");
+        const netIssue = issues.find((issue) => issue.path === "amountNet");
+        const fieldErrors: Record<string, string> = {};
+        if (grossIssue) {
+          fieldErrors.amountGross = translate(
+            "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE,
+          );
+        }
+        if (netIssue) {
+          fieldErrors.amountNet = translate(
+            "sales.adjustments.error.returnExceedsRemainingGrandTotalNet",
+            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE,
+          );
+        }
+        throw new CrudHttpError(400, {
+          error:
+            fieldErrors.amountGross ??
+            fieldErrors.amountNet ??
+            translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE,
+            ),
+          fieldErrors,
+        });
+      }
+    }
     const calculation = await salesCalculationService.calculateDocumentTotals({
       documentKind: "quote",
       lines: calcLines,

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

@@ -523,6 +523,44 @@ export const enforceAdjustmentSign = (
  */
 export const enforceReturnAdjustmentSign = enforceAdjustmentSign
 
+export const RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE =
+  'Return adjustment amountNet exceeds the remaining grand total. Reduce the amount or remove existing returns first.'
+export const RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE =
+  'Return adjustment amountGross exceeds the remaining grand total. Reduce the amount or remove existing returns first.'
+
+export type ReturnAdjustmentRemainingCheck = {
+  kind?: string | null
+  amountNet?: number | null
+  amountGross?: number | null
+  remainingNet: number
+  remainingGross: number
+}
+
+export type ReturnAdjustmentRemainingIssue = {
+  path: 'amountNet' | 'amountGross'
+  message: string
+}
+
+// Inclusive: abs(amount) === remaining is allowed. Tiny epsilon absorbs
+// floating-point rounding from upstream tax/rate adjustments.
+const RETURN_REMAINING_EPSILON = 0.005
+
+export const validateReturnAdjustmentWithinRemaining = (
+  value: ReturnAdjustmentRemainingCheck
+): ReturnAdjustmentRemainingIssue[] => {
+  if (value.kind !== 'return') return []
+  const absNet = typeof value.amountNet === 'number' ? Math.abs(value.amountNet) : 0
+  const absGross = typeof value.amountGross === 'number' ? Math.abs(value.amountGross) : 0
+  const issues: ReturnAdjustmentRemainingIssue[] = []
+  if (absGross > value.remainingGross + RETURN_REMAINING_EPSILON) {
+    issues.push({ path: 'amountGross', message: RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE })
+  }
+  if (absNet > value.remainingNet + RETURN_REMAINING_EPSILON) {
+    issues.push({ path: 'amountNet', message: RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE })
+  }
+  return issues
+}
+
 export const orderAdjustmentCreateSchema = scoped.extend({
   orderId: uuid(),
   orderLineId: uuid().optional(),

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

@@ -4,6 +4,8 @@
   "audit_logs.resource_kind.sales.payment": "Zahlung",
   "audit_logs.resource_kind.sales.shipment": "Versand",
   "customers~sales.nav.group": "Vertrieb",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalGross": "Der Bruttobetrag der Rücksendeanpassung überschreitet den verbleibenden Gesamtbetrag. Bitte verringern Sie den Betrag oder entfernen Sie bestehende Rücksendungen.",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalNet": "Der Nettobetrag der Rücksendeanpassung überschreitet den verbleibenden Gesamtbetrag. Bitte verringern Sie den Betrag oder entfernen Sie bestehende Rücksendungen.",
   "sales.audit.channels.create": "Vertriebskanal erstellen",
   "sales.audit.channels.delete": "Vertriebskanal löschen",
   "sales.audit.channels.update": "Vertriebskanal aktualisieren",

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

@@ -4,6 +4,8 @@
   "audit_logs.resource_kind.sales.payment": "Payment",
   "audit_logs.resource_kind.sales.shipment": "Shipment",
   "customers~sales.nav.group": "Sales",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalGross": "Return adjustment amountGross exceeds the remaining grand total. Reduce the amount or remove existing returns first.",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalNet": "Return adjustment amountNet exceeds the remaining grand total. Reduce the amount or remove existing returns first.",
   "sales.audit.channels.create": "Create sales channel",
   "sales.audit.channels.delete": "Delete sales channel",
   "sales.audit.channels.update": "Update sales channel",

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

@@ -4,6 +4,8 @@
   "audit_logs.resource_kind.sales.payment": "Pago",
   "audit_logs.resource_kind.sales.shipment": "Envío",
   "customers~sales.nav.group": "Ventas",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalGross": "El importe bruto del ajuste de devolución supera el total restante. Reduzca el importe o elimine las devoluciones existentes.",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalNet": "El importe neto del ajuste de devolución supera el total restante. Reduzca el importe o elimine las devoluciones existentes.",
   "sales.audit.channels.create": "Crear canal de ventas",
   "sales.audit.channels.delete": "Eliminar canal de ventas",
   "sales.audit.channels.update": "Actualizar canal de ventas",

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

@@ -4,6 +4,8 @@
   "audit_logs.resource_kind.sales.payment": "Płatność",
   "audit_logs.resource_kind.sales.shipment": "Wysyłka",
   "customers~sales.nav.group": "Sprzedaż",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalGross": "Kwota brutto korekty zwrotu przekracza pozostałą wartość zamówienia. Zmniejsz kwotę lub usuń istniejące zwroty.",
+  "sales.adjustments.error.returnExceedsRemainingGrandTotalNet": "Kwota netto korekty zwrotu przekracza pozostałą wartość zamówienia. Zmniejsz kwotę lub usuń istniejące zwroty.",
   "sales.audit.channels.create": "Utwórz kanał sprzedaży",
   "sales.audit.channels.delete": "Usuń kanał sprzedaży",
   "sales.audit.channels.update": "Zaktualizuj kanał sprzedaży",