shareneus 1.5.15 → 1.5.17

package/dist/inventory/items/item-price-for-pricelist.d.ts

@@ -1,4 +1,4 @@
-export declare function GetItemPriceForPriceList(item: any, priceList: any, includeMargin?: boolean): any;
+export declare function GetItemPriceForPriceList(item: any, priceList: any, includeMargin?: boolean, quantity?: number): any;
 /**
  * Calculates the final sale price of an item after applying a discount and optional markup.
  * Optionally includes margin calculation based on cost.

package/dist/inventory/items/item-price-for-pricelist.js

@@ -4,58 +4,87 @@ exports.GetItemPriceForPriceList = GetItemPriceForPriceList;
 exports.CalcItemFinalSalePrice = CalcItemFinalSalePrice;
 const math_operations_1 = require("../../shared/math-operations");
 const util_1 = require("../../shared/util");
-function GetItemPriceForPriceList(item, priceList, includeMargin = false) {
-    var _a, _b;
-    let salePricesByPriceListId = [];
+function GetItemPriceForPriceList(item, priceList, includeMargin = false, quantity = 1) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    if (!priceList) {
+        return item;
+    }
+    const resolvedQty = Math.max(1, Number(quantity) || 1);
     const calcDisc = (_a = priceList.CalcDisc) !== null && _a !== void 0 ? _a : {};
-    let markUp = (_b = calcDisc.Mark) !== null && _b !== void 0 ? _b : false;
-    if ((0, util_1.IsNotNull)(item.SalePrices) && item.SalePrices.length > 0) {
-        salePricesByPriceListId = item.SalePrices.filter((price) => priceList._id.toString() == price.PrListId.toString());
+    const markUp = (_b = calcDisc.Mark) !== null && _b !== void 0 ? _b : false;
+    const priceListId = (_d = (_c = priceList === null || priceList === void 0 ? void 0 : priceList._id) === null || _c === void 0 ? void 0 : _c.toString) === null || _d === void 0 ? void 0 : _d.call(_c);
+    let salePricesByPriceListId = [];
+    if (priceListId && (0, util_1.IsNotNull)(item.SalePrices) && item.SalePrices.length > 0) {
+        salePricesByPriceListId = item.SalePrices.filter((price) => (price === null || price === void 0 ? void 0 : price.PrListId) && price.PrListId.toString() === priceListId);
     }
+    item.PriceTiers = (_e = priceList === null || priceList === void 0 ? void 0 : priceList.QtyTiers) !== null && _e !== void 0 ? _e : undefined;
+    item.AppliedPriceTier = undefined;
     if (salePricesByPriceListId.length > 0) {
         item.SalePrices = salePricesByPriceListId;
-        if (item.Track == 'TR' || item.Track == 'SN') {
+        const activeSalePrice = salePricesByPriceListId[0];
+        const activeTierList = (_f = activeSalePrice === null || activeSalePrice === void 0 ? void 0 : activeSalePrice.QtyTiers) !== null && _f !== void 0 ? _f : priceList === null || priceList === void 0 ? void 0 : priceList.QtyTiers;
+        if (activeTierList) {
+            item.PriceTiers = activeTierList;
+        }
+        if (item.Track === "TR" || item.Track === "SN") {
             item.Sale["MRP"] = item.Sale.Price;
-            if ((0, util_1.IsNotNull)(item.SalePrices[0].Price) && (0, util_1.IsNotNull)(item.SalePrices[0].Disc)) {
-                item.Sale.Price = CalcItemFinalSalePrice(item.SalePrices[0].Price, item.SalePrices[0].Disc, priceList, markUp);
+            const tier = ResolveTier(resolvedQty, activeSalePrice === null || activeSalePrice === void 0 ? void 0 : activeSalePrice.QtyTiers);
+            if (tier) {
+                const baseForTier = (0, util_1.IsNotNull)(activeSalePrice.Price) ? activeSalePrice.Price : item.Sale.Price;
+                item.Sale.Price = ApplyTierAdjustment(baseForTier, tier, priceList, false);
+                item.AppliedPriceTier = BuildAppliedTierMeta("ITEM", tier);
+            }
+            else if ((0, util_1.IsNotNull)(activeSalePrice.Price) && (0, util_1.IsNotNull)(activeSalePrice.Disc)) {
+                item.Sale.Price = CalcItemFinalSalePrice(activeSalePrice.Price, activeSalePrice.Disc, priceList, markUp);
             }
-            else if ((0, util_1.IsNotNull)(item.SalePrices[0].Price) && (0, util_1.IsNull)(item.SalePrices[0].Disc)) {
-                item.Sale.Price = ApplyRounding(item.SalePrices[0].Price, priceList);
+            else if ((0, util_1.IsNotNull)(activeSalePrice.Price) && (0, util_1.IsNull)(activeSalePrice.Disc)) {
+                item.Sale.Price = ApplyRounding(activeSalePrice.Price, priceList);
             }
-            else if ((0, util_1.IsNull)(item.SalePrices[0].Price) && (0, util_1.IsNotNull)(item.SalePrices[0].Disc)) {
-                item.Sale.Price = CalcItemFinalSalePrice(item.Sale.Price, item.SalePrices[0].Disc, priceList, markUp);
+            else if ((0, util_1.IsNull)(activeSalePrice.Price) && (0, util_1.IsNotNull)(activeSalePrice.Disc)) {
+                item.Sale.Price = CalcItemFinalSalePrice(item.Sale.Price, activeSalePrice.Disc, priceList, markUp);
             }
-            if (includeMargin) {
+            if (includeMargin && (0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
                 item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
             }
         }
-        else if (item.Track == 'BN') {
-            for (let index = 0; index < item.Batches.length; index++) {
-                const element = item.Batches[index];
-                let batchSalePrice = item.SalePrices.filter((batch) => priceList._id.toString() == batch.PrListId.toString() && element.BN == batch.BN);
-                if (batchSalePrice.length == 0) {
-                    batchSalePrice = item.SalePrices.filter((batch) => priceList._id.toString() == batch.PrListId.toString() && batch.BN == null);
+        else if (item.Track === "BN" && Array.isArray(item.Batches)) {
+            for (const element of item.Batches) {
+                const batchSalePrice = item.SalePrices.filter((batch) => {
+                    var _a;
+                    return priceListId === ((_a = batch === null || batch === void 0 ? void 0 : batch.PrListId) === null || _a === void 0 ? void 0 : _a.toString()) &&
+                        (element.BN === batch.BN || batch.BN == null);
+                });
+                const activeBatchSale = batchSalePrice.length > 0 ? batchSalePrice[0] : undefined;
+                const tierList = (_h = (_g = activeBatchSale === null || activeBatchSale === void 0 ? void 0 : activeBatchSale.QtyTiers) !== null && _g !== void 0 ? _g : activeSalePrice === null || activeSalePrice === void 0 ? void 0 : activeSalePrice.QtyTiers) !== null && _h !== void 0 ? _h : priceList === null || priceList === void 0 ? void 0 : priceList.QtyTiers;
+                if (tierList) {
+                    element.PriceTiers = tierList;
                 }
                 element.MRP = element.Price;
-                if (batchSalePrice.length > 0) {
-                    if ((0, util_1.IsNotNull)(batchSalePrice[0].Price) && (0, util_1.IsNotNull)(batchSalePrice[0].Disc)) {
-                        element.Price = CalcItemFinalSalePrice(batchSalePrice[0].Price, batchSalePrice[0].Disc, priceList, markUp);
+                const tier = ResolveTier(resolvedQty, (_j = activeBatchSale === null || activeBatchSale === void 0 ? void 0 : activeBatchSale.QtyTiers) !== null && _j !== void 0 ? _j : activeSalePrice === null || activeSalePrice === void 0 ? void 0 : activeSalePrice.QtyTiers);
+                if (tier) {
+                    const baseForTier = (0, util_1.IsNotNull)(activeBatchSale === null || activeBatchSale === void 0 ? void 0 : activeBatchSale.Price) ? activeBatchSale.Price : element.Price;
+                    element.Price = ApplyTierAdjustment(baseForTier, tier, priceList, false);
+                    element.AppliedPriceTier = BuildAppliedTierMeta("ITEM", tier);
+                }
+                else if (activeBatchSale) {
+                    if ((0, util_1.IsNotNull)(activeBatchSale.Price) && (0, util_1.IsNotNull)(activeBatchSale.Disc)) {
+                        element.Price = CalcItemFinalSalePrice(activeBatchSale.Price, activeBatchSale.Disc, priceList, markUp);
                     }
-                    else if ((0, util_1.IsNotNull)(batchSalePrice[0].Price) && (0, util_1.IsNull)(batchSalePrice[0].Disc)) {
-                        element.Price = ApplyRounding(batchSalePrice[0].Price, priceList);
+                    else if ((0, util_1.IsNotNull)(activeBatchSale.Price) && (0, util_1.IsNull)(activeBatchSale.Disc)) {
+                        element.Price = ApplyRounding(activeBatchSale.Price, priceList);
                     }
-                    else if ((0, util_1.IsNull)(batchSalePrice[0].Price) && (0, util_1.IsNotNull)(batchSalePrice[0].Disc)) {
-                        element.Price = CalcItemFinalSalePrice(element.Price, batchSalePrice[0].Disc, priceList, markUp);
+                    else if ((0, util_1.IsNull)(activeBatchSale.Price) && (0, util_1.IsNotNull)(activeBatchSale.Disc)) {
+                        element.Price = CalcItemFinalSalePrice(element.Price, activeBatchSale.Disc, priceList, markUp);
                     }
                 }
-                if (includeMargin) {
+                if (includeMargin && (0, util_1.IsNotNull)(element.Cost)) {
                     element.Margin = (0, math_operations_1.GetMarginValue)(element.Price, element.Cost);
                 }
             }
         }
         return item;
     }
-    return CalculatePriceBasedOnPriceList(item, priceList, includeMargin);
+    return CalculatePriceBasedOnPriceList(item, priceList, includeMargin, resolvedQty);
 }
 /**
  * Calculates the final sale price of an item after applying a discount and optional markup.
@@ -70,93 +99,116 @@ function GetItemPriceForPriceList(item, priceList, includeMargin = false) {
  * @returns The final price or an object containing margin and final price if includeMargin is true.
  */
 function CalcItemFinalSalePrice(price, disc, priceList, markup = false, includeMargin = false, cost = 0) {
-    // Calculate the price after applying discount or markup
     const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(price, disc, markup);
-    // Apply rounding rules from the price list
     const finalPrice = ApplyRounding(calculatedPrice, priceList);
-    // If margin calculation is requested, calculate and return both margin and final price
     if (includeMargin) {
         const margin = (0, math_operations_1.GetMarginValue)(finalPrice, cost);
         return { margin: margin, finalPrice: finalPrice };
     }
-    // Otherwise, return only the final price
     return finalPrice;
 }
