@open-mercato/core 0.6.6-develop.6529.1.e1de4b3f27 → 0.6.6-develop.6531.1.87e9d31db6

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

@@ -93,6 +93,7 @@
   "entities.customFields.editor.noFieldsets": "Aún no se han definido conjuntos de campos. Los conjuntos de campos permiten agrupar campos personalizados para distintas variantes de la misma entidad (p. ej. productos de Moda vs. Deporte).",
   "entities.customFields.editor.noGroup": "Sin grupo",
   "entities.customFields.editor.noOptionsDefined": "No se han definido opciones.",
+  "entities.customFields.editor.noParameterPlaceholder": "-",
   "entities.customFields.editor.noValidationRules": "No se han definido reglas de validación.",
   "entities.customFields.editor.optionLabelPlaceholder": "Etiqueta visible para los usuarios (opcional)",
   "entities.customFields.editor.options": "Opciones",
@@ -118,6 +119,17 @@
   "entities.customFields.editor.unassignedFields": "Campos sin asignar",
   "entities.customFields.editor.unitsOptional": "Unidades (opcional)",
   "entities.customFields.editor.unitsPlaceholder": "kg, cm, etc.",
+  "entities.customFields.editor.validation.date": "fecha",
+  "entities.customFields.editor.validation.eq": "igual",
+  "entities.customFields.editor.validation.float": "decimal",
+  "entities.customFields.editor.validation.gt": "mayor que",
+  "entities.customFields.editor.validation.gte": "mayor o igual",
+  "entities.customFields.editor.validation.integer": "entero",
+  "entities.customFields.editor.validation.lt": "menor que",
+  "entities.customFields.editor.validation.lte": "menor o igual",
+  "entities.customFields.editor.validation.ne": "distinto",
+  "entities.customFields.editor.validation.regex": "regex",
+  "entities.customFields.editor.validation.required": "obligatorio",
   "entities.customFields.editor.validationRules": "Reglas de validación",
   "entities.customFields.editor.value": "Valor",
   "entities.customFields.editor.valueRequired": "El valor es obligatorio",
@@ -183,6 +195,28 @@
   "entities.nav.systemEntities": "Entidades del sistema",
   "entities.nav.userEntities": "Entidades de usuario",
   "entities.nav.userEntities.create": "Crear entidad",
+  "entities.userEntities.edit.errors.deleteEntityFailed": "No se pudo eliminar la entidad",
+  "entities.userEntities.edit.errors.invalidEntityDescription": "Falta el ID de la entidad solicitada o no es válido.",
+  "entities.userEntities.edit.errors.invalidEntityId": "ID de entidad no válido",
+  "entities.userEntities.edit.errors.invalidEntityTitle": "Entidad no válida",
+  "entities.userEntities.edit.errors.loadDefinitionsFailed": "No se pudieron cargar las definiciones de la entidad",
+  "entities.userEntities.edit.errors.loadFailed": "No se pudo cargar",
+  "entities.userEntities.edit.errors.loadMetadataFailed": "No se pudieron cargar los metadatos de la entidad",
+  "entities.userEntities.edit.errors.reloadDefinitionsFailed": "No se pudieron recargar las definiciones de campos",
+  "entities.userEntities.edit.errors.restoreFieldFailed": "No se pudo restaurar el campo",
+  "entities.userEntities.edit.errors.saveEntityFailed": "No se pudo guardar la entidad",
+  "entities.userEntities.edit.errors.saveOrderFailed": "No se pudo guardar el orden",
+  "entities.userEntities.edit.errors.validationFailed": "La validación falló",
+  "entities.userEntities.edit.fieldsetTitle": "Editar conjunto: {{name}}",
+  "entities.userEntities.edit.flash.entityDeleted": "Entidad eliminada",
+  "entities.userEntities.edit.flash.orderSaved": "Orden guardado",
+  "entities.userEntities.edit.flash.restoredField": "{{key}} restaurado",
+  "entities.userEntities.edit.groups.definitions": "Definiciones de campos",
+  "entities.userEntities.edit.groups.settings": "Configuración de la entidad",
+  "entities.userEntities.edit.orderNotice": "Reordenado - se guardará al salir del campo",
+  "entities.userEntities.edit.pageTitle": "Editar definiciones",
+  "entities.userEntities.edit.showRecords": "Mostrar registros",
+  "entities.userEntities.edit.title": "Editar entidad: {{entityId}}",
   "entities.userEntities.errors.entityIdExists": "El ID de la entidad ya existe",
   "entities.userEntities.errors.entityIdRequired": "El ID de la entidad es obligatorio",
   "entities.userEntities.errors.loadFailed": "No se pudieron cargar las entidades",

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

