erxes · munkhsaikhan · Jun 4, 2025 · May 29, 2025 · May 30, 2025 · May 30, 2025
diff --git a/packages/plugin-loans-api/src/messageBroker.ts b/packages/plugin-loans-api/src/messageBroker.ts
@@ -4,7 +4,6 @@ import { generateModels } from './connectionResolver';
 import fetch from 'node-fetch';
 import { consumeRPCQueue } from '@erxes/api-utils/src/messageBroker';
 import { getCloseInfo } from './models/utils/closeUtils';
-import { IConfig } from './interfaces/config';
 import { dealContract } from './utils';
 
 type CustomFieldType = 'core:customer';
@@ -15,7 +14,7 @@ export const setupMessageConsumers = async () => {
 
     return {
       status: 'success',
-      data: await models.Contracts.find(data).lean(),
+      data: await models.Contracts.find(data).lean()
     };
   });
 
@@ -24,7 +23,7 @@ export const setupMessageConsumers = async () => {
 
     return {
       status: 'success',
-      data: await models.Contracts.findOne(data).lean(),
+      data: await models.Contracts.findOne(data).lean()
     };
   });
 
@@ -35,7 +34,7 @@ export const setupMessageConsumers = async () => {
 
       return {
         status: 'success',
-        data: await models.FirstSchedules.findOne(data).lean(),
+        data: await models.FirstSchedules.findOne(data).lean()
       };
     }
   );
@@ -47,7 +46,7 @@ export const setupMessageConsumers = async () => {
     const result = await models.Contracts.updateOne(selector, modifier);
     return {
       status: 'success',
-      data: result,
+      data: result
     };
   });
 
@@ -56,12 +55,12 @@ export const setupMessageConsumers = async () => {
     async ({ subdomain, data }) => {
       const models = await generateModels(subdomain);
       const contract = await models.Contracts.getContract({
-        _id: data.contractId,
+        _id: data.contractId
       });
       const closeInfo = await getCloseInfo(models, contract, data.closeDate);
       return {
         status: 'success',
-        data: closeInfo,
+        data: closeInfo
       };
     }
   );
@@ -73,7 +72,7 @@ export const setupMessageConsumers = async () => {
 
       return {
         status: 'success',
-        data: await dealContract(dealId, args, models, subdomain),
+        data: await dealContract(dealId, args, models, subdomain)
       };
     }
   );
@@ -82,15 +81,15 @@ export const setupMessageConsumers = async () => {
     const models = await generateModels(subdomain);
     return {
       status: 'success',
-      data: await models.ContractTypes.findOne(data).lean(),
+      data: await models.ContractTypes.findOne(data).lean()
     };
   });
 
   consumeRPCQueue('loans:purposeType.findOne', async ({ subdomain, data }) => {
     const models = await generateModels(subdomain);
     return {
       status: 'success',
-      data: await models.LoanPurpose.findOne(data).lean(),
+      data: await models.LoanPurpose.findOne(data).lean()
     };
   });
 
@@ -100,7 +99,7 @@ export const setupMessageConsumers = async () => {
       const models = await generateModels(subdomain);
       return {
         status: 'success',
-        data: await models.CollateralTypes.findOne(data).lean(),
+        data: await models.CollateralTypes.findOne(data).lean()
       };
     }
   );
@@ -110,7 +109,7 @@ export const setupMessageConsumers = async () => {
 
     return {
       status: 'success',
-      data: await models.ContractTypes.find(data).lean(),
+      data: await models.ContractTypes.find(data).lean()
     };
   });
 
@@ -119,7 +118,7 @@ export const setupMessageConsumers = async () => {
 
     return {
       status: 'success',
-      data: await models.Transactions.find(data).lean(),
+      data: await models.Transactions.find(data).lean()
     };
   });
 
@@ -132,14 +131,29 @@ export const setupMessageConsumers = async () => {
       return {
         status: 'success',
         data: await models.Transactions.find({
-          contractId: { $in: contracts.map((c) => c._id) },
-        }).lean(),
+          contractId: { $in: contracts.map((c) => c._id) }
+        }).lean()
       };
     }
   );
+
+  consumeRPCQueue(
+    'savings:transactions.update',
+    async ({ subdomain, data }) => {
+      const models = await generateModels(subdomain);
+      const { selector, modifier } = data;
+      const result = await models.Transactions.updateOne(selector, modifier);
+
+      return {
+        status: 'success',
+        data: result
+      };
+    }
+  );
+
   consumeRPCQueue('loans:transaction', async ({ subdomain, data }) => {
     return {
-      status: 'success',
+      status: 'success'
     };
   });
   consumeRPCQueue(
@@ -149,7 +163,7 @@ export const setupMessageConsumers = async () => {
 
       return {
         data: await models.FirstSchedules.insertMany(data),
-        status: 'success',
+        status: 'success'
       };
     }
   );
@@ -158,7 +172,7 @@ export const setupMessageConsumers = async () => {
 
     return {
       data: await models.FirstSchedules.insertMany(data),
-      status: 'success',
+      status: 'success'
     };
   });
 };
