shareneus 1.7.16 → 1.7.18

package/dist/accounting/invoice/invoice-pdf/invoice-pdf.service.js

@@ -261,11 +261,18 @@ function buildPdfDocDefinition(PDFInvoiceData = {}, PrintConfigData = {}, printC
         }, ...invoiceTotalsAndNotesContent, ...signatureContent);
     });
     const dd = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ pageSize: pageSize }, (typeof pageSize === 'string' ? { pageOrientation: requestedPageOrientation } : {})), { pageMargins: pageMargins, content: content, info: {
-            title: 'invoice',
+            title: GetFileName(PDFInvoiceData),
             subject: Array.isArray(printCopies) ? printCopies.join(', ') : ''
         } }), (background ? { background } : {})), (watermark ? { watermark } : {})), (pageHeader !== null ? { header: pageHeader } : {})), (pageFooter !== null ? { footer: pageFooter } : {}));
     return dd;
 }
+function GetFileName(ROPrintData) {
+    let fileName = ROPrintData.HeaderName;
+    if (!tr_utils_1.TrUtils.IsNull(ROPrintData.Product) && !tr_utils_1.TrUtils.IsEmpty(ROPrintData.Product.RegNo)) {
+        fileName = fileName + '-' + ROPrintData.Product.RegNo;
+    }
+    return fileName;
+}
 function normalizeCopyLabels(printCopies = []) {
     const labels = Array.isArray(printCopies)
         ? printCopies

package/dist/shared/header-footer-section/pdf-header-footer.section.js

@@ -179,7 +179,7 @@ function buildDocumentHeadingSection(PDFInvoiceData, PrintConfig, availableWidth
 }
 function buildWatermark(PrintConfig, DocumentData = {}) {
     const value = (DocumentData === null || DocumentData === void 0 ? void 0 : DocumentData.IsProforma) ? 'Not a final invoice' : (0, pdf_shared_utils_1.firstValue)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.WatermarkText);
-    const isEnabled = !!((PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Watermark) || (PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.WatermarkEnabled) || value);
+    const isEnabled = !!(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Watermark);
     if (!isEnabled) {
         return null;
     }

package/package.json

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

package/src/accounting/invoice/invoice-pdf/invoice-pdf.service.ts

@@ -296,7 +296,7 @@ function buildPdfDocDefinition(PDFInvoiceData: any = {}, PrintConfigData: any =
         pageMargins: pageMargins,
         content: content,
         info: {
-            title: 'invoice',
+            title: GetFileName(PDFInvoiceData),
             subject: Array.isArray(printCopies) ? printCopies.join(', ') : ''
         },
         ...(background ? { background } : {}),
@@ -308,6 +308,14 @@ function buildPdfDocDefinition(PDFInvoiceData: any = {}, PrintConfigData: any =
     return dd;
 }
 
+function GetFileName(ROPrintData: any) {
+    let fileName: string = ROPrintData.HeaderName;
+    if (!TrUtils.IsNull(ROPrintData.Product) && !TrUtils.IsEmpty(ROPrintData.Product.RegNo)) {
+        fileName = fileName + '-' + ROPrintData.Product.RegNo;
+    }
+    return fileName;
+}
+
 function normalizeCopyLabels(printCopies: string[] = []) {
     const labels = Array.isArray(printCopies)
         ? printCopies

package/src/shared/header-footer-section/pdf-header-footer.section.ts

@@ -202,7 +202,7 @@ export function buildDocumentHeadingSection(PDFInvoiceData: any, PrintConfig: an
 
 export function buildWatermark(PrintConfig: any, DocumentData: any = {}) {
     const value = DocumentData?.IsProforma ? 'Not a final invoice' : firstValue(PrintConfig?.WatermarkText);
-    const isEnabled = !!(PrintConfig?.Watermark || PrintConfig?.WatermarkEnabled || value);
+    const isEnabled = !!(PrintConfig?.Watermark);
     if (!isEnabled) {
         return null;
     }