wait #5267 @1

diff --git a/framework/application/controllers/DevisController.php b/framework/application/controllers/DevisController.php
index 33329f84242ef5e1f37f9d7694e1fcb300866e42..9efc77c87a7f1d39a7cee7efe9731bef5caa8f69 100644 (file)
--- a/framework/application/controllers/DevisController.php
+++ b/framework/application/controllers/DevisController.php
@@ -45,20 +45,22 @@ class DevisController extends CubeIT_Controller_PageController
         $this->view->print = isset($_GET['print']);
 
 
-        $currency = 978;
-        if ($this->view->devis->magasin == 'paris11') {
-            $this->view->magasin = 11;
-            $sgc = new CubeIT_Payment_Sogecommerce();
-            $this->view->paymentForm = $sgc->getForm($this->view->devis->id, $amounts['ttc'], $currency, $this->view->devis->email, 'fr');
-            $this->view->paymentAddForm = '<iframe name="sogecommerceIframe" id="sogecommerceIframe"></iframe><script>$(function(){$("#sogecommerce").submit()})</script>';
-        } else {
-            $this->view->magasin = 15;
-            $sogenactif = new CubeIT_Payment_Sogenactif();
-            $form = $sogenactif->getForm($this->view->devis->id, $amounts['ttc'], $currency, $this->view->devis->email, 'fr');
-            $this->view->paymentForm = $form;
-            $submit = new CubeIT_Form_Element_Html('image');
-            $submit->setLabel($this->view->link($this->view->image('/images/devis/cartes.png'), '#', array('class' => 'submit')));
-            $this->view->paymentForm->addElement($submit);
+        if($amounts['ttc']>0) {
+            $currency = 978;
+            if ($this->view->devis->magasin == 'paris11') {
+                $this->view->magasin = 11;
+                $sgc = new CubeIT_Payment_Sogecommerce();
+                $this->view->paymentForm = $sgc->getForm($this->view->devis->id, $amounts['ttc'], $currency, $this->view->devis->email, 'fr');
+                $this->view->paymentAddForm = '<iframe name="sogecommerceIframe" id="sogecommerceIframe"></iframe><script>$(function(){$("#sogecommerce").submit()})</script>';
+            } else {
+                $this->view->magasin = 15;
+                $sogenactif = new CubeIT_Payment_Sogenactif();
+                $form = $sogenactif->getForm($this->view->devis->id, $amounts['ttc'], $currency, $this->view->devis->email, 'fr');
+                $this->view->paymentForm = $form;
+                $submit = new CubeIT_Form_Element_Html('image');
+                $submit->setLabel($this->view->link($this->view->image('/images/devis/cartes.png'), '#', array('class' => 'submit')));
+                $this->view->paymentForm->addElement($submit);
+            }
         }
 
 

diff --git a/framework/application/views/scripts/devis/index.phtml b/framework/application/views/scripts/devis/index.phtml
index b6a70d167e7defd65caa0c0c2871ddb9f6b1ac03..f663ccd950483f85568bfdff5860f8eae315f0c8 100644 (file)
--- a/framework/application/views/scripts/devis/index.phtml
+++ b/framework/application/views/scripts/devis/index.phtml
@@ -125,7 +125,7 @@ echo '</div>';
 echo '</div>';
 echo '</div>';
 
-if (!$isFacture) {
+if (!$isFacture && $this->paymentForm) {
        echo '<div class="box">';
        echo '<h3>Payer en ligne grâce au paiement sécurisé Sogenactif</h3><br>';
        // echo '<div style="display: none;">' . $this->paymentForm1 . '</div>';