shareneus 1.5.7 → 1.5.8

package/dist/accounting/counter-sales/pos-receipt-pdf.d.ts

@@ -83,7 +83,7 @@ export declare class PosReceiptPrintService {
     static GetHeaderInfo(InvoicePDFData: any, marginleft: number): any;
     static finalReturnTotal(InvoicePDFData: any): string;
     static GetMarginsBasedOnPaperSize(size: any): number[];
-    static GetTotalDeetails(InvoicePDFData: any, size: any): {
+    static GetTotalDetails(InvoicePDFData: any, size: any): {
         style: string[];
         lineHeight: number;
         marginBottom: number;

package/dist/accounting/counter-sales/pos-receipt-pdf.js

@@ -7,6 +7,7 @@ exports.PosReceiptPrintService = void 0;
 const tr_utils_1 = require("../../utils/tr-utils");
 const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const jsbarcode_1 = __importDefault(require("jsbarcode"));
+const math_operations_1 = require("../../shared/math-operations");
 class PosReceiptPrintService {
     static GetPrint(InvoicePDFData, size) {
         var _a;
@@ -104,7 +105,7 @@ class PosReceiptPrintService {
                 // { text: 'Adjust : ' + this.GetAdjustValue(InvoicePDFData.Adj), style: ['headerstyle'], alignment: 'right' },
                 {
                     columns: [{ text: '', width: '*' }, { text: this.finalReturnTotal(InvoicePDFData), width: '*', bold: true, fontSize: 10, alignment: 'center' },
-                        this.GetTotalDeetails(InvoicePDFData, size)]
+                        this.GetTotalDetails(InvoicePDFData, size)]
                 },
                 // { text: '' , fontSize: 8, alignment: 'left' },
                 {
@@ -268,17 +269,21 @@ class PosReceiptPrintService {
             return [25, 15, 25, 435.945];
         }
     }
-    static GetTotalDeetails(InvoicePDFData, size) {
+    static GetTotalDetails(InvoicePDFData, size) {
+        console.log('InvoicePDFData', InvoicePDFData);
         let TotalData = [];
-        if (!tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.STotal)) {
+        if (!InvoicePDFData.Consolidate && !tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.STotal)) {
             // TotalData.push({ text: 'Sub Total : ' + InvoicePDFData.STotal, style: ['headerstyle'], alignment: 'right', marginRight: 5, })
             TotalData.push({ name: 'Sub Total', value: InvoicePDFData.STotal });
         }
+        else {
+            TotalData.push({ name: 'Sub Total', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(InvoicePDFData.STotal, InvoicePDFData.CustPartITax)) });
+        }
         if (!tr_utils_1.TrUtils.IsFixedZero(this.GetDiscountOverall(InvoicePDFData))) {
             // TotalData.push({ text: 'Discount : -' + this.GetDiscountOverall(InvoicePDFData), style: ['headerstyle'], alignment: 'right', marginRight: 5, });
             TotalData.push({ name: 'Discount', value: this.GetDiscountOverall(InvoicePDFData) });
         }
-        if (!tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.CustPartITax) && tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.CustRetRoundedTotal)) {
+        if (!InvoicePDFData.Consolidate && !tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.CustPartITax) && tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.CustRetRoundedTotal)) {
             TotalData.push({ name: 'Tax Amount', value: tr_utils_1.TrUtils.FixPriceValue(InvoicePDFData.CustPartITax) });
         }
         if (!tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.Round) && tr_utils_1.TrUtils.IsFixedZero(InvoicePDFData.CustRetRoundedTotal)) {

package/dist/accounting/counter-sales/sales-receipt-print.service.js

@@ -57,7 +57,7 @@ class SaleReceiptPrintService {
             InvoicePrintData.Sts = PaymentData.Sts;
         }
         InvoicePrintData.Consolidate = ConsolidateGST;
-        InvoicePrintData.ShowDiscountColumn = true;
+        InvoicePrintData.ShowDiscountColumn = false;
         if (!ForInsurance && !ConsolidateGST) {
             if (shared_print_service_1.PrintSharedService.CheckItemIndexWithDisc(InvoicePrintData) !== -1) {
                 InvoicePrintData.ShowDiscountColumn = (InvoicePrintData.Settings.DiscLvl === 'ITM' || InvoicePrintData.Settings.DiscLvl === 'RECITM') ? true : false;
@@ -177,7 +177,8 @@ class SaleReceiptPrintService {
                 let CTaxAmtPerItem = (0, math_operations_1.Divide)(Item.CGST, Item.Qty);
                 let STaxAmtPerItem = (0, math_operations_1.Divide)(Item.SGST, Item.Qty);
                 let ITaxAmtPerItem = (0, math_operations_1.Divide)(Item.IGST, Item.Qty);
-                Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
+                let DiscPerItem = (0, math_operations_1.Divide)((0, math_operations_1.Add)(Item.Disc, Item.RecDisc), Item.Qty);
+                Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(AfterDiscForEach, DiscPerItem, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
             }
             else {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
@@ -198,11 +199,16 @@ class SaleReceiptPrintService {
             Item.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             Item.TaxName = this.getTaxName(Item.TCode, TaxCodes);
             Item.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
-            if (LineTotal === 'AT') {
-                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
+            if (Consolidate) {
+                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Multiply)(Item.UnPr, Item.Qty), DecimalsNumber);
             }
             else {
-                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc), DecimalsNumber);
+                if (LineTotal === 'AT') {
+                    Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
+                }
+                else {
+                    Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc), DecimalsNumber);
+                }
             }
             if (!tr_utils_1.TrUtils.IsZero(Item.Qty) && !tr_utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
                 Item.QtyAndUoM = Item.Qty + ' ' + Item.UoM;

package/dist/index.d.ts

@@ -131,3 +131,4 @@ export { CalcItemFinalSalePrice } from "./inventory/items/item-price-for-priceli
 export { IsNotNull, IsNull } from "./shared/util";
 export { GetAgeString } from "./shared/util";
 export { SalesTotalCalculationsWithDecimals } from "./sales-receive/sales-total-calculation";
+export { ServiceHistoryPDFService } from "./services/service-history-pdf.service";

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.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.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");
@@ -270,3 +270,5 @@ var util_2 = require("./shared/util");
 Object.defineProperty(exports, "GetAgeString", { enumerable: true, get: function () { return util_2.GetAgeString; } });
 var sales_total_calculation_1 = require("./sales-receive/sales-total-calculation");
 Object.defineProperty(exports, "SalesTotalCalculationsWithDecimals", { enumerable: true, get: function () { return sales_total_calculation_1.SalesTotalCalculationsWithDecimals; } });
+var service_history_pdf_service_1 = require("./services/service-history-pdf.service");
+Object.defineProperty(exports, "ServiceHistoryPDFService", { enumerable: true, get: function () { return service_history_pdf_service_1.ServiceHistoryPDFService; } });

package/dist/services/service-history-pdf.service.d.ts

@@ -0,0 +1,37 @@
+export declare class ServiceHistoryPDFService {
+    static GetPrint(ReOrderPointData: any, DatesDetails: any): any;
+    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 GetHistoryTable(WOHistory: any, DecimalsNumber: number): {
+        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 BuildTableBodyForHistory(WOHistory: any, DecimalsNumber: number): any;
+    static GetHeaderNames(): any;
+}

package/dist/services/service-history-pdf.service.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceHistoryPDFService = void 0;
+const my_date_1 = require("../utils/my-date");
+const tr_utils_1 = require("../utils/tr-utils");
+class ServiceHistoryPDFService {
+    static GetPrint(ReOrderPointData, DatesDetails) {
+        // console.log('ReOrderPointData', ReOrderPointData);
+        let dd = {
+            // info: {
+            //     title: this.GetFileName(ROPrintData),
+            // },
+            info: {
+                title: 'ExpiringDrugs',
+            },
+            header: function (currentPage, pageCount, pageSize) {
+                return { text: currentPage.toString() + ' of ' + pageCount, alignment: 'right', marginRight: 25, fontSize: 8, marginTop: 2 };
+            },
+            pageMargins: [25, 15, 25, 15],
+            pageSize: 'A4',
+            content: [
+                { text: ReOrderPointData.Entity.CName, style: ['headerstyle'], alignment: 'center', fontSize: 20 },
+                { text: 'Service History', style: ['headerstyle'], alignment: 'center', fontSize: 12 },
+                this.GetHistoryTable(ReOrderPointData.WOHistory, ReOrderPointData.Entity.DecimalsNumber),
+                this.GetSignatures(ReOrderPointData.Entity.CName, ReOrderPointData.Type, ReOrderPointData.For),
+            ],
+            styles: {
+                headerstyle: {
+                    fontFamily: 'Calibri',
+                    fontSize: 9
+                },
+                Sign: {
+                    fontSize: 8,
+                    margin: [0, 30, 0, 5]
+                },
+                forCompany: {
+                    // margin: [0, 10, 30, 0],
+                    marginRight: 5,
+                    marginTop: 10,
+                    fontSize: 9,
+                    alignment: 'right'
+                },
+                tableheader: {
+                    bold: true,
+                    fontFamily: 'Calibri',
+                    margin: [0, 1, 0, 5],
+                    alignment: 'center'
+                },
+                tableheader1: {
+                    bold: true,
+                    fontFamily: 'Calibri',
+                    margin: [0, 2, 0, 2],
+                    alignment: 'center'
+                },
+                tableExample: {
+                    fontSize: 9
+                }
+            }
+        };
+        return dd;
+    }
+    static GetSignatures(CName, For, Type) {
+        return {
+            columns: [{
+                    stack: [
+                        this.CompanyName(CName),
+                    ]
+                }],
+        };
+    }
+    static CompanyName(CName) {
+        return {
+            style: 'forCompany',
+            text: ['For ', { text: CName, }],
+        };
+    }
+    static GetHistoryTable(WOHistory, DecimalsNumber) {
+        return {
+            style: 'tableExample',
+            marginTop: 3,
+            marginBottom: 5,
+            table: {
+                widths: [100, 80, 80, '*', 100],
+                headerRows: 1,
+                body: this.BuildTableBodyForHistory(WOHistory, DecimalsNumber)
+            },
+            layout: {
+                hLineWidth: function (i, node) {
+                    return (i === 0 || i === 1 || i === node.table.body.length) ? 1 : 0.5;
+                },
+                vLineWidth: function (i, node) {
+                    return (i === 0 || i === node.table.widths.length) ? 1 : 0.5;
+                },
+                hLineColor: function (i, node) {
+                    return (i === 0 || i === 1 || i === node.table.body.length) ? 'gray' : 'lightgrey';
+                },
+                vLineColor: function (i, node) {
+                    return 'gray';
+                },
+            }
+        };
+    }
+    static BuildTableBodyForHistory(WOHistory, DecimalsNumber) {
+        let body = this.GetHeaderNames();
+        // let Total: number = 0;
+        WOHistory.forEach((item, index) => {
+            // Total = Total + (TrUtils.SetValueToZeroIfNull(item.Batch.Qty) * TrUtils.SetValueToZeroIfNull(item.Batch.Cost));
+            let dataRow = [];
+            dataRow.push({ text: item.Code, });
+            dataRow.push({ text: my_date_1.MyDate.ConvertUTCDateToReadable(item.CrDate), alignment: 'center', style: ['headerstyle'], });
+            dataRow.push({ text: item.Prod.MIn, alignment: 'center', style: ['headerstyle'], });
+            dataRow.push({ text: item.TypeName, alignment: 'center', style: ['headerstyle'], });
+            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Total, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
+            body.push(dataRow);
+        });
+        // let Row: any = [{ text: 'Total', alignment: 'right', colSpan: 5, bold: true, fontSize: 12 }, {}, {}, {}, {}, { text: TrUtils.FixPriceValue(Total, DecimalsNumber), fontSize: 12, alignment: 'right', bold: true }];
+        // body.push(Row);
+        return body;
+    }
+    static GetHeaderNames() {
+        let HeadingNames;
+        HeadingNames = [[{ text: 'WO#', style: 'tableheader1', Field: 'Code', alignment: 'left', line: true },
+                { text: 'Created Date', style: 'tableheader1', Field: 'CrDate', alignment: 'center' },
+                { text: 'Mileage In', style: 'tableheader1', Field: 'Mileage', alignment: 'center' },
+                { text: 'Service Type', style: 'tableheader1', Field: 'Type', alignment: 'center' },
+                { text: 'Total', style: 'tableheader1', Field: 'Total', alignment: 'right' }
+            ]];
+        return HeadingNames;
+    }
+}
+exports.ServiceHistoryPDFService = ServiceHistoryPDFService;

package/package.json

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