@@ -93,6 +93,7 @@
   "entities.customFields.editor.noFieldsets": "Nie zdefiniowano jeszcze zestawów pól. Zestawy pól pozwalają grupować pola niestandardowe dla różnych wariantów tej samej encji (np. produkty Moda vs Sport).",
   "entities.customFields.editor.noGroup": "Bez grupy",
   "entities.customFields.editor.noOptionsDefined": "Nie zdefiniowano opcji.",
+  "entities.customFields.editor.noParameterPlaceholder": "-",
   "entities.customFields.editor.noValidationRules": "Nie zdefiniowano reguł walidacji.",
   "entities.customFields.editor.optionLabelPlaceholder": "Etykieta widoczna dla użytkowników (opcjonalnie)",
   "entities.customFields.editor.options": "Opcje",
@@ -118,6 +119,17 @@
   "entities.customFields.editor.unassignedFields": "Pola nieprzypisane",
   "entities.customFields.editor.unitsOptional": "Jednostki (opcjonalnie)",
   "entities.customFields.editor.unitsPlaceholder": "kg, cm itp.",
+  "entities.customFields.editor.validation.date": "data",
+  "entities.customFields.editor.validation.eq": "równe",
+  "entities.customFields.editor.validation.float": "liczba zmiennoprzecinkowa",
+  "entities.customFields.editor.validation.gt": "większe niż",
+  "entities.customFields.editor.validation.gte": "większe lub równe",
+  "entities.customFields.editor.validation.integer": "liczba całkowita",
+  "entities.customFields.editor.validation.lt": "mniejsze niż",
+  "entities.customFields.editor.validation.lte": "mniejsze lub równe",
+  "entities.customFields.editor.validation.ne": "różne",
+  "entities.customFields.editor.validation.regex": "regex",
+  "entities.customFields.editor.validation.required": "wymagane",
   "entities.customFields.editor.validationRules": "Reguły walidacji",
   "entities.customFields.editor.value": "Wartość",
   "entities.customFields.editor.valueRequired": "Wartość jest wymagana",
@@ -183,6 +195,28 @@
   "entities.nav.systemEntities": "Encje systemowe",
   "entities.nav.userEntities": "Encje użytkownika",
   "entities.nav.userEntities.create": "Utwórz encję",
