@open-mercato/core 0.7.1-develop.7123.1.25365e718d → 0.7.1-develop.7130.1.fef2396fd8

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

@@ -1867,11 +1867,17 @@
   "customers.people.detail.addresses.fields.line1": "주소 1",
   "customers.people.detail.addresses.fields.line2": "주소 2",
   "customers.people.detail.addresses.fields.longitude": "경도",
+  "customers.people.detail.addresses.fields.phone": "전화번호",
   "customers.people.detail.addresses.fields.postalCode": "우편번호",
   "customers.people.detail.addresses.fields.primary": "기본 주소로 설정",
   "customers.people.detail.addresses.fields.region": "지역 / 주",
   "customers.people.detail.addresses.fields.street": "도로명",
   "customers.people.detail.addresses.fields.streetExtra": "추가 주소 정보",
+  "customers.people.detail.addresses.fields.taxId": "세금 번호",
+  "customers.people.detail.addresses.fields.taxId.euVat": "EU 부가세 번호",
+  "customers.people.detail.addresses.fields.taxId.other": "세금 번호",
+  "customers.people.detail.addresses.fields.taxId.plNip": "납세자 번호",
+  "customers.people.detail.addresses.fields.taxIdType": "세금 번호 유형",
   "customers.people.detail.addresses.fields.type": "주소 유형",
   "customers.people.detail.addresses.formatLoadError": "주소 설정을 불러오지 못했습니다",
   "customers.people.detail.addresses.formatLoading": "주소 설정을 불러오는 중…",

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

@@ -1867,11 +1867,17 @@
   "customers.people.detail.addresses.fields.line1": "Adres (linia 1)",
   "customers.people.detail.addresses.fields.line2": "Adres (linia 2)",
   "customers.people.detail.addresses.fields.longitude": "Długość geograficzna",
+  "customers.people.detail.addresses.fields.phone": "Telefon",
   "customers.people.detail.addresses.fields.postalCode": "Kod pocztowy",
   "customers.people.detail.addresses.fields.primary": "Ustaw jako główny",
   "customers.people.detail.addresses.fields.region": "Region / województwo",
   "customers.people.detail.addresses.fields.street": "Ulica",
   "customers.people.detail.addresses.fields.streetExtra": "Dodatkowe informacje adresowe",
+  "customers.people.detail.addresses.fields.taxId": "Nr podatkowy",
+  "customers.people.detail.addresses.fields.taxId.euVat": "VAT UE",
+  "customers.people.detail.addresses.fields.taxId.other": "Nr podatkowy",
+  "customers.people.detail.addresses.fields.taxId.plNip": "NIP",
+  "customers.people.detail.addresses.fields.taxIdType": "Typ numeru",
   "customers.people.detail.addresses.fields.type": "Typ adresu",
   "customers.people.detail.addresses.formatLoadError": "Nie udało się wczytać konfiguracji adresów",
   "customers.people.detail.addresses.formatLoading": "Ładowanie preferencji adresowych…",

package/src/modules/customers/utils/addressFormat.tsx

