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

Diverse correction

Browse Source
This commit is contained in:
Michael RICOIS 2013-11-15 09:37:46 +00:00
parent 67a01a01f8
commit b4d77ea504
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/controllers/ReportController.php
View File

@ -296,6 +296,8 @@ class ReportController extends Zend_Controller_Action
$cmdState = 4; $cmdState = 4;
$cmdId = $request->getParam('id');
$session = new Zend_Session_Namespace('Cmd'); $session = new Zend_Session_Namespace('Cmd');
if ( $session->state > $cmdState || $session->CmdID != $cmdId ) { if ( $session->state > $cmdState || $session->CmdID != $cmdId ) {
$url = $this->view->url(array( $url = $this->view->url(array(
@ -308,8 +310,6 @@ class ReportController extends Zend_Controller_Action
$session->state = $cmdState; $session->state = $cmdState;
} }
$cmdId = $request->getParam('id');
//Vérification que la commande existe //Vérification que la commande existe
$commandM = new Application_Model_Command(); $commandM = new Application_Model_Command();
$row = $commandM->fetchRow('cmdId="'.$cmdId.'"'); $row = $commandM->fetchRow('cmdId="'.$cmdId.'"');
@ -382,20 +382,21 @@ class ReportController extends Zend_Controller_Action
$this->view->Infos = $infos; $this->view->Infos = $infos;
$links = array();
if ( file_exists($pathCmd . DIRECTORY_SEPARATOR . $row->cmdId . '.html') ) { if ( file_exists($pathCmd . DIRECTORY_SEPARATOR . $row->cmdId . '.html') ) {
//Define links to get the HTML and/or PDF //Define links to get the HTML and/or PDF
$links = array( $links[] = array(
0 => array(
'title' => 'Fichier PDF', 'title' => 'Fichier PDF',
'desc' => 'Télécharger le bilan financier', 'desc' => 'Télécharger le bilan financier',
'url' => $this->view->url(array( 'url' => $this->view->url(array(
'controller'=>'report', 'controller'=>'report',
'action'=>'pdf', 'action'=>'pdf',
'id' => $row->cmdId 'id' => $row->cmdId))
)) );
),
);
} }
$this->view->links = $links;
} }
} }

2
application/views/scripts/report/deliver.phtml
View File

@ -47,7 +47,7 @@
<?php foreach ( $this->links as $link ) {?> <?php foreach ( $this->links as $link ) {?>
<div class="list-group"> <div class="list-group">
<a href="#" class="list-group-item"> <a href="<?=$link['url']?>" class="list-group-item">
<h4 class="list-group-item-heading"><?=$link['title']?></h4> <h4 class="list-group-item-heading"><?=$link['title']?></h4>
<p class="list-group-item-text"><?=$link['desc']?></p> <p class="list-group-item-text"><?=$link['desc']?></p>
</a> </a>

4
application/views/scripts/report/retour.phtml
View File

@ -1,7 +1,7 @@
<?php echo $this->render('report/header.phtml')?> <?php echo $this->render('report/header.phtml')?>
<div class="page-header"> <div class="page-header">
<h2>RAPPORT FINANCIER COMPLET <small>Erreur</small></h2> <h2>RAPPORT FINANCIER COMPLET <small>Validation du paiement</small></h2>
</div> </div>
<?php if ( $this->PaiementError ) {?> <?php if ( $this->PaiementError ) {?>
@ -11,7 +11,7 @@
<?php } else {?> <?php } else {?>
<div class="alert alert-success"><strong>Paiment autorisé.</strong> <div class="alert alert-success"><strong>Paiment autorisé.</strong>
<a href="<?=$this->devliveryUrl?>">Consulter vos fichiers en cliquant ici</a></div> <a href="<?=$this->deliveryUrl?>">Consulter vos fichiers en cliquant ici</a></div>
<?php }?> <?php }?>