MARX#81188 Toevoegen van nieuwe factuurvelden in de JSON structuur voor T365

svn path=/Mareon/trunk/; revision=62725

ax/SRC/AxFacilitor.js

@@ -738,10 +738,11 @@ function FACILITOR_2_Xtractor()
 // 1.73 -- MARX#76390: Kan oude logging van de SYNC adapter automatisch opgeruimd worden + MARX#76891: Registratie in AX2012 of inkooporder aanwezig is in Mareon
 // 1.74 -- MARX#78797: Premium Ter Steege met woco "Mijande Wonen" (Viewpoint/Itris) - soapaction toegevoegd, contenttype aangepast en timestamp in MsgDateTime verbeterd
 // 1.75 -- MARX#74747: Voor T365 de Facturen via de Saxton/JSON koppeling
-// 1.76 -- MARX#80511: Weg met de Secrets en Tokens in de Mareon logging 
+// 1.76 -- MARX#80511: Weg met de Secrets en Tokens in de Mareon logging
+// 1.77 -- MARX#81188 Toevoegen van nieuwe factuurvelden in de JSON structuur voor T365 - Failure, InvoiceSource, PaymentID, OrderArtikelOmschr
 
 
-var G_Mareon_Adapter = "1.76";
+var G_Mareon_Adapter = "1.77";
 //MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753 
 var G_new_date = new Date();
 //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

ax/SRC/F_GetFacturen.js

@@ -515,6 +515,8 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
 //  "deliveryDate": "2023-06-19T10:42:49.281Z",
 //  "description": "string",
 //  "documentFileName": "string",
+//  "failure": "string",
+//  "failureDesc": "string",
 //  "g_Account": "string",
 //  "g_Amount": 0,
 //  "invoiceAmount": 0,
@@ -522,6 +524,8 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
 //  "invoiceDate": "2023-06-19T10:42:49.281Z",
 //  "invoiceNumber": "string",
 //  "invoiceSource": "string",
+//  "invoiceSourceNum": "string",
+//  "paymId": "string",
 //  "specs": [
 //    {
 //      "amount": 0,
@@ -531,6 +535,7 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
 //      "lineNum": 0,
 //      "lineQuanity": 0,
 //      "location": "string",
+//      "orderArtOms": <string>,
 //      "typeId": "string",
 //      "unit": "string",
 //      "vatIndicator": "string"
@@ -617,7 +622,14 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
     var v_invoiceBase64 = p_pdf_base64;
     
     var v_invoiceNumber = p_xml.selectSingleNode(strQuery_document + "/EX_INVOICENR").text;
-    var v_invoiceSource = p_xml.selectSingleNode(strQuery_document + "/EX_INVOICE_BRON").text;
+    //var v_invoiceSource = p_xml.selectSingleNode(strQuery_document + "/EX_INVOICE_BRON").text;
+    var v_invoice_MARXSource = p_xml.selectSingleNode(strQuery_document + "/EX_INVOICE_SOURCE").text;
+    var v_invoice_MARXSource_TEKST = p_xml.selectSingleNode(strQuery_document + "/EX_INVOICE_SOURCE_TXT").text;
+    
+    var v_PaymId = p_xml.selectSingleNode(strQuery_document + "/EX_INVOICE_PAYMENTID").text;
+    
+    var v_failure = p_xml.selectSingleNode(strQuery_document + "/EX_UITVAL").text;
+    var v_failureDesc = p_xml.selectSingleNode(strQuery_document + "/EX_UITVALOMS").text;
     
     var i = 1;
     var strQuery_tableROW = "//document/fields/TABLE/EX_TABLE/row[" + i + "]";
@@ -626,8 +638,9 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
     while (l_tableROW_xml)
     { 
       var v_ART = p_xml.selectSingleNode(strQuery_tableROW + "/col[@nr='1']").text;
-      //omschrijving van factuurregel wordt in T365 (nog) niet gebruikt...
+      
-      //var v_DESCR = p_xml.selectSingleNode(strQuery_tableROW + "/col[@nr='2']").text;
+      var v_DESCR = p_xml.selectSingleNode(strQuery_tableROW + "/col[@nr='2']").text;
+      
       var v_AMNT = 0;
       var v_AMNT_txt = p_xml.selectSingleNode(strQuery_tableROW + "/col[@nr='3']").text;
       if (v_AMNT_txt != "")
@@ -680,6 +693,7 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
             "lineNum": v_LINENUM,
             "lineQuanity": v_ARTNRAMNT,
             "location": v_ARTNRLOC,
+            "orderArtOms": v_DESCR,
             "typeId": v_ARTSPEC,
             "unit": v_ARTNRUNIT,
             "vatIndicator": v_BTW
@@ -734,13 +748,17 @@ function Xtractor_2_PreInvoice (p_xml, p_pdf_base64)
       "deliveryDate": v_deliveryDate,
       "description": v_description,
       "documentFileName": v_documentFileName,
+      "failure": v_failure,
+      "failureDesc": v_failureDesc,
       "g_Account": v_g_Account,
       "g_Amount": v_g_Amount,
       "invoiceAmount": v_invoiceAmount,
       "invoiceBase64": v_invoiceBase64,
       "invoiceDate": v_invoiceDate,
       "invoiceNumber": v_invoiceNumber,
-      "invoiceSource": v_invoiceSource,
+      "invoiceSource": v_invoice_MARXSource_TEKST,
+      "invoiceSourceNum": v_invoice_MARXSource,
+      "paymId": v_PaymId,
       "specs": v_array_resulttableROW,
       "taxAmountHigh": v_taxAmountHigh,
       "taxAmountLow": v_taxAmountLow,