@open-mercato/core 0.4.5-develop-3ce83a8b24 → 0.4.5-develop-539cff4960

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

@@ -96,6 +96,7 @@
   "dashboards.analytics.widgets.topProducts.empty": "Keine Produktverkaufsdaten für diesen Zeitraum",
   "dashboards.analytics.widgets.topProducts.error": "Produktdaten konnten nicht geladen werden",
   "dashboards.analytics.widgets.topProducts.title": "Top-Produkte nach Umsatz",
+  "dashboards.widgets.effective": "Aktive Widgets:",
   "dashboards.widgets.error.load": "Widget-Konfiguration konnte nicht geladen werden.",
   "dashboards.widgets.error.save": "Dashboard-Widget-Einstellungen konnten nicht gespeichert werden.",
   "dashboards.widgets.flash.saved": "Dashboard-Widgets aktualisiert",
@@ -103,7 +104,6 @@
   "dashboards.widgets.mode.hint": "Dieser Benutzer erbt derzeit Widgets von seinen Rollen. Wechseln Sie zu \"Überschreiben\", um anzupassen.",
   "dashboards.widgets.mode.inherit": "Von Rollen übernehmen",
   "dashboards.widgets.mode.override": "Für diesen Benutzer überschreiben",
-  "dashboards.widgets.effective": "Aktive Widgets:",
   "dashboards.widgets.reset": "Zurücksetzen",
   "dashboards.widgets.save": "Widgets speichern",
   "dashboards.widgets.saving": "Speichern…"

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

@@ -96,6 +96,7 @@
   "dashboards.analytics.widgets.topProducts.empty": "No product sales data for this period",
   "dashboards.analytics.widgets.topProducts.error": "Failed to load top products data",
   "dashboards.analytics.widgets.topProducts.title": "Top Products by Revenue",
+  "dashboards.widgets.effective": "Effective widgets:",
   "dashboards.widgets.error.load": "Unable to load widget configuration.",
   "dashboards.widgets.error.save": "Unable to save dashboard widget preferences.",
   "dashboards.widgets.flash.saved": "Dashboard widgets updated",
@@ -103,7 +104,6 @@
   "dashboards.widgets.mode.hint": "This user currently inherits widgets from their assigned roles. Switch to override to customize.",
   "dashboards.widgets.mode.inherit": "Inherit from roles",
   "dashboards.widgets.mode.override": "Override for this user",
-  "dashboards.widgets.effective": "Effective widgets:",
   "dashboards.widgets.reset": "Reset",
   "dashboards.widgets.save": "Save widgets",
   "dashboards.widgets.saving": "Saving…"

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

@@ -96,6 +96,7 @@
   "dashboards.analytics.widgets.topProducts.empty": "No hay datos de ventas de productos para este período",
   "dashboards.analytics.widgets.topProducts.error": "No se pudieron cargar los datos de productos",
   "dashboards.analytics.widgets.topProducts.title": "Productos principales por ingresos",
+  "dashboards.widgets.effective": "Widgets efectivos:",
   "dashboards.widgets.error.load": "No se pudo cargar la configuración de widgets.",
   "dashboards.widgets.error.save": "No se pudieron guardar las preferencias de los widgets del panel.",
   "dashboards.widgets.flash.saved": "Widgets del panel actualizados",
@@ -103,7 +104,6 @@
   "dashboards.widgets.mode.hint": "Este usuario hereda los widgets de sus roles asignados. Cambia a sobrescribir para personalizar.",
   "dashboards.widgets.mode.inherit": "Heredar de los roles",
   "dashboards.widgets.mode.override": "Sobrescribir para este usuario",
-  "dashboards.widgets.effective": "Widgets efectivos:",
   "dashboards.widgets.reset": "Restablecer",
   "dashboards.widgets.save": "Guardar widgets",
   "dashboards.widgets.saving": "Guardando…"

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

@@ -96,6 +96,7 @@
   "dashboards.analytics.widgets.topProducts.empty": "Brak danych o sprzedaży produktów dla tego okresu",
   "dashboards.analytics.widgets.topProducts.error": "Nie udało się załadować danych o produktach",
   "dashboards.analytics.widgets.topProducts.title": "Najlepsze produkty wg przychodu",
+  "dashboards.widgets.effective": "Aktywne widżety:",
   "dashboards.widgets.error.load": "Nie udało się wczytać konfiguracji widżetów.",
   "dashboards.widgets.error.save": "Nie udało się zapisać preferencji widżetów pulpitu.",
   "dashboards.widgets.flash.saved": "Widżety pulpitu zostały zaktualizowane",
