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

Prepare new release 2.8, issue #0002114

Browse Source
This commit is contained in:
Michael RICOIS 2015-05-28 13:19:28 +00:00
parent aef8f4d490
commit 9f2f33a6b8
10 changed files with 435 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/SdMetier/autoload_classmap.php
View File

@ -6,7 +6,8 @@ return array(
'SdMetier_Infogreffe_DocBI' => dirname(__FILE__) . '//Infogreffe/DocBI.php',
'SdMetier_Infogreffe_DocST' => dirname(__FILE__) . '//Infogreffe/DocST.php',
'SdMetier_Infogreffe_Service' => dirname(__FILE__) . '//Infogreffe/Service.php',
'SdMetier_Scoring_Vars' => dirname(__FILE__) . '//Scoring/Vars.php',
'SdMetier_Intersud_Service' => dirname(__FILE__) . '//Intersud/Service.php',
'SdMetier_Rnvp_Detail' => dirname(__FILE__) . '//Rnvp/Detail.php',
'SdMetier_Search_Engine' => dirname(__FILE__) . '//Search/Engine.php',
'SdMetier_Sfr_Compile' => dirname(__FILE__) . '//Sfr/Compile.php',
'SdMetier_Sfr_Scoring' => dirname(__FILE__) . '//Sfr/Scoring.php',

5
library/WsScore/Entreprise/v0.8/Entreprise.php
View File

@ -268,8 +268,7 @@ class Entreprise extends Scores_Ws_Server
$identite->DateMajANN = $entrep['dateMajANN']; //@todo : date
$identite->DateMajID = $entrep['dateMajIdentite']; //@todo : date
if (preg_match('/NAF4/i', $this->User->pref))
{
if ( preg_match('/NAF4/i', $this->User->pref) ) {
$entrep2 = $iInsee->getNaf4($siren, $nic, $id);
if ( $entrep2 !== false ) {
$identite->Naf4Ent = $entrep2['apen4'];
@ -279,7 +278,7 @@ class Entreprise extends Scores_Ws_Server
}
}
$this->wsLog('identite',$siret,$id);
$this->wsLog('identite', $siret, $id);
return $identite;
}

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

@ -538,7 +538,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) {

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

@ -765,6 +765,36 @@ class Identite
* @var AutreSiret[]
*/
public $AutreSiret;
/**
*
* @var string
*/
public $GroupeId;
/**
*
* @var string
*/
public $GroupeName;
/**
*
* @var string
*/
public $GroupeIsin;
/**
*
* @var string
*/
public $GroupeCountryCode;
/**
*
* @var string
*/
public $GroupeCountryLabel;
}
@ -801,6 +831,43 @@ class IdentiteBourse {
public $derCoursCloture;
}
class InfosIris
{
/** Code Iris format court
* @var string
*/
public $codIris;
/** Code Iris format long (code commune Insee + code Iris)
* @var string
*/
public $codComIris;
/** Libellé de la zone Iris
* @var string
*/
public $libIris;
/** Libellé du type de la zone Iris
* @var string
*/
public $typIris;
/** Dernière évolution de la zone Iris
* @var string
*/
public $evoIris;
/** Code TRIRIS de l'Iris
* @var string
*/
public $trIris;
/** Code Grand Quartier de l'Iris
* @var string
*/
public $grdQuartier;
}
class IdentiteBilan
{

1
library/WsScore/Gestion/v0.4/Gestion.php
View File

@ -467,6 +467,7 @@ class Gestion extends Scores_Ws_Server
$acces = new AccesDetails();
$acces->Code = $item->Acces;
$acces->Label = $this->listeDroits[$item->Acces];
//@todo : ajouter Enable
$output->Acces[] = $acces;
}
}

1
library/WsScore/Order/v0.1/Config.php
View File

@ -2,4 +2,5 @@
return array(
'BilanInput' => 'BilanInput',
'PieceKbis' => 'PieceKbis',
'Bilan' => 'Bilan',
);

54
library/WsScore/Order/v0.1/Order.php
View File

