shareneus 1.7.338 → 1.7.339

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

@@ -71,6 +71,7 @@ function getReverseTaxBreakdown(taxes, qty) {
         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));
@@ -169,6 +170,7 @@ class TransactionCalculationEngine {
             return total;
         }
         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));

package/package.json

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

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

@@ -65,88 +65,88 @@ function sumTaxAmountFromTaxes(taxes: any): number {
   );
 }
 
-function sumTaxRateFromTaxes(taxes: any): number {
-  const rows = getTaxesArray(taxes);
-  return rows.reduce(
-    (sum, row) => Add(sum, toNum(row?.Rate ?? row?.rate)),
-    0,
-  );
-}
-
-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);
-
-      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 },
-  );
-}
+function sumTaxRateFromTaxes(taxes: any): number {
+  const rows = getTaxesArray(taxes);
+  return rows.reduce(
+    (sum, row) => Add(sum, toNum(row?.Rate ?? row?.rate)),
+    0,
+  );
+}
+
+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
@@ -228,30 +228,31 @@ export class TransactionCalculationEngine {
       : baseAmount;
   }
 
-  static calculateSubtotalFromTotalUsingTaxes(input: {
-    total: number;
-    taxRows: unknown;
-    includeTaxInTotal: boolean;
-    qty?: number;
-  }): number {
-    const total = toNum(input.total);
-    if (!input.includeTaxInTotal) {
-      return total;
-    }
-
-    const taxBreakdown = getReverseTaxBreakdown(
-      input.taxRows,
-      toNum(input.qty) || 1,
-    );
-    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 totalAfterFixedTax;
-  }
+  static calculateSubtotalFromTotalUsingTaxes(input: {
+    total: number;
+    taxRows: unknown;
+    includeTaxInTotal: boolean;
+    qty?: number;
+  }): number {
+    const total = toNum(input.total);
+    if (!input.includeTaxInTotal) {
+      return total;
+    }
+
+    const taxBreakdown = getReverseTaxBreakdown(
+      input.taxRows,
+      toNum(input.qty) || 1,
+    );
+    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 totalAfterFixedTax;
+  }
 
   static reverseCalculateAmountAndUnitPriceFromTotal(input: {
     qty: number;
@@ -264,12 +265,12 @@ export class TransactionCalculationEngine {
   }): { amount: number; unitPrice: number } {
     const qty = toNum(input.qty) || 1;
     const subtotal =
-      TransactionCalculationEngine.calculateSubtotalFromTotalUsingTaxes({
-        total: input.total,
-        taxRows: input.taxRows,
-        includeTaxInTotal: input.includeTaxInTotal,
-        qty,
-      });
+      TransactionCalculationEngine.calculateSubtotalFromTotalUsingTaxes({
+        total: input.total,
+        taxRows: input.taxRows,
+        includeTaxInTotal: input.includeTaxInTotal,
+        qty,
+      });
 
     const disc = toNum(input.disc);
     const recDisc = toNum(input.recDisc);
@@ -554,15 +555,15 @@ export class TransactionCalculationEngine {
       return { ...item };
     }
 
-    // If total doesn't include tax, treat it as "already stripped".
-    const subtotal = includeTaxInTotal
-      ? TransactionCalculationEngine.calculateSubtotalFromTotalUsingTaxes({
-          total,
-          taxRows: item?.Taxes ?? item?.taxes,
-          includeTaxInTotal,
-          qty,
-        })
-      : total;
+    // If total doesn't include tax, treat it as "already stripped".
+    const subtotal = includeTaxInTotal
+      ? TransactionCalculationEngine.calculateSubtotalFromTotalUsingTaxes({
+          total,
+          taxRows: item?.Taxes ?? item?.taxes,
+          includeTaxInTotal,
+          qty,
+        })
+      : total;
 
     if (item.NoDisc) {
       const unpr = Divide(subtotal, qty);