gemcap-be-common 1.5.5 → 1.5.6

package/package.json

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

package/services/pdf.service.js

@@ -236,11 +236,12 @@ class PdfService {
                 }],
             [{ text: 'Commitment amount' }, { text: (0, numbers_helper_1.formatNumbers)(product.commitment), alignment: 'right' }],
         ];
+        const endDate = dayjs_1.default.utc(product.deactivationDate).isBefore(dayjs_1.default.utc(end)) ? dayjs_1.default.utc(product.deactivationDate) : dayjs_1.default.utc(end);
         const preparedStatementHeader = [
             { text: `STATEMENT FOR PRODUCT: ${product.name}`, bold: true },
             { text: `Client: ${borrower.code}`, bold: true },
             {
-                text: `PERIOD FROM ${(0, dayjs_1.default)(start.slice(0, 10)).format(defaultDateFormat)} PERIOD TO ${(0, dayjs_1.default)(end.slice(0, 10)).format(defaultDateFormat)}`,
+                text: `PERIOD FROM ${dayjs_1.default.utc(start).format(defaultDateFormat)} TO ${endDate.format(defaultDateFormat)}`,
                 bold: true,
             },
             {

package/services/pdf.service.ts

@@ -272,11 +272,13 @@ export class PdfService {
       [{ text: 'Commitment amount' }, { text: formatNumbers(product.commitment), alignment: 'right' }],
     ];
 
+    const endDate = dayjs.utc(product.deactivationDate).isBefore(dayjs.utc(end)) ? dayjs.utc(product.deactivationDate) : dayjs.utc(end);
+
     const preparedStatementHeader = [
       { text: `STATEMENT FOR PRODUCT: ${product.name}`, bold: true },
       { text: `Client: ${borrower.code}`, bold: true },
       {
-        text: `PERIOD FROM ${dayjs(start.slice(0, 10)).format(defaultDateFormat)} PERIOD TO ${dayjs(end.slice(0, 10)).format(defaultDateFormat)}`,
+        text: `PERIOD FROM ${dayjs.utc(start).format(defaultDateFormat)} TO ${endDate.format(defaultDateFormat)}`,
         bold: true,
       },
       {