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

Change and correction

Browse Source
This commit is contained in:
Michael RICOIS 2014-01-10 09:54:19 +00:00
parent 0cbde292b5
commit 4997aa3f6f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/controllers/ReportController.php
View File

@ -436,6 +436,7 @@ class ReportController extends Zend_Controller_Action
public function pdfAction() public function pdfAction()
{ {
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
$request = $this->getRequest(); $request = $this->getRequest();
@ -489,11 +490,14 @@ class ReportController extends Zend_Controller_Action
*/ */
public function getcmdAction() public function getcmdAction()
{ {
$this->_helper->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
$request = $this->getRequest(); $request = $this->getRequest();
$cmdId = $request->getParam('id'); $cmdId = $request->getParam('id');
$c = Zend_Registry::get('config'); $c = Zend_Registry::get('config');
$path = $c->profil->path->data; $path = $c->profil->path->pages;
$auth = Zend_Auth::getInstance(); $auth = Zend_Auth::getInstance();
@ -524,6 +528,9 @@ class ReportController extends Zend_Controller_Action
*/ */
public function billAction() public function billAction()
{ {
$this->_helper->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
$request = $this->getRequest(); $request = $this->getRequest();
$cmdId = $request->getParam('id'); $cmdId = $request->getParam('id');
$regen = $request->getParam('regen'); $regen = $request->getParam('regen');
@ -549,7 +556,10 @@ class ReportController extends Zend_Controller_Action
//Prepare information in database //Prepare information in database
if ( $bill === null ) { if ( $bill === null ) {
$lastItemSql = $billM->select()->order('id DESC')->limit(1);
$lastItem = $billM->fetchRow($lastItemSql);
$NumCmd = $billM->insert(array( $NumCmd = $billM->insert(array(
'id' => $lastItem->id+1,
'cmdId' => $cmdId, 'cmdId' => $cmdId,
)); ));
} elseif ( $bill !== null && $regen !== null ) { } elseif ( $bill !== null && $regen !== null ) {
@ -631,11 +641,6 @@ class ReportController extends Zend_Controller_Action
$pdf->save($path.$file); $pdf->save($path.$file);
$billM->update(array('file' => $file), 'id='.$NumCmd); $billM->update(array('file' => $file), 'id='.$NumCmd);
/**
ALTER TABLE `command` ADD `mt` FLOAT NOT NULL COMMENT 'Montant Hors taxes' AFTER `cmdId` ,
ADD `tax` FLOAT NOT NULL COMMENT 'Taux de taxe' AFTER `mt` ;
*/
} }
//Distribuer la facture //Distribuer la facture
else { else {