shareneus 1.7.335 → 1.7.336

package/dist/accounting/invoice/invoice-total.service.js

@@ -55,7 +55,6 @@ class InvoiceTotalsService {
     }
     static CalculateLaborValues(opCodesList, IsIndependentTax) {
         opCodesList = this.ResetLaborValues(opCodesList, IsIndependentTax);
-        console.log('opCodesList', opCodesList);
         // opCodesList = this.GetOperationsDiscountPrice(opCodesList);
         // opCodesList = this.GetOperationsAfterDiscount(opCodesList,IsIndependentTax);
         // opCodesList = this.GetOperationsAfterTax(opCodesList, IsIndependentTax);

package/dist/transaction-calculations/discounts-distribution.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiscountAndTaxCalculation = DiscountAndTaxCalculation;
 exports.calculateRecordDiscountForLine = calculateRecordDiscountForLine;
 const math_operations_1 = require("../shared/math-operations");
+const util_1 = require("../shared/util");
+const tax_calculator_1 = require("../tax/tax-calculator");
 const tr_utils_1 = require("../utils/tr-utils");
-const transaction_calculation_engine_1 = require("./transaction-calculation-engine");
 function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
     // ---------- STEP 0: FETCH TAX CODES ----------
     // const taxcodes:any = isTaxable
@@ -78,7 +79,7 @@ function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
         labor.RecDisc = totalTransactionDiscount;
         const laborafterDiscPrice = (0, math_operations_1.Subtract)(labor.Amt, labor.Disc);
         const afterDisc = (0, math_operations_1.Subtract)(laborafterDiscPrice, totalTransactionDiscount);
-        labor.Taxes = recalculateTaxes(afterDisc, labor.TCode, taxcodes, labor.Taxes);
+        labor.Taxes = recalculateTaxes(labor, afterDisc, taxcodes);
         return labor;
     });
     // ---------- STEP 8: PROCESS INVENTORY ITEMS ----------
@@ -99,7 +100,7 @@ function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
         item.RecDisc = totalTransactionDiscount;
         const ItemafterDiscPrice = (0, math_operations_1.Subtract)(item.UnAmt, item.Disc);
         const afterDisc = (0, math_operations_1.Subtract)(ItemafterDiscPrice, totalTransactionDiscount);
-        item.Taxes = recalculateTaxes(afterDisc, item.TCode, taxcodes, item.Taxes);
+        item.Taxes = recalculateTaxes(item, afterDisc, taxcodes);
         return item;
     });
     // ---------- STEP 9: FINALIZE ----------
@@ -107,50 +108,82 @@ function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
     recordData.Ops = [...finalServices, ...nonDiscountableOps];
     return recordData;
 }
