shareneus 1.4.37 → 1.4.39

package/dist/index.d.ts

@@ -121,4 +121,5 @@ export { NextServiceDateXlsxFileService } from './excel-files/next-service-date-
 export { NextServiceDatePDFService } from './services/next-service-date-pdf.service';
 export { ItemBarCodeLabelPdf } from './inventory/items/item-bar-code-label-pdf';
 export { GetItemPriceForPriceList } from "./inventory/items/item-price-for-pricelist";
+export { CalcItemFinalSalePrice } from "./inventory/items/item-price-for-pricelist";
 export { IsNotNull, IsNull } from "./shared/util";

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.IsNull = exports.IsNotNull = exports.GetItemPriceForPriceList = 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.IsNull = exports.IsNotNull = exports.CalcItemFinalSalePrice = exports.GetItemPriceForPriceList = 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("./sales/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("./sales/reports/excel/category-wise-item-excel.service");
@@ -249,6 +249,8 @@ var item_bar_code_label_pdf_1 = require("./inventory/items/item-bar-code-label-p
 Object.defineProperty(exports, "ItemBarCodeLabelPdf", { enumerable: true, get: function () { return item_bar_code_label_pdf_1.ItemBarCodeLabelPdf; } });
 var item_price_for_pricelist_1 = require("./inventory/items/item-price-for-pricelist");
 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 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 +1,14 @@
-export declare function GetItemPriceForPriceList(item: any, priceList: any, includeMargin: boolean): any;
+export declare function GetItemPriceForPriceList(item: any, priceList: any, includeMargin?: boolean): any;
+/**
+ * Calculates the final sale price of an item after applying a discount and optional markup.
+ * Optionally includes margin calculation based on cost.
+ *
+ * @param price - The original price of the item.
+ * @param disc - The discount percentage to apply.
+ * @param priceList - The price list object containing rounding and other configurations.
+ * @param markup - Whether to apply markup instead of discount (default is false).
+ * @param includeMargin - Whether to include margin calculation in the result (default is false).
+ * @param cost - The cost of the item, used for margin calculation (default is 0).
+ * @returns The final price or an object containing margin and final price if includeMargin is true.
+ */
+export declare function CalcItemFinalSalePrice(price: number, disc: number, priceList: any, markup?: boolean, includeMargin?: boolean, cost?: number): any;

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

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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) {
+const tr_utils_1 = require("../../utils/tr-utils");
+function GetItemPriceForPriceList(item, priceList, includeMargin = false) {
+    var _a, _b;
     let salePricesByPriceListId = [];
+    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());
     }
@@ -13,15 +18,13 @@ function GetItemPriceForPriceList(item, priceList, includeMargin) {
         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)) {
-                const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(item.SalePrices[0].Price, item.SalePrices[0].Disc);
-                item.Sale.Price = ApplyRounding(calculatedPrice, priceList);
+                item.Sale.Price = CalcItemFinalSalePrice(item.SalePrices[0].Price, item.SalePrices[0].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.IsNull)(item.SalePrices[0].Price) && (0, util_1.IsNotNull)(item.SalePrices[0].Disc)) {
-                const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(item.Sale.Price, item.SalePrices[0].Disc);
-                item.Sale.Price = ApplyRounding(calculatedPrice, priceList);
+                item.Sale.Price = CalcItemFinalSalePrice(item.Sale.Price, item.SalePrices[0].Disc, priceList, markUp);
             }
             if (includeMargin) {
                 item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
@@ -35,17 +38,17 @@ function GetItemPriceForPriceList(item, priceList, includeMargin) {
                     batchSalePrice = item.SalePrices.filter((batch) => priceList._id.toString() == batch.PrListId.toString() && batch.BN == null);
                 }
                 element.MRP = element.Price;
+                console.log("Batch Sale Price:", batchSalePrice);
                 if (batchSalePrice.length > 0) {
                     if ((0, util_1.IsNotNull)(batchSalePrice[0].Price) && (0, util_1.IsNotNull)(batchSalePrice[0].Disc)) {
-                        const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(batchSalePrice[0].Price, batchSalePrice[0].Disc);
-                        element.Price = ApplyRounding(calculatedPrice, priceList);
+                        console.log("Price:", batchSalePrice[0].Price, "Discount:", batchSalePrice[0].Disc);
+                        element.Price = CalcItemFinalSalePrice(batchSalePrice[0].Price, batchSalePrice[0].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.IsNull)(batchSalePrice[0].Price) && (0, util_1.IsNotNull)(batchSalePrice[0].Disc)) {
-                        const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(element.Price, batchSalePrice[0].Disc);
-                        element.Price = ApplyRounding(calculatedPrice, priceList);
+                        element.Price = CalcItemFinalSalePrice(element.Price, batchSalePrice[0].Disc, priceList, markUp);
                     }
                 }
                 if (includeMargin) {
@@ -53,10 +56,36 @@ function GetItemPriceForPriceList(item, priceList, includeMargin) {
                 }
             }
         }
