repzo-sap-absjo 1.0.23 → 1.0.25

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
@@ -17,6 +18,7 @@
 
 ### Fixed
 
+- [command/measureunit] if product has multi measureUnits, the base_measureunit should be PC, POUCH or CARD @maramalshen
 - [command/measureunit-family] use _.xor instead or _.difference @maramalshen
 - [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

package/lib/commands/measureunit.js

@@ -101,9 +101,14 @@ export const sync_measureunit = async (commandEvent) => {
         }
       });
       if (max_unit.sap_product_UoMs.length > 1) {
-        max_unit.default_unit = max_unit.sap_product_UoMs.find(
-          (u) => u.ALTUOMCODE == "PC"
+        const PC = max_unit.sap_product_UoMs.find((u) => u.ALTUOMCODE == "PC");
+        const POUCH = max_unit.sap_product_UoMs.find(
+          (u) => u.ALTUOMCODE == "POUCH"
         );
+        const CARD = max_unit.sap_product_UoMs.find(
+          (u) => u.ALTUOMCODE == "CARD"
+        );
+        max_unit.default_unit = PC || POUCH || CARD;
         if (!max_unit.default_unit) {
           // console.log(
           //   "Create/Update Measure Unit Failed >> ",
@@ -197,7 +202,7 @@ export const sync_measureunit = async (commandEvent) => {
       const body = {
         parent: repzo_parent_id,
         name: sap_UoM.ALTUOMCODE,
-        factor: sap_UoM.repzo_factor || 0, // ??????
+        factor: sap_UoM.repzo_factor || 0,
         disabled: false,
         integration_meta: {
           id: `${nameSpace}_${sap_UoM.UOMGROUPENTRY}_${sap_UoM.ALTUOMID}`,

package/lib/commands/product.js

@@ -299,7 +299,7 @@ export const sync_product = async (commandEvent) => {
             {
               disabled: false,
               name: sap_product.ITEMCODE,
-              price: 0, // Math.round(sap_product.PRICE * 1000),
+              price: 0,
               integration_meta: {
                 id: `${nameSpace}_${sap_product.ITEMCODE}`,
                 ITEMCODE: sap_product.ITEMCODE,

package/lib/commands/rep.js

@@ -2,7 +2,7 @@ import Repzo from "repzo";
 import DataSet from "data-set-query";
 import { _create, update_bench_time, set_error } from "../util.js";
 export const sync_rep = async (commandEvent) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   const repzo = new Repzo(
     (_a = commandEvent.app.formData) === null || _a === void 0
       ? void 0
@@ -85,6 +85,11 @@ export const sync_rep = async (commandEvent) => {
         } reps in Repzo`
       )
       .commit();
+    // Get Repzo Warehouse
+    const repzo_warehouses = await repzo.warehouse.find({
+      per_page: 50000,
+      disabled: false,
+    });
     for (
       let i = 0;
       i <
@@ -106,27 +111,21 @@ export const sync_rep = async (commandEvent) => {
       });
       let warehouse;
       if (sap_rep.USERWHSCODE && sap_rep.USERWHSCODE != "") {
-        const warehouse_res = await repzo.warehouse.find({
-          code: sap_rep.USERWHSCODE,
-        });
-        if (
-          (_f =
-            warehouse_res === null || warehouse_res === void 0
-              ? void 0
-              : warehouse_res.data) === null || _f === void 0
+        const warehouse_res =
+          repzo_warehouses === null || repzo_warehouses === void 0
             ? void 0
-            : _f.length
-        )
-          warehouse = warehouse_res.data[0]._id;
+            : repzo_warehouses.data.find((w) => w.code == sap_rep.USERWHSCODE);
+        // await repzo.warehouse.find({ code: sap_rep.USERWHSCODE });
+        if (warehouse_res) warehouse = warehouse_res._id;
       }
       const body = {
         name: sap_rep.USERDESC,
         password: Math.round(Math.random() * (9999 - 1000) + 1000).toString(),
         username: nameSpace + sap_rep.USERID,
         integration_id:
-          (_g = sap_rep.USERID) === null || _g === void 0
+          (_f = sap_rep.USERID) === null || _f === void 0
             ? void 0
-            : _g.toString(),
+            : _f.toString(),
         integration_meta: {
           DEPARTMENTCODE: sap_rep.DEPARTMENTCODE,
           USERCASHACCOUNT: sap_rep.USERCASHACCOUNT,
@@ -156,21 +155,21 @@ export const sync_rep = async (commandEvent) => {
           USERID: repzo_rep.integration_id,
           USERDESC: repzo_rep.name,
           DEPARTMENTCODE:
-            (_h = repzo_rep.integration_meta) === null || _h === void 0
+            (_g = repzo_rep.integration_meta) === null || _g === void 0
               ? void 0
-              : _h.DEPARTMENTCODE,
+              : _g.DEPARTMENTCODE,
           USERCASHACCOUNT:
-            (_j = repzo_rep.integration_meta) === null || _j === void 0
+            (_h = repzo_rep.integration_meta) === null || _h === void 0
               ? void 0
-              : _j.USERCASHACCOUNT,
+              : _h.USERCASHACCOUNT,
           USERCHECKACCTCODE:
-            (_k = repzo_rep.integration_meta) === null || _k === void 0
+            (_j = repzo_rep.integration_meta) === null || _j === void 0
               ? void 0
-              : _k.USERCHECKACCTCODE,
+              : _j.USERCHECKACCTCODE,
           USERWHSCODE:
-            (_l = repzo_rep.integration_meta) === null || _l === void 0
+            (_k = repzo_rep.integration_meta) === null || _k === void 0
               ? void 0
-              : _l.USERWHSCODE,
+              : _k.USERWHSCODE,
         });
         if (found_identical_docs.length) continue;
         // Update
@@ -212,10 +211,10 @@ export const sync_rep = async (commandEvent) => {
   } catch (e) {
     //@ts-ignore
     console.error(
-      ((_m = e === null || e === void 0 ? void 0 : e.response) === null ||
-      _m === void 0
+      ((_l = e === null || e === void 0 ? void 0 : e.response) === null ||
+      _l === void 0
         ? void 0
-        : _m.data) || e
+        : _l.data) || e
     );
     await commandLog.setStatus("fail", e).commit();
     throw e;

package/lib/commands/tax.js

@@ -96,7 +96,7 @@ export const sync_tax = async (commandEvent) => {
       const body = {
         name: sap_tax.TaxName,
         rate: Number(sap_tax.TaxRate / 100),
-        type: "additive", // hardcode
+        type: "additive",
         disabled: sap_tax.Inactive === "N" ? false : true,
         integration_meta: {
           id: `${nameSpace}_${sap_tax.TaxCode}`,

package/lib/test/actions/create_invoice.js

@@ -6,7 +6,7 @@ Actions(
     rawPath: "/actions",
     rawQueryString: "app=repzo-sap-absjo&action=create_invoice",
     headers: {
-      action_sync_id: "Actions-0000001", // SYNC_ID
+      action_sync_id: "Actions-0000001",
       accept: "*/*",
       "accept-encoding": "gzip, deflate",
       "content-length": "3658",

package/lib/test/actions/create_payment.js

@@ -6,7 +6,7 @@ Actions(
     rawPath: "/actions",
     rawQueryString: "app=repzo-sap-absjo&action=create_payment",
     headers: {
-      action_sync_id: "Actions-0000004", // SYNC_ID
+      action_sync_id: "Actions-0000004",
       accept: "*/*",
       "accept-encoding": "gzip, deflate",
       "content-length": "3658",

package/lib/test/actions/create_proforma.js

@@ -6,7 +6,7 @@ Actions(
     rawPath: "/actions",
     rawQueryString: "app=repzo-sap-absjo&action=create_proforma",
     headers: {
-      action_sync_id: "Actions-0000003", // SYNC_ID
+      action_sync_id: "Actions-0000003",
       accept: "*/*",
       "accept-encoding": "gzip, deflate",
       "content-length": "3658",

package/lib/test/actions/create_return_invoice.js

@@ -6,7 +6,7 @@ Actions(
     rawPath: "/actions",
     rawQueryString: "app=repzo-sap-absjo&action=create_return_invoice",
     headers: {
-      action_sync_id: "Actions-0000002", // SYNC_ID
+      action_sync_id: "Actions-0000002",
       accept: "*/*",
       "accept-encoding": "gzip, deflate",
       "content-length": "3658",

package/lib/test/actions/create_transfer.js

@@ -6,7 +6,7 @@ Actions(
     rawPath: "/actions",
     rawQueryString: "app=repzo-sap-absjo&action=create_transfer",
     headers: {
-      action_sync_id: "Actions-0000005", // SYNC_ID
+      action_sync_id: "Actions-0000005",
       accept: "*/*",
       "accept-encoding": "gzip, deflate",
       "content-length": "3658",

package/lib/test/commands/brand.js

@@ -87,7 +87,7 @@ let commandEvent = {
     __v: 0,
   },
   end_of_day: "04:00",
-  nameSpace: ["unisap"], // demosv
+  nameSpace: ["unisap"],
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",

package/lib/test/commands/category.js

@@ -87,7 +87,7 @@ let commandEvent = {
     __v: 0,
   },
   end_of_day: "04:00",
-  nameSpace: ["unisap"], // demosv
+  nameSpace: ["unisap"],
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",

package/lib/test/commands/channel.js

@@ -87,7 +87,7 @@ let commandEvent = {
     __v: 0,
   },
   end_of_day: "04:00",
-  nameSpace: ["unisap"], // demosv
+  nameSpace: ["unisap"],
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",

package/lib/test/commands/payment_term.js

@@ -87,7 +87,7 @@ let commandEvent = {
     __v: 0,
   },
   end_of_day: "04:00",
-  nameSpace: ["unisap"], // demosv
+  nameSpace: ["unisap"],
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",

package/lib/test/commands/price_list.js

@@ -341,7 +341,7 @@ let commandEvent = {
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",
-  sync_id: "9811c42a-d26e-41e0-bee5-e75260c04767", // should change
+  sync_id: "9811c42a-d26e-41e0-bee5-e75260c04767",
   command: "price_list",
 };
 Commands(commandEvent);

package/lib/test/commands/price_list_disabled.js

@@ -353,7 +353,7 @@ let commandEvent = {
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",
-  sync_id: "a7e620b6-c5a2-44f7-b44b-3599b3ea1b54", // should change
+  sync_id: "a7e620b6-c5a2-44f7-b44b-3599b3ea1b54",
   command: "price_list_disabled",
 };
 Commands(commandEvent);

package/lib/test/commands/warehouse.js

@@ -87,7 +87,7 @@ let commandEvent = {
     __v: 0,
   },
   end_of_day: "04:00",
-  nameSpace: ["unisap"], // demosv
+  nameSpace: ["unisap"],
   timezone: "Asia/Amman",
   meta: "",
   env: "staging",

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.23",
+  "version": "1.0.25",
   "homepage": "",
   "keywords": [],
   "author": {

package/src/commands/measureunit.ts

@@ -39,7 +39,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
   const commandLog = new Repzo.CommandLog(
     repzo,
     commandEvent.app,
-    commandEvent.command
+    commandEvent.command,
   );
   try {
     // console.log("sync_measureunit");
@@ -64,7 +64,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
 
     const sap_UoMs: SAPUoM[] = await get_sap_UoMs(
       commandEvent.app.formData.sapHostUrl,
-      {}
+      {},
     );
     result.sap_total = sap_UoMs?.length;
 
@@ -114,9 +114,15 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
       });
 
       if (max_unit.sap_product_UoMs.length > 1) {
-        max_unit.default_unit = max_unit.sap_product_UoMs.find(
-          (u) => u.ALTUOMCODE == "PC"
+        const PC = max_unit.sap_product_UoMs.find((u) => u.ALTUOMCODE == "PC");
+        const POUCH = max_unit.sap_product_UoMs.find(
+          (u) => u.ALTUOMCODE == "POUCH",
         );
+        const CARD = max_unit.sap_product_UoMs.find(
+          (u) => u.ALTUOMCODE == "CARD",
+        );
+        max_unit.default_unit = PC || POUCH || CARD;
+
         if (!max_unit.default_unit) {
           // console.log(
           //   "Create/Update Measure Unit Failed >> ",
@@ -129,7 +135,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
               max_unit?.sap_product_UoMs[0]?.ITEMCODE || units[0]?.ITEMCODE,
             doc: units,
             error_message: set_error(
-              `Create/Update Measure Unit Failed >> ${max_unit?.sap_product_UoMs[0]?.ITEMCODE} Could not found the base_unit`
+              `Create/Update Measure Unit Failed >> ${max_unit?.sap_product_UoMs[0]?.ITEMCODE} Could not found the base_unit`,
             ),
           });
           result.failed++;
@@ -170,7 +176,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
       const repzo_UoM = repzo_UoMs.data.find(
         (r_UoM) =>
           r_UoM.integration_meta?.id ==
-          `${nameSpace}_${sap_UoM.UOMGROUPENTRY}_${sap_UoM.ALTUOMID}`
+          `${nameSpace}_${sap_UoM.UOMGROUPENTRY}_${sap_UoM.ALTUOMID}`,
       );
 
       const body:
@@ -192,7 +198,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
         // Create
         try {
           const created_UoM = await repzo.measureunit.create(
-            body as Service.MeasureUnit.Create.Body
+            body as Service.MeasureUnit.Create.Body,
           );
           result.created++;
         } catch (e: any) {
@@ -216,7 +222,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
         try {
           const updated_UoM = await repzo.measureunit.update(
             repzo_UoM._id,
-            body as Service.MeasureUnit.Update.Body
+            body as Service.MeasureUnit.Update.Body,
           );
           result.updated++;
         } catch (e: any) {
@@ -242,12 +248,12 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
       repzo,
       commandEvent.app._id,
       bench_time_key,
-      new_bench_time
+      new_bench_time,
     );
     await commandLog
       .setStatus(
         "success",
-        failed_docs_report.length ? failed_docs_report : null
+        failed_docs_report.length ? failed_docs_report : null,
       )
       .setBody(result)
       .commit();
@@ -262,7 +268,7 @@ export const sync_measureunit = async (commandEvent: CommandEvent) => {
 
 export const get_sap_UoMs = async (
   serviceEndPoint: string,
-  query?: { updateAt?: string }
+  query?: { updateAt?: string },
 ): Promise<SAPUoM[]> => {
   try {
     const sap_UoMs: SAPUoMs = await _create(serviceEndPoint, "/Uom", {

package/src/commands/rep.ts

@@ -93,6 +93,12 @@ export const sync_rep = async (commandEvent: CommandEvent) => {
       .addDetail(`${repzo_reps?.data?.length} reps in Repzo`)
       .commit();
 
+    // Get Repzo Warehouse
+    const repzo_warehouses = await repzo.warehouse.find({
+      per_page: 50000,
+      disabled: false,
+    });
+
     for (let i = 0; i < sap_reps?.Users?.length; i++) {
       const sap_rep: SAPRep = sap_reps.Users[i];
       const repzo_rep = repzo_reps.data.find(
@@ -102,10 +108,11 @@ export const sync_rep = async (commandEvent: CommandEvent) => {
 
       let warehouse;
       if (sap_rep.USERWHSCODE && sap_rep.USERWHSCODE != "") {
-        const warehouse_res = await repzo.warehouse.find({
-          code: sap_rep.USERWHSCODE,
-        });
-        if (warehouse_res?.data?.length) warehouse = warehouse_res.data[0]._id;
+        const warehouse_res = repzo_warehouses?.data.find(
+          (w) => w.code == sap_rep.USERWHSCODE
+        );
+        // await repzo.warehouse.find({ code: sap_rep.USERWHSCODE });
+        if (warehouse_res) warehouse = warehouse_res._id;
       }
 
       const body: Service.Rep.Create.Body | Service.Rep.Update.Body = {

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)