fix: save convertDealId when pos order sync

erxes · Apr 10, 2024 · f5c8dfd · f5c8dfd
1 parent d6457be
commit f5c8dfd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/plugin-pos-api/src/utils.ts b/packages/plugin-pos-api/src/utils.ts
@@ -289,7 +289,7 @@ const createDeliveryDeal = async ({ subdomain, models, doneOrder, pos }) => {
         },
         stringValue: `${marker.longitude || marker.lng},${
           marker.latitude || marker.lat
-        }`,
+          }`,
       },
     ];
   }
@@ -486,8 +486,12 @@ const createDealPerOrder = async ({ subdomain, pos, newOrder }) => {
         },
       },
     });
+
+    await newOrder.updateOne({ _id: newOrder._id }, { $set: { convertDealId: cardDeal._id } });
+    return cardDeal._id
   }
   // end sync cards config then <
+  return;
 };
 
 const syncErkhetRemainder = async ({ subdomain, models, pos, newOrder }) => {
@@ -705,7 +709,7 @@ export const syncOrderFromClient = async ({
   await confirmLoyalties(subdomain, newOrder);
   await otherPlugins(subdomain, newOrder, oldOrder, newOrder.userId);
 
-  await createDealPerOrder({ subdomain, pos, newOrder });
+  const convertDealId = await createDealPerOrder({ subdomain, pos, newOrder });
 
   if (pos.isOnline && newOrder.subBranchId) {
     const toPos = await models.Pos.findOne({
@@ -721,7 +725,7 @@ export const syncOrderFromClient = async ({
         subdomain,
         action: 'erxes-posclient-to-pos-api',
         data: {
-          order: { ...newOrder, posToken, subToken: toPos.token },
+          order: { ...newOrder, convertDealId, posToken, subToken: toPos.token },
         },
         pos: toPos,
       });
@@ -776,6 +780,7 @@ export const syncOrderFromClient = async ({
       posToken,
       responseIds: syncedResponeIds,
       orderId: newOrder._id,
+      convertDealId
     },
     pos,
   });

diff --git a/packages/plugin-posclient-api/src/messageBroker.ts b/packages/plugin-posclient-api/src/messageBroker.ts
@@ -112,11 +112,11 @@ export const setupMessageConsumers = async () => {
     `posclient:updateSynced${channelToken}`,
     async ({ subdomain, data }) => {
       const models = await generateModels(subdomain);
-      const { responseIds, orderId } = data;
+      const { responseIds, orderId, convertDealId } = data;
 
       await models.Orders.updateOne(
         { _id: orderId },
-        { $set: { synced: true } },
+        { $set: { synced: true, convertDealId } },
       );
       await models.PutResponses.updateMany(
         { _id: { $in: responseIds } },