scores/webservice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RNVP : cedexa et permission, issue #0002114

Browse Source
This commit is contained in:
Michael RICOIS 2015-06-16 15:18:01 +00:00
parent 5d091a42cd
commit 6cd9530590
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library/WsScore/Entreprise/v0.9/Service.php
View File

@ -540,7 +540,7 @@ class Entreprise extends Scores_Ws_Server
public function getRNVP($companyId, $type = null)
{
$this->authenticate();
//$this->permission('RNVP');
$this->permission('RNVP');
// --- Identifiant SD : source + id
if ($type === null) {
@ -601,13 +601,11 @@ class Entreprise extends Scores_Ws_Server
'Iris_Ilot99',
'Iris_CodeIris',
'Iris_Canton',
/*
Cdx_Matricule
Cdx_V5Geo
Cdx_V6Geo
Cdx_V5Cdx
Cdx_V6Cdx
*/
'Cdx_Matricule',
'Cdx_V5Geo',
'Cdx_V6Geo',
'Cdx_V5Cdx',
'Cdx_V6Cdx',
'dateInsert',
'dateUpdate',
))->where('source=?', $source)->where('source_id=?', $sourceId);
@ -666,7 +664,7 @@ class Entreprise extends Scores_Ws_Server
'80' => "Cp/Ville non corrigeable (voie absente)",
'90' => "Etranger détecté",
);
if( array_key_exists($rnvpResult->CQadrs, $tabCQAdrs)) {
if( array_key_exists($rnvpResult->CQadrs, $tabCQAdrs) ) {
$InfoRNVP->QualityLabel = $tabCQAdrs[$rnvpResult->CQadrs];
}
@ -679,15 +677,11 @@ class Entreprise extends Scores_Ws_Server
$InfoRNVP->GeoIlot = $rnvpResult->Iris_Ilot99;
$InfoRNVP->GeoIris = $rnvpResult->Iris_CodeIris;
$InfoRNVP->GeoCanton = $rnvpResult->Iris_Canton;
/*
Cdx_Matricule int(7) Matricule contrat Cedex
Cdx_V5Geo varchar(38) Ligne 5 géographique
Cdx_V6Geo varchar(38) Ligne 6 géographique
Cdx_V5Cdx varchar(38) Mention spéciale de distribution
Cdx_V6Cdx varchar(38) Acheminement Cedex
*/
$InfoRNVP->CedexaMatricule = $rnvpResult->Cdx_Matricule;
$InfoRNVP->CedexaGeoL5 = $rnvpResult->Cdx_V5Geo;
$InfoRNVP->CedexaGeoL6 = $rnvpResult->Cdx_V6Geo;
$InfoRNVP->CedexaCdxL5 = $rnvpResult->Cdx_V5Cdx;
$InfoRNVP->CedexaCdxL6 = $rnvpResult->Cdx_V6Cdx;
$InfoRNVP->DateInsert = $rnvpResult->dateInsert;
$InfoRNVP->DateUpdate = $rnvpResult->dateUpdate;

25
library/WsScore/Entreprise/v0.9/Types.php
View File

@ -1500,6 +1500,31 @@ class Rnvp
*/
public $GeoCanton;
/**
* @var string
*/
public $CedexaMatricule;
/**
* @var string
*/
public $CedexaGeoL5;
/**
* @var string
*/
public $CedexaGeoL6;
/**
* @var string
*/
public $CedexaCdxL5;
/**
* @var string
*/
public $CedexaCdxL6;
/**
* @var string
*/