shareneus 1.7.339 → 1.7.341

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

@@ -37,6 +37,7 @@ export declare class TransactionCalculationEngine {
         qty: number;
         total: number;
         disc: number;
+        perc?: string;
         recDisc: number;
         noDisc: boolean;
         taxRows: unknown;

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

@@ -71,7 +71,6 @@ 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));
@@ -170,7 +169,6 @@ 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));
@@ -187,10 +185,21 @@ class TransactionCalculationEngine {
             qty,
         });
         const disc = toNum(input.disc);
+        const perc = toNum(input.perc);
         const recDisc = toNum(input.recDisc);
-        const amount = input.noDisc
-            ? subtotal
-            : (0, math_operations_1.Add)(subtotal, (0, math_operations_1.Add)(disc, recDisc));
+        let amount = subtotal;
+        if (!input.noDisc) {
+            if (!isNullOrEmpty(input.perc) && perc !== 0) {
+                const discountRate = (0, math_operations_1.Divide)(perc, 100);
+                const priceFactor = (0, math_operations_1.Subtract)(1, discountRate);
+                amount = priceFactor === 0
+                    ? subtotal
+                    : (0, math_operations_1.Divide)((0, math_operations_1.Add)(subtotal, recDisc), priceFactor);
+            }
+            else {
+                amount = (0, math_operations_1.Add)(subtotal, (0, math_operations_1.Add)(disc, recDisc));
+            }
+        }
         const unitPrice = (0, math_operations_1.Divide)(amount, qty);
         return { amount, unitPrice };
     }

package/package.json

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

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

@@ -106,7 +106,7 @@ function getReverseTaxBreakdown(taxes: any, qty: number): {
     (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(
@@ -243,7 +243,6 @@ export class TransactionCalculationEngine {
       input.taxRows,
       toNum(input.qty) || 1,
     );
-    console.log('Reverse tax breakdown', taxBreakdown);
     const totalAfterFixedTax = Subtract(total, taxBreakdown.fixedTaxAmount);
 
     if (taxBreakdown.percentTaxRate) {
@@ -254,14 +253,15 @@ export class TransactionCalculationEngine {
     return totalAfterFixedTax;
   }
 
-  static reverseCalculateAmountAndUnitPriceFromTotal(input: {
-    qty: number;
-    total: number;
-    disc: number;
-    recDisc: number;
-    noDisc: boolean;
-    taxRows: unknown;
-    includeTaxInTotal: boolean;
+  static reverseCalculateAmountAndUnitPriceFromTotal(input: {
+    qty: number;
+    total: number;
+    disc: number;
+    perc?: string;
+    recDisc: number;
+    noDisc: boolean;
+    taxRows: unknown;
+    includeTaxInTotal: boolean;
   }): { amount: number; unitPrice: number } {
     const qty = toNum(input.qty) || 1;
     const subtotal =
@@ -271,16 +271,28 @@ export class TransactionCalculationEngine {
         includeTaxInTotal: input.includeTaxInTotal,
         qty,
       });
-
-    const disc = toNum(input.disc);
-    const recDisc = toNum(input.recDisc);
-    const amount = input.noDisc
-      ? subtotal
-      : Add(subtotal, Add(disc, recDisc));
-    const unitPrice = Divide(amount, qty);
-
-    return { amount, unitPrice };
-  }
+
+    const disc = toNum(input.disc);
+    const perc = toNum(input.perc);
+    const recDisc = toNum(input.recDisc);
+    let amount = subtotal;
+
+    if (!input.noDisc) {
+      if (!isNullOrEmpty(input.perc) && perc !== 0) {
+        const discountRate = Divide(perc, 100);
+        const priceFactor = Subtract(1, discountRate);
+        amount = priceFactor === 0
+          ? subtotal
+          : Divide(Add(subtotal, recDisc), priceFactor);
+      } else {
+        amount = Add(subtotal, Add(disc, recDisc));
+      }
+    }
+
+    const unitPrice = Divide(amount, qty);
+
+    return { amount, unitPrice };
+  }
 
   // Shared reverse-calculation formula. Components only need to supply their own field mapping.
   static calculatePriceFromTotal(input: ReverseCalculationInput): number {