-function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
-    var _a, _b;
-    if (priceList != null) {
-        if (priceList.PrCalc == "FIXED") {
-            if (priceList.Fixed && (0, util_1.IsNotNull)(priceList.Fixed.Price)) {
-                const fixedPrice = priceList.Fixed.Price;
-                const fixedDisc = priceList.Fixed.Disc || 0;
-                if (item.Track == 'TR' || item.Track == 'SN') {
-                    item.Sale["MRP"] = item.Sale.Price;
+function CalculatePriceBasedOnPriceList(item, priceList, includeMargin, quantity) {
+    var _a, _b, _c;
+    if (!priceList) {
+        return item;
+    }
+    const calcDisc = (_a = priceList.CalcDisc) !== null && _a !== void 0 ? _a : {};
+    const markUp = (_b = calcDisc.Mark) !== null && _b !== void 0 ? _b : false;
+    const resolvedQty = Math.max(1, Number(quantity) || 1);
+    const tier = ResolveTier(resolvedQty, priceList.QtyTiers);
+    if (tier) {
+        item.PriceTiers = (_c = priceList.QtyTiers) !== null && _c !== void 0 ? _c : undefined;
+        if (item.Track === "TR" || item.Track === "SN") {
+            item.Sale["MRP"] = item.Sale.Price;
+            const basePrice = DetermineBasePriceForTier(item, priceList);
+            item.Sale.Price = ApplyTierAdjustment(basePrice, tier, priceList, markUp);
+            item.AppliedPriceTier = BuildAppliedTierMeta("PRICELIST", tier);
+            if (includeMargin && (0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
+                item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
+            }
+        }
+        else if (item.Track === "BN" && Array.isArray(item.Batches)) {
+            for (const batch of item.Batches) {
+                batch.MRP = batch.Price;
+                const basePrice = DetermineBatchBasePriceForTier(batch, item, priceList);
+                batch.Price = ApplyTierAdjustment(basePrice, tier, priceList, markUp);
+                batch.AppliedPriceTier = BuildAppliedTierMeta("PRICELIST", tier);
+                if (includeMargin && (0, util_1.IsNotNull)(batch.Cost)) {
+                    batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
+                }
+            }
+        }
+        return item;
+    }
+    if (priceList.PrCalc === "FIXED") {
+        if (priceList.Fixed && (0, util_1.IsNotNull)(priceList.Fixed.Price)) {
+            const fixedPrice = priceList.Fixed.Price;
+            const fixedDisc = priceList.Fixed.Disc || 0;
+            if (item.Track === "TR" || item.Track === "SN") {
+                item.Sale["MRP"] = item.Sale.Price;
+                if ((0, util_1.IsNotNull)(fixedDisc) && fixedDisc > 0) {
+                    item.Sale.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
+                }
+                else {
+                    item.Sale.Price = ApplyRounding(fixedPrice, priceList);
+                }
+                if (includeMargin && (0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
+                    item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
+                }
+            }
+            else if (item.Track === "BN" && Array.isArray(item.Batches)) {
+                for (const batch of item.Batches) {
+                    batch.MRP = batch.Price;
                     if ((0, util_1.IsNotNull)(fixedDisc) && fixedDisc > 0) {
-                        item.Sale.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
+                        batch.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
                     }
                     else {
-                        item.Sale.Price = ApplyRounding(fixedPrice, priceList);
+                        batch.Price = ApplyRounding(fixedPrice, priceList);
                     }
-                    if (includeMargin) {
-                        item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
+                    if (includeMargin && (0, util_1.IsNotNull)(batch.Cost)) {
+                        batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
                     }
                 }
-                else if (item.Track == 'BN') {
-                    for (let batch of item.Batches) {
-                        batch.MRP = batch.Price;
-                        if ((0, util_1.IsNotNull)(fixedDisc) && fixedDisc > 0) {
-                            batch.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
-                        }
-                        else {
-                            batch.Price = ApplyRounding(fixedPrice, priceList);
-                        }
-                        if (includeMargin) {
-                            batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
-                        }
+            }
+        }
+    }
+    else if (priceList.PrCalc === "DISC") {
+        const discPerc = calcDisc.Perc || 0;
+        if (priceList.BasedOn === "SP") {
+            if (item.Track === "TR" || item.Track === "SN") {
+                item.Sale["MRP"] = item.Sale.Price;
+                item.Sale.Price = CalcItemFinalSalePrice(item.Sale.Price, discPerc, priceList, markUp);
+                if (includeMargin && (0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
+                    item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
+                }
+            }
+            else if (item.Track === "BN" && Array.isArray(item.Batches)) {
+                for (const batch of item.Batches) {
+                    batch.MRP = batch.Price;
+                    batch.Price = CalcItemFinalSalePrice(batch.Price, discPerc, priceList, markUp);
+                    if (includeMargin && (0, util_1.IsNotNull)(batch.Cost)) {
+                        batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
                     }
                 }
             }
         }
-        else if (priceList.PrCalc == "DISC") {
-            const calcDisc = (_a = priceList.CalcDisc) !== null && _a !== void 0 ? _a : {};
-            let discPerc = calcDisc.Perc || 0;
-            let markUp = (_b = calcDisc.Mark) !== null && _b !== void 0 ? _b : false;
-            if (priceList.BasedOn == "SP") {
-                if (item.Track == 'TR' || item.Track == 'SN') {
-                    item.Sale["MRP"] = item.Sale.Price;
-                    item.Sale.Price = CalcItemFinalSalePrice(item.Sale.Price, discPerc, priceList, markUp);
+        else if (priceList.BasedOn === "PC") {
+            if (item.Track === "TR" || item.Track === "SN") {
+                item.Sale["MRP"] = item.Sale.Price;
+                if ((0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
+                    item.Sale.Price = CalcItemFinalSalePrice(item.Pur.Cost, discPerc, priceList, markUp);
                     if (includeMargin) {
                         item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
                     }
                 }
-                else if (item.Track == 'BN') {
-                    for (let batch of item.Batches) {
-                        batch.MRP = batch.Price;
-                        batch.Price = CalcItemFinalSalePrice(batch.Price, discPerc, priceList, markUp);
-                        if (includeMargin) {
-                            batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
-                        }
-                    }
-                }
             }
-            else if (priceList.BasedOn == "PC") {
-                if (item.Track == 'TR' || item.Track == 'SN') {
-                    item.Sale["MRP"] = item.Sale.Price;
-                    if ((0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
-                        item.Sale.Price = CalcItemFinalSalePrice(item.Pur.Cost, discPerc, priceList, markUp);
+            else if (item.Track === "BN" && Array.isArray(item.Batches)) {
+                for (const batch of item.Batches) {
+                    batch.MRP = batch.Price;
+                    if ((0, util_1.IsNotNull)(batch.Cost)) {
+                        batch.Price = CalcItemFinalSalePrice(batch.Cost, discPerc, priceList, markUp);
                         if (includeMargin) {
-                            item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
-                        }
-                    }
-                }
-                else if (item.Track == 'BN') {
-                    for (let batch of item.Batches) {
-                        batch.MRP = batch.Price;
-                        if ((0, util_1.IsNotNull)(batch.Cost)) {
-                            batch.Price = CalcItemFinalSalePrice(batch.Cost, discPerc, priceList, markUp);
-                            if (includeMargin) {
-                                batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
-                            }
+                            batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
                         }
                     }
                 }
@@ -189,3 +241,74 @@ function ApplyRounding(price, priceList) {
             return price;
     }
 }
+function ResolveTier(quantity, tiers) {
+    if (!Array.isArray(tiers) || tiers.length === 0) {
+        return null;
+    }
+    const sorted = [...tiers]
+        .filter((tier) => (0, util_1.IsNotNull)(tier) && (0, util_1.IsNotNull)(tier.MinQty))
+        .sort((a, b) => a.MinQty - b.MinQty);
+    let selected = null;
+    for (const tier of sorted) {
+        if (quantity >= tier.MinQty) {
+            selected = tier;
+        }
+        else {
+            break;
+        }
+    }
+    return selected;
+}
+function ApplyTierAdjustment(basePrice, tier, priceList, markUp) {
+    if ((0, util_1.IsNotNull)(tier === null || tier === void 0 ? void 0 : tier.Price)) {
+        return ApplyRounding(tier.Price, priceList);
+    }
+    if ((0, util_1.IsNotNull)(tier === null || tier === void 0 ? void 0 : tier.Disc)) {
+        const targetBase = (0, util_1.IsNotNull)(basePrice) ? basePrice : 0;
+        return CalcItemFinalSalePrice(targetBase, tier.Disc, priceList, markUp);
+    }
+    return ApplyRounding(basePrice, priceList);
+}
+function BuildAppliedTierMeta(source, tier) {
+    if (!tier) {
+        return undefined;
+    }
+    return {
+        Source: source,
+        MinQty: (0, util_1.IsNotNull)(tier.MinQty) ? tier.MinQty : null,
+        Price: (0, util_1.IsNotNull)(tier.Price) ? tier.Price : null,
+        Disc: (0, util_1.IsNotNull)(tier.Disc) ? tier.Disc : null,
+    };
+}
+function DetermineBasePriceForTier(item, priceList) {
+    var _a;
+    if (priceList.PrCalc === "FIXED") {
+        if ((0, util_1.IsNotNull)((_a = priceList.Fixed) === null || _a === void 0 ? void 0 : _a.Price)) {
+            return priceList.Fixed.Price;
+        }
+        return item.Sale.Price;
+    }
+    if (priceList.PrCalc === "DISC") {
+        if (priceList.BasedOn === "PC" && (0, util_1.IsNotNull)(item.Pur) && (0, util_1.IsNotNull)(item.Pur.Cost)) {
+            return item.Pur.Cost;
+        }
+        return item.Sale.Price;
+    }
+    return item.Sale.Price;
+}
+function DetermineBatchBasePriceForTier(batch, item, priceList) {
+    var _a;
+    if (priceList.PrCalc === "FIXED") {
+        if ((0, util_1.IsNotNull)((_a = priceList.Fixed) === null || _a === void 0 ? void 0 : _a.Price)) {
+            return priceList.Fixed.Price;
+        }
+        return batch.Price;
+    }
+    if (priceList.PrCalc === "DISC") {
+        if (priceList.BasedOn === "PC" && (0, util_1.IsNotNull)(batch.Cost)) {
+            return batch.Cost;
+        }
+        return batch.Price;
+    }
+    return batch.Price;
+}

package/dist/sales/sales/sales-totals.service.d.ts

@@ -9,6 +9,8 @@ export declare class SalesTotalsService {
     static GetSubTotalFor(ItemsList: any): any;
     static GetItemsTotalAfterDiscount(ItemsList: any): any;
     static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, ItemsList: any, TaxCodes: any, DecimalsNumber: any): any;
+    static GetTaxGroupingForPartsByPerc(Parts: any, TaxCodes: any, DecimalsNumber: any): any[];
+    static ComparePartsByPerc(Parts: any, TaxCodes: any): any[];
     static GetLaborDiscountedTotal(LaborList: any): any;
     static GetItemDiscountedTotal(ItemsList: any): any;
     static GetItemsTaxTotalFor(ItemsList: any, IsIndependentTax: boolean): any;
@@ -22,6 +24,6 @@ export declare class SalesTotalsService {
     static GetTaxGroupingForItemsByHSN(Items: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetCombinedTaxPercentage(Items: any, TaxCodes: any): any;
     static CompareItemsByHSN(Items: any, TaxCodes: any): any[];
-    static GetTaxGroupingInfoByHSN(FinalMatchedItems: any, TaxCodes: any, DecimalsNumber: number): any[];
+    static GetTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any, DecimalsNumber: any): any[];
     static GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
 }

package/dist/sales/sales/sales-totals.service.js

@@ -122,6 +122,7 @@ class SalesTotalsService {
         // finalTotalsData.CustLaborAfterTax = TrUtils.FixedTo(finalTotalsData.CustLaborITax + finalTotalsData.CustLaborTotalAfterDisc);
         finalTotalsData.CustItemAfterTax = (0, math_operations_1.Add)(finalTotalsData.CustItemITax, finalTotalsData.CustItemsTotalAfterDisc);
         finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForItemsByHSN(ItemsList, TaxCodes, DecimalsNumber);
+        finalTotalsData.CustTaxGroupDataByPerc = this.GetTaxGroupingForPartsByPerc(ItemsList, TaxCodes, DecimalsNumber);
         finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round, DecimalsNumber);
         finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total, DecimalsNumber);
         for (var key in finalTotalsData) {
@@ -134,6 +135,43 @@ class SalesTotalsService {
         }
         return finalTotalsData;
     }
+    static GetTaxGroupingForPartsByPerc(Parts, TaxCodes, DecimalsNumber) {
+        Parts = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(Parts), TaxCodes);
+        // Parts = this.ResetPartsHSNIfInvalid(Parts);
+        let FinalMatchedParts = this.ComparePartsByPerc(Parts, TaxCodes);
+        return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber);
+    }
+    static ComparePartsByPerc(Parts, TaxCodes) {
+        let FinalMatchedParts = [];
+        Parts === null || Parts === void 0 ? void 0 : Parts.forEach((Part) => {
+            let MatchedPartsBasedOnHSN = Parts.filter((argPart) => {
+                let PartFound = false;
+                FinalMatchedParts.forEach((FinalArgParts) => {
+                    let PartIndex = FinalArgParts.findIndex((FinalArgPart) => {
+                        return FinalArgPart._id === argPart._id;
+                    });
+                    if (PartIndex !== -1) {
+                        PartFound = true;
+                    }
+                });
+                // let argGSTValues: any[] = this.GetGSTValueBasedOnTaxCode(argPart.TCode, TaxCodes);
+                // let argCGST = argGSTValues[0];
+                // let argSGST = argGSTValues[1];
+                // let argIGST = argGSTValues[2];
+                // let partGSTValues: any[] = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+                // let partCGST = partGSTValues[0];
+                // let partSGST = partGSTValues[1];
+                // let partIGST = partGSTValues[2];
+                return (!PartFound) &&
+                    (argPart.CGSTAmt === Part.CGSTAmt) && (argPart.IGSTAmt === Part.IGSTAmt) &&
+                    (argPart.SGSTAmt === Part.SGSTAmt);
+            });
+            if (MatchedPartsBasedOnHSN.length !== 0) {
+                FinalMatchedParts.push(MatchedPartsBasedOnHSN);
+            }
+        });
+        return FinalMatchedParts;
+    }
     static GetLaborDiscountedTotal(LaborList) {
         let LaborDiscountedTotal = 0;
         LaborList.forEach((Labor) => {
@@ -283,31 +321,40 @@ class SalesTotalsService {
         });
         return FinalMatchedItems;
     }
-    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes, DecimalsNumber) {
+    static GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber) {
         let HSNTaxInfo = [];
-        FinalMatchedItems.forEach((MatchedItem) => {
+        FinalMatchedParts.forEach((MatchedPart) => {
             let TaxInfo = {};
             let TaxOnAmount = 0;
             let TaxAmount = 0;
-            let HSN = MatchedItem[0].HSN;
-            TaxInfo.CombinedTaxPercentage = MatchedItem[0].CombinedTaxPercentage;
-            MatchedItem.forEach((argMatchedGSTItem) => {
-                TaxOnAmount = (0, math_operations_1.Add)(TaxOnAmount, argMatchedGSTItem.AfterItemDisc);
-                TaxAmount = (0, math_operations_1.Add)(TaxAmount, argMatchedGSTItem.CGST);
-                TaxAmount = (0, math_operations_1.Add)(TaxAmount, argMatchedGSTItem.IGST);
-                TaxAmount = (0, math_operations_1.Add)(TaxAmount, argMatchedGSTItem.SGST);
+            let CGSTAmt = 0;
+            let SGSTAmt = 0;
+            let IGSTAmt = 0;
+            let HSN = MatchedPart[0].HSN;
+            TaxInfo.CombinedTaxPercentage = MatchedPart[0].CombinedTaxPercentage;
+            MatchedPart.forEach((argMatchedGSTPart) => {
+                TaxOnAmount = (0, math_operations_1.Add)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.AfterPartDisc, DecimalsNumber));
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST, DecimalsNumber));
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST, DecimalsNumber));
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST, DecimalsNumber));
+                CGSTAmt = (0, math_operations_1.Add)(CGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST, DecimalsNumber));
+                SGSTAmt = (0, math_operations_1.Add)(SGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST, DecimalsNumber));
+                IGSTAmt = (0, math_operations_1.Add)(IGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST, DecimalsNumber));
             });
             TaxInfo.HSN = HSN;
+            TaxInfo.CGSTAmt = CGSTAmt;
+            TaxInfo.SGSTAmt = SGSTAmt;
+            TaxInfo.IGSTAmt = IGSTAmt;
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
             TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
-            TaxInfo.ItemsCount = MatchedItem.length;
-            // let GSTValues: any[] = this.GetGSTValueBasedOnTaxCode(MatchedItem[0].TCode, TaxCodes);
+            TaxInfo.ItemsCount = MatchedPart.length;
+            // let GSTValues: any[] = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
             // TaxInfo.CGST = GSTValues[0];
             // TaxInfo.SGST = GSTValues[1];
             // TaxInfo.IGST = GSTValues[2];
-            TaxInfo.CGST = MatchedItem[0].CGSTAmt;
-            TaxInfo.IGST = MatchedItem[0].IGSTAmt;
-            TaxInfo.SGST = MatchedItem[0].SGSTAmt;
+            TaxInfo.CGST = MatchedPart[0].CGSTAmt;
+            TaxInfo.IGST = MatchedPart[0].IGSTAmt;
+            TaxInfo.SGST = MatchedPart[0].SGSTAmt;
             if (TaxOnAmount !== 0) {
                 HSNTaxInfo.push(TaxInfo);
             }

package/dist/sales-receive/sales-total-calculation.js

@@ -17,18 +17,22 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
     const safeOps = safeArray(ops);
     const safeTaxCodes = safeArray(taxCodes);
     // Initialize all totals
-    let total = 0;
     let subtotalOnItems = 0;
+    let totalTaxOnItems = 0;
+    let totalDiscountOnItems = 0;
     let subtotalOnLabor = 0;
+    let totalTaxOnLabor = 0;
+    let totalDiscountOnLabor = 0;
+    let total = 0;
     let subtotal = 0;
     let totalTax = 0;
-    let totalTaxOnItems = 0;
-    let totalTaxOnLabor = 0;
     let totalDiscount = 0;
-    let totalDiscountOnItems = 0;
-    let totalDiscountOnLabor = 0;
     let roundOff = 0;
     let totalAfterRounded = 0;
+    // Returns totals
+    let returnSubtotal = 0;
+    let returnTax = 0;
+    let returnTotal = 0;
     // Tax breakdown totals - only calculate if taxable
     let totalSGST = 0;
     let totalCGST = 0;
@@ -44,18 +48,41 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         const itemDisc = (0, util_1.GetNumber)(item.Disc);
         const itemRecDisc = (0, util_1.GetNumber)(item.RecDisc);
         const itemUnAmt = (0, util_1.GetNumber)(item.UnAmt);
-        totalDiscountOnItems = (0, math_operations_1.Add)(totalDiscountOnItems, itemDisc, itemRecDisc);
-        subtotalOnItems = (0, math_operations_1.Add)(subtotalOnItems, itemUnAmt);
-        // Only calculate tax if taxable
-        if (isTaxable) {
-            const itemSGST = (0, util_1.GetNumber)(item.SGST);
-            const itemCGST = (0, util_1.GetNumber)(item.CGST);
-            const itemIGST = (0, util_1.GetNumber)(item.IGST);
-            // Add individual tax amounts for items
-            totalSGSTOnItems = (0, math_operations_1.Add)(totalSGSTOnItems, itemSGST);
-            totalCGSTOnItems = (0, math_operations_1.Add)(totalCGSTOnItems, itemCGST);
-            totalIGSTOnItems = (0, math_operations_1.Add)(totalIGSTOnItems, itemIGST);
-            totalTaxOnItems = (0, math_operations_1.Add)(totalTaxOnItems, itemSGST, itemCGST, itemIGST);
+        // Calculate return total for items with Ret = true
+        if (item.Ret === true) {
+            const itemNetAmount = (0, math_operations_1.Subtract)(itemUnAmt, (0, math_operations_1.Add)(itemDisc, itemRecDisc));
+            // Add to return subtotal (net amount after discounts)
+            returnSubtotal = (0, math_operations_1.Add)(returnSubtotal, itemNetAmount);
+            if (isTaxable) {
+                const itemSGST = (0, util_1.GetNumber)(item.SGST);
+                const itemCGST = (0, util_1.GetNumber)(item.CGST);
+                const itemIGST = (0, util_1.GetNumber)(item.IGST);
+                const itemTotalTax = (0, math_operations_1.Add)(itemSGST, itemCGST, itemIGST);
+                // Add to return tax
+                returnTax = (0, math_operations_1.Add)(returnTax, itemTotalTax);
+                // Return total includes net amount + tax
+                returnTotal = (0, math_operations_1.Add)(returnTotal, itemNetAmount, itemTotalTax);
+            }
+            else {
+                // Return total without tax (same as returnSubtotal when not taxable)
+                returnTotal = (0, math_operations_1.Add)(returnTotal, itemNetAmount);
+            }
+        }
+        else {
+            // Process normal items (not returns)
+            totalDiscountOnItems = (0, math_operations_1.Add)(totalDiscountOnItems, itemDisc, itemRecDisc);
+            subtotalOnItems = (0, math_operations_1.Add)(subtotalOnItems, itemUnAmt);
+            // Only calculate tax if taxable
+            if (isTaxable) {
+                const itemSGST = (0, util_1.GetNumber)(item.SGST);
+                const itemCGST = (0, util_1.GetNumber)(item.CGST);
+                const itemIGST = (0, util_1.GetNumber)(item.IGST);
+                // Add individual tax amounts for items
+                totalSGSTOnItems = (0, math_operations_1.Add)(totalSGSTOnItems, itemSGST);
+                totalCGSTOnItems = (0, math_operations_1.Add)(totalCGSTOnItems, itemCGST);
+                totalIGSTOnItems = (0, math_operations_1.Add)(totalIGSTOnItems, itemIGST);
+                totalTaxOnItems = (0, math_operations_1.Add)(totalTaxOnItems, itemSGST, itemCGST, itemIGST);
+            }
         }
     });
     // Calculate operations/labor totals with null safety
@@ -81,6 +108,10 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
     totalDiscount = (0, math_operations_1.Add)(totalDiscountOnItems, totalDiscountOnLabor);
     totalTax = (0, math_operations_1.Add)(totalTaxOnItems, totalTaxOnLabor);
     subtotal = (0, math_operations_1.Add)(subtotalOnItems, subtotalOnLabor);
+    // Subtract return subtotal from subtotal
+    subtotal = (0, math_operations_1.Subtract)(subtotal, returnSubtotal);
+    // Subtract return tax from total tax
+    totalTax = (0, math_operations_1.Subtract)(totalTax, returnTax);
     // Calculate combined tax breakdown totals only if taxable
     if (isTaxable) {
         totalSGST = (0, math_operations_1.Add)(totalSGSTOnItems, totalSGSTOnLabor);
@@ -92,7 +123,10 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
     const netAmountAfterDiscount = (0, math_operations_1.Subtract)(subtotal, totalDiscount);
     // Step 2: Add tax if taxable
     total = isTaxable ? (0, math_operations_1.Add)(netAmountAfterDiscount, totalTax) : netAmountAfterDiscount;
+    // Step 3: Add adjustments
     total = (0, math_operations_1.Add)(total, (0, util_1.GetNumber)(Adjust));
+    // Step 4: Subtract return total from the final total
+    total = (0, math_operations_1.Subtract)(total, returnTotal);
     // FIXED ROUNDING: Use Math.round instead of Math.floor
     const roundedTotal = Math.round(total);
     roundOff = (0, math_operations_1.Subtract)(roundedTotal, total);
@@ -109,7 +143,10 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         subtotalOnLabor,
         totalDiscountOnItems,
         totalDiscountOnLabor,
-        netAmountAfterDiscount
+        netAmountAfterDiscount,
+        returnSubtotal,
+        returnTax,
+        returnTotal
     };
     // Only include tax fields and taxSummary if taxable
     if (isTaxable) {
@@ -149,7 +186,10 @@ function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = fa
         subtotalOnLabor: roundToDecimals(result.subtotalOnLabor),
         totalDiscountOnItems: roundToDecimals(result.totalDiscountOnItems),
         totalDiscountOnLabor: roundToDecimals(result.totalDiscountOnLabor),
-        netAmountAfterDiscount: roundToDecimals(result.netAmountAfterDiscount)
+        netAmountAfterDiscount: roundToDecimals(result.netAmountAfterDiscount),
+        returnSubtotal: roundToDecimals(result.returnSubtotal),
+        returnTax: roundToDecimals(result.returnTax),
+        returnTotal: roundToDecimals(result.returnTotal)
     };
     // Only include tax fields and taxSummary if taxable
     if (isTaxable) {

package/package.json

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