gemcap-be-common 1.5.23 → 1.5.25

package/package.json

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

package/services/pdf.service.js

@@ -403,6 +403,7 @@ class PdfService {
             ...acc,
             [p._id.toString()]: 0,
         }), {});
+        let totalStatementValue = 0;
         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();
@@ -419,8 +420,8 @@ class PdfService {
             const warningText = product.type === loan_types_enum_1.ELoanTypes.REVOLVER
                 ? `AMOUNT WILL BE ADDED TO THE LOAN ON 1ST. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THERE IS INSUFFICIENT AVAILABILITY TO ADD IT TO THE LOAN.`
                 : `PAYABLE BY 7TH. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THE STATEMENT IS NOT PAID.`;
-            return [
-                this.addHeaderNew(organization.subfolder), // Add the image element to the content
+            const baseContent = [
+                this.addHeaderNew(organization.subfolder),
                 emptyString,
                 ...preparedStatementHeader,
                 emptyString,
@@ -439,8 +440,33 @@ class PdfService {
                 preparedTransactions,
                 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) {
+                    totalStatementValue = new decimal_js_1.default(totalStatementValue).add(monthlyPrincipal).toNumber();
+                    principalData.push([
+                        { text: `Principal (${product.name})` },
+                        { text: (0, numbers_helper_1.formatNumbers)(monthlyPrincipal), alignment: 'right' },
+                        { text: '' },
+                    ]);
+                    paymentDueDate = dueDate;
+                    productTotals[product._id.toString()] = new decimal_js_1.default(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
+                }
+                return [
+                    ...baseContent,
+                    pageBreaker,
+                    this.addHeaderNew(organization.subfolder),
+                    emptyString,
+                    { text: `Term loan schedule: `, fontSize: 15, bold: true },
+                    emptyString,
+                    {
+                        table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
+                        layout: 'lightHorizontalLines',
+                    },
+                ];
+            }
+            return baseContent;
         }));
-        let totalStatementValue = 0;
         const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {
             totalStatementValue = new decimal_js_1.default(totalStatementValue).add(amount).toNumber();
             return [
@@ -458,31 +484,6 @@ class PdfService {
             : [];
         const principalData = [];
         let paymentDueDate = null;
-        const termLoanProducts = productForPeriod.filter((product) => product.type === loan_types_enum_1.ELoanTypes.TERM);
-        await Promise.all(termLoanProducts.map(async (product) => {
-            const { termLoanTableData, monthlyPrincipal, dueDate, } = await this.getTermLoan(product._id.toString(), new Date(start));
-            if (monthlyPrincipal !== null) {
-                totalStatementValue = new decimal_js_1.default(totalStatementValue).add(monthlyPrincipal).toNumber();
-                principalData.push([
-                    { text: 'Principal' },
-                    { text: (0, numbers_helper_1.formatNumbers)(monthlyPrincipal), alignment: 'right' },
-                    { text: '' },
-                ]);
-                paymentDueDate = dueDate;
-                productTotals[product._id.toString()] = new decimal_js_1.default(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
-            }
-            docContent.push([
-                pageBreaker,
-                this.addHeaderNew(organization.subfolder),
-                emptyString,
-                { text: `Term loan schedule: `, fontSize: 15, bold: true },
-                emptyString,
-                {
-                    table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
-                    layout: 'lightHorizontalLines',
-                },
-            ]);
-        }));
         const totalOwed = new decimal_js_1.default(totalStatementValue).add(totalOverDueStatementBalance).toNumber();
         if (getOnlyTotal) {
             return { total: totalOwed, dueDate: paymentDueDate, productTotals };

package/services/pdf.service.ts

@@ -472,6 +472,8 @@ export class PdfService {
       [p._id.toString()]: 0,
     }), {});
 
+    let totalStatementValue = 0;
+
     const docContent = await Promise.all(productForPeriod.map(async (product, index) => {
       const {
         startStatementBalance,
@@ -500,8 +502,8 @@ export class PdfService {
         ? `AMOUNT WILL BE ADDED TO THE LOAN ON 1ST. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THERE IS INSUFFICIENT AVAILABILITY TO ADD IT TO THE LOAN.`
         : `PAYABLE BY 7TH. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THE STATEMENT IS NOT PAID.`;
 
-      return [
-        this.addHeaderNew(organization.subfolder), // Add the image element to the content
+      const baseContent = [
+        this.addHeaderNew(organization.subfolder),
         emptyString,
         ...preparedStatementHeader,
         emptyString,
@@ -520,9 +522,42 @@ export class PdfService {
         preparedTransactions,
         productForPeriod.length === index + 1 ? emptyString : pageBreaker,
       ];
+
+      if (product.type === ELoanTypes.TERM) {
+        const {
+          termLoanTableData,
+          monthlyPrincipal,
+          dueDate,
+        } = await this.getTermLoan(product._id.toString(), new Date(start));
+
+        if (monthlyPrincipal !== null) {
+          totalStatementValue = new Decimal(totalStatementValue).add(monthlyPrincipal).toNumber();
+          principalData.push([
+            { text: `Principal (${product.name})` },
+            { text: formatNumbers(monthlyPrincipal), alignment: 'right' },
+            { text: '' },
+          ]);
+          paymentDueDate = dueDate;
+          productTotals[product._id.toString()] = new Decimal(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
+        }
+
+        return [
+          ...baseContent,
+          pageBreaker,
+          this.addHeaderNew(organization.subfolder),
+          emptyString,
+          <any>{ text: `Term loan schedule: `, fontSize: 15, bold: true },
+          emptyString,
+          {
+            table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
+            layout: 'lightHorizontalLines',
+          },
+        ];
+      }
+
+      return baseContent;
     }));
 
-    let totalStatementValue = 0;
     const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {
       totalStatementValue = new Decimal(totalStatementValue).add(amount).toNumber();
       return [
@@ -541,37 +576,6 @@ export class PdfService {
 
     const principalData = [];
     let paymentDueDate: Date = null;
-    const termLoanProducts = productForPeriod.filter((product) => product.type === ELoanTypes.TERM);
-    await Promise.all(termLoanProducts.map(async (product) => {
-      const {
-        termLoanTableData,
-        monthlyPrincipal,
-        dueDate,
-      } = await this.getTermLoan(product._id.toString(), new Date(start));
-
-      if (monthlyPrincipal !== null) {
-        totalStatementValue = new Decimal(totalStatementValue).add(monthlyPrincipal).toNumber();
-        principalData.push([
-          { text: 'Principal' },
-          { text: formatNumbers(monthlyPrincipal), alignment: 'right' },
-          { text: '' },
-        ]);
-        paymentDueDate = dueDate;
-        productTotals[product._id.toString()] = new Decimal(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
-      }
-
-      docContent.push([
-        pageBreaker,
-        this.addHeaderNew(organization.subfolder),
-        emptyString,
-        <any>{ text: `Term loan schedule: `, fontSize: 15, bold: true },
-        emptyString,
-        {
-          table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
-          layout: 'lightHorizontalLines',
-        },
-      ]);
-    }));
 
     const totalOwed = new Decimal(totalStatementValue).add(totalOverDueStatementBalance).toNumber();