shareneus 1.4.75 → 1.4.77

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

@@ -1488,7 +1488,7 @@ class SharedPDFService {
             // { text: 'CGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'CGST' },
             // { text: 'SGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'SGST' },
             // { text: 'Count', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'PartsCount' },
-            { text: 'Tax Rate', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CombinedTaxPercentage', alignment: 'center' },
+            { text: 'Tax Rate', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CombinedTaxPercentage', alignment: 'left' },
             { text: 'Taxable Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxableAmount', alignment: 'right' },
             // { text: 'Tax Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxAmount' },
         ];
@@ -1527,7 +1527,7 @@ class SharedPDFService {
                     }
                     else {
                         part[column.Field] = '';
-                        dataRow.push({ text: part[column.Field].toString(), alignment: 'center', opacity: 0.7, fontSize: 6 });
+                        dataRow.push({ text: part[column.Field].toString(), alignment: 'left', opacity: 0.7, fontSize: 6 });
                     }
                 });
                 body.push(dataRow);
@@ -1647,8 +1647,7 @@ class SharedPDFService {
                 this.GrandTotal1(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
             ]
             // columnGap: 40
-            ,
-            marginLeft: 10
+            // , marginLeft: 10
         };
     }
     static GrandTotal1(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails) {
@@ -2125,8 +2124,8 @@ class SharedPDFService {
                 marginBottom: 5,
                 table: {
                     widths: ['*', 'auto'],
-                    body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid, DecimalsNumber) },
-                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) }]]
+                    body: [[{ text: 'Paid : Rs.' + tr_utils_1.TrUtils.FixPriceValue(Paid, DecimalsNumber), marginLeft: 30 },
+                            { text: 'Due : Rs.' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber), marginRight: 30 }]]
                 },
                 layout: this.LayOutLineStyle(),
             };
@@ -2144,8 +2143,8 @@ class SharedPDFService {
             marginBottom: 5,
             table: {
                 widths: ['*', 'auto'],
-                body: [[{ text: 'Paid : ' + Paid },
-                        { text: 'Due : ' + Due }]]
+                body: [[{ text: 'Paid : Rs.' + Paid, marginLeft: 30 },
+                        { text: 'Due : Rs.' + Due, marginRight: 30 }]]
             },
             layout: this.LayOutStyle(),
         };
@@ -2286,14 +2285,13 @@ class SharedPDFService {
     }
     static CompanyName(CName) {
         return {
-            style: 'forCompany',
-            text: ['For ', { text: CName, bold: 'true' }],
+            text: [{ text: 'For ', fontSize: 10 }, { text: CName, bold: 'true', fontSize: 10 }],
         };
     }
     static Authorizedsignature() {
         return {
             style: 'Sign',
-            text: ['Authorized Signature'], width: 'auto'
+            text: ['Authorised Signatory'], width: 'auto'
         };
     }
     static Accountantsignature() {
@@ -2312,7 +2310,7 @@ class SharedPDFService {
     static PatientSignature() {
         return {
             style: 'Sign',
-            text: ['Patient Signature'], width: '*'
+            text: ['Patient / Guardian Signature'], width: '*'
         };
     }
     static SurveyorSignature(For, Type) {
@@ -2465,7 +2463,7 @@ class SharedPDFService {
             },
             textcust: {
                 fontSize: this.BodySize,
-                margin: [0, 5, 0, 5],
+                margin: [0, 2, 0, 2],
             },
             column: {
                 margin: [15, 0, 0, 0]
@@ -2525,20 +2523,20 @@ class SharedPDFService {
             },
             forCompany: {
                 margin: [0, 10, 30, 0],
-                fontSize: '9'
+                fontSize: 9
             },
             forCompany1: {
                 margin: [0, 5, 15, 0],
-                fontSize: '9'
+                fontSize: 9
             },
             Rupees: {
                 margin: [0, 40, 0, 0],
-                fontSize: '10',
+                fontSize: 10,
             },
             Signature: {
                 margin: [0, 40, 50, 0],
                 alignment: 'right',
-                fontSize: '10'
+                fontSize: 10
             },
             withApp: {
                 alignment: 'center',
@@ -2550,7 +2548,7 @@ class SharedPDFService {
             },
             Sign: {
                 fontSize: this.BodySize,
-                margin: [0, 30, 0, 5]
+                margin: [0, 20, 0, 5]
             },
             Sign1: {
                 fontSize: this.BodySize,

package/package.json

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