admin/Mareon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MARX#61048: Documenten versturen van Mareon naar AX (Stadgenoot)

Browse Source 
svn path=/Mareon/trunk/; revision=46490
This commit is contained in:
Marcel Bourseau
2020-04-03 14:45:55 +00:00
parent 2b72bb10cc
commit 7aacebd7e5
7 changed files with 245 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ax/SRC/AxFacilitor.js
View File

@@ -79,6 +79,9 @@ function AX2012_2_FCLT_Opdrachten(){
A2012_GetOpdrachten();
}
function FCLT_2_AX2012_Bijlagen(){
F_GetOpdrachten_Bijlagen();
}
function FCLT_2_AX2012_OpmerkingOpdrachten(){
F_GetOpdrachten_Opmerking();
}
@@ -289,6 +292,27 @@ function Ax2012_2_FACILITOR()
__Log("*** Communicatie logboek UIT", 2);
}
if (G_mar_sync_bijlages_naar_opdrgvr != '0'){
__Log("*** START FCLT --> AX2012 : Bijlagen bij opdrachten uit Mareon naar AX ***", 2);
//Bijlages naar AX2012 kan alleen via Token icm Saxton AX-webservice(s). Op soortgelijke (bijna identieke wijze) als AX365.
//---------------
__Log("*** START AX2012 --> FCLT : Get Token ***", 2);
G_Token = ReadTokenFromFile();
__Log("G_Token ReadTokenFromFile:" + G_Token, 4);
if (G_Token == ""){
__Log("G_Token ReadTokenFromFile is leeg:", 4);
G_Token = A2012_GetToken();
}
__Log("*** END Get Token", 2);
//---------------
FCLT_2_AX2012_Bijlagen();
__Log("*** END", 2);
}
__Log("*** START FCLT --> AX2012 : Afgemelde opdrachten uit Facilitor naar AX ***", 2);
FCLT_2_AX2012_AfgemeldeOpdrachten();
__Log("*** END", 2);
@@ -494,11 +518,12 @@ var G_ax_succeededfolder = Read_Ini_Setting("xtractor", "succeededfolder");
var G_ax_rejectedfolder = Read_Ini_Setting("xtractor", "rejectedfolder");
// Microsoft Token instellingen
var G_MS_url = Read_Ini_Setting("microsoft","token/url");
var G_MS_client_id = Read_Ini_Setting("microsoft","token/client_id");
var G_MS_client_secret = Read_Ini_Setting("microsoft","token/client_secret");
var G_MS_grant_type = Read_Ini_Setting("microsoft","token/grant_type");
var G_MS_resource = Read_Ini_Setting("microsoft","token/resource");
var G_ID_url = Read_Ini_Setting("identityserver","token/url");
var G_ID_client_id = Read_Ini_Setting("identityserver","token/client_id");
var G_ID_client_secret = Read_Ini_Setting("identityserver","token/client_secret");
var G_ID_grant_type = Read_Ini_Setting("identityserver","token/grant_type");
var G_ID_resource = Read_Ini_Setting("identityserver","token/resource");
var G_ID_scope = Read_Ini_Setting("identityserver","token/scope");
// Mareon instellingen, de term (XML node) "facilitor" is ivm historie cq. alle locale installaties bij woco's niet 1-2-3 aan te passen in de veel logischere term mareon.
var G_marx_url = Read_Ini_Setting("facilitor","url");
@@ -524,7 +549,7 @@ var G_mar_timeout = 0; //initieel 1e keer.
__Log("***XML- rems/opdrachtenfolder: " + G_rems_opdracht_xmlfolder, 1);
__Log("***XML- rems/opdrachtstatusfolder: " + G_rems_opdrachtstatus_xmlfolder, 1);
__Log("***XML- rems/facturenfolder: " + G_rems_facturen_xmlfolder, 1);
__Log("***XML- microsoft/token/url: " + G_MS_url, 1);
__Log("***XML- microsoft/token/url: " + G_ID_url, 1);
__Log("***XML- mareon/url: " + G_marx_url, 1);
__Log("***XML- xtractor/xmlfolder: " + G_ax_xtractorfolder, 1);
__Log("***XML- xtractor/pdffolder: " + G_pdf_xtractorfolder, 1);