npm - gemcap-be-common - Versions diffs - 1.5.7 → 1.5.8 - Mend

gemcap-be-common 1.5.7 → 1.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json +1 -1
package/services/loan-statement.service.js +15 -13
package/services/loan-statement.service.ts +15 -13
package/tsconfig.tsbuildinfo +1 -1

package/package.json CHANGED Viewed

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

package/services/loan-statement.service.js CHANGED Viewed

@@ -289,19 +289,21 @@ class LoanStatementService {
                 };
                 fee = checkMinAmount(fee);
                 if (fee !== null && fee > 0) {
-                    const newStatement = {
-                        order: orderIndex,
-                        date: statementDate,
-                        chargeId: charge._id,
-                        amount: fee,
-                        amountPaid: 0,
-                        isSystem: true,
-                        memo: 'System Generated',
-                        balance: 0,
-                    };
-                    const newStatementDoc = await LoanStatementTransaction_model_1.LoanStatementTransactionModel.create(newStatement);
-                    await newStatementDoc.save();
-                    orderIndex = orderIndex + 1;
+                    if ((0, dayjs_1.default)(statementDate).isSame((0, dayjs_1.default)(charge.applyFrom)) || (0, dayjs_1.default)(statementDate).isAfter((0, dayjs_1.default)(charge.applyFrom))) {
+                        const newStatement = {
+                            order: orderIndex,
+                            date: statementDate,
+                            chargeId: charge._id,
+                            amount: fee,
+                            amountPaid: 0,
+                            isSystem: true,
+                            memo: 'System Generated',
+                            balance: 0,
+                        };
+                        const newStatementDoc = await LoanStatementTransaction_model_1.LoanStatementTransactionModel.create(newStatement);
+                        await newStatementDoc.save();
+                        orderIndex = orderIndex + 1;
+                    }
                 }
             }
         }

package/services/loan-statement.service.ts CHANGED Viewed

@@ -333,19 +333,21 @@ export class LoanStatementService {
         fee = checkMinAmount(fee);
         if (fee !== null && fee > 0) {
-          const newStatement: ILoanStatementTransaction = {
-            order: orderIndex,
-            date: statementDate,
-            chargeId: charge._id,
-            amount: fee,
-            amountPaid: 0,
-            isSystem: true,
-            memo: 'System Generated',
-            balance: 0,
-          };
-          const newStatementDoc = await LoanStatementTransactionModel.create(newStatement);
-          await newStatementDoc.save();
-          orderIndex = orderIndex + 1;
+          if (dayjs(statementDate).isSame(dayjs(charge.applyFrom)) || dayjs(statementDate).isAfter(dayjs(charge.applyFrom))) {
+            const newStatement: ILoanStatementTransaction = {
+              order: orderIndex,
+              date: statementDate,
+              chargeId: charge._id,
+              amount: fee,
+              amountPaid: 0,
+              isSystem: true,
+              memo: 'System Generated',
+              balance: 0,
+            };
+            const newStatementDoc = await LoanStatementTransactionModel.create(newStatement);
+            await newStatementDoc.save();
+            orderIndex = orderIndex + 1;
+          }
         }
       }
     }