From bb8a5ca3e2dc101bbe6ee5dc2e6072220e5c61b2 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Mon, 18 Nov 2013 09:50:43 +0000 Subject: [PATCH] Ajout du montant HT et TTC --- application/configs/application.ini | 2 +- application/controllers/ReportController.php | 6 +++--- scripts/build/config/local/application.ini | 1 + scripts/build/config/sd-46528/application.ini | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/configs/application.ini b/application/configs/application.ini index a134028..447c7ee 100644 --- a/application/configs/application.ini +++ b/application/configs/application.ini @@ -38,7 +38,7 @@ profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8" profil.report.username=mricois profil.report.password=ju2loh6o profil.report.montant=21.53 - +profil.report.montantht=18.00 [staging : production] resources.frontController.params.displayExceptions = 1 diff --git a/application/controllers/ReportController.php b/application/controllers/ReportController.php index c74aac9..a31ec82 100644 --- a/application/controllers/ReportController.php +++ b/application/controllers/ReportController.php @@ -56,7 +56,7 @@ class ReportController extends Zend_Controller_Action 'siren'=>$response->Siren )); - $this->view->montant = $c->profil->report->montant . " €"; + $this->view->montant = $c->profil->report->montantht." € HT" . " (".$c->profil->report->montant." € TTC)"; //Session $session->CmdSiren = $response->Siren; @@ -162,7 +162,7 @@ class ReportController extends Zend_Controller_Action } $c = Zend_Registry::get('config'); - $this->view->montant = $c->profil->report->montant . " €"; + $this->view->montant = $c->profil->report->montantht." € HT" . " (".$c->profil->report->montant." € TTC)"; if ( !isset($session->CmdID) || empty($session->CmdID) ) { //Get the report @@ -247,7 +247,7 @@ class ReportController extends Zend_Controller_Action if ($row !== null) { $c = Zend_Registry::get('config'); - $this->view->montant = $c->profil->report->montant . " €"; + $this->view->montant = $c->profil->report->montantht." € HT" . " (".$c->profil->report->montant." € TTC)"; //Paybox $paybox = new Paybox_System(true); diff --git a/scripts/build/config/local/application.ini b/scripts/build/config/local/application.ini index 629d361..c76f6a2 100644 --- a/scripts/build/config/local/application.ini +++ b/scripts/build/config/local/application.ini @@ -38,6 +38,7 @@ profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8" profil.report.username=partner144 profil.report.password=yY2Uhp0mf5 profil.report.montant=21.53 +profil.report.montantht=18.00 [staging : production] resources.frontController.params.displayExceptions = 1 diff --git a/scripts/build/config/sd-46528/application.ini b/scripts/build/config/sd-46528/application.ini index 96a828d..8c1ef55 100644 --- a/scripts/build/config/sd-46528/application.ini +++ b/scripts/build/config/sd-46528/application.ini @@ -38,6 +38,7 @@ profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8" profil.report.username=partner144 profil.report.password=yY2Uhp0mf5 profil.report.montant=21.53 +profil.report.montantht=18.00 [staging : production] resources.frontController.params.displayExceptions = 1