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

Merge branch 'develop' of ssh://git@192.168.78.249:10022/SCORES/extranet.git into develop

Browse Source
This commit is contained in:
Jean Vladimir TWAHIRWA 2016-11-21 17:26:34 +01:00
commit 60657ac327
3 changed files with 65 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/modules/default/controllers/SaisieController.php
View File

@ -259,7 +259,7 @@ class SaisieController extends Zend_Controller_Action
$lib[$key] = $row['libPays'];
}
array_multisort($lib, SORT_ASC, SORT_STRING, $countries);
$this->countries = $countries;
$this->countries = $countries;
}
//devIso (index), devNom
@ -451,10 +451,6 @@ class SaisieController extends Zend_Controller_Action
$ws = new WsScores();
$reponse = $ws->getListeJalCollecte();
$listeJalCollecte = $reponse->result->item;
$this->view->assign('ListeJalCollecte', $listeJalCollecte);
if (Zend_Session::sessionExists()){
if(Zend_Session::namespaceIsset('saisie')){
$sessionSaisie = new Zend_Session_Namespace('saisie');
@ -2902,7 +2898,7 @@ class SaisieController extends Zend_Controller_Action
$ws->setGeoCode($p);
}
}
public function ribibanAction()
{
$this->_helper->layout()->disableLayout();
@ -2911,11 +2907,11 @@ class SaisieController extends Zend_Controller_Action
$mode = $request->getParam('mode');
$guichetMod = $request->getParam('guichetMod');
$banqueMod = $request->getParam('banqueMod');
$ws = new WsScores();
$result = $ws->getIdentite($siren);
$infos = $ws->getBanques($siren);
$this->view->assign('actif',$result->Actif);
$this->view->assign('siren', $siren);
$this->view->assign('mode', $mode);
@ -2923,9 +2919,9 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('guichetMod', $guichetMod);
$this->view->assign('banqueMod', $banqueMod);
}
public function ribansaveAction(){
$this->_helper->layout()->disableLayout();
@ -2936,14 +2932,14 @@ class SaisieController extends Zend_Controller_Action
$bicSwift = str_replace(' ', '',$request->getParam('bic_swift'));
$iban = str_replace(' ', '',$request->getParam('iban'));
$mode = $request->getParam('mode');
$this->view->assign('code_banque', $guichetMod);
$this->view->assign('code_guichet', $codeGuichet);
$this->view->assign('num_compte', $numCompte);
$this->view->assign('bic_swift', $bicSwift);
$this->view->assign('iban', $iban);
}
}

11
application/modules/default/views/default/scripts/saisie/form.phtml
View File

@ -22,17 +22,6 @@ $select = '';
if ( $this->saisie['source']=='JT' ){ $select = 'selected'; }
?>
<option value="JT" <?=$select?>>TESSI</option>
<?php
if (count($this->ListeJalCollecte)>0) {
foreach ($this->ListeJalCollecte as $jal) {
echo "<option value=\"JS$jal->id\" ";
if ( $this->saisie['source']=="JS$jal->id" ) {
echo 'selected';
}
echo ">$jal->nom</option>";
}
}
?>
</select>
<div id="dateParution">

77
library/Scores/IdentiteEntreprise.php
View File