@ -96,12 +96,12 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1OrderBilanInput();
$sql = $commandeM->select()->where('userId=?', $this->User->id);
$sql = $commandeM->select()->where('userId=?', $this->User->id)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Siren = $item->siren;
$cmd->BilanFileRecv = $item->bilanFileRecv;
$cmd->BilanCloture = $item->bilanCloture;
@ -140,7 +140,7 @@ class Order extends Scores_Ws_Server
$item = $commandeM->fetchRow($sql);
if ($item !== null) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Siren = $item->siren;
$cmd->BilanFileRecv = $item->bilanFileRecv;
$cmd->BilanCloture = $item->bilanCloture;
@ -182,12 +182,12 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1GreffeCommandesKb();
$sql = $commandeM->select()->where('login=?', $this->User->login);
$sql = $commandeM->select()->where('login=?', $this->User->login)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new PieceKbis();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->CompanyName = $item->raisonSociale;
@ -224,7 +224,7 @@ class Order extends Scores_Ws_Server
$item = $commandeM->fetchRow($sql);
if ($item !== null) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->CompanyName = $item->raisonSociale;
@ -267,7 +267,7 @@ class Order extends Scores_Ws_Server
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->CompanyName = $item->raisonSociale;
@ -289,7 +289,13 @@ class Order extends Scores_Ws_Server
}
protected function getActeList($month = null)
/**
* Liste des commandes d'acte infogreffe
* @param string $month
* @throws SoapFault
* @return Acte[]
*/
public function getActeList($month = null)
{
$this->authenticate();
@ -303,22 +309,20 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1GreffeCommandesAc();
$sql = $commandeM->select()->where('login=?', $this->User->login);
$sql = $commandeM->select()->where('login=?', $this->User->login)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd = new Acte();
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
//@todo : Génére le libellé du document
$cmd->DocDepotNum;
$cmd->DocDepotDate;
$cmd->DocActeNum;
$cmd->DocActeType;
$cmd->DocActeDate;
$cmd->DocLabel = ''; //@todo : Génére le libellé du document
$cmd->DocDepotNum = $item->depotNum;
$cmd->DocDepotDate = $item->depotDate;
$cmd->DocActeNum = $item->acteNum;
$cmd->DocActeType = $item->acteType;
$cmd->DocActeDate = $item->acteDate;
$cmd->CompanyName = $item->raisonSociale;
$cmd->CompanySiren = $item->siren;
$cmd->DateInsert = $item->dateInsert;
@ -344,9 +348,9 @@ class Order extends Scores_Ws_Server
* Liste des commandes de bilan infogreffe
* @param string $month
* @throws SoapFault
* @return multitype:BilanInput
* @return Bilan[]
*/
protected function getBilanList($month = null)
public function getBilanList($month = null)
{
$this->authenticate();
@ -360,12 +364,12 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1GreffeCommandesBi();
$sql = $commandeM->select()->where('login=?', $this->User->login);
$sql = $commandeM->select()->where('login=?', $this->User->login)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd = new Bilan();
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->DocBilanCloture = $item->bilanCloture;
@ -404,7 +408,7 @@ class Order extends Scores_Ws_Server
$item = $commandeM->fetchRow($sql);
if ($item !== null) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->DocBilanCloture = $item->bilanCloture;

54
library/WsScore/Order/v0.1/Service.php
View File

@ -96,12 +96,12 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1OrderBilanInput();
$sql = $commandeM->select()->where('userId=?', $this->User->id);
$sql = $commandeM->select()->where('userId=?', $this->User->id)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Siren = $item->siren;
$cmd->BilanFileRecv = $item->bilanFileRecv;
$cmd->BilanCloture = $item->bilanCloture;
@ -140,7 +140,7 @@ class Order extends Scores_Ws_Server
$item = $commandeM->fetchRow($sql);
if ($item !== null) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Siren = $item->siren;
$cmd->BilanFileRecv = $item->bilanFileRecv;
$cmd->BilanCloture = $item->bilanCloture;
@ -182,12 +182,12 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1GreffeCommandesKb();
$sql = $commandeM->select()->where('login=?', $this->User->login);
$sql = $commandeM->select()->where('login=?', $this->User->login)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new PieceKbis();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->CompanyName = $item->raisonSociale;
@ -224,7 +224,7 @@ class Order extends Scores_Ws_Server
$item = $commandeM->fetchRow($sql);
if ($item !== null) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->CompanyName = $item->raisonSociale;
@ -267,7 +267,7 @@ class Order extends Scores_Ws_Server
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->CompanyName = $item->raisonSociale;
@ -289,7 +289,13 @@ class Order extends Scores_Ws_Server
}
protected function getActeList($month = null)
/**
* Liste des commandes d'acte infogreffe
* @param string $month
* @throws SoapFault
* @return Acte[]
*/
public function getActeList($month = null)
{
$this->authenticate();
@ -303,22 +309,20 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1GreffeCommandesAc();
$sql = $commandeM->select()->where('login=?', $this->User->login);
$sql = $commandeM->select()->where('login=?', $this->User->login)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd = new Acte();
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
//@todo : Génére le libellé du document
$cmd->DocDepotNum;
$cmd->DocDepotDate;
$cmd->DocActeNum;
$cmd->DocActeType;
$cmd->DocActeDate;
$cmd->DocLabel = ''; //@todo : Génére le libellé du document
$cmd->DocDepotNum = $item->depotNum;
$cmd->DocDepotDate = $item->depotDate;
$cmd->DocActeNum = $item->acteNum;
$cmd->DocActeType = $item->acteType;
$cmd->DocActeDate = $item->acteDate;
$cmd->CompanyName = $item->raisonSociale;
$cmd->CompanySiren = $item->siren;
$cmd->DateInsert = $item->dateInsert;
@ -344,9 +348,9 @@ class Order extends Scores_Ws_Server
* Liste des commandes de bilan infogreffe
* @param string $month
* @throws SoapFault
* @return multitype:BilanInput
* @return Bilan[]
*/
protected function getBilanList($month = null)
public function getBilanList($month = null)
{
$this->authenticate();
@ -360,12 +364,12 @@ class Order extends Scores_Ws_Server
try {
$commandeM = new Application_Model_Sdv1GreffeCommandesBi();
$sql = $commandeM->select()->where('login=?', $this->User->login);
$sql = $commandeM->select()->where('login=?', $this->User->login)->order('dateInsert DESC');
$result = $commandeM->fetchAll($sql);
if (count($result) > 0) {
foreach($result as $item) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd = new Bilan();
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->DocBilanCloture = $item->bilanCloture;
@ -404,7 +408,7 @@ class Order extends Scores_Ws_Server
$item = $commandeM->fetchRow($sql);
if ($item !== null) {
$cmd = new BilanInput();
$cmd->Reference = $item->refCommande;
$cmd->Reference = strtoupper($item->refCommande);
$cmd->Mode = $item->mode;
$cmd->Error = $item->cmdError;
$cmd->DocBilanCloture = $item->bilanCloture;

110
library/WsScore/Order/v0.1/Types.php
View File

@ -198,4 +198,114 @@ class PieceActe
public $DateEnvoi;
}
class Bilan
{
/**
* @var string
*/
public $Reference;
/**
* @var string
*/
public $Mode;
/**
* @var string
*/
public $Error;
/**
* @var string
*/
public $DocBilanCloture;
/**
* @var string
*/
public $DocBilanType;
/**
* @var string
*/
public $CompanyName;
/**
* @var string
*/
public $CompanySiren;
/**
* @var string
*/
public $DateInsert;
/**
* @var string
*/
public $DateEnvoi;
}
class Acte
{
/**
* @var string
*/
public $Reference;
/**
* @var string
*/
public $Mode;
/**
* @var string
*/
public $Error;
/**
* @var string
*/
public $DocDepotNum;
/**
* @var string
*/
public $DocDepotDate;
/**
* @var string
*/
public $DocActeNum;
/**
* @var string
*/
public $DocActeType;
/**
* @var string
*/
public $DocActeDate;
/**
* @var string
*/
public $CompanyName;
/**
* @var string
*/
public $CompanySiren;
/**
* @var string
*/
public $DateInsert;
/**
* @var string
*/
public $DateEnvoi;
}

2
scripts/build/configure.php
View File

@ -107,6 +107,8 @@ if ($opts->install)
// Generate cache file
// genCache.php
passthru('php '.realpath(dirname(__FILE__)).'/genCache.php --generate Evenements');
// genCodeRatios.php
if ( substr(strtoupper(PHP_OS),0,3) != 'WIN' ) {