@open-mercato/core 0.9.1-develop.7473.1.de5b22888f → 0.9.1-develop.7475.1.28ca93ed97

package/src/modules/catalog/translations.ts

@@ -1,3 +1,12 @@
+import {
+  registerTranslatableEntityListPath,
+  registerTranslatableFieldExpander,
+} from '@open-mercato/shared/lib/localization/translatable-fields'
+import {
+  OPTION_SCHEMA_TEMPLATE_ENTITY_TYPE,
+  expandOptionSchemaTranslationFields,
+} from './lib/optionSchemaTranslations'
+
 export const translatableFields: Record<string, string[]> = {
   'catalog:catalog_product': ['title', 'subtitle', 'description', 'seoTitle', 'seoDescription'],
   'catalog:catalog_product_variant': ['name'],
@@ -7,4 +16,7 @@ export const translatableFields: Record<string, string[]> = {
   'catalog:catalog_product_tag': ['label'],
 }
 
+registerTranslatableFieldExpander(OPTION_SCHEMA_TEMPLATE_ENTITY_TYPE, expandOptionSchemaTranslationFields)
+registerTranslatableEntityListPath(OPTION_SCHEMA_TEMPLATE_ENTITY_TYPE, '/api/catalog/option-schemas')
+
 export default translatableFields

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

@@ -201,5 +201,9 @@
   "configs.upgrades.devicesPushTokenEncryption.cta": "Push-Tokens von Geräten verschlüsseln",
   "configs.upgrades.devicesPushTokenEncryption.loading": "Verschlüsselungszuordnung für Push-Tokens wird angelegt…",
   "configs.upgrades.devicesPushTokenEncryption.message": "Version {{version}} fügt mobile Push-Benachrichtigungen hinzu und verschlüsselt Geräte-Push-Tokens im Ruhezustand. Bestehende Mandanten haben keine Verschlüsselungszuordnung für die neue Geräte-Entität, sodass nach dem Upgrade registrierte Tokens unverschlüsselt gespeichert würden. Führen Sie dies aus, um die Zuordnung anzulegen, damit Push-Tokens verschlüsselt werden.",
-  "configs.upgrades.devicesPushTokenEncryption.success": "Verschlüsselungszuordnung für Push-Tokens angelegt."
+  "configs.upgrades.devicesPushTokenEncryption.success": "Verschlüsselungszuordnung für Push-Tokens angelegt.",
+  "configs.upgrades.ecommerceDraftStore.cta": "Standard-Shop erstellen",
+  "configs.upgrades.ecommerceDraftStore.loading": "Standard-Shop wird erstellt…",
+  "configs.upgrades.ecommerceDraftStore.message": "Version {{version}} fügt das Shop-Modul hinzu. Arbeitsbereiche, die schon vorher existierten, haben noch keinen Shop. Führen Sie dies aus, um aus dem Namen Ihrer Organisation einen Entwurfs-Shop zu erstellen, den Sie dann konfigurieren können. Existiert bereits ein Shop, passiert nichts.",
+  "configs.upgrades.ecommerceDraftStore.success": "Standard-Shop erstellt."
 }

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

@@ -201,5 +201,9 @@
   "configs.upgrades.devicesPushTokenEncryption.cta": "Encrypt device push tokens",
   "configs.upgrades.devicesPushTokenEncryption.loading": "Seeding push-token encryption map…",
   "configs.upgrades.devicesPushTokenEncryption.message": "Version {{version}} adds mobile push and encrypts device push tokens at rest. Existing tenants have no encryption map for the new device entity, so tokens registered after the upgrade would be stored unencrypted. Run this to seed the map so push tokens are encrypted.",
-  "configs.upgrades.devicesPushTokenEncryption.success": "Push-token encryption map seeded."
+  "configs.upgrades.devicesPushTokenEncryption.success": "Push-token encryption map seeded.",
+  "configs.upgrades.ecommerceDraftStore.cta": "Create the default store",
+  "configs.upgrades.ecommerceDraftStore.loading": "Creating the default store…",
+  "configs.upgrades.ecommerceDraftStore.message": "Version {{version}} adds the Stores module. Workspaces that existed before it have no store yet. Run this to create one draft store from your organization's name so you have something to configure. It does nothing if a store already exists.",
+  "configs.upgrades.ecommerceDraftStore.success": "Default store created."
 }

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

@@ -201,5 +201,9 @@
   "configs.upgrades.devicesPushTokenEncryption.cta": "Cifrar tokens push de dispositivos",
   "configs.upgrades.devicesPushTokenEncryption.loading": "Creando el mapa de cifrado de tokens push…",
   "configs.upgrades.devicesPushTokenEncryption.message": "La versión {{version}} añade notificaciones push móviles y cifra los tokens push de los dispositivos en reposo. Los inquilinos existentes no tienen un mapa de cifrado para la nueva entidad de dispositivo, por lo que los tokens registrados tras la actualización se guardarían sin cifrar. Ejecuta esto para crear el mapa y que los tokens push queden cifrados.",
