shareneus 1.4.36 → 1.4.38

package/dist/{services → inventory/items}/item-price-for-pricelist.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetItemPriceForPriceList = GetItemPriceForPriceList;
-exports.CalculatePriceBasedOnPriceList = CalculatePriceBasedOnPriceList;
-exports.ApplyRounding = ApplyRounding;
-const math_operations_1 = require("../shared/math-operations");
-const util_1 = require("../shared/util");
-function GetItemPriceForPriceList(item, priceList, includeMargin) {
+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 = [];
+    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());
     }
@@ -15,15 +17,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);
@@ -39,15 +39,13 @@ function GetItemPriceForPriceList(item, priceList, includeMargin) {
                 element.MRP = element.Price;
                 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);
+                        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) {
@@ -59,15 +57,46 @@ function GetItemPriceForPriceList(item, priceList, includeMargin) {
     }
     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) {
         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;
-                    item.Sale.Price = ApplyRounding(fixedPrice, priceList);
+                    if ((0, util_1.IsNotNull)(fixedDisc) && fixedDisc > 0) {
+                        item.Sale.Price = CalcItemFinalSalePrice(fixedPrice, fixedDisc, priceList);
+                    }
+                    else {
+                        item.Sale.Price = ApplyRounding(fixedPrice, priceList);
+                    }
                     if (includeMargin) {
                         item.Margin = (0, math_operations_1.GetMarginValue)(item.Sale.Price, item.Pur.Cost);
                     }
@@ -75,7 +104,12 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin) {
                 else if (item.Track == 'BN') {
                     for (let batch of item.Batches) {
                         batch.MRP = batch.Price;
-                        batch.Price = ApplyRounding(fixedPrice, priceList);
+                        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);
                         }
@@ -90,8 +124,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);
                     }
@@ -99,8 +132,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);
                         }
@@ -111,8 +143,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);
                         }
@@ -122,8 +153,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/inventory/items/reports/excel/item-wise-mout-details.d.ts

@@ -0,0 +1,23 @@
+export declare class ItemWiseMODetailsXlsxFileService {
+    static wb: any;
+    static Row: any;
+    static MergeArray: any[];
+    static range: {
+        s: {
+            c: number;
+            r: number;
+        };
+        e: {
+            c: number;
+            r: number;
+        };
+    };
+    static ws: any;
+    static GetItemWiseMODetailsExcelData(MainData: any, searchValue: any, HeaderName: any): any;
+    static setHeadingInCell(HeaderName: any, searchValue: any): void;
+    static setInvoiceDetailsInCell(MainData: any): void;
+    static SetInvoiceDataInExcel(InvoiceInfo: any): void;
+    static ConvertToString(Text: any, IsString: any): any;
+    static SetDataInCell(Data: any, ColRange: number, RowNum: any): void;
+    static getcelltype(cell: any): any;
+}

