Merge branch 'bilanconfidentiel' into 'develop'

Bilanconfidentiel

See merge request !1
This commit is contained in:
potier 2017-03-29 08:29:02 +00:00
commit d1d3448e2d
6 changed files with 646 additions and 650 deletions

View File

@ -852,6 +852,7 @@ class FinanceController extends Zend_Controller_Action
$this->view->assign('raisonSociale', $entreprise->getRaisonSociale()); $this->view->assign('raisonSociale', $entreprise->getRaisonSociale());
$this->view->assign('siren', substr($this->siret, 0, 9)); $this->view->assign('siren', substr($this->siret, 0, 9));
$this->view->assign('siret', $this->siret); $this->view->assign('siret', $this->siret);
$this->view->assign('idClient', $user->identity->idClient);
$this->view->haveLiasse = ($bilanList->nbReponses > 0) ? true : false; $this->view->haveLiasse = ($bilanList->nbReponses > 0) ? true : false;

View File

@ -9,203 +9,203 @@ class SaisieController extends Zend_Controller_Action
* test de type de voie * test de type de voie
* @todo vérifier si type de voie à jour * @todo vérifier si type de voie à jour
*/ */
protected $codVoie = array( protected $codVoie = array(
'ABE' => "Abbaye", 'ABE' => "Abbaye",
'AGL' => "Agglomération", 'AGL' => "Agglomération",
'AIRE' => "Aire", 'AIRE' => "Aire",
'ALL' => "Allée", 'ALL' => "Allée",
'ALL' => "Allee", 'ALL' => "Allee",
'ACH' => "Ancien chemin", 'ACH' => "Ancien chemin",
'ART' => "Ancienne route", 'ART' => "Ancienne route",
'ANSE' => "Anse", 'ANSE' => "Anse",
'ARC' => "Arcade", 'ARC' => "Arcade",
'AUT' => "Autoroute", 'AUT' => "Autoroute",
'AV' => "Avenue", 'AV' => "Avenue",
'BRE' => "Barrière", 'BRE' => "Barrière",
'BCH' => "Bas chemin", 'BCH' => "Bas chemin",
'BSTD' => "Bastide", 'BSTD' => "Bastide",
'BAST' => "Baston", 'BAST' => "Baston",
'BEGI' => "Beguinage", 'BEGI' => "Beguinage",
'BER' => "Berge", 'BER' => "Berge",
'BOIS' => "Bois", 'BOIS' => "Bois",
'BCLE' => "Boucle", 'BCLE' => "Boucle",
'BD' => "Boulevard", 'BD' => "Boulevard",
'BRG' => "Bourg", 'BRG' => "Bourg",
'BUT' => "Butte", 'BUT' => "Butte",
'CALE' => "Cale", 'CALE' => "Cale",
'CAMP' => "Camp", 'CAMP' => "Camp",
'CGNE' => "Campagne", 'CGNE' => "Campagne",
'CPG' => "Camping", 'CPG' => "Camping",
'CARR' => "Carré", 'CARR' => "Carré",
'CAU' => "Carreau", 'CAU' => "Carreau",
'CAR' => "Carrefour", 'CAR' => "Carrefour",
'CARE' => "Carrière", 'CARE' => "Carrière",
'CST' => "Castel", 'CST' => "Castel",
'CAV' => "Cavée", 'CAV' => "Cavée",
'CTRE' => "Central", 'CTRE' => "Central",
'CTRE' => "Centre", 'CTRE' => "Centre",
'CHL' => "Chalet", 'CHL' => "Chalet",
'CHP' => "Chapelle", 'CHP' => "Chapelle",
'CHI' => "Charmille", 'CHI' => "Charmille",
'CHT' => "Château", 'CHT' => "Château",
'CHS' => "Chaussée", 'CHS' => "Chaussée",
'CHE' => "Chemin", 'CHE' => "Chemin",
'CHV' => "Chemin vicinaux", 'CHV' => "Chemin vicinaux",
'CHV' => "Chemin vicinal", 'CHV' => "Chemin vicinal",
'CHEM' => "Cheminement", 'CHEM' => "Cheminement",
'CITE' => "Cîte", 'CITE' => "Cîte",
'CLOI' => "Cloître", 'CLOI' => "Cloître",
'CLOS' => "Clos", 'CLOS' => "Clos",
'COL' => "Col", 'COL' => "Col",
'COLI' => "Colline", 'COLI' => "Colline",
'CTR' => "Contour", 'CTR' => "Contour",
'COR' => "Corniche", 'COR' => "Corniche",
'COTE' => "Côte", 'COTE' => "Côte",
'COTT' => "Cottage", 'COTT' => "Cottage",
'COUR' => "Cour", 'COUR' => "Cour",
'CRS' => "Cours", 'CRS' => "Cours",
'DARS' => "Darse", 'DARS' => "Darse",
'DEG' => "Degré", 'DEG' => "Degré",
'DSG' => "Descente", 'DSG' => "Descente",
'DSC' => "Descente", 'DSC' => "Descente",
'DIG' => "Digue", 'DIG' => "Digue",
'DOM' => "Domaine", 'DOM' => "Domaine",
'ECA' => "Ecart", 'ECA' => "Ecart",
'ECL' => "Ecluse", 'ECL' => "Ecluse",
'EGL' => "Eglise", 'EGL' => "Eglise",
'EN' => "Enceinte", 'EN' => "Enceinte",
'ENV' => "Enclave", 'ENV' => "Enclave",
'ENC' => "Enclos", 'ENC' => "Enclos",
'ESC' => "Escalier", 'ESC' => "Escalier",
'ESPA' => "Espace", 'ESPA' => "Espace",
'ESP' => "Esplanade", 'ESP' => "Esplanade",
'ETING' => "Etang", 'ETING' => "Etang",
'FG' => "Faubourg", 'FG' => "Faubourg",
'FRM' => "Ferme", 'FRM' => "Ferme",
'FON' => "Fontaine", 'FON' => "Fontaine",
'FORT' => "Fort", 'FORT' => "Fort",
'FORM' => "Forum", 'FORM' => "Forum",
'FOS' => "Fosse", 'FOS' => "Fosse",
'FOYR' => "Foyer", 'FOYR' => "Foyer",
'GAL' => "Galerie", 'GAL' => "Galerie",
'GARE' => "Gare", 'GARE' => "Gare",
'GARN' => "Garenne", 'GARN' => "Garenne",
'GBD' => "Grand boulevard", 'GBD' => "Grand boulevard",
'GDEN' => "Grande ensemble", 'GDEN' => "Grande ensemble",
'GR' => "Grande rue", 'GR' => "Grande rue",
'GRI' => "Grille", 'GRI' => "Grille",
'GRIM' => "Grimpette", 'GRIM' => "Grimpette",
'GPE' => "Groupe", 'GPE' => "Groupe",
'GPT' => "Groupement", 'GPT' => "Groupement",
'HLE' => "Halle", 'HLE' => "Halle",
'HAM' => "Hameau", 'HAM' => "Hameau",
'HCH' => "Haut chemin", 'HCH' => "Haut chemin",
'HIP' => "Hippodrome", 'HIP' => "Hippodrome",
'HLM' => "HLM", 'HLM' => "HLM",
'ILE' => "Ile", 'ILE' => "Ile",
'IMM' => "Immeuble", 'IMM' => "Immeuble",
'IMP' => "Impasse", 'IMP' => "Impasse",
'JARD' => "Jardin", 'JARD' => "Jardin",
'JTE' => "Jetée", 'JTE' => "Jetée",
'LEVE' => "Levée", 'LEVE' => "Levée",
'LD' => "Lieu dit", 'LD' => "Lieu dit",
'LD' => "Lieudit", 'LD' => "Lieudit",
'LOT' => "Lotissement", 'LOT' => "Lotissement",
'MAIL' => "Mail", 'MAIL' => "Mail",
'MF' => "Maison forestière", 'MF' => "Maison forestière",
'MAN' => "Manoir", 'MAN' => "Manoir",
'MAR' => "Marche", 'MAR' => "Marche",
'MAS' => "Mas", 'MAS' => "Mas",
'MET' => "Métro", 'MET' => "Métro",
'MTE' => "Montée", 'MTE' => "Montée",
'MLN' => "Moulin", 'MLN' => "Moulin",
'MUS' => "Musée", 'MUS' => "Musée",
'NTE' => "Nouvelle route", 'NTE' => "Nouvelle route",
'PAL' => "Palais", 'PAL' => "Palais",
'PARC' => "Parc", 'PARC' => "Parc",
'PKG' => "Parking", 'PKG' => "Parking",
'PRV' => "Parvis", 'PRV' => "Parvis",
'PAS' => "Passage", 'PAS' => "Passage",
'PN' => "Passage à niveau", 'PN' => "Passage à niveau",
'PASS' => "Passe", 'PASS' => "Passe",
'PLE' => "Passerelle", 'PLE' => "Passerelle",
'PAT' => "Patio", 'PAT' => "Patio",
'PAV' => "Pavillon", 'PAV' => "Pavillon",
'PERI' => "Périphérique", 'PERI' => "Périphérique",
'PSTY' => "Péristyle", 'PSTY' => "Péristyle",
'PTA' => "Petites allée", 'PTA' => "Petites allée",
'PCH' => "Petit chemin", 'PCH' => "Petit chemin",
'PAE' => "Petite avenue", 'PAE' => "Petite avenue",
'PIM' => "Petite impasse", 'PIM' => "Petite impasse",
'PRT' => "Petite route", 'PRT' => "Petite route",
'PTR' => "Petite rue", 'PTR' => "Petite rue",
'PL' => "Place", 'PL' => "Place",
'PLCI' => "Placis", 'PLCI' => "Placis",
'PLAG' => "Plage", 'PLAG' => "Plage",
'PLN' => "Plaine", 'PLN' => "Plaine",
'PLAN' => "Plan", 'PLAN' => "Plan",
'PLT' => "Plateau", 'PLT' => "Plateau",
'PNT' => "Pointe", 'PNT' => "Pointe",
'PONT' => "Pont", 'PONT' => "Pont",
'PCH' => "Porche", 'PCH' => "Porche",
'PORT' => "Port", 'PORT' => "Port",
'PTE' => "Porte", 'PTE' => "Porte",
'PORQ' => "Portique", 'PORQ' => "Portique",
'POT' => "Poterne", 'POT' => "Poterne",
'POUR' => "Pourtour", 'POUR' => "Pourtour",
'PRE' => "Pré", 'PRE' => "Pré",
'PRQ' => "Presqu'île", 'PRQ' => "Presqu'île",
'PROM' => "Promenade", 'PROM' => "Promenade",
'QU' => "Quai", 'QU' => "Quai",
'QUAI' => "Quai", 'QUAI' => "Quai",
'QUA' => "Quartier", 'QUA' => "Quartier",
'RAC' => "Raccourci", 'RAC' => "Raccourci",
'RAID' => "Raidillon", 'RAID' => "Raidillon",
'RPE' => "Rampe", 'RPE' => "Rampe",
'REM' => "Rempart", 'REM' => "Rempart",
'RES' => "Résidence", 'RES' => "Résidence",
'ROC' => "Roc", 'ROC' => "Roc",
'ROC' => "Rocade", 'ROC' => "Rocade",
'RPT' => "Rond point", 'RPT' => "Rond point",
'ROQT' => "Roquet", 'ROQT' => "Roquet",
'RTD' => "Rotonde", 'RTD' => "Rotonde",
'RTE' => "Route", 'RTE' => "Route",
'R' => "Rue", 'R' => "Rue",
'RUE' => "Rue", 'RUE' => "Rue",
'RLE' => "Ruelle", 'RLE' => "Ruelle",
'SEN' => "Sente", 'SEN' => "Sente",
'SEN' => "Sentier", 'SEN' => "Sentier",
'SQ' => "Square", 'SQ' => "Square",
'STDE' => "Stade", 'STDE' => "Stade",
'STA' => "Station", 'STA' => "Station",
'TPL' => "Terre plein", 'TPL' => "Terre plein",
'TRN' => "Terrain", 'TRN' => "Terrain",
'TSSE' => "Terrasse", 'TSSE' => "Terrasse",
'TRT' => "Tertre", 'TRT' => "Tertre",
'TOUR' => "Tour", 'TOUR' => "Tour",
'TRA' => "Traverse", 'TRA' => "Traverse",
'VAL' => "Vallon", 'VAL' => "Vallon",
'VAL' => "Vallée", 'VAL' => "Vallée",
'VEN' => "Venelle", 'VEN' => "Venelle",
'VIA' => "Via", 'VIA' => "Via",
'VTE' => "Vieille route", 'VTE' => "Vieille route",
'VCHE' => "Vieux chemin", 'VCHE' => "Vieux chemin",
'VLA' => "Villa", 'VLA' => "Villa",
'VGE' => "Village", 'VGE' => "Village",
'VLGE' => "Village", 'VLGE' => "Village",
'VOI' => "Voie", 'VOI' => "Voie",
'VOIE' => "Voie", 'VOIE' => "Voie",
'ZONE' => "Zone", 'ZONE' => "Zone",
'ZAC' => "Zone d'aménagement concerté", 'ZAC' => "Zone d'aménagement concerté",
'Z A C' => "Zone d'aménagement concerté", 'Z A C' => "Zone d'aménagement concerté",
'ZAD' => "Zone d'aménagement différé", 'ZAD' => "Zone d'aménagement différé",
'Z A D' => "Zone d'aménagement différé", 'Z A D' => "Zone d'aménagement différé",
'ZA' => "Zone artisanale", 'ZA' => "Zone artisanale",
'Z A' => "Zone artisanale", 'Z A' => "Zone artisanale",
'ZI' => "Zone industrielle", 'ZI' => "Zone industrielle",
'Z I' => "Zone industrielle", 'Z I' => "Zone industrielle",
'ZUP' => "Zone à urbaniser en priorité", 'ZUP' => "Zone à urbaniser en priorité",
'Z U P' => "Zone à urbaniser en priorité", 'Z U P' => "Zone à urbaniser en priorité",
); );
/** /**
@ -904,7 +904,7 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('siret', $siret); $this->view->assign('siret', $siret);
} }
public function liasseAction() public function liasseAction()
{ {
$request = $this->getRequest(); $request = $this->getRequest();
@ -915,16 +915,17 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('siren', $siren); $this->view->assign('siren', $siren);
$session = new Scores_Session_Entreprise($siret, $id); $session = new Scores_Session_Entreprise($siret, $id);
$this->view->assign('siret', $siret); $this->view->assign('siret', $siret);
$this->view->assign('raisonSociale', $session->getRaisonSociale()); $this->view->assign('raisonSociale', $session->getRaisonSociale());
require_once 'Scores/WsScores.php'; require_once 'Scores/WsScores.php';
$ws = new WsScores(); $ws = new WsScores();
$selection = $request->getParam('selection', ''); $selection = $request->getParam('selection', '');
if ( !empty($selection) ) { if ( !empty($selection) ) {
list($date, $type) = explode(':', $selection); list($date, $type) = explode(':', $selection);
// --- Correction d'un bilan // --- Correction d'un bilan
if ($date!='NEW') { if ($date!='NEW') {
$milDate = $milDatePre = null; $milDate = $milDatePre = null;
@ -954,6 +955,7 @@ class SaisieController extends Zend_Controller_Action
$infos->dureeMois = $response->DUREE_MOIS; $infos->dureeMois = $response->DUREE_MOIS;
$infos->dureeMoisPre = $response->DUREE_MOIS_PRE; $infos->dureeMoisPre = $response->DUREE_MOIS_PRE;
$infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE; $infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE;
$postes = array(); $postes = array();
foreach ($response->POSTES->item as $item) { foreach ($response->POSTES->item as $item) {
$postes[$item->id] = $item->val; $postes[$item->id] = $item->val;
@ -969,6 +971,7 @@ class SaisieController extends Zend_Controller_Action
$infos->dateCloturePre = $response->DATE_CLOTURE; $infos->dateCloturePre = $response->DATE_CLOTURE;
$infos->dureeMoisPre = $response->DUREE_MOIS; $infos->dureeMoisPre = $response->DUREE_MOIS;
$infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE; $infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE;
$postesN1 = array(); $postesN1 = array();
foreach ($response->POSTES->item as $item) { foreach ($response->POSTES->item as $item) {
$postesN1[$item->id] = $item->val; $postesN1[$item->id] = $item->val;
@ -1233,63 +1236,63 @@ class SaisieController extends Zend_Controller_Action
} }
} }
$ancres = array( $ancres = array(
'C' => array( 'C' => array(
'actif' => 'Actif', 'actif' => 'Actif',
'passif' => 'Passif', 'passif' => 'Passif',
'compteDeResultat' => 'Compte de résultat', 'compteDeResultat' => 'Compte de résultat',
//+ Poste YP pour l'effectif du groupe //+ Poste YP pour l'effectif du groupe
), ),
'N' => array( 'N' => array(
'actif' => 'Actif', 'actif' => 'Actif',
'passif' => 'Passif', 'passif' => 'Passif',
'compteDeResultat' => 'Compte de résultat', 'compteDeResultat' => 'Compte de résultat',
'immobilisations' => 'Immobilisations', 'immobilisations' => 'Immobilisations',
'amortissements' => 'Amortissements', 'amortissements' => 'Amortissements',
'provisions' => 'Provisions', 'provisions' => 'Provisions',
'creancesDettes' => 'Créances, Dettes', 'creancesDettes' => 'Créances, Dettes',
'resultatfiscal' => 'Détermination du résultat fiscal', 'resultatfiscal' => 'Détermination du résultat fiscal',
'deficit' => 'DÉFICITS, INDEMNITÉS POUR CONGÉS À PAYER ET PROVISIONS NON DÉDUCTIBLES', 'deficit' => 'DÉFICITS, INDEMNITÉS POUR CONGÉS À PAYER ET PROVISIONS NON DÉDUCTIBLES',
'affectation' => 'Affectation', 'affectation' => 'Affectation',
'annexe16' => 'DÉTERMINATION DE LA VALEUR AJOUTÉE PRODUITE AU COURS DE L\'EXERCICE', 'annexe16' => 'DÉTERMINATION DE LA VALEUR AJOUTÉE PRODUITE AU COURS DE L\'EXERCICE',
), ),
'S' => array( 'S' => array(
'actif' => 'Actif', 'actif' => 'Actif',
'passif' => 'Passif', 'passif' => 'Passif',
'compteDeResultat' => 'Compte de résultat', 'compteDeResultat' => 'Compte de résultat',
'immobilisations' => 'Immobilisations', 'immobilisations' => 'Immobilisations',
'amortissements' => 'Amortissements', 'amortissements' => 'Amortissements',
'provisions' => 'Provisions', 'provisions' => 'Provisions',
'creancesDettes' => 'Créances, Dettes', 'creancesDettes' => 'Créances, Dettes',
'affectation' => 'Affectation' 'affectation' => 'Affectation'
), ),
'A' => array( 'A' => array(
'actif' => 'Actif', 'actif' => 'Actif',
'passif' => 'Passif', 'passif' => 'Passif',
'compteDeResultat' => 'Compte de résultat', 'compteDeResultat' => 'Compte de résultat',
), ),
'B' => array( 'B' => array(
'actif' => 'Actif', 'actif' => 'Actif',
'passif' => 'Passif', 'passif' => 'Passif',
'compteDeResultat' => 'Compte de résultat', 'compteDeResultat' => 'Compte de résultat',
), ),
); );
if (!empty($infos)) { if (!empty($infos)) {
// --- Default value pour les nouveaux bilans // --- Default value pour les nouveaux bilans
if ( is_string($infos) && $infos == 'NEW' ) { if ( is_string($infos) && $infos == 'NEW' ) {
$dateCloture = (date('Y')-1).'1231'; $dateCloture = (date('Y')-1).'1231';
$dureeMois = '12'; $dureeMois = '12';
$dateCloturePre = 'AAAAMMJJ'; $dateCloturePre = 'AAAAMMJJ';
$dureeMoisPre = '0'; $dureeMoisPre = '0';
$unite = 'U'; $unite = 'U';
} }
// --- Default value pour l' edition de bilan // --- Default value pour l' edition de bilan
else { else {
$dateCloture = ($infos->dateCloture!='') ? $infos->dateCloture : $date; $dateCloture = ($infos->dateCloture!='') ? $infos->dateCloture : $date;
$dureeMois = ($infos->dureeMois!='') ? $infos->dureeMois : '12'; $dureeMois = ($infos->dureeMois!='') ? $infos->dureeMois : '12';
$dateCloturePre = empty($infos->dateCloturePre) ? 'AAAAMMJJ' : $infos->dateCloturePre ; $dateCloturePre = empty($infos->dateCloturePre) ? 'AAAAMMJJ' : $infos->dateCloturePre ;
$dureeMoisPre = empty($infos->dureeMoisPre) ? '0' : $infos->dureeMoisPre; $dureeMoisPre = empty($infos->dureeMoisPre) ? '0' : $infos->dureeMoisPre;
$unite = $infos->unite; $unite = $infos->unite;
$this->view->assign('liasse', $postes); $this->view->assign('liasse', $postes);
} }
@ -1298,23 +1301,23 @@ class SaisieController extends Zend_Controller_Action
$dateCloture = substr($dateCloture,6,2).'/'.substr($dateCloture,4,2).'/'.substr($dateCloture,0,4); $dateCloture = substr($dateCloture,6,2).'/'.substr($dateCloture,4,2).'/'.substr($dateCloture,0,4);
$dateCloturePre = substr($dateCloturePre,6,2).'/'.substr($dateCloturePre,4,2).'/'.substr($dateCloturePre,0,4); $dateCloturePre = substr($dateCloturePre,6,2).'/'.substr($dateCloturePre,4,2).'/'.substr($dateCloturePre,0,4);
$this->view->assign('dateCloture', $dateCloture); $this->view->assign('dateCloture', $dateCloture);
$this->view->assign('dateCloturePre', $dateCloturePre); $this->view->assign('dateCloturePre', $dateCloturePre);
$this->view->assign('dureeMois', $dureeMois); $this->view->assign('dureeMois', $dureeMois);
$this->view->assign('dureeMoisPre', $dureeMoisPre); $this->view->assign('dureeMoisPre', $dureeMoisPre);
$this->view->assign('unite', $unite); $this->view->assign('unite', $unite);
$this->view->assign('typeBilan', $type); $this->view->assign('typeBilan', $type);
$this->view->assign('ancres', $ancres[$type]); $this->view->assign('ancres', $ancres[$type]);
$this->view->inlineScript()->appendFile('/libs/editable/jquery.jeditable.js'); $this->view->inlineScript()->appendFile('/libs/editable/jquery.jeditable.js');
$this->view->assign('infos', $infos); $this->view->assign('infos', $infos);
} }
} }
/** /**
* Sauvegarde de la liasse saisie * Sauvegarde de la liasse saisie
*/ */
public function liassesaveAction() public function liassesaveAction()
{ {
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
//Renvoyer flux json STATUS : OK ou ERR, MESSAGE : TEXTE, POSTE : ARRAY ou vide //Renvoyer flux json STATUS : OK ou ERR, MESSAGE : TEXTE, POSTE : ARRAY ou vide
@ -1669,14 +1672,14 @@ class SaisieController extends Zend_Controller_Action
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
$dep = new Application_Model_TabDepartements(); $dep = new Application_Model_TabDepartements();
$sql = $dep->select(); $sql = $dep->select();
$rows = $dep->fetchAll($sql); $rows = $dep->fetchAll($sql);
if ( count($rows)>0 ) { if ( count($rows)>0 ) {
foreach ($rows as $item) { foreach ($rows as $item) {
$depListe[] = array( $depListe[] = array(
'num' => $item->numdep, 'num' => $item->numdep,
'lib' => $item->libdep, 'lib' => $item->libdep,
); );
} }
} }
$this->view->assign('depListe', $depListe); $this->view->assign('depListe', $depListe);
$this->view->assign('countries', $this->countries); $this->view->assign('countries', $this->countries);
@ -1872,9 +1875,9 @@ class SaisieController extends Zend_Controller_Action
if($params['transfer'] && ($params['MajMin'] == 'T' || $params['MajMin'] == 'F')) if($params['transfer'] && ($params['MajMin'] == 'T' || $params['MajMin'] == 'F'))
{ {
$liens = $ws->getLiensById($idPar); $liens = $ws->getLiensById($idPar);
$participations = $liens->participations->item; $participations = $liens->participations->item;
if (count($participations)>0) { if (count($participations)>0) {
$ws->setLienChange('tupfusion', $idPar, $idAct); $ws->setLienChange('tupfusion', $idPar, $idAct);
} }
@ -2071,12 +2074,12 @@ class SaisieController extends Zend_Controller_Action
$ws = new WsScores(); $ws = new WsScores();
$result = $ws->getSaisieBourse($isin); $result = $ws->getSaisieBourse($isin);
$infos = json_decode($result, true); $infos = json_decode($result, true);
$dateFields = array( $dateFields = array(
'dateIntroduction', 'dateIntroduction',
'dateIntroYmd', 'dateIntroYmd',
'dateRadiation', 'dateRadiation',
'dateNbTitres', 'dateNbTitres',
'dateDerAG'); 'dateDerAG');
if ( $infos === null ) { if ( $infos === null ) {
$this->view->assign('error', $result); $this->view->assign('error', $result);
@ -2244,21 +2247,21 @@ class SaisieController extends Zend_Controller_Action
if ($items['PpPm']=='PM') { if ($items['PpPm']=='PM') {
$this->view->assign('nom', $items['RS']); $this->view->assign('nom', $items['RS']);
} else { } else {
$dep = new Application_Model_TabDepartements(); $dep = new Application_Model_TabDepartements();
$sql = $dep->select(); $sql = $dep->select();
$rows = $dep->fetchAll($sql); $rows = $dep->fetchAll($sql);
if ( count($rows)>0 ) { if ( count($rows)>0 ) {
foreach ($rows as $item) { foreach ($rows as $item) {
$depListe[] = array( $depListe[] = array(
'num' => $item->numdep, 'num' => $item->numdep,
'lib' => $item->libdep, 'lib' => $item->libdep,
); );
if ($item->numdep == $items['naissance_dept_pays']) { if ($item->numdep == $items['naissance_dept_pays']) {
$this->view->assign('naissance_dept_pays', 'FRA'); $this->view->assign('naissance_dept_pays', 'FRA');
$this->view->assign('naissance_dept', $item->numdep); $this->view->assign('naissance_dept', $item->numdep);
} }
} }
} }
$this->view->assign('depListe', $depListe); $this->view->assign('depListe', $depListe);
$this->view->assign('nom', $items['nom']); $this->view->assign('nom', $items['nom']);
} }
@ -2320,19 +2323,19 @@ class SaisieController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$id = $request->getParam('idFiche', null); $id = $request->getParam('idFiche', null);
$infos = array ('delete' => '1'); $infos = array ('delete' => '1');
$ws = new WsScores();
if ($id===null) {
$siren = $request->getParam('siren');
$result = $ws->searchLienRef($siren, 'siren'); $ws = new WsScores();
if (count($result->item)>0) {
foreach ($result->item as $item) { if ($id===null) {
$id = $item->id; $siren = $request->getParam('siren');
break;
} $result = $ws->searchLienRef($siren, 'siren');
} if (count($result->item)>0) {
foreach ($result->item as $item) {
$id = $item->id;
break;
}
}
} }
if ( $request->isPost() ) { if ( $request->isPost() ) {
@ -2356,7 +2359,7 @@ class SaisieController extends Zend_Controller_Action
public function scorecutoffAction() public function scorecutoffAction()
{ {
$ws = new WsScores(); $ws = new WsScores();
$user = new Scores_Utilisateur(); $user = new Scores_Utilisateur();
$request = $this->getRequest(); $request = $this->getRequest();
@ -2413,22 +2416,22 @@ class SaisieController extends Zend_Controller_Action
if ( $request->isPost() ) { if ( $request->isPost() ) {
// check values one more time // check values one more time
$paramlist = array( $paramlist = array(
'siren' => 'Siren', 'siren' => 'Siren',
'encours' => 'Encours', 'encours' => 'Encours',
'scoreSolv' => 'Indiscore', 'scoreSolv' => 'Indiscore',
'scoreDir' => 'Score dirigeance', 'scoreDir' => 'Score dirigeance',
'scoreConf' => 'Score de conformité', 'scoreConf' => 'Score de conformité',
'remarque' => 'Remarque', 'remarque' => 'Remarque',
'paiement' => 'Information de paiement', 'paiement' => 'Information de paiement',
); );
foreach ($paramlist as $item => $val) { foreach ($paramlist as $item => $val) {
if ( !isset($params[$item]) ) { if ( !isset($params[$item]) ) {
$message .= "Valeur $val vide !<br/>"; $message .= "Valeur $val vide !<br/>";
} }
if ( $params['encours']<0 || $params['encours']>500 ) { if ( $params['encours']<0 || $params['encours']>500 ) {
$message = "Encours : Erreur borne"; $message = "Encours : Erreur borne";
} }
} }
// end checking values // end checking values
@ -2483,7 +2486,7 @@ class SaisieController extends Zend_Controller_Action
) , 'default', true)); ) , 'default', true));
} }
$this->view->assign('getcutoff', $getcutoff); $this->view->assign('getcutoff', $getcutoff);
$this->view->assign('siren', $siren); $this->view->assign('siren', $siren);
$this->view->assign('typescore', $user->getTypeScore()); $this->view->assign('typescore', $user->getTypeScore());
@ -2492,11 +2495,11 @@ class SaisieController extends Zend_Controller_Action
public function citysearchAction() public function citysearchAction()
{ {
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
$cpVille = $this->getRequest()->getParam('cpville', null); $cpVille = $this->getRequest()->getParam('cpville', null);
$output = array(); $output = array();
if ( null !== $cpVille) { if ( null !== $cpVille) {
$city = new Application_Model_City(); $city = new Application_Model_City();
$sql = $city->select('code, libelle'); $sql = $city->select('code, libelle');
@ -2505,39 +2508,39 @@ class SaisieController extends Zend_Controller_Action
} else { } else {
$sql->where('libelle LIKE ?', "%$cpVille%"); $sql->where('libelle LIKE ?', "%$cpVille%");
} }
$sql->limit(20); $sql->limit(20);
$rows = $city->fetchAll($sql); $rows = $city->fetchAll($sql);
if ( count($rows)>0 ) { if ( count($rows)>0 ) {
foreach ($rows as $item) { foreach ($rows as $item) {
$output[] = array( $output[] = array(
'label' => str_pad($item->code, 5, 0, STR_PAD_LEFT).": ".$item->libelle, 'label' => str_pad($item->code, 5, 0, STR_PAD_LEFT).": ".$item->libelle,
'value' => str_pad($item->code, 5, 0, STR_PAD_LEFT), 'value' => str_pad($item->code, 5, 0, STR_PAD_LEFT),
); );
} }
} }
} }
$this->view->assign('output', $output); $this->view->assign('output', $output);
} }
public function codvoieAction() public function codvoieAction()
{ {
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
$codvoie = $this->getRequest()->getParam('codvoie', null); $codvoie = $this->getRequest()->getParam('codvoie', null);
$output = array(); $output = array();
if ( null !== $codvoie) { if ( null !== $codvoie) {
foreach($this->codVoie as $key=>$val){ foreach($this->codVoie as $key=>$val){
if (stripos($key, $codvoie)!==false || stripos($val, $codvoie)!==false){ if (stripos($key, $codvoie)!==false || stripos($val, $codvoie)!==false){
$output[] = array( $output[] = array(
'label' => $key.": ".$val, 'label' => $key.": ".$val,
'value' => $key 'value' => $key
); );
} }
} }
} }
$this->view->assign('output', $output); $this->view->assign('output', $output);
} }
/** /**
@ -2553,8 +2556,8 @@ class SaisieController extends Zend_Controller_Action
$siret = $request->getParam('siret'); $siret = $request->getParam('siret');
$siren = substr($siret, 0, 9); $siren = substr($siret, 0, 9);
$nic = substr($siret, 9, 5); $nic = substr($siret, 9, 5);
$ws = new WsScores(); $ws = new WsScores();
switch ($mode) { switch ($mode) {
case 'add': case 'add':
@ -2575,23 +2578,23 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('mode', $mode); $this->view->assign('mode', $mode);
$this->view->assign('id', $id); $this->view->assign('id', $id);
$this->view->assign('siren', $siren); $this->view->assign('siren', $siren);
$this->view->assign('nic', $nic); $this->view->assign('nic', $nic);
} }
/** /**
* Sauvegarder les modifications des dirigeants oppérationnels * Sauvegarder les modifications des dirigeants oppérationnels
*/ */
public function diropsaveAction() public function diropsaveAction()
{ {
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
$params = $this->getRequest()->getParams(); $params = $this->getRequest()->getParams();
$message = ''; $message = '';
$newDate = '0000-00-00'; $newDate = '0000-00-00';
if (trim($params['naiss_date']) != '') { if (trim($params['naiss_date']) != '') {
$date = new Zend_Date($params['naiss_date'], 'dd/MM/yyyy'); $date = new Zend_Date($params['naiss_date'], 'dd/MM/yyyy');
$newDate = $date->toString('yyyy-MM-dd'); $newDate = $date->toString('yyyy-MM-dd');
} }
$infos = array( $infos = array(
@ -2611,25 +2614,25 @@ class SaisieController extends Zend_Controller_Action
$ws = new WsScores(); $ws = new WsScores();
if($params['mode'] == 'add'){ if($params['mode'] == 'add'){
$message = $this->view->translate('Ajout'); $message = $this->view->translate('Ajout');
} else if ($params['mode'] == 'edit') { } else if ($params['mode'] == 'edit') {
$message = $this->view->translate('Edition'); $message = $this->view->translate('Edition');
} else if ($params['mode'] == 'del') { } else if ($params['mode'] == 'del') {
$message = $this->view->translate('Suppression'); $message = $this->view->translate('Suppression');
} }
$result = $ws->setDirigeantsOp(json_encode($infos), $params['mode'], $params['id']); $result = $ws->setDirigeantsOp(json_encode($infos), $params['mode'], $params['id']);
if ($result>0) { if ($result>0) {
$message = $message.' '.$this->view->translate('a été réussi!'); $message = $message.' '.$this->view->translate('a été réussi!');
} else if ($result===0) { } else if ($result===0) {
$message = $message.' '.$this->view->translate('n\'a pas été réussi!'); $message = $message.' '.$this->view->translate('n\'a pas été réussi!');
} else { } else {
$message = $result; $message = $result;
} }
$this->view->assign('message', $message); $this->view->assign('message', $message);
} }
/** /**

View File

@ -40,6 +40,15 @@
</td> </td>
</tr> </tr>
<?php }?> <?php }?>
<?php if (0 < $this->exportObjet->TOP_CONFIDENTIEL) : ?>
<tr>
<td width="30">&nbsp;</td>
<td colspan="2">
<span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
Ce bilan est confidentiel.
</td>
</tr>
<?php endif ?>
<?php if ( $this->champType == 'S' ) {?> <?php if ( $this->champType == 'S' ) {?>
<tr> <tr>
<td colspan="3"> <td colspan="3">

View File

@ -92,9 +92,14 @@ switch ($type) {
$date = new Zend_Date($element->dateExercicePre, 'yyyyMMdd'); $date = new Zend_Date($element->dateExercicePre, 'yyyyMMdd');
echo $date->toString('dd/MM/yyyy'); echo $date->toString('dd/MM/yyyy');
} ?> - <?php if ($element->dureeExercicePre > 0) {?><?=$element->dureeExercicePre?> Mois<?php } ?></td> } ?> - <?php if ($element->dureeExercicePre > 0) {?><?=$element->dureeExercicePre?> Mois<?php } ?></td>
<td><a href="<?=$this->url(array('controller'=>'finance','action'=>'liasse', <td><?php if (in_array($this->idClient, [1, 147]) || ($element->confidentielClient == $this->idClient || 0 == $element->confidentiel)) : ?>
'siret'=>$this->siret,'id'=>$this->id, 'date'=> $type.$element->dateExercice), 'default', true)?>"> <a href="<?=$this->url(array('controller'=>'finance', 'action'=>'liasse',
Visualiser</a> 'siret'=>$this->siret, 'id'=>$this->id, 'date'=> $type.$element->dateExercice), 'default', true)?>">
Visualiser
</a>
<?php else :?>
Confidentiel
<?php endif; ?>
</td> </td>
</tr> </tr>
<?php break;?> <?php break;?>
@ -150,9 +155,13 @@ switch ($type) {
?> ?>
- <?php if ($element->dureeExercicePre > 0) {?><?=$element->dureeExercicePre?> Mois<?php } ?> - <?php if ($element->dureeExercicePre > 0) {?><?=$element->dureeExercicePre?> Mois<?php } ?>
</td> </td>
<td><a href="<?=$this->url(array('controller'=>'finance', 'action'=>'liasse', 'siret'=>$this->siret, <td><?php if (in_array($this->idClient, [1, 147]) || ($element->confidentielClient == $this->idClient || 0 == $element->confidentiel)) : ?>
'id'=>$this->id, 'date'=> $type.$element->dateExercice), 'default', true)?>"> <a href="<?=$this->url(array('controller'=>'finance', 'action'=>'liasse', 'siret'=>$this->siret,
Visualiser</a> 'id'=>$this->id, 'date'=> $type.$element->dateExercice), 'default', true)?>">
Visualiser</a>
<?php else :?>
Confidentiel
<?php endif; ?>
</td> </td>
</tr> </tr>
<?php }?> <?php }?>

View File

@ -31,7 +31,7 @@ span.poste input { width:50px; }
<h2>Liasse</h2> <h2>Liasse</h2>
<div class="paragraph"> <div class="paragraph">
<?php if ($this->infos) {?> <?php if ($this->infos) { ?>
<div class="content"> <div class="content">
<?php <?php
$params = array( $params = array(

View File

@ -405,24 +405,24 @@ class WsScores
} }
} }
public function getCatalogCity($id, $columns) public function getCatalogCity($id, $columns)
{ {
$params = new stdClass(); $params = new stdClass();
$params->id = $id; $params->id = $id;
$params->columns = $columns; $params->columns = $columns;
$client = $this->loadClient('catalog'); $client = $this->loadClient('catalog');
try { try {
$reponse = $client->getCity($params); $reponse = $client->getCity($params);
return $reponse->getCityResult; return $reponse->getCityResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){ if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
return $fault->faultstring; return $fault->faultstring;
} else { } else {
echo $client->__getLastResponse(); echo $client->__getLastResponse();
//$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); //$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
} }
public function getCatalogLegalForm($id, $columns) public function getCatalogLegalForm($id, $columns)
@ -501,42 +501,42 @@ class WsScores
} }
} }
/** /**
* Get Score Cut Off * Get Score Cut Off
* @param string $siren * @param string $siren
* @return Cutoff values or False * @return Cutoff values or False
*/ */
public function getScoreCutoff($siren) public function getScoreCutoff($siren)
{ {
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$client = $this->loadClient('saisie'); $client = $this->loadClient('saisie');
try { try {
$reponse = $client->getScoreCutoff($params); $reponse = $client->getScoreCutoff($params);
return $reponse->getScoreCutoffResult; return $reponse->getScoreCutoffResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->logger->info($fault->faultcode.':'.$fault->faultstring); $this->logger->info($fault->faultcode.':'.$fault->faultstring);
return $fault->faultstring; return $fault->faultstring;
} }
} }
/** /**
* Delete Score Cut Off * Delete Score Cut Off
* @param string $siren * @param string $siren
* @return boolean * @return boolean
*/ */
public function delScoreCutoff($siren) public function delScoreCutoff($siren)
{ {
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$client = $this->loadClient('saisie'); $client = $this->loadClient('saisie');
try { try {
$reponse = $client->delScoreCutoff($params); //change name when webservice is ready $reponse = $client->delScoreCutoff($params); //change name when webservice is ready
return $reponse->delScoreCutoffResult; //change name when webservice is ready return $reponse->delScoreCutoffResult; //change name when webservice is ready
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->logger->info($fault->faultcode.':'.$fault->faultstring); $this->logger->info($fault->faultcode.':'.$fault->faultstring);
return $fault->faultstring; return $fault->faultstring;
} }
} }
public function searchLogin($idClient, $query) public function searchLogin($idClient, $query)
@ -884,18 +884,18 @@ class WsScores
$params->type = $type; $params->type = $type;
$params->libelle = $libelle; $params->libelle = $libelle;
$params->date = $date; $params->date = $date;
$client = $this->loadClient('saisie'); $client = $this->loadClient('saisie');
try { try {
$reponse = $client->setActeAsso($params); $reponse = $client->setActeAsso($params);
return $reponse->setActeAssoResult; return $reponse->setActeAssoResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->logger->info($fault->faultcode.':'.$fault->faultstring); $this->logger->info($fault->faultcode.':'.$fault->faultstring);
if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){ if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
return $fault->faultstring; return $fault->faultstring;
} else { } else {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
} }
@ -943,14 +943,14 @@ class WsScores
$params->identifiant = $identifiant; $params->identifiant = $identifiant;
$params->position = $position; $params->position = $position;
$params->nbRep = $nbRep; $params->nbRep = $nbRep;
$client = $this->loadClient('pieces'); $client = $this->loadClient('pieces');
try { try {
$reponse = $client->getBilans($params); $reponse = $client->getBilans($params);
return $reponse->getBilansResult; return $reponse->getBilansResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->logger->info($fault->faultcode.':'.$fault->faultstring); $this->logger->info($fault->faultcode.':'.$fault->faultstring);
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
@ -964,21 +964,21 @@ class WsScores
*/ */
public function getPiecesBilan($siren, $type, $diffusion, $dateCloture, $reference = '') public function getPiecesBilan($siren, $type, $diffusion, $dateCloture, $reference = '')
{ {
$params = new stdClass(); $params = new stdClass();
$params->identifiant = $siren; $params->identifiant = $siren;
$params->dateCloture = $dateCloture; $params->dateCloture = $dateCloture;
$params->type = $type; $params->type = $type;
$params->diffusion = $diffusion; $params->diffusion = $diffusion;
$params->reference = $reference; $params->reference = $reference;
$client = $this->loadClient('pieces'); $client = $this->loadClient('pieces');
try { try {
$reponse = $client->getBilan($params); $reponse = $client->getBilan($params);
$this->logger->info(print_r($reponse,1)); $this->logger->info(print_r($reponse,1));
return $reponse->getBilanResult; return $reponse->getBilanResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->logger->info($fault->faultcode.':'.$fault->faultstring); $this->logger->info($fault->faultcode.':'.$fault->faultstring);
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
@ -1103,15 +1103,15 @@ class WsScores
*/ */
public function getUser($login) public function getUser($login)
{ {
$params = new stdClass(); $params = new stdClass();
$params->login = $login; $params->login = $login;
$client = $this->loadClient('gestion'); $client = $this->loadClient('gestion');
try { try {
$reponse = $client->getUser($params); $reponse = $client->getUser($params);
return $reponse->getUserResult; return $reponse->getUserResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
@ -1170,17 +1170,17 @@ class WsScores
{ {
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$client = $this->loadClient('interne'); $client = $this->loadClient('interne');
try { try {
$reponse = $client->getGroupeInfos($params); $reponse = $client->getGroupeInfos($params);
return $reponse->getGroupeInfosResult; return $reponse->getGroupeInfosResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
if ( in_array($fault->faultcode, array('Error')) ){ if ( in_array($fault->faultcode, array('Error')) ){
return $fault->faultstring; return $fault->faultstring;
} else { } else {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
} }
@ -1196,7 +1196,7 @@ class WsScores
$filename.= '-0'; $filename.= '-0';
if ($stopAtIsin === true) { if ($stopAtIsin === true) {
$filename.= '-1'; $filename.= '-1';
} }
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache = new Cache($filename); $cache = new Cache($filename);
@ -1214,7 +1214,7 @@ class WsScores
try { try {
$reponse = $client->getGroupesArbo($params); $reponse = $client->getGroupesArbo($params);
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getGroupesArboResult); $cache->setBlock($reponse->getGroupesArboResult);
} }
return $reponse->getGroupesArboResult; return $reponse->getGroupesArboResult;
@ -1913,28 +1913,28 @@ class WsScores
} }
} }
/** /**
* getListeDepartements * getListeDepartements
* Liste des départements * Liste des départements
*/ */
public function getCatalogDepartements($id, $columns) public function getCatalogDepartements($id, $columns)
{ {
$params = new stdClass(); $params = new stdClass();
$params->id = $id; $params->id = $id;
$params->columns = $columns; $params->columns = $columns;
$client = $this->loadClient('catalog'); $client = $this->loadClient('catalog');
try { try {
$reponse = $client->getDepartements($params); $reponse = $client->getDepartements($params);
return $reponse->getDepartementsResult; return $reponse->getDepartementsResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){ if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
return $fault->faultstring; return $fault->faultstring;
} else { } else {
echo $client->__getLastResponse(); echo $client->__getLastResponse();
//$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); //$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
} }
/** /**
@ -2185,11 +2185,11 @@ class WsScores
return false; return false;
} }
} }
} }
public function getAnnoncesNum($siren) public function getAnnoncesNum($siren)
{ {
$filename = 'annoncesnum-'.$siren; $filename = 'annoncesnum-'.$siren;
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache = new Cache($filename); $cache = new Cache($filename);
@ -2197,26 +2197,26 @@ class WsScores
return $cache->getBlock(); return $cache->getBlock();
} }
} }
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getAnnoncesNum($params); $reponse = $client->getAnnoncesNum($params);
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getAnnoncesNumResult); $cache->setBlock($reponse->getAnnoncesNumResult);
} }
return $reponse->getAnnoncesNumResult; return $reponse->getAnnoncesNumResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
public function getAnnoncesBalo($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20) public function getAnnoncesBalo($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20)
{ {
$filename = 'annoncesbalo-'.$siren.'-'.$idAnn.'-'.$position.'-'.$nbRep; $filename = 'annoncesbalo-'.$siren.'-'.$idAnn.'-'.$position.'-'.$nbRep;
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache = new Cache($filename); $cache = new Cache($filename);
@ -2224,30 +2224,30 @@ class WsScores
return $cache->getBlock(); return $cache->getBlock();
} }
} }
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$params->idAnn = $idAnn; $params->idAnn = $idAnn;
$params->filtre = $filtre; $params->filtre = $filtre;
$params->position = $position; $params->position = $position;
$params->nbRep = $nbRep; $params->nbRep = $nbRep;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getAnnoncesBalo($params); $reponse = $client->getAnnoncesBalo($params);
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getAnnoncesBaloResult); $cache->setBlock($reponse->getAnnoncesBaloResult);
} }
return $reponse->getAnnoncesBaloResult; return $reponse->getAnnoncesBaloResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
public function getAnnoncesBoamp($siren, $idAnn=null, $filtre = null, $position=0, $nbRep=20) public function getAnnoncesBoamp($siren, $idAnn=null, $filtre = null, $position=0, $nbRep=20)
{ {
$filename = 'annoncesboamp-'.$siren.'-'.$filtre.'-'.$position.'-'.$nbRep; $filename = 'annoncesboamp-'.$siren.'-'.$filtre.'-'.$position.'-'.$nbRep;
if ($idAnn !== null) { if ($idAnn !== null) {
$filename = 'annoncesboamp-'.$siren.'-'.$filtre.'-'.$idAnn.'-'.$position.'-'.$nbRep; $filename = 'annoncesboamp-'.$siren.'-'.$filtre.'-'.$idAnn.'-'.$position.'-'.$nbRep;
@ -2259,38 +2259,38 @@ class WsScores
return $cache->getBlock(); return $cache->getBlock();
} }
} }
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$params->idAnn = $idAnn; $params->idAnn = $idAnn;
$params->filtre = null; $params->filtre = null;
if (!empty($filtre) && in_array($filtre,array('A','M'))) { if (!empty($filtre) && in_array($filtre,array('A','M'))) {
$filtreStruct = new stdClass(); $filtreStruct = new stdClass();
$filtreStruct->key = 'type'; $filtreStruct->key = 'type';
$filtreStruct->value = $filtre; $filtreStruct->value = $filtre;
$params->filtre[] = $filtreStruct; $params->filtre[] = $filtreStruct;
} }
$params->position = $position; $params->position = $position;
$params->nbRep = $nbRep; $params->nbRep = $nbRep;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getAnnoncesBoamp($params); $reponse = $client->getAnnoncesBoamp($params);
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getAnnoncesBoampResult); $cache->setBlock($reponse->getAnnoncesBoampResult);
} }
return $reponse->getAnnoncesBoampResult; return $reponse->getAnnoncesBoampResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
public function getAnnoncesAsso($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20) public function getAnnoncesAsso($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20)
{ {
$filename = 'annoncesasso-'.$siren.'-'.$idAnn.'-'.$position.'-'.$nbRep; $filename = 'annoncesasso-'.$siren.'-'.$idAnn.'-'.$position.'-'.$nbRep;
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache = new Cache($filename); $cache = new Cache($filename);
@ -2298,30 +2298,30 @@ class WsScores
return $cache->getBlock(); return $cache->getBlock();
} }
} }
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$params->idAnn = $idAnn; $params->idAnn = $idAnn;
$params->filtre = $filtre; $params->filtre = $filtre;
$params->position = $position; $params->position = $position;
$params->nbRep = $nbRep; $params->nbRep = $nbRep;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getAnnoncesAsso($params); $reponse = $client->getAnnoncesAsso($params);
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getAnnoncesAssoResult); $cache->setBlock($reponse->getAnnoncesAssoResult);
} }
return $reponse->getAnnoncesAssoResult; return $reponse->getAnnoncesAssoResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
public function getAnnoncesLegales($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20) public function getAnnoncesLegales($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20)
{ {
$filename = 'annonceslegales-'.$siren.'-'.$idAnn.'-'.$position.'-'.$nbRep; $filename = 'annonceslegales-'.$siren.'-'.$idAnn.'-'.$position.'-'.$nbRep;
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache = new Cache($filename); $cache = new Cache($filename);
@ -2329,28 +2329,28 @@ class WsScores
return $cache->getBlock(); return $cache->getBlock();
} }
} }
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
$params->idAnn = $idAnn; $params->idAnn = $idAnn;
$params->filtre = $filtre; $params->filtre = $filtre;
$params->position = $position; $params->position = $position;
$params->nbRep = $nbRep; $params->nbRep = $nbRep;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getAnnoncesLegales($params); $reponse = $client->getAnnoncesLegales($params);
$this->logger->info(print_r($reponse,1)); $this->logger->info(print_r($reponse,1));
if ($this->cacheWrite) { if ($this->cacheWrite) {
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getAnnoncesLegalesResult); $cache->setBlock($reponse->getAnnoncesLegalesResult);
} }
return $reponse->getAnnoncesLegalesResult; return $reponse->getAnnoncesLegalesResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
/** /**
* getAnnonces * getAnnonces
* @param string $siren * @param string $siren
@ -2457,24 +2457,11 @@ class WsScores
*/ */
public function getListeBilans($siren) public function getListeBilans($siren)
{ {
$filename = 'listebilans-'.$siren;
if ($this->cacheWrite) {
$cache = new Cache($filename);
if ($cache->exist() && $this->cacheEnable ){
return $cache->getBlock();
}
}
$params = new StdClass; $params = new StdClass;
$params->siren = $siren; $params->siren = $siren;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getListeBilans($params); $reponse = $client->getListeBilans($params);
if ($this->cacheWrite) {
$cache->deletefile();
$cache->setBlock($reponse->getListeBilansResult);
}
return $reponse->getListeBilansResult; return $reponse->getListeBilansResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
@ -2592,25 +2579,12 @@ class WsScores
*/ */
public function getRatios($siren, $page = 'ratios') public function getRatios($siren, $page = 'ratios')
{ {
$filename = 'ratios-'.$siren.'-'.$page;
if ($this->cacheWrite) {
$cache = new Cache($filename);
if ($cache->exist() && $this->cacheEnable ){
return $cache->getBlock();
}
}
$params = new StdClass(); $params = new StdClass();
$params->siren = $siren; $params->siren = $siren;
$params->page = $page; $params->page = $page;
$client = $this->loadClient('entreprise'); $client = $this->loadClient('entreprise');
try { try {
$reponse = $client->getRatios($params); $reponse = $client->getRatios($params);
if ($this->cacheWrite) {
$cache->deletefile();
$cache->setBlock($reponse->getRatiosResult);
}
return $reponse->getRatiosResult; return $reponse->getRatiosResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
@ -2684,29 +2658,29 @@ class WsScores
} }
} }
/** /**
* setDirigeantsOp * setDirigeantsOp
* @param array $infos * @param array $infos
*/ */
public function setDirigeantsOp($infos, $mode, $id) public function setDirigeantsOp($infos, $mode, $id)
{ {
$params = new stdClass(); $params = new stdClass();
$params->infos = $infos; $params->infos = $infos;
$params->mode = $mode; $params->mode = $mode;
$params->id = $id; $params->id = $id;
$client = $this->loadClient('saisie'); $client = $this->loadClient('saisie');
try { try {
$reponse = $client->setDirigeantsOp($params); $reponse = $client->setDirigeantsOp($params);
return $reponse->setDirigeantsOpResult; return $reponse->setDirigeantsOpResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->logger->info($fault->faultcode.':'.$fault->faultstring); $this->logger->info($fault->faultcode.':'.$fault->faultstring);
if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){ if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
return $fault->faultstring; return $fault->faultstring;
} else { } else {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
} }
/** /**
@ -3214,24 +3188,24 @@ class WsScores
} }
} }
/** /**
* getScoreHistorique pour les derniers 5 ans * getScoreHistorique pour les derniers 5 ans
* @param string $siret * @param string $siret
* @param string $type * @param string $type
*/ */
public function getScoresHisto($siret, $type = 'indiscore') public function getScoresHisto($siret, $type = 'indiscore')
{ {
$params = new stdClass(); $params = new stdClass();
$params->siret = $siret; $params->siret = $siret;
$params->type = $type; $params->type = $type;
try { try {
$client = $this->loadClient('interne'); $client = $this->loadClient('interne');
$reponse = $client->getScoresHisto($params); $reponse = $client->getScoresHisto($params);
return $reponse->getScoresHistoResult; return $reponse->getScoresHistoResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
return false; return false;
} }
} }
/** /**
@ -3327,25 +3301,25 @@ class WsScores
/** /**
* getCategory * getCategory
*/ */
public function getCategory() public function getCategory()
{ {
$filename = 'category'; $filename = 'category';
$cache = new Cache($filename); $cache = new Cache($filename);
if ($cache->exist() && $this->cacheEnable ){ if ($cache->exist() && $this->cacheEnable ){
return $cache->getBlock('category'); return $cache->getBlock('category');
} }
try { try {
$client = $this->loadClient('gestion'); $client = $this->loadClient('gestion');
$reponse = $client->getCategory(); $reponse = $client->getCategory();
$cache->deletefile(); $cache->deletefile();
$cache->setBlock($reponse->getCategoryResult); $cache->setBlock($reponse->getCategoryResult);
return $reponse->getCategoryResult; return $reponse->getCategoryResult;
} catch (SoapFault $fault) { } catch (SoapFault $fault) {
$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse()); $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
//Placer exception pour affichage message //Placer exception pour affichage message
return false; return false;
} }
} }
/** /**