@open-mercato/core 0.6.6-develop.6404.1.e2f8d5025a → 0.6.6-develop.6407.1.9a4c26cf6a

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

@@ -614,6 +614,14 @@
   "catalog.search.priceKind.promotion": "Promoción",
   "catalog.search.status.inactive": "Inactivo",
   "catalog.search.variant.default": "Predeterminado",
+  "catalog.settings.loading": "Cargando…",
+  "catalog.settings.messages.saved": "Ajustes guardados.",
+  "catalog.settings.unitPriceDisplay.description": "Controla si la función de presentación del precio unitario de la UE está disponible en el formulario de producto.",
+  "catalog.settings.unitPriceDisplay.errors.load": "No se pudieron cargar los ajustes del catálogo.",
+  "catalog.settings.unitPriceDisplay.errors.save": "No se pudieron guardar los ajustes del catálogo.",
+  "catalog.settings.unitPriceDisplay.title": "Presentación del precio unitario",
+  "catalog.settings.unitPriceDisplay.toggleDescription": "Cuando está desactivado, los ajustes del precio unitario de la UE se ocultan en todos los formularios de producto. Desactívalo para fabricantes u otros inquilinos que no venden a consumidores.",
+  "catalog.settings.unitPriceDisplay.toggleLabel": "Activar la presentación del precio unitario de la UE",
   "catalog.stats.active": "Activos",
   "catalog.stats.categories": "Categorías",
   "catalog.stats.products": "Productos",

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

@@ -614,6 +614,14 @@
   "catalog.search.priceKind.promotion": "Promocja",
   "catalog.search.status.inactive": "Nieaktywny",
   "catalog.search.variant.default": "Domyślny",
+  "catalog.settings.loading": "Ładowanie…",
+  "catalog.settings.messages.saved": "Ustawienia zapisane.",
+  "catalog.settings.unitPriceDisplay.description": "Określa, czy funkcja prezentacji ceny jednostkowej UE jest dostępna w formularzu produktu.",
+  "catalog.settings.unitPriceDisplay.errors.load": "Nie udało się wczytać ustawień katalogu.",
+  "catalog.settings.unitPriceDisplay.errors.save": "Nie udało się zapisać ustawień katalogu.",
+  "catalog.settings.unitPriceDisplay.title": "Prezentacja ceny jednostkowej",
+  "catalog.settings.unitPriceDisplay.toggleDescription": "Gdy wyłączone, ustawienia ceny jednostkowej UE są ukryte w każdym formularzu produktu. Wyłącz tę opcję dla firm produkcyjnych lub innych najemców, którzy nie sprzedają konsumentom.",
+  "catalog.settings.unitPriceDisplay.toggleLabel": "Włącz prezentację ceny jednostkowej UE",
   "catalog.stats.active": "Aktywne",
   "catalog.stats.categories": "Kategorie",
   "catalog.stats.products": "Produkty",

package/src/modules/catalog/lib/settings.ts

@@ -0,0 +1,8 @@
+export const CATALOG_SETTINGS_MODULE_ID = 'catalog'
+
+// Controls whether the EU unit-price presentation feature is exposed at all.
+// Default ON so existing tenants keep the current behavior; manufacturers or
+// other non-retail tenants can turn it off to remove the settings from the
+// product form entirely.
+export const UNIT_PRICE_DISPLAY_ENABLED_KEY = 'unit_price_display_enabled'
+export const UNIT_PRICE_DISPLAY_ENABLED_DEFAULT = true

package/src/modules/customers/api/pipeline-stages/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 { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CommandRuntimeContext, CommandBus } from '@open-mercato/shared/lib/commands'
 import { CustomerPipelineStage, CustomerDictionaryEntry } from '../../data/entities'