package/dist/{excel-files → inventory/items/reports/excel}/item-wise-mout-details.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ItemWiseMODetailsXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));
-const my_date_1 = require("../utils/my-date");
-const tr_utils_1 = require("../utils/tr-utils");
+const tr_utils_1 = require("../../../../utils/tr-utils");
+const my_date_1 = require("../../../../utils/my-date");
 class ItemWiseMODetailsXlsxFileService {
     static GetItemWiseMODetailsExcelData(MainData, searchValue, HeaderName) {
         this.wb = {};

package/dist/inventory/items/reports/excel/item-wise-mout-summary.d.ts

@@ -0,0 +1,23 @@
+export declare class ItemWiseMOSummaryXlsxFileService {
+    static wb: any;
+    static Row: any;
+    static MergeArray: any[];
+    static range: {
+        s: {
+            c: number;
+            r: number;
+        };
+        e: {
+            c: number;
+            r: number;
+        };
+    };
+    static ws: any;
+    static GetItemWiseMOSummaryExcelData(MainData: any, searchValue: any, HeaderName: any): any;
+    static setHeadingInCell(HeaderName: any, searchValue: any): void;
+    static setInvoiceDetailsInCell(MainData: any): void;
+    static SetInvoiceDataInExcel(InvoiceInfo: any): void;
+    static ConvertToString(Text: any, IsString: any): any;
+    static SetDataInCell(Data: any, ColRange: number, RowNum: any): void;
+    static getcelltype(cell: any): any;
+}

package/dist/{excel-files → inventory/items/reports/excel}/item-wise-mout-summary.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ItemWiseMOSummaryXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));
-const my_date_1 = require("../utils/my-date");
-const tr_utils_1 = require("../utils/tr-utils");
+const my_date_1 = require("../../../../utils/my-date");
+const tr_utils_1 = require("../../../../utils/tr-utils");
 class ItemWiseMOSummaryXlsxFileService {
     static GetItemWiseMOSummaryExcelData(MainData, searchValue, HeaderName) {
         this.wb = {};

package/dist/inventory/items/reports/pdf/expiring-drugs-pdf.service.d.ts

@@ -0,0 +1,49 @@
+export declare class ExpiringDrugPDFService {
+    static GetPrint(ReOrderPointData: any, DatesDetails: any): any;
+    static GetDate(DatesDetails: any): string;
+    static CustomerAndVehicleDetailsAfterLine(): {
+        canvas: {
+            type: string;
+            lineColor: string;
+            x1: number;
+            y1: number;
+            x2: number;
+            y2: number;
+            lineWidth: number;
+        }[];
+    };
+    static GetSignatures(CName: any, For: any, Type: any): {
+        columns: {
+            stack: {
+                style: string;
+                text: (string | {
+                    text: any;
+                })[];
+            }[];
+        }[];
+    };
+    static CompanyName(CName: any): {
+        style: string;
+        text: (string | {
+            text: any;
+        })[];
+    };
+    static GetItemsTable(Items: any): {
+        style: string;
+        marginTop: number;
+        marginBottom: number;
+        table: {
+            widths: (string | number)[];
+            headerRows: number;
+            body: any;
+        };
+        layout: {
+            hLineWidth: (i: any, node: any) => 1 | 0.5;
+            vLineWidth: (i: any, node: any) => 1 | 0.5;
+            hLineColor: (i: any, node: any) => "gray" | "lightgrey";
+            vLineColor: (i: any, node: any) => string;
+        };
+    };
+    static BuildTableBodyForLaborAndParts(Items: any): any;
+    static GetHeaderNames(): any;
+}

package/dist/{services → inventory/items/reports/pdf}/expiring-drugs-pdf.service.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpiringDrugPDFService = void 0;
-const my_date_1 = require("../utils/my-date");
-const tr_utils_1 = require("../utils/tr-utils");
+const my_date_1 = require("../../../../utils/my-date");
+const tr_utils_1 = require("../../../../utils/tr-utils");
 class ExpiringDrugPDFService {
     static GetPrint(ReOrderPointData, DatesDetails) {
         // console.log('ReOrderPointData', ReOrderPointData);

package/dist/inventory/items/reports/pdf/item-wise-mout-details-pdf.d.ts

@@ -0,0 +1,229 @@
+export declare class ItemWiseMODetailsPDF {
+    static GetItemWiseMODetailsPrint(InvoicesData: any, CName: any, isPhar: boolean, isHC: boolean, HeaderName: any, searchValue: any): {
+        info: {
+            title: string;
+        };
+        header: (currentPage: any, pageCount: any) => {
+            text: string;
+            alignment: string;
+            marginRight: number;
+            fontSize: number;
+            marginTop: number;
+        };
+        pageMargins: number[];
+        pageOrientation: string;
+        content: any[];
+        styles: {
+            temp2header: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+            };
+            tableheader1: {
+                bold: boolean;
+                fontFamily: string;
+                margin: number[];
+                alignment: string;
+            };
+            header: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+            };
+            meetingHeader: {
+                fontSize: number;
+                bold: boolean;
+            };
+            Receiptheader: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+                margin: number[];
+            };
+            InlineHeader: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+                margin: number[];
+            };
+            TaskHeading: {
+                fontSize: number;
+                bold: boolean;
+                margin: number[];
+            };
+            lettersSize: {
+                fontSize: number;
+                margin: number[];
+            };
+            tablexample: {
+                margin: number[];
+            };
+            hedstyl: {
+                margin: number[];
+            };
+            header2: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+                margin: number[];
+            };
+            header1: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+                decoration: string;
+                margin: number[];
+            };
+            ws_adrs_center: {
+                fontSize: number;
+                alignment: string;
+            };
+            ws_adrs_center1: {
+                fontSize: number;
+                alignment: string;
+            };
+            ws_adrs_left: {
+                fontSize: number;
+                alignment: string;
+            };
+            ws_adrs_left1: {
+                fontSize: number;
+                alignment: string;
+            };
+            columnheader: {
+                margin: number[];
+            };
+            tableExample: {
+                margin: number[];
+                fontSize: number;
+            };
+            tableExamplemargin: {
+                margin: number[];
+                fontSize: number;
+            };
+            textcust: {
+                fontSize: number;
+                margin: number[];
+            };
+            column: {
+                margin: number[];
+            };
+            tableheader: {
+                bold: boolean;
+                fontSize: number;
+                margin: number[];
+                alignment: string;
+            };
+            tableheader2: {
+                fontSize: number;
+                margin: number[];
+                alignment: string;
+                opacity: number;
+            };
+            hed: {
+                fontSize: number;
+                bold: boolean;
+            };
+            hed2: {
+                fontSize: number;
+            };
+            TotalsStyles: {
+                marginTop: number;
+                lineHeight: number;
+                fontSize: number;
+                margin: number[];
+            };
+            colum1: {
+                fontSize: number;
+                lineHeight: number;
+            };
+            colum2: {
+                fontSize: number;
+                lineHeight: number;
+                margin: number[];
+            };
+            colum3: {
+                lineHeight: number;
+            };
+            Receiptheader1: {
+                fontSize: number;
+                bold: boolean;
+                alignment: string;
+                margin: number[];
+            };
+            Row1: {
+                fontSize: number;
+                margin: number[];
+            };
+            rowdata: {
+                margin: number[];
+                fontSize: number;
+            };
+            forCompany: {
+                margin: number[];
+                fontSize: string;
+            };
+            forCompany1: {
+                margin: number[];
+                fontSize: string;
+            };
+            Rupees: {
+                margin: number[];
+                fontSize: string;
+            };
+            Signature: {
+                margin: number[];
+                alignment: string;
+                fontSize: string;
+            };
+            withApp: {
+                alignment: string;
+                lineHeight: number;
+            };
+            withOutApp: {
+                alignment: string;
+                lineHeight: number;
+            };
+            Sign: {
+                fontSize: number;
+                margin: number[];
+            };
+            Sign1: {
+                fontSize: number;
+                margin: number[];
+            };
+            'margin-all': {
+                margin: number[];
+            };
+            'margin-top': {
+                margin: number[];
+            };
+            'margin-bottom': {
+                margin: number[];
+            };
+            fontSize: {
+                fontSize: number;
+            };
+        };
+    };
+    static GetInvoiceDataTable(InvoicesData: any, isPhar: boolean, isHC: boolean): any;
+    static getTableWidths(isHC: any): (string | number)[];
+    static GetItemsTable(InvoiceData: any, isPhar: boolean, isHC: boolean): {
+        style: string;
+        marginTop: number;
+        marginBottom: number;
+        table: {
+            widths: (string | number)[];
+            headerRows: number;
+            body: any;
+        };
+        layout: {
+            hLineWidth: (i: any, node: any) => 1 | 0.5;
+            vLineWidth: (i: any, node: any) => 1 | 0.5;
+            hLineColor: (i: any, node: any) => "gray" | "lightgrey";
+            vLineColor: (i: any, node: any) => string;
+        };
+    };
+    static BuildTableBodyForLaborAndParts(InvoiceData: any, isPhar: boolean, isHC: boolean): any;
+    static GetHeaderNames(isPhar: boolean, isHC: boolean): any;
+}

package/dist/{services → inventory/items/reports/pdf}/item-wise-mout-details-pdf.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ItemWiseMODetailsPDF = void 0;
-const my_date_1 = require("../utils/my-date");
-const tr_utils_1 = require("../utils/tr-utils");
-const shared_pdf_service_1 = require("./shared-pdf.service");
+const shared_pdf_service_1 = require("../../../../shared/shared-services/shared-pdf.service");
+const my_date_1 = require("../../../../utils/my-date");
+const tr_utils_1 = require("../../../../utils/tr-utils");
 class ItemWiseMODetailsPDF {
     static GetItemWiseMODetailsPrint(InvoicesData, CName, isPhar, isHC, HeaderName, searchValue) {
         var dd = {