@open-mercato/core 0.6.7-develop.6862.1.c11a64ce0a → 0.6.7

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

@@ -2,9 +2,6 @@
   "payment_gateways.captureMethod.automatic": "Automatyczny",
   "payment_gateways.captureMethod.manual": "Manualny",
   "payment_gateways.column.gatewayStatus": "Status bramki",
-  "payment_gateways.errors.sessionAmountMismatch": "Kwota sesji płatności {amount} nie zgadza się z kwotą do zapłaty dla zamówienia {orderId}",
-  "payment_gateways.errors.sessionCurrencyMismatch": "Waluta sesji płatności {currencyCode} nie zgadza się z walutą zamówienia {orderId}",
-  "payment_gateways.errors.sessionOrderNotFound": "Nie znaleziono zamówienia {orderId} w bieżącym zakresie",
   "payment_gateways.feature.capture": "Przechwytywanie autoryzowanych płatności",
   "payment_gateways.feature.manage": "Zarządzanie sesjami płatności",
   "payment_gateways.feature.refund": "Zwroty przechwyconych płatności",
@@ -79,9 +76,5 @@
   "payment_gateways.transactions.success.capture": "Płatność została przechwycona",
   "payment_gateways.transactions.success.refreshStatus": "Status transakcji odświeżony",
   "payment_gateways.transactions.tableTitle": "Transakcje",
-  "payment_gateways.transactions.title": "Transakcje płatności",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.cta": "Zaplanuj czyszczenie roszczeń",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.loading": "Planowanie czyszczenia roszczeń…",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.message": "Zarejestruj codzienny harmonogram usuwający zakończone roszczenia inicjalizacji sesji płatności po 24-godzinnym oknie ponowienia.",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.success": "Czyszczenie roszczeń inicjalizacji sesji płatności zostało zaplanowane."
+  "payment_gateways.transactions.title": "Transakcje płatności"
 }

package/src/modules/payment_gateways/lib/gateway-service.ts

@@ -1,7 +1,6 @@
 import { randomUUID } from 'node:crypto'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
