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

issue #0001603 : Suppression surcharge pays avec nat

Browse Source
This commit is contained in:
Michael RICOIS 2013-04-06 12:51:27 +00:00
parent cef54af78d
commit ad3b32237f
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,13 +704,6 @@ class Entreprise extends WsScore
if ($item->PpPm=='PP') {
$detail->nom = $item->civilite.' '.$item->nom.' '.$item->prenom;
if ($item->adresse_pays!='') {
$libPays = array_key_exists($item->nat, $tabPays) ?
$tabPays[$item->nat] : $item->nat;
} else {
$libPays = $tabPays['FRA'];
}
$detail->pays = $libPays;
}
$detail->siren = str_pad($item->siren, 9, "0", STR_PAD_LEFT);
$detail->PDetention = $item->PDetention;
@ -770,13 +763,6 @@ class Entreprise extends WsScore
if ($item->PpPm=='PP') {
$detail->nom = $item->civilite.' '.$item->nom.' '.$item->prenom;
if ($item->adresse_pays!='') {
$libPays = array_key_exists($item->nat, $tabPays) ?
$tabPays[$item->nat] : $item->nat;
} else {
$libPays = $tabPays['FRA'];
}
$detail->pays = $libPays;
}
$detail->siren = str_pad($item->siren, 9, "0", STR_PAD_LEFT);
$detail->PDetention = $item->PDetention;
@ -917,13 +903,6 @@ class Entreprise extends WsScore
if ($item->PpPm=='PP') {
$detail->nom = $item->civilite.' '.$item->nom.' '.$item->prenom;
if ($item->adresse_pays!='') {
$libPays = array_key_exists($item->nat, $tabPays) ?
$tabPays[$item->nat] : $item->nat;
} else {
$libPays = $tabPays['FRA'];
}
$detail->pays = $libPays;
}
$detail->siren = str_pad($item->siren, 9, "0", STR_PAD_LEFT);
$detail->PDetention = $item->PDetention;
@ -983,13 +962,6 @@ class Entreprise extends WsScore
if ($item->PpPm=='PP') {
$detail->nom = $item->civilite.' '.$item->nom.' '.$item->prenom;
if ($item->adresse_pays!='') {
$libPays = array_key_exists($item->nat, $tabPays) ?
$tabPays[$item->nat] : $item->nat;
} else {
$libPays = $tabPays['FRA'];
}
$detail->pays = $libPays;
}
$detail->siren = str_pad($item->siren, 9, "0", STR_PAD_LEFT);
$detail->PDetention = $item->PDetention;
@ -1198,11 +1170,10 @@ class Entreprise extends WsScore
$rep = $iInsee->getEtablissements($siren, '', $position, $nbRep, 200, $departement, $actif);
$etabs = $rep['reponses'];
$nbReponses = $rep['nbReponsesTotal'];
$result = array();
if (count($etabs)>0)
{
foreach ($etabs as $nb => $etab)
{
if (count($etabs)>0) {
foreach ($etabs as $nb => $etab) {
$etablissement = new Etablissement();
$etablissement->id = $etab['id'];
$etablissement->Siege = $etab['Siege'];
@ -1808,6 +1779,11 @@ class Entreprise extends WsScore
return $output;
}
protected function getAnnoncesBoampList($siren, $filtre = null, $position = 0, $nbRep = 20)
{
}
/**
* Retourne les annonces de marché public
* @param string $siren
@ -1860,7 +1836,18 @@ class Entreprise extends WsScore
$liste = array();
if (is_array($anns) && count($anns)>0) {
foreach ($anns as $nb=>$ann) {
$entites = array();
//Add acheteur
$identite = $iInsee->getIdentiteLight($siren);
$entite = new AnnonceEntite();
$entite->siret = $identite['Siret'];
$entite->raisonSociale = $identite['Nom'];
$even = new AnnonceEvenement();
//$even->CodeEven = '';
$even->LibEven = 'Acheteur';
$entite->event = $even;
$entites[] = $entite;
//Search titulaire
$boamplotsM = new Application_Model_JoBoampLots();
@ -1870,6 +1857,7 @@ class Entreprise extends WsScore
)->where('idAnn=?', substr($ann['id'],2));
$result = $boamplotsM->fetchAll($sql);
if (count($result)>0) {
foreach ($result as $entity) {
$entite = new AnnonceEntite();
@ -1878,7 +1866,7 @@ class Entreprise extends WsScore
$even = new AnnonceEvenement();
//$even->CodeEven = '';
$even->LibEven = 'Titulaire';
$even->LibEven = 'Attributaire';
$entite->event = $even;
$entites[] = $entite;
}
@ -1906,7 +1894,7 @@ class Entreprise extends WsScore
$annonce->Rubrique = $ann['Rubrique'];
$annonce->typeAnnonce = $ann['typeAnnonce'];
$annonce->texteRectificatif = prepareString($ann['texteRectificatif']);
$annonce->texteAnnonce = utf8_encode($ann['texteAnnonce']);
$annonce->texteAnnonce = $ann['texteAnnonce'];
//$annonce->libFJ = $ann['libFJ'];
//$annonce->codFJ = $ann['codFJ'];
//$annonce->capital = $ann['capital'];