shareneus 1.4.32 → 1.4.34

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.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.PricelistItemFinalPriceService = 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("./excel-files/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("./excel-files/category-wise-item-excel.service");
@@ -247,3 +247,8 @@ var next_service_date_pdf_service_1 = require("./services/next-service-date-pdf.
 Object.defineProperty(exports, "NextServiceDatePDFService", { enumerable: true, get: function () { return next_service_date_pdf_service_1.NextServiceDatePDFService; } });
 var item_bar_code_label_pdf_1 = require("./services/item-bar-code-label-pdf");
 Object.defineProperty(exports, "ItemBarCodeLabelPdf", { enumerable: true, get: function () { return item_bar_code_label_pdf_1.ItemBarCodeLabelPdf; } });
+var pricelist_item_final_price_service_1 = require("./services/pricelist-item-final-price.service");
+Object.defineProperty(exports, "PricelistItemFinalPriceService", { enumerable: true, get: function () { return pricelist_item_final_price_service_1.PricelistItemFinalPriceService; } });
+var tr_utils_2 = require("./utils/tr-utils");
+Object.defineProperty(exports, "IsNotNull", { enumerable: true, get: function () { return tr_utils_2.IsNotNull; } });
+Object.defineProperty(exports, "IsNull", { enumerable: true, get: function () { return tr_utils_2.IsNull; } });

package/dist/services/debit-note-pdf.service.js

@@ -412,10 +412,10 @@ class DebitNotePdfService {
         else {
             if (ShowIGST) {
                 if (ShowDiscountColumn) {
-                    return [15, 215, 40, 25, 40, 17, 35, 17, 35, 50];
+                    return [20, "*", 60, 17, 35, 17, 35, 60];
                 }
                 else {
-                    return [15, 270, 40, 25, 40, 20, 40, 54];
+                    return [20, '*', 40, 25, 40, 60];
                 }
             }
             else {

package/dist/services/pricelist-item-final-price.service.js

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PricelistItemFinalPriceService = void 0;
+const aggregation_1 = require("../aggregation/aggregation");
+const tr_utils_1 = require("../utils/tr-utils");
+class PricelistItemFinalPriceService {
+    static GetItemPriceForPriceList(item, priceList, includeMargin) {
+        let salePricesByPriceListId = [];
+        if ((0, tr_utils_1.IsNotNull)(item.SalePrices) && item.SalePrices.length > 0) {
+            salePricesByPriceListId = item.SalePrices.filter((price) => priceList._id.toString() == price.PrListId.toString());
+        }
+        if (salePricesByPriceListId.length > 0) {
+            item.SalePrices = salePricesByPriceListId;
+            if (item.Track == 'TR' || item.Track == 'SN') {
+                item.Sale["MRP"] = item.Sale.Price;
+                if ((0, tr_utils_1.IsNotNull)(item.SalePrices[0].Price) && (0, tr_utils_1.IsNotNull)(item.SalePrices[0].Disc)) {
+                    const calculatedPrice = this.CalcDiscPrice(item.SalePrices[0].Price, item.SalePrices[0].Disc);
+                    item.Sale.Price = this.applyRounding(calculatedPrice, priceList);
+                }
+                else if ((0, tr_utils_1.IsNotNull)(item.SalePrices[0].Price) && (0, tr_utils_1.IsNull)(item.SalePrices[0].Disc)) {
+                    item.Sale.Price = this.applyRounding(item.SalePrices[0].Price, priceList);
+                }
+                else if ((0, tr_utils_1.IsNull)(item.SalePrices[0].Price) && (0, tr_utils_1.IsNotNull)(item.SalePrices[0].Disc)) {
+                    const calculatedPrice = this.CalcDiscPrice(item.Sale.Price, item.SalePrices[0].Disc);
+                    item.Sale.Price = this.applyRounding(calculatedPrice, priceList);
+                }
+                if (includeMargin) {
+                    item.Margin = this.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);
+                    }
+                    element.MRP = element.Price;
+                    if (batchSalePrice.length > 0) {
+                        if ((0, tr_utils_1.IsNotNull)(batchSalePrice[0].Price) && (0, tr_utils_1.IsNotNull)(batchSalePrice[0].Disc)) {
+                            const calculatedPrice = this.CalcDiscPrice(batchSalePrice[0].Price, batchSalePrice[0].Disc);
+                            element.Price = this.applyRounding(calculatedPrice, priceList);
+                        }
+                        else if ((0, tr_utils_1.IsNotNull)(batchSalePrice[0].Price) && (0, tr_utils_1.IsNull)(batchSalePrice[0].Disc)) {
+                            element.Price = this.applyRounding(batchSalePrice[0].Price, priceList);
+                        }
+                        else if ((0, tr_utils_1.IsNull)(batchSalePrice[0].Price) && (0, tr_utils_1.IsNotNull)(batchSalePrice[0].Disc)) {
+                            const calculatedPrice = this.CalcDiscPrice(element.Price, batchSalePrice[0].Disc);
+                            element.Price = this.applyRounding(calculatedPrice, priceList);
+                        }
+                    }
+                    if (includeMargin) {
+                        element.Margin = this.GetMarginValue(element.Price, element.Cost);
+                    }
+                }
+            }
+            return item;
+        }
+        return this.calculatePriceBasedOnPriceList(item, priceList, includeMargin);
+    }
+    static calculatePriceBasedOnPriceList(item, priceList, includeMargin) {
+        var _a, _b;
+        if (priceList != null) {
+            if (priceList.PrCalc == "FIXED") {
+                if (priceList.Fixed && (0, tr_utils_1.IsNotNull)(priceList.Fixed.Price)) {
+                    const fixedPrice = priceList.Fixed.Price;
+                    if (item.Track == 'TR' || item.Track == 'SN') {
+                        item.Sale["MRP"] = item.Sale.Price;
+                        item.Sale.Price = this.applyRounding(fixedPrice, priceList);
+                        if (includeMargin) {
+                            item.Margin = this.GetMarginValue(item.Sale.Price, item.Pur.Cost);
+                        }
+                    }
+                    else if (item.Track == 'BN') {
+                        for (let batch of item.Batches) {
+                            batch.MRP = batch.Price;
+                            batch.Price = this.applyRounding(fixedPrice, priceList);
+                            if (includeMargin) {
+                                batch.Margin = this.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;
+                        const calculatedPrice = this.CalcDiscPrice(item.Sale.Price, discPerc, markUp);
+                        item.Sale.Price = this.applyRounding(calculatedPrice, priceList);
+                        if (includeMargin) {
+                            item.Margin = this.GetMarginValue(item.Sale.Price, item.Pur.Cost);
+                        }
+                    }
+                    else if (item.Track == 'BN') {
+                        for (let batch of item.Batches) {
+                            batch.MRP = batch.Price;
+                            const calculatedPrice = this.CalcDiscPrice(batch.Price, discPerc, markUp);
+                            batch.Price = this.applyRounding(calculatedPrice, priceList);
+                            if (includeMargin) {
+                                batch.Margin = this.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, tr_utils_1.IsNotNull)(item.Pur) && (0, tr_utils_1.IsNotNull)(item.Pur.Cost)) {
+                            const calculatedPrice = this.CalcDiscPrice(item.Pur.Cost, discPerc, markUp);
+                            item.Sale.Price = this.applyRounding(calculatedPrice, priceList);
+                            if (includeMargin) {
+                                item.Margin = this.GetMarginValue(item.Sale.Price, item.Pur.Cost);
+                            }
+                        }
+                    }
+                    else if (item.Track == 'BN') {
+                        for (let batch of item.Batches) {
+                            batch.MRP = batch.Price;
+                            if ((0, tr_utils_1.IsNotNull)(batch.Cost)) {
+                                const calculatedPrice = this.CalcDiscPrice(batch.Cost, discPerc, markUp);
+                                batch.Price = this.applyRounding(calculatedPrice, priceList);
+                                if (includeMargin) {
+                                    batch.Margin = this.GetMarginValue(batch.Price, batch.Cost);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return item;
+    }
+    static applyRounding(price, priceList) {
+        if (!priceList || !priceList.Round)
+            return price;
+        switch (priceList.Round) {
+            case "-1":
+                return price;
+            case "0":
+                return Math.round(price);
+            case "0.99":
+                return Math.floor(price) + 0.99;
+            case "0.50":
+                return Math.round(price * 2) / 2;
+            case "0.49":
+                return Math.floor(price) + 0.49;
+            case "Dec":
+                if ((0, tr_utils_1.IsNotNull)(priceList.Deci)) {
+                    const factor = Math.pow(10, priceList.Deci);
+                    return Math.round(price * factor) / factor;
+                }
+                return price;
+            default:
+                return price;
+        }
+    }
+    static CalcDiscPrice(Price, Disc, MarkUp = false) {
+        let PriceValue = 0;
+        if (MarkUp) {
+            PriceValue = (0, aggregation_1.addition)(Price, (0, aggregation_1.division)((0, aggregation_1.multiply)(Price, Disc), 100));
+        }
+        else {
+            PriceValue = (0, aggregation_1.subtraction)(Price, (0, aggregation_1.division)((0, aggregation_1.multiply)(Price, Disc), 100));
+        }
+        return PriceValue;
+    }
+    static GetMarginValue(price, cost) {
+        let Margin = 0;
+        Margin = (0, aggregation_1.multiply)((0, aggregation_1.division)((0, aggregation_1.subtraction)(price, cost), price), 100);
+        return Margin;
+    }
+}
+exports.PricelistItemFinalPriceService = PricelistItemFinalPriceService;

package/dist/services/vendor-debit-note-totals.service.js

@@ -33,6 +33,9 @@ class VendorDebitNoteTotalsService {
     static ResetLaborItemValues(ItemsList, IsIndependentTax) {
         ItemsList.forEach((Item) => {
             Item = this.ResetLaborItemValueIfInvalid(Item);
+            if (tr_utils_1.TrUtils.IsZero(Item.Qty)) {
+                Item.Qty = 1;
+            }
             Item.DiscountedPrice = (0, aggregation_1.addition)(Item.Disc, Item.RecDisc);
             Item.AfterItemDisc = Item.NetAmt;
             if (IsIndependentTax) {

package/dist/utils/tr-utils.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrUtils = void 0;
+exports.IsNull = IsNull;
+exports.IsNotNull = IsNotNull;
 // import { HttpClient } from '@angular/common/http';
 const enums_1 = require("../enums/enums");
 var deepEqual = require('deep-equal');
 // import { LaborStatusEnum } from '../enums/enums';
+function IsNull(Value) {
+    return Value === null || typeof Value === 'undefined';
+}
+function IsNotNull(Value) {
+    return Value !== null && typeof Value !== 'undefined';
+}
 class TrUtils {
     static IsNull(Value) {
         return Value === null || typeof Value === 'undefined';

package/package.json

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