-  "configs.upgrades.devicesPushTokenEncryption.success": "Mapa de cifrado de tokens push creado."
+  "configs.upgrades.devicesPushTokenEncryption.success": "Mapa de cifrado de tokens push creado.",
+  "configs.upgrades.ecommerceDraftStore.cta": "Crear la tienda predeterminada",
+  "configs.upgrades.ecommerceDraftStore.loading": "Creando la tienda predeterminada…",
+  "configs.upgrades.ecommerceDraftStore.message": "La versión {{version}} añade el módulo de tiendas. Los espacios de trabajo anteriores aún no tienen ninguna tienda. Ejecuta esto para crear una tienda en borrador a partir del nombre de tu organización y tener algo que configurar. No hace nada si ya existe una tienda.",
+  "configs.upgrades.ecommerceDraftStore.success": "Tienda predeterminada creada."
 }

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

@@ -201,5 +201,9 @@
   "configs.upgrades.devicesPushTokenEncryption.cta": "기기 푸시 토큰 암호화",
   "configs.upgrades.devicesPushTokenEncryption.loading": "푸시 토큰 암호화 맵을 생성하는 중…",
   "configs.upgrades.devicesPushTokenEncryption.message": "{{version}} 버전에서 모바일 푸시가 추가되며 기기 푸시 토큰이 저장 시 암호화됩니다. 기존 테넌트에는 새 기기 엔티티에 대한 암호화 맵이 없어, 업그레이드 이후 등록되는 토큰이 암호화되지 않은 상태로 저장됩니다. 이 작업을 실행해 맵을 생성하면 푸시 토큰이 암호화됩니다.",
-  "configs.upgrades.devicesPushTokenEncryption.success": "푸시 토큰 암호화 맵이 생성되었습니다."
+  "configs.upgrades.devicesPushTokenEncryption.success": "푸시 토큰 암호화 맵이 생성되었습니다.",
+  "configs.upgrades.ecommerceDraftStore.cta": "기본 스토어 만들기",
+  "configs.upgrades.ecommerceDraftStore.loading": "기본 스토어를 만드는 중…",
+  "configs.upgrades.ecommerceDraftStore.message": "{{version}} 버전에서 스토어 모듈이 추가됩니다. 이전부터 있던 워크스페이스에는 아직 스토어가 없습니다. 이 작업을 실행하면 조직 이름으로 초안 스토어가 하나 생성되어 바로 설정을 시작할 수 있습니다. 이미 스토어가 있으면 아무 작업도 하지 않습니다.",
+  "configs.upgrades.ecommerceDraftStore.success": "기본 스토어가 생성되었습니다."
 }

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

@@ -201,5 +201,9 @@
   "configs.upgrades.devicesPushTokenEncryption.cta": "Szyfruj tokeny push urządzeń",
   "configs.upgrades.devicesPushTokenEncryption.loading": "Tworzenie mapy szyfrowania tokenów push…",
   "configs.upgrades.devicesPushTokenEncryption.message": "Wersja {{version}} dodaje mobilne powiadomienia push i szyfruje tokeny push urządzeń w spoczynku. Istniejący najemcy nie mają mapy szyfrowania dla nowej encji urządzenia, więc tokeny zarejestrowane po aktualizacji byłyby przechowywane bez szyfrowania. Uruchom to, aby utworzyć mapę i zaszyfrować tokeny push.",
-  "configs.upgrades.devicesPushTokenEncryption.success": "Utworzono mapę szyfrowania tokenów push."
+  "configs.upgrades.devicesPushTokenEncryption.success": "Utworzono mapę szyfrowania tokenów push.",
+  "configs.upgrades.ecommerceDraftStore.cta": "Utwórz domyślny sklep",
+  "configs.upgrades.ecommerceDraftStore.loading": "Tworzenie domyślnego sklepu…",
+  "configs.upgrades.ecommerceDraftStore.message": "Wersja {{version}} dodaje moduł sklepów. Przestrzenie robocze istniejące wcześniej nie mają jeszcze żadnego sklepu. Uruchom to, aby utworzyć jeden sklep w wersji szkicu na podstawie nazwy organizacji, który możesz skonfigurować. Jeśli sklep już istnieje, nic się nie dzieje.",
+  "configs.upgrades.ecommerceDraftStore.success": "Utworzono domyślny sklep."
 }

package/src/modules/configs/lib/upgrade-actions.ts

@@ -7,6 +7,13 @@ import { reconcileAttachmentOrganizations } from '@open-mercato/core/modules/att
 
 const logger = createLogger('configs').child({ component: 'upgrade-actions' })
 
+type BaseCurrencyResolver = {
+  resolveBaseCurrency(scope: {
+    tenantId: string
+    organizationIds: string[]
+  }): Promise<{ status: 'resolved'; code: string } | { status: 'missing' | 'ambiguous' | 'unavailable' }>
+}
+
 export type UpgradeActionContext = {
   tenantId: string
   organizationId: string
@@ -176,6 +183,34 @@ export const upgradeActions: UpgradeActionDefinition[] = [
       else await invalidate()
     },
   },