@@ -56,15 +57,16 @@ async function buildContext(
 
 export async function GET(req: Request) {
   try {
-    const { ctx, organizationId, tenantId, translate } = await buildContext(req)
-    if (!organizationId || !tenantId) {
+    const { ctx, tenantId, translate } = await buildContext(req)
+    if (!tenantId) {
       return NextResponse.json({ error: translate('customers.errors.context_required', 'Organization and tenant context required') }, { status: 400 })
     }
+    const orgFilter = resolveOrganizationScopeFilter(ctx.organizationScope, ctx.auth)
     const url = new URL(req.url)
     const pipelineId = url.searchParams.get('pipelineId')
 
     const em = (ctx.container.resolve('em') as EntityManager)
-    const where: Record<string, unknown> = { organizationId, tenantId }
+    const where: Record<string, unknown> = { tenantId, ...orgFilter.where }
     if (pipelineId) where.pipelineId = pipelineId
 
     const stages = await em.find(CustomerPipelineStage, where, { orderBy: { order: 'ASC' } })
@@ -72,8 +74,8 @@ export async function GET(req: Request) {
     const stageLabels = stages.map((s) => s.label.trim().toLowerCase())
     const dictEntries = stageLabels.length
       ? await em.find(CustomerDictionaryEntry, {
-          organizationId,
           tenantId,
+          ...orgFilter.where,
           kind: 'pipeline_stage',
           normalizedValue: { $in: stageLabels },
         })

package/src/modules/customers/api/pipelines/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 { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CommandRuntimeContext, CommandBus } from '@open-mercato/shared/lib/commands'
 import { CustomerPipeline } from '../../data/entities'
@@ -56,15 +57,16 @@ async function buildContext(
 
 export async function GET(req: Request) {
   try {
-    const { ctx, organizationId, tenantId, translate } = await buildContext(req)
-    if (!organizationId || !tenantId) {
+    const { ctx, tenantId, translate } = await buildContext(req)
+    if (!tenantId) {
       return NextResponse.json({ error: translate('customers.errors.context_required', 'Organization and tenant context required') }, { status: 400 })
     }
+    const orgFilter = resolveOrganizationScopeFilter(ctx.organizationScope, ctx.auth)
     const url = new URL(req.url)
     const isDefaultParam = url.searchParams.get('isDefault')
 
     const em = (ctx.container.resolve('em') as EntityManager)
-    const where: Record<string, unknown> = { organizationId, tenantId }
+    const where: Record<string, unknown> = { tenantId, ...orgFilter.where }
     if (isDefaultParam === 'true') where.isDefault = true
     if (isDefaultParam === 'false') where.isDefault = false
 

package/src/modules/staff/api/team-members/assignable/route.ts

@@ -6,6 +6,7 @@ import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { createPagedListResponseSchema as createSharedPagedListResponseSchema } from '@open-mercato/shared/lib/openapi/crud'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import { User } from '@open-mercato/core/modules/auth/data/entities'
 import {
   resolveAuthActorId,
@@ -57,7 +58,7 @@ export const metadata = {
 async function canAccessAssignableStaff(
   rbac: RbacService | undefined,
   userId: string,
-  scope: { tenantId: string; organizationId: string },
+  scope: { tenantId: string; organizationId: string | null },
 ): Promise<boolean> {
   if (!rbac) return false
   if (
@@ -72,18 +73,13 @@ export async function GET(request: Request) {
   const { translate } = await resolveTranslations()
   try {
     const query = querySchema.parse(Object.fromEntries(new URL(request.url).searchParams))
-    const { container, em, auth, selectedOrganizationId } = await resolveCustomersRequestContext(request)
+    const { container, em, auth, scope: organizationScope } = await resolveCustomersRequestContext(request)
 
-    if (!selectedOrganizationId) {
-      throw new CrudHttpError(
-        400,
-        { error: translate('customers.errors.organization_required', 'Organization context is required') },
-      )
-    }
+    const orgFilter = resolveOrganizationScopeFilter(organizationScope, auth)
 
     const actorId = resolveAuthActorId(auth)
     const rbacService = container.resolve('rbacService') as RbacService | undefined
-    const scope = { tenantId: auth.tenantId, organizationId: selectedOrganizationId }
+    const scope = { tenantId: auth.tenantId, organizationId: orgFilter.rbacOrganizationId }
     const hasAccess = await canAccessAssignableStaff(rbacService, actorId, scope)
     if (!hasAccess) {
       throw new CrudHttpError(
@@ -104,7 +100,7 @@ export async function GET(request: Request) {
       StaffTeamMember,
       {
         tenantId: auth.tenantId,
-        organizationId: selectedOrganizationId,
+        ...orgFilter.where,
         deletedAt: null,
         isActive: true,
       },
@@ -136,7 +132,7 @@ export async function GET(request: Request) {
               id: { $in: userIds },
               deletedAt: null,
               tenantId: auth.tenantId,
-              organizationId: selectedOrganizationId,
+              ...orgFilter.where,
             },
             undefined,
             scope,
@@ -150,7 +146,7 @@ export async function GET(request: Request) {
               id: { $in: teamIds },
               deletedAt: null,
               tenantId: auth.tenantId,
-              organizationId: selectedOrganizationId,
+              ...orgFilter.where,
             },
             undefined,
             scope,