+        console.log("Item after applying price list:", tr_utils_1.TrUtils.Stringify(item));
         return item;
     }
     return CalculatePriceBasedOnPriceList(item, priceList, includeMargin);
 }
+/**
+ * Calculates the final sale price of an item after applying a discount and optional markup.
+ * Optionally includes margin calculation based on cost.
+ *
+ * @param price - The original price of the item.
+ * @param disc - The discount percentage to apply.
+ * @param priceList - The price list object containing rounding and other configurations.
+ * @param markup - Whether to apply markup instead of discount (default is false).
+ * @param includeMargin - Whether to include margin calculation in the result (default is false).
+ * @param cost - The cost of the item, used for margin calculation (default is 0).
+ * @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) {
@@ -67,8 +96,7 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
                 if (item.Track == 'TR' || item.Track == 'SN') {
                     item.Sale["MRP"] = item.Sale.Price;
                     if ((0, util_1.IsNotNull)(fixedDisc) && fixedDisc > 0) {
-                        const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(fixedPrice, fixedDisc);
-                        item.Sale.Price = ApplyRounding(calculatedPrice, priceList);
+                        item.Sale.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
                     }
                     else {
                         item.Sale.Price = ApplyRounding(fixedPrice, priceList);
@@ -81,8 +109,7 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
                     for (let batch of item.Batches) {
                         batch.MRP = batch.Price;
                         if ((0, util_1.IsNotNull)(fixedDisc) && fixedDisc > 0) {
-                            const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(fixedPrice, fixedDisc);
-                            batch.Price = ApplyRounding(calculatedPrice, priceList);
+                            batch.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
                         }
                         else {
                             batch.Price = ApplyRounding(fixedPrice, priceList);
@@ -101,8 +128,7 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
             if (priceList.BasedOn == "SP") {
                 if (item.Track == 'TR' || item.Track == 'SN') {
                     item.Sale["MRP"] = item.Sale.Price;
-                    const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(item.Sale.Price, discPerc, markUp);
-                    item.Sale.Price = ApplyRounding(calculatedPrice, priceList);
+                    item.Sale.Price = CalcItemFinalSalePrice(item.Sale.Price, discPerc, priceList, markUp);
                     if (includeMargin) {
                         item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
                     }
@@ -110,8 +136,7 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
                 else if (item.Track == 'BN') {
                     for (let batch of item.Batches) {
                         batch.MRP = batch.Price;
-                        const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(batch.Price, discPerc, markUp);
-                        batch.Price = ApplyRounding(calculatedPrice, priceList);
+                        batch.Price = CalcItemFinalSalePrice(batch.Price, discPerc, priceList, markUp);
                         if (includeMargin) {
                             batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
                         }
@@ -122,8 +147,7 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
                 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)) {
-                        const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(item.Pur.Cost, discPerc, markUp);
-                        item.Sale.Price = ApplyRounding(calculatedPrice, priceList);
+                        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);
                         }
@@ -133,8 +157,7 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
                     for (let batch of item.Batches) {
                         batch.MRP = batch.Price;
                         if ((0, util_1.IsNotNull)(batch.Cost)) {
-                            const calculatedPrice = (0, math_operations_1.CalcDiscPrice)(batch.Cost, discPerc, markUp);
-                            batch.Price = ApplyRounding(calculatedPrice, priceList);
+                            batch.Price = CalcItemFinalSalePrice(batch.Cost, discPerc, priceList, markUp);
                             if (includeMargin) {
                                 batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
                             }

package/dist/utils/tr-utils.d.ts

@@ -36,6 +36,5 @@ export declare class TrUtils {
     static IsItemFromEstimate(ItemId: string): boolean;
     static IsItemInsurance(PayBy: string): boolean;
     static GetMonthsArray(): any[];
-    static IsEqual(arg1: any, arg2: any): any;
     static GetDurationInHrsAndMins(duration: number): string;
 }

package/dist/utils/tr-utils.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrUtils = void 0;
 // import { HttpClient } from '@angular/common/http';
 const enums_1 = require("../enums/enums");
-var deepEqual = require('deep-equal');
 // import { LaborStatusEnum } from '../enums/enums';
 class TrUtils {
     static IsNull(Value) {
@@ -327,9 +326,6 @@ class TrUtils {
         MonthName[11] = 'Dec';
         return MonthName;
     }
-    static IsEqual(arg1, arg2) {
-        return deepEqual(arg1, arg2, true);
-    }
     static GetDurationInHrsAndMins(duration) {
         let Durationhr = Math.floor(duration / 60);
         let Durationmin = duration % 60;

package/package.json

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