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

Redraw init with the remove of entrep in session

Browse Source
This commit is contained in:
Michael RICOIS 2013-11-21 13:35:26 +00:00
parent 4509af069e
commit a559ec7c3f
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/controllers/PiecesController.php
View File

@ -15,7 +15,6 @@ class PiecesController extends Zend_Controller_Action
protected $siret;
protected $id;
protected $entrep;
public function init()
{
@ -25,7 +24,6 @@ class PiecesController extends Zend_Controller_Action
$request = $this->getRequest();
$this->siret = $request->getParam('siret');
$this->id = $request->getParam('id', 0);
$this->entrep = new Scores_Session_Entreprise($this->siret, $this->id);
}
public function indexAction(){}
@ -36,6 +34,7 @@ class PiecesController extends Zend_Controller_Action
public function cmdassociationAction()
{
$user = new Scores_Utilisateur();
$session = new Scores_Session_Entreprise($this->siret, $this->id);
$request = $this->getRequest();
$email = $request->getParam('email', '');
@ -57,7 +56,7 @@ class PiecesController extends Zend_Controller_Action
$infoAsso->siren = $siren;
$infoAsso->waldec = '';
$infoAsso->idEntreprise = $this->id;
$infoAsso->raisonSociale = $this->entrep->getRaisonSociale();
$infoAsso->raisonSociale = $session->getRaisonSociale();
$infoDemande = new stdClass();
$infoDemande->reference = $request->getParam('reference');
@ -91,7 +90,7 @@ class PiecesController extends Zend_Controller_Action
$this->view->assign('siren', substr($this->siret, 0,9));
$this->view->assign('siret', $this->siret);
$this->view->assign('id', $this->id);
$this->view->assign('raisonSociale', $this->entrep->getRaisonSociale());
$this->view->assign('raisonSociale', $session->getRaisonSociale());
}
/**
@ -102,9 +101,10 @@ class PiecesController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/themes/default/scripts/pieces.js', 'text/javascript');
$user = new Scores_Utilisateur();
$session = new Scores_Session_Entreprise($this->siret, $this->id);
//Catégorie Juridique
$cj = $this->entrep->getFormeJuridique();
$cj = $session->getFormeJuridique();
if( in_array($cj, $this->association_cj) ) {
$this->_forward('associationactes');
}
@ -335,7 +335,7 @@ class PiecesController extends Zend_Controller_Action
$this->view->assign('InfosActes', $infosActes);
$this->view->assign('siren', $siren);
$this->view->assign('siret', $this->siret);
$this->view->assign('raisonSociale', $this->entrep->getRaisonSociale());
$this->view->assign('raisonSociale', $session->getRaisonSociale());
$this->view->assign('surveillance', $user->checkPerm('survbilan'));
}
@ -346,11 +346,12 @@ class PiecesController extends Zend_Controller_Action
public function bilansAction()
{
$user = new Scores_Utilisateur();
$session = new Scores_Session_Entreprise($this->siret, $this->id);
$this->view->headScript()->appendFile('/themes/default/scripts/pieces.js', 'text/javascript');
//Catégorie Juridique
$cj = $this->entrep->getFormeJuridique();
$cj = $session->getFormeJuridique();
if( in_array($cj, $this->association_cj) ) {
$this->_forward('associationbilans');
} else {
@ -461,7 +462,7 @@ class PiecesController extends Zend_Controller_Action
$this->view->assign('InfosBilans', $infosBilans);
$this->view->assign('siren', $siren);
$this->view->assign('siret', $this->siret);
$this->view->assign('raisonSociale', $this->entrep->getRaisonSociale());
$this->view->assign('raisonSociale', $session->getRaisonSociale());
$this->view->assign('surveillance', $user->checkPerm('survactes'));
}
@ -1178,7 +1179,7 @@ class PiecesController extends Zend_Controller_Action
'cp' => '',
'ville' => '',
'siren' => substr($this->siret,0,9),
'raisonSociale' => $this->entrep->getRaisonSociale(),
'raisonSociale' => $session->getRaisonSociale(),
'type' => 'M',
'dateCommande' => date('Y-m-d H:i:s'),
);
@ -1238,7 +1239,7 @@ class PiecesController extends Zend_Controller_Action
'cp' => $params['cp'],
'ville' => $params['ville'],
'siren' => substr($this->siret,0,9),
'raisonSociale' => $this->entrep->getRaisonSociale(),
'raisonSociale' => $session->getRaisonSociale(),
'type' => 'C',
'dateCommande' => date('Y-m-d H:i:s'),
);
@ -1334,6 +1335,8 @@ class PiecesController extends Zend_Controller_Action
$siren = substr($this->siret, 0,9);
$session = new Scores_Session_Entreprise($this->siret, $this->id);
$c = Zend_Registry::get('config');
$path = $c->profil->path->data.'/association/actes';
@ -1384,7 +1387,7 @@ class PiecesController extends Zend_Controller_Action
$this->view->assign('siren', $siren);
$this->view->assign('siret', $this->siret);
$this->view->assign('id', $this->id);
$this->view->assign('raisonSociale', $this->entrep->getRaisonSociale());
$this->view->assign('raisonSociale', $session->getRaisonSociale());
}
/**
@ -1422,6 +1425,8 @@ class PiecesController extends Zend_Controller_Action
{
$user = new Scores_Utilisateur();
$session = new Scores_Session_Entreprise($this->siret, $this->id);
$siren = substr($this->siret,0,9);
$bilans = array();
@ -1474,7 +1479,7 @@ class PiecesController extends Zend_Controller_Action
$this->view->assign('siren', substr($this->siret, 0,9));
$this->view->assign('siret', $this->siret);
$this->view->assign('id', $this->id);
$this->view->assign('raisonSociale', $this->entrep->getRaisonSociale());
$this->view->assign('raisonSociale', $session->getRaisonSociale());
}