shareneus 1.1.5 → 1.1.7

package/dist/services/inv-print.service.js

@@ -53,7 +53,9 @@ class InvPrintService {
         }
         InvoicePrintData.Consolidate = ConsolidateGST;
         InvoicePrintData.ShowDiscountColumn = false;
+        console.log(ForInsurance, ConsolidateGST);
         if (!ForInsurance && !ConsolidateGST) {
+            console.log(shared_print_service_1.PrintSharedService.CheckItemIndexWithDisc(InvoicePrintData));
             if (shared_print_service_1.PrintSharedService.CheckItemIndexWithDisc(InvoicePrintData) !== -1) {
                 // InvoicePrintData.ShowDiscountColumn = (InvoicePrintData.Settings.DiscLvl === 'ITM' || InvoicePrintData.Settings.DiscLvl === 'RECITM') ? true : false;
                 InvoicePrintData.ShowDiscountColumn = true;
@@ -244,6 +246,14 @@ class InvPrintService {
             Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.CGST);
             Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.SGST);
             Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.IGST);
+            Item.TaxName = this.getTaxName(Item.TCode, TaxCodes);
+            if (!tr_utils_1.TrUtils.IsEmpty(Item.Perc)) {
+                Item.DiscPerc = Item.Perc;
+            }
+            else {
+                Item.DiscPerc = Item.Perc;
+                Item.DiscPerc = (0, aggregation_1.division)((0, aggregation_1.multiply)(100, Item.Disc), Item.UnPr);
+            }
             Item.CGSTPerc = shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             Item.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             Item.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
@@ -259,9 +269,21 @@ class InvPrintService {
             else {
                 Item.QtyAndUoM = Item.Qty + '';
             }
+            if (!tr_utils_1.TrUtils.IsZero(Item.OfQty) && !tr_utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
+                Item.OfQtyAndUoM = Item.OfQty + ' ' + Item.UoM;
+            }
+            else {
+                Item.OfQtyAndUoM = Item.OfQty + '';
+            }
         });
         return Items;
     }
+    static getTaxName(TCode, TaxCodes) {
+        let Index = TaxCodes.findIndex((TaxCode) => {
+            return Number(TCode) === TaxCode._id;
+        });
+        return (Index !== -1) ? TaxCodes[Index].Name : '';
+    }
     static ReverseItemsForInvoicePrint(argInvoiceData) {
         argInvoiceData.Ops = argInvoiceData.Ops;
         argInvoiceData.Items = argInvoiceData.Items;

package/dist/services/invoice-landscape-pdf.service.js

@@ -156,6 +156,7 @@ class InvoiceLandscapePdfService {
         ];
     }
     static PreparesparePartsTable(ROPrintData) {
+        console.log('ROPrintData', ROPrintData);
         let List = [];
         if (ROPrintData.Entity.Body === 1) {
             for (let i = 0; i < ROPrintData.PrintInfo.length; i++) {

package/dist/services/invoice-portrait-pdf.js

@@ -0,0 +1,636 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvoicePortraitPrintService = void 0;
+const enums_1 = require("../enums/enums");
+const my_date_1 = require("../utils/my-date");
+const tr_utils_1 = require("../utils/tr-utils");
+class InvoicePortraitPrintService {
+    static GetPrint(InvoicePDFData, size, printOptions) {
+        // console.log('InvoicePDFData', InvoicePDFData);
+        if (tr_utils_1.TrUtils.IsNull(InvoicePDFData.Name)) {
+            InvoicePDFData.Name = '';
+        }
+        let dd = {
+            info: {
+                title: 'CounterSale',
+            },
+            header: function (currentPage, pageCount, pageSize) {
+                return { text: currentPage.toString() + ' of ' + pageCount, alignment: 'right', marginRight: 25, fontSize: 8, marginTop: 2 };
+            },
+            pageMargins: this.GetMarginsBasedOnPaperSize(size),
+            pageSize: 'A4',
+            content: [
+                { text: InvoicePDFData.Entity.CName, style: ['headerstyle'], alignment: 'center', fontSize: 15 },
+                { text: this.GetAddress(InvoicePDFData.Entity), alignment: 'center', style: ['headerstyle'] },
+                {
+                    columns: this.GetHeaderInfo(InvoicePDFData)
+                },
+                {
+                    style: 'tableExample',
+                    table: {
+                        widths: [200, '*', 'auto'],
+                        body: this.GetCustomerAndBankDetails(InvoicePDFData)
+                    },
+                    layout: this.HeaderLayOut()
+                },
+                this.GetItemsTable(InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.Settings.PoS.SType, printOptions, size),
+                [this.TotalDetails(InvoicePDFData)],
+                this.GetSignatures(InvoicePDFData.Entity.CName, InvoicePDFData.Type, InvoicePDFData.For),
+            ],
+            styles: {
+                headerstyle: {
+                    fontFamily: 'Calibri',
+                    fontSize: 9
+                },
+                Sign: {
+                    fontSize: 8,
+                    margin: [0, 15, 0, 5]
+                },
+                forCompany: {
+                    // margin: [0, 10, 30, 0],
+                    marginRight: 5,
+                    marginTop: 10,
+                    fontSize: 9,
+                    alignment: 'right'
+                },
+                forCompany1: {
+                    margin: [0, 5, 15, 0],
+                    fontSize: 8
+                },
+                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
+                },
+                tableExample1: {
+                    fontSize: 8
+                }
+            }
+        };
+        return dd;
+    }
+    static GetCustomerAndBankDetails(InvoicePDFData) {
+        let CustDetails = [];
+        CustDetails.push([{
+                marginLeft: 3,
+                stack: [
+                    this.GetCustomerDetails(InvoicePDFData.Customer, InvoicePDFData.Type, null, null, 'Customer Name & Address')
+                ]
+            },
+            {
+                marginLeft: 5,
+                marginRight: 5,
+                stack: [this.GetCustomerGSTIN(InvoicePDFData.Customer), this.GetCustomerDLNo(InvoicePDFData.Customer)]
+            },
+            {
+                marginRight: 5,
+                stack: [{ text: 'Invoice No : ' + InvoicePDFData._id, style: ['headerstyle'] },
+                    { text: 'Date : ' + InvoicePDFData.CrDate, style: ['headerstyle'] }]
+            }]);
+        if (InvoicePDFData.Entity.PrBank) {
+            CustDetails.push([{ text: 'Note: OUR BANK A/C: ' + InvoicePDFData.Entity.Bank.ACNo + ', IFSC CODE: ' + InvoicePDFData.Entity.Bank.IFSC + ', Account Holder Name: ' + InvoicePDFData.Entity.Bank.ACName + ', BANK NAME: ' + InvoicePDFData.Entity.Bank.Name, colSpan: 3, fontSize: 8 }]);
+        }
+        return CustDetails;
+    }
+    static GetAddress1(Customer) {
+        var Address = this.GetFormatAddress(Customer);
+        if (Address.length !== 5) {
+            return Address;
+        }
+        else {
+            let a = '';
+            return a;
+        }
+    }
+    static GetFormatAddress(CustomerObj) {
+        var Addressnew = '';
+        if (!tr_utils_1.TrUtils.IsNull(CustomerObj.Adrs)) {
+            CustomerObj.Adrs.forEach((Adrs, index) => {
+                Addressnew = Addressnew + Adrs;
+                if (CustomerObj.Adrs.length > (index + 1)) {
+                    Addressnew = Addressnew + ', ';
+                }
+            });
+        }
+        return Addressnew;
+    }
+    static GetCustomerDetails(Customer, Type, Vehicle, Settings, CustHeader) {
+        if (tr_utils_1.TrUtils.IsNull(Customer)) {
+            return this.emptyObject();
+        }
+        let Data = [{ text: CustHeader + ':', style: 'hed', bold: true },
+            { text: Customer.Name, marginTop: 2 },
+            { text: this.GetAddress1(Customer), marginTop: 3, fontSize: 7 },
+            this.GetCustPhoneNumber(Customer, Type),
+            this.GetCustomerName(Customer.CustName)];
+        return {
+            style: 'colum1',
+            stack: Data
+        };
+    }
+    static GetFormatContact(CustomerObj) {
+        var contactnew = '';
+        if (!tr_utils_1.TrUtils.IsNull(CustomerObj.Cons)) {
+            CustomerObj.Cons.forEach((Contact) => {
+                contactnew = contactnew + '(' + Contact.Type + '):' + Contact.No + '\n';
+            });
+        }
+        return contactnew;
+    }
+    static GetCustPhoneNumber(Customer, Type) {
+        if (Type !== 'Technician Copy') {
+            var contact = this.GetFormatContact(Customer);
+            if (contact.length !== 0) {
+                return { columns: [{ text: 'Phone', width: 27, style: 'hed' }, contact] };
+            }
+            else {
+                return this.emptyObject();
+            }
+        }
+        else {
+            return this.emptyObject();
+        }
+    }
+    static emptyObject() {
+        let a = {};
+        return a;
+    }
+    static GetCustomerName(Customer) {
+        if (!tr_utils_1.TrUtils.IsEmpty(Customer)) {
+            let GSTIN = { columns: [{ text: 'Customer Name :', width: 65, bold: true }, { text: Customer }] };
+            return GSTIN;
+        }
+        else {
+            return this.emptyObject();
+        }
+    }
+    static GetCustomerGSTIN(Customer) {
+        if (!tr_utils_1.TrUtils.IsEmpty(Customer.GSTIN)) {
+            let GSTIN = { columns: [{ text: 'GSTIN :', width: 33, style: 'hed' }, { text: Customer.GSTIN, marginTop: 1.5 }] };
+            return GSTIN;
+        }
+        else {
+            return this.emptyObject();
+        }
+    }
+    static GetCustomerDLNo(Customer) {
+        if (!tr_utils_1.TrUtils.IsEmpty(Customer.DLNo)) {
+            let GSTIN = { columns: [{ text: 'DL No :', width: 33, style: 'hed' }, { text: Customer.DLNo, marginTop: 1.5 }] };
+            return GSTIN;
+        }
+        else {
+            return this.emptyObject();
+        }
+    }
+    static HeaderLayOut() {
+        return {
+            hLineWidth: function (i, node) {
+                return (i === 0 || i === 1 || i === node.table.body.length) ? 1 : 0;
+            },
+            vLineWidth: function (i, node) {
+                return (i === 0 || i === node.table.widths.length) ? 1 : 0;
+            },
+            hLineColor: function (i, node) {
+                return 'gray';
+            },
+            vLineColor: function (i, node) {
+                return 'gray';
+            },
+        };
+    }
+    static GetHeaderInfo(InvoicePDFData) {
+        let TaxInfo = [];
+        if (!tr_utils_1.TrUtils.IsEmpty(InvoicePDFData.Entity.GSTIN)) {
+            TaxInfo.push({ text: 'GSTIN : ' + InvoicePDFData.Entity.GSTIN, marginTop: 2, marginLeft: 5, alignment: 'left', fontSize: 9, width: 'auto' });
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(InvoicePDFData.Entity.DLNo)) {
+            TaxInfo.push({ text: 'D.L.NO : ' + InvoicePDFData.Entity.DLNo, marginTop: 2, marginLeft: 5, alignment: 'left', fontSize: 9, width: '*' });
+        }
+        TaxInfo.push(this.GetBillofSupplyName(InvoicePDFData.Settings));
+        return TaxInfo;
+    }
+    static GetMarginsBasedOnPaperSize(size) {
+        if (size === 'full') {
+            return [20, 15, 20, 15];
+        }
+        else {
+            return [20, 15, 20, 435.945];
+        }
+    }
+    static GrandTotalTable(data) {
+        var body = [];
+        data.forEach((row) => {
+            if (!tr_utils_1.TrUtils.IsFixedZero(row.value) || row.name === 'Total') {
+                var dataRow = [];
+                dataRow.push({ text: (row.name).toString(), noWrap: true });
+                dataRow.push(':');
+                if (row.name === 'Final Total') {
+                    dataRow.push({ text: (row.value).toString(), noWrap: true, bold: true, fontSize: 12, alignment: 'right' });
+                }
+                else if (!tr_utils_1.TrUtils.IsNull(row.value)) {
+                    dataRow.push({ text: (row.value).toString(), noWrap: true, alignment: 'right' });
+                }
+                else {
+                    dataRow.push({ text: '', noWrap: true, alignment: 'right' });
+                }
+                body.push(dataRow);
+            }
+        });
+        return body;
+    }
+    static GetBillofSupplyName(Settings) {
+        return { text: Settings.Tax === 'BS' ? ' Bill of Supply' : null, alignment: 'center', marginLeft: 15, marginTop: 2, marginBottom: 3, fontSize: 9, width: 'auto' };
+    }
+    static GetDiscountOverall(InvoicePDFData) {
+        return tr_utils_1.TrUtils.FixPriceValue(Number(InvoicePDFData.FixedDisc));
+    }
+    static CustomerAndVehicleDetailsAfterLine(size) {
+        let length = 575;
+        if (size === 'A3') {
+            length = 820;
+        }
+        else if (size === 'Custom') {
+            length = 575;
+        }
+        return {
+            canvas: [
+                {
+                    type: 'line',
+                    lineColor: 'gray',
+                    x1: 0,
+                    y1: 0,
+                    x2: 540,
+                    y2: 0,
+                    lineWidth: 1
+                }
+            ]
+        };
+    }
+    static GetSignatures(CName, For, Type) {
+        return {
+            columns: [{
+                    stack: [
+                        { columns: ['', '', this.CompanyName(CName)] }
+                    ]
+                }],
+        };
+    }
+    static CompanyName(CName) {
+        return {
+            style: 'forCompany1',
+            text: ['For ', { text: CName, bold: 'true' }],
+        };
+    }
+    static Authorizedsignature() {
+        return {
+            style: 'Sign',
+            text: ['Authorized Signatory'],
+        };
+    }
+    static CustomerSignature() {
+        return {
+            style: 'Sign',
+            text: ['Customer Signature'], marginLeft: 90
+        };
+    }
+    static GetItemsTable(Items, ShowTaxColumn, SType, printOptions, size) {
+        return {
+            style: 'tableExample',
+            marginTop: 3,
+            marginBottom: 5,
+            table: {
+                widths: this.GetWidths(ShowTaxColumn, printOptions),
+                headerRows: 1,
+                body: this.BuildTableBodyForLaborAndParts(Items, ShowTaxColumn, SType, printOptions, size)
+            },
+            layout: {
+                hLineWidth: function (i, node) {
+                    return (i === 0 || i === 1 || i === node.table.body.length) ? 1 : 0;
+                },
+                vLineWidth: function (i, node) {
+                    return (i === 0 || i === node.table.widths.length) ? 1 : 0.5;
+                },
+                hLineColor: function (i, node) {
+                    return 'gray';
+                },
+                vLineColor: function (i, node) {
+                    return 'gray';
+                },
+            }
+        };
+    }
+    static GetWidths(ShowTaxColumn, printOptions) {
+        if (ShowTaxColumn && printOptions.Tax !== 'NO') {
+            if (printOptions.Disc === 'NO') {
+                return [16, '*', 40, 45, 25, 20, 20, 45, 45, 30, 50];
+            }
+            else {
+                return [16, '*', 40, 45, 25, 20, 20, 45, 45, 35, 30, 50];
+            }
+        }
+        else {
+            if (printOptions.Disc === 'NO') {
+                return [22, '*', 40, 45, 25, 20, 20, 50, 50, 50];
+            }
+            else {
+                return [22, '*', 40, 45, 25, 20, 20, 50, 50, 50, 50];
+            }
+        }
+    }
+    static GetAddress(Entity) {
+        return Entity.Adrs1 + ', ' + Entity.Adrs2 + ', ' + Entity.City + '-' + Entity.PIN + ', Cell : ' + Entity.Phone;
+    }
+    static BuildTableBodyForLaborAndParts(Items, ShowTaxColumn, SType, printOptions, size) {
+        let body = this.GetHeaderNames(ShowTaxColumn, SType, printOptions);
+        let j = 1;
+        Items.forEach((item, index) => {
+            var _a, _b;
+            let dataRow = [];
+            dataRow.push({ text: index + 1, });
+            dataRow.push({ text: item.Desc, });
+            if (ShowTaxColumn) {
+                dataRow.push({ text: item.HSN, alignment: 'center', style: ['headerstyle'], });
+            }
+            dataRow.push({ text: (_a = item.Batch) === null || _a === void 0 ? void 0 : _a.BN, alignment: 'center', style: ['headerstyle'], });
+            dataRow.push({ text: my_date_1.MyDate.ConvertUTCDateToReadableExDate(item['Batch'].ExDt), alignment: 'center', style: ['headerstyle'], });
+            dataRow.push({ text: item.QtyAndUoM, alignment: 'right', style: ['headerstyle'], });
+            dataRow.push({ text: item.OfQty, alignment: 'right', style: ['headerstyle'], });
+            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.MRP), alignment: 'right', style: ['headerstyle'], });
+            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.UnPr), alignment: 'right', style: ['headerstyle'], });
+            if (printOptions.Disc !== 'NO') {
+                if (printOptions.Disc === 'PERC') {
+                    dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.DiscPerc), alignment: 'right', style: ['headerstyle'], });
+                }
+                else {
+                    dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Disc), alignment: 'right', style: ['headerstyle'], });
+                }
+            }
+            if (ShowTaxColumn && printOptions.Tax !== 'NO') {
+                let Tax = (_b = item.TaxName) === null || _b === void 0 ? void 0 : _b.split('%');
+                dataRow.push({ text: tr_utils_1.TrUtils.IsNull(Tax) ? '' : Tax[0], alignment: 'right', style: ['headerstyle'], });
+            }
+            dataRow.push({ text: item.Ret ? '-' + tr_utils_1.TrUtils.FixPriceValue(item.LineTotal) : tr_utils_1.TrUtils.FixPriceValue(item.LineTotal), alignment: 'right', style: ['headerstyle'], });
+            body.push(dataRow);
+            if (index + 1 === j * 9) {
+                j++;
+                if (size === 'diff') {
+                    let dataRow1 = [{ text: '', pageBreak: 'after' }, '', '', '', '', ''];
+                    if (ShowTaxColumn) {
+                        dataRow1.push('');
+                        dataRow1.push('');
+                    }
+                    body.push(dataRow1);
+                }
+            }
+        });
+        return body;
+    }
+    static GetHeaderNames(ShowTaxColumn, SType, printOptions) {
+        let HeadingNames;
+        if (ShowTaxColumn) {
+            HeadingNames = [[{ text: 'S.No', style: 'tableheader1', Field: 'SNo', alignment: 'left', fontSize: 7 },
+                    { text: 'Item Name', style: 'tableheader1', Field: 'Desc', alignment: 'left', line: true },
+                    { text: 'HSN', style: 'tableheader1', Field: 'HSN' },
+                    { text: 'Batch No.', style: 'tableheader1', Field: 'Batches' },
+                    { text: 'Ex.Dt', style: 'tableheader1', Field: 'ExDate' },
+                    { text: 'Qty', style: 'tableheader1', Field: 'Qty', alignment: 'right' },
+                    { text: 'Free', style: 'tableheader1', Field: 'OfQty', alignment: 'right' },
+                    { text: 'MRP', style: 'tableheader1', Field: 'MRP', alignment: 'right' },
+                    { text: 'Price', style: 'tableheader1', Field: 'UnPr', alignment: 'right' },
+                    { text: 'Line Total', style: 'tableheader1', Field: 'LineTotal', alignment: 'right' }]];
+            if (printOptions.Disc !== 'NO') {
+                HeadingNames[0].splice(9, 0, { text: (printOptions.Disc === 'PERC') ? 'Disc(%)' : 'Disc(Rs)', style: 'tableheader1', Field: 'Disc' });
+            }
+            if (printOptions.Tax !== 'NO') {
+                HeadingNames[0].splice(10, 0, { text: (SType === 'Intra') ? 'GST(%)' : 'IGST(%)', style: 'tableheader1', Field: 'TaxAmount', alignment: 'right' });
+            }
+        }
+        else {
+            HeadingNames = [[{ text: 'S.No', style: 'tableheader1', Field: 'SNo', alignment: 'left' },
+                    { text: 'Item Name', style: 'tableheader1', Field: 'Desc', alignment: 'left', line: true },
+                    { text: 'Batch No.', style: 'tableheader1', Field: 'Batches', alignment: 'left' },
+                    { text: 'Ex.Dt', style: 'tableheader1', Field: 'ExDate', alignment: 'left' },
+                    { text: 'Qty', style: 'tableheader1', Field: 'Qty', alignment: 'right' },
+                    { text: 'Free', style: 'tableheader1', Field: 'OfQty', alignment: 'right' },
+                    { text: 'MRP', style: 'tableheader1', Field: 'MRP', alignment: 'right' },
+                    { text: 'Price', style: 'tableheader1', Field: 'UnPr', alignment: 'right' },
+                    // { text: 'Disc(%)', style: 'tableheader1', Field: 'Disc' },
+                    { text: 'Line Total', style: 'tableheader1', Field: 'LineTotal', alignment: 'right' }]];
+            if (printOptions.Disc !== 'NO') {
+                HeadingNames[0].splice(8, 0, { text: (printOptions.Disc === 'PERC') ? 'Disc(%)' : 'Disc(Rs)', style: 'tableheader1', Field: 'Disc' });
+            }
+        }
+        return HeadingNames;
+    }
+    static TotalDetails(ROPrintData) {
+        let totalDisc;
+        let totalTax;
+        if (!ROPrintData.Consolidate) {
+            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartITax));
+            if (tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartsDiscTotal));
+            }
+            else {
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartsDiscTotal) + Number(ROPrintData.FixedDisc));
+            }
+        }
+        return [
+            {
+                style: 'tableExample',
+                marginTop: -3,
+                table: {
+                    widths: ['*', '*'],
+                    body: [
+                        [
+                            this.PartsTaxAmounts(ROPrintData.CustTaxGroupData, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
+                            {
+                                columns: [{ text: '', width: 150 }, this.GrandTotal('0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null)]
+                            }
+                        ],
+                    ]
+                },
+                layout: 'noBorders'
+            },
+        ];
+    }
+    static PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
+        if (ShowTaxColumn) {
+            return {
+                stack: [this.AllHSNPartCGSTTaxListTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)]
+            };
+        }
+        else {
+            return '';
+        }
+    }
+    static GrandTotal(LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal) {
+        let AccountFields = [
+            { name: 'Total Disc.', value: OverAllRecordDiscount },
+        ];
+        if (!Consolidate && !tr_utils_1.TrUtils.IsNull(subTotal)) {
+            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal))) });
+        }
+        else {
+            if (!Consolidate) {
+                AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))) });
+            }
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
+            AccountFields.push({ name: 'Total Tax', value: totalTax });
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
+            if (Adj > 0) {
+                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj);
+            }
+            AccountFields.push({ name: 'Adjust', value: Adj });
+        }
+        if (For === enums_1.PayTypeEnum.Insurance) {
+            let total = {
+                name: 'Total',
+                value: OverAllRecordTotal
+            };
+            let Rounding = { name: 'Rounding', value: Rounded };
+            if (Rounding.value > 0) {
+                Rounding.value = '+' + Rounding.value;
+            }
+            let FinalTotal = { name: 'Final Total', value: GrandTotal, bold: true, fontSize: 12 };
+            AccountFields.push(total);
+            AccountFields.push(Rounding);
+            if (!tr_utils_1.TrUtils.IsFixedZero(Rounded)) {
+                AccountFields.push(FinalTotal);
+            }
+        }
+        else {
+            let total = {
+                name: 'Total',
+                value: OverAllRecordTotal
+            };
+            let Rounding = { name: 'Rounding', value: Rounded };
+            let FinalTotal = { name: 'Final Total', value: GrandTotal };
+            if (Rounding.value > 0) {
+                Rounding.value = '+' + Rounding.value;
+            }
+            // AccountFields.push(total);
+            AccountFields.push(Rounding);
+            if (!tr_utils_1.TrUtils.IsFixedZero(Rounded)) {
+                AccountFields.push(FinalTotal);
+            }
+        }
+        return {
+            style: ['columnheader', 'TotalsStyles'],
+            lineHeight: 0.7,
+            marginBottom: 5,
+            width: 'auto',
+            table: {
+                widths: ['auto', 'auto', 60],
+                body: this.GrandTotalTable(AccountFields)
+            },
+            layout: 'noBorders'
+        };
+    }
+    static AllHSNPartCGSTTaxListTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
+        if (ShowIGST) {
+            return {
+                style: 'tableExample1',
+                table: {
+                    widths: [50, 30, 45, 45],
+                    headerRows: 1,
+                    body: this.CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
+                },
+                layout: this.HeaderLineStyle(),
+            };
+        }
+        else {
+            return {
+                style: 'tableExample1',
+                table: {
+                    widths: [50, 30, 30, 60, 60],
+                    headerRows: 1,
+                    body: this.CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
+                },
+                layout: this.HeaderLineStyle(),
+            };
+        }
+    }
+    static CreateHeadingAllHSNTaxList(ShowIGST) {
+        let HeaderNames = [{ text: 'HSN', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'HSN', alignment: 'right' },
+            { text: 'Taxable Value', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxableAmount', alignment: 'right' },
+            { text: 'Amount', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxAmount', alignment: 'right' },
+        ];
+        if (ShowIGST) {
+            HeaderNames.splice(1, 0, { text: 'IGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'IGST', alignment: 'right' });
+        }
+        else {
+            HeaderNames.splice(1, 0, { text: 'CGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'CGST', alignment: 'right' });
+            HeaderNames.splice(2, 0, { text: 'SGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'SGST', alignment: 'right' });
+        }
+        return HeaderNames;
+    }
+    static CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
+        if (!tr_utils_1.TrUtils.IsNull(PartsTaxInfo) && PartsTaxInfo.length !== 0 && ShowAccParts && ShowTaxColumn) {
+            var body = [];
+            let columns = this.CreateHeadingAllHSNTaxList(ShowIGST);
+            body.push(columns);
+            PartsTaxInfo.forEach((part) => {
+                var dataRow = [];
+                columns.forEach((column) => {
+                    if (!tr_utils_1.TrUtils.IsFixedZero(part[column.Field]) &&
+                        !tr_utils_1.TrUtils.IsNull(part[column.Field]) || column.Field === 'SGST' || column.Field === 'CGST'
+                        || column.Field === 'TotalTaxAmount') {
+                        if (column.Field === 'HSN') {
+                            dataRow.push({ text: part[column.Field].toString(), alignment: 'right', nowrap: true });
+                        }
+                        else {
+                            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(part[column.Field]).toString(), alignment: 'right', nowrap: true });
+                        }
+                    }
+                    else {
+                        part[column.Field] = '';
+                        dataRow.push({ text: part[column.Field].toString(), alignment: 'right' });
+                    }
+                });
+                body.push(dataRow);
+            });
+            return body;
+        }
+        else {
+            return [{}];
+        }
+    }
+    static HeaderLineStyle() {
+        return {
+            hLineWidth: function (i, node) {
+                return (i === 1) ? 0.1 : 0;
+            },
+            vLineWidth: function (i, node) {
+                return (i === 0 || i === node.table.widths.length) ? 0 : 0;
+            },
+            hLineColor: function (i, node) {
+                let color;
+                if (i === 0 || i === node.table.body.length) {
+                    color = 'black';
+                }
+                else {
+                    if (i === 1) {
+                        color = 'lightgray';
+                    }
+                    else {
+                        color = 'lightgray';
+                    }
+                }
+                return color;
+            },
+        };
+    }
+}
+exports.InvoicePortraitPrintService = InvoicePortraitPrintService;

package/package.json

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