repzo-sap-absjo 1.0.24 → 1.0.26

package/changelog.md

@@ -4,6 +4,7 @@
 
 ### Added
 
+- [util] in method: getUniqueConcatenatedValues, also add the promotions for items.buy @maramalshen
 - [actions/***] add 2 keys in integration_meta: sync_to_sap_started & sync_to_sap_succeeded @maramalshen
 - [commands/product] assign Foreign Name (ITEMDESCF) in SAP to local_name in Repzo @maramalshen
 - [actions/payment] add the field UserId where it equals USERID of the SAP API REP @maramalshen
@@ -22,6 +23,7 @@
 - [command/price_list] fix bug in priceList-item @maramalshen
 - [actions/**] don't update integration_meta.sync_to_sap_succeeded if it is already true @maramalshen
 - [actions/create_invoice] include item.get_promotion in MEO_Serial & Promotion_Name @maramalshen
+- fix bug in is_matched in client & product @maramalshen
 
 ### Removed
 

package/lib/commands/client.js

@@ -231,7 +231,7 @@ export const sync_client = async (commandEvent) => {
         paymentTerm: paymentTerm ? paymentTerm._id : undefined,
         sv_priceList: priceList ? priceList._id : undefined,
         disabled: sap_client.ACTIVE == "Y" ? false : true,
-        payment_type: sap_client.PAYMENTTERM ? "credit" : "cash", // sap_client.CLIENTGROUP == "Cash Van"
+        payment_type: sap_client.PAYMENTTERM ? "credit" : "cash",
         integrated_client_balance:
           client_credit_consumed && Math.round(client_credit_consumed * 1000),
       };
@@ -366,7 +366,7 @@ const is_matched = (body_1, body_2) => {
       }
     }
     for (let i = 0; i < integration_meta_keys.length; i++) {
-      const key = keys[i];
+      const key = integration_meta_keys[i];
       if (
         ((_d =
           (_c =

package/lib/commands/product.js

@@ -473,7 +473,7 @@ const is_matched = (body_1, body_2) => {
       }
     }
     for (let i = 0; i < integration_meta_keys.length; i++) {
-      const key = keys[i];
+      const key = integration_meta_keys[i];
       if (
         ((_d =
           (_c =

package/lib/util.js

@@ -198,7 +198,7 @@ export const getUniqueConcatenatedValues = function (
   delimiter,
   all_promos
 ) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g;
   item.general_promotions = item.general_promotions || [];
   item.used_promotions = item.used_promotions || [];
   const allPromotions = [...item.general_promotions, ...item.used_promotions];
@@ -212,6 +212,38 @@ export const getUniqueConcatenatedValues = function (
         : _c.promotion;
     if (promo_id && all_promos[promo_id])
       allPromotions.push(all_promos[promo_id]);
+  } else if (
+    (_e =
+      (_d = item.promotions) === null || _d === void 0
+        ? void 0
+        : _d.bookings) === null || _e === void 0
+      ? void 0
+      : _e.length
+  ) {
+    const promos = {};
+    (_g =
+      (_f = item.promotions) === null || _f === void 0
+        ? void 0
+        : _f.bookings) === null || _g === void 0
+      ? void 0
+      : _g.forEach((booking) => {
+          if (
+            booking === null || booking === void 0 ? void 0 : booking.promotion
+          ) {
+            promos[
+              booking === null || booking === void 0
+                ? void 0
+                : booking.promotion
+            ] =
+              booking === null || booking === void 0
+                ? void 0
+                : booking.promotion;
+          }
+        });
+    for (let promo_id in promos) {
+      if (promo_id && all_promos[promo_id])
+        allPromotions.push(all_promos[promo_id]);
+    }
   }
   const uniqueValues = new Set(
     allPromotions.map((promotion) => promotion[key]).filter((value) => value)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "repzo-sap-absjo",
   "description": "repzo SAP ABS jo integration",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "homepage": "",
   "keywords": [],
   "author": {

package/src/commands/client.ts

@@ -351,7 +351,7 @@ const is_matched = (
       }
     }
     for (let i = 0; i < integration_meta_keys.length; i++) {
-      const key = keys[i];
+      const key = integration_meta_keys[i];
       if (
         body_1?.integration_meta?.[key]?.toString() !==
         body_2?.integration_meta?.[key]?.toString()

package/src/commands/product.ts

@@ -368,7 +368,7 @@ const is_matched = (
       }
     }
     for (let i = 0; i < integration_meta_keys.length; i++) {
-      const key = keys[i];
+      const key = integration_meta_keys[i];
       if (
         body_1?.integration_meta?.[key]?.toString() !==
         body_2?.integration_meta?.[key]?.toString()

package/src/util.ts

@@ -260,6 +260,17 @@ export const getUniqueConcatenatedValues = function (
     const promo_id = item.promotions.bookings?.[0]?.promotion;
     if (promo_id && all_promos[promo_id])
       allPromotions.push(all_promos[promo_id]);
+  } else if (item.promotions?.bookings?.length) {
+    const promos: { [promo_id: string]: string } = {};
+    item.promotions?.bookings?.forEach((booking) => {
+      if (booking?.promotion) {
+        promos[booking?.promotion] = booking?.promotion;
+      }
+    });
+    for (let promo_id in promos) {
+      if (promo_id && all_promos[promo_id])
+        allPromotions.push(all_promos[promo_id]);
+    }
   }
   const uniqueValues = new Set(
     allPromotions.map((promotion) => promotion[key]).filter((value) => value)