diff --git a/ax/SRC/AxFacilitor.js b/ax/SRC/AxFacilitor.js index 6b502e0..1e4eca6 100644 --- a/ax/SRC/AxFacilitor.js +++ b/ax/SRC/AxFacilitor.js @@ -735,9 +735,10 @@ function FACILITOR_2_Xtractor() // 1.71 -- MARX#76342: Mareon Bijlagen aanpassing AX2012 via nieuwe webservices die base64 stuk voor stuk ophaalt tbv performance // 1.72 -- MARX#77225: Bugje statusbericht naar 3RD party Viewpoint/Itris + MARX#76900 Mareon Universele Opdracht API // 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 -var G_Mareon_Adapter = "1.73"; +var G_Mareon_Adapter = "1.74"; //MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753 var G_new_date = new Date(); //----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/ax/SRC/Common.js b/ax/SRC/Common.js index 162ab41..55a3b74 100644 --- a/ax/SRC/Common.js +++ b/ax/SRC/Common.js @@ -919,6 +919,7 @@ function api_3P_inner (v_Url, v_API, v_req, v_type, v_soapAction, v_discard_acti __Log("api2_3P_inner v_API: " + v_API, 3); __Log("api2_3P_inner v_type: " + v_type, 3); __Log("api2_3P_inner v_req: " + v_req, 3); + __Log("api2_3P_inner v_soapAction: " + v_soapAction, 3); __Log("api2_3P_inner v_discard_active_abort: " + v_discard_active_abort, 3); __Log("api2_3P_inner v_soort_api: " + v_soort_api, 3); @@ -942,8 +943,11 @@ function api_3P_inner (v_Url, v_API, v_req, v_type, v_soapAction, v_discard_acti xmlhttp.setProxy(SXH_PROXY_SET_PROXY, proxy); xmlhttp.open("POST", v_Url, false); - xmlhttp.setRequestHeader("Content-Type", "text/plain"); - + xmlhttp.setRequestHeader("Content-Type", "text/xml"); + if (v_soapAction) + { + xmlhttp.setRequestHeader("SOAPAction",v_soapAction); + } if (G_mar_timeout != 0){ //MARX#57502: AX Adapter robuuster maken, instelbare timeout @@ -1497,6 +1501,9 @@ function displayTimeStamp() { if (dag < 10) { dag = "0" + dag } + if (hours < 10) { + hours = "0" + hours + } if (minutes < 10) { minutes = "0" + minutes } diff --git a/ax/SRC/TQ_SetOpdrachtStatus.js b/ax/SRC/TQ_SetOpdrachtStatus.js index 4769a50..848e466 100644 --- a/ax/SRC/TQ_SetOpdrachtStatus.js +++ b/ax/SRC/TQ_SetOpdrachtStatus.js @@ -76,7 +76,7 @@ function THIRDP_SetOpdrachtStatus (v_company_id, v_woco_gln, v_lev_gln, v_taskId var v_req = DICO_StatusBericht (v_woco_gln, v_lev_gln, v_purchId, v_statuscode, v_extraInfo, v_dateTime); var v_API = ""; var v_type = 0; - var v_soapAction = ""; + var v_soapAction = "messageservice/PostMessage"; var v_discard_active_abort = 1; //In geval van 500-error, geen active abort... var v_soort_api = 2; var v_resp = apiAX_GENERAL(v_API, v_req, v_type, v_soapAction, v_discard_active_abort, v_soort_api);