shareneus 1.6.23 → 1.6.25

package/dist/tax/tax-calculator.js

@@ -65,9 +65,6 @@ const math_operations_1 = require("../shared/math-operations");
 function CalculateNetAmt(input) {
     var _a, _b, _c;
     const line = input;
-    if (line.NetAmt != null) {
-        return (0, util_1.GetNumber)(line.NetAmt);
-    }
     const disc = (0, util_1.GetNumber)(input.Disc);
     const recDisc = (0, util_1.GetNumber)(input.RecDisc);
     if (line.UnAmt != null || line.Amt != null) {

package/dist/transaction-calculations/discounts-distribution.d.ts

@@ -0,0 +1,19 @@
+export declare function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, taxcodes?: any): any;
+/**
+* Calculates the record-level discount amount (RecDisc) for a single line.
+*
+* @param invoiceData  Full invoice data containing Items, Ops and discount fields.
+* @param currentLine  Normalised data for the line being edited.
+* @param lineType     'item' for parts/inventory lines, 'op' for service/labor lines.
+*/
+export declare function calculateRecordDiscountForLine(invoiceData: any, currentLine: {
+    _id: any;
+    noDisc: boolean;
+    /** Item-only: quantity */
+    qty?: number;
+    /** Item-only: unit price */
+    unpr?: number;
+    /** Op-only: gross amount */
+    amt?: number;
+    disc: number;
+}, lineType: 'item' | 'op'): number;

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

@@ -0,0 +1,274 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DiscountAndTaxCalculation = DiscountAndTaxCalculation;
+exports.calculateRecordDiscountForLine = calculateRecordDiscountForLine;
+const math_operations_1 = require("../shared/math-operations");
+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
+    //     ? await this.laborCompSrv.GetTaxCodesByPromise()
+    //     : [];
+    // ---------- STEP 1: INITIALIZE DEFAULTS ----------
+    recordData.LDisc = recordData.LDisc || 0;
+    recordData.PDisc = recordData.PDisc || 0;
+    recordData.Disc = recordData.Disc || 0;
+    recordData.LPerc = recordData.LPerc || 0; // Labor-level %
+    recordData.PPerc = recordData.PPerc || 0; // Parts-level %
+    recordData.Perc = recordData.Perc || 0; // Global %
+    // ---------- STEP 2: CALCULATE NET AMOUNTS ----------
+    // Services (labor)
+    const servicesWithNet = (recordData.Ops || []).map((labor) => {
+        const gross = labor.Amt || 0;
+        const discount = labor.Disc || 0;
+        const net = (0, math_operations_1.Subtract)(gross, discount);
+        return Object.assign(Object.assign({}, labor), { net });
+    });
+    // Inventory items (parts)
+    const itemsWithNet = (recordData.Items || []).map((item) => {
+        const qty = item.Qty || 0;
+        const unitPrice = item.UnPr || 0;
+        const gross = item.UnAmt || (0, math_operations_1.Multiply)(qty, unitPrice);
+        const discount = item.Disc || 0;
+        const net = (0, math_operations_1.Subtract)(gross, discount);
+        return Object.assign(Object.assign({}, item), { net, UnAmt: gross });
+    });
+    // ---------- STEP 3: FILTER GROUPS ----------
+    const nonDiscountableItems = itemsWithNet.filter((val) => val.NoDisc);
+    const discountableItems = itemsWithNet.filter((val) => !val.NoDisc);
+    const nonDiscountableOps = servicesWithNet.filter((val) => val.NoDisc);
+    const discountableOps = servicesWithNet.filter((val) => !val.NoDisc);
+    const itemTotalNet = discountableItems.reduce((sum, item) => (0, math_operations_1.Add)(sum, item.net), 0);
+    const serviceTotalNet = discountableOps.reduce((sum, service) => (0, math_operations_1.Add)(sum, service.net), 0);
+    // ---------- STEP 4: HANDLE LEVEL DISCOUNTS (LPerc, PPerc) ----------
+    if (recordData.LPerc && Number(recordData.LPerc) > 0) {
+        const percValue = Number(recordData.LPerc);
+        recordData.LDisc = (0, math_operations_1.Multiply)(serviceTotalNet, (0, math_operations_1.Divide)(percValue, 100));
+    }
+    if (recordData.PPerc && Number(recordData.PPerc) > 0) {
+        const percValue = Number(recordData.PPerc);
+        recordData.PDisc = (0, math_operations_1.Multiply)(itemTotalNet, (0, math_operations_1.Divide)(percValue, 100));
+    }
+    const totalNetAfterLevelDiscounts = (0, math_operations_1.Subtract)((0, math_operations_1.Add)(itemTotalNet, serviceTotalNet), (0, math_operations_1.Add)(recordData.LDisc, recordData.PDisc));
+    // ---------- STEP 5: HANDLE GLOBAL DISCOUNT (Perc OR Disc) ----------
+    if (recordData.Perc && Number(recordData.Perc) > 0) {
+        const percValue = Number(recordData.Perc);
+        recordData.Disc = (0, math_operations_1.Multiply)(totalNetAfterLevelDiscounts, (0, math_operations_1.Divide)(percValue, 100));
+    }
+    else {
+        recordData.Disc = recordData.Disc || 0;
+    }
+    // ---------- STEP 6: TAX CALCULATION HELPER ----------
+    // ---------- STEP 7: PROCESS LABOR ITEMS ----------
+    const finalServices = discountableOps.map((labor) => {
+        if (labor.NoDisc)
+            return labor;
+        labor.Pr = tr_utils_1.TrUtils.SetValueToZeroIfNull(labor.Pr);
+        labor.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(labor.Disc);
+        const laborLevelDiscShare = serviceTotalNet > 0
+            ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(labor.net, serviceTotalNet), recordData.LDisc)
+            : 0;
+        const netAfterLDisc = (0, math_operations_1.Subtract)(labor.net, laborLevelDiscShare);
+        let globalDiscShare = 0;
+        if (totalNetAfterLevelDiscounts > 0) {
+            globalDiscShare = (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(netAfterLDisc, totalNetAfterLevelDiscounts), recordData.Disc);
+        }
+        const totalTransactionDiscount = (0, math_operations_1.Add)(laborLevelDiscShare, globalDiscShare);
+        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);
+        return labor;
+    });
+    // ---------- STEP 8: PROCESS INVENTORY ITEMS ----------
+    const finalItems = discountableItems.map((item) => {
+        if (item.NoDisc)
+            return item;
+        item.UnPr = tr_utils_1.TrUtils.SetValueToZeroIfNull(item.UnPr);
+        item.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(item.Disc);
+        const partLevelDiscShare = itemTotalNet > 0
+            ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(item.net, itemTotalNet), recordData.PDisc)
+            : 0;
+        const netAfterPDisc = (0, math_operations_1.Subtract)(item.net, partLevelDiscShare);
+        let globalDiscShare = 0;
+        if (totalNetAfterLevelDiscounts > 0) {
+            globalDiscShare = (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(netAfterPDisc, totalNetAfterLevelDiscounts), recordData.Disc);
+        }
+        const totalTransactionDiscount = (0, math_operations_1.Add)(partLevelDiscShare, globalDiscShare);
+        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);
+        return item;
+    });
+    // ---------- STEP 9: FINALIZE ----------
+    recordData.Items = [...finalItems, ...nonDiscountableItems];
+    recordData.Ops = [...finalServices, ...nonDiscountableOps];
+    return recordData;
+}
+function recalculateTaxes(amount, taxCode, taxCodes = [], 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)
+                ? 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.
+*
+* @param invoiceData  Full invoice data containing Items, Ops and discount fields.
+* @param currentLine  Normalised data for the line being edited.
+* @param lineType     'item' for parts/inventory lines, 'op' for service/labor lines.
+*/
+function calculateRecordDiscountForLine(invoiceData, currentLine, lineType) {
+    var _a, _b;
+    if (!!(currentLine === null || currentLine === void 0 ? void 0 : currentLine.noDisc)) {
+        return 0;
+    }
+    const toNum = (v) => {
+        const n = Number(v);
+        return Number.isFinite(n) ? n : 0;
+    };
+    const rawItems = Array.isArray(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Items) ? invoiceData.Items : [];
+    const rawOps = Array.isArray(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Ops) ? invoiceData.Ops : [];
+    // --- Build normalised items list, patching the current line ---
+    const items = rawItems.map((item) => ({
+        _id: item === null || item === void 0 ? void 0 : item._id,
+        qty: toNum(item === null || item === void 0 ? void 0 : item.Qty),
+        unpr: toNum(item === null || item === void 0 ? void 0 : item.UnPr),
+        disc: toNum(item === null || item === void 0 ? void 0 : item.Disc),
+        noDisc: !!(item === null || item === void 0 ? void 0 : item.NoDisc),
+    }));
+    if (lineType === 'item') {
+        const currentItem = {
+            _id: currentLine._id,
+            qty: toNum(currentLine.qty),
+            unpr: toNum(currentLine.unpr),
+            disc: toNum(currentLine.disc),
+            noDisc: currentLine.noDisc,
+        };
+        const idx = currentLine._id != null ? items.findIndex((i) => i._id === currentLine._id) : -1;
+        if (idx !== -1) {
+            items[idx] = currentItem;
+        }
+        else {
+            items.push(currentItem);
+        }
+    }
+    // --- Build normalised ops list, patching the current line ---
+    const ops = rawOps.map((op) => {
+        var _a, _b, _c, _d;
+        return ({
+            _id: op === null || op === void 0 ? void 0 : op._id,
+            amt: toNum((_c = (_b = (_a = op === null || op === void 0 ? void 0 : op.Amt) !== null && _a !== void 0 ? _a : op === null || op === void 0 ? void 0 : op.amount) !== null && _b !== void 0 ? _b : op === null || op === void 0 ? void 0 : op.Total) !== null && _c !== void 0 ? _c : op === null || op === void 0 ? void 0 : op.total),
+            disc: toNum((_d = op === null || op === void 0 ? void 0 : op.Disc) !== null && _d !== void 0 ? _d : op === null || op === void 0 ? void 0 : op.disc),
+            noDisc: !!(op === null || op === void 0 ? void 0 : op.NoDisc),
+        });
+    });
+    if (lineType === 'op') {
+        const currentOp = {
+            _id: currentLine._id,
+            amt: toNum(currentLine.amt),
+            disc: toNum(currentLine.disc),
+            noDisc: currentLine.noDisc,
+        };
+        const idx = currentLine._id != null ? ops.findIndex((o) => o._id === currentLine._id) : -1;
+        if (idx !== -1) {
+            ops[idx] = currentOp;
+        }
+        else {
+            ops.push(currentOp);
+        }
+    }
+    // --- Compute net amounts ---
+    const discountableItems = items.filter((i) => !i.noDisc);
+    const itemNets = discountableItems.map((item) => {
+        const unAmt = tr_utils_1.TrUtils.FixedTo(toNum(item.qty) * toNum(item.unpr));
+        const net = tr_utils_1.TrUtils.FixedTo(unAmt - toNum(item.disc));
+        return Object.assign(Object.assign({}, item), { net });
+    });
+    const itemTotalNet = itemNets.reduce((sum, i) => (0, math_operations_1.Add)(sum, i.net), 0);
+    const discountableOps = ops.filter((o) => !o.noDisc);
+    const opNets = discountableOps.map((op) => {
+        const net = tr_utils_1.TrUtils.FixedTo(toNum(op.amt) - toNum(op.disc));
+        return Object.assign(Object.assign({}, op), { net });
+    });
+    const serviceTotalNet = opNets.reduce((sum, o) => (0, math_operations_1.Add)(sum, o.net), 0);
+    // --- Level discount amounts ---
+    const pperc = toNum(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PPerc);
+    const lperc = toNum(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.LPerc);
+    const globalPerc = toNum(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Perc);
+    const pDiscAmount = pperc > 0
+        ? (0, math_operations_1.Multiply)(itemTotalNet, (0, math_operations_1.Divide)(pperc, 100))
+        : toNum(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PDisc);
+    const lDiscAmount = lperc > 0
+        ? (0, math_operations_1.Multiply)(serviceTotalNet, (0, math_operations_1.Divide)(lperc, 100))
+        : toNum(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.LDisc);
+    const totalNetAfterLevelDiscounts = (0, math_operations_1.Subtract)((0, math_operations_1.Add)(itemTotalNet, serviceTotalNet), (0, math_operations_1.Add)(pDiscAmount, lDiscAmount));
+    const globalDiscAmount = globalPerc > 0
+        ? (0, math_operations_1.Multiply)(totalNetAfterLevelDiscounts, (0, math_operations_1.Divide)(globalPerc, 100))
+        : toNum(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Disc);
+    // --- Compute share for the current line ---
+    if (lineType === 'item') {
+        const currentNetRow = (_a = itemNets.find((i) => i._id === currentLine._id)) !== null && _a !== void 0 ? _a : itemNets[itemNets.length - 1];
+        const currentNet = toNum(currentNetRow === null || currentNetRow === void 0 ? void 0 : currentNetRow.net);
+        const partLevelShare = itemTotalNet > 0
+            ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(currentNet, itemTotalNet), pDiscAmount)
+            : 0;
+        const netAfterPDisc = (0, math_operations_1.Subtract)(currentNet, partLevelShare);
+        const globalShare = totalNetAfterLevelDiscounts > 0
+            ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(netAfterPDisc, totalNetAfterLevelDiscounts), globalDiscAmount)
+            : 0;
+        return tr_utils_1.TrUtils.FixedTo(Math.max(0, (0, math_operations_1.Add)(partLevelShare, globalShare)));
+    }
+    else {
+        const currentNetRow = (_b = opNets.find((o) => o._id === currentLine._id)) !== null && _b !== void 0 ? _b : opNets[opNets.length - 1];
+        const currentNet = toNum(currentNetRow === null || currentNetRow === void 0 ? void 0 : currentNetRow.net);
+        const laborLevelShare = serviceTotalNet > 0
+            ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(currentNet, serviceTotalNet), lDiscAmount)
+            : 0;
+        const netAfterLDisc = (0, math_operations_1.Subtract)(currentNet, laborLevelShare);
+        const globalShare = totalNetAfterLevelDiscounts > 0
+            ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(netAfterLDisc, totalNetAfterLevelDiscounts), globalDiscAmount)
+            : 0;
+        return tr_utils_1.TrUtils.FixedTo(Math.max(0, (0, math_operations_1.Add)(laborLevelShare, globalShare)));
+    }
+}

package/dist/transaction-calculations/index.d.ts

@@ -1 +1,2 @@
 export { TransactionCalculationEngine } from "./transaction-calculation-engine";
+export { DiscountAndTaxCalculation, calculateRecordDiscountForLine } from "./discounts-distribution";

package/dist/transaction-calculations/index.js

@@ -1,5 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionCalculationEngine = void 0;
+exports.calculateRecordDiscountForLine = exports.DiscountAndTaxCalculation = exports.TransactionCalculationEngine = void 0;
 var transaction_calculation_engine_1 = require("./transaction-calculation-engine");
 Object.defineProperty(exports, "TransactionCalculationEngine", { enumerable: true, get: function () { return transaction_calculation_engine_1.TransactionCalculationEngine; } });
+var discounts_distribution_1 = require("./discounts-distribution");
+Object.defineProperty(exports, "DiscountAndTaxCalculation", { enumerable: true, get: function () { return discounts_distribution_1.DiscountAndTaxCalculation; } });
+Object.defineProperty(exports, "calculateRecordDiscountForLine", { enumerable: true, get: function () { return discounts_distribution_1.calculateRecordDiscountForLine; } });

package/package.json

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