shareneus 1.7.337 → 1.7.339

package/dist/transaction-calculations/transaction-calculation-engine.d.ts

@@ -31,6 +31,7 @@ export declare class TransactionCalculationEngine {
         total: number;
         taxRows: unknown;
         includeTaxInTotal: boolean;
+        qty?: number;
     }): number;
     static reverseCalculateAmountAndUnitPriceFromTotal(input: {
         qty: number;

package/dist/transaction-calculations/transaction-calculation-engine.js

@@ -48,6 +48,60 @@ function sumTaxRateFromTaxes(taxes) {
     const rows = getTaxesArray(taxes);
     return rows.reduce((sum, row) => { var _a; return (0, math_operations_1.Add)(sum, toNum((_a = row === null || row === void 0 ? void 0 : row.Rate) !== null && _a !== void 0 ? _a : row === null || row === void 0 ? void 0 : row.rate)); }, 0);
 }
+function normalizeCalcMethod(calcMethod) {
+    return calcMethod === 'Percentage' || isNullOrEmpty(calcMethod)
+        ? 'Percent'
+        : String(calcMethod);
+}
+function getTaxRowQty(row, fallbackQty) {
+    var _a, _b, _c;
+    return toNum((_c = (_b = (_a = row === null || row === void 0 ? void 0 : row.Qty) !== null && _a !== void 0 ? _a : row === null || row === void 0 ? void 0 : row.qty) !== null && _b !== void 0 ? _b : row === null || row === void 0 ? void 0 : row.Quantity) !== null && _c !== void 0 ? _c : row === null || row === void 0 ? void 0 : row.quantity) || fallbackQty;
+}
+function getPerUnitTaxAmount(row, fallbackQty, fallbackToAmt = true) {
+    var _a, _b;
+    const perUnitAmt = toNum((_a = row === null || row === void 0 ? void 0 : row.PerUnitAmt) !== null && _a !== void 0 ? _a : row === null || row === void 0 ? void 0 : row.perUnitAmt);
+    const qty = getTaxRowQty(row, fallbackQty);
+    if (perUnitAmt !== 0 && qty !== 0) {
+        return (0, math_operations_1.Multiply)(perUnitAmt, qty);
+    }
+    return fallbackToAmt ? toNum((_b = row === null || row === void 0 ? void 0 : row.Amt) !== null && _b !== void 0 ? _b : row === null || row === void 0 ? void 0 : row.amt) : 0;
+}
+function getReverseTaxBreakdown(taxes, qty) {
+    return getTaxesArray(taxes).reduce((summary, row) => {
+        var _a, _b, _c;
+        const calcMethod = normalizeCalcMethod((_a = row === null || row === void 0 ? void 0 : row.CalcMethod) !== null && _a !== void 0 ? _a : row === null || row === void 0 ? void 0 : row.calcMethod);
+        const rate = toNum((_b = row === null || row === void 0 ? void 0 : row.Rate) !== null && _b !== void 0 ? _b : row === null || row === void 0 ? void 0 : row.rate);
+        console.log('Reverse tax row', { row, calcMethod, rate, qty });
+        switch (calcMethod) {
+            case 'PerUnit':
+                summary.fixedTaxAmount = (0, math_operations_1.Add)(summary.fixedTaxAmount, getPerUnitTaxAmount(row, qty));
+                break;
+            case 'PerUnitPlusPercent':
+                summary.fixedTaxAmount = (0, math_operations_1.Add)(summary.fixedTaxAmount, getPerUnitTaxAmount(row, qty, false));
+                summary.percentTaxRate = (0, math_operations_1.Add)(summary.percentTaxRate, rate);
+                break;
+            case 'MaxOfPercentOrPerUnit': {
+                const amt = toNum((_c = row === null || row === void 0 ? void 0 : row.Amt) !== null && _c !== void 0 ? _c : row === null || row === void 0 ? void 0 : row.amt);
+                const perUnitAmt = getPerUnitTaxAmount(row, qty);
+                if (amt !== 0) {
+                    summary.fixedTaxAmount = (0, math_operations_1.Add)(summary.fixedTaxAmount, amt);
+                }
+                else if (perUnitAmt !== 0) {
+                    summary.fixedTaxAmount = (0, math_operations_1.Add)(summary.fixedTaxAmount, perUnitAmt);
+                }
+                else {
+                    summary.percentTaxRate = (0, math_operations_1.Add)(summary.percentTaxRate, rate);
+                }
+                break;
+            }
+            case 'Percent':
+            default:
+                summary.percentTaxRate = (0, math_operations_1.Add)(summary.percentTaxRate, rate);
+                break;
+        }
+        return summary;
+    }, { fixedTaxAmount: 0, percentTaxRate: 0 });
+}
 /**
  * Distribute a flat discount amount across a set of rows proportionally
  * by each row's `baseKey` value. Returns an array of share amounts aligned
@@ -115,12 +169,14 @@ class TransactionCalculationEngine {
         if (!input.includeTaxInTotal) {
             return total;
         }
-        const taxSummary = TransactionCalculationEngine.getTaxesSummary(input.taxRows);
-        if (taxSummary.taxRate) {
-            const divisor = (0, math_operations_1.Add)(1, (0, math_operations_1.Divide)(taxSummary.taxRate, 100));
-            return divisor === 0 ? total : (0, math_operations_1.Divide)(total, divisor);
+        const taxBreakdown = getReverseTaxBreakdown(input.taxRows, toNum(input.qty) || 1);
+        console.log('Reverse tax breakdown', taxBreakdown);
+        const totalAfterFixedTax = (0, math_operations_1.Subtract)(total, taxBreakdown.fixedTaxAmount);
+        if (taxBreakdown.percentTaxRate) {
+            const divisor = (0, math_operations_1.Add)(1, (0, math_operations_1.Divide)(taxBreakdown.percentTaxRate, 100));
+            return divisor === 0 ? totalAfterFixedTax : (0, math_operations_1.Divide)(totalAfterFixedTax, divisor);
         }
-        return (0, math_operations_1.Subtract)(total, taxSummary.taxAmount);
+        return totalAfterFixedTax;
     }
     static reverseCalculateAmountAndUnitPriceFromTotal(input) {
         const qty = toNum(input.qty) || 1;
@@ -128,6 +184,7 @@ class TransactionCalculationEngine {
             total: input.total,
             taxRows: input.taxRows,
             includeTaxInTotal: input.includeTaxInTotal,
+            qty,
         });
         const disc = toNum(input.disc);
         const recDisc = toNum(input.recDisc);
@@ -369,15 +426,14 @@ class TransactionCalculationEngine {
         if (qty === 0) {
             return Object.assign({}, item);
         }
-        const taxSummary = TransactionCalculationEngine.getTaxesSummary((_a = item === null || item === void 0 ? void 0 : item.Taxes) !== null && _a !== void 0 ? _a : item === null || item === void 0 ? void 0 : item.taxes);
         // If total doesn't include tax, treat it as "already stripped".
         const subtotal = includeTaxInTotal
-            ? taxSummary.taxAmount !== 0
-                ? (0, math_operations_1.Subtract)(total, taxSummary.taxAmount)
-                : (() => {
-                    const divisor = (0, math_operations_1.Add)(1, (0, math_operations_1.Divide)(taxSummary.taxRate, 100));
-                    return (0, math_operations_1.Divide)(total, divisor === 0 ? 1 : divisor);
-                })()
+            ? TransactionCalculationEngine.calculateSubtotalFromTotalUsingTaxes({
+                total,
+                taxRows: (_a = item === null || item === void 0 ? void 0 : item.Taxes) !== null && _a !== void 0 ? _a : item === null || item === void 0 ? void 0 : item.taxes,
+                includeTaxInTotal,
+                qty,
+            })
             : total;
         if (item.NoDisc) {
             const unpr = (0, math_operations_1.Divide)(subtotal, qty);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.7.337",
+  "version": "1.7.339",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/transaction-calculations/transaction-calculation-engine.ts

@@ -73,6 +73,81 @@ function sumTaxRateFromTaxes(taxes: any): number {
   );
 }
 
+function normalizeCalcMethod(calcMethod: any): string {
+  return calcMethod === 'Percentage' || isNullOrEmpty(calcMethod)
+    ? 'Percent'
+    : String(calcMethod);
+}
+
+function getTaxRowQty(row: any, fallbackQty: number): number {
+  return toNum(row?.Qty ?? row?.qty ?? row?.Quantity ?? row?.quantity) || fallbackQty;
+}
+
+function getPerUnitTaxAmount(
+  row: any,
+  fallbackQty: number,
+  fallbackToAmt = true,
+): number {
+  const perUnitAmt = toNum(row?.PerUnitAmt ?? row?.perUnitAmt);
+  const qty = getTaxRowQty(row, fallbackQty);
+
+  if (perUnitAmt !== 0 && qty !== 0) {
+    return Multiply(perUnitAmt, qty);
+  }
+
+  return fallbackToAmt ? toNum(row?.Amt ?? row?.amt) : 0;
+}
+
+function getReverseTaxBreakdown(taxes: any, qty: number): {
+  fixedTaxAmount: number;
+  percentTaxRate: number;
+} {
+  return getTaxesArray(taxes).reduce(
+    (summary, row) => {
+      const calcMethod = normalizeCalcMethod(row?.CalcMethod ?? row?.calcMethod);
+      const rate = toNum(row?.Rate ?? row?.rate);
+console.log('Reverse tax row', { row, calcMethod, rate, qty });
+      switch (calcMethod) {
+        case 'PerUnit':
+          summary.fixedTaxAmount = Add(
+            summary.fixedTaxAmount,
+            getPerUnitTaxAmount(row, qty),
+          );
+          break;
+
+        case 'PerUnitPlusPercent':
+          summary.fixedTaxAmount = Add(
+            summary.fixedTaxAmount,
+            getPerUnitTaxAmount(row, qty, false),
+          );
+          summary.percentTaxRate = Add(summary.percentTaxRate, rate);
+          break;
+
+        case 'MaxOfPercentOrPerUnit': {
+          const amt = toNum(row?.Amt ?? row?.amt);
+          const perUnitAmt = getPerUnitTaxAmount(row, qty);
+          if (amt !== 0) {
+            summary.fixedTaxAmount = Add(summary.fixedTaxAmount, amt);
+          } else if (perUnitAmt !== 0) {
+            summary.fixedTaxAmount = Add(summary.fixedTaxAmount, perUnitAmt);
+          } else {
+            summary.percentTaxRate = Add(summary.percentTaxRate, rate);
+          }
+          break;
+        }
+
+        case 'Percent':
+        default:
+          summary.percentTaxRate = Add(summary.percentTaxRate, rate);
+          break;
+      }
+
+      return summary;
+    },
+    { fixedTaxAmount: 0, percentTaxRate: 0 },
+  );
+}
+
 /**
  * Distribute a flat discount amount across a set of rows proportionally
  * by each row's `baseKey` value. Returns an array of share amounts aligned
@@ -157,21 +232,26 @@ export class TransactionCalculationEngine {
     total: number;
     taxRows: unknown;
     includeTaxInTotal: boolean;
+    qty?: number;
   }): number {
     const total = toNum(input.total);
     if (!input.includeTaxInTotal) {
       return total;
     }
 
-    const taxSummary = TransactionCalculationEngine.getTaxesSummary(
+    const taxBreakdown = getReverseTaxBreakdown(
       input.taxRows,
+      toNum(input.qty) || 1,
     );
-    if (taxSummary.taxRate) {
-      const divisor = Add(1, Divide(taxSummary.taxRate, 100));
-      return divisor === 0 ? total : Divide(total, divisor);
+    console.log('Reverse tax breakdown', taxBreakdown);
+    const totalAfterFixedTax = Subtract(total, taxBreakdown.fixedTaxAmount);
+
+    if (taxBreakdown.percentTaxRate) {
+      const divisor = Add(1, Divide(taxBreakdown.percentTaxRate, 100));
+      return divisor === 0 ? totalAfterFixedTax : Divide(totalAfterFixedTax, divisor);
     }
 
-    return Subtract(total, taxSummary.taxAmount);
+    return totalAfterFixedTax;
   }
 
   static reverseCalculateAmountAndUnitPriceFromTotal(input: {
@@ -189,6 +269,7 @@ export class TransactionCalculationEngine {
         total: input.total,
         taxRows: input.taxRows,
         includeTaxInTotal: input.includeTaxInTotal,
+        qty,
       });
 
     const disc = toNum(input.disc);
@@ -474,18 +555,14 @@ export class TransactionCalculationEngine {
       return { ...item };
     }
 
-    const taxSummary = TransactionCalculationEngine.getTaxesSummary(
-      item?.Taxes ?? item?.taxes,
-    );
-
     // If total doesn't include tax, treat it as "already stripped".
     const subtotal = includeTaxInTotal
-      ? taxSummary.taxAmount !== 0
-        ? Subtract(total, taxSummary.taxAmount)
-        : (() => {
-            const divisor = Add(1, Divide(taxSummary.taxRate, 100));
-            return Divide(total, divisor === 0 ? 1 : divisor);
-          })()
+      ? TransactionCalculationEngine.calculateSubtotalFromTotalUsingTaxes({
+          total,
+          taxRows: item?.Taxes ?? item?.taxes,
+          includeTaxInTotal,
+          qty,
+        })
       : total;
 
     if (item.NoDisc) {