(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index de7a018d111e59e689a68e8e994230046f90e1ac..0e3a4d1a9124596ea346af5e4d4173118374f745 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -36,6 +36,14 @@ class commonCore extends cubeCore {
                        2 => __('Payée'), 3 => __('Annulée'), 4 => __('Avoir'));\r
                $this->books_status = array(-1 => __('Brouillon'), 0 => __('Prêt'), 1 => __('Téléchargé'), 2 => __('Facturé'));\r
                $this->agences = array('Paris', 'Montpellier');\r
+               $this->demandes_type = array(0 => __('Non défini'),\r
+                       1 => __('Catalogue'),\r
+                       2 => __('Magazine / Presse'),\r
+                       3 => __('Rapport annuel'),\r
+                       4 => __('Plaquette de société'),\r
+                       5 => __('Brochure touristique'),\r
+                       6 => __("Manuel d'utilisation"),\r
+                       7 => __('Livre'));\r
                $this->ws_grades = array(0 => __("Pas d'accès"), 1 => __('Client'), 2 => __('Client (droits de création)'), 3 => __('Revendeur'), 4 => __('Revendeur (droits de création)'), 5 => __('Administrateur'));\r
        }\r
 \r
@@ -399,7 +407,7 @@ class commonCore extends cubeCore {
                $db->ws_users_tree->primary('pk_utilisateur_id', 'utilisateur_id');\r
                // Table des demandes de devis\r
                $db->demandes->demande_id('integer', 0, false);\r
-               $db->demandes->type('varchar', 128, false);\r
+               $db->demandes->type('integer', 0, false);\r
                $db->demandes->pages('varchar', 128, false);\r
                $db->demandes->liens('varchar', 128, false);\r
                $db->demandes->langues('varchar', 128, false);\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index ed4128d17881ede64108c647261a354ea1c5fdcb..0e668412bbd68ace45c1470d29743657eae28ef8 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -234,10 +234,10 @@ class wsAjax extends cubeAjax {
                        $datas['code_postal'] = $_POST['code_postal'];\r
                        $datas['ville'] = $_POST['ville'];\r
                        $datas['pays'] = $_POST['pays'];\r
-                       if ($_POST['societe'] == '') {\r
+                       if ($_POST['rs'] == '') {\r
                                $datas['nom'] = $_POST['prenom'] . ' ' . $_POST['nom'];\r
                        } else {\r
-                               $datas['nom'] = $_POST['societe'];\r
+                               $datas['nom'] = $_POST['rs'];\r
                        }\r
                        $datas['site'] = $_POST['site'];\r
                        $datas['ws_grade'] = 1;\r
@@ -265,11 +265,11 @@ class wsAjax extends cubeAjax {
 \r
                $datas = array();\r
                $datas['demande_id'] = 'new';\r
-               $datas['type'] = $_POST['type'];\r
-               $datas['pages'] = $_POST['pages'];\r
-               $datas['liens'] = $_POST['liens'];\r
-               $datas['langues'] = $_POST['langues'];\r
-               $datas['details'] = $_POST['details'];\r
+               $datas['type'] = $_POST['produits'];\r
+               $datas['pages'] = $_POST['nombre_pages'];\r
+               $datas['liens'] = $_POST['nombre_liens'];\r
+               $datas['langues'] = $_POST['nombre_langues'];\r
+               $datas['details'] = $_POST['detail'];\r
                $datas['utilisateur'] = $utilisateur_id;\r
                $datas['revendeur'] = 0;\r
                $datas['status'] = 0;\r
@@ -281,13 +281,14 @@ class wsAjax extends cubeAjax {
 \r
        public static function valideDemandeDevis(&$x)\r
        {\r
-               $d = array_unique($_POST);\r
+               $d = unserialize(base64_decode($_GET['devis_form']));\r
+               $d = cubeArray::array_flatten($d);\r
                foreach($d as $k => $v) {\r
                        $_POST[$k] = trim($v);\r
                }\r
                // Validation des champs de formulaires\r
                $ok = true;\r
-               $non_vides = array('pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays');\r
+               $non_vides = array('nombre_pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays');\r
                foreach($non_vides as $nv) {\r
                        if (!isset($_POST[$nv]) || $_POST[$nv] == '') {\r
                                $x->addError($nv);\r