@open-mercato/core 0.6.5-develop.4490.1.d8e873f3cf → 0.6.5-develop.4498.1.55dc06a57c

package/src/modules/customers/commands/personCompanyLinks.ts

@@ -294,33 +294,38 @@ const createPersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkCreateInpu
     )
     if (!link) return
 
+    let person: CustomerEntity | null = null
+    let profile: CustomerPersonProfile | null = null
+    let remainingLinks: CustomerPersonCompanyLink[] = []
+
     await withAtomicFlush(em, [
       async () => {
-        link.isPrimary = false
-        link.deletedAt = new Date()
-        const person = await findOneWithDecryption(
+        person = await findOneWithDecryption(
           em,
           CustomerEntity,
           { id: after.personEntityId, kind: 'person', tenantId: after.tenantId, organizationId: after.organizationId, deletedAt: null },
           undefined,
           { tenantId: after.tenantId, organizationId: after.organizationId },
         )
-        if (person) {
-          const profile = await findOneWithDecryption(
-            em,
-            CustomerPersonProfile,
-            { entity: person },
-            { populate: ['company'] },
-            { tenantId: person.tenantId, organizationId: person.organizationId },
-          )
-          if (profile) {
-            const remainingLinks = await loadPersonCompanyLinks(em, person)
-            if (after.isPrimary) {
-              await promoteFallbackPrimaryLink(em, person, profile, remainingLinks, after.companyEntityId)
-            } else if (profile.company && typeof profile.company !== 'string' && profile.company.id === after.companyEntityId) {
-              profile.company = null
-            }
-          }
+        if (!person) return
+        profile = await findOneWithDecryption(
+          em,
+          CustomerPersonProfile,
+          { entity: person },
+          { populate: ['company'] },
+          { tenantId: person.tenantId, organizationId: person.organizationId },
+        )
+        if (!profile) return
+        remainingLinks = (await loadPersonCompanyLinks(em, person)).filter((entry) => entry.id !== link.id)
+      },
+      async () => {
+        link.isPrimary = false
+        link.deletedAt = new Date()
+        if (!person || !profile) return
+        if (after.isPrimary) {
+          await promoteFallbackPrimaryLink(em, person, profile, remainingLinks, after.companyEntityId)
+        } else if (profile.company && typeof profile.company !== 'string' && profile.company.id === after.companyEntityId) {
+          profile.company = null
         }
       },
     ], { transaction: true })
@@ -453,39 +458,44 @@ const updatePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkUpdateInpu
     )
     if (!link) return
 
+    let person: CustomerEntity | null = null
+    let profile: CustomerPersonProfile | null = null
+    let company: CustomerEntity | null = null
+
     await withAtomicFlush(em, [
       async () => {
-        const person = await findOneWithDecryption(
+        person = await findOneWithDecryption(
           em,
           CustomerEntity,
           { id: before.personEntityId, kind: 'person', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
           undefined,
           { tenantId: before.tenantId, organizationId: before.organizationId },
         )
-        if (person) {
-          const profile = await findOneWithDecryption(
-            em,
-            CustomerPersonProfile,
-            { entity: person },
-            { populate: ['company'] },
-            { tenantId: person.tenantId, organizationId: person.organizationId },
-          )
-          if (profile) {
-            if (before.isPrimary) {
-              await clearPrimaryFlagsForPerson(em, person)
-              link.isPrimary = true
-              const company = await findOneWithDecryption(
-                em,
-                CustomerEntity,
-                { id: before.companyEntityId, kind: 'company', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
-                undefined,
-                { tenantId: before.tenantId, organizationId: before.organizationId },
-              )
-              if (company) profile.company = company
-            } else {
-              link.isPrimary = false
-            }
-          }
+        if (!person) return
+        profile = await findOneWithDecryption(
+          em,
+          CustomerPersonProfile,
+          { entity: person },
+          { populate: ['company'] },
+          { tenantId: person.tenantId, organizationId: person.organizationId },
+        )
+        if (!profile || !before.isPrimary) return
+        company = await findOneWithDecryption(
+          em,
+          CustomerEntity,
+          { id: before.companyEntityId, kind: 'company', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
+          undefined,
+          { tenantId: before.tenantId, organizationId: before.organizationId },
+        )
+      },
+      async () => {
+        if (!person || !profile) return
+        if (before.isPrimary) {
+          await clearPrimaryFlagsForPerson(em, person)
+          link.isPrimary = true
+          if (company) profile.company = company
+        } else {
+          link.isPrimary = false
         }
       },
     ], { transaction: true })
@@ -610,38 +620,43 @@ const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInpu
     )
     if (!link) return
 
+    let person: CustomerEntity | null = null
+    let profile: CustomerPersonProfile | null = null
+    let company: CustomerEntity | null = null
+
     await withAtomicFlush(em, [
       async () => {
-        link.deletedAt = null
-        link.isPrimary = before.isPrimary
-
-        const person = await findOneWithDecryption(
+        person = await findOneWithDecryption(
           em,
           CustomerEntity,
           { id: before.personEntityId, kind: 'person', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
           undefined,
           { tenantId: before.tenantId, organizationId: before.organizationId },
         )
+        if (!person || !before.isPrimary) return
+        profile = await findOneWithDecryption(
+          em,
+          CustomerPersonProfile,
+          { entity: person },
+          { populate: ['company'] },
+          { tenantId: person.tenantId, organizationId: person.organizationId },
+        )
+        if (!profile) return
+        company = await findOneWithDecryption(
+          em,
+          CustomerEntity,
+          { id: before.companyEntityId, kind: 'company', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
+          undefined,
+          { tenantId: before.tenantId, organizationId: before.organizationId },
+        )
+      },
+      async () => {
+        link.deletedAt = null
+        link.isPrimary = before.isPrimary
         if (person && before.isPrimary) {
           await clearPrimaryFlagsForPerson(em, person)
           link.isPrimary = true
-          const profile = await findOneWithDecryption(
-            em,
-            CustomerPersonProfile,
-            { entity: person },
-            { populate: ['company'] },
-            { tenantId: person.tenantId, organizationId: person.organizationId },
-          )
-          if (profile) {
-            const company = await findOneWithDecryption(
-              em,
-              CustomerEntity,
-              { id: before.companyEntityId, kind: 'company', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
-              undefined,
-              { tenantId: before.tenantId, organizationId: before.organizationId },
-            )
-            if (company) profile.company = company
-          }
+          if (profile && company) profile.company = company
         }
       },
     ], { transaction: true })

package/src/modules/sales/commands/payments.ts

@@ -757,6 +757,12 @@ const updatePaymentCommand: CommandHandler<
       }
       payment.updatedAt = new Date()
 
+      // Persist the payment scalar changes before any allocation query below.
+      // MikroORM discards pending scalar mutations when a find() runs on the
+      // same EntityManager before they are flushed, which would otherwise drop
+      // the updated amount/reference when allocations are (re)synced.
+      await tx.flush()
+
       if (input.allocations !== undefined) {
         const existingAllocations = await findWithDecryption(tx, SalesPaymentAllocation, { payment }, {}, { tenantId: payment.tenantId, organizationId: payment.organizationId })
         existingAllocations.forEach((allocation) => tx.remove(allocation))
@@ -816,6 +822,29 @@ const updatePaymentCommand: CommandHandler<
           })
           tx.persist(entity)
         }
+      } else if (input.amount !== undefined || input.currencyCode !== undefined) {
+        // The caller changed the payment amount/currency without managing
+        // allocations explicitly. A simple payment carries a single
+        // auto-created allocation covering the full amount (see create); keep
+        // it in sync so recomputeOrderPaymentTotals — which sums allocations in
+        // preference to the payment amount — does not report a stale paid total
+        // after a payment edit (#2455).
+        const existingAllocations = await findWithDecryption(tx, SalesPaymentAllocation, { payment }, {}, { tenantId: payment.tenantId, organizationId: payment.organizationId })
+        const paymentOrderId =
+          (typeof payment.order === 'string' ? payment.order : payment.order?.id) ?? null
+        const isDefaultAllocation = (allocation: SalesPaymentAllocation): boolean => {
+          const allocationOrderId =
+            typeof allocation.order === 'string' ? allocation.order : allocation.order?.id ?? null
+          const allocationInvoiceId =
+            typeof allocation.invoice === 'string' ? allocation.invoice : allocation.invoice?.id ?? null
+          return allocationInvoiceId === null && allocationOrderId === paymentOrderId
+        }
+        if (existingAllocations.length === 1 && isDefaultAllocation(existingAllocations[0])) {
+          const [allocation] = existingAllocations
+          allocation.amount = toNumericString(toNumber(payment.amount)) ?? '0'
+          allocation.currencyCode = payment.currencyCode
+          tx.persist(allocation)
+        }
       }
     })
 

package/src/modules/sales/lib/calculations.ts

@@ -94,14 +94,23 @@ function buildBaseLineResult(line: SalesLineSnapshot): SalesLineCalculationResul
   const netSubtotalBeforeDiscount = toNumber(unitNet, 0) * quantity
   const discountTotal = Math.min(Math.max(discountPerUnit * quantity, 0), netSubtotalBeforeDiscount)
   const netSubtotal = Math.max(netSubtotalBeforeDiscount - discountTotal, 0)
-  const taxAmount =
-    line.taxAmount !== null && line.taxAmount !== undefined
-      ? toNumber(line.taxAmount, 0)
-      : round(netSubtotal * Math.max(taxRate, 0))
+  const explicitTaxAmount = line.taxAmount !== null && line.taxAmount !== undefined
+  let taxAmount = explicitTaxAmount
+    ? toNumber(line.taxAmount, 0)
+    : round(netSubtotal * Math.max(taxRate, 0))
   const grossSubtotal =
     line.totalGrossAmount !== null && line.totalGrossAmount !== undefined
       ? toNumber(line.totalGrossAmount, 0)
       : round(netSubtotal + taxAmount)
+  // When tax was not supplied explicitly and the rate-derived tax is zero but
+  // the gross total already embeds tax (gross > net) — e.g. a tax-class-priced
+  // line whose resolved rate was not persisted — derive the tax from the
+  // net/gross delta so the document-level tax total is not silently zeroed
+  // while per-line net/gross stay correct (#2457).
+  if (!explicitTaxAmount && taxAmount <= 0) {
+    const grossNetDelta = round(grossSubtotal - netSubtotal)
+    if (grossNetDelta > 0) taxAmount = grossNetDelta
+  }
 
   return {
     line,
@@ -356,6 +365,25 @@ class SalesCalculationRegistry {
       })
     }
 
+    // Payment totals (paid/refunded) are authoritative inputs, not derived from
+    // lines or adjustments. Totals calculators rebuild the document result from
+    // lines+adjustments and would otherwise reset paid/refunded to 0 (and
+    // outstanding back to the full grand total), producing a stale paid/
+    // outstanding display after a payment. Re-apply the input totals last and
+    // recompute outstanding against the post-calculation grand total.
+    if (existingTotals) {
+      const paidTotalAmount = Math.max(toNumber(existingTotals.paidTotalAmount, 0), 0)
+      const refundedTotalAmount = Math.max(toNumber(existingTotals.refundedTotalAmount, 0), 0)
+      current.totals = {
+        ...current.totals,
+        paidTotalAmount,
+        refundedTotalAmount,
+        outstandingAmount: round(
+          Math.max(current.totals.grandTotalGrossAmount - paidTotalAmount + refundedTotalAmount, 0)
+        ),
+      }
+    }
+
     return current
   }
 }