@@ -103,7 +104,6 @@
   "dashboards.widgets.mode.hint": "Ten użytkownik dziedziczy widżety z przypisanych ról. Wybierz nadpisanie, aby je dostosować.",
   "dashboards.widgets.mode.inherit": "Dziedzicz po rolach",
   "dashboards.widgets.mode.override": "Nadpisz dla tego użytkownika",
-  "dashboards.widgets.effective": "Aktywne widżety:",
   "dashboards.widgets.reset": "Resetuj",
   "dashboards.widgets.save": "Zapisz widżety",
   "dashboards.widgets.saving": "Zapisywanie…"

package/src/modules/dashboards/seed/analytics.ts

@@ -325,6 +325,9 @@ export async function seedAnalyticsData(
           kind: 'product',
           name: lineData.product.title,
           quantity: toAmount(lineData.quantity),
+          normalizedQuantity: toAmount(lineData.quantity),
+          normalizedUnit: null,
+          uomSnapshot: null,
           currencyCode: 'USD',
           unitPriceNet: toAmount(lineData.unitPriceNet),
           unitPriceGross: toAmount(lineData.unitPriceGross),

package/src/modules/sales/api/order-lines/route.ts

@@ -1,50 +1,69 @@
-import { z } from 'zod'
-import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
-import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import { buildCustomFieldFiltersFromQuery, extractAllCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields'
-import { SalesOrderLine } from '../../data/entities'
-import { orderLineCreateSchema } from '../../data/validators'
-import { createPagedListResponseSchema, createSalesCrudOpenApi, defaultOkResponseSchema } from '../openapi'
-import { withScopedPayload } from '../utils'
-import { E } from '#generated/entities.ids.generated'
-import * as F from '#generated/entities/sales_order_line'
+import { z } from "zod";
+import { makeCrudRoute } from "@open-mercato/shared/lib/crud/factory";
+import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
+import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import {
+  buildCustomFieldFiltersFromQuery,
+  extractAllCustomFieldEntries,
+} from "@open-mercato/shared/lib/crud/custom-fields";
+import { SalesOrderLine } from "../../data/entities";
+import { orderLineCreateSchema } from "../../data/validators";
+import {
+  createPagedListResponseSchema,
+  createSalesCrudOpenApi,
+  defaultOkResponseSchema,
+} from "../openapi";
+import { withScopedPayload } from "../utils";
+import { E } from "#generated/entities.ids.generated";
+import * as F from "#generated/entities/sales_order_line";
+import { canonicalizeUnitCode, REFERENCE_UNIT_CODES } from "@open-mercato/shared/lib/units/unitCodes";
 
-const rawBodySchema = z.object({}).passthrough()
-const resolveRawBody = (raw: unknown) => (raw && typeof raw === 'object' && 'body' in raw ? (raw as any).body : raw)
+const rawBodySchema = z.object({}).passthrough();
+const resolveRawBody = (raw: unknown): Record<string, unknown> => {
+  if (!raw || typeof raw !== "object") return {};
+  if ("body" in raw) {
+    const payload = raw as { body?: unknown };
+    if (payload.body && typeof payload.body === "object") {
+      return payload.body as Record<string, unknown>;
+    }
+  }
+  return raw as Record<string, unknown>;
+};
 
 const listSchema = z
   .object({
     page: z.coerce.number().min(1).default(1),
-    pageSize: z.coerce.number().min(1).max(200).default(50),
+    pageSize: z.coerce.number().min(1).max(100).default(50),
     id: z.string().uuid().optional(),
     orderId: z.string().uuid().optional(),
     sortField: z.string().optional(),
-    sortDir: z.enum(['asc', 'desc']).optional(),
+    sortDir: z.enum(["asc", "desc"]).optional(),
   })
-  .passthrough()
+  .passthrough();
 
 const routeMetadata = {
-  GET: { requireAuth: true, requireFeatures: ['sales.orders.view'] },
-  POST: { requireAuth: true, requireFeatures: ['sales.orders.manage'] },
-  PUT: { requireAuth: true, requireFeatures: ['sales.orders.manage'] },
-  DELETE: { requireAuth: true, requireFeatures: ['sales.orders.manage'] },
-}
+  GET: { requireAuth: true, requireFeatures: ["sales.orders.view"] },
+  POST: { requireAuth: true, requireFeatures: ["sales.orders.manage"] },
+  PUT: { requireAuth: true, requireFeatures: ["sales.orders.manage"] },
+  DELETE: { requireAuth: true, requireFeatures: ["sales.orders.manage"] },
+};
 
-const upsertSchema = orderLineCreateSchema.extend({ id: z.string().uuid().optional() })
+const upsertSchema = orderLineCreateSchema.extend({
+  id: z.string().uuid().optional(),
+});
 const deleteSchema = z.object({
   id: z.string().uuid(),
   orderId: z.string().uuid(),
-})
+});
 
 const crud = makeCrudRoute({
   metadata: routeMetadata,
   orm: {
     entity: SalesOrderLine,
-    idField: 'id',
-    orgField: 'organizationId',
-    tenantField: 'tenantId',
-    softDeleteField: 'deletedAt',
+    idField: "id",
+    orgField: "organizationId",
+    tenantField: "tenantId",
+    softDeleteField: "deletedAt",
   },
   indexer: {
     entityType: E.sales.sales_order_line,
@@ -54,7 +73,7 @@ const crud = makeCrudRoute({
     entityId: E.sales.sales_order_line,
     fields: [
       F.id,
-      'order_id',
+      "order_id",
       F.line_number,
       F.kind,
       F.status_entry_id,
@@ -69,6 +88,9 @@ const crud = makeCrudRoute({
       F.tenant_id,
       F.quantity,
       F.quantity_unit,
+      F.normalized_quantity,
+      F.normalized_unit,
+      F.uom_snapshot,
       F.currency_code,
       F.unit_price_net,
       F.unit_price_gross,
@@ -92,75 +114,134 @@ const crud = makeCrudRoute({
       lineNumber: F.line_number,
     },
     buildFilters: async (query, ctx) => {
-      const filters: Record<string, unknown> = {}
-      if (query.id) filters.id = { $eq: query.id }
-      if (query.orderId) filters.order_id = { $eq: query.orderId }
+      const filters: Record<string, unknown> = {};
+      if (query.id) filters.id = { $eq: query.id };
+      if (query.orderId) filters.order_id = { $eq: query.orderId };
       try {
-        const em = ctx.container.resolve('em')
+        const em = ctx.container.resolve("em");
         const cfFilters = await buildCustomFieldFiltersFromQuery({
           entityId: E.sales.sales_order_line,
           query,
           em,
           tenantId: ctx.auth?.tenantId ?? null,
-        })
-        Object.assign(filters, cfFilters)
+        });
+        Object.assign(filters, cfFilters);
       } catch {
         // ignore
       }
-      return filters
+      return filters;
     },
-    transformItem: (item: any) => {
-      if (!item) return item
-      const normalized = { ...item }
-      const cfEntries = extractAllCustomFieldEntries(item)
+    transformItem: (item: Record<string, unknown> | null | undefined) => {
+      if (!item) return item;
+      const normalized = { ...item };
+      const cfEntries = extractAllCustomFieldEntries(item);
       for (const key of Object.keys(normalized)) {
-        if (key.startsWith('cf:')) delete normalized[key]
+        if (key.startsWith("cf:")) delete normalized[key];
       }
-      return { ...normalized, ...cfEntries }
+      const quantityUnit = canonicalizeUnitCode(
+        normalized["quantity_unit"] ?? normalized["quantityUnit"],
+      );
+      const normalizedUnit =
+        canonicalizeUnitCode(
+          normalized["normalized_unit"] ?? normalized["normalizedUnit"],
+        ) ?? quantityUnit;
+      return {
+        ...normalized,
+        quantity_unit: quantityUnit,
+        normalized_unit: normalizedUnit,
+        ...cfEntries,
+      };
     },
   },
   actions: {
     create: {
-      commandId: 'sales.orders.lines.upsert',
+      commandId: "sales.orders.lines.upsert",
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
-        console.log('CREATE order line raw input:', raw)
-        const { translate } = await resolveTranslations()
-        const payload = upsertSchema.parse(withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate))
-        return { body: payload }
+        const { translate } = await resolveTranslations();
+        const payload = upsertSchema.parse(
+          withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate),
+        );
+        return { body: payload };
       },
-      response: ({ result }) => ({ id: result?.lineId ?? null, orderId: result?.orderId ?? null }),
+      response: ({ result }) => ({
+        id: result?.lineId ?? null,
+        orderId: result?.orderId ?? null,
+      }),
       status: 201,
     },
     update: {
-      commandId: 'sales.orders.lines.upsert',
+      commandId: "sales.orders.lines.upsert",
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const payload = upsertSchema.parse(withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate))
-        return { body: payload }
+        const { translate } = await resolveTranslations();
+        const payload = upsertSchema.parse(
+          withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate),
+        );
+        return { body: payload };
       },
-      response: ({ result }) => ({ id: result?.lineId ?? null, orderId: result?.orderId ?? null }),
+      response: ({ result }) => ({
+        id: result?.lineId ?? null,
+        orderId: result?.orderId ?? null,
+      }),
     },
     delete: {
-      commandId: 'sales.orders.lines.delete',
+      commandId: "sales.orders.lines.delete",
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const payload = deleteSchema.parse(withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate))
+        const { translate } = await resolveTranslations();
+        const payload = deleteSchema.parse(
+          withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate),
+        );
         if (!payload.id || !payload.orderId) {
-          throw new CrudHttpError(400, { error: translate('sales.documents.detail.error', 'Document not found or inaccessible.') })
+          throw new CrudHttpError(400, {
+            error: translate(
+              "sales.documents.detail.error",
+              "Document not found or inaccessible.",
+            ),
+          });
         }
-        return { body: payload }
+        return { body: payload };
       },
       response: () => ({ ok: true }),
     },
   },