+  {
+    id: 'ecommerce.seed-draft-store',
+    version: '0.9.1',
+    messageKey: 'configs.upgrades.ecommerceDraftStore.message',
+    ctaKey: 'configs.upgrades.ecommerceDraftStore.cta',
+    successKey: 'configs.upgrades.ecommerceDraftStore.success',
+    loadingKey: 'configs.upgrades.ecommerceDraftStore.loading',
+    requiredModules: ['ecommerce'],
+    run: async ({ container, em, tenantId, organizationId }) => {
+      const { seedDraftStore } = await import('@open-mercato/core/modules/ecommerce/lib/seedDraftStore')
+      const result = await seedDraftStore(
+        em,
+        { tenantId, organizationId },
+        {
+          resolveCurrencyCode: async () => {
+            try {
+              const resolver = container.resolve<BaseCurrencyResolver>('baseCurrencyService')
+              const resolution = await resolver.resolveBaseCurrency({ tenantId, organizationIds: [organizationId] })
+              return resolution.status === 'resolved' ? resolution.code : null
+            } catch {
+              return null
+            }
+          },
+        },
+      )
+      logger.info('ecommerce draft store seed completed', { tenantId, organizationId, status: result.status })
+    },
+  },
 ]
 
 export function actionsUpToVersion(version: string): UpgradeActionDefinition[] {

package/src/modules/customer_groups/api/customer-groups/[id]/terms/route.ts

@@ -9,12 +9,14 @@ import { CrudHttpError, badRequest, conflict, isCrudHttpError, isUniqueViolation
 import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import type { AssortmentScope } from '@open-mercato/shared/lib/catalog-visibility'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
 import { CustomerGroup, CustomerGroupTerms } from '../../../../data/entities'
 import { isPriceKindInTenant } from '../../../../lib/priceKindScope'
 import { announceCustomerGroupTermsUpdated } from '../../../../lib/groupEvents'
 import {
+  assortmentScopeSchema,
   customerGroupTermsCreateSchema,
   customerGroupTermsUpdateSchema,
   type CustomerGroupTermsCreateInput,
@@ -113,6 +115,7 @@ function serializeTerms(terms: CustomerGroupTerms) {
     creditCurrencyCode: terms.creditCurrencyCode ?? null,
     approvalRequiredAbove: toNumberOrNull(terms.approvalRequiredAbove),
     minOrderValue: toNumberOrNull(terms.minOrderValue),
+    assortmentScope: terms.assortmentScope ?? null,
     metadata: terms.metadata ?? null,
     createdAt: terms.createdAt.toISOString(),
     updatedAt: terms.updatedAt.toISOString(),
@@ -159,6 +162,7 @@ type CustomerGroupTermsEntityData = {
   creditCurrencyCode: string | null
   approvalRequiredAbove: string | null
   minOrderValue: string | null
+  assortmentScope: AssortmentScope | null
   metadata: Record<string, unknown> | null
 }
 
@@ -174,6 +178,7 @@ function toEntityData(input: CustomerGroupTermsCreateInput): CustomerGroupTermsE
     creditCurrencyCode: input.creditCurrencyCode ?? null,
     approvalRequiredAbove: toNumericString(input.approvalRequiredAbove),
     minOrderValue: toNumericString(input.minOrderValue),
+    assortmentScope: input.assortmentScope ?? null,
     metadata: input.metadata ?? null,
   }
 }
@@ -193,6 +198,7 @@ function applyTermsUpdate(entity: CustomerGroupTerms, input: CustomerGroupTermsU
   if (hasOwn(input, 'creditCurrencyCode')) entity.creditCurrencyCode = input.creditCurrencyCode ?? null
   if (hasOwn(input, 'approvalRequiredAbove')) entity.approvalRequiredAbove = toNumericString(input.approvalRequiredAbove)
   if (hasOwn(input, 'minOrderValue')) entity.minOrderValue = toNumericString(input.minOrderValue)
+  if (hasOwn(input, 'assortmentScope')) entity.assortmentScope = input.assortmentScope ?? null
   if (hasOwn(input, 'metadata')) entity.metadata = input.metadata ?? null
 }
 
@@ -314,6 +320,7 @@ const termsItemSchema = z.object({
   creditCurrencyCode: z.string().nullable(),
   approvalRequiredAbove: z.number().nullable(),
   minOrderValue: z.number().nullable(),
+  assortmentScope: assortmentScopeSchema,
   metadata: z.record(z.string(), z.unknown()).nullable(),
   createdAt: z.string(),
   updatedAt: z.string(),

package/src/modules/customer_groups/components/CustomerGroupTermsSection.tsx

@@ -3,15 +3,29 @@
 import * as React from 'react'
 import { z } from 'zod'
 import { FileText } from 'lucide-react'
-import { CrudForm, type CrudField } from '@open-mercato/ui/backend/CrudForm'
+import { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'
 import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { ErrorMessage, LoadingMessage } from '@open-mercato/ui/backend/detail'
 import { SectionHeader } from '@open-mercato/ui/backend/SectionHeader'
 import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { LookupMultiPicker } from '@open-mercato/ui/backend/inputs/LookupPickers'
+import type { LookupSource } from '@open-mercato/ui/backend/inputs/lookupSources'
+import {
+  categoryLookupSource,
+  productLookupSource,
+  tagLookupSource,
+} from '@open-mercato/core/modules/catalog/components/lookupSources'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { CustomerGroupTermsPriceKindField } from './CustomerGroupTermsPriceKindField'
+import {
+  buildAssortmentScopePayload,
+  mapAssortmentScopeToFormValues,
+  type AssortmentScopeField,
+  type AssortmentScopeFormValues,
+  type GroupAssortmentScope,
+} from './customerGroupAssortmentScope'
 
 export type CustomerGroupTermsDTO = {
   id: string
@@ -25,6 +39,7 @@ export type CustomerGroupTermsDTO = {
   creditCurrencyCode: string | null
   approvalRequiredAbove: number | null
   minOrderValue: number | null
+  assortmentScope?: GroupAssortmentScope | null
   metadata: Record<string, unknown> | null
   createdAt: string
   updatedAt: string
@@ -52,7 +67,7 @@ function fromPurchaseOnAccountValue(value: string | undefined): boolean | null {
   return null
 }
 
-type CustomerGroupTermsFormValues = {
+type CustomerGroupTermsFormValues = AssortmentScopeFormValues & {
   priceKindId: string
   paymentTermsDays?: number
   allowPurchaseOnAccount: PurchaseOnAccountValue
@@ -71,6 +86,45 @@ function mapTermsToFormValues(terms: CustomerGroupTermsDTO | null): CustomerGrou
     creditCurrencyCode: terms?.creditCurrencyCode ?? '',
     approvalRequiredAbove: terms?.approvalRequiredAbove ?? undefined,
     minOrderValue: terms?.minOrderValue ?? undefined,
+    ...mapAssortmentScopeToFormValues(terms?.assortmentScope),
+  }
+}
+
+const TERMS_FIELD_IDS = [
+  'priceKindId',
+  'paymentTermsDays',
+  'allowPurchaseOnAccount',
+  'defaultCreditLimit',
+  'creditCurrencyCode',
+  'approvalRequiredAbove',
+  'minOrderValue',
+]
+
+function toIdList(value: unknown): string[] {
+  return Array.isArray(value) ? value.filter((entry): entry is string => typeof entry === 'string') : []
+}
+
+function scopePickerField(
+  id: AssortmentScopeField,
+  label: string,
+  placeholder: string,
+  source: LookupSource,
+  readOnly: boolean,
+): CrudField {
+  return {
+    id,
+    type: 'custom',
+    label,
+    disabled: readOnly,
+    component: ({ value, setValue, disabled }) => (
+      <LookupMultiPicker
+        source={source}
+        value={toIdList(value)}
+        onChange={(next) => setValue(next)}
+        placeholder={placeholder}
+        disabled={disabled || readOnly}
+      />
+    ),
   }
 }
 
@@ -118,6 +172,11 @@ export function CustomerGroupTermsSection({
           .max(4, t('customer_groups.groups.form.terms.errors.currencyLength', 'Use up to 4 characters.')),
         approvalRequiredAbove: z.coerce.number().min(0, negativeMessage).optional(),
         minOrderValue: z.coerce.number().min(0, negativeMessage).optional(),
+        categoryIds: z.array(z.string()).default([]),
+        tagIds: z.array(z.string()).default([]),
+        excludeProductIds: z.array(z.string()).default([]),
+        excludeCategoryIds: z.array(z.string()).default([]),
+        excludeTagIds: z.array(z.string()).default([]),
       }),
     [negativeMessage, t],
   )
@@ -189,6 +248,66 @@ export function CustomerGroupTermsSection({
         type: 'number',
         layout: 'half',
       },
+      scopePickerField(
+        'categoryIds',
+        t('customer_groups.groups.form.terms.assortment.field.categoryIds', 'Categories'),
+        t('customer_groups.groups.form.terms.assortment.placeholder.category', 'Search categories'),
+        categoryLookupSource,
+        !canManage,
+      ),
+      scopePickerField(
+        'tagIds',
+        t('customer_groups.groups.form.terms.assortment.field.tagIds', 'Tags'),
+        t('customer_groups.groups.form.terms.assortment.placeholder.tag', 'Search tags'),
+        tagLookupSource,
+        !canManage,
+      ),
+      scopePickerField(
+        'excludeProductIds',
+        t('customer_groups.groups.form.terms.assortment.field.excludeProductIds', 'Products'),
+        t('customer_groups.groups.form.terms.assortment.placeholder.product', 'Search products'),
+        productLookupSource,
+        !canManage,
+      ),
+      scopePickerField(
+        'excludeCategoryIds',
+        t('customer_groups.groups.form.terms.assortment.field.excludeCategoryIds', 'Categories'),
+        t('customer_groups.groups.form.terms.assortment.placeholder.category', 'Search categories'),
+        categoryLookupSource,
+        !canManage,
+      ),
+      scopePickerField(
+        'excludeTagIds',
+        t('customer_groups.groups.form.terms.assortment.field.excludeTagIds', 'Tags'),
+        t('customer_groups.groups.form.terms.assortment.placeholder.tag', 'Search tags'),
+        tagLookupSource,
+        !canManage,
+      ),
+    ],
+    [canManage, t],
+  )
+
+  const groups = React.useMemo<CrudFormGroup[]>(
+    () => [
+      { id: 'terms', fields: TERMS_FIELD_IDS },
+      {
+        id: 'assortmentInclude',
+        title: t('customer_groups.groups.form.terms.assortment.includeTitle', 'Assortment scope: show only products in'),
+        description: t(
+          'customer_groups.groups.form.terms.assortment.includeHint',
+          "A product is visible to this group when it is in any of the chosen categories and carries any of the chosen tags. An empty picker does not filter, so leave both empty for no restriction; clearing a picker never hides everything. The storefront assortment a buyer sees is the channel's scope narrowed by this group's scope, and a buyer in several groups sees the union of their scopes.",
+        ),
+        fields: ['categoryIds', 'tagIds'],
+      },
+      {
+        id: 'assortmentExclude',
+        title: t('customer_groups.groups.form.terms.assortment.excludeTitle', 'Always hide from this group'),
+        description: t(
+          'customer_groups.groups.form.terms.assortment.excludeHint',
+          'Hidden products, categories and tags win over the selection above.',
+        ),
+        fields: ['excludeProductIds', 'excludeCategoryIds', 'excludeTagIds'],
+      },
     ],
     [t],
   )
@@ -209,6 +328,7 @@ export function CustomerGroupTermsSection({
         approvalRequiredAbove:
           typeof values.approvalRequiredAbove === 'number' ? values.approvalRequiredAbove : null,
         minOrderValue: typeof values.minOrderValue === 'number' ? values.minOrderValue : null,
+        assortmentScope: buildAssortmentScopePayload(values),
       }
       // `updateCrud` PUTs to `/api/customer_groups/customer-groups/{groupId}/terms`, matching the
       // upsert route (Step 2.4). `optimisticLockUpdatedAt` below is
@@ -253,8 +373,10 @@ export function CustomerGroupTermsSection({
         <CrudForm<CustomerGroupTermsFormValues>
           key={terms?.updatedAt ?? 'new'}
           embedded
+          disableInitialFocus
           schema={schema}
           fields={fields}
+          groups={groups}
           initialValues={initialValues}
           optimisticLockUpdatedAt={terms?.updatedAt ?? TERMS_NOT_YET_CREATED_LOCK_TOKEN}
           readOnly={!canManage}

package/src/modules/customer_groups/components/customerGroupAssortmentScope.ts

@@ -0,0 +1,46 @@
+export const ASSORTMENT_SCOPE_FIELDS = [
+  'categoryIds',
+  'tagIds',
+  'excludeProductIds',
+  'excludeCategoryIds',
+  'excludeTagIds',
+] as const
+
+export type AssortmentScopeField = (typeof ASSORTMENT_SCOPE_FIELDS)[number]
+
+export type GroupAssortmentScope = Partial<Record<AssortmentScopeField, string[]>>
+
+export type AssortmentScopeFormValues = Record<AssortmentScopeField, string[]>
+
+function normalizeIds(value: unknown): string[] {
+  if (!Array.isArray(value)) return []
+  const seen = new Set<string>()
+  const ids: string[] = []
+  for (const entry of value) {
+    if (typeof entry !== 'string') continue
+    const trimmed = entry.trim()
+    if (!trimmed || seen.has(trimmed)) continue
+    seen.add(trimmed)
+    ids.push(trimmed)
+  }
+  return ids
+}
+
+export function mapAssortmentScopeToFormValues(scope: GroupAssortmentScope | null | undefined): AssortmentScopeFormValues {
+  return {
+    categoryIds: normalizeIds(scope?.categoryIds),
+    tagIds: normalizeIds(scope?.tagIds),
+    excludeProductIds: normalizeIds(scope?.excludeProductIds),
+    excludeCategoryIds: normalizeIds(scope?.excludeCategoryIds),
+    excludeTagIds: normalizeIds(scope?.excludeTagIds),
+  }
+}
+
+export function buildAssortmentScopePayload(values: Partial<Record<AssortmentScopeField, unknown>>): GroupAssortmentScope | null {
+  const scope: GroupAssortmentScope = {}
+  for (const field of ASSORTMENT_SCOPE_FIELDS) {
+    const ids = normalizeIds(values[field])
+    if (ids.length > 0) scope[field] = ids
+  }
+  return Object.keys(scope).length > 0 ? scope : null
+}

package/src/modules/customer_groups/data/entities.ts

@@ -1,5 +1,6 @@
 import { OptionalProps } from '@mikro-orm/core'
 import { Entity, Index, PrimaryKey, Property } from '@mikro-orm/decorators/legacy'
+import type { AssortmentScope } from '@open-mercato/shared/lib/catalog-visibility'
 
 export type CustomerGroupKind = 'b2c' | 'b2b' | 'internal' | 'partner'
 export type CustomerGroupMembershipSource = 'manual' | 'import' | 'rule' | 'onboarding'
@@ -230,6 +231,9 @@ export class CustomerGroupTerms {
   @Property({ name: 'min_order_value', type: 'numeric', precision: 16, scale: 2, nullable: true })
   minOrderValue?: string | null
 
+  @Property({ name: 'assortment_scope', type: 'jsonb', nullable: true })
+  assortmentScope?: AssortmentScope | null
+
   @Property({ type: 'jsonb', nullable: true })
   metadata?: Record<string, unknown> | null
 

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

@@ -198,6 +198,19 @@ const clearableNonNegativeNumberSchema = z.preprocess(
 
 const currencyCodeSchema = clearableStringSchema(4)
 
+export const assortmentScopeSchema = z
+  .object({
+    categoryIds: z.array(uuid()).optional(),
+    tagIds: z.array(uuid()).optional(),
+    excludeProductIds: z.array(uuid()).optional(),
+    excludeCategoryIds: z.array(uuid()).optional(),
+    excludeTagIds: z.array(uuid()).optional(),
+  })
+  .strict()
+  .nullable()
+
+export type AssortmentScopeInput = z.infer<typeof assortmentScopeSchema>
+
 // Default-free, for the same reason as `customerGroupBaseShape` above.
 const customerGroupTermsBaseShape = {
   organizationId: uuid().nullable().optional(),
@@ -210,6 +223,7 @@ const customerGroupTermsBaseShape = {
   creditCurrencyCode: currencyCodeSchema,
   approvalRequiredAbove: clearableNonNegativeNumberSchema,
   minOrderValue: clearableNonNegativeNumberSchema,
+  assortmentScope: assortmentScopeSchema.optional(),
   metadata: clearableMetadataSchema,
 }
 

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

@@ -71,6 +71,18 @@
   "customer_groups.groups.form.loading": "Kundengruppe wird geladen …",
   "customer_groups.groups.form.readOnly": "Diese Gruppe ist schreibgeschützt. Sie haben keine Berechtigung, sie zu ändern.",
   "customer_groups.groups.form.terms.action.save": "Konditionen speichern",
+  "customer_groups.groups.form.terms.assortment.excludeHint": "Ausgeblendete Produkte, Kategorien und Tags haben Vorrang vor der Auswahl oben.",
+  "customer_groups.groups.form.terms.assortment.excludeTitle": "Für diese Gruppe immer ausblenden",
+  "customer_groups.groups.form.terms.assortment.field.categoryIds": "Kategorien",
+  "customer_groups.groups.form.terms.assortment.field.excludeCategoryIds": "Kategorien",
+  "customer_groups.groups.form.terms.assortment.field.excludeProductIds": "Produkte",
+  "customer_groups.groups.form.terms.assortment.field.excludeTagIds": "Tags",
+  "customer_groups.groups.form.terms.assortment.field.tagIds": "Tags",
+  "customer_groups.groups.form.terms.assortment.includeHint": "Ein Produkt ist für diese Gruppe sichtbar, wenn es in einer der gewählten Kategorien liegt und einen der gewählten Tags trägt. Ein leeres Feld filtert nicht; lassen Sie beide leer für keine Einschränkung. Ein geleertes Feld blendet nie alles aus. Das Shop-Sortiment eines Käufers ist der Bereich des Kanals, eingeschränkt durch den Bereich dieser Gruppe; ein Käufer in mehreren Gruppen sieht die Vereinigung ihrer Bereiche.",
+  "customer_groups.groups.form.terms.assortment.includeTitle": "Sortimentsbereich: nur Produkte zeigen aus",
+  "customer_groups.groups.form.terms.assortment.placeholder.category": "Kategorien suchen",
+  "customer_groups.groups.form.terms.assortment.placeholder.product": "Produkte suchen",
+  "customer_groups.groups.form.terms.assortment.placeholder.tag": "Tags suchen",
   "customer_groups.groups.form.terms.empty.action": "Konditionen für diese Gruppe festlegen",
   "customer_groups.groups.form.terms.empty.description": "Diese Gruppe verwendet derzeit die von der übergeordneten Gruppe oder den Mandanten-Standardwerten geerbten Handelskonditionen. Legen Sie explizite Konditionen fest, um sie für diese Gruppe zu überschreiben.",
   "customer_groups.groups.form.terms.empty.title": "Keine Konditionen festgelegt — geerbt von übergeordneter Gruppe / Mandanten-Standardwerten",

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

@@ -71,6 +71,18 @@
   "customer_groups.groups.form.loading": "Loading customer group...",
   "customer_groups.groups.form.readOnly": "This group is view-only. You do not have permission to change it.",
   "customer_groups.groups.form.terms.action.save": "Save terms",
+  "customer_groups.groups.form.terms.assortment.excludeHint": "Hidden products, categories and tags win over the selection above.",
+  "customer_groups.groups.form.terms.assortment.excludeTitle": "Always hide from this group",
+  "customer_groups.groups.form.terms.assortment.field.categoryIds": "Categories",
+  "customer_groups.groups.form.terms.assortment.field.excludeCategoryIds": "Categories",
+  "customer_groups.groups.form.terms.assortment.field.excludeProductIds": "Products",
+  "customer_groups.groups.form.terms.assortment.field.excludeTagIds": "Tags",
+  "customer_groups.groups.form.terms.assortment.field.tagIds": "Tags",
+  "customer_groups.groups.form.terms.assortment.includeHint": "A product is visible to this group when it is in any of the chosen categories and carries any of the chosen tags. An empty picker does not filter, so leave both empty for no restriction; clearing a picker never hides everything. The storefront assortment a buyer sees is the channel's scope narrowed by this group's scope, and a buyer in several groups sees the union of their scopes.",
+  "customer_groups.groups.form.terms.assortment.includeTitle": "Assortment scope: show only products in",
+  "customer_groups.groups.form.terms.assortment.placeholder.category": "Search categories",
+  "customer_groups.groups.form.terms.assortment.placeholder.product": "Search products",
+  "customer_groups.groups.form.terms.assortment.placeholder.tag": "Search tags",
   "customer_groups.groups.form.terms.empty.action": "Set terms for this group",
   "customer_groups.groups.form.terms.empty.description": "This group currently uses commercial terms inherited from its parent group or the tenant defaults. Set explicit terms to override them for this group.",
   "customer_groups.groups.form.terms.empty.title": "No terms set — inheriting from parent / tenant defaults",

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

@@ -71,6 +71,18 @@
   "customer_groups.groups.form.loading": "Cargando grupo de clientes…",
   "customer_groups.groups.form.readOnly": "Este grupo es de solo lectura. No tienes permiso para modificarlo.",
   "customer_groups.groups.form.terms.action.save": "Guardar condiciones",
+  "customer_groups.groups.form.terms.assortment.excludeHint": "Los productos, categorías y etiquetas ocultos prevalecen sobre la selección anterior.",
+  "customer_groups.groups.form.terms.assortment.excludeTitle": "Ocultar siempre a este grupo",
+  "customer_groups.groups.form.terms.assortment.field.categoryIds": "Categorías",
+  "customer_groups.groups.form.terms.assortment.field.excludeCategoryIds": "Categorías",
+  "customer_groups.groups.form.terms.assortment.field.excludeProductIds": "Productos",
+  "customer_groups.groups.form.terms.assortment.field.excludeTagIds": "Etiquetas",
+  "customer_groups.groups.form.terms.assortment.field.tagIds": "Etiquetas",
+  "customer_groups.groups.form.terms.assortment.includeHint": "Un producto es visible para este grupo cuando está en alguna de las categorías elegidas y tiene alguna de las etiquetas elegidas. Un selector vacío no filtra, así que deja ambos vacíos para no aplicar ninguna restricción; vaciar un selector nunca oculta todo. El surtido de la tienda que ve un comprador es el alcance del canal acotado por el alcance de este grupo, y un comprador en varios grupos ve la unión de sus alcances.",
+  "customer_groups.groups.form.terms.assortment.includeTitle": "Alcance del surtido: mostrar solo productos de",
+  "customer_groups.groups.form.terms.assortment.placeholder.category": "Buscar categorías",
+  "customer_groups.groups.form.terms.assortment.placeholder.product": "Buscar productos",
+  "customer_groups.groups.form.terms.assortment.placeholder.tag": "Buscar etiquetas",
   "customer_groups.groups.form.terms.empty.action": "Establecer condiciones para este grupo",
   "customer_groups.groups.form.terms.empty.description": "Este grupo utiliza actualmente las condiciones comerciales heredadas de su grupo principal o de los valores predeterminados del inquilino. Establezca condiciones explícitas para anularlas en este grupo.",
   "customer_groups.groups.form.terms.empty.title": "No se han establecido condiciones — se heredan del grupo principal o de los valores predeterminados del inquilino",

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

@@ -71,6 +71,18 @@
   "customer_groups.groups.form.loading": "고객 그룹을 불러오는 중…",
   "customer_groups.groups.form.readOnly": "이 그룹은 보기 전용입니다. 변경할 권한이 없습니다.",
   "customer_groups.groups.form.terms.action.save": "조건 저장",
+  "customer_groups.groups.form.terms.assortment.excludeHint": "숨긴 상품, 카테고리, 태그가 위의 선택보다 우선합니다.",
+  "customer_groups.groups.form.terms.assortment.excludeTitle": "이 그룹에는 항상 숨기기",
+  "customer_groups.groups.form.terms.assortment.field.categoryIds": "카테고리",
+  "customer_groups.groups.form.terms.assortment.field.excludeCategoryIds": "카테고리",
+  "customer_groups.groups.form.terms.assortment.field.excludeProductIds": "상품",
+  "customer_groups.groups.form.terms.assortment.field.excludeTagIds": "태그",
+  "customer_groups.groups.form.terms.assortment.field.tagIds": "태그",
+  "customer_groups.groups.form.terms.assortment.includeHint": "상품은 선택한 카테고리 중 하나에 속하고 선택한 태그 중 하나를 가질 때 이 그룹에 표시됩니다. 비어 있는 선택기는 필터링하지 않으므로 제한이 없으려면 둘 다 비워 두세요. 선택기를 비워도 모든 상품이 숨겨지지는 않습니다. 구매자가 보는 스토어프런트 상품은 채널 범위를 이 그룹의 범위로 좁힌 것이며, 여러 그룹에 속한 구매자는 각 범위의 합집합을 봅니다.",
+  "customer_groups.groups.form.terms.assortment.includeTitle": "상품 범위: 다음 상품만 표시",
+  "customer_groups.groups.form.terms.assortment.placeholder.category": "카테고리 검색",
+  "customer_groups.groups.form.terms.assortment.placeholder.product": "상품 검색",
+  "customer_groups.groups.form.terms.assortment.placeholder.tag": "태그 검색",
   "customer_groups.groups.form.terms.empty.action": "이 그룹의 조건 설정",
   "customer_groups.groups.form.terms.empty.description": "이 그룹은 현재 상위 그룹 또는 테넌트 기본값에서 상속된 상거래 조건을 사용합니다. 이 그룹에 대해 재정의하려면 명시적인 조건을 설정하세요.",
   "customer_groups.groups.form.terms.empty.title": "설정된 조건 없음 — 상위 그룹/테넌트 기본값을 상속함",

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

@@ -71,6 +71,18 @@
   "customer_groups.groups.form.loading": "Wczytywanie grupy klientów…",
   "customer_groups.groups.form.readOnly": "Ta grupa jest tylko do odczytu. Nie masz uprawnień do jej zmiany.",
   "customer_groups.groups.form.terms.action.save": "Zapisz warunki",
+  "customer_groups.groups.form.terms.assortment.excludeHint": "Ukryte produkty, kategorie i tagi mają pierwszeństwo przed powyższym wyborem.",
+  "customer_groups.groups.form.terms.assortment.excludeTitle": "Zawsze ukrywaj dla tej grupy",
+  "customer_groups.groups.form.terms.assortment.field.categoryIds": "Kategorie",
+  "customer_groups.groups.form.terms.assortment.field.excludeCategoryIds": "Kategorie",
+  "customer_groups.groups.form.terms.assortment.field.excludeProductIds": "Produkty",
+  "customer_groups.groups.form.terms.assortment.field.excludeTagIds": "Tagi",
+  "customer_groups.groups.form.terms.assortment.field.tagIds": "Tagi",
+  "customer_groups.groups.form.terms.assortment.includeHint": "Produkt jest widoczny dla tej grupy, gdy należy do dowolnej z wybranych kategorii i ma dowolny z wybranych tagów. Puste pole nie filtruje, więc pozostaw oba puste, aby nie ograniczać; wyczyszczenie pola nigdy nie ukrywa wszystkiego. Asortyment sklepu widoczny dla kupującego to zakres kanału zawężony zakresem tej grupy, a kupujący w kilku grupach widzi sumę ich zakresów.",
+  "customer_groups.groups.form.terms.assortment.includeTitle": "Zakres asortymentu: pokazuj tylko produkty z",
+  "customer_groups.groups.form.terms.assortment.placeholder.category": "Szukaj kategorii",
+  "customer_groups.groups.form.terms.assortment.placeholder.product": "Szukaj produktów",
+  "customer_groups.groups.form.terms.assortment.placeholder.tag": "Szukaj tagów",
   "customer_groups.groups.form.terms.empty.action": "Ustaw warunki dla tej grupy",
   "customer_groups.groups.form.terms.empty.description": "Ta grupa korzysta obecnie z warunków handlowych odziedziczonych po grupie nadrzędnej lub z domyślnych ustawień dzierżawcy. Ustaw jawne warunki, aby je zastąpić dla tej grupy.",
   "customer_groups.groups.form.terms.empty.title": "Nie ustawiono warunków — dziedziczone z grupy nadrzędnej / ustawień domyślnych dzierżawcy",

package/src/modules/customer_groups/migrations/.snapshot-open-mercato.json

@@ -317,6 +317,23 @@
           "enumItems": [],
           "mappedType": "decimal"
         },
+        "assortment_scope": {
+          "name": "assortment_scope",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "json"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz(6)",

package/src/modules/customer_groups/migrations/Migration20261005110250_customer_groups.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20261005110250_customer_groups extends Migration {
+
+  override name = 'Migration20261005110250';
+
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "customer_group_terms" add "assortment_scope" jsonb null;`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`alter table "customer_group_terms" drop column "assortment_scope";`);
+  }
+
+}