wip #7378 @0.5

diff --git a/framework/application/controllers/AdminajaxpopupController.php b/framework/application/controllers/AdminajaxpopupController.php
index 491f2d7c148a3178bb544df75bc6d6e696e932e6..40dc861603838397d8069cf180af79f491421a81 100644 (file)
--- a/framework/application/controllers/AdminajaxpopupController.php
+++ b/framework/application/controllers/AdminajaxpopupController.php
@@ -72,11 +72,11 @@ class AdminajaxpopupController extends CubeIT_Controller_Admin_AdminajaxpopupCon
         $res .= '</dt>';
         $res .= '<dd>';
         $res .= '<select name="methode_paiement">
-<option name="CB">Carte bancaire</option>
-<option name="ESPECES">Espèces</option>
-<option name="CHEQUE">Chèque</option>
-<option name="VIREMENT">Virement</option>
-<option name="SOGENACTIF">Sogenactif</option>
+<option value="CB">Carte bancaire</option>
+<option value="ESPECES">Espèces</option>
+<option value="CHEQUE">Chèque</option>
+<option value="VIREMENT">Virement</option>
+<option value="SOGENACTIF">Sogenactif</option>
 </select>';
         $res .= '</dd>';
         $res .= '</div>';

diff --git a/framework/application/controllers/DevisController.php b/framework/application/controllers/DevisController.php
index b73e152783e9f80950a279fc8b8f0f988c56a09f..b03ff6c1ae05325ae9a29817eb5ef777376d9fb3 100644 (file)
--- a/framework/application/controllers/DevisController.php
+++ b/framework/application/controllers/DevisController.php
@@ -119,16 +119,18 @@ class DevisController extends CubeIT_Controller_PageController
         $this->disableLayout(true);
         $p = $this->_parseParams();
 
+        $url = str_replace('https://dev', 'https://www', SITE_URL . '/devis/index/' . $p[0] . '/' . $p[1] . "?print=1&j=" . time());
+        $format = '210mm*297mm*0*0*0*0';
+
         $file = CubeIT_Files::tempnam();
         $f = $file . '.pdf';
-
-        $url = SITE_URL . '/devis/index/' . $p[0] . '/' . $p[1] . "?print=1&j=" . time();
-
-        CubeIT_CommandLine_Phantomjs::html2pdf($url, $f, '210mm*297mm*0*0*0*0');
+        CubeIT_CommandLine_Phantomjs::html2pdf($url, $f, $format);
 
         $response = $this->getResponse();
         $response->setHeader('Content-type', CubeIT_Files::getMimeType('file.pdf'))
             ->setBody(file_get_contents($f));
+          //  ->setBody(file_get_contents('https://extranet.cubedesigners.com/tools/phantomjs?url=' . urlencode($url) . '&pageformat=' . $format));
+
 
         $response->sendResponse();
     }

diff --git a/less/common.less b/less/common.less
index f7be6f53de98dd5519fd16bfd261b2dbae6b0092..3bdd04ed1ee99b9007ca5359c7417dd4e87a2658 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -1,9 +1,6 @@
 * {
        background-repeat: repeat;
        vertical-align: top;
-       -webkit-print-color-adjust: exact !important;   /* Chrome, Safari 6 – 15.3, Edge */
-       color-adjust: exact !important;                 /* Firefox 48 – 96 */
-       print-color-adjust: exact !important;           /* Firefox 97+, Safari 15.4+ */
 }
 
 body {