gemcap-be-common 1.5.25 → 1.5.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.25",
+  "version": "1.5.27",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/pdf.service.js

@@ -404,6 +404,8 @@ class PdfService {
             [p._id.toString()]: 0,
         }), {});
         let totalStatementValue = 0;
+        const principalData = [];
+        let paymentDueDate = null;
         const docContent = await Promise.all(productForPeriod.map(async (product, index) => {
             const { startStatementBalance, preparedStatementHeader, preparedStatement, preparedTransactionsHeader, preparedTransactions, groupedData, otherStatements, } = await this.getProductStatementData(product._id.toString(), start, end);
             totalOverDueStatementBalance = new decimal_js_1.default(totalOverDueStatementBalance).add(startStatementBalance).toNumber();
@@ -438,8 +440,10 @@ class PdfService {
                 emptyString,
                 ...preparedTransactionsHeader,
                 preparedTransactions,
-                productForPeriod.length === index + 1 ? emptyString : pageBreaker,
             ];
+            const productPageEnd = productForPeriod.length === index + 1
+                ? emptyString
+                : pageBreaker;
             if (product.type === loan_types_enum_1.ELoanTypes.TERM) {
                 const { termLoanTableData, monthlyPrincipal, dueDate, } = await this.getTermLoan(product._id.toString(), new Date(start));
                 if (monthlyPrincipal !== null) {
@@ -463,9 +467,13 @@ class PdfService {
                         table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
                         layout: 'lightHorizontalLines',
                     },
+                    productPageEnd,
                 ];
             }
-            return baseContent;
+            return [
+                ...baseContent,
+                productPageEnd,
+            ];
         }));
         const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {
             totalStatementValue = new decimal_js_1.default(totalStatementValue).add(amount).toNumber();
@@ -482,8 +490,6 @@ class PdfService {
                 { text: '' }
             ]
             : [];
-        const principalData = [];
-        let paymentDueDate = null;
         const totalOwed = new decimal_js_1.default(totalStatementValue).add(totalOverDueStatementBalance).toNumber();
         if (getOnlyTotal) {
             return { total: totalOwed, dueDate: paymentDueDate, productTotals };

package/services/pdf.service.ts

@@ -473,6 +473,8 @@ export class PdfService {
     }), {});
 
     let totalStatementValue = 0;
+    const principalData = [];
+    let paymentDueDate: Date = null;
 
     const docContent = await Promise.all(productForPeriod.map(async (product, index) => {
       const {
@@ -520,9 +522,12 @@ export class PdfService {
         emptyString,
         ...preparedTransactionsHeader,
         preparedTransactions,
-        productForPeriod.length === index + 1 ? emptyString : pageBreaker,
       ];
 
+      const productPageEnd = productForPeriod.length === index + 1
+        ? emptyString
+        : pageBreaker;
+
       if (product.type === ELoanTypes.TERM) {
         const {
           termLoanTableData,
@@ -552,10 +557,14 @@ export class PdfService {
             table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
             layout: 'lightHorizontalLines',
           },
+          productPageEnd,
         ];
       }
 
-      return baseContent;
+      return [
+        ...baseContent,
+        productPageEnd,
+      ];
     }));
 
     const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {
@@ -574,9 +583,6 @@ export class PdfService {
         { text: '' }]
       : [];
 
-    const principalData = [];
-    let paymentDueDate: Date = null;
-
     const totalOwed = new Decimal(totalStatementValue).add(totalOverDueStatementBalance).toNumber();
 
     if (getOnlyTotal) {