+  "entities.userEntities.edit.errors.deleteEntityFailed": "Nie udało się usunąć encji",
+  "entities.userEntities.edit.errors.invalidEntityDescription": "Brakuje identyfikatora encji albo jest on nieprawidłowy.",
+  "entities.userEntities.edit.errors.invalidEntityId": "Nieprawidłowy identyfikator encji",
+  "entities.userEntities.edit.errors.invalidEntityTitle": "Nieprawidłowa encja",
+  "entities.userEntities.edit.errors.loadDefinitionsFailed": "Nie udało się wczytać definicji encji",
+  "entities.userEntities.edit.errors.loadFailed": "Nie udało się wczytać",
+  "entities.userEntities.edit.errors.loadMetadataFailed": "Nie udało się wczytać metadanych encji",
+  "entities.userEntities.edit.errors.reloadDefinitionsFailed": "Nie udało się ponownie wczytać definicji pól",
+  "entities.userEntities.edit.errors.restoreFieldFailed": "Nie udało się przywrócić pola",
+  "entities.userEntities.edit.errors.saveEntityFailed": "Nie udało się zapisać encji",
+  "entities.userEntities.edit.errors.saveOrderFailed": "Nie udało się zapisać kolejności",
+  "entities.userEntities.edit.errors.validationFailed": "Walidacja nie powiodła się",
+  "entities.userEntities.edit.fieldsetTitle": "Edytuj zestaw pól: {{name}}",
+  "entities.userEntities.edit.flash.entityDeleted": "Encja została usunięta",
+  "entities.userEntities.edit.flash.orderSaved": "Kolejność została zapisana",
+  "entities.userEntities.edit.flash.restoredField": "Przywrócono {{key}}",
+  "entities.userEntities.edit.groups.definitions": "Definicje pól",
+  "entities.userEntities.edit.groups.settings": "Ustawienia encji",
+  "entities.userEntities.edit.orderNotice": "Zmieniono kolejność - zapisze się po opuszczeniu pola",
+  "entities.userEntities.edit.pageTitle": "Edytuj definicje",
+  "entities.userEntities.edit.showRecords": "Pokaż rekordy",
+  "entities.userEntities.edit.title": "Edytuj encję: {{entityId}}",
   "entities.userEntities.errors.entityIdExists": "Identyfikator encji już istnieje",
   "entities.userEntities.errors.entityIdRequired": "Identyfikator encji jest wymagany",
   "entities.userEntities.errors.loadFailed": "Nie udało się wczytać encji",

package/src/modules/sales/components/documents/AddressesSection.tsx