@@ -178,7 +192,7 @@ export const sendMessageBroker = async (
 ): Promise<any> => {
   return sendMessage({
     serviceName: name,
-    ...args,
+    ...args
   });
 };
 
@@ -187,7 +201,7 @@ export const sendCoreMessage = async (
 ): Promise<any> => {
   return sendMessage({
     serviceName: 'core',
-    ...args,
+    ...args
   });
 };
 
@@ -196,7 +210,7 @@ export const sendSalesMessage = async (
 ): Promise<any> => {
   return sendMessage({
     serviceName: 'sales',
-    ...args,
+    ...args
   });
 };
 
@@ -205,15 +219,15 @@ export const sendReactionsMessage = async (
 ): Promise<any> => {
   return sendMessage({
     serviceName: 'reactions',
-    ...args,
+    ...args
   });
 };
 
 export const sendCommonMessage = async (
   args: MessageArgs & { serviceName: string }
 ): Promise<any> => {
   return sendMessage({
-    ...args,
+    ...args
   });
 };
 
@@ -229,16 +243,16 @@ export const getFieldObject = async (
     data: {
       query: {
         contentType: customFieldType,
-        code: { $exists: true, $ne: '' },
+        code: { $exists: true, $ne: '' }
       },
       projection: {
         groupId: 1,
         code: 1,
-        _id: 1,
-      },
+        _id: 1
+      }
     },
     isRPC: true,
-    defaultValue: [],
+    defaultValue: []
   });
 
   return fields.find((row) => row.code === code);
@@ -266,7 +280,7 @@ export const getConfig = async (
     action: 'getConfig',
     data: { code, defaultValue },
     isRPC: true,
-    defaultValue,
+    defaultValue
   });
 };
 
@@ -298,7 +312,7 @@ export const sendSms = async (
             key: MESSAGE_PRO_API_KEY,
             from: MESSAGE_PRO_PHONE_NUMBER,
             to: phoneNumber,
-            text: content,
+            text: content
           })
       );
 

diff --git a/packages/plugin-loans-api/src/models/definitions/transactions.ts b/packages/plugin-loans-api/src/models/definitions/transactions.ts
@@ -18,7 +18,7 @@ export interface IBankTransaction {
   toOwner?: string;
 }
 
-export interface IEBarimt { }
+export interface IEBarimt {}
 
 export interface ITransaction {
   number?: string;
@@ -65,6 +65,7 @@ export interface ITransaction {
   isOrganization?: boolean;
   organizationRegister?: string;
   scheduleId?: string;
+  isSyncedTransaction?: boolean;
 }
 
 export interface ITransactionDocument extends ITransaction, Document {
@@ -211,6 +212,11 @@ export const transactionSchema = schemaHooksWrapper(
       type: String,
       optional: true,
       label: 'scheduleId'
+    }),
+    isSyncedTransaction: field({
+      type: Boolean,
+      label: 'Is Synced transaction',
+      optional: true
     })
   }),
   'erxes_transactionSchema'

diff --git a/packages/plugin-loans-ui/src/transactions/types.ts b/packages/plugin-loans-ui/src/transactions/types.ts
@@ -27,6 +27,7 @@ export interface ITransactionDoc {
   total: number;
   futureDebt?: number;
   debtTenor?: number;
+  isSyncedTransaction?: boolean;
 }
 
 export interface ITransaction extends ITransactionDoc {

diff --git a/packages/plugin-savings-api/src/graphql/resolvers/queries/contracts.ts b/packages/plugin-savings-api/src/graphql/resolvers/queries/contracts.ts
@@ -256,7 +256,10 @@ const contractQueries = {
 
     return {
       list: await paginate(
-        models.Contracts.find(filter).sort(sortBuilder(params)),
+        models.Contracts.find(filter).sort(
+          { createdAt: -1 },
+          sortBuilder(params)
+        ),
         {
           page: params.page,
           perPage: params.perPage
@@ -345,11 +348,11 @@ const contractQueries = {
     const account = await models.Contracts.findOne({ number: accountNumber });
 
     if (!account) {
-      throw new Error('cant find account')
+      throw new Error('cant find account');
     }
 
     if (!account.customerId) {
-      throw new Error('this account has not customer')
+      throw new Error('this account has not customer');
     }
 
     const customer = await sendMessageBroker(

diff --git a/packages/plugin-savings-api/src/messageBroker.ts b/packages/plugin-savings-api/src/messageBroker.ts
@@ -124,6 +124,20 @@ export const setupMessageConsumers = async () => {
       };
     }
   );
+
+  consumeRPCQueue(
+    "savings:transactions.update",
+    async ({ subdomain, data }) => {
+      const models = await generateModels(subdomain);
+      const { selector, modifier } = data;
+      const result = await models.Transactions.updateOne(selector, modifier);
+
+      return {
+        status: "success",
+        data: result
+      };
+    }
+  );
 };
 
 export const getConfig = async (