-function recalculateTaxes(amount, taxCode, taxCodes = [], existingTaxes = []) {
+function recalculateTaxes(line, amount, taxCodes = []) {
+    const existingTaxes = Array.isArray(line === null || line === void 0 ? void 0 : line.Taxes) ? line.Taxes : [];
+    const taxCode = getTaxCodeForLine(line, taxCodes, existingTaxes);
+    if (!taxCode) {
+        return recalculateExistingTaxes(amount, line === null || line === void 0 ? void 0 : line.TCode, existingTaxes);
+    }
+    const qty = (0, util_1.GetNumber)(line === null || line === void 0 ? void 0 : line.Qty, 1) || 1;
+    const calculatedTaxes = (0, tax_calculator_1.CalculateLineTax)({
+        Qty: qty,
+        UnitPrice: (0, math_operations_1.Divide)(amount, qty),
+        Disc: 0,
+        RecDisc: 0,
+        TaxCode: normalizeTaxCodeForCalculation(taxCode, existingTaxes),
+        ComponentOverrides: line === null || line === void 0 ? void 0 : line.ComponentOverrides,
+    });
+    const existingByCode = new Map(existingTaxes
+        .filter((tax) => tax === null || tax === void 0 ? void 0 : tax.Code)
+        .map((tax) => [tax.Code, tax]));
+    return calculatedTaxes.map((tax) => (Object.assign(Object.assign({}, (existingByCode.get(tax.Code) || {})), tax)));
+}
+function getTaxCodeForLine(line, taxCodes = [], existingTaxes = []) {
+    var _a, _b;
+    if ((_a = line === null || line === void 0 ? void 0 : line.TCode) === null || _a === void 0 ? void 0 : _a.Components) {
+        return line.TCode;
+    }
+    const taxCodeId = !tr_utils_1.TrUtils.IsNull(line === null || line === void 0 ? void 0 : line.TCode)
+        ? line.TCode
+        : (_b = existingTaxes.find((tax) => !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId))) === null || _b === void 0 ? void 0 : _b.TaxCodeId;
+    if (tr_utils_1.TrUtils.IsNull(taxCodeId) || !Array.isArray(taxCodes)) {
+        return null;
+    }
+    return taxCodes.find((code) => String(code === null || code === void 0 ? void 0 : code._id) === String(taxCodeId)) || null;
+}
+function normalizeTaxCodeForCalculation(taxCode, existingTaxes = []) {
+    if (Array.isArray(taxCode === null || taxCode === void 0 ? void 0 : taxCode.Components) && taxCode.Components.length > 0) {
+        return taxCode;
+    }
+    return Object.assign(Object.assign({}, taxCode), { Components: buildLegacyComponents(taxCode, existingTaxes) });
+}
+function buildLegacyComponents(taxCode, existingTaxes = []) {
+    const components = ["CGST", "SGST", "IGST"]
+        .map((code) => ({
+        Code: code,
+        Name: code,
+        Rate: (0, util_1.GetNumber)(taxCode === null || taxCode === void 0 ? void 0 : taxCode[code]),
+        Type: "Tax",
+        CalcMethod: "Percent",
+        AppliedOn: "NetAmt",
+    }))
+        .filter((component) => component.Rate > 0);
+    existingTaxes.forEach((tax) => {
+        if (!(tax === null || tax === void 0 ? void 0 : tax.Code) || components.some((component) => component.Code === tax.Code)) {
+            return;
+        }
+        components.push({
+            Code: tax.Code,
+            Name: tax.Name || tax.Code,
+            Rate: (0, util_1.GetNumber)(tax.Rate),
+            Type: tax.Type || (String(tax.Code).toUpperCase().includes("CESS") ? "Cess" : "Tax"),
+            CalcMethod: tax.CalcMethod || "Percent",
+            PerUnitAmt: tax.PerUnitAmt,
+            Unit: tax.Unit,
+            AppliedOn: tax.AppliedOn || "NetAmt",
+        });
+    });
+    return components;
+}
+function recalculateExistingTaxes(amount, taxCode, existingTaxes = []) {
     const normalizedTaxCode = tr_utils_1.TrUtils.IsNull(taxCode) ? null : Number(taxCode);
-    const defaultRates = getDefaultTaxRates(taxCode, taxCodes);
-    return (Array.isArray(existingTaxes) ? existingTaxes : []).map((tax) => {
-        const code = tax === null || tax === void 0 ? void 0 : tax.Code;
-        const rate = Number(tax === null || tax === void 0 ? void 0 : tax.Rate);
-        const normalizedRate = Number.isFinite(rate) ? rate : (defaultRates[code] || 0);
-        return Object.assign(Object.assign({}, tax), { Rate: normalizedRate, Amt: (0, math_operations_1.Multiply)(amount, (0, math_operations_1.Divide)(normalizedRate, 100)), TaxCodeId: !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId)
+    return existingTaxes.map((tax) => {
+        const rate = (0, util_1.GetNumber)(tax === null || tax === void 0 ? void 0 : tax.Rate);
+        return Object.assign(Object.assign({}, tax), { Rate: rate, Amt: (0, math_operations_1.Multiply)(amount, (0, math_operations_1.Divide)(rate, 100)), TaxCodeId: !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId)
                 ? Number(tax.TaxCodeId)
                 : normalizedTaxCode });
     });
 }
-function getDefaultTaxRates(taxCode, taxCodes = []) {
-    const normalizedTaxCode = tr_utils_1.TrUtils.IsNull(taxCode) ? null : taxCode;
-    const taxCodeRow = Array.isArray(taxCodes)
-        ? taxCodes.find((code) => (code === null || code === void 0 ? void 0 : code._id) === normalizedTaxCode)
-        : null;
-    const components = Array.isArray(taxCodeRow === null || taxCodeRow === void 0 ? void 0 : taxCodeRow.Components)
-        ? taxCodeRow.Components
-        : [];
-    const getComponentRate = (code) => {
-        const match = components.find((component) => {
-            var _a, _b;
-            const compCode = (_b = (_a = component === null || component === void 0 ? void 0 : component.Code) !== null && _a !== void 0 ? _a : component === null || component === void 0 ? void 0 : component.Type) !== null && _b !== void 0 ? _b : component === null || component === void 0 ? void 0 : component.Name;
-            return compCode === code;
-        });
-        const rate = Number(match === null || match === void 0 ? void 0 : match.Rate);
-        return Number.isFinite(rate) ? rate : 0;
-    };
-    let CGST = getComponentRate('CGST');
-    let SGST = getComponentRate('SGST');
-    let IGST = getComponentRate('IGST');
-    if (CGST === 0 && SGST === 0 && IGST === 0) {
-        const gstRateSum = transaction_calculation_engine_1.TransactionCalculationEngine.getGSTRateSumByTaxCode(normalizedTaxCode, taxCodes);
-        if (components.length === 1) {
-            IGST = gstRateSum;
-        }
-        else if (components.length === 2) {
-            CGST = gstRateSum / 2;
-            SGST = gstRateSum / 2;
-        }
-    }
-    return { CGST, SGST, IGST };
-}
 /**
 * Calculates the record-level discount amount (RecDisc) for a single line.
 *

package/package.json

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

package/src/accounting/invoice/invoice-total.service.ts

@@ -71,7 +71,7 @@ export class InvoiceTotalsService {
 
     static CalculateLaborValues(opCodesList: any, IsIndependentTax: boolean) {
         opCodesList = this.ResetLaborValues(opCodesList, IsIndependentTax);
-console.log('opCodesList', opCodesList);
+
         // opCodesList = this.GetOperationsDiscountPrice(opCodesList);
 
         // opCodesList = this.GetOperationsAfterDiscount(opCodesList,IsIndependentTax);

package/src/transaction-calculations/discounts-distribution.ts

@@ -1,6 +1,7 @@
-import { Add, Divide, Multiply, Subtract } from "../shared/math-operations";
-import { TrUtils } from "../utils/tr-utils";
-import { TransactionCalculationEngine } from "./transaction-calculation-engine";
+import { Add, Divide, Multiply, Subtract } from "../shared/math-operations";
+import { GetNumber } from "../shared/util";
+import { CalculateLineTax } from "../tax/tax-calculator";
+import { TrUtils } from "../utils/tr-utils";
 
 export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, taxcodes: any = []) {
 
@@ -101,7 +102,7 @@ export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, t
         const laborafterDiscPrice = Subtract(labor.Amt, labor.Disc);
         const afterDisc = Subtract(laborafterDiscPrice, totalTransactionDiscount);
 
-        labor.Taxes = recalculateTaxes(afterDisc, labor.TCode, taxcodes, labor.Taxes);
+        labor.Taxes = recalculateTaxes(labor, afterDisc, taxcodes);
 
         return labor;
     });
@@ -134,7 +135,7 @@ export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, t
         const ItemafterDiscPrice = Subtract(item.UnAmt, item.Disc);
         const afterDisc = Subtract(ItemafterDiscPrice, totalTransactionDiscount);
 
-        item.Taxes = recalculateTaxes(afterDisc, item.TCode, taxcodes, item.Taxes);
+        item.Taxes = recalculateTaxes(item, afterDisc, taxcodes);
 
         return item;
     });
@@ -146,64 +147,111 @@ export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, t
     return recordData;
 }
 
-function recalculateTaxes(amount: any, taxCode: any, taxCodes: any[] = [], existingTaxes: any[] = []): any[] {
-    const normalizedTaxCode = TrUtils.IsNull(taxCode) ? null : Number(taxCode);
-    const defaultRates = getDefaultTaxRates(taxCode, taxCodes);
-
-    return (Array.isArray(existingTaxes) ? existingTaxes : []).map((tax: any) => {
-        const code = tax?.Code;
-        const rate = Number(tax?.Rate);
-        const normalizedRate = Number.isFinite(rate) ? rate : (defaultRates[code] || 0);
-
-        return {
-            ...tax,
-            Rate: normalizedRate,
-            Amt: Multiply(amount, Divide(normalizedRate, 100)),
-            TaxCodeId: !TrUtils.IsNull(tax?.TaxCodeId)
-                ? Number(tax.TaxCodeId)
-                : normalizedTaxCode
-        };
-    });
-}
-
-function getDefaultTaxRates(taxCode: any, taxCodes: any[] = []): any {
-    const normalizedTaxCode = TrUtils.IsNull(taxCode) ? null : taxCode;
-    const taxCodeRow = Array.isArray(taxCodes)
-        ? taxCodes.find((code: any) => code?._id === normalizedTaxCode)
-        : null;
-    const components = Array.isArray(taxCodeRow?.Components)
-        ? taxCodeRow.Components
-        : [];
-
-    const getComponentRate = (code: string): number => {
-        const match = components.find((component: any) => {
-            const compCode = component?.Code ?? component?.Type ?? component?.Name;
-            return compCode === code;
-        });
-        const rate = Number(match?.Rate);
-        return Number.isFinite(rate) ? rate : 0;
-    };
-
-    let CGST = getComponentRate('CGST');
-    let SGST = getComponentRate('SGST');
-    let IGST = getComponentRate('IGST');
-
-    if (CGST === 0 && SGST === 0 && IGST === 0) {
-        const gstRateSum =
-            TransactionCalculationEngine.getGSTRateSumByTaxCode(
-                normalizedTaxCode,
-                taxCodes,
-            );
-        if (components.length === 1) {
-            IGST = gstRateSum;
-        } else if (components.length === 2) {
-            CGST = gstRateSum / 2;
-            SGST = gstRateSum / 2;
-        }
-    }
-
-    return { CGST, SGST, IGST };
-}
+function recalculateTaxes(line: any, amount: any, taxCodes: any[] = []): any[] {
+    const existingTaxes = Array.isArray(line?.Taxes) ? line.Taxes : [];
+    const taxCode = getTaxCodeForLine(line, taxCodes, existingTaxes);
+
+    if (!taxCode) {
+        return recalculateExistingTaxes(amount, line?.TCode, existingTaxes);
+    }
+
+    const qty = GetNumber(line?.Qty, 1) || 1;
+    const calculatedTaxes = CalculateLineTax({
+        Qty: qty,
+        UnitPrice: Divide(amount, qty),
+        Disc: 0,
+        RecDisc: 0,
+        TaxCode: normalizeTaxCodeForCalculation(taxCode, existingTaxes),
+        ComponentOverrides: line?.ComponentOverrides,
+    });
+
+    const existingByCode = new Map(
+        existingTaxes
+            .filter((tax: any) => tax?.Code)
+            .map((tax: any) => [tax.Code, tax])
+    );
+
+    return calculatedTaxes.map((tax: any) => ({
+        ...(existingByCode.get(tax.Code) || {}),
+        ...tax,
+    }));
+}
+
+function getTaxCodeForLine(line: any, taxCodes: any[] = [], existingTaxes: any[] = []): any {
+    if (line?.TCode?.Components) {
+        return line.TCode;
+    }
+
+    const taxCodeId = !TrUtils.IsNull(line?.TCode)
+        ? line.TCode
+        : existingTaxes.find((tax: any) => !TrUtils.IsNull(tax?.TaxCodeId))?.TaxCodeId;
+
+    if (TrUtils.IsNull(taxCodeId) || !Array.isArray(taxCodes)) {
+        return null;
+    }
+
+    return taxCodes.find((code: any) => String(code?._id) === String(taxCodeId)) || null;
+}
+
+function normalizeTaxCodeForCalculation(taxCode: any, existingTaxes: any[] = []): any {
+    if (Array.isArray(taxCode?.Components) && taxCode.Components.length > 0) {
+        return taxCode;
+    }
+
+    return {
+        ...taxCode,
+        Components: buildLegacyComponents(taxCode, existingTaxes),
+    };
+}
+
+function buildLegacyComponents(taxCode: any, existingTaxes: any[] = []): any[] {
+    const components: any[] = ["CGST", "SGST", "IGST"]
+        .map((code: string) => ({
+            Code: code,
+            Name: code,
+            Rate: GetNumber(taxCode?.[code]),
+            Type: "Tax",
+            CalcMethod: "Percent",
+            AppliedOn: "NetAmt",
+        }))
+        .filter((component: any) => component.Rate > 0);
+
+    existingTaxes.forEach((tax: any) => {
+        if (!tax?.Code || components.some((component: any) => component.Code === tax.Code)) {
+            return;
+        }
+
+        components.push({
+            Code: tax.Code,
+            Name: tax.Name || tax.Code,
+            Rate: GetNumber(tax.Rate),
+            Type: tax.Type || (String(tax.Code).toUpperCase().includes("CESS") ? "Cess" : "Tax"),
+            CalcMethod: tax.CalcMethod || "Percent",
+            PerUnitAmt: tax.PerUnitAmt,
+            Unit: tax.Unit,
+            AppliedOn: tax.AppliedOn || "NetAmt",
+        });
+    });
+
+    return components;
+}
+
+function recalculateExistingTaxes(amount: any, taxCode: any, existingTaxes: any[] = []): any[] {
+    const normalizedTaxCode = TrUtils.IsNull(taxCode) ? null : Number(taxCode);
+
+    return existingTaxes.map((tax: any) => {
+        const rate = GetNumber(tax?.Rate);
+
+        return {
+            ...tax,
+            Rate: rate,
+            Amt: Multiply(amount, Divide(rate, 100)),
+            TaxCodeId: !TrUtils.IsNull(tax?.TaxCodeId)
+                ? Number(tax.TaxCodeId)
+                : normalizedTaxCode
+        };
+    });
+}
 
 /**
 * Calculates the record-level discount amount (RecDisc) for a single line.