shareneus 1.5.16 → 1.5.18

package/dist/index.d.ts

@@ -128,6 +128,7 @@ export { SalesReceivePrintService } from "./sales-receive/sales-receive-print.se
 export { SalesReceiveTotalsService } from "./sales-receive/sales-receive-totals.service";
 export { GetItemPriceForPriceList } from "./inventory/items/item-price-for-pricelist";
 export { CalcItemFinalSalePrice } from "./inventory/items/item-price-for-pricelist";
+export { ApplyServicePriceListToProcedure, ApplyServicePriceListToOpcode } from "./services/service-price-for-pricelist";
 export { IsNotNull, IsNull } from "./shared/util";
 export { GetAgeString } from "./shared/util";
 export { SalesTotalCalculationsWithDecimals } from "./sales-receive/sales-total-calculation";

package/dist/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebitNotePdfService = exports.DCWithoutPricePdfService = exports.DCLandscapeWithoutPricePdfService = exports.DCLandscapePdfService = exports.CustomerBalancesService = exports.SalesByCustomerPDFService = exports.CustWiseSalesDetailsService = exports.CreditNoteTotalsService = exports.CreditNotePdfService = exports.ConsultationPDFService = exports.ConsultationFullPrintService = exports.ConsultationFeeReceiptPrintService = exports.CNPrintService = exports.ChecklistsPDFService = exports.CheckListPrintService = exports.CategoryWiseItemPDFService = exports.SalesReceiptprintService = exports.AppointmentTotalsService = exports.AnalysisPDFService = exports.VenBalanceXlsxFileService = exports.TallySalesImportXlsxFileService = exports.StockXlsxFileService = exports.IssueSparesXlsxFileService = exports.ScheduledDrugXlsxFileService = exports.ScheduledDrugSummaryXlsxFileService = exports.SalesByServiceSummaryXlsxFileService = exports.SummaryXlsxFileService = exports.ServiceAdvisorWisePartXlsxFileService = exports.ServiceAdvisorWiseLaborXlsxFileService = exports.RepairOrdersXlsxFileService = exports.PaymentsMadeXlsxFileService = exports.PaymentReceiveXlsxFileService = exports.OperatorWiseSummaryXlsxFileService = exports.OperatorWiseDetailsXlsxFileService = exports.ManfWiseSalesXlsxFileService = exports.ItemsWiseSalesXlsxFileService = exports.ItemWiseMOSummaryXlsxFileService = exports.ItemWiseMODetailsXlsxFileService = exports.ItemWiseDoctorSaleXlsxFileService = exports.InvoicesWiseXlsxFileService = exports.InsuranceExpireXlsxFileService = exports.GSTR2ExcelService = exports.GSTR1ExcelService = exports.GSTROXlsxFileService = exports.ExpiringDrugsXlsxFileService = exports.SalesByCustomerXlsxFileService = exports.CustWiseSalesXlsxFileService = exports.CustBalanceXlsxFileService = exports.CategoryWiseItemXlsxFileService = exports.AnalysisXlsxFileService = void 0;
 exports.SharedPDFService = exports.SharedInvoiceprintService = exports.WOPrintService = exports.ScheduledDrugSummaryPDFService = exports.ScheduledDrugPDFService = exports.SalesTotalsService = exports.SaleReceiptPrintService = exports.SalesReceiptpdfService = exports.SalesPrintService = exports.SalesPdfService = exports.SalesByServiceSummaryPDF = exports.ROTotalsService = exports.ROPrintService = exports.RoprintService = exports.RepairOrdersReportsPDFService = exports.ReorderPointPDFService = exports.ReceiptPrintService = exports.PurchaseOrderPDFService = exports.PurchaseOrderTotalsService = exports.PurchaseOrderPrintService = exports.PosReceiptPrintService = exports.POTotalsService = exports.PaymentsReportPDFService = exports.ReceiptPDFService = exports.PackShipPrintService = exports.PackShipPDFService = exports.OperatorWiseSalesSummaryPDF = exports.OperatorWiseSalesDetailsPDF = exports.MaterialOutprintService = exports.MeetingPdfService = exports.ManfWiseSalesService = exports.ItemWiseSalesPDFService = exports.ItemWiseMOSummaryPDF = exports.ItemWiseMODetailsPDF = exports.ItemWiseDoctorSalePDFService = exports.ItemDetaisPdf = exports.IssuePartsprintService = exports.InvoiceTotalsService = exports.InvoiceLandscapePdfService = exports.InvPrintService = exports.InvoiceprintService = exports.InsuranceExpirePDF = exports.ExpiringDrugPDFService = exports.EstPrintService = exports.EquipmentDesignPdf = exports.DeliveryChallanTotalsService = exports.DeliveryChallanPrintService = exports.DeliveryChallanPdfService = exports.DebitNoteTotalsService = exports.DebitNotePrintService = void 0;
-exports.ServiceHistoryPDFService = exports.SalesTotalCalculationsWithDecimals = exports.GetAgeString = exports.IsNull = exports.IsNotNull = exports.CalcItemFinalSalePrice = exports.GetItemPriceForPriceList = exports.SalesReceiveTotalsService = exports.SalesReceivePrintService = exports.SalesReceivePdfService = exports.AdjustmentDrugPDFService = exports.HSNSummaryPDFService = exports.HSNSummaryExcelService = exports.ItemBarCodeLabelPdf = exports.NextServiceDatePDFService = exports.NextServiceDateXlsxFileService = exports.ConsultationLetterHeadPDFService = exports.InvoiceLetterheadPdfService = exports.HCInvoiceprintService = exports.InvoicePortraitPrintService = exports.MyDate = exports.TrUtils = exports.VendorDebitNoteTotalsService = exports.VendorDebitNotePrintService = exports.VendorDebitNotePdfService = exports.VendorCreditNoteTotalsService = exports.VendorCreditNotePrintService = exports.VendorCreditNotePDFService = exports.VendorBalancesService = exports.TransferOrderPrintService = exports.TechnicianPrintService = exports.TechnicianpdfService = exports.TaskReportsPDfService = exports.TaskPDfService = exports.PrintSharedService = void 0;
+exports.ServiceHistoryPDFService = exports.SalesTotalCalculationsWithDecimals = exports.GetAgeString = exports.IsNull = exports.IsNotNull = exports.ApplyServicePriceListToOpcode = exports.ApplyServicePriceListToProcedure = exports.CalcItemFinalSalePrice = exports.GetItemPriceForPriceList = exports.SalesReceiveTotalsService = exports.SalesReceivePrintService = exports.SalesReceivePdfService = exports.AdjustmentDrugPDFService = exports.HSNSummaryPDFService = exports.HSNSummaryExcelService = exports.ItemBarCodeLabelPdf = exports.NextServiceDatePDFService = exports.NextServiceDateXlsxFileService = exports.ConsultationLetterHeadPDFService = exports.InvoiceLetterheadPdfService = exports.HCInvoiceprintService = exports.InvoicePortraitPrintService = exports.MyDate = exports.TrUtils = exports.VendorDebitNoteTotalsService = exports.VendorDebitNotePrintService = exports.VendorDebitNotePdfService = exports.VendorCreditNoteTotalsService = exports.VendorCreditNotePrintService = exports.VendorCreditNotePDFService = exports.VendorBalancesService = exports.TransferOrderPrintService = exports.TechnicianPrintService = exports.TechnicianpdfService = exports.TaskReportsPDfService = exports.TaskPDfService = exports.PrintSharedService = void 0;
 var analysis_excel_service_1 = require("./accounting/invoice/reports/excel/analysis-excel.service");
 Object.defineProperty(exports, "AnalysisXlsxFileService", { enumerable: true, get: function () { return analysis_excel_service_1.AnalysisXlsxFileService; } });
 var category_wise_item_excel_service_1 = require("./accounting/invoice/reports/excel/category-wise-item-excel.service");
@@ -263,6 +263,9 @@ var item_price_for_pricelist_1 = require("./inventory/items/item-price-for-price
 Object.defineProperty(exports, "GetItemPriceForPriceList", { enumerable: true, get: function () { return item_price_for_pricelist_1.GetItemPriceForPriceList; } });
 var item_price_for_pricelist_2 = require("./inventory/items/item-price-for-pricelist");
 Object.defineProperty(exports, "CalcItemFinalSalePrice", { enumerable: true, get: function () { return item_price_for_pricelist_2.CalcItemFinalSalePrice; } });
+var service_price_for_pricelist_1 = require("./services/service-price-for-pricelist");
+Object.defineProperty(exports, "ApplyServicePriceListToProcedure", { enumerable: true, get: function () { return service_price_for_pricelist_1.ApplyServicePriceListToProcedure; } });
+Object.defineProperty(exports, "ApplyServicePriceListToOpcode", { enumerable: true, get: function () { return service_price_for_pricelist_1.ApplyServicePriceListToOpcode; } });
 var util_1 = require("./shared/util");
 Object.defineProperty(exports, "IsNotNull", { enumerable: true, get: function () { return util_1.IsNotNull; } });
 Object.defineProperty(exports, "IsNull", { enumerable: true, get: function () { return util_1.IsNull; } });

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, pricingContext?: any): 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, pricingContext = {}) {
+    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-receive/sales-total-calculation.js

@@ -17,18 +17,26 @@ 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 nonReturnSubTotal = 0;
+    let returnTax = 0;
+    let nonReturnTax = 0;
+    let returnTotal = 0;
+    let nonReturnTotal = 0;
+    let returnTotalDiscount = 0;
     // Tax breakdown totals - only calculate if taxable
     let totalSGST = 0;
     let totalCGST = 0;
@@ -44,18 +52,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 (explicitly check for 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, itemUnAmt);
+            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 (Ret is false, undefined, or null - all treated as normal items)
+            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 +112,14 @@ 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);
+    nonReturnSubTotal = subtotal;
+    nonReturnTax = totalTax;
+    // Step 2: Add tax if taxable
+    nonReturnTotal = isTaxable ? (0, math_operations_1.Add)((0, math_operations_1.Subtract)(subtotal, totalDiscount), totalTax) : (0, math_operations_1.Subtract)(subtotal, totalDiscount);
+    // 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 +131,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 = 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 +151,13 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         subtotalOnLabor,
         totalDiscountOnItems,
         totalDiscountOnLabor,
-        netAmountAfterDiscount
+        netAmountAfterDiscount,
+        returnSubtotal,
+        returnTax,
+        returnTotal,
+        nonReturnSubTotal,
+        nonReturnTax,
+        nonReturnTotal
     };
     // Only include tax fields and taxSummary if taxable
     if (isTaxable) {
@@ -126,7 +174,9 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         result.totalCGSTOnLabor = totalCGSTOnLabor;
         result.totalIGSTOnLabor = totalIGSTOnLabor;
         // Calculate tax summary only if taxable and taxCodes provided
-        result.itemsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(safeItems, safeTaxCodes) : [];
+        // Filter out items where Ret is true (only include non-return items)
+        const nonReturnItems = safeItems.filter((item) => item.Ret !== true);
+        result.itemsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(nonReturnItems, safeTaxCodes) : [];
         result.opsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(safeOps, safeTaxCodes) : [];
     }
     return result;
@@ -149,7 +199,13 @@ 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),
+        nonReturnSubTotal: roundToDecimals(result.nonReturnSubTotal),
+        nonReturnTax: roundToDecimals(result.nonReturnTax),
+        nonReturnTotal: roundToDecimals(result.nonReturnTotal)
     };
     // Only include tax fields and taxSummary if taxable
     if (isTaxable) {

package/dist/services/service-price-for-pricelist.d.ts

@@ -0,0 +1,25 @@
+type QuantityTier = {
+    MinQty?: number | null;
+    Price?: number | null;
+    Disc?: number | null;
+};
+type PriceListDoc = {
+    _id?: any;
+    TType: "SALE" | "PUR";
+    PrCalc: "FIXED" | "DISC" | "FORMULA";
+    BasedOn?: "SP" | "PC" | "PCBD" | "PCAD";
+    Fixed?: {
+        Price?: number | null;
+    };
+    CalcDisc?: {
+        Mark?: boolean;
+        Perc?: number | null;
+    };
+    Round?: string | null;
+    Deci?: number | null;
+    QtyTiers?: QuantityTier[];
+    Currency?: string | null;
+};
+export declare function ApplyServicePriceListToProcedure(procedure: any, priceList: PriceListDoc | null, quantity?: number): any;
+export declare function ApplyServicePriceListToOpcode(opcode: any, priceList: PriceListDoc | null, quantity?: number): any;
+export {};

package/dist/services/service-price-for-pricelist.js

@@ -0,0 +1,235 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApplyServicePriceListToProcedure = ApplyServicePriceListToProcedure;
+exports.ApplyServicePriceListToOpcode = ApplyServicePriceListToOpcode;
+const math_operations_1 = require("../shared/math-operations");
+const util_1 = require("../shared/util");
+const ROUND_VALUES = new Set(["-1", "0", "0.99", "0.50", "0.49", "Dec"]);
+function ApplyServicePriceListToProcedure(procedure, priceList, quantity = 1) {
+    var _a, _b;
+    if (!procedure || !priceList) {
+        return procedure;
+    }
+    const resolvedQty = Math.max(1, Number(quantity) || 1);
+    const warnings = [];
+    if (priceList.TType === "SALE" && procedure.Sale) {
+        const basePrice = (0, util_1.IsNotNull)(procedure.Sale.Price) ? procedure.Sale.Price : null;
+        const { value, tierWarnings, appliedTier, appliedCalc } = evaluatePriceBlock(basePrice, procedure.Pur, priceList, resolvedQty);
+        procedure.Sale.PriceBeforePriceList = basePrice;
+        if (value != null) {
+            procedure.Sale.Price = value;
+            procedure.Sale.AppliedPriceListId = (_a = priceList._id) !== null && _a !== void 0 ? _a : null;
+            procedure.Sale.AppliedPriceTier = appliedTier !== null && appliedTier !== void 0 ? appliedTier : undefined;
+            procedure.Sale.AppliedPriceCalc = appliedCalc !== null && appliedCalc !== void 0 ? appliedCalc : undefined;
+        }
+        if (tierWarnings.length > 0) {
+            warnings.push(...tierWarnings);
+        }
+    }
+    if (priceList.TType === "PUR" && procedure.Pur) {
+        const baseCost = (0, util_1.IsNotNull)(procedure.Pur.Cost) ? procedure.Pur.Cost : null;
+        const { value, tierWarnings, appliedTier, appliedCalc } = evaluatePriceBlock(baseCost, procedure.Pur, priceList, resolvedQty);
+        procedure.Pur.CostBeforePriceList = baseCost;
+        if (value != null) {
+            procedure.Pur.Cost = value;
+            procedure.Pur.AppliedPriceListId = (_b = priceList._id) !== null && _b !== void 0 ? _b : null;
+            procedure.Pur.AppliedPriceTier = appliedTier !== null && appliedTier !== void 0 ? appliedTier : undefined;
+            procedure.Pur.AppliedPriceCalc = appliedCalc !== null && appliedCalc !== void 0 ? appliedCalc : undefined;
+        }
+        if (tierWarnings.length > 0) {
+            warnings.push(...tierWarnings);
+        }
+    }
+    if (warnings.length > 0) {
+        procedure.PriceListWarnings = warnings;
+    }
+    return procedure;
+}
+function ApplyServicePriceListToOpcode(opcode, priceList, quantity = 1) {
+    if (!opcode || !priceList) {
+        return opcode;
+    }
+    const resolvedQty = Math.max(1, Number(quantity) || 1);
+    const warnings = [];
+    if (Array.isArray(opcode.Prices) && opcode.Prices.length > 0) {
+        opcode.Prices = opcode.Prices.map((pricing) => {
+            var _a, _b;
+            const cloned = Object.assign({}, pricing);
+            if (cloned.Sale) {
+                cloned.Sale = Object.assign({}, cloned.Sale);
+            }
+            if (cloned.Pur) {
+                cloned.Pur = Object.assign({}, cloned.Pur);
+            }
+            if (priceList.TType === "SALE" &&
+                cloned.Sale &&
+                (!cloned.PS || cloned.PS === "S" || cloned.PS === "SP")) {
+                const basePrice = (0, util_1.IsNotNull)(cloned.Sale.Price) ? cloned.Sale.Price : null;
+                const { value, tierWarnings, appliedTier, appliedCalc } = evaluatePriceBlock(basePrice, cloned.Pur, priceList, resolvedQty);
+                cloned.Sale.PriceBeforePriceList = basePrice;
+                if (value != null) {
+                    cloned.Sale.Price = value;
+                    cloned.Sale.AppliedPriceListId = (_a = priceList._id) !== null && _a !== void 0 ? _a : null;
+                    cloned.Sale.AppliedPriceTier = appliedTier !== null && appliedTier !== void 0 ? appliedTier : undefined;
+                    cloned.Sale.AppliedPriceCalc = appliedCalc !== null && appliedCalc !== void 0 ? appliedCalc : undefined;
+                }
+                if (tierWarnings.length > 0) {
+                    warnings.push(...tierWarnings);
+                }
+            }
+            if (priceList.TType === "PUR" &&
+                cloned.Pur &&
+                (!cloned.PS || cloned.PS === "P" || cloned.PS === "SP")) {
+                const baseCost = (0, util_1.IsNotNull)(cloned.Pur.Cost) ? cloned.Pur.Cost : null;
+                const { value, tierWarnings, appliedTier, appliedCalc } = evaluatePriceBlock(baseCost, cloned.Pur, priceList, resolvedQty);
+                cloned.Pur.CostBeforePriceList = baseCost;
+                if (value != null) {
+                    cloned.Pur.Cost = value;
+                    cloned.Pur.AppliedPriceListId = (_b = priceList._id) !== null && _b !== void 0 ? _b : null;
+                    cloned.Pur.AppliedPriceTier = appliedTier !== null && appliedTier !== void 0 ? appliedTier : undefined;
+                    cloned.Pur.AppliedPriceCalc = appliedCalc !== null && appliedCalc !== void 0 ? appliedCalc : undefined;
+                }
+                if (tierWarnings.length > 0) {
+                    warnings.push(...tierWarnings);
+                }
+            }
+            return cloned;
+        });
+    }
+    if (warnings.length > 0) {
+        opcode.PriceListWarnings = warnings;
+    }
+    return opcode;
+}
+function evaluatePriceBlock(baseValue, purchaseBlock, priceList, quantity) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const warnings = [];
+    const tier = resolveTier(quantity, priceList.QtyTiers);
+    if (tier) {
+        const tierValue = applyTierAdjustment(baseValue, purchaseBlock, tier, priceList);
+        const rounded = applyRounding(priceList, tierValue);
+        return {
+            value: rounded,
+            tierWarnings: warnings,
+            appliedTier: buildAppliedTierMeta(tier),
+            appliedCalc: "TIER",
+        };
+    }
+    switch (priceList.PrCalc) {
+        case "FIXED": {
+            if ((0, util_1.IsNull)((_a = priceList.Fixed) === null || _a === void 0 ? void 0 : _a.Price)) {
+                warnings.push("Fixed price list selected but Fixed.Price is not configured.");
+                return { value: null, tierWarnings: warnings };
+            }
+            const rounded = applyRounding(priceList, (_c = (_b = priceList.Fixed) === null || _b === void 0 ? void 0 : _b.Price) !== null && _c !== void 0 ? _c : null);
+            return { value: rounded, tierWarnings: warnings, appliedCalc: "FIXED" };
+        }
+        case "DISC": {
+            const base = resolveDiscountBase(priceList, baseValue, purchaseBlock);
+            if (base == null) {
+                warnings.push("Discount price list requires a base value but none was available.");
+                return { value: null, tierWarnings: warnings };
+            }
+            const perc = (_e = (_d = priceList.CalcDisc) === null || _d === void 0 ? void 0 : _d.Perc) !== null && _e !== void 0 ? _e : 0;
+            const mark = (_g = (_f = priceList.CalcDisc) === null || _f === void 0 ? void 0 : _f.Mark) !== null && _g !== void 0 ? _g : false;
+            const price = (0, math_operations_1.CalcDiscPrice)(base, perc, mark);
+            return {
+                value: applyRounding(priceList, price),
+                tierWarnings: warnings,
+                appliedCalc: "DISCOUNT",
+            };
+        }
+        case "FORMULA": {
+            warnings.push("Formula-based service price lists are not implemented.");
+            return { value: null, tierWarnings: warnings };
+        }
+        default:
+            return { value: null, tierWarnings: warnings };
+    }
+}
+function applyTierAdjustment(baseValue, purchaseBlock, tier, priceList) {
+    var _a, _b;
+    if ((0, util_1.IsNotNull)(tier.Price)) {
+        return (_a = tier.Price) !== null && _a !== void 0 ? _a : null;
+    }
+    const targetBase = resolveDiscountBase(priceList, baseValue, purchaseBlock);
+    if (targetBase == null || (0, util_1.IsNull)(tier.Disc)) {
+        return baseValue;
+    }
+    return (0, math_operations_1.CalcDiscPrice)(targetBase, (_b = tier.Disc) !== null && _b !== void 0 ? _b : 0, false);
+}
+function resolveDiscountBase(priceList, baseValue, purchaseBlock) {
+    var _a;
+    const basedOn = (_a = priceList.BasedOn) !== null && _a !== void 0 ? _a : "SP";
+    switch (basedOn) {
+        case "SP":
+            return baseValue;
+        case "PC":
+        case "PCBD":
+        case "PCAD":
+            if (purchaseBlock && (0, util_1.IsNotNull)(purchaseBlock.Cost)) {
+                return purchaseBlock.Cost;
+            }
+            return null;
+        default:
+            return baseValue;
+    }
+}
+function applyRounding(priceList, value) {
+    var _a;
+    if (value == null) {
+        return null;
+    }
+    if (!priceList.Round || !ROUND_VALUES.has(priceList.Round)) {
+        return value;
+    }
+    switch (priceList.Round) {
+        case "-1":
+            return value;
+        case "0":
+            return Math.round(value);
+        case "0.99":
+            return Math.floor(value) + 0.99;
+        case "0.50":
+            return Math.round(value * 2) / 2;
+        case "0.49":
+            return Math.floor(value) + 0.49;
+        case "Dec":
+            if ((0, util_1.IsNotNull)(priceList.Deci)) {
+                const factor = Math.pow(10, (_a = priceList.Deci) !== null && _a !== void 0 ? _a : 0);
+                return Math.round(value * factor) / factor;
+            }
+            return value;
+        default:
+            return value;
+    }
+}
+function resolveTier(quantity, tiers) {
+    var _a;
+    if (!Array.isArray(tiers) || tiers.length === 0) {
+        return null;
+    }
+    const sorted = [...tiers]
+        .filter((tier) => (0, util_1.IsNotNull)(tier === null || tier === void 0 ? void 0 : tier.MinQty))
+        .sort((a, b) => { var _a, _b; return ((_a = a === null || a === void 0 ? void 0 : a.MinQty) !== null && _a !== void 0 ? _a : 0) - ((_b = b === null || b === void 0 ? void 0 : b.MinQty) !== null && _b !== void 0 ? _b : 0); });
+    let selected = null;
+    for (const tier of sorted) {
+        if (quantity >= ((_a = tier === null || tier === void 0 ? void 0 : tier.MinQty) !== null && _a !== void 0 ? _a : 0)) {
+            selected = tier !== null && tier !== void 0 ? tier : null;
+        }
+        else {
+            break;
+        }
+    }
+    return selected;
+}
+function buildAppliedTierMeta(tier) {
+    if (!tier) {
+        return undefined;
+    }
+    return {
+        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,
+    };
+}

package/package.json

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