@@ -13,6 +13,34 @@ export type AddressValue = {
   postalCode?: string | null
   country?: string | null
   companyName?: string | null
+  /**
+   * Contact details that belong to the ADDRESS rather than to the customer: who to call about this
+   * delivery, and the tax identifier this invoice address was billed under. They remain available to
+   * address editors and snapshot payloads, but are deliberately excluded from `formatAddressLines`
+   * and `AddressView`, whose existing contract remains postal-only.
+   *
+   * `taxIdType` interprets the value in Stripe's `{country}_{kind}` vocabulary (`pl_nip`, `eu_vat`,
+   * `other`, widened additively): `1234567890` and `PL1234567890` are the same business, and only the
+   * type tells a domestic identifier from an EU VAT number. It is metadata about `taxId`, never a
+   * displayed field of its own.
+   */
+  phone?: string | null
+  taxId?: string | null
+  taxIdType?: string | null
+}
+
+/**
+ * Tax-id labels keyed by `taxIdType`, for a caller that wants the identifier named correctly rather
+ * than generically.
+ *
+ * The stored scheme is chosen explicitly rather than inferred from the identifier. `other` also
+ * covers an address written before `taxIdType` existed. An unrecognised type takes the `other` route
+ * instead of guessing a domestic scheme.
+ */
+export type TaxIdLabelByType = {
+  plNip: string
+  euVat: string
+  other: string
 }
 
 export type AddressJsonShape = {
@@ -100,6 +128,31 @@ export function formatAddressString(address: AddressValue, format: AddressFormat
   return formatAddressLines(address, format).filter(Boolean).join(separator)
 }
 
+/**
+ * Which member of a label map names which scheme. Private, and deliberately not exhaustive: an
+ * unrecognised type resolves to `other`, so the vocabulary can widen without every caller being
+ * updated in the same release.
+ */
+const TAX_ID_LABEL_KEY_BY_TYPE: Record<string, keyof TaxIdLabelByType> = {
+  pl_nip: 'plNip',
+  eu_vat: 'euVat',
+}
+
+/**
+ * The label a tax identifier should carry, given its type. Exported because the editor renders the
+ * same identifier as an input and must name it the same way this formatter does — two copies of the
+ * mapping is exactly how a foreign number ends up under a domestic scheme's name.
+ */
+export function resolveTaxIdLabel(
+  label: string | TaxIdLabelByType | undefined,
+  taxIdType: string | null | undefined,
+): string | undefined {
+  if (!label) return undefined
+  if (typeof label === 'string') return label
+  const key = TAX_ID_LABEL_KEY_BY_TYPE[typeof taxIdType === 'string' ? taxIdType : ''] ?? 'other'
+  return label[key]
+}
+
 type AddressViewProps = {
   address: AddressValue
   format: AddressFormatStrategy
@@ -107,7 +160,12 @@ type AddressViewProps = {
   lineClassName?: string
 }
 
-export function AddressView({ address, format, className, lineClassName }: AddressViewProps): React.ReactElement | null {
+export function AddressView({
+  address,
+  format,
+  className,
+  lineClassName,
+}: AddressViewProps): React.ReactElement | null {
   const lines = formatAddressLines(address, format)
   if (!lines.length) return null
   return (

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

@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 "use client"
 
 import * as React from 'react'
@@ -72,17 +70,47 @@ const emptyDraft: AddressEditorDraft = {
   region: '',
   postalCode: '',
   country: '',
+  taxId: '',
+  taxIdType: '',
+  phone: '',
   isPrimary: false,
 }
 
 const EDITABLE_SNAPSHOT_KEYS = new Set(Object.keys(emptyDraft))
 
+/**
+ * The fields the editor owns, typed, plus whatever else the caller's snapshot carried.
+ *
+ * The index signature is what lets an integration's extra keys — anything a future
+ * integration writes — survive the merge-back below, while the named fields stay `string` for callers
+ * that read them. `taxId` and `phone` are NOT among them any more: the editor renders both, so they
+ * are assigned from the draft like every other field. Reading
+ * `normalized.city` off a bare `Record<string, unknown>` yields `unknown`, which is what forced the
+ * `@ts-nocheck` on this file.
+ */
+type NormalizedAddressDraft = {
+  name?: string
+  purpose?: string
+  companyName?: string
+  addressLine1?: string
+  addressLine2?: string
+  buildingNumber?: string
+  flatNumber?: string
+  city?: string
+  region?: string
+  postalCode?: string
+  country?: string
+  taxId?: string
+  phone?: string
+  isPrimary?: boolean
+} & Record<string, unknown>
+
 function normalizeAddressDraft(
   draft?: AddressEditorDraft | null,
   previous?: Record<string, unknown> | null,
-): Record<string, unknown> | null {
+): NormalizedAddressDraft | null {
   if (!draft) return null
-  const normalized: Record<string, unknown> = {}
+  const normalized: NormalizedAddressDraft = {}
   let hasEditableContent = false
   const assign = (key: keyof AddressEditorDraft, target: string) => {
     const value = draft[key]
@@ -103,6 +131,9 @@ function normalizeAddressDraft(
   assign('region', 'region')
   assign('postalCode', 'postalCode')
   assign('country', 'country')
+  assign('taxId', 'taxId')
+  assign('taxIdType', 'taxIdType')
+  assign('phone', 'phone')
   assign('isPrimary', 'isPrimary')
   if (!hasEditableContent) return null
   if (previous) {
@@ -129,6 +160,9 @@ function draftFromSnapshot(snapshot?: Record<string, unknown> | null): AddressEd
     region: typeof record.region === 'string' ? record.region : '',
     postalCode: typeof record.postalCode === 'string' ? record.postalCode : '',
     country: typeof record.country === 'string' ? record.country : '',
+    taxId: typeof record.taxId === 'string' ? record.taxId : '',
+    taxIdType: typeof record.taxIdType === 'string' ? record.taxIdType : '',
+    phone: typeof record.phone === 'string' ? record.phone : '',
     isPrimary: record.isPrimary === true,
   }
 }
@@ -370,7 +404,10 @@ export function SalesDocumentAddressesSection({
               companyName: value.companyName ?? null,
             }
           })
-          .filter((entry): entry is DocumentAddressAssignment => entry !== null)
+          // Narrow to non-null only. Asserting `DocumentAddressAssignment` here was wrong: its
+          // optional fields (`name?`, `purpose?`, …) admit `undefined`, which the mapped literal's
+          // `string | null` does not, so the predicate was not assignable to what it filtered.
+          .filter((entry): entry is NonNullable<typeof entry> => entry !== null)
         setDocumentAddresses(mapped)
       } else {
         setDocumentAddresses([])
@@ -1093,9 +1130,12 @@ export function SalesDocumentAddressesSection({
               <AddressEditor
                 value={shippingDraft}
                 format={addressFormat}
+                showPhoneField
+                showTaxIdField
                 t={t as Translator}
                 onChange={(next) => setShippingDraft(next)}
                 hidePrimaryToggle
+                disabled={locked}
               />
               <SwitchField
                 label={t('sales.documents.form.address.saveToCustomer', 'Save this address to the customer')}
@@ -1160,9 +1200,12 @@ export function SalesDocumentAddressesSection({
                   <AddressEditor
                     value={billingDraft}
                     format={addressFormat}
+                    showPhoneField
+                    showTaxIdField
                     t={t as Translator}
                     onChange={(next) => setBillingDraft(next)}
                     hidePrimaryToggle
+                    disabled={locked}
                   />
                   <SwitchField
                     label={t('sales.documents.form.address.saveToCustomer', 'Save this address to the customer')}

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

@@ -60,6 +60,7 @@ import { AddressEditor, type AddressEditorDraft } from '@open-mercato/core/modul
 import { useSalesChannelsEnabled } from '../useSalesChannelsEnabled'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { SalesOrderDraftLines, createSalesOrderLineDraft, type SalesOrderLineDraft } from './SalesOrderDraftLines'
+import { normalizeAddressDraft } from './normalizeAddressDraft'
 
 const logger = createLogger('sales')
 
@@ -435,29 +436,6 @@ function parseCustomerOptions(items: unknown[], kind: 'person' | 'company'): Cus
   return parsed
 }
 
-function normalizeAddressDraft(draft?: AddressDraft | null): Record<string, unknown> | null {
-  if (!draft) return null
-  const normalized: Record<string, unknown> = {}
-  const assign = (key: keyof AddressDraft, target: string) => {
-    const value = draft[key]
-    if (typeof value === 'string' && value.trim().length) normalized[target] = value.trim()
-    if (typeof value === 'boolean') normalized[target] = value
-  }
-  assign('name', 'name')
-  assign('purpose', 'purpose')
-  assign('companyName', 'companyName')
-  assign('addressLine1', 'addressLine1')
-  assign('addressLine2', 'addressLine2')
-  assign('buildingNumber', 'buildingNumber')
-  assign('flatNumber', 'flatNumber')
-  assign('city', 'city')
-  assign('region', 'region')
-  assign('postalCode', 'postalCode')
-  assign('country', 'country')
-  assign('isPrimary', 'isPrimary')
-  return Object.keys(normalized).length ? normalized : null
-}
-
 type DocumentNumberFieldProps = CrudCustomFieldRenderProps & { t: Translator }
 
 type BillingAddressSectionFieldProps = CrudCustomFieldRenderProps & {
@@ -655,6 +633,8 @@ function BillingAddressSectionField({ values, setFormValue, t, addressesLoading,
                 t={t}
                 onChange={(next) => updateValue('billingAddressDraft', next)}
                 hidePrimaryToggle
+                showPhoneField
+                showTaxIdField
               />
               <SwitchField
                 containerClassName="col-span-2"
@@ -1267,6 +1247,8 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
                   t={t}
                   onChange={(next) => updateValue('shippingAddressDraft', next)}
                   hidePrimaryToggle
+                  showPhoneField
+                  showTaxIdField
                 />
                 <SwitchField
                   containerClassName="col-span-2"

package/src/modules/sales/components/documents/normalizeAddressDraft.ts

@@ -0,0 +1,29 @@
+import type { AddressEditorDraft } from '@open-mercato/core/modules/customers/components/AddressEditor'
+
+export function normalizeAddressDraft(
+  draft?: AddressEditorDraft | null,
+): Record<string, unknown> | null {
+  if (!draft) return null
+  const normalized: Record<string, unknown> = {}
+  const assign = (key: keyof AddressEditorDraft, target: string) => {
+    const value = draft[key]
+    if (typeof value === 'string' && value.trim().length) normalized[target] = value.trim()
+    if (typeof value === 'boolean') normalized[target] = value
+  }
+  assign('name', 'name')
+  assign('purpose', 'purpose')
+  assign('companyName', 'companyName')
+  assign('addressLine1', 'addressLine1')
+  assign('addressLine2', 'addressLine2')
+  assign('buildingNumber', 'buildingNumber')
+  assign('flatNumber', 'flatNumber')
+  assign('city', 'city')
+  assign('region', 'region')
+  assign('postalCode', 'postalCode')
+  assign('country', 'country')
+  assign('taxId', 'taxId')
+  assign('taxIdType', 'taxIdType')
+  assign('phone', 'phone')
+  assign('isPrimary', 'isPrimary')
+  return Object.keys(normalized).length ? normalized : null
+}