repzo-sap-absjo 1.0.22 → 1.0.23

package/changelog.md

@@ -20,6 +20,7 @@
 - [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
+- [actions/create_invoice] include item.get_promotion in MEO_Serial & Promotion_Name @maramalshen
 
 ### Removed
 

package/lib/actions/create_invoice.js

@@ -3,7 +3,7 @@ import { _create, getUniqueConcatenatedValues } from "../util.js";
 import { v4 as uuid } from "uuid";
 import moment from "moment-timezone";
 export const create_invoice = async (event, options) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   const repzo = new Repzo(
     (_a = options.data) === null || _a === void 0 ? void 0 : _a.repzoApiKey,
     { env: options.env }
@@ -197,28 +197,42 @@ export const create_invoice = async (event, options) => {
       },
       { per_page: 50000 }
     );
+    const all_promotions = {};
+    (_g =
+      repzo_invoice === null || repzo_invoice === void 0
+        ? void 0
+        : repzo_invoice.promotions) === null || _g === void 0
+      ? void 0
+      : _g.forEach((promo) => {
+          if (!promo) return;
+          all_promotions[promo._id] = {
+            _id: promo._id,
+            name: promo.name,
+            ref: promo.ref,
+          };
+        });
     // Prepare SAP_invoice_items
     const items = [];
     for (
       let i = 0;
       i <
-      ((_g =
+      ((_h =
         repzo_invoice === null || repzo_invoice === void 0
           ? void 0
-          : repzo_invoice.items) === null || _g === void 0
+          : repzo_invoice.items) === null || _h === void 0
         ? void 0
-        : _g.length);
+        : _h.length);
       i++
     ) {
       const item = repzo_invoice.items[i];
       // Get Repzo Tax
       const repzo_tax =
-        (_h =
+        (_j =
           repzo_taxes === null || repzo_taxes === void 0
             ? void 0
-            : repzo_taxes.data) === null || _h === void 0
+            : repzo_taxes.data) === null || _j === void 0
           ? void 0
-          : _h.find((t) => {
+          : _j.find((t) => {
               var _a, _b, _c;
               return (
                 ((_a = t._id) === null || _a === void 0
@@ -235,12 +249,12 @@ export const create_invoice = async (event, options) => {
       if (!repzo_tax) throw `Tax with _id: ${item.tax._id} not found in Repzo`;
       // Get Repzo UoM
       const repzo_measureunit =
-        (_j =
+        (_k =
           repzo_measureunits === null || repzo_measureunits === void 0
             ? void 0
-            : repzo_measureunits.data) === null || _j === void 0
+            : repzo_measureunits.data) === null || _k === void 0
           ? void 0
-          : _j.find((m) => {
+          : _k.find((m) => {
               var _a, _b, _c;
               return (
                 ((_a = m._id) === null || _a === void 0
@@ -256,16 +270,16 @@ export const create_invoice = async (event, options) => {
             });
       if (!repzo_measureunit)
         throw `Uom with _id: ${
-          (_k = item.measureunit) === null || _k === void 0 ? void 0 : _k._id
+          (_l = item.measureunit) === null || _l === void 0 ? void 0 : _l._id
         } not found in Repzo`;
       // Get Repzo Product
       const repzo_product =
-        (_l =
+        (_m =
           repzo_products === null || repzo_products === void 0
             ? void 0
-            : repzo_products.data) === null || _l === void 0
+            : repzo_products.data) === null || _m === void 0
           ? void 0
-          : _l.find((p) => {
+          : _m.find((p) => {
               var _a, _b, _c;
               return (
                 ((_a = p._id) === null || _a === void 0
@@ -282,30 +296,40 @@ export const create_invoice = async (event, options) => {
       if (!repzo_product)
         throw `Product with _id: ${item.measureunit._id} not found in Repzo`;
       items.push({
-        MEO_Serial: getUniqueConcatenatedValues(item, "ref", " | "),
-        Promotion_Name: getUniqueConcatenatedValues(item, "name", " | "),
+        MEO_Serial: getUniqueConcatenatedValues(
+          item,
+          "ref",
+          " | ",
+          all_promotions
+        ),
+        Promotion_Name: getUniqueConcatenatedValues(
+          item,
+          "name",
+          " | ",
+          all_promotions
+        ),
         ItemCode: item.variant.variant_name,
         Quantity: item.qty,
         TaxCode: repzo_tax.integration_meta.TaxCode,
         UnitPrice: (item.price * repzo_measureunit.factor) / 1000,
-        DiscountPerc: "0", // ??
+        DiscountPerc: "0",
         //@ts-ignore
         LineTotal: item.total_before_tax / 1000,
         UomCode: repzo_measureunit.integration_meta.ALTUOMID,
         Brand:
-          (_m = repzo_product.integration_meta) === null || _m === void 0
+          (_o = repzo_product.integration_meta) === null || _o === void 0
             ? void 0
-            : _m.BRAND, // "B1", // ??
+            : _o.BRAND,
         Department:
-          ((_o =
+          ((_p =
             repzo_rep === null || repzo_rep === void 0
               ? void 0
-              : repzo_rep.integration_meta) === null || _o === void 0
+              : repzo_rep.integration_meta) === null || _p === void 0
             ? void 0
-            : _o.DEPARTMENTCODE) ||
-          ((_p = options.data) === null || _p === void 0
+            : _p.DEPARTMENTCODE) ||
+          ((_q = options.data) === null || _q === void 0
             ? void 0
-            : _p.DepartmentCode), // "D2",
+            : _q.DepartmentCode), // "D2",
       });
     }
     const sap_invoice = {

package/lib/actions/create_proforma.js

@@ -3,7 +3,7 @@ import { _create, getUniqueConcatenatedValues } from "../util.js";
 import { v4 as uuid } from "uuid";
 import moment from "moment-timezone";
 export const create_proforma = async (event, options) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
   const repzo = new Repzo(
     (_a = options.data) === null || _a === void 0 ? void 0 : _a.repzoApiKey,
     { env: options.env }
@@ -137,28 +137,42 @@ export const create_proforma = async (event, options) => {
       },
       { per_page: 50000 }
     );
+    const all_promotions = {};
+    (_g =
+      repzo_proforma === null || repzo_proforma === void 0
+        ? void 0
+        : repzo_proforma.promotions) === null || _g === void 0
+      ? void 0
+      : _g.forEach((promo) => {
+          if (!promo) return;
+          all_promotions[promo._id] = {
+            _id: promo._id,
+            name: promo.name,
+            ref: promo.ref,
+          };
+        });
     // Prepare SAP_invoice_items
     const items = [];
     for (
       let i = 0;
       i <
-      ((_g =
+      ((_h =
         repzo_proforma === null || repzo_proforma === void 0
           ? void 0
-          : repzo_proforma.items) === null || _g === void 0
+          : repzo_proforma.items) === null || _h === void 0
         ? void 0
-        : _g.length);
+        : _h.length);
       i++
     ) {
       const item = repzo_proforma.items[i];
       // Get Repzo Tax
       const repzo_tax =
-        (_h =
+        (_j =
           repzo_taxes === null || repzo_taxes === void 0
             ? void 0
-            : repzo_taxes.data) === null || _h === void 0
+            : repzo_taxes.data) === null || _j === void 0
           ? void 0
-          : _h.find((t) => {
+          : _j.find((t) => {
               var _a, _b, _c;
               return (
                 ((_a = t._id) === null || _a === void 0
@@ -175,12 +189,12 @@ export const create_proforma = async (event, options) => {
       if (!repzo_tax) throw `Tax with _id: ${item.tax._id} not found in Repzo`;
       // Get Repzo UoM
       const repzo_measureunit =
-        (_j =
+        (_k =
           repzo_measureunits === null || repzo_measureunits === void 0
             ? void 0
-            : repzo_measureunits.data) === null || _j === void 0
+            : repzo_measureunits.data) === null || _k === void 0
           ? void 0
-          : _j.find((m) => {
+          : _k.find((m) => {
               var _a, _b, _c;
               return (
                 ((_a = m._id) === null || _a === void 0
@@ -196,16 +210,16 @@ export const create_proforma = async (event, options) => {
             });
       if (!repzo_measureunit)
         throw `Uom with _id: ${
-          (_k = item.measureunit) === null || _k === void 0 ? void 0 : _k._id
+          (_l = item.measureunit) === null || _l === void 0 ? void 0 : _l._id
         } not found in Repzo`;
       // Get Repzo Product
       const repzo_product =
-        (_l =
+        (_m =
           repzo_products === null || repzo_products === void 0
             ? void 0
-            : repzo_products.data) === null || _l === void 0
+            : repzo_products.data) === null || _m === void 0
           ? void 0
-          : _l.find((p) => {
+          : _m.find((p) => {
               var _a, _b, _c;
               return (
                 ((_a = p._id) === null || _a === void 0
@@ -222,8 +236,18 @@ export const create_proforma = async (event, options) => {
       if (!repzo_product)
         throw `Product with _id: ${item.measureunit._id} not found in Repzo`;
       items.push({
-        MEO_Serial: getUniqueConcatenatedValues(item, "ref", " | "),
-        Promotion_Name: getUniqueConcatenatedValues(item, "name", " | "),
+        MEO_Serial: getUniqueConcatenatedValues(
+          item,
+          "ref",
+          " | ",
+          all_promotions
+        ),
+        Promotion_Name: getUniqueConcatenatedValues(
+          item,
+          "name",
+          " | ",
+          all_promotions
+        ),
         ItemCode: item.variant.variant_name,
         Quantity: item.qty,
         TaxCode: repzo_tax.integration_meta.TaxCode,
@@ -233,28 +257,28 @@ export const create_proforma = async (event, options) => {
         LineTotal: item.total_before_tax / 1000,
         UomCode: repzo_measureunit.integration_meta.ALTUOMID,
         Brand:
-          (_m = repzo_product.integration_meta) === null || _m === void 0
+          (_o = repzo_product.integration_meta) === null || _o === void 0
             ? void 0
-            : _m.BRAND,
+            : _o.BRAND,
         Department:
-          ((_o =
+          ((_p =
             repzo_rep === null || repzo_rep === void 0
               ? void 0
-              : repzo_rep.integration_meta) === null || _o === void 0
+              : repzo_rep.integration_meta) === null || _p === void 0
             ? void 0
-            : _o.DEPARTMENTCODE) ||
-          ((_p = options.data) === null || _p === void 0
+            : _p.DEPARTMENTCODE) ||
+          ((_q = options.data) === null || _q === void 0
             ? void 0
-            : _p.DepartmentCode), // "D2"
+            : _q.DepartmentCode), // "D2"
       });
     }
     const sap_invoice = {
       RefNum: repzo_proforma.serial_number.formatted,
       SalPersCode: repzo_rep
         ? repzo_rep.integration_id
-        : (_q = options.data) === null || _q === void 0
+        : (_r = options.data) === null || _r === void 0
         ? void 0
-        : _q.SalPersCode, // "111",
+        : _r.SalPersCode,
       DocDate: moment(repzo_proforma.issue_date, "YYYY-MM-DD").format(
         "YYYYMMDD"
       ),

package/lib/util.d.ts

@@ -83,6 +83,13 @@ export declare const send_command_to_marketplace: ({
 export declare const getUniqueConcatenatedValues: (
   item: Service.Item.Schema,
   key: "name" | "ref",
-  delimiter: string
+  delimiter: string,
+  all_promos: {
+    [promo_id: string]: {
+      _id: string;
+      name: string;
+      ref?: string | undefined;
+    };
+  }
 ) => string;
 export {};

package/lib/util.js

@@ -192,10 +192,27 @@ export const send_command_to_marketplace = async ({
     throw e;
   }
 };
-export const getUniqueConcatenatedValues = function (item, key, delimiter) {
+export const getUniqueConcatenatedValues = function (
+  item,
+  key,
+  delimiter,
+  all_promos
+) {
+  var _a, _b, _c;
   item.general_promotions = item.general_promotions || [];
   item.used_promotions = item.used_promotions || [];
   const allPromotions = [...item.general_promotions, ...item.used_promotions];
+  if ((_a = item.promotions) === null || _a === void 0 ? void 0 : _a.isGet) {
+    const promo_id =
+      (_c =
+        (_b = item.promotions.bookings) === null || _b === void 0
+          ? void 0
+          : _b[0]) === null || _c === void 0
+        ? void 0
+        : _c.promotion;
+    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.22",
+  "version": "1.0.23",
   "homepage": "",
   "keywords": [],
   "author": {
@@ -45,7 +45,7 @@
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34",
-    "repzo": "^1.0.29",
+    "repzo": "^1.0.33",
     "uuid": "^8.3.2"
   }
 }

package/src/actions/create_invoice.ts

@@ -217,6 +217,18 @@ export const create_invoice = async (event: EVENT, options: Config) => {
       { per_page: 50000 }
     );
 
+    const all_promotions: {
+      [promo_id: string]: { _id: string; name: string; ref?: string };
+    } = {};
+    repzo_invoice?.promotions?.forEach((promo) => {
+      if (!promo) return;
+      all_promotions[promo._id] = {
+        _id: promo._id,
+        name: promo.name,
+        ref: promo.ref,
+      };
+    });
+
     // Prepare SAP_invoice_items
     const items = [];
 
@@ -244,8 +256,18 @@ export const create_invoice = async (event: EVENT, options: Config) => {
         throw `Product with _id: ${item.measureunit._id} not found in Repzo`;
 
       items.push({
-        MEO_Serial: getUniqueConcatenatedValues(item, "ref", " | "),
-        Promotion_Name: getUniqueConcatenatedValues(item, "name", " | "),
+        MEO_Serial: getUniqueConcatenatedValues(
+          item,
+          "ref",
+          " | ",
+          all_promotions
+        ),
+        Promotion_Name: getUniqueConcatenatedValues(
+          item,
+          "name",
+          " | ",
+          all_promotions
+        ),
         ItemCode: item.variant.variant_name,
         Quantity: item.qty,
         TaxCode: repzo_tax.integration_meta.TaxCode,

package/src/actions/create_proforma.ts

@@ -143,6 +143,18 @@ export const create_proforma = async (event: EVENT, options: Config) => {
       { per_page: 50000 }
     );
 
+    const all_promotions: {
+      [promo_id: string]: { _id: string; name: string; ref?: string };
+    } = {};
+    repzo_proforma?.promotions?.forEach((promo) => {
+      if (!promo) return;
+      all_promotions[promo._id] = {
+        _id: promo._id,
+        name: promo.name,
+        ref: promo.ref,
+      };
+    });
+
     // Prepare SAP_invoice_items
     const items: SAPProformaItem[] = [];
 
@@ -170,8 +182,18 @@ export const create_proforma = async (event: EVENT, options: Config) => {
         throw `Product with _id: ${item.measureunit._id} not found in Repzo`;
 
       items.push({
-        MEO_Serial: getUniqueConcatenatedValues(item, "ref", " | "),
-        Promotion_Name: getUniqueConcatenatedValues(item, "name", " | "),
+        MEO_Serial: getUniqueConcatenatedValues(
+          item,
+          "ref",
+          " | ",
+          all_promotions
+        ),
+        Promotion_Name: getUniqueConcatenatedValues(
+          item,
+          "name",
+          " | ",
+          all_promotions
+        ),
         ItemCode: item.variant.variant_name,
         Quantity: item.qty,
         TaxCode: repzo_tax.integration_meta.TaxCode,

package/src/util.ts

@@ -245,7 +245,10 @@ export const send_command_to_marketplace = async ({
 export const getUniqueConcatenatedValues = function (
   item: Service.Item.Schema,
   key: "name" | "ref",
-  delimiter: string
+  delimiter: string,
+  all_promos: {
+    [promo_id: string]: { _id: string; name: string; ref?: string };
+  }
 ): string {
   item.general_promotions = item.general_promotions || [];
   item.used_promotions = item.used_promotions || [];
@@ -253,6 +256,11 @@ export const getUniqueConcatenatedValues = function (
     ...item.general_promotions,
     ...item.used_promotions,
   ];
+  if (item.promotions?.isGet) {
+    const promo_id = item.promotions.bookings?.[0]?.promotion;
+    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)
   );