init

.github/workflows/plugin-syncpolaris-api.yaml

@@ -0,0 +1,64 @@
+name: Plugin syncpolaris Api CI
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+      - staging
+      - build-test
+    paths:
+      - 'packages/api-utils/**'
+      - 'packages/plugin-syncpolaris-api/**'
+      - '.github/workflows/plugin-syncpolaris-api.yaml'
+  pull_request:
+    branches:
+      - dev
+      - master
+      - staging
+      - build-test
+    paths:
+      - 'packages/api-utils/**'
+      - 'packages/plugin-syncpolaris-api/**'
+      - '.github/workflows/plugin-syncpolaris-api.yaml'
+
+jobs:
+  api:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.17.x
+
+      # https://github.com/actions/cache/blob/main/examples.md#node---yarn
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-api-plugin-syncpolaris
+          restore-keys: |
+            ${{ runner.os }}-yarn-api-
+            ${{ runner.os }}-yarn-
+
+      - name: Build
+        run: |
+          cp -r builder dist
+          cd dist
+          yarn install
+          yarn build plugin syncpolaris
+
+      - name: Build docker image
+        if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test' )
+        run: |
+          cd dist/erxes
+          echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+          docker buildx build -t erxes/plugin-syncpolaris-api:${GITHUB_REF#refs/heads/} -f Dockerfile .
+          docker push erxes/plugin-syncpolaris-api:${GITHUB_REF#refs/heads/}

.github/workflows/plugin-syncpolaris-ui.yaml

@@ -0,0 +1,99 @@
+name: Plugin syncpolaris UI CI
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+      - staging
+      - build-test
+    paths:
+      - 'packages/erxes-ui/**'
+      - 'packages/ui-plugin-template/**'
+      - 'packages/ui-cards/**'
+      - 'packages/ui-forms/**'
+      - 'packages/ui-inbox/**'
+      - 'packages/ui-knowledgebase/**'
+      - 'packages/ui-leads/**'
+      - 'packages/ui-log/**'
+      - 'packages/ui-notifications/**'
+      - 'packages/ui-products/**'
+      - 'packages/ui-segments/**'
+      - 'packages/ui-settings/**'
+      - 'packages/ui-team/**'
+      - 'packages/ui-tags/**'
+      - 'packages/ui-syncpolaris/**'
+      - 'packages/plugin-syncpolaris-ui/**'
+      - '.github/workflows/plugin-syncpolaris-ui.yaml'
+  pull_request:
+    branches:
+      - dev
+      - master
+      - staging
+      - build-test
+    paths:
+      - 'packages/erxes-ui/**'
+      - 'packages/ui-plugin-template/**'
+      - 'packages/ui-cards/**'
+      - 'packages/ui-forms/**'
+      - 'packages/ui-inbox/**'
+      - 'packages/ui-knowledgebase/**'
+      - 'packages/ui-leads/**'
+      - 'packages/ui-log/**'
+      - 'packages/ui-notifications/**'
+      - 'packages/ui-products/**'
+      - 'packages/ui-segments/**'
+      - 'packages/ui-settings/**'
+      - 'packages/ui-team/**'
+      - 'packages/ui-tags/**'
+      - 'packages/ui-syncpolaris/**'
+      - 'packages/plugin-syncpolaris-ui/**'
+      - '.github/workflows/plugin-syncpolaris-ui.yaml'
+
+jobs:
+  ui:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.17.x
+
+      # https://github.com/actions/cache/blob/main/examples.md#node---yarn
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn # since the yarn install runs at workspace level
+          restore-keys: |
+            ${{ runner.os }}-yarn
+
+      - name: Build
+        run: |
+          yarn install --frozen-lockfile
+          cd packages/plugin-syncpolaris-ui
+          yarn build
+          cp -r ./src/locales/ ./dist/locales 2>/dev/null || true
+
+      - name: Configure AWS credentials
+        if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
+
+      - name: Deploy
+        if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
+        run: |
+          tar -cf build.tar --directory=packages/plugin-syncpolaris-ui/dist .
+          cp build.tar packages/plugin-syncpolaris-ui/dist
+          rm -rf packages/plugin-syncpolaris-ui/dist/*.js
+          aws s3 sync packages/plugin-syncpolaris-ui/dist s3://erxes-${GITHUB_REF#refs/heads/}-plugins/uis/plugin-syncpolaris-ui --delete

packages/plugin-loans-api/src/cronjobs/contractCronJobs.ts

@@ -1,7 +1,7 @@
 import { IModels, generateModels } from '../connectionResolver';
 import {
   CONTRACT_STATUS,
-  SCHEDULE_STATUS
+  SCHEDULE_STATUS,
 } from '../models/definitions/constants';
 import { IContractDocument } from '../models/definitions/contracts';
 import { getFullDate } from '../models/utils/utils';
@@ -20,12 +20,14 @@ export async function checkContractScheduleAnd(subdomain: string) {
 
   if (exactTime === '00:00:00') {
     const loanContracts: IContractDocument[] = await models.Contracts.find({
-      status: CONTRACT_STATUS.NORMAL
+      status: CONTRACT_STATUS.NORMAL,
     }).lean();
 
     if (!loanContracts.length) return;
+    now.setDate(now.getDate() - 1);
+    const periodDate = getFullDate(now);
 
-    const periodLock = await createPeriodLock(today, [], models);
+    const periodLock = await createPeriodLock(periodDate, [], models);
 
     for await (let contract of loanContracts) {
       await storeInterestContract(contract, today, models, periodLock._id);

packages/plugin-loans-api/src/graphql/schema/contract.ts

@@ -110,6 +110,7 @@ export const types = () => `
     leaseType: String
     commitmentInterest:Float
     endDate:Date
+    customFieldsData: JSON
   }
 
 
@@ -237,6 +238,7 @@ const commonFields = `
   commitmentInterest: Float
   endDate: Date
   savingContractId: String
+  customFieldsData: JSON
 `;
 
 const interestCorrectionFields = `

packages/plugin-loans-api/src/logUtils.ts

@@ -76,6 +76,35 @@ export async function createLog(subdomain, user, logData) {
   );
 }
 
+export const prepareCocLogData = (coc) => {
+  // condition logic was in ActivityLogs model before
+  let action = 'create';
+  let content: string[] = [];
+
+  if (coc.mergedIds && coc.mergedIds.length > 0) {
+    action = 'merge';
+    content = coc.mergedIds;
+  }
+
+  return {
+    createdBy: coc.ownerId || coc.integrationId,
+    action,
+    content,
+    contentId: coc._id,
+  };
+};
+
+export async function activityLog(subdomain, logData) {
+  const { data } = logData;
+
+  const updatedParams = {
+    ...logData,
+    subdomain,
+    data: { ...data, contentType: `contacts:${data.contentType}` },
+  };
+  await putActivityLog(subdomain, updatedParams);
+}
+
 export async function updateLog(subdomain, user, logData) {
   const descriptions = gatherDescriptions(logData);
 

packages/plugin-loans-api/src/messageBroker.ts

@@ -3,6 +3,7 @@ import { MessageArgs, MessageArgsOmitService } from '@erxes/api-utils/src/core';
 import { generateModels } from './connectionResolver';
 import fetch from 'node-fetch';
 import { consumeRPCQueue } from '@erxes/api-utils/src/messageBroker';
+import { getCloseInfo } from './models/utils/closeUtils';
 
 export const initBroker = async () => {
   consumeRPCQueue('loans:contracts.find', async ({ subdomain, data }) => {
@@ -14,6 +15,50 @@ export const initBroker = async () => {
     };
   });
 
+  consumeRPCQueue(
+    'loans:contracts.updateContractNumber',
+    async ({ subdomain, data }) => {
+      const models = await generateModels(subdomain);
+
+      return {
+        status: 'success',
+        data: await models.Contracts.updateOne(
+          { _id: data._id },
+          { number: data.number },
+        ),
+      };
+    },
+  );
+
+  consumeRPCQueue(
+    'loans:contracts.getCloseInfo',
+    async ({ subdomain, data }) => {
+      const models = await generateModels(subdomain);
+      const contract = await models.Contracts.getContract({
+        _id: data.contractId,
+      });
+      const closeInfo = await getCloseInfo(
+        models,
+        subdomain,
+        contract,
+        data.closeDate,
+      );
+      return {
+        status: 'success',
+        data: closeInfo,
+      };
+    },
+  );
+
+  consumeRPCQueue('loans:contractType.findOne', async ({ subdomain, data }) => {
+    const models = await generateModels(subdomain);
+
+    return {
+      status: 'success',
+      data: await models.ContractTypes.findOne(data).lean(),
+    };
+  });
+
   consumeRPCQueue('loans:transactions.find', async ({ subdomain, data }) => {
     const models = await generateModels(subdomain);