sales config first

erxes · Oct 30, 2023 · a4f7efc · a4f7efc
1 parent 41b5a5b
commit a4f7efc
Show file tree

Hide file tree

Showing 8 changed files with 219 additions and 90 deletions.
diff --git a/packages/plugin-syncerkhet-api/src/afterMutations.ts b/packages/plugin-syncerkhet-api/src/afterMutations.ts
@@ -4,9 +4,9 @@ import {
   productToErkhet,
   productCategoryToErkhet
 } from './utils/productToErkhet';
-import { sendCardInfo } from './utils/utils';
 import { customerToErkhet, companyToErkhet } from './utils/customerToErkhet';
 import { generateModels } from './connectionResolver';
+import { getSyncLogDoc } from './utils/utils';
 
 const allowTypes = {
   'cards:deal': ['update'],
@@ -49,6 +49,8 @@ export const afterMutationHandlers = async (subdomain, params) => {
         {}
       );
 
+      const mainConfigs = await models.Configs.getConfig('erkhetConfig', {});
+
       // return
       if (Object.keys(returnConfigs).includes(destinationStageId)) {
         const returnConfig = {
@@ -70,7 +72,9 @@ export const afterMutationHandlers = async (subdomain, params) => {
           apiSecret: returnConfig.apiSecret,
           orderInfos: JSON.stringify(orderInfos)
         };
-
+        const syncLog = await models.SyncLogs.syncLogsAdd(
+          getSyncLogDoc(params)
+        );
         await sendRPCMessage(
           models,
           syncLog,
@@ -95,7 +99,9 @@ export const afterMutationHandlers = async (subdomain, params) => {
         };
 
         const postData = await getMoveData(subdomain, moveConfig, deal);
-
+        const syncLog = await models.SyncLogs.syncLogsAdd(
+          getSyncLogDoc(params)
+        );
         const response = await sendRPCMessage(
           models,
           syncLog,
@@ -114,45 +120,41 @@ export const afterMutationHandlers = async (subdomain, params) => {
             message: response.message,
             error: response.error
           });
-          if (moveConfig.responseField) {
-            await sendCardInfo(subdomain, deal, moveConfig, txt);
-          } else {
-            console.log(txt);
-          }
+          console.log(txt);
         }
 
         return;
       }
 
       // create sale
       if (Object.keys(configs).includes(destinationStageId)) {
-        const config = {
-          ...configs[destinationStageId],
-          ...(await models.Configs.getConfig('ERKHET', {}))
-        };
-        const postData = await getPostData(subdomain, config, deal);
-
-        const response = await sendRPCMessage(
-          models,
-          syncLog,
-          'rpc_queue:erxes-automation-erkhet',
-          {
-            action: 'get-response-send-order-info',
-            isEbarimt: false,
-            payload: JSON.stringify(postData),
-            isJson: true,
-            thirdService: true
-          }
-        );
-
-        if (response && (response.message || response.error)) {
-          const txt = JSON.stringify({
-            message: response.message,
-            error: response.error
-          });
-          if (config.responseField) {
-            await sendCardInfo(subdomain, deal, config, txt);
-          } else {
+        const postDatas = (await getPostData(
+          subdomain,
+          configs[destinationStageId],
+          mainConfigs,
+          deal
+        )) as any;
+
+        for (const data of postDatas) {
+          const { syncLog, postData } = data;
+          const response = await sendRPCMessage(
+            models,
+            syncLog,
+            'rpc_queue:erxes-automation-erkhet',
+            {
+              action: 'get-response-send-order-info',
+              isEbarimt: false,
+              payload: JSON.stringify(postData),
+              isJson: true,
+              thirdService: true
+            }
+          );
+
+          if (response && (response.message || response.error)) {
+            const txt = JSON.stringify({
+              message: response.message,
+              error: response.error
+            });
             console.log(txt);
           }
         }

diff --git a/packages/plugin-syncerkhet-api/src/utils/ebarimtData.ts b/packages/plugin-syncerkhet-api/src/utils/ebarimtData.ts
@@ -120,8 +120,6 @@ export const getPostData = async (subdomain, config, deal, dateType = '') => {
     productCodeById[product._id] = product.code;
   }
 
-  const details: any = [];
-
   const branchIds = deal.productsData.map(pd => pd.branchId) || [];
   const departmentIds = deal.productsData.map(pd => pd.departmentId) || [];
 
@@ -156,6 +154,8 @@ export const getPostData = async (subdomain, config, deal, dateType = '') => {
     }
   }
 
+  const details: any = [];
+
   for (const productData of deal.productsData) {
     // not tickUsed product not sent
     if (!productData.tickUsed) {

diff --git a/packages/plugin-syncerkhet-api/src/utils/productToErkhet.ts b/packages/plugin-syncerkhet-api/src/utils/productToErkhet.ts
@@ -59,7 +59,7 @@ export const productCategoryToErkhet = async (
     data: { _id: category.parentId },
     isRPC: true
   });
-  const noBrandConfig = configs['newBrandId'];
+  const noBrandConfig = configs['noBrand'];
 
   const remBrands = oldCategory.scopeBrandIds.filter(
     b => !category.scopeBrandIds.includes(b)
@@ -179,7 +179,7 @@ export const productToErkhet = async (subdomain, models, params, action) => {
     ratioMeasureUnit = subUom.ratio;
   }
 
-  const noBrandConfig = configs['newBrandId'];
+  const noBrandConfig = configs['noBrand'];
 
   const remBrands = oldProduct.scopeBrandIds.filter(
     b => !product.scopeBrandIds.includes(b)

diff --git a/packages/plugin-syncerkhet-ui/src/components/ReturnPerSettings.tsx b/packages/plugin-syncerkhet-ui/src/components/ReturnPerSettings.tsx
@@ -52,8 +52,8 @@ class PerSettings extends React.Component<Props, State> {
     const { config } = this.state;
     const key = config.stageId;
 
-    delete configsMap.returnEbarimtConfig[currentConfigKey];
-    configsMap.returnEbarimtConfig[key] = config;
+    delete configsMap.stageInReturnConfig[currentConfigKey];
+    configsMap.stageInReturnConfig[key] = config;
     this.props.save(configsMap);
   };
 
@@ -118,7 +118,11 @@ class PerSettings extends React.Component<Props, State> {
     return (
       <CollapseContent
         title={__(config.title)}
-        open={this.props.currentConfigKey === 'newEbarimtConfig' ? true : false}
+        open={
+          this.props.currentConfigKey === 'newStageInReturnConfig'
+            ? true
+            : false
+        }
       >
         <FormGroup>
           <ControlLabel>{'Title'}</ControlLabel>

diff --git a/packages/plugin-syncerkhet-ui/src/components/ReturnStageSettings.tsx b/packages/plugin-syncerkhet-ui/src/components/ReturnStageSettings.tsx
@@ -32,12 +32,12 @@ class GeneralSettings extends React.Component<Props, State> {
     e.preventDefault();
     const { configsMap } = this.state;
 
-    if (!configsMap.returnEbarimtConfig) {
-      configsMap.returnEbarimtConfig = {};
+    if (!configsMap.stageInReturnConfig) {
+      configsMap.stageInReturnConfig = {};
     }
 
     // must save prev item saved then new item
-    configsMap.returnEbarimtConfig.newEbarimtConfig = {
+    configsMap.stageInReturnConfig.newStageInReturnConfig = {
       title: 'New Erkhet Config',
       boardId: '',
       pipelineId: '',
@@ -53,8 +53,8 @@ class GeneralSettings extends React.Component<Props, State> {
 
   delete = (currentConfigKey: string) => {
     const { configsMap } = this.state;
-    delete configsMap.returnEbarimtConfig[currentConfigKey];
-    delete configsMap.returnEbarimtConfig['newEbarimtConfig'];
+    delete configsMap.stageInReturnConfig[currentConfigKey];
+    delete configsMap.stageInReturnConfig['newStageInReturnConfig'];
 
     this.setState({ configsMap });
 
@@ -77,7 +77,7 @@ class GeneralSettings extends React.Component<Props, State> {
 
   renderContent() {
     const { configsMap } = this.state;
-    const configs = configsMap.returnEbarimtConfig || {};
+    const configs = configsMap.stageInReturnConfig || {};
 
     return (
       <ContentBox id={'GeneralSettingsMenu'}>