@@ -890,8 +890,12 @@ export function SalesDocumentAddressesSection({
         if (res?.result?.id) billingId = res.result.id
       }
 
-      payload.shippingAddressSnapshot = shippingSnapshot ?? null
-      payload.billingAddressSnapshot = billingSnapshot ?? null
+      if (shippingSnapshot || !shippingId) {
+        payload.shippingAddressSnapshot = shippingSnapshot ?? null
+      }
+      if (billingSnapshot || !billingId) {
+        payload.billingAddressSnapshot = billingSnapshot ?? null
+      }
       payload.shippingAddressId = shippingSnapshot ? null : shippingId
       payload.billingAddressId = billingSnapshot ? null : billingId
 

package/src/modules/sales/components/documents/SalesDocumentForm.tsx

@@ -168,6 +168,7 @@ function CustomerQuickCreate({ t, onCreated }: CustomerQuickCreateProps) {
     async (values: PersonFormValues) => {
       setSaving(true)
       try {
+        const addresses = Array.isArray(values.addresses) ? values.addresses : []
         const payload = buildPersonPayload(values, organizationId)
         const { result } = await createCrud<{ id?: string; entityId?: string }>('customers/people', payload, {
           errorMessage: t('sales.documents.form.customer.quick.error', 'Failed to create customer.'),
@@ -177,6 +178,51 @@ function CustomerQuickCreate({ t, onCreated }: CustomerQuickCreateProps) {
           (result && typeof result.id === 'string' && result.id) ||
           null
         if (!id) throw new Error('Missing customer id')
+        if (addresses.length) {
+          const normalize = (value?: string | null) => {
+            if (typeof value !== 'string') return undefined
+            const trimmed = value.trim()
+            return trimmed.length ? trimmed : undefined
+          }
+          for (const entry of addresses) {
+            const normalizedLine1 = normalize(entry.addressLine1)
+            if (!normalizedLine1) continue
+            const body: Record<string, unknown> = {
+              entityId: id,
+              ...(organizationId ? { organizationId } : {}),
+              addressLine1: normalizedLine1,
+              isPrimary: entry.isPrimary ?? false,
+            }
+            const name = normalize(entry.name)
+            if (name !== undefined) body.name = name
+            const purpose = normalize(entry.purpose)
+            if (purpose !== undefined) body.purpose = purpose
+            const line2 = normalize(entry.addressLine2)
+            if (line2 !== undefined) body.addressLine2 = line2
+            const buildingNumber = normalize(entry.buildingNumber)
+            if (buildingNumber !== undefined) body.buildingNumber = buildingNumber
+            const flatNumber = normalize(entry.flatNumber)
+            if (flatNumber !== undefined) body.flatNumber = flatNumber
+            const city = normalize(entry.city)
+            if (city !== undefined) body.city = city
+            const region = normalize(entry.region)
+            if (region !== undefined) body.region = region
+            const postalCode = normalize(entry.postalCode)
+            if (postalCode !== undefined) body.postalCode = postalCode
+            const country = normalize(entry.country)
+            if (country !== undefined) body.country = country.toUpperCase()
+            if (typeof entry.latitude === 'number') body.latitude = entry.latitude
+            if (typeof entry.longitude === 'number') body.longitude = entry.longitude
+            try {
+              await createCrud('customers/addresses', body)
+            } catch (addressErr) {
+              const message =
+                (addressErr instanceof Error && addressErr.message ? addressErr.message : null) ||
+                t('customers.people.detail.addresses.error')
+              flash(message, 'error')
+            }
+          }
+        }
         const displayName =
           typeof values.displayName === 'string' && values.displayName.trim().length
             ? values.displayName.trim()

package/src/modules/sales/components/documents/ShipmentDialog.tsx

@@ -296,6 +296,13 @@ export function ShipmentDialog({
   const [addressOptions, setAddressOptions] = React.useState<ShipmentAddressOption[]>([])
   const [addressLoading, setAddressLoading] = React.useState(false)
   const [addressError, setAddressError] = React.useState<string | null>(null)
+  const addressLoadPromiseRef = React.useRef<{
+    orderId: string
+    promise: Promise<ShipmentAddressOption[]>
+  } | null>(null)
+  const currentAddressOrderIdRef = React.useRef(orderId)
+  currentAddressOrderIdRef.current = orderId
+  const initializedDialogKeyRef = React.useRef<string | null>(null)
   const [documentStatuses, setDocumentStatuses] = React.useState<StatusOption[]>([])
   const [lineStatuses, setLineStatuses] = React.useState<StatusOption[]>([])
   const [shipmentStatuses, setShipmentStatuses] = React.useState<StatusOption[]>([])
@@ -479,37 +486,52 @@ export function ShipmentDialog({
     [],
   )
 
-  const loadAddressOptions = React.useCallback(async () => {
+  const loadAddressOptions = React.useCallback((): Promise<ShipmentAddressOption[]> => {
+    const activeRequest = addressLoadPromiseRef.current
+    if (activeRequest?.orderId === orderId) return activeRequest.promise
+
     setAddressLoading(true)
-    try {
-      const params = new URLSearchParams({
-        page: '1',
-        pageSize: '100',
-        documentId: orderId,
-        documentKind: 'order',
-      })
-      const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
-        `/api/sales/document-addresses?${params.toString()}`,
-        undefined,
-        { fallback: { items: [] } },
-      )
-      const items = Array.isArray(response.result?.items) ? response.result.items : []
-      const mapped = items
-        .map((item) => mapDocumentAddressOption(item))
-        .filter((entry): entry is ShipmentAddressOption => Boolean(entry))
-      mergeAddressOptions(mapped)
-      setAddressError(null)
-      return mapped
-    } catch (err) {
-      logger.error('sales.shipments.addresses.load', { err })
-      setAddressError(
-        t('sales.documents.shipments.addressLoadError', 'Failed to load addresses.'),
-      )
-      return []
-    } finally {
-      setAddressLoading(false)
-    }
-  }, [mapDocumentAddressOption, mergeAddressOptions, orderId, t])
+    const request = (async () => {
+      try {
+        const params = new URLSearchParams({
+          page: '1',
+          pageSize: '100',
+          documentId: orderId,
+          documentKind: 'order',
+        })
+        const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
+          `/api/sales/document-addresses?${params.toString()}`,
+          undefined,
+          { fallback: { items: [] } },
+        )
+        const items = Array.isArray(response.result?.items) ? response.result.items : []
+        const mapped = items
+          .map((item) => mapDocumentAddressOption(item))
+          .filter((entry): entry is ShipmentAddressOption => Boolean(entry))
+        const loadedOptions = dedupeAddressOptions([...baseAddressOptions, ...mapped])
+        if (currentAddressOrderIdRef.current !== orderId) return baseAddressOptions
+        mergeAddressOptions(loadedOptions)
+        setAddressError(null)
+        return loadedOptions
+      } catch (err) {
+        logger.error('sales.shipments.addresses.load', { err })
+        if (currentAddressOrderIdRef.current === orderId) {
+          setAddressError(
+            t('sales.documents.shipments.addressLoadError', 'Failed to load addresses.'),
+          )
+        }
+        return baseAddressOptions
+      }
+    })()
+    addressLoadPromiseRef.current = { orderId, promise: request }
+    void request.then(() => {
+      if (addressLoadPromiseRef.current?.promise === request) {
+        addressLoadPromiseRef.current = null
+        setAddressLoading(false)
+      }
+    })
+    return request
+  }, [baseAddressOptions, mapDocumentAddressOption, mergeAddressOptions, orderId, t])
 
   const buildPriceSubtitle = React.useCallback(
     (option: ShippingMethodOption): string | undefined => {
@@ -851,16 +873,20 @@ export function ShipmentDialog({
   )
 
   React.useEffect(() => {
-    if (!open) return
+    if (!open) {
+      initializedDialogKeyRef.current = null
+      return
+    }
+    const dialogKey = `${orderId}:${mode}:${shipment?.id ?? 'new'}`
+    if (initializedDialogKeyRef.current === dialogKey) return
+    initializedDialogKeyRef.current = dialogKey
     setFormResetKey((prev) => prev + 1)
     if (!shippingMethods.length) {
       void loadShippingMethods()
     }
     setAddressOptions(baseAddressOptions)
     setAddressError(null)
-    if (!addressOptions.length) {
-      void loadAddressOptions()
-    }
+    void loadAddressOptions()
     if (!shipmentStatuses.length) {
       void loadShipmentStatuses()
     }
@@ -871,7 +897,6 @@ export function ShipmentDialog({
       void loadLineStatuses()
     }
   }, [
-    addressOptions.length,
     baseAddressOptions,
     documentStatuses.length,
     loadAddressOptions,
@@ -881,6 +906,8 @@ export function ShipmentDialog({
     loadShippingMethods,
     mode,
     open,
+    orderId,
+    shipment?.id,
     lineStatuses.length,
     shipmentStatuses.length,
     shippingMethods.length,
@@ -939,11 +966,9 @@ export function ShipmentDialog({
 
   const fetchAddressItems = React.useCallback(
     async (query?: string): Promise<LookupSelectItem[]> => {
-      if (!addressOptions.length && !addressLoading) {
-        await loadAddressOptions()
-      }
+      const options = addressOptions.length ? addressOptions : await loadAddressOptions()
       const needle = query?.trim().toLowerCase() ?? ''
-      return addressOptions
+      return options
         .filter((option) => {
           if (!needle) return true
           return (
@@ -962,7 +987,7 @@ export function ShipmentDialog({
           ),
         }))
     },
-    [addressLoading, addressOptions, loadAddressOptions],
+    [addressOptions, loadAddressOptions],
   )
 
   const validateItems = React.useCallback(