-})
+});
 
-const { GET, POST, PUT, DELETE } = crud
+const { GET, POST, PUT, DELETE } = crud;
 
-export { GET, POST, PUT, DELETE }
+export { GET, POST, PUT, DELETE };
+
+const uomSnapshotOpenApiSchema = z
+  .object({
+    version: z.literal(1),
+    productId: z.string().nullable(),
+    productVariantId: z.string().nullable(),
+    baseUnitCode: z.string().nullable(),
+    enteredUnitCode: z.string().nullable(),
+    enteredQuantity: z.string(),
+    toBaseFactor: z.string(),
+    normalizedQuantity: z.string(),
+    rounding: z.object({
+      mode: z.enum(["half_up", "down", "up"]),
+      scale: z.number().int(),
+    }),
+    source: z.object({
+      conversionId: z.string().nullable(),
+      resolvedAt: z.string(),
+    }),
+    unitPriceReference: z
+      .object({
+        enabled: z.boolean(),
+        referenceUnitCode: z.enum(REFERENCE_UNIT_CODES).nullable(),
+        baseQuantity: z.string().nullable(),
+        grossPerReference: z.string().nullable().optional(),
+        netPerReference: z.string().nullable().optional(),
+      })
+      .optional(),
+  })
+  .nullable()
+  .optional();
 
 const orderLineSchema = z.object({
   id: z.string().uuid(),
@@ -177,6 +258,9 @@ const orderLineSchema = z.object({
   comment: z.string().nullable().optional(),
   quantity: z.number(),
   quantity_unit: z.string().nullable().optional(),
+  normalized_quantity: z.number(),
+  normalized_unit: z.string().nullable().optional(),
+  uom_snapshot: uomSnapshotOpenApiSchema,
   currency_code: z.string(),
   unit_price_net: z.number(),
   unit_price_gross: z.number(),
@@ -193,25 +277,31 @@ const orderLineSchema = z.object({
   custom_field_set_id: z.string().uuid().nullable().optional(),
   created_at: z.string(),
   updated_at: z.string(),
-})
+});
 
 export const openApi = createSalesCrudOpenApi({
-  resourceName: 'Order line',
+  resourceName: "Order line",
   querySchema: listSchema,
   listResponseSchema: createPagedListResponseSchema(orderLineSchema),
   create: {
     schema: upsertSchema,
-    responseSchema: z.object({ id: z.string().uuid().nullable(), orderId: z.string().uuid().nullable() }),
-    description: 'Creates an order line and recalculates totals.',
+    responseSchema: z.object({
+      id: z.string().uuid().nullable(),
+      orderId: z.string().uuid().nullable(),
+    }),
+    description: "Creates an order line and recalculates totals.",
   },
   update: {
     schema: upsertSchema,
-    responseSchema: z.object({ id: z.string().uuid().nullable(), orderId: z.string().uuid().nullable() }),
-    description: 'Updates an order line and recalculates totals.',
+    responseSchema: z.object({
+      id: z.string().uuid().nullable(),
+      orderId: z.string().uuid().nullable(),
+    }),
+    description: "Updates an order line and recalculates totals.",
   },
   del: {
     schema: deleteSchema,
     responseSchema: defaultOkResponseSchema,
-    description: 'Deletes an order line and recalculates totals.',
+    description: "Deletes an order line and recalculates totals.",
   },
-})
+});