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

Merge from branch 2.8

Browse Source
This commit is contained in:
Michael RICOIS 2016-01-27 10:25:32 +00:00
parent b61f5eb7b2
commit fa22480576
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/modules/default/controllers/IdentiteController.php
View File

@ -2279,10 +2279,11 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('adresse', $session->getAdresse());
if ($this->view->hasRight) {
$ws = new Scores_Ws_Client('entreprise', '0.9');
$source = str_pad($session->getSource(), 3, '0', STR_PAD_LEFT);
$sourceId = str_pad($session->getSourceId(), 17, '0', STR_PAD_LEFT);
$ws = new Scores_Ws_Client('entreprise', '0.9');
$params = new stdClass();
$params->companyId = $this->siret;
$params->type = 'siren';
$params->companyId = $source . $sourceId;
$response = $ws->getRNVP($params);
if ($response === false) {
$this->view->Error = true;

22
application/modules/default/views/default/scripts/pieces/privilegedetail.phtml
View File

@ -24,7 +24,7 @@
<div class="paragraph">
<table class="identite">
<tr>
<?php $date = new Zend_Date($this->Privilege->Date,'yyyy-MM-dd')?>
<?php $date = new Zend_Date($this->Privilege->Date,'yyyy-MM-dd');?>
<td colspan="2"><i>Inscription n° <?=$this->Privilege->Num?> du <?=$date->toString('dd/MM/yyyy')?>, au <?=$this->Privilege->GreffeLabel?></i></td>
</tr>
<tr>
@ -46,9 +46,27 @@
</tr>
<tr>
<td class="StyleInfoLib">Date de fraicheur</td>
<?php $date = new Zend_Date($this->Privilege->DateFresh,'yyyy-MM-dd')?>
<?php $date = new Zend_Date($this->Privilege->DateFresh, 'yyyy-MM-dd')?>
<td><?=$date->toString('dd/MM/yyyy')?></td>
</tr>
<?php if ($this->Privilege->RadiationDate == '0000-00-00' && empty($this->Privilege->RadiationPartiel)) {?>
<tr>
<td class="StyleInfoLib">Date de fin</td>
<td>
<?php $date = new Zend_Date($this->Privilege->Date, 'yyyy-MM-dd'); ?>
<?php
switch ($this->Privilege->Type) {
case '03':
echo $date->addDay(900)->toString('dd/MM/yyyy');
break;
case '04':
echo $date->addDay(1460)->toString('dd/MM/yyyy');
break;
}
?>
</td>
</tr>
<?php }?>
<tr>
<td class="StyleInfoLib" style="vertical-align:top;">Compléments</td>
<?php if (!empty($this->Privilege->RadiationDate) && $this->Privilege->RadiationDate!='0000-00-00'

4
application/modules/default/views/default/scripts/pieces/privileges.phtml
View File

@ -59,8 +59,8 @@
<tr>
<th>Date</th>
<th>Type</th>
<th>Montant</th>
<th>Créancier</th>
<th>Montant</th>
</tr>
</thead>
<tbody>
@ -68,11 +68,11 @@
<tr>
<td><?=substr($p->Date,8,2).'/'.substr($p->Date,5,2).'/'.substr($p->Date,0,4)?></td>
<td><?=$p->TypeLabel?></td>
<td><?=$p->CreancierNom?></td>
<td nowrap>
<a href="<?=$this->url(array('controller'=>'pieces', 'action'=>'privilegedetail', 'siret'=>$this->siret,
'viewId'=>$p->Id), 'default', true)?>"><?=number_format($p->Mt, 2, ',', ' ')?></a>
</td>
<td><?=$p->CreancierNom?></td>
</tr>
<?php }?>
</tbody>