repzo-sap-absjo 1.0.29 → 1.0.31

package/changelog.md

@@ -17,6 +17,7 @@
 - [commands/rep] delete hard code of rep.warehouse for reps start with: [WS, RET, MT] @maramalshen
 - [commands/client] decide if client is cash or credit depend on PAYMENTTERM instead of CLIENTGROUP @maramalshen
 - [actions/**] update integration_meta using repzo.updateIntegrationMeta instead of using service.update method to avoid infinity looping @maramalshen
+- [actions/create_invoice, actions/create_return_invoice] RefNum: advanced_serial_number ||serial_number.formatted @maramalshen
 
 ### Fixed
 

package/lib/actions/create_invoice.d.ts

@@ -1,5 +1,5 @@
 import { EVENT, Config } from "../types";
-interface SAPOpenInvoice {
+export interface SAPOpenInvoice {
   CustomerNumber: string;
   FatherCode: string;
   DocDate: string;
@@ -23,4 +23,3 @@ export declare const get_invoice_from_sap: (
     InvoiceId: string;
   }
 ) => Promise<SAPOpenInvoice[]>;
-export {};

package/lib/actions/create_invoice.js

@@ -333,7 +333,9 @@ export const create_invoice = async (event, options) => {
       });
     }
     const sap_invoice = {
-      RefNum: repzo_invoice.serial_number.formatted,
+      RefNum:
+        repzo_invoice.advanced_serial_number ||
+        repzo_invoice.serial_number.formatted,
       SalPersCode:
         repzo_rep === null || repzo_rep === void 0
           ? void 0

package/lib/actions/create_payment.js

@@ -4,7 +4,7 @@ import { v4 as uuid } from "uuid";
 import moment from "moment-timezone";
 import { get_invoice_from_sap } from "./create_invoice.js";
 export const create_payment = 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 }
@@ -96,20 +96,55 @@ export const create_payment = async (event, options) => {
         ? void 0
         : repzo_payment.LinkedTxn
     ) {
-      const sap_open_invoices = await get_invoice_from_sap(SAP_HOST_URL, {
-        updatedAt: "",
-        Status: "",
-        InvoiceId:
-          (_g =
-            (_f =
-              repzo_payment === null || repzo_payment === void 0
-                ? void 0
-                : repzo_payment.LinkedTxn) === null || _f === void 0
+      const repzo_inv_serial_number =
+        (_g =
+          (_f =
+            repzo_payment === null || repzo_payment === void 0
               ? void 0
-              : _f.Txn_serial_number) === null || _g === void 0
+              : repzo_payment.LinkedTxn) === null || _f === void 0
             ? void 0
-            : _g.formatted,
+            : _f.Txn_serial_number) === null || _g === void 0
+          ? void 0
+          : _g.formatted;
+      const repzo_invoices = await repzo.invoice.find({
+        "serial_number.formatted": repzo_inv_serial_number,
       });
+      const repzo_invoice =
+        (_h =
+          repzo_invoices === null || repzo_invoices === void 0
+            ? void 0
+            : repzo_invoices.data) === null || _h === void 0
+          ? void 0
+          : _h.find((inv) => {
+              var _a;
+              return (
+                ((_a = inv.serial_number) === null || _a === void 0
+                  ? void 0
+                  : _a.formatted) == repzo_inv_serial_number
+              );
+            });
+      if (!repzo_invoice) {
+        throw `Invoice with serial number: ${repzo_payment.LinkedTxn.Txn_serial_number.formatted} was not found on Repzo`;
+      }
+      let sap_open_invoices = [];
+      if (repzo_invoice.advanced_serial_number) {
+        sap_open_invoices = await get_invoice_from_sap(SAP_HOST_URL, {
+          updatedAt: "",
+          Status: "",
+          InvoiceId: repzo_invoice.advanced_serial_number,
+        });
+      }
+      if (
+        !(sap_open_invoices === null || sap_open_invoices === void 0
+          ? void 0
+          : sap_open_invoices.length)
+      ) {
+        sap_open_invoices = await get_invoice_from_sap(SAP_HOST_URL, {
+          updatedAt: "",
+          Status: "",
+          InvoiceId: repzo_inv_serial_number,
+        });
+      }
       if (
         !(sap_open_invoices === null || sap_open_invoices === void 0
           ? void 0
@@ -119,12 +154,12 @@ export const create_payment = async (event, options) => {
       }
       sap_payment.InvoiceID = sap_open_invoices[0].InvoiceID;
       sap_payment.InvoiceTotal =
-        ((_h =
+        ((_j =
           repzo_payment === null || repzo_payment === void 0
             ? void 0
-            : repzo_payment.LinkedTxn) === null || _h === void 0
+            : repzo_payment.LinkedTxn) === null || _j === void 0
           ? void 0
-          : _h.Txn_invoice_total) / 1000;
+          : _j.Txn_invoice_total) / 1000;
     } else {
       sap_payment.InvoiceID = "";
       sap_payment.InvoiceTotal = "";
@@ -133,7 +168,7 @@ export const create_payment = async (event, options) => {
       // bank
       //@ts-ignore
       const repzo_bank = await repzo.bank.get(
-        (_j = repzo_payment.check) === null || _j === void 0 ? void 0 : _j.bank
+        (_k = repzo_payment.check) === null || _k === void 0 ? void 0 : _k.bank
       );
       if (!repzo_bank) {
         //@ts-ignore
@@ -141,39 +176,39 @@ export const create_payment = async (event, options) => {
       }
       sap_payment.PaymentType = "2";
       sap_payment.ChequeAccount =
-        (_k =
+        (_l =
           repzo_rep === null || repzo_rep === void 0
             ? void 0
-            : repzo_rep.integration_meta) === null || _k === void 0
+            : repzo_rep.integration_meta) === null || _l === void 0
           ? void 0
-          : _k.USERCHECKACCTCODE;
+          : _l.USERCHECKACCTCODE;
       sap_payment.ChequeDate = moment(
-        (_l = repzo_payment.check) === null || _l === void 0
+        (_m = repzo_payment.check) === null || _m === void 0
           ? void 0
-          : _l.check_date,
+          : _m.check_date,
         "YYYY-MM-DD"
       ).format("YYYYMMDD");
       sap_payment.ChequeNumber =
-        (_m = repzo_payment.check) === null || _m === void 0
+        (_o = repzo_payment.check) === null || _o === void 0
           ? void 0
-          : _m.check_number;
+          : _o.check_number;
       sap_payment.BankCode =
-        (_o = repzo_bank.integration_meta) === null || _o === void 0
+        (_p = repzo_bank.integration_meta) === null || _p === void 0
           ? void 0
-          : _o.BANKCODE;
+          : _p.BANKCODE;
       sap_payment.CountryCode =
-        (_p = repzo_bank.integration_meta) === null || _p === void 0
+        (_q = repzo_bank.integration_meta) === null || _q === void 0
           ? void 0
-          : _p.COUNTRY;
+          : _q.COUNTRY;
     } else if (repzo_payment.payment_type == "cash") {
       sap_payment.PaymentType = "1";
       sap_payment.CashAccount =
-        (_q =
+        (_r =
           repzo_rep === null || repzo_rep === void 0
             ? void 0
-            : repzo_rep.integration_meta) === null || _q === void 0
+            : repzo_rep.integration_meta) === null || _r === void 0
           ? void 0
-          : _q.USERCASHACCOUNT;
+          : _r.USERCASHACCOUNT;
     }
     // console.dir(sap_payment, { depth: null });
     actionLog.addDetail(

package/lib/actions/create_return_invoice.js

@@ -271,7 +271,9 @@ export const create_return_invoice = async (event, options) => {
       });
     }
     const sap_return_invoice = {
-      RefNum: repzo_invoice.serial_number.formatted,
+      RefNum:
+        repzo_invoice.advanced_serial_number ||
+        repzo_invoice.serial_number.formatted,
       SalPersCode:
         repzo_rep === null || repzo_rep === void 0
           ? void 0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "repzo-sap-absjo",
   "description": "repzo SAP ABS jo integration",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "homepage": "",
   "keywords": [],
   "author": {
@@ -45,7 +45,7 @@
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34",
-    "repzo": "^1.0.103",
+    "repzo": "^1.0.109",
     "uuid": "^8.3.2"
   }
 }

package/src/actions/create_invoice.ts

@@ -38,7 +38,7 @@ interface SAPInvoice {
   U_ISTDQR?: string;
 }
 
-interface SAPOpenInvoice {
+export interface SAPOpenInvoice {
   CustomerNumber: string; // "400065-53";
   FatherCode: string; // "400065";
   DocDate: string; // "2022-12-14T21:00:00Z";
@@ -285,7 +285,9 @@ export const create_invoice = async (event: EVENT, options: Config) => {
     }
 
     const sap_invoice: SAPInvoice = {
-      RefNum: repzo_invoice.serial_number.formatted,
+      RefNum:
+        repzo_invoice.advanced_serial_number ||
+        repzo_invoice.serial_number.formatted,
       SalPersCode: repzo_rep?.integration_id,
       DocDate: moment(repzo_invoice.issue_date, "YYYY-MM-DD").format(
         "YYYYMMDD"

package/src/actions/create_payment.ts

@@ -4,7 +4,7 @@ import { _fetch, _create, _update, _delete } from "../util.js";
 import { Service } from "repzo/src/types";
 import { v4 as uuid } from "uuid";
 import moment from "moment-timezone";
-import { get_invoice_from_sap } from "./create_invoice.js";
+import { get_invoice_from_sap, SAPOpenInvoice } from "./create_invoice.js";
 
 interface SAPPayment {
   PaymentID: string; // "PAY-1041-3";
@@ -87,11 +87,33 @@ export const create_payment = async (event: EVENT, options: Config) => {
     };
 
     if (repzo_payment?.LinkedTxn) {
-      const sap_open_invoices = await get_invoice_from_sap(SAP_HOST_URL, {
-        updatedAt: "",
-        Status: "",
-        InvoiceId: repzo_payment?.LinkedTxn?.Txn_serial_number?.formatted,
+      const repzo_inv_serial_number =
+        repzo_payment?.LinkedTxn?.Txn_serial_number?.formatted;
+      const repzo_invoices = await repzo.invoice.find({
+        "serial_number.formatted": repzo_inv_serial_number,
       });
+      const repzo_invoice = repzo_invoices?.data?.find(
+        (inv) => inv.serial_number?.formatted == repzo_inv_serial_number
+      );
+      if (!repzo_invoice) {
+        throw `Invoice with serial number: ${repzo_payment.LinkedTxn.Txn_serial_number.formatted} was not found on Repzo`;
+      }
+
+      let sap_open_invoices: SAPOpenInvoice[] = [];
+      if (repzo_invoice.advanced_serial_number) {
+        sap_open_invoices = await get_invoice_from_sap(SAP_HOST_URL, {
+          updatedAt: "",
+          Status: "",
+          InvoiceId: repzo_invoice.advanced_serial_number,
+        });
+      }
+      if (!sap_open_invoices?.length) {
+        sap_open_invoices = await get_invoice_from_sap(SAP_HOST_URL, {
+          updatedAt: "",
+          Status: "",
+          InvoiceId: repzo_inv_serial_number,
+        });
+      }
       if (!sap_open_invoices?.length) {
         throw `Invoice with serial number: ${repzo_payment.LinkedTxn.Txn_serial_number.formatted} was not found on SAP or was closed`;
       }

package/src/actions/create_return_invoice.ts

@@ -208,7 +208,9 @@ export const create_return_invoice = async (event: EVENT, options: Config) => {
     }
 
     const sap_return_invoice: SAPInvoice = {
-      RefNum: repzo_invoice.serial_number.formatted,
+      RefNum:
+        repzo_invoice.advanced_serial_number ||
+        repzo_invoice.serial_number.formatted,
       SalPersCode: repzo_rep?.integration_id,
       DocDate: moment(repzo_invoice.issue_date, "YYYY-MM-DD").format(
         "YYYYMMDD"