@ -397,14 +397,15 @@ class IdentiteEntreprise
public function getSituationJuridiqueTexte()
{
$data = false;
if ( in_array($this->identite->SituationJuridique, array('P', 'PL', 'R', 'RR', 'RP', 'CL')) ) {
if (in_array($this->identite->SituationJuridique, array(
'P', 'PL', 'R', 'RR', 'RP', 'CL', 'A', 'D'))) {
$dateRad = '';
if($this->identite->DateRadiation!='' && $this->identite->DateRadiation!='0000-00-00'){
if($this->identite->DateRadiation!='' && $this->identite->DateRadiation!='0000-00-00') {
$date = new Zend_Date(str_replace('-','',$this->identite->DateRadiation),'yyyyMMdd');
$dateRad = $date->toString('dd/MM/yyyy');
}
//Procédure collective
if ($this->identite->SituationJuridique=='PL') {
// Procédure collective
if ($this->identite->SituationJuridique == 'PL') {
$data = '<a href="'.$this->view->url(array(
'controller'=>'juridique',
'action'=>'annonces',
@ -412,7 +413,8 @@ class IdentiteEntreprise
'id'=>$this->identite->id), 'default', true).'">'.
'<font color="blue"><b>Plan en cours</b></font>'.
'</a>';
} elseif ($this->identite->SituationJuridique=='P') {
}
elseif ($this->identite->SituationJuridique == 'P') {
$data = '<a href="'.$this->view->url(array(
'controller'=>'juridique',
'action'=>'annonces',
@ -420,8 +422,11 @@ class IdentiteEntreprise
'id'=>$this->identite->id), 'default', true).'">'.
'<font color="red"><b>En procédure collective</b></font>'.
'</a>';
if($dateRad!=''){ $data.= '<br/>Radié du RCS le '.$dateRad; }
} elseif ($this->identite->SituationJuridique=='CL') {
if($dateRad != '') {
$data.= '<br/>Radié du RCS le '.$dateRad;
}
}
elseif ($this->identite->SituationJuridique == 'CL') {
$data = '<a href="'.$this->view->url(array(
'controller'=>'juridique',
'action'=>'annonces',
@ -429,24 +434,52 @@ class IdentiteEntreprise
'id'=>$this->identite->id), 'default', true).'">'.
'<font color="red">Clôture de la procédure</font>'.
'</a>';
if($dateRad!=''){ $data.= '<br/>Radié du RCS le '.$dateRad; }
if($dateRad != '') {
$data.= '<br/>Radié du RCS le '.$dateRad;
}
}
//Radiation
if ($this->identite->SituationJuridique=='RR') {
elseif ($this->identite->SituationJuridique == 'A') {
$data = '<a href="'.$this->view->url(array(
'controller'=>'juridique',
'action'=>'annonces',
'siret'=>$this->identite->Siret,
'id'=>$this->identite->id), 'default', true).'">'.
'<font color="blue"><b>Absorption</b></font>'.
'</a>';
if($dateRad != '') {
$data.= '<br/>Radié du RCS le '.$dateRad;
}
}
elseif ($this->identite->SituationJuridique == 'D') {
$data = '<a href="'.$this->view->url(array(
'controller'=>'juridique',
'action'=>'annonces',
'siret'=>$this->identite->Siret,
'id'=>$this->identite->id), 'default', true).'">'.
'<font color="blue"><b>Dissolution</b></font>'.
'</a>';
if($dateRad != '') {
$data.= '<br/>Radié du RCS le '.$dateRad;
}
}
// Radiation
elseif ($this->identite->SituationJuridique == 'RR') {
$data.= 'Radié du RCS';
if($dateRad!=''){ $data.= ' le '.$dateRad; }
} elseif($this->identite->SituationJuridique=='RP') {
if($dateRad != '') {
$data.= ' le '.$dateRad;
}
} elseif($this->identite->SituationJuridique == 'RP') {
$data.= 'Radiation publiée';
if($dateRad!=''){ $data.= ' le '.$dateRad; }
if($dateRad != '') {
$data.= ' le '.$dateRad;
}
}
} elseif($this->identite->EntActiveRCS == 1) {
$data = 'Actif au RCS';
$data = 'Actif au RCS';
}
//Mode Edition
// Mode Edition
$user = new Scores_Utilisateur();
if ($user->checkModeEdition())
{
if ($user->checkModeEdition()) {
$href = $this->view->url(array(
'controller' => 'saisie',
'action' => 'fiche',
@ -921,12 +954,12 @@ class IdentiteEntreprise
{
if ($this->identite->Nafa!='') {
$data = $this->identite->NafaLib . ' ('.$this->identite->Nafa.')';
return $data;
return $data;
}
return false;
}
}
public function getNaf4Label()
{
return 'Anciens codes NAF';