-import { createLogger } from '@open-mercato/shared/lib/logger'
 import {
   getGatewayAdapter,
   type CreateSessionInput,
@@ -12,27 +11,16 @@ import {
   type GatewayAdapter,
   type GatewayPaymentStatus,
   type PaymentGatewayPresentationRequest,
-  type PaymentOrderTotalResolver,
   type UnifiedPaymentStatus,
 } from '@open-mercato/shared/modules/payment_gateways/types'
 import type { CredentialsService } from '../../integrations/lib/credentials-service'
 import type { IntegrationStateService } from '../../integrations/lib/state-service'
 import type { IntegrationLogService } from '../../integrations/lib/log-service'
-import { conflict, CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import { GatewayPaymentOperation, GatewaySessionInitialization, GatewayTransaction } from '../data/entities'
+import { conflict } from '@open-mercato/shared/lib/crud/errors'
+import { GatewaySessionInitialization, GatewayTransaction } from '../data/entities'
 import { canApplyManualAction, isValidTransition, type ManualGatewayAction } from './status-machine'
 import { emitPaymentGatewayEvent } from '../events'
 import { readGatewayMetadata, readWebhookLog } from './transaction-fields'
-import { reconcileSessionAmountWithOrder } from './order-amount-reconciliation'
-import {
-  alignCapturedAmountWithStatus,
-  assertCaptureWithinRemaining,
-  formatAmountUnits,
-  parseAmountUnits,
-  releaseCaptureAmount,
-  reserveCaptureAmount,
-  settleCapturedAmount,
-} from './capture-ledger'
 import {
   completePaymentOperation,
   failPaymentOperation,
@@ -49,7 +37,6 @@ import {
 
 const PAYMENT_SESSION_CLAIM_STALE_MS = 30_000
 const PAYMENT_SESSION_WAIT_INTERVAL_MS = 25
-const logger = createLogger('payment_gateways').child({ component: 'gateway-service' })
 
 function assertManualActionAllowed(action: ManualGatewayAction, transaction: GatewayTransaction): void {
   const current = transaction.unifiedStatus as UnifiedPaymentStatus
@@ -58,6 +45,12 @@ function assertManualActionAllowed(action: ManualGatewayAction, transaction: Gat
   }
 }
 
+function assertCaptureAmountAllowed(amount: number | undefined, transaction: GatewayTransaction): void {
+  if (amount !== undefined && amount > Number(transaction.amount)) {
+    throw conflict(`Capture amount ${amount} exceeds authorized transaction amount ${transaction.amount}`)
+  }
+}
+
 function applyAdapterResultStatus(
   action: ManualGatewayAction,
   transaction: GatewayTransaction,
@@ -80,11 +73,6 @@ export interface PaymentGatewayServiceDeps {
   integrationCredentialsService: CredentialsService
   integrationStateService?: IntegrationStateService
   integrationLogService?: IntegrationLogService
-  /**
-   * Optional seam supplied by the module that owns orders (`sales` by default).
-   * When absent, session amounts cannot be reconciled and are accepted as-is.
-   */
-  paymentOrderTotalResolver?: PaymentOrderTotalResolver | null
   sessionClaimOptions?: {
     staleAfterMs?: number
     heartbeatIntervalMs?: number
@@ -191,10 +179,11 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       : undefined
     const adapter = getGatewayAdapter(providerKey, selectedVersion)
     if (!adapter) {
-      const message = selectedVersion
-        ? `No gateway adapter registered for provider: ${providerKey} (version: ${selectedVersion})`
-        : `No gateway adapter registered for provider: ${providerKey}`
-      throw new CrudHttpError(422, { error: message })
+      throw new Error(
+        selectedVersion
+          ? `No gateway adapter registered for provider: ${providerKey} (version: ${selectedVersion})`
+          : `No gateway adapter registered for provider: ${providerKey}`,
+      )
     }
     const credentials = await integrationCredentialsService.resolve(integrationId, scope) ?? {}
 
@@ -210,12 +199,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
     payload: Record<string, unknown>
     scope: { organizationId: string; tenantId: string }
     assertInitialAllowed?: (transaction: GatewayTransaction) => void
-    beforeInvoke?: (context: { transaction: GatewayTransaction; operation: GatewayPaymentOperation }) => Promise<void>
-    releaseOnFailure?: (context: {
-      transaction: GatewayTransaction
-      operation: GatewayPaymentOperation
-      providerInvoked: boolean
-    }) => Promise<void>
     invoke: (context: {
       adapter: GatewayAdapter
       credentials: Record<string, unknown>
@@ -248,17 +231,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       return prepared.result as unknown as TResult
     }
 
-    const operation = prepared.claim.record
-    // Everything after this flips to true is post-settlement: the provider moved the money and the
-    // completion transaction committed it. A later event or logging failure must not undo either,
-    // so the failure path below only runs while the operation can still be rolled back.
-    let settled = false
-    // Flips once the provider call returned, so the failure path can tell "the provider never
-    // moved the money" from "the provider moved it and only our bookkeeping failed" — the two
-    // cases need opposite rollback decisions.
-    let providerInvoked = false
     try {
-      await input.beforeInvoke?.({ transaction, operation })
       const { adapter, credentials } = await resolveAdapterAndCredentials(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
@@ -269,7 +242,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         transaction,
         idempotencyKey: prepared.claim.providerIdempotencyKey,
       })
-      providerInvoked = true
       const statusChanged = await completePaymentOperation(
         em,
         prepared.claim,
@@ -281,7 +253,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
           return changed
         },
       )
-      settled = true
       if (statusChanged) {
         await emitStatusEvent(result.status, {
           transactionId: transaction.id,
@@ -294,12 +265,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       await input.afterCommit(transaction, result)
       return result
     } catch (error: unknown) {
-      if (!settled) {
-        if (input.releaseOnFailure) {
-          await input.releaseOnFailure({ transaction, operation, providerInvoked }).catch(() => undefined)
-        }
-        await Promise.allSettled([failPaymentOperation(em, prepared.claim)])
-      }
+      await Promise.allSettled([failPaymentOperation(em, prepared.claim)])
       throw error
     }
   }
@@ -319,9 +285,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         ?? (session.clientSession?.type === 'redirect' ? session.clientSession.redirectUrl : null),
       clientSecret: session.clientSecret ?? null,
       amount: String(input.amount),
-      // An automatic-capture session comes back already captured, so the ledger has to start
-      // at the full amount — otherwise a later manual capture would look like the first one.
-      capturedAmount: session.status === 'captured' ? String(input.amount) : '0',
       currencyCode: input.currencyCode,
       gatewayMetadata: {
         ...(session.providerData ?? {}),
@@ -413,13 +376,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
   return {
     async createPaymentSession(input: CreatePaymentSessionInput): Promise<{ transaction: GatewayTransaction; session: CreateSessionResult }> {
       const scope = { organizationId: input.organizationId, tenantId: input.tenantId }
-      await reconcileSessionAmountWithOrder({
-        orderId: input.orderId,
-        amount: input.amount,
-        currencyCode: input.currencyCode,
-        scope,
-        resolver: deps.paymentOrderTotalResolver,
-      })
       const { adapter, credentials } = await resolveAdapterAndCredentials(input.providerKey, scope)
 
       const sessionInput: CreateSessionInput = {
@@ -470,7 +426,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
             scope,
           )
           if (!transaction) {
-            throw new Error('[internal] Completed payment session is missing its gateway transaction')
+            throw new Error('Completed payment session is missing its gateway transaction')
           }
           return { transaction, session: restoreSession(transaction) }
         }
@@ -491,15 +447,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         try {
           session = await adapter.createSession({ ...sessionInput, idempotencyKey: operationKey })
         } catch (error) {
-          try {
-            await releasePaymentSessionInitialization(em, ownership, scope)
-          } catch (releaseError) {
-            logger.warn('Failed to release payment session initialization claim', {
-              claimId: ownership.id,
-              providerKey: input.providerKey,
-              err: releaseError,
-            })
-          }
+          await releasePaymentSessionInitialization(em, ownership, scope).catch(() => undefined)
           throw error
         } finally {
           await stopHeartbeat()
@@ -543,57 +491,16 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       scope: { organizationId: string; tenantId: string },
       operationId?: string,
     ): Promise<CaptureResult> {
-      let reservedUnits: bigint | null = null
-      let providerAmount = amount
       return executeManualOperation({
         action: 'capture',
         transactionId,
         operationId,
         payload: { amount: amount ?? null },
         scope,
-        assertInitialAllowed: (transaction) => { assertCaptureWithinRemaining(transaction, amount) },
-        beforeInvoke: async ({ transaction, operation }) => {
-          const alreadyCapturedUnits = parseAmountUnits(transaction.capturedAmount)
-          reservedUnits = await reserveCaptureAmount(em, { transaction, operation, amount, scope })
-          // "Capture the rest" has to name the remaining amount once part of the authorization is
-          // already captured, otherwise the provider would capture the full amount a second time.
-          if (amount === undefined && alreadyCapturedUnits > 0n) {
-            providerAmount = Number(formatAmountUnits(reservedUnits))
-          }
-        },
-        // The slice goes back only while the provider has not been called yet. Once the capture
-        // call returned, the money may already have moved and only the completion transaction
-        // failed, so releasing would reopen the authorization for a fresh operation id and allow an
-        // over-capture. Holding the reservation is the conservative outcome: a retry of this same
-        // operation id reuses both the reservation and the provider idempotency key, so the provider
-        // itself collapses the duplicate.
-        releaseOnFailure: async ({ transaction, operation, providerInvoked }) => {
-          if (reservedUnits === null) return
-          if (providerInvoked) {
-            await writeTransactionLog(
-              transaction.providerKey,
-              { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
-              transaction.id,
-              'warn',
-              'Capture reservation stays outstanding because the provider call already returned',
-              { operationId: operation.operationId, reservedAmount: formatAmountUnits(reservedUnits) },
-            )
-            return
-          }
-          const released = await releaseCaptureAmount(em, { transactionId, operation, reservedUnits, scope })
-          if (released) return
-          await writeTransactionLog(
-            transaction.providerKey,
-            { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
-            transaction.id,
-            'warn',
-            'Capture reservation stays outstanding after a failed capture',
-            { operationId: operation.operationId, reservedAmount: formatAmountUnits(reservedUnits) },
-          )
-        },
+        assertInitialAllowed: (transaction) => assertCaptureAmountAllowed(amount, transaction),
         invoke: ({ adapter, credentials, transaction, idempotencyKey }) => adapter.capture({
           sessionId: readProviderSessionId(transaction),
-          amount: providerAmount,
+          amount,
           credentials,
           idempotencyKey,
         }),
@@ -602,7 +509,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
             ...readGatewayMetadata(transaction.gatewayMetadata),
             captureResult: result.providerData,
           }
-          if (reservedUnits !== null) settleCapturedAmount(transaction, reservedUnits, result.capturedAmount)
         },
         afterCommit: (transaction, result) => writeTransactionLog(
           transaction.providerKey,
@@ -698,7 +604,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       if (status.status !== transaction.unifiedStatus && isValidTransition(transaction.unifiedStatus as UnifiedPaymentStatus, status.status)) {
         const previousStatus = transaction.unifiedStatus
         transaction.unifiedStatus = status.status
-        alignCapturedAmountWithStatus(transaction, status.status)
         transaction.gatewayStatus = status.status
         transaction.gatewayMetadata = { ...readGatewayMetadata(transaction.gatewayMetadata), statusResult: status.providerData ?? null }
         transaction.lastPolledAt = new Date()
@@ -745,7 +650,6 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       const previousStatus = transaction.unifiedStatus
       if (shouldApplyStatus) {
         transaction.unifiedStatus = update.unifiedStatus
-        alignCapturedAmountWithStatus(transaction, update.unifiedStatus)
       }
       if (update.providerStatus) {
         transaction.gatewayStatus = update.providerStatus

package/src/modules/payment_gateways/lib/payment-operation-idempotency.ts

@@ -170,7 +170,6 @@ export async function preparePaymentOperation(
     attemptToken: claim.attemptToken,
     attemptCount: 1,
     result: null,
-    reservedAmount: null,
     leaseExpiresAt: claim.leaseExpiresAt,
     organizationId: input.scope.organizationId,
     tenantId: input.scope.tenantId,

package/src/modules/payment_gateways/lib/session-idempotency.ts

@@ -6,11 +6,6 @@ import { GatewaySessionInitialization } from '../data/entities'
 
 type Scope = { organizationId: string; tenantId: string }
 
-export const PAYMENT_SESSION_REPLAY_WINDOW_MS = 24 * 60 * 60 * 1000
-export const PAYMENT_SESSION_INITIALIZATION_PRUNE_QUEUE =
-  'payment-gateway-session-initialization-prune'
-export const PAYMENT_SESSION_INITIALIZATION_PRUNE_BATCH_SIZE = 1_000
-
 export type OwnedPaymentSessionInitialization = {
   id: string
   claimToken: string
@@ -145,34 +140,3 @@ export async function refreshPaymentSessionInitialization(
   )
   return refreshedRows > 0
 }
-
-export async function pruneCompletedPaymentSessionInitializations(
-  em: EntityManager,
-  scope: Scope,
-  options: { now?: Date; batchSize?: number } = {},
-): Promise<number> {
-  const now = options.now ?? new Date()
-  const batchSize = options.batchSize ?? PAYMENT_SESSION_INITIALIZATION_PRUNE_BATCH_SIZE
-  if (!Number.isInteger(batchSize) || batchSize < 1) {
-    throw new Error('[internal] Payment-session initialization prune batch size must be a positive integer')
-  }
-  const cutoff = new Date(now.getTime() - PAYMENT_SESSION_REPLAY_WINDOW_MS)
-  const connection = em.getConnection()
-  const result = await connection.execute(
-    `
-    delete from gateway_session_initializations
-    where id in (
-      select id from gateway_session_initializations
-      where tenant_id = ?
-        and organization_id = ?
-        and gateway_transaction_id is not null
-        and updated_at < ?
-      order by updated_at asc
-      limit ?
-    )
-    `,
-    [scope.tenantId, scope.organizationId, cutoff, batchSize],
-    'run',
-  ) as { affectedRows?: number; rowCount?: number } | undefined
-  return result?.affectedRows ?? result?.rowCount ?? 0
-}

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

@@ -195,23 +195,6 @@
           "enumItems": [],
           "mappedType": "text"
         },
-        "reserved_amount": {
-          "name": "reserved_amount",
-          "type": "numeric(18,4)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": 18,
-          "scale": 4,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "decimal"
-        },
         "result": {
           "name": "result",
           "type": "jsonb",
@@ -537,15 +520,6 @@
           "primary": true,
           "unique": true
         },
-        {
-          "columnNames": [],
-          "composite": false,
-          "constraint": false,
-          "keyName": "gateway_session_initializations_prune_idx",
-          "primary": false,
-          "unique": false,
-          "expression": "create index \"gateway_session_initializations_prune_idx\" on \"gateway_session_initializations\" (\"tenant_id\", \"organization_id\", \"updated_at\") where \"gateway_transaction_id\" is not null"
-        },
         {
           "columnNames": [
             "operation_key",
@@ -586,23 +560,6 @@
           "enumItems": [],
           "mappedType": "decimal"
         },
-        "captured_amount": {
-          "name": "captured_amount",
-          "type": "numeric(18,4)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": 18,
-          "scale": 4,
-          "default": "'0'",
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "decimal"
-        },
         "client_secret": {
           "name": "client_secret",
           "type": "text",
@@ -1171,4 +1128,4 @@
   ],
   "views": [],
   "nativeEnums": {}
-}
+}

package/src/modules/payment_gateways/setup.ts

@@ -1,62 +1,4 @@
-import { createHash } from 'node:crypto'
-import { createLogger } from '@open-mercato/shared/lib/logger'
 import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
-import { PAYMENT_SESSION_INITIALIZATION_PRUNE_QUEUE } from './lib/session-idempotency'
-
-type SchedulerServiceLike = {
-  register: (registration: Record<string, unknown>) => Promise<void>
-}
-
-const logger = createLogger('payment_gateways')
-
-function stableScheduleUuid(stableKey: string): string {
-  const hex = createHash('sha256').update(stableKey).digest('hex')
-  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`
-}
-
-export async function registerSessionInitializationPruneSchedule(
-  container: import('awilix').AwilixContainer | undefined,
-  scope: { tenantId: string; organizationId: string },
-): Promise<boolean> {
-  if (!container) return false
-  const cradle = container as { hasRegistration?: (name: string) => boolean }
-  if (typeof cradle.hasRegistration !== 'function' || !cradle.hasRegistration('schedulerService')) {
-    return false
-  }
-
-  const schedulerService = container.resolve('schedulerService') as SchedulerServiceLike
-  await schedulerService.register({
-    id: stableScheduleUuid(
-      `payment_gateways:session-initialization-prune:${scope.tenantId}:${scope.organizationId}`,
-    ),
-    name: 'Payment-session initialization prune',
-    description: 'Delete completed payment-session initialization claims after the 24-hour replay window.',
-    scopeType: 'organization',
-    tenantId: scope.tenantId,
-    organizationId: scope.organizationId,
-    scheduleType: 'interval',
-    scheduleValue: '24h',
-    timezone: 'UTC',
-    targetType: 'queue',
-    targetQueue: PAYMENT_SESSION_INITIALIZATION_PRUNE_QUEUE,
-    targetPayload: scope,
-    sourceType: 'module',
-    sourceModule: 'payment_gateways',
-    isEnabled: true,
-  })
-  return true
-}
-
-async function ensureSessionInitializationPruneSchedule(
-  container: import('awilix').AwilixContainer | undefined,
-  scope: { tenantId: string; organizationId: string },
-): Promise<void> {
-  try {
-    await registerSessionInitializationPruneSchedule(container, scope)
-  } catch (error) {
-    logger.warn('Failed to register payment-session initialization prune schedule', { err: error })
-  }
-}
 
 export const setup: ModuleSetupConfig = {
   defaultRoleFeatures: {
@@ -64,10 +6,6 @@ export const setup: ModuleSetupConfig = {
     admin: ['payment_gateways.*'],
     employee: ['payment_gateways.view'],
   },
-
-  async seedDefaults({ container, tenantId, organizationId }) {
-    await ensureSessionInitializationPruneSchedule(container, { tenantId, organizationId })
-  },
 }
 
 export default setup

package/src/modules/planner/components/AvailabilityRulesEditor.tsx

@@ -1666,7 +1666,7 @@ export function AvailabilityRulesEditor({
                           ) : (
                             windows.map((window, windowIndex) => {
                               const windowError = weeklyWindowErrors[index]?.[windowIndex] ?? null
-                              const errorClass = windowError ? 'border-status-error-border aria-invalid:ring-destructive' : ''
+                              const errorClass = windowError ? 'border-red-500 aria-invalid:ring-destructive' : ''
                               return (
                                 <div key={`${day.code}-${windowIndex}`} className="space-y-1">
                                   <div className="flex flex-wrap items-center gap-2">
@@ -1697,7 +1697,7 @@ export function AvailabilityRulesEditor({
                                     </Button>
                                   </div>
                                   {windowError ? (
-                                    <div className="text-xs text-status-error-text">{windowError}</div>
+                                    <div className="text-xs text-red-600">{windowError}</div>
                                   ) : null}
                                 </div>
                               )
@@ -1985,7 +1985,7 @@ export function AvailabilityRulesEditor({
                           <label className="text-xs font-medium text-muted-foreground">{listLabels.windowsLabel}</label>
                           {editorWindows.map((window, index) => {
                             const windowError = editorWindowErrors[index] ?? null
-                            const errorClass = windowError ? 'border-status-error-border aria-invalid:ring-destructive' : ''
+                            const errorClass = windowError ? 'border-red-500 aria-invalid:ring-destructive' : ''
                             return (
                               <div key={`${index}-${window.start}`} className="space-y-1">
                                 <div className="flex flex-wrap items-center gap-2">
@@ -2013,7 +2013,7 @@ export function AvailabilityRulesEditor({
                                   </Button>
                                 </div>
                                 {windowError ? (
-                                  <div className="text-xs text-status-error-text">{windowError}</div>
+                                  <div className="text-xs text-red-600">{windowError}</div>
                                 ) : null}
                               </div>
                             )

package/src/modules/planner/components/unavailabilityReasons.ts

@@ -1,7 +1,6 @@
 "use client"
 
 import { apiCall, apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { fetchAllDictionaryEntries } from '@open-mercato/core/modules/dictionaries/lib/fetchAllEntries'
 import {
   resolveUnavailabilityReasonDictionary,
   type UnavailabilityReasonSubjectType,
@@ -46,9 +45,10 @@ export async function loadUnavailabilityReasonEntries(
   const dictionary = resolveUnavailabilityReasonDictionary(subjectType)
   const resolved = await ensureDictionary(dictionary.key, dictionary.name)
   if (!resolved) return []
-  const entriesCall = await fetchAllDictionaryEntries(resolved.id)
+  const entriesCall = await apiCall<{ items?: Record<string, unknown>[] }>(`/api/dictionaries/${resolved.id}/entries`)
   if (!entriesCall.ok) return []
-  return entriesCall.items
+  const items = Array.isArray(entriesCall.result?.items) ? entriesCall.result?.items ?? [] : []
+  return items
     .map((entry) => {
       if (!entry || typeof entry !== 'object') return null
       const record = entry as Record<string, unknown>

package/src/modules/portal/frontend/[orgSlug]/portal/dashboard/page.tsx

@@ -1,6 +1,5 @@
 "use client"
 import React, { useEffect, useMemo, useState, useCallback } from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/portal/extension-points'
 import { useRouter } from 'next/navigation'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -11,6 +10,7 @@ import { PortalCard, PortalCardHeader } from '@open-mercato/ui/portal/components
 import { PortalEmptyState } from '@open-mercato/ui/portal/components/PortalEmptyState'
 import { usePortalDashboardWidgets } from '@open-mercato/ui/portal/hooks/usePortalDashboardWidgets'
 import { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'
+import { PortalInjectionSpots } from '@open-mercato/ui/backend/injection/spotIds'
 import {
   loadHiddenWidgets,
   saveHiddenWidgets,
@@ -107,7 +107,7 @@ export default function PortalDashboardPage({ params }: Props) {
         }
       />
 
-      <InjectionSpot spotId={extensionPoints.hosts.dashboardBefore.spotId} context={injectionContext} />
+      <InjectionSpot spotId={PortalInjectionSpots.pageBefore('dashboard')} context={injectionContext} />
 
       {editing && dashboardWidgets.length > 0 ? (
         <PortalCard>
@@ -151,7 +151,7 @@ export default function PortalDashboardPage({ params }: Props) {
         />
       ) : null}
 
-      <InjectionSpot spotId={extensionPoints.hosts.dashboardAfter.spotId} context={injectionContext} />
+      <InjectionSpot spotId={PortalInjectionSpots.pageAfter('dashboard')} context={injectionContext} />
     </div>
   )
 }

package/src/modules/portal/frontend/[orgSlug]/portal/login/page.tsx

@@ -1,6 +1,5 @@
 "use client"
 import { useCallback, useMemo, useState } from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/portal/extension-points'
 import Link from 'next/link'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { EmailInput } from '@open-mercato/ui/primitives/email-input'
@@ -14,6 +13,7 @@ import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { usePortalContext } from '@open-mercato/ui/portal/PortalContext'
 import { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'
+import { PortalInjectionSpots } from '@open-mercato/ui/backend/injection/spotIds'
 
 type Props = { params: { orgSlug: string } }
 
@@ -97,7 +97,7 @@ export default function PortalLoginPage({ params }: Props) {
         <p className="mt-1.5 text-sm text-muted-foreground">{t('portal.login.description', 'Enter your credentials to access the portal.')}</p>
       </div>
 
-      <InjectionSpot spotId={extensionPoints.hosts.loginBefore.spotId} context={injectionContext} />
+      <InjectionSpot spotId={PortalInjectionSpots.pageBefore('login')} context={injectionContext} />
 
       <form onSubmit={handleSubmit} className="flex flex-col gap-4">
         {error ? (
@@ -128,7 +128,7 @@ export default function PortalLoginPage({ params }: Props) {
         </p>
       </form>
 
-      <InjectionSpot spotId={extensionPoints.hosts.loginAfter.spotId} context={injectionContext} />
+      <InjectionSpot spotId={PortalInjectionSpots.pageAfter('login')} context={injectionContext} />
     </div>
   )
 }

package/src/modules/portal/frontend/[orgSlug]/portal/page.tsx

@@ -1,6 +1,5 @@
 "use client"
 import { useEffect, useMemo } from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/portal/extension-points'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -11,6 +10,7 @@ import { SearchX, ShoppingBag, User, Shield } from 'lucide-react'
 import { usePortalContext } from '@open-mercato/ui/portal/PortalContext'
 import { PortalFeatureCard } from '@open-mercato/ui/portal/components/PortalFeatureCard'
 import { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'
+import { PortalInjectionSpots } from '@open-mercato/ui/backend/injection/spotIds'
 
 type Props = { params: { orgSlug: string } }
 
@@ -54,7 +54,7 @@ export default function PortalLandingPage({ params }: Props) {
 
   return (
     <>
-      <InjectionSpot spotId={extensionPoints.hosts.homeBefore.spotId} context={injectionContext} />
+      <InjectionSpot spotId={PortalInjectionSpots.pageBefore('home')} context={injectionContext} />
 
       <section className="flex flex-col items-center gap-5 py-8 text-center sm:py-16">
         <p className="text-overline font-semibold uppercase tracking-widest text-muted-foreground/60">
@@ -94,7 +94,7 @@ export default function PortalLandingPage({ params }: Props) {
         />
       </section>
 
-      <InjectionSpot spotId={extensionPoints.hosts.homeAfter.spotId} context={injectionContext} />
+      <InjectionSpot spotId={PortalInjectionSpots.pageAfter('home')} context={injectionContext} />
     </>
   )
 }