shareneus 1.1.8 → 1.2.0

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

@@ -676,7 +676,7 @@ class InvoiceprintService {
         return headersNames;
     }
     static CommonTotalDetails(ROPrintData, index, numberofCopies, withPass, isAuto) {
-        console.log('ROPrintData', ROPrintData);
+        // console.log('ROPrintData', ROPrintData);
         let CommonDetails = [
             // SharedPDFService.GetFinalTotalDetails(ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST,
             //     ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn,

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

@@ -53,9 +53,7 @@ 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;

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

@@ -156,7 +156,7 @@ class InvoiceLandscapePdfService {
         ];
     }
     static PreparesparePartsTable(ROPrintData) {
-        console.log('ROPrintData', 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

@@ -4,6 +4,7 @@ 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");
+const shared_pdf_service_1 = require("./shared-pdf.service");
 class InvoicePortraitPrintService {
     static GetPrint(InvoicePDFData, size, printOptions) {
         // console.log('InvoicePDFData', InvoicePDFData);
@@ -35,7 +36,7 @@ class InvoicePortraitPrintService {
                 },
                 this.GetItemsTable(InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.Settings.PoS.SType, printOptions, size),
                 [this.TotalDetails(InvoicePDFData)],
-                this.GetSignatures(InvoicePDFData.Entity.CName, InvoicePDFData.Type, InvoicePDFData.For),
+                this.GetSignatures(InvoicePDFData.Entity.CName, InvoicePDFData.CustRoundedTotal),
             ],
             styles: {
                 headerstyle: {
@@ -276,11 +277,11 @@ class InvoicePortraitPrintService {
             ]
         };
     }
-    static GetSignatures(CName, For, Type) {
+    static GetSignatures(CName, Total) {
         return {
             columns: [{
                     stack: [
-                        { columns: ['', '', this.CompanyName(CName)] }
+                        { columns: [this.GetNumberInWords(Total), '', this.CompanyName(CName)] }
                     ]
                 }],
         };
@@ -330,7 +331,7 @@ class InvoicePortraitPrintService {
         };
     }
     static GetWidths(ShowTaxColumn, printOptions) {
-        if (ShowTaxColumn && printOptions.Tax !== 'NO') {
+        if (ShowTaxColumn && printOptions.ShowTax !== 'NO') {
             if (printOptions.Disc === 'NO') {
                 return [16, '*', 40, 45, 25, 20, 20, 45, 45, 30, 50];
             }
@@ -375,7 +376,7 @@ class InvoicePortraitPrintService {
                     dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Disc), alignment: 'right', style: ['headerstyle'], });
                 }
             }
-            if (ShowTaxColumn && printOptions.Tax !== 'NO') {
+            if (ShowTaxColumn && printOptions.ShowTax !== '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'], });
             }
@@ -411,7 +412,7 @@ class InvoicePortraitPrintService {
             if (printOptions.Disc !== 'NO') {
                 HeadingNames[0].splice(9, 0, { text: (printOptions.Disc === 'PERC') ? 'Disc(%)' : 'Disc(Rs)', style: 'tableheader1', Field: 'Disc' });
             }
-            if (printOptions.Tax !== 'NO') {
+            if (printOptions.ShowTax !== 'NO') {
                 HeadingNames[0].splice(10, 0, { text: (SType === 'Intra') ? 'GST(%)' : 'IGST(%)', style: 'tableheader1', Field: 'TaxAmount', alignment: 'right' });
             }
         }
@@ -607,6 +608,11 @@ class InvoicePortraitPrintService {
             return [{}];
         }
     }
+    static GetNumberInWords(TotalAmount) {
+        var rupee = shared_pdf_service_1.SharedPDFService.convertNumberToWords(TotalAmount);
+        // console.log('rupee', rupee);
+        return { columns: [{ text: 'In Words :', fontSize: 8, width: 45 }, { text: rupee, bold: true, fontSize: 8, width: '*' }] };
+    }
     static HeaderLineStyle() {
         return {
             hLineWidth: function (i, node) {

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

@@ -370,6 +370,11 @@ class PrintSharedService {
                     }
                 });
             }
+            else if (!tr_utils_1.TrUtils.IsNull(PrintInfo.Items)) {
+                PartDiscItem = PrintInfo.Items.findIndex((Item) => {
+                    return !tr_utils_1.TrUtils.IsZero(Item.Disc);
+                });
+            }
             if (LaborDiscItem !== -1 || PartDiscItem !== -1) {
                 return PrintInfo;
             }

package/package.json

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