@open-mercato/core 0.9.1-develop.7467.1.3b2bb92d47 → 0.9.1-develop.7468.1.7ea720142b

package/dist/modules/sales/lib/convertedOrderTotals.js

@@ -0,0 +1,51 @@
+import { rebuildDocumentResult } from "./calculations.js";
+const FEE_KINDS = /* @__PURE__ */ new Set(["shipping", "surcharge"]);
+function parseStoredAmount(value) {
+  if (typeof value === "number") return Number.isFinite(value) ? value : null;
+  if (typeof value === "string" && value.trim().length) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+function readSnapshotAmount(totalsSnapshot, key) {
+  if (!totalsSnapshot || typeof totalsSnapshot !== "object" || Array.isArray(totalsSnapshot)) return null;
+  const value = totalsSnapshot[key];
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function isOrderScopedFee(adjustment) {
+  return FEE_KINDS.has(adjustment.kind) && (!adjustment.scope || adjustment.scope === "order");
+}
+function toFeeDraft(adjustment) {
+  return {
+    scope: "order",
+    kind: adjustment.kind,
+    amountNet: parseStoredAmount(adjustment.amountNet),
+    amountGross: parseStoredAmount(adjustment.amountGross),
+    position: adjustment.position ?? 0
+  };
+}
+function resolveConvertedOrderFeeTotals(params) {
+  const derived = rebuildDocumentResult({
+    documentKind: "order",
+    currencyCode: params.currencyCode,
+    lines: [],
+    adjustments: params.adjustments.filter(isOrderScopedFee).map(toFeeDraft)
+  }).totals;
+  const snapshotShippingNet = readSnapshotAmount(params.totalsSnapshot, "shippingNetAmount");
+  const snapshotShippingGross = readSnapshotAmount(params.totalsSnapshot, "shippingGrossAmount");
+  const snapshotSurcharge = readSnapshotAmount(params.totalsSnapshot, "surchargeTotalAmount");
+  const shippingFromSnapshot = snapshotShippingNet !== null && snapshotShippingGross !== null;
+  const shippingNet = shippingFromSnapshot ? snapshotShippingNet : derived.shippingNetAmount ?? 0;
+  const shippingGross = shippingFromSnapshot ? snapshotShippingGross : derived.shippingGrossAmount ?? 0;
+  const surcharge = snapshotSurcharge ?? derived.surchargeTotalAmount ?? 0;
+  return {
+    shippingNetAmount: shippingNet.toString(),
+    shippingGrossAmount: shippingGross.toString(),
+    surchargeTotalAmount: surcharge.toString()
+  };
+}
+export {
+  resolveConvertedOrderFeeTotals
+};
+//# sourceMappingURL=convertedOrderTotals.js.map

package/dist/modules/sales/lib/convertedOrderTotals.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/sales/lib/convertedOrderTotals.ts"],
+  "sourcesContent": ["import { rebuildDocumentResult } from './calculations'\nimport type { SalesAdjustmentDraft } from './types'\n\nexport type ConvertedOrderFeeTotals = {\n  shippingNetAmount: string\n  shippingGrossAmount: string\n  surchargeTotalAmount: string\n}\n\ntype ConvertedOrderFeeAdjustment = {\n  scope?: string | null\n  kind: string\n  amountNet?: unknown\n  amountGross?: unknown\n  position?: number | null\n}\n\nconst FEE_KINDS = new Set(['shipping', 'surcharge'])\n\nfunction parseStoredAmount(value: unknown): number | null {\n  if (typeof value === 'number') return Number.isFinite(value) ? value : null\n  if (typeof value === 'string' && value.trim().length) {\n    const parsed = Number(value)\n    return Number.isFinite(parsed) ? parsed : null\n  }\n  return null\n}\n\nfunction readSnapshotAmount(totalsSnapshot: unknown, key: keyof ConvertedOrderFeeTotals): number | null {\n  if (!totalsSnapshot || typeof totalsSnapshot !== 'object' || Array.isArray(totalsSnapshot)) return null\n  const value = (totalsSnapshot as Record<string, unknown>)[key]\n  return typeof value === 'number' && Number.isFinite(value) ? value : null\n}\n\nfunction isOrderScopedFee(adjustment: ConvertedOrderFeeAdjustment): boolean {\n  return FEE_KINDS.has(adjustment.kind) && (!adjustment.scope || adjustment.scope === 'order')\n}\n\nfunction toFeeDraft(adjustment: ConvertedOrderFeeAdjustment): SalesAdjustmentDraft {\n  return {\n    scope: 'order',\n    kind: adjustment.kind,\n    amountNet: parseStoredAmount(adjustment.amountNet),\n    amountGross: parseStoredAmount(adjustment.amountGross),\n    position: adjustment.position ?? 0,\n  }\n}\n\n/**\n * A quote has no shipping / surcharge columns: those buckets live only in its\n * `totalsSnapshot`, written by the same calculation as the grand total the\n * conversion copies. The order does have the columns, so read them from the\n * snapshot, and fall back to the engine's own bucketing of the copied\n * adjustment rows when the snapshot carries no number for them.\n */\nexport function resolveConvertedOrderFeeTotals(params: {\n  totalsSnapshot: unknown\n  currencyCode: string\n  adjustments: ReadonlyArray<ConvertedOrderFeeAdjustment>\n}): ConvertedOrderFeeTotals {\n  const derived = rebuildDocumentResult({\n    documentKind: 'order',\n    currencyCode: params.currencyCode,\n    lines: [],\n    adjustments: params.adjustments.filter(isOrderScopedFee).map(toFeeDraft),\n  }).totals\n  const snapshotShippingNet = readSnapshotAmount(params.totalsSnapshot, 'shippingNetAmount')\n  const snapshotShippingGross = readSnapshotAmount(params.totalsSnapshot, 'shippingGrossAmount')\n  const snapshotSurcharge = readSnapshotAmount(params.totalsSnapshot, 'surchargeTotalAmount')\n  const shippingFromSnapshot = snapshotShippingNet !== null && snapshotShippingGross !== null\n  const shippingNet = shippingFromSnapshot ? snapshotShippingNet : derived.shippingNetAmount ?? 0\n  const shippingGross = shippingFromSnapshot ? snapshotShippingGross : derived.shippingGrossAmount ?? 0\n  const surcharge = snapshotSurcharge ?? derived.surchargeTotalAmount ?? 0\n  return {\n    shippingNetAmount: shippingNet.toString(),\n    shippingGrossAmount: shippingGross.toString(),\n    surchargeTotalAmount: surcharge.toString(),\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,6BAA6B;AAiBtC,MAAM,YAAY,oBAAI,IAAI,CAAC,YAAY,WAAW,CAAC;AAEnD,SAAS,kBAAkB,OAA+B;AACxD,MAAI,OAAO,UAAU,SAAU,QAAO,OAAO,SAAS,KAAK,IAAI,QAAQ;AACvE,MAAI,OAAO,UAAU,YAAY,MAAM,KAAK,EAAE,QAAQ;AACpD,UAAM,SAAS,OAAO,KAAK;AAC3B,WAAO,OAAO,SAAS,MAAM,IAAI,SAAS;AAAA,EAC5C;AACA,SAAO;AACT;AAEA,SAAS,mBAAmB,gBAAyB,KAAmD;AACtG,MAAI,CAAC,kBAAkB,OAAO,mBAAmB,YAAY,MAAM,QAAQ,cAAc,EAAG,QAAO;AACnG,QAAM,QAAS,eAA2C,GAAG;AAC7D,SAAO,OAAO,UAAU,YAAY,OAAO,SAAS,KAAK,IAAI,QAAQ;AACvE;AAEA,SAAS,iBAAiB,YAAkD;AAC1E,SAAO,UAAU,IAAI,WAAW,IAAI,MAAM,CAAC,WAAW,SAAS,WAAW,UAAU;AACtF;AAEA,SAAS,WAAW,YAA+D;AACjF,SAAO;AAAA,IACL,OAAO;AAAA,IACP,MAAM,WAAW;AAAA,IACjB,WAAW,kBAAkB,WAAW,SAAS;AAAA,IACjD,aAAa,kBAAkB,WAAW,WAAW;AAAA,IACrD,UAAU,WAAW,YAAY;AAAA,EACnC;AACF;AASO,SAAS,+BAA+B,QAInB;AAC1B,QAAM,UAAU,sBAAsB;AAAA,IACpC,cAAc;AAAA,IACd,cAAc,OAAO;AAAA,IACrB,OAAO,CAAC;AAAA,IACR,aAAa,OAAO,YAAY,OAAO,gBAAgB,EAAE,IAAI,UAAU;AAAA,EACzE,CAAC,EAAE;AACH,QAAM,sBAAsB,mBAAmB,OAAO,gBAAgB,mBAAmB;AACzF,QAAM,wBAAwB,mBAAmB,OAAO,gBAAgB,qBAAqB;AAC7F,QAAM,oBAAoB,mBAAmB,OAAO,gBAAgB,sBAAsB;AAC1F,QAAM,uBAAuB,wBAAwB,QAAQ,0BAA0B;AACvF,QAAM,cAAc,uBAAuB,sBAAsB,QAAQ,qBAAqB;AAC9F,QAAM,gBAAgB,uBAAuB,wBAAwB,QAAQ,uBAAuB;AACpG,QAAM,YAAY,qBAAqB,QAAQ,wBAAwB;AACvE,SAAO;AAAA,IACL,mBAAmB,YAAY,SAAS;AAAA,IACxC,qBAAqB,cAAc,SAAS;AAAA,IAC5C,sBAAsB,UAAU,SAAS;AAAA,EAC3C;AACF;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.9.1-develop.7467.1.3b2bb92d47",
+  "version": "0.9.1-develop.7468.1.7ea720142b",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -264,16 +264,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.9.1-develop.7467.1.3b2bb92d47",
-    "@open-mercato/shared": "0.9.1-develop.7467.1.3b2bb92d47",
-    "@open-mercato/ui": "0.9.1-develop.7467.1.3b2bb92d47",
+    "@open-mercato/ai-assistant": "0.9.1-develop.7468.1.7ea720142b",
+    "@open-mercato/shared": "0.9.1-develop.7468.1.7ea720142b",
+    "@open-mercato/ui": "0.9.1-develop.7468.1.7ea720142b",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.9.1-develop.7467.1.3b2bb92d47",
-    "@open-mercato/shared": "0.9.1-develop.7467.1.3b2bb92d47",
-    "@open-mercato/ui": "0.9.1-develop.7467.1.3b2bb92d47",
+    "@open-mercato/ai-assistant": "0.9.1-develop.7468.1.7ea720142b",
+    "@open-mercato/shared": "0.9.1-develop.7468.1.7ea720142b",
+    "@open-mercato/ui": "0.9.1-develop.7468.1.7ea720142b",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",

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

@@ -122,6 +122,7 @@ import {
   restorePaymentSnapshot,
   type PaymentSnapshot,
 } from "./payments";
+import { resolveConvertedOrderFeeTotals } from "../lib/convertedOrderTotals";
 import type { SalesCalculationService } from "../services/salesCalculationService";
 import type { TaxCalculationService } from "../services/taxCalculationService";
 import type {
@@ -6871,9 +6872,11 @@ const convertQuoteToOrderCommand: CommandHandler<
         subtotalGrossAmount: snapshot.quote.subtotalGrossAmount,
         discountTotalAmount: snapshot.quote.discountTotalAmount,
         taxTotalAmount: snapshot.quote.taxTotalAmount,
-        shippingNetAmount: "0",
-        shippingGrossAmount: "0",
-        surchargeTotalAmount: "0",
+        ...resolveConvertedOrderFeeTotals({
+          totalsSnapshot: snapshot.quote.totalsSnapshot,
+          currencyCode: snapshot.quote.currencyCode,
+          adjustments: snapshot.adjustments,
+        }),
         grandTotalNetAmount: snapshot.quote.grandTotalNetAmount,
         grandTotalGrossAmount: snapshot.quote.grandTotalGrossAmount,
         paidTotalAmount: "0",

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

@@ -0,0 +1,79 @@
+import { rebuildDocumentResult } from './calculations'
+import type { SalesAdjustmentDraft } from './types'
+
+export type ConvertedOrderFeeTotals = {
+  shippingNetAmount: string
+  shippingGrossAmount: string
+  surchargeTotalAmount: string
+}
+
+type ConvertedOrderFeeAdjustment = {
+  scope?: string | null
+  kind: string
+  amountNet?: unknown
+  amountGross?: unknown
+  position?: number | null
+}
+
+const FEE_KINDS = new Set(['shipping', 'surcharge'])
+
+function parseStoredAmount(value: unknown): number | null {
+  if (typeof value === 'number') return Number.isFinite(value) ? value : null
+  if (typeof value === 'string' && value.trim().length) {
+    const parsed = Number(value)
+    return Number.isFinite(parsed) ? parsed : null
+  }
+  return null
+}
+
+function readSnapshotAmount(totalsSnapshot: unknown, key: keyof ConvertedOrderFeeTotals): number | null {
+  if (!totalsSnapshot || typeof totalsSnapshot !== 'object' || Array.isArray(totalsSnapshot)) return null
+  const value = (totalsSnapshot as Record<string, unknown>)[key]
+  return typeof value === 'number' && Number.isFinite(value) ? value : null
+}
+
+function isOrderScopedFee(adjustment: ConvertedOrderFeeAdjustment): boolean {
+  return FEE_KINDS.has(adjustment.kind) && (!adjustment.scope || adjustment.scope === 'order')
+}
+
+function toFeeDraft(adjustment: ConvertedOrderFeeAdjustment): SalesAdjustmentDraft {
+  return {
+    scope: 'order',
+    kind: adjustment.kind,
+    amountNet: parseStoredAmount(adjustment.amountNet),
+    amountGross: parseStoredAmount(adjustment.amountGross),
+    position: adjustment.position ?? 0,
+  }
+}
+
+/**
+ * A quote has no shipping / surcharge columns: those buckets live only in its
+ * `totalsSnapshot`, written by the same calculation as the grand total the
+ * conversion copies. The order does have the columns, so read them from the
+ * snapshot, and fall back to the engine's own bucketing of the copied
+ * adjustment rows when the snapshot carries no number for them.
+ */
+export function resolveConvertedOrderFeeTotals(params: {
+  totalsSnapshot: unknown
+  currencyCode: string
+  adjustments: ReadonlyArray<ConvertedOrderFeeAdjustment>
+}): ConvertedOrderFeeTotals {
+  const derived = rebuildDocumentResult({
+    documentKind: 'order',
+    currencyCode: params.currencyCode,
+    lines: [],
+    adjustments: params.adjustments.filter(isOrderScopedFee).map(toFeeDraft),
+  }).totals
+  const snapshotShippingNet = readSnapshotAmount(params.totalsSnapshot, 'shippingNetAmount')
+  const snapshotShippingGross = readSnapshotAmount(params.totalsSnapshot, 'shippingGrossAmount')
+  const snapshotSurcharge = readSnapshotAmount(params.totalsSnapshot, 'surchargeTotalAmount')
+  const shippingFromSnapshot = snapshotShippingNet !== null && snapshotShippingGross !== null
+  const shippingNet = shippingFromSnapshot ? snapshotShippingNet : derived.shippingNetAmount ?? 0
+  const shippingGross = shippingFromSnapshot ? snapshotShippingGross : derived.shippingGrossAmount ?? 0
+  const surcharge = snapshotSurcharge ?? derived.surchargeTotalAmount ?? 0
+  return {
+    shippingNetAmount: shippingNet.toString(),
+    shippingGrossAmount: shippingGross.toString(),
+    surchargeTotalAmount: surcharge.toString(),
+  }
+}