shareneus 1.5.25 → 1.5.27

package/dist/accounting/payment-receive/payment-pdf.service.js

@@ -191,14 +191,21 @@ class ReceiptPDFService {
                 data = data + Ids[i];
             }
         }
-        if (!tr_utils_1.TrUtils.IsEmpty(data)) {
+        if (!tr_utils_1.TrUtils.IsEmpty(data) || RefundAmt > 0) {
             if (IsRepairOrder) {
                 toward = 'RO - ' + data;
             }
             else {
-                toward = 'INVOICE - ' + data;
-                if (RefundAmt > 0) {
-                    toward += ', (refunded Rs.' + RefundAmt + ' )';
+                if (tr_utils_1.TrUtils.IsEmpty(data)) {
+                    if (RefundAmt > 0) {
+                        toward += '(refunded Rs.' + RefundAmt + ' )';
+                    }
+                }
+                else {
+                    toward = 'INVOICE - ' + data;
+                    if (RefundAmt > 0) {
+                        toward += ', (refunded Rs.' + RefundAmt + ' )';
+                    }
                 }
                 if (RemAmt > 0) {
                     toward += ', (remaining Rs.' + RemAmt + ' as advance)';

package/dist/index.d.ts

@@ -128,7 +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 { ApplyServicePriceListToProcedure, ApplyServicePriceListToOpcode, GetServicePriceForPriceList } from "./services/service-price-for-pricelist";
 export { IsNotNull, IsNull } from "./shared/util";
 export { GetAgeString, GetNumber } 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.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.ServiceHistoryPDFService = exports.SalesTotalCalculationsWithDecimals = exports.GetNumber = 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;
+exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.ServiceHistoryPDFService = exports.SalesTotalCalculationsWithDecimals = exports.GetNumber = exports.GetAgeString = exports.IsNull = exports.IsNotNull = exports.GetServicePriceForPriceList = 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");
@@ -266,6 +266,7 @@ Object.defineProperty(exports, "CalcItemFinalSalePrice", { enumerable: true, get
 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; } });
+Object.defineProperty(exports, "GetServicePriceForPriceList", { enumerable: true, get: function () { return service_price_for_pricelist_1.GetServicePriceForPriceList; } });
 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/services/service-price-for-pricelist.d.ts

@@ -22,4 +22,9 @@ type PriceListDoc = {
 };
 export declare function ApplyServicePriceListToProcedure(procedure: any, priceList: PriceListDoc | null, quantity?: number): any;
 export declare function ApplyServicePriceListToOpcode(opcode: any, priceList: PriceListDoc | null, quantity?: number): any;
+/**
+ * Applies price list to Service with support for equipment-based pricing (FitPrices)
+ * Handles both simple services (healthcare) and equipment-based services (automotive, HVAC)
+ */
+export declare function GetServicePriceForPriceList(service: any, priceList: PriceListDoc | null, vehicle?: any, quantity?: number): any;
 export {};

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplyServicePriceListToProcedure = ApplyServicePriceListToProcedure;
 exports.ApplyServicePriceListToOpcode = ApplyServicePriceListToOpcode;
+exports.GetServicePriceForPriceList = GetServicePriceForPriceList;
 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"]);
@@ -233,3 +234,292 @@ function buildAppliedTierMeta(tier) {
         Disc: (0, util_1.IsNotNull)(tier.Disc) ? tier.Disc : null,
     };
 }
+/**
+ * Applies price list to Service with support for equipment-based pricing (FitPrices)
+ * Handles both simple services (healthcare) and equipment-based services (automotive, HVAC)
+ */
+function GetServicePriceForPriceList(service, priceList, vehicle = null, quantity = 1) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    if (!service || !priceList) {
+        return service;
+    }
+    const resolvedQty = Math.max(1, Number(quantity) || 1);
+    const warnings = [];
+    const priceListId = (_b = (_a = priceList === null || priceList === void 0 ? void 0 : priceList._id) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a);
+    // Step 1: Determine base pricing (equipment-specific or simple)
+    let basePrice = null;
+    let basePriceSource = "BASE";
+    let matchedFitPriceCost = null;
+    if (priceList.TType === "SALE" && service.Sale) {
+        // Check if equipment-based service (FitPriceCosts) or simple service (Price)
+        if (service.FitPriceCosts && service.FitPriceCosts.length > 0) {
+            // Equipment-based service - need vehicle information
+            if (!vehicle) {
+                warnings.push("Vehicle information required for equipment-based service pricing.");
+                service.PriceListWarnings = warnings;
+                return service;
+            }
+            // Find matching FitPriceCost for vehicle
+            matchedFitPriceCost = findMatchingFitPriceCost(service.FitPriceCosts, vehicle);
+            if (!matchedFitPriceCost || !matchedFitPriceCost.Sale) {
+                warnings.push(`No pricing found for ${vehicle.Make || 'Unknown'} ${vehicle.Model || ''}`);
+                service.PriceListWarnings = warnings;
+                return service;
+            }
+            basePrice = matchedFitPriceCost.Sale;
+            basePriceSource = "FIT";
+        }
+        else if ((0, util_1.IsNotNull)(service.Sale.Price)) {
+            // Simple service - single base price
+            basePrice = {
+                Price: service.Sale.Price,
+                FSale: service.Sale.FSale,
+                BHours: service.Sale.BHours,
+                Dur: service.Sale.Dur,
+            };
+            basePriceSource = "BASE";
+        }
+        else {
+            warnings.push("No base pricing configured for service.");
+            service.PriceListWarnings = warnings;
+            return service;
+        }
+        // Step 2: Check for item-specific price list overrides (SalePrices)
+        // For equipment services: Look inside matched FitPriceCost
+        // For simple services: Look at root level
+        let salePriceOverride = null;
+        if (priceListId) {
+            if (matchedFitPriceCost && Array.isArray((_c = matchedFitPriceCost.Sale) === null || _c === void 0 ? void 0 : _c.SalePrices)) {
+                // Equipment service - check nested SalePrices inside matched FitPriceCost
+                salePriceOverride = matchedFitPriceCost.Sale.SalePrices.find((sp) => (sp === null || sp === void 0 ? void 0 : sp.PrListId) && sp.PrListId.toString() === priceListId);
+            }
+            else if (Array.isArray(service.SalePrices)) {
+                // Simple service - check root-level SalePrices
+                salePriceOverride = service.SalePrices.find((sp) => (sp === null || sp === void 0 ? void 0 : sp.PrListId) && sp.PrListId.toString() === priceListId);
+            }
+        }
+        if (salePriceOverride) {
+            // Apply item-specific override
+            const originalPrice = basePrice.Price;
+            service.Sale.PriceBeforePriceList = originalPrice;
+            // Check for quantity tiers in override
+            const tierList = (_d = salePriceOverride.QtyTiers) !== null && _d !== void 0 ? _d : priceList.QtyTiers;
+            const tier = resolveTier(resolvedQty, tierList);
+            if (tier) {
+                // Apply tier pricing
+                const tierValue = applyTierAdjustmentForSale(basePrice, tier);
+                service.Sale.Price = applyRounding(priceList, tierValue);
+                service.Sale.AppliedPriceListId = (_e = priceList._id) !== null && _e !== void 0 ? _e : null;
+                service.Sale.AppliedPriceTier = buildAppliedTierMeta(tier);
+                service.Sale.AppliedPriceCalc = "TIER_OVERRIDE";
+                service.Sale.PriceSource = basePriceSource;
+            }
+            else if ((0, util_1.IsNotNull)(salePriceOverride.Price)) {
+                // Fixed price override
+                service.Sale.Price = applyRounding(priceList, salePriceOverride.Price);
+                service.Sale.AppliedPriceListId = (_f = priceList._id) !== null && _f !== void 0 ? _f : null;
+                service.Sale.AppliedPriceCalc = "FIXED_OVERRIDE";
+                service.Sale.PriceSource = basePriceSource;
+            }
+            else if ((0, util_1.IsNotNull)(salePriceOverride.Disc)) {
+                // Percentage discount override
+                const discountedPrice = (0, math_operations_1.CalcDiscPrice)(originalPrice, salePriceOverride.Disc, false);
+                service.Sale.Price = applyRounding(priceList, discountedPrice);
+                service.Sale.AppliedPriceListId = (_g = priceList._id) !== null && _g !== void 0 ? _g : null;
+                service.Sale.AppliedPriceCalc = "DISCOUNT_OVERRIDE";
+                service.Sale.PriceSource = basePriceSource;
+            }
+            // Apply other override fields
+            if ((0, util_1.IsNotNull)(salePriceOverride.BHours)) {
+                service.Sale.BHours = salePriceOverride.BHours;
+            }
+            if ((0, util_1.IsNotNull)(salePriceOverride.Dur)) {
+                service.Sale.Dur = salePriceOverride.Dur;
+            }
+            if ((0, util_1.IsNotNull)(salePriceOverride.FSale)) {
+                service.Sale.FSale = salePriceOverride.FSale;
+            }
+        }
+        else {
+            // Step 3: Apply global price list calculation
+            const originalPrice = basePrice.Price;
+            service.Sale.PriceBeforePriceList = originalPrice;
+            const tier = resolveTier(resolvedQty, priceList.QtyTiers);
+            if (tier) {
+                const tierValue = applyTierAdjustmentForSale(basePrice, tier);
+                service.Sale.Price = applyRounding(priceList, tierValue);
+                service.Sale.AppliedPriceListId = (_h = priceList._id) !== null && _h !== void 0 ? _h : null;
+                service.Sale.AppliedPriceTier = buildAppliedTierMeta(tier);
+                service.Sale.AppliedPriceCalc = "TIER";
+                service.Sale.PriceSource = basePriceSource;
+            }
+            else {
+                // Apply global calculation
+                const { value, tierWarnings, appliedCalc } = evaluatePriceBlock(originalPrice, service.Pur, priceList, resolvedQty);
+                if (value != null) {
+                    service.Sale.Price = value;
+                    service.Sale.AppliedPriceListId = (_j = priceList._id) !== null && _j !== void 0 ? _j : null;
+                    service.Sale.AppliedPriceCalc = appliedCalc !== null && appliedCalc !== void 0 ? appliedCalc : "GLOBAL";
+                    service.Sale.PriceSource = basePriceSource;
+                }
+                if (tierWarnings.length > 0) {
+                    warnings.push(...tierWarnings);
+                }
+            }
+        }
+    }
+    // Step 4: Handle Purchase pricing (similar logic for Pur side)
+    if (priceList.TType === "PUR" && service.Pur) {
+        let baseCost = null;
+        let baseCostSource = "BASE";
+        if (service.FitPriceCosts && service.FitPriceCosts.length > 0) {
+            // Equipment-based service - need vehicle information
+            if (!vehicle) {
+                warnings.push("Vehicle information required for equipment-based service costing.");
+                service.PriceListWarnings = warnings;
+                return service;
+            }
+            // Reuse the matchedFitPriceCost from Sale section if available
+            const fitPriceCostEntry = matchedFitPriceCost || findMatchingFitPriceCost(service.FitPriceCosts, vehicle);
+            if (!fitPriceCostEntry || !fitPriceCostEntry.Pur) {
+                warnings.push(`No costing found for ${vehicle.Make || 'Unknown'} ${vehicle.Model || ''}`);
+                service.PriceListWarnings = warnings;
+                return service;
+            }
+            baseCost = fitPriceCostEntry.Pur;
+            baseCostSource = "FIT";
+            matchedFitPriceCost = fitPriceCostEntry; // Store for later use
+        }
+        else if ((0, util_1.IsNotNull)(service.Pur.Cost)) {
+            baseCost = {
+                Cost: service.Pur.Cost,
+                FCost: service.Pur.FCost,
+            };
+            baseCostSource = "BASE";
+        }
+        if (baseCost) {
+            // Check for purchase cost overrides
+            // For equipment services: Look inside matched FitPriceCost
+            // For simple services: Look at root level
+            let purchaseCostOverride = null;
+            if (priceListId) {
+                if (matchedFitPriceCost && Array.isArray((_k = matchedFitPriceCost.Pur) === null || _k === void 0 ? void 0 : _k.PurchaseCosts)) {
+                    // Equipment service - check nested PurchaseCosts inside matched FitPriceCost
+                    purchaseCostOverride = matchedFitPriceCost.Pur.PurchaseCosts.find((pc) => (pc === null || pc === void 0 ? void 0 : pc.PrListId) && pc.PrListId.toString() === priceListId);
+                }
+                else if (Array.isArray(service.PurchaseCosts)) {
+                    // Simple service - check root-level PurchaseCosts
+                    purchaseCostOverride = service.PurchaseCosts.find((pc) => (pc === null || pc === void 0 ? void 0 : pc.PrListId) && pc.PrListId.toString() === priceListId);
+                }
+            }
+            const originalCost = baseCost.Cost;
+            service.Pur.CostBeforePriceList = originalCost;
+            if (purchaseCostOverride) {
+                if ((0, util_1.IsNotNull)(purchaseCostOverride.Cost)) {
+                    service.Pur.Cost = applyRounding(priceList, purchaseCostOverride.Cost);
+                    service.Pur.AppliedPriceListId = (_l = priceList._id) !== null && _l !== void 0 ? _l : null;
+                    service.Pur.CostSource = baseCostSource;
+                }
+                else if ((0, util_1.IsNotNull)(purchaseCostOverride.Disc)) {
+                    const discountedCost = (0, math_operations_1.CalcDiscPrice)(originalCost, purchaseCostOverride.Disc, false);
+                    service.Pur.Cost = applyRounding(priceList, discountedCost);
+                    service.Pur.AppliedPriceListId = (_m = priceList._id) !== null && _m !== void 0 ? _m : null;
+                    service.Pur.CostSource = baseCostSource;
+                }
+            }
+            else {
+                const { value, tierWarnings } = evaluatePriceBlock(originalCost, service.Pur, priceList, resolvedQty);
+                if (value != null) {
+                    service.Pur.Cost = value;
+                    service.Pur.AppliedPriceListId = (_o = priceList._id) !== null && _o !== void 0 ? _o : null;
+                    service.Pur.CostSource = baseCostSource;
+                }
+                if (tierWarnings.length > 0) {
+                    warnings.push(...tierWarnings);
+                }
+            }
+        }
+    }
+    if (warnings.length > 0) {
+        service.PriceListWarnings = warnings;
+    }
+    return service;
+}
+/**
+ * Finds the matching FitPriceCost entry for a given vehicle
+ * Tries most specific match first (Make + Model + Variant), then progressively less specific
+ */
+function findMatchingFitPriceCost(fitPriceCosts, vehicle) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    if (!Array.isArray(fitPriceCosts) || fitPriceCosts.length === 0 || !vehicle) {
+        return null;
+    }
+    const vehicleMakeId = (_b = (_a = vehicle.Make_Id) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a);
+    const vehicleModelId = (_d = (_c = vehicle.Model_Id) === null || _c === void 0 ? void 0 : _c.toString) === null || _d === void 0 ? void 0 : _d.call(_c);
+    const vehicleVarId = ((_f = (_e = vehicle.Var_Id) === null || _e === void 0 ? void 0 : _e.toString) === null || _f === void 0 ? void 0 : _f.call(_e)) || ((_h = (_g = vehicle.Variant_Id) === null || _g === void 0 ? void 0 : _g.toString) === null || _h === void 0 ? void 0 : _h.call(_g));
+    // Try Make + Model + Variant
+    if (vehicleMakeId && vehicleModelId && vehicleVarId) {
+        const match = fitPriceCosts.find((fpc) => {
+            if (!Array.isArray(fpc.Fit) || fpc.Fit.length === 0)
+                return false;
+            return fpc.Fit.some((fit) => {
+                var _a, _b, _c, _d, _e, _f;
+                return ((_b = (_a = fit.Make_Id) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a)) === vehicleMakeId &&
+                    ((_d = (_c = fit.Model_Id) === null || _c === void 0 ? void 0 : _c.toString) === null || _d === void 0 ? void 0 : _d.call(_c)) === vehicleModelId &&
+                    ((_f = (_e = fit.Var_Id) === null || _e === void 0 ? void 0 : _e.toString) === null || _f === void 0 ? void 0 : _f.call(_e)) === vehicleVarId;
+            });
+        });
+        if (match)
+            return match;
+    }
+    // Try Make + Model
+    if (vehicleMakeId && vehicleModelId) {
+        const match = fitPriceCosts.find((fpc) => {
+            if (!Array.isArray(fpc.Fit) || fpc.Fit.length === 0)
+                return false;
+            return fpc.Fit.some((fit) => {
+                var _a, _b, _c, _d;
+                return ((_b = (_a = fit.Make_Id) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a)) === vehicleMakeId &&
+                    ((_d = (_c = fit.Model_Id) === null || _c === void 0 ? void 0 : _c.toString) === null || _d === void 0 ? void 0 : _d.call(_c)) === vehicleModelId &&
+                    !fit.Var_Id;
+            });
+        });
+        if (match)
+            return match;
+    }
+    // Try Make only
+    if (vehicleMakeId) {
+        const match = fitPriceCosts.find((fpc) => {
+            if (!Array.isArray(fpc.Fit) || fpc.Fit.length === 0)
+                return false;
+            return fpc.Fit.some((fit) => {
+                var _a, _b;
+                return ((_b = (_a = fit.Make_Id) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a)) === vehicleMakeId &&
+                    !fit.Model_Id;
+            });
+        });
+        if (match)
+            return match;
+    }
+    // Try generic (no Make/Model/Variant specified = applies to all)
+    const genericMatch = fitPriceCosts.find((fpc) => {
+        if (!Array.isArray(fpc.Fit) || fpc.Fit.length === 0)
+            return true; // No fit = applies to all
+        return fpc.Fit.some((fit) => !fit.Make_Id && !fit.Model_Id && !fit.Var_Id);
+    });
+    return genericMatch || null;
+}
+/**
+ * Applies tier adjustment to sale pricing
+ */
+function applyTierAdjustmentForSale(baseSale, tier) {
+    var _a, _b, _c, _d;
+    if ((0, util_1.IsNotNull)(tier.Price)) {
+        return (_a = tier.Price) !== null && _a !== void 0 ? _a : null;
+    }
+    if ((0, util_1.IsNotNull)(tier.Disc)) {
+        const basePrice = (_b = baseSale === null || baseSale === void 0 ? void 0 : baseSale.Price) !== null && _b !== void 0 ? _b : 0;
+        return (0, math_operations_1.CalcDiscPrice)(basePrice, (_c = tier.Disc) !== null && _c !== void 0 ? _c : 0, false);
+    }
+    return (_d = baseSale === null || baseSale === void 0 ? void 0 : baseSale.Price) !== null && _d !== void 0 ? _d : null;
+}

package/package.json

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