shareneus 1.5.51 → 1.5.53

package/dist/accounting/invoice/invoice-letterhead-pdf.service.d.ts

@@ -226,7 +226,7 @@ export declare class InvoiceLetterheadPdfService {
         } | {
             text: any;
             alignment: string;
-            width?: undefined;
+            width: string;
         })[];
         style: string;
     } | {

package/dist/shared/shared-pdf.service.d.ts

@@ -55,7 +55,7 @@ export declare class SharedPDFService {
         } | {
             text: any;
             alignment: string;
-            width?: undefined;
+            width: string;
         })[];
         style: string;
     };

package/dist/shared/shared-pdf.service.js

@@ -192,42 +192,38 @@ class SharedPDFService {
         return Details;
     }
     static GetAddresDetailsAndLogo(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
-        const headerWidth = orientation === 'landscape' ? 400 : 300;
-        const emptyWidth = orientation === 'landscape' ? 200 : 150;
-        const noImageEmptyWidth = orientation === 'landscape' ? 170 : 130;
-        let Details = [
+        const logoWidth = 120;
+        const logoHeight = 80;
+        const headerStyle = this.GetMainHeaderStyleForLeftAlignHeader(Entity.CName || '');
+        const extras = [];
+        if (!tr_utils_1.TrUtils.IsNull(Entity.PageCount)) {
+            extras.push({ text: 'Page: ' + Entity.PageCount, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(Entity.Extra1)) {
+            extras.push({ text: Entity.Extra1, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(Entity.Extra2)) {
+            extras.push({ text: Entity.Extra2, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
+        }
+        const centerStack = [
+            { text: '' + (Entity.CName || '') + '', color: HColor, fontSize: headerStyle.fontSize, bold: true, alignment: 'center' },
             {
-                stack: [
-                    { columns: [this.MainHeading(Entity.CName, Entity, Image, HColor, text)] },
-                    {
-                        columns: [{
-                                width: headerWidth,
-                                margin: [0, 0, 0, 5],
-                                stack: this.GetHeader(Entity, HColor),
-                                color: AColor,
-                                style: 'header'
-                            },
-                            this.emptyObject()]
-                    }
-                ]
+                stack: this.GetHeader(Entity, HColor),
+                color: AColor,
+                style: 'header',
+                alignment: 'center',
+                margin: [0, 0, 0, 2]
             }
         ];
-        if (!tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo) {
-            // Details.unshift({ text: '', width: 120 });
-            if (Entity.CName.length < 28) {
-                Details[0].stack[0].columns.push({ text: '', width: emptyWidth });
-            }
-            if (!tr_utils_1.TrUtils.IsNull(text)) {
-                Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 7 });
-            }
-            Details.unshift({ image: Image, width: 120, height: 80 });
-        }
-        else {
-            Details[0].stack[1].columns.unshift({ text: '', width: noImageEmptyWidth });
-            if (!tr_utils_1.TrUtils.IsNull(text)) {
-                Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 7 });
-            }
+        if (!tr_utils_1.TrUtils.IsNull(text)) {
+            centerStack.push({ text: text, color: 'grey', alignment: 'center', fontSize: 7, margin: [0, 0, 0, 1] });
         }
+        extras.forEach((row) => centerStack.push(row));
+        let Details = [
+            !tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo ? { image: Image, width: logoWidth, height: logoHeight } : { text: '', width: logoWidth },
+            { width: '*', stack: centerStack },
+            { text: '', width: logoWidth }
+        ];
         return Details;
     }
     static GetHeader(Entity, HColor) {
@@ -399,9 +395,10 @@ class SharedPDFService {
     }
     static GetPrintType(type) {
         return {
-            // marginLeft: 10,
-            columns: [{ text: '', width: 120 },
-                { text: type, alignment: 'center' }, { text: '', width: 140 }
+            columns: [
+                { text: '', width: 120 },
+                { text: type, alignment: 'center', width: '*' },
+                { text: '', width: 120 }
             ],
             style: 'Receiptheader1